diff options
author | Oz Linden <oz@lindenlab.com> | 2011-06-01 07:22:02 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-06-01 07:22:02 -0400 |
commit | 32f795d027c6787681f1138b76c4149788160151 (patch) | |
tree | b9d888d27e37c143841b2c2e2fca9830052aef29 /indra/newview/skins/default/xui/es | |
parent | e9501b855b32189f1bf627853487a443e6d9daf8 (diff) | |
parent | 5142751def66bfd9e527b55528fa6be83650d7a2 (diff) |
merge changes for storm-1304
Diffstat (limited to 'indra/newview/skins/default/xui/es')
4 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/es/floater_help_browser.xml b/indra/newview/skins/default/xui/es/floater_help_browser.xml index ec3c38e8c7..5ebd7ad6e0 100644 --- a/indra/newview/skins/default/xui/es/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/es/floater_help_browser.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floater_help_browser" title="BUSCADOR DE AYUDA"> +<floater name="floater_help_browser" title="BUSCAR EN LA AYUDA"> <floater.string name="loading_text"> Cargando... </floater.string> diff --git a/indra/newview/skins/default/xui/es/floater_tools.xml b/indra/newview/skins/default/xui/es/floater_tools.xml index fba969f267..f215e5909c 100644 --- a/indra/newview/skins/default/xui/es/floater_tools.xml +++ b/indra/newview/skins/default/xui/es/floater_tools.xml @@ -58,7 +58,7 @@ <radio_item label="Horizontal (Ctrl+Shift)" name="radio spin"/> </radio_group> <radio_group name="edit_radio_group"> - <radio_item label="Moverse" name="radio position"/> + <radio_item label="Mover" name="radio position"/> <radio_item label="Girar (Ctrl)" name="radio rotate"/> <radio_item label="Estirar (Ctrl+Shift)" name="radio stretch"/> <radio_item label="Elegir la cara" name="radio select face"/> @@ -480,7 +480,7 @@ Modificar la parcela </text> <button label="Dividir" label_selected="Dividir" name="button subdivide land"/> - <button label="Inscribirse" label_selected="Inscribirse" name="button join land"/> + <button label="Inscribirse" label_selected="Unir" name="button join land"/> <text name="label_parcel_trans"> Transacciones de terreno </text> diff --git a/indra/newview/skins/default/xui/es/panel_im_control_panel.xml b/indra/newview/skins/default/xui/es/panel_im_control_panel.xml index 7d4db6a630..f218324d50 100644 --- a/indra/newview/skins/default/xui/es/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/es/panel_im_control_panel.xml @@ -8,7 +8,7 @@ <button label="Añadir como amigo" name="add_friend_btn"/> </layout_panel> <layout_panel name="teleport_btn_panel"> - <button label="Teleportarme" name="teleport_btn" tool_tip="Ofrecer teleporte a esta persona"/> + <button label="Teleportar" name="teleport_btn" tool_tip="Ofrecer teleporte a esta persona"/> </layout_panel> <layout_panel name="share_btn_panel"> <button label="Compartir" name="share_btn"/> diff --git a/indra/newview/skins/default/xui/es/panel_login.xml b/indra/newview/skins/default/xui/es/panel_login.xml index eee1844c46..0e94cbe70b 100644 --- a/indra/newview/skins/default/xui/es/panel_login.xml +++ b/indra/newview/skins/default/xui/es/panel_login.xml @@ -30,6 +30,7 @@ <combo_box name="start_location_combo"> <combo_box.item label="Mi última posición" name="MyLastLocation"/> <combo_box.item label="Mi Base" name="MyHome"/> + <combo_box.item label="<Escribe en qué región>" name="Typeregionname"/> </combo_box> </layout_panel> <layout_panel name="links"> |