summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/skins/default/xui/en/floater_preferences.xml2
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml6
-rw-r--r--indra/newview/skins/default/xui/en/panel_main_inventory.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_alerts.xml4
-rw-r--r--indra/newview/skins/default/xui/en/sidepanel_appearance.xml5
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml2
6 files changed, 9 insertions, 12 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 &apos;[_NAME]&apos; was not found in notifications.xml.
+Error details: The notification called &apos;[_NAME]&apos; was not found in notifications.xml.
<usetemplate
name="okbutton"
yestext="OK"/>
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 812801abc9..9990215dfd 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -31,10 +31,8 @@ halign="center"
layout="topleft"
left_delta="-4"
name="inventory filter tabs"
- tab_min_width="70"
tab_height="30"
tab_position="top"
- tab_height="30"
tab_min_width="100"
top_pad="4"
width="305">
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/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index c457dcb526..3dac1a9614 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -119,8 +119,8 @@ left="0"
image_disabled="AddItem_Disabled"
layout="topleft"
left_pad="5"
- name="add_btn"
- tool_tip="Add new item"
+ name="newlook_btn"
+ tool_tip="Add new outfit"
width="18" />
<dnd_button
follows="bottom|left"
@@ -150,7 +150,6 @@ left="0"
layout="topleft"
left_pad="5"
right="-10"
- name="newlook_btn"
width="100" />-->
<panel
class="panel_look_info"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 58aa609bd6..d5022de089 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2216,7 +2216,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.