diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-03-16 10:19:37 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-03-16 10:19:37 -0400 |
| commit | ba414d500ca8cb88da530c89ba373c95195ce633 (patch) | |
| tree | 7101caf69a2d609d04f1352ad2f01c8d310e6228 /indra/newview/skins/default/xui/en | |
| parent | 43f1abee2b7c8f2a1615ee98074b024156392dd9 (diff) | |
| parent | 9bdf262d8511e84c2425e48a466b60f185516c76 (diff) | |
automated merge viewer2.0->viewe2.0
Diffstat (limited to 'indra/newview/skins/default/xui/en')
7 files changed, 17 insertions, 33 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/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index a2540237c8..5680b91c05 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5379,27 +5379,6 @@ Grant this request? </form> </notification> - <notification - icon="notify.tga" - name="ScriptToast" - type="notify"> - [FIRST] [LAST]'s '[TITLE]' is requesting Resident input. - <form name="form"> - <button - index="0" - name="Open" - text="Open Dialog"/> - <button - index="1" - name="Ignore" - text="Ignore"/> - <button - index="2" - name="Block" - text="Block"/> - </form> - </notification> - <!-- <notification icon="notify.tga" 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_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml index 1e7c51259c..9e5ef10d42 100644 --- a/indra/newview/skins/default/xui/en/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml @@ -353,7 +353,7 @@ left_pad="12" name="rating_label" value="Rating:" - width="60" /> + width="90" /> <text follows="left|right|top" height="16" @@ -380,7 +380,7 @@ name="voice_label" top_delta="0" value="Voice:" - width="60" /> + width="90" /> <text follows="left|right|top" height="18" @@ -406,7 +406,7 @@ left_pad="8" name="fly_label" value="Fly:" - width="60" /> + width="90" /> <text follows="left|right|top" height="16" @@ -432,7 +432,7 @@ left_pad="8" name="push_label" value="Push:" - width="60" /> + width="90" /> <text follows="left|right|top" height="14" @@ -458,7 +458,7 @@ left_pad="8" name="build_label" value="Build:" - width="60" /> + width="90" /> <text follows="left|right|top" height="15" @@ -484,7 +484,7 @@ left_pad="8" name="scripts_label" value="Scripts:" - width="60" /> + width="90" /> <text follows="left|right|top" height="14" @@ -510,7 +510,7 @@ left_pad="8" name="damage_label" value="Damage:" - width="60" /> + width="90" /> <text follows="left|right|top" height="14" 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/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml index 433b7691fa..d46783e058 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml @@ -303,7 +303,7 @@ follows="left|top|right" layout="topleft" name="perm_modify" - width="200"> + width="310"> You can modify this object </text> <text 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> |