Commits

nat_linden  committed 4770cab

Reinstate "Need help logging in?" link rather than question-diamond.
Revert to corresponding original login_help text for each affected language.

  • Participants
  • Parent commits 951b7b4

Comments (0)

Files changed (12)

File indra/newview/skins/default/xui/da/panel_login.xml

 				<combo_box.item label="Hjem" name="MyHome"/>
 				<combo_box.item label="&lt;Indtast regionnavn&gt;" name="Typeregionname"/>
 			</combo_box>
+			<text name="login_help">
+				Hjælp til login
+			</text>
 			<text name="forgot_password_text">
 				Har du glemt brugernavn eller password?
 			</text>

File indra/newview/skins/default/xui/de/panel_login.xml

 				<combo_box.item label="Mein Zuhause" name="MyHome"/>
 				<combo_box.item label="&lt;Region eingeben&gt;" name="Typeregionname"/>
 			</combo_box>
+			<text name="login_help">
+				Sie brauchen Hilfe?
+			</text>
 			<text name="forgot_password_text">
 				Benutzernamen oder Kennwort vergessen?
 			</text>
-			<text name="login_help" left="410">&#xFFFD;</text>
 		</layout_panel>
 		<layout_panel name="links">
 			<text name="create_account_text">

File indra/newview/skins/default/xui/en/panel_login.xml

 label="&lt;Type region name&gt;"
 name="Typeregionname"   value="" />
 </combo_box>
-<text
-follows="left|bottom"
-font="SansSerif"
-font.style="BOLD"
-font.size="Large"
-text_color="EmphasisColor"
-left="370"
-name="login_help"
-top="32"
-width="16">
- &#xFFFD;
-</text>
 <combo_box
 allow_text_entry="true"
 font="SansSerifSmall"
 follows="left|bottom"
 font="SansSerifSmall"
 text_color="EmphasisColor"
+left="630"
+name="login_help"
+top="19"
+width="280">
+       Need help logging in?
+</text>
+<text
+follows="left|bottom"
+font="SansSerifSmall"
+text_color="EmphasisColor"
 height="16"
 name="forgot_password_text"
 top="35"
-left="630"
-  width="280">
+width="280">
        Forgot your username or password?
 </text>
 <button

File indra/newview/skins/default/xui/es/panel_login.xml

 				<combo_box.item label="Mi Base" name="MyHome"/>
 				<combo_box.item label="&lt;Escribe en qué región&gt;" name="Typeregionname"/>
 			</combo_box>
+			<text name="login_help">
+				¿Necesitas ayuda para conectarte?
+			</text>
 			<text name="forgot_password_text">
 				¿Olvidaste el nombre de usuario o la contraseña?
 			</text>
-			<text name="login_help" left="400">
-				&#xFFFD;
-			</text>
 		</layout_panel>
 		<layout_panel name="links">
 			<text name="create_account_text">

File indra/newview/skins/default/xui/fr/panel_login.xml

 				<combo_box.item label="Domicile" name="MyHome"/>
 				<combo_box.item label="&lt;Saisir le nom de la région&gt;" name="Typeregionname"/>
 			</combo_box>
+			<text name="login_help">
+				Besoin d&apos;aide ?
+			</text>
 			<text name="forgot_password_text">
 				Nom d&apos;utilisateur ou mot de passe oublié ?
 			</text>
-			<text name="login_help" left="410">
-				&#xFFFD;
-			</text>
 		</layout_panel>
 		<layout_panel name="links">
 			<text name="create_account_text">

File indra/newview/skins/default/xui/it/panel_login.xml

 				<combo_box.item label="Casa mia" name="MyHome"/>
 				<combo_box.item label="&lt;Scrivi nome regione&gt;" name="Typeregionname"/>
 			</combo_box>
+			<text name="login_help">
+				Ti serve aiuto con la fase di accesso?
+			</text>
 			<text name="forgot_password_text">
 				Hai dimenticato il nome utente o la password?
 			</text>

File indra/newview/skins/default/xui/ja/panel_login.xml

 				<combo_box.item label="ホーム" name="MyHome"/>
 				<combo_box.item label="<地域名を入力>" name="Typeregionname"/>
 			</combo_box>
+			<text name="login_help">
+				ログインの方法
+			</text>
 			<text name="forgot_password_text">
 				ユーザー名またはパスワードをお忘れですか?
 			</text>

File indra/newview/skins/default/xui/pl/panel_login.xml

 				<combo_box.item label="Moje Miejsce Startu" name="MyHome"/>
 				<combo_box.item label="&lt;Wpisz Region&gt;" name="Typeregionname"/>
 			</combo_box>
+			<text name="login_help">
+				Potrzebujesz pomocy z logowaniem się?
+			</text>
 			<text name="forgot_password_text">
 				Zapomniałeś swojej nazwy użytkownika lub hasła?
 			</text>
-			<text name="login_help" left="395">
-				&#xFFFD;
-			</text>
 		</layout_panel>
 		<layout_panel name="links">
 			<text name="create_account_text">

File indra/newview/skins/default/xui/pt/panel_login.xml

 				<combo_box.item label="Última posição" name="MyLastLocation"/>
 				<combo_box.item label="Meu início" name="MyHome"/>
 			</combo_box>
+			<text name="login_help">
+				Precisa de ajuda ao conectar?
+			</text>
 			<text name="forgot_password_text">
 				Esqueceu seu nome ou senha?
 			</text>
-			<text name="login_help" left="400">
-				&#xFFFD;
-			</text>
 		</layout_panel>
 		<layout_panel name="links">
 			<text name="create_account_text">

File indra/newview/skins/default/xui/ru/panel_login.xml

 				<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">

File indra/newview/skins/default/xui/tr/panel_login.xml

 				<combo_box.item label="Ana Konumum" name="MyHome"/>
 				<combo_box.item label="&lt;Bölge adını girin&gt;" name="Typeregionname"/>
 			</combo_box>
+			<text name="login_help">
+				Oturum açarken yardım mı gerekiyor?
+			</text>
 			<text name="forgot_password_text">
 				Kullanıcı adınızı veya parolanızı mı unuttunuz?
 			</text>
-			<text name="login_help" left="410">
-				&#xFFFD;
-			</text>
 		</layout_panel>
 		<layout_panel name="links">
 			<text name="create_account_text">

File indra/newview/skins/default/xui/zh/panel_login.xml

 				<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>