diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-11-18 12:12:00 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-11-18 12:12:00 -0500 |
| commit | eee556cfbb1bdd0bf35568632a96ce9f18d27262 (patch) | |
| tree | b4113b74f74010b0326d2c37af60ea40d17c79be /indra/newview | |
| parent | 4bcdcd02fb7e83a2754084f2fb599b56ea6c8743 (diff) | |
| parent | 13b084fde7fe5a51729491c4173acf7cbb85defe (diff) | |
merge changes for vmrg-186
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/skins/default/xui/es/panel_people.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/es/strings.xml | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/es/panel_people.xml b/indra/newview/skins/default/xui/es/panel_people.xml index 2fcbb00aed..a9d38dca25 100644 --- a/indra/newview/skins/default/xui/es/panel_people.xml +++ b/indra/newview/skins/default/xui/es/panel_people.xml @@ -76,7 +76,7 @@ <button label="Compartir" name="share_btn" tool_tip="Compartir un objeto del inventario"/> </layout_panel> <layout_panel name="teleport_btn_lp"> - <button label="Teleportarte" name="teleport_btn" tool_tip="Ofrecer teleporte"/> + <button label="Teleporte" name="teleport_btn" tool_tip="Ofrecer teleporte"/> </layout_panel> </layout_stack> <layout_stack name="bottom_bar_ls1"> diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml index 83747b85c0..4cae6ce5e8 100644 --- a/indra/newview/skins/default/xui/es/strings.xml +++ b/indra/newview/skins/default/xui/es/strings.xml @@ -3841,6 +3841,9 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE]. <string name="inventory_item_offered-im"> Ofrecido el item del inventario </string> + <string name="share_alert"> + Arrastra los ítems desde el invenbtario hasta aquí + </string> <string name="no_session_message"> (La sesión de MI no existe) </string> |