From 28b1264c57bfca2d88b9e64c0fdfe64c22189ebf Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Tue, 16 Mar 2010 14:28:47 +0200
Subject: Fixed critical bug EXT-6318 [TRUNCATION] [EN XUI REWORK] - Talk
 button is truncated "Sprechen". need xui designer to widen it by some 10
 pixels * restored Speak button shrink feature * redesigned Speak button to
 accommodate label in 'de' locale ** made it wider to 5 px ** made label
 left-aligned ** set left padding to 12px

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/36/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_bottomtray.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 015a2e91ff..e70a0512d6 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -59,9 +59,9 @@
          height="28"
          layout="topleft"
          min_height="28"
-         width="100"
+         width="105"
          top_delta="0"
-         min_width="100"
+         min_width="54"
          name="speak_panel"
          user_resize="false">
           <talk_button
@@ -73,11 +73,13 @@
            left="0"
            name="talk"
            top="5"
-          width="100">
+          width="105">
   <speak_button
+    halign="left"
     name="speak_btn"
     label="Speak"
     label_selected="Speak"
+    pad_left="12"
     />
               <show_button>
                   <show_button.init_callback
-- 
cgit v1.2.3


From 04e692b3f1fbd98bc9fabc76e258c89b95458468 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Tue, 16 Mar 2010 14:45:12 +0200
Subject: Fixed bug EXT-6007 ([STRING IN EN] - While loading Second Life
 several messages need to be localized). Reviewed by Richard:
 https://codereview.productengine.com/secondlife/r/31/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/strings.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 48fa5dd44f..4940c2f5d9 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -14,7 +14,14 @@
 
 	<!-- starting up -->
 	<string name="StartupDetectingHardware">Detecting hardware...</string>
-	<string name="StartupLoading">Loading</string>
+	<string name="StartupLoading">Loading [APP_NAME]...</string>
+	<string name="StartupClearingCache">Clearing cache...</string>
+	<string name="StartupInitializingTextureCache">Initializing Texture Cache...</string>
+	<string name="StartupInitializingVFS">Initializing VFS...</string>
+
+	<!--  progress -->
+	<string name="ProgressRestoring">Restoring...</string>
+	<string name="ProgressChangingResolution">Changing Resolution...</string>
 
 	<!-- Legacy strings, almost never used -->
 	<string name="Fullbright">Fullbright (Legacy)</string>	<!-- used in the Build > materials dropdown-->
@@ -45,6 +52,9 @@
 
 	<!-- Disconnection -->
 	<string name="AgentLostConnection">This region may be experiencing trouble.  Please check your connection to the Internet.</string>
+	<string name="SavingSettings">Saving your settings...</string>
+	<string name="LoggingOut">Logging out...</string>
+	<string name="ShuttingDown">Shutting down...</string>
 
 
 	<!-- Tooltip, lltooltipview.cpp -->
-- 
cgit v1.2.3


From 5675afccbb30d44f367dd50d99b41fcf64c9c4f9 Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Tue, 16 Mar 2010 14:49:20 +0200
Subject: fixed  EXT-6363 [HARD CODED] "Login Failed." is hardcoded

moved out "Login failed." to strings.xml

Reviewed by Q at https://codereview.productengine.com/secondlife/r/27/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 4940c2f5d9..4b9140ee90 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -47,6 +47,7 @@
 	<string name="LoginConnectingToRegion">Connecting to region...</string>
 	<string name="LoginDownloadingClothing">Downloading clothing...</string>
 	<string name="LoginFailedNoNetwork">Network Error: Could not establish connection, please check your network connection.</string>
+	<string name="LoginFailed">Login failed.</string>
 	<string name="Quit">Quit</string>
 	<string name="create_account_url">http://join.secondlife.com/</string>
 
-- 
cgit v1.2.3


From a872814de964ebcbf40e812f79319a13a54e2336 Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Tue, 16 Mar 2010 14:51:56 +0200
Subject: fixed EXT-6322 [NAMELESS XUI STRING] Nearby Media> Detail window -
 "Nearby Media" "Show:" and "On other Avatars"

fixed "name" attributes

Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/37/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_nearby_media.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_nearby_media.xml b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
index 7c0ce9e62e..d14712a7fa 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
@@ -95,6 +95,7 @@
 		follows="top|left"
 		font="SansSerif"
 		left="10"
+		name="nearby_media"
 		width="100">
 	  Nearby Media
 	</text>
@@ -105,6 +106,7 @@
 		font="SansSerif"
 		top_pad="15"
 		left="10"
+		name="show"
 		width="40">
 	  Show:
 	</text>
@@ -130,7 +132,7 @@
 	  <combo_box.item
 		  label="On other Avatars"
 		  value="4"
-		  ame="OnOthers" />
+		  name="OnOthers" />
 	</combo_box>
 	<scroll_list
 		name="media_list"
@@ -179,6 +181,7 @@
 		top_pad="5"
 		height="30"
 		left="10"
+		name="media_controls_panel"
 		right="-10">
 	  <layout_stack
 		  name="media_controls"
-- 
cgit v1.2.3