From eb15b6f93618f34516e00d3ba96237fde8663f58 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 28 Jun 2012 17:55:10 -0400
Subject: Remove redundant "create_account_url" string from panel_login.xml. We
 already have a "create_account_url" string in strings.xml, and in fact --
 according to Eli -- the strings.xml values are "better" for non-English
 languages. Unfortunately those "better" strings weren't being used. They were
 tied to the FirstRun notification, which seems to have been disengaged.
 Changed llpanellogin.cpp to look in strings.xml rather than panel_login.xml
 when clicking the "Sign Up" link on the login panel.

---
 indra/newview/skins/default/xui/ru/panel_login.xml | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'indra/newview/skins/default/xui/ru/panel_login.xml')

diff --git a/indra/newview/skins/default/xui/ru/panel_login.xml b/indra/newview/skins/default/xui/ru/panel_login.xml
index 7928191fa6..4edf976339 100644
--- a/indra/newview/skins/default/xui/ru/panel_login.xml
+++ b/indra/newview/skins/default/xui/ru/panel_login.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_login">
-	<panel.string name="create_account_url">
-		http://join.secondlife.com/
-	</panel.string>
 	<panel.string name="forgot_password_url">
 		http://secondlife.com/account/request.php
 	</panel.string>
-- 
cgit v1.2.3


From da69ec0138c818cd5c0668b10ec977d87a10fdd3 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 13 Jul 2012 16:20:39 -0400
Subject: Try to adapt non-English panel_login.xml files for Leo's new layout.
 en/panel_login.xml had to be changed to enlarge certain fields for other
 languages (rather than overriding sizes in each of several other languages).
 Still need to translate new create_account_text and verify guessed
 log_in_text.

---
 indra/newview/skins/default/xui/ru/panel_login.xml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'indra/newview/skins/default/xui/ru/panel_login.xml')

diff --git a/indra/newview/skins/default/xui/ru/panel_login.xml b/indra/newview/skins/default/xui/ru/panel_login.xml
index 4edf976339..3a8ce2ca5a 100644
--- a/indra/newview/skins/default/xui/ru/panel_login.xml
+++ b/indra/newview/skins/default/xui/ru/panel_login.xml
@@ -5,6 +5,9 @@
 	</panel.string>
 	<layout_stack name="login_widgets">
 		<layout_panel name="login">
+			<text name="log_in_text">
+				ВОЙТИ
+			</text>
 			<text name="username_text">
 				Имя пользователя:
 			</text>
@@ -29,17 +32,18 @@
 				<combo_box.item label="Мой дом" name="MyHome"/>
 				<combo_box.item label="&lt;Введите название региона&gt;" name="Typeregionname"/>
 			</combo_box>
-		</layout_panel>
-		<layout_panel name="links">
-			<text name="create_new_account_text">
-				Регистрация
-			</text>
 			<text name="forgot_password_text">
 				Забыли имя или пароль?
 			</text>
-			<text name="login_help">
-				Нужна помощь при входе?
+			<text name="login_help" left="410">
+				☠
+			</text>
+		</layout_panel>
+		<layout_panel name="links">
+			<text name="create_account_text">
+				CREATE YǾUR ACCǾUNT
 			</text>
+			<button name="create_new_account_btn" label="Регистрация"/>
 		</layout_panel>
 	</layout_stack>
 </panel>
-- 
cgit v1.2.3


From 5a1cbb1ef68a255074fdcb15815ca5aa4d3b5265 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 16 Jul 2012 21:59:13 -0400
Subject: Use question-mark-in-diamond for help, rather than skull&crossbones.

---
 indra/newview/skins/default/xui/ru/panel_login.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/ru/panel_login.xml')

diff --git a/indra/newview/skins/default/xui/ru/panel_login.xml b/indra/newview/skins/default/xui/ru/panel_login.xml
index 3a8ce2ca5a..72ae345ef5 100644
--- a/indra/newview/skins/default/xui/ru/panel_login.xml
+++ b/indra/newview/skins/default/xui/ru/panel_login.xml
@@ -36,7 +36,7 @@
 				Забыли имя или пароль?
 			</text>
 			<text name="login_help" left="410">
-				☠
+				&#xFFFD;
 			</text>
 		</layout_panel>
 		<layout_panel name="links">
-- 
cgit v1.2.3


From 149598bd57ad7a0e6703c49355c6d51ba4c55202 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 17 Jul 2012 16:24:58 -0400
Subject: Reinstate "Need help logging in?" link rather than question-diamond.
 Revert to corresponding original login_help text for each affected language.

---
 indra/newview/skins/default/xui/ru/panel_login.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui/ru/panel_login.xml')

diff --git a/indra/newview/skins/default/xui/ru/panel_login.xml b/indra/newview/skins/default/xui/ru/panel_login.xml
index 72ae345ef5..5b751e4f92 100644
--- a/indra/newview/skins/default/xui/ru/panel_login.xml
+++ b/indra/newview/skins/default/xui/ru/panel_login.xml
@@ -32,12 +32,12 @@
 				<combo_box.item label="Мой дом" name="MyHome"/>
 				<combo_box.item label="&lt;Введите название региона&gt;" name="Typeregionname"/>
 			</combo_box>
