From 27a76a7e731bd13fb5d0862a932f40ea5c9c7119 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Wed, 12 Sep 2018 17:05:27 -0700
Subject: SL-1402, SL-1193, SL-976: Corrected strings and layout for named bugs
 ("Use Shared Environment", no selection format in panel, Missing String in
 give object) Also Rider learned how to spell Committed

---
 indra/newview/skins/default/xui/en/menu_viewer.xml              | 4 ++--
 indra/newview/skins/default/xui/en/panel_region_environment.xml | 6 ++----
 indra/newview/skins/default/xui/en/strings.xml                  | 6 +++---
 3 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index b6bc271cf1..8af754ffec 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -698,8 +698,8 @@
                  parameter="midnight" />
             </menu_item_check>
             <menu_item_check
-             label="Use Region Settings"
-             name="Use Region Settings">
+             label="Use Shared Environment"
+             name="Use Shared Environment">
                 <menu_item_check.on_click
                  function="World.EnvSettings"
                  parameter="region" />
diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml
index 8229dcb91d..a58f38d417 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -26,13 +26,11 @@
                 name="pnl_environment_disabled"
                 visible="false">
             <text follows="top|left|bottom|right"
-                            font="SansSerif"
                             halign="center"
                             valign="top"
-                            top_pad="20"
+                            top_pad="40"
                             text_color="white">
-No Parcel parcel is selected. Environmental 
-settings are disabled.
+No parcel is selected. Environmental settings are disabled.
             </text>
         </layout_panel>
         <layout_panel 
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 3a882a73d3..76d040150d 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -404,9 +404,9 @@ http://secondlife.com/support for help fixing this problem.
 	<string name="simstate">simstate</string>
 	<string name="favorite">favorite</string>
 	<string name="symbolic link">link</string>
-	<string name="symbolic folder link">folder link</string>
-  <string name="mesh">mesh</string>
-  <string name="settings">settings</string>
+    <string name="settings blob">settings</string>
+    <string name="symbolic folder link">folder link</string>
+    <string name="mesh">mesh</string>
   
 	<!-- llvoavatar. Displayed in the avatar chat bubble -->
 	<string name="AvatarEditingAppearance">(Editing Appearance)</string>
-- 
cgit v1.2.3