diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-15 15:23:28 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-15 15:23:28 +0000 |
| commit | 42d1aaee2e3a9c5df3e7b4ace3bf6b5972a74847 (patch) | |
| tree | 81c20219c87f23b5f9cce34099cf1db6d68709cd /indra/newview/skins/default | |
| parent | 234cd6e7c04c0840be6ae4a74eaf138e72876f44 (diff) | |
| parent | 8a8e8e46ee0564ac052c5fecaa1117db19f41c97 (diff) | |
PE merge.
Diffstat (limited to 'indra/newview/skins/default')
4 files changed, 9 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml index ead5b8c8f2..e9099211a3 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml @@ -25,10 +25,6 @@ name="Title"> Notecard: [NAME] </floater.string> - <floater.string - name="Save"> - Save - </floater.string> <icon follows="top|right" height="18" diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml index 7445bb339d..15517fb805 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml @@ -12,6 +12,10 @@ help_topic="profile_edit_pick" top="0" width="333"> + <panel.string + name="location_notice"> + (will update after save) + </panel.string> <button follows="top|right" height="23" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml index 3d434361b9..eb2112c586 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -337,6 +337,7 @@ top_pad="5" width="400" /> <text + name="show_ims_in_label" follows="left|top" layout="topleft" left="30" @@ -346,6 +347,7 @@ Show IMs in: </text> <text + name="requires_restart_label" follows="left|top" layout="topleft" top_delta="0" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 1eaf77c328..48fa5dd44f 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3015,4 +3015,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="unread_chat_multiple"> [SOURCES] have said something new </string>" + + <string name="paid_you_ldollars">"paid you L$"</string>" + </strings> |