+			<text name="login_help">
+				Нужна помощь при входе?
+			</text>
 			<text name="forgot_password_text">
 				Забыли имя или пароль?
 			</text>
-			<text name="login_help" left="410">
-				&#xFFFD;
-			</text>
 		</layout_panel>
 		<layout_panel name="links">
 			<text name="create_account_text">
-- 
cgit v1.2.3


From f7449bdc570e97a2ded2864779c72cce7f52e608 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 18 Jul 2012 14:47:16 -0400
Subject: Make "Log In" button (etc.) move with start/grid combo visibility.
 The "Start at:" combo box and the grid-selector box can be turned on and off
 with checkboxes on the Preferences floater. Break the bottom-left
 layout_panel on panel_login into several different layout_panels so when
 these UI elements disappear, other controls move left to fill the holes.
 Similarly, when you turn on either or both of the UI elements in question,
 the remaining controls in that general bottom-left area move right to
 accommodate. Tweak C++ and non-English panel_login.xml overrides to reflect
 widgets' containment in new layout_panel elements. Discard obsolete
 "mode_selection_text" and "mode_combo" translations from non- English
 panel_login.xml overrides.

---
 indra/newview/skins/default/xui/ru/panel_login.xml | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'indra/newview/skins/default/xui/ru/panel_login.xml')

diff --git a/indra/newview/skins/default/xui/ru/panel_login.xml b/indra/newview/skins/default/xui/ru/panel_login.xml
index 5b751e4f92..7ead924c1f 100644
--- a/indra/newview/skins/default/xui/ru/panel_login.xml
+++ b/indra/newview/skins/default/xui/ru/panel_login.xml
@@ -15,15 +15,8 @@
 			<text name="password_text">
 				Пароль:
 			</text>
-			<check_box label="Запомнить пароль" name="remember_check"/>
-			<button label="Войти" name="connect_btn"/>
-			<text name="mode_selection_text">
-				Режим:
-			</text>
-			<combo_box name="mode_combo" tool_tip="Выберите режим. Основной – для быстрого и простого ознакомления с игрой, а также общения. Расширенный – для доступа к более широким возможностям.">
-				<combo_box.item label="Основной" name="Basic"/>
-				<combo_box.item label="Расширенный" name="Advanced"/>
-			</combo_box>
+		</layout_panel>
+		<layout_panel name="start_location_panel">
 			<text name="start_location_text">
 				Место старта:
 			</text>
@@ -32,12 +25,16 @@
 				<combo_box.item label="Мой дом" name="MyHome"/>
 				<combo_box.item label="&lt;Введите название региона&gt;" name="Typeregionname"/>
 			</combo_box>
+		</layout_panel>
+		<layout_panel name="links_login_panel">
 			<text name="login_help">
 				Нужна помощь при входе?
 			</text>
 			<text name="forgot_password_text">
 				Забыли имя или пароль?
 			</text>
+			<button label="Войти" name="connect_btn"/>
+			<check_box label="Запомнить пароль" name="remember_check"/>
 		</layout_panel>
 		<layout_panel name="links">
 			<text name="create_account_text">
-- 
cgit v1.2.3


From 8b857580a82ba1b77318174df324d5ae244441be Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Mon, 10 Sep 2012 12:58:53 -0700
Subject: FIX INTL-104 Translation of Set34 in 8 languages, including Steam
 content

---
 indra/newview/skins/default/xui/ru/panel_login.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/ru/panel_login.xml')

diff --git a/indra/newview/skins/default/xui/ru/panel_login.xml b/indra/newview/skins/default/xui/ru/panel_login.xml
index 7ead924c1f..f0877731c6 100644
--- a/indra/newview/skins/default/xui/ru/panel_login.xml
+++ b/indra/newview/skins/default/xui/ru/panel_login.xml
@@ -38,9 +38,9 @@
 		</layout_panel>
 		<layout_panel name="links">
 			<text name="create_account_text">
-				CREATE YǾUR ACCǾUNT
+				СОЗДАЙТЕ СВОЙ АККАУНТ
 			</text>
-			<button name="create_new_account_btn" label="Регистрация"/>
+			<button label="Начать" name="create_new_account_btn"/>
 		</layout_panel>
 	</layout_stack>
 </panel>
-- 
cgit v1.2.3


From bf6182daa8b4d7cea79310547f71d7a3155e17b0 Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Fri, 29 Mar 2013 07:50:08 -0700
Subject: Update Mac and Windows breakpad builds to latest

---
 indra/newview/skins/default/xui/ru/panel_login.xml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 indra/newview/skins/default/xui/ru/panel_login.xml

(limited to 'indra/newview/skins/default/xui/ru/panel_login.xml')

diff --git a/indra/newview/skins/default/xui/ru/panel_login.xml b/indra/newview/skins/default/xui/ru/panel_login.xml
old mode 100644
new mode 100755
-- 
cgit v1.2.3