diff options
| author | Lis Pardi <lis@lindenlab.com> | 2009-12-09 16:35:15 -0500 |
|---|---|---|
| committer | Lis Pardi <lis@lindenlab.com> | 2009-12-09 16:35:15 -0500 |
| commit | 1c0b5d4435e30dbfa5865ad212b3ca2a391d43ee (patch) | |
| tree | 17901432956ed4958547c0d75106f0f37f3a8c5b | |
| parent | 7193e97b982d69de75ee6bb5769f5e53ccfb517d (diff) | |
| parent | 3b36b1fd2acbafd30242ad63e1c0c8d2038d8fdf (diff) | |
Automated merge with ssh://lis@hg.lindenlab.com/james/gooey
4 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml index d182cdc6bb..15655a920e 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences.xml @@ -86,7 +86,7 @@ <panel class="panel_preference" filename="panel_preferences_alerts.xml" - label="Alerts" + label="Notifications" layout="topleft" help_topic="preferences_msgs_tab" name="msgs" /> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index a07b23d0c3..3659db230c 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -100,11 +100,11 @@ functor="GenericAcknowledge" icon="alertmodal.tga" name="MissingAlert" - label="Unknown Alert Message" + label="Unknown Notification Message" type="alertmodal"> -Your version of [APP_NAME] does not know how to display the alert it just received. Please verify that you have the latest Viewer installed. +Your version of [APP_NAME] does not know how to display the notification it just received. Please verify that you have the latest Viewer installed. -Error details: The alert called '[_NAME]' was not found in notifications.xml. +Error details: The notification called '[_NAME]' was not found in notifications.xml. <usetemplate name="okbutton" yestext="OK"/> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml index d4f4053dad..18d0f8acab 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml @@ -50,7 +50,7 @@ name="show_label" top_pad="14" width="450"> - Always show these alerts: + Always show these notifications: </text> <scroll_list follows="top|left" @@ -107,7 +107,7 @@ name="dont_show_label" top_pad="10" width="450"> - Never show these alerts: + Never show these notifications: </text> <scroll_list follows="top|left" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 7fafa63e57..34ad6ab797 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2215,7 +2215,7 @@ If this message persists, restart your computer. [APP_NAME] appears to have frozen or crashed on the previous run. Would you like to send a crash report? </string> - <string name="MBAlert">Alert</string> + <string name="MBAlert">Notification</string> <string name="MBNoDirectX"> [APP_NAME] is unable to detect DirectX 9.0b or greater. [APP_NAME] uses DirectX to detect hardware and/or outdated drivers that can cause stability problems, poor performance and crashes. While you can run [APP_NAME] without it, we highly recommend running with DirectX 9.0b. |