diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2012-07-17 16:24:58 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2012-07-17 16:24:58 -0400 |
commit | 149598bd57ad7a0e6703c49355c6d51ba4c55202 (patch) | |
tree | a96a6b27d9acb6642070282d63849a9c08b02748 /indra/newview | |
parent | 5a1cbb1ef68a255074fdcb15815ca5aa4d3b5265 (diff) |
Reinstate "Need help logging in?" link rather than question-diamond.
Revert to corresponding original login_help text for each affected language.
Diffstat (limited to 'indra/newview')
12 files changed, 44 insertions, 33 deletions
diff --git a/indra/newview/skins/default/xui/da/panel_login.xml b/indra/newview/skins/default/xui/da/panel_login.xml index a5b101efc4..c2fd3c44c7 100644 --- a/indra/newview/skins/default/xui/da/panel_login.xml +++ b/indra/newview/skins/default/xui/da/panel_login.xml @@ -32,6 +32,9 @@ <combo_box.item label="Hjem" name="MyHome"/> <combo_box.item label="<Indtast regionnavn>" 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> diff --git a/indra/newview/skins/default/xui/de/panel_login.xml b/indra/newview/skins/default/xui/de/panel_login.xml index 6904ace5f8..26fbc64ab6 100644 --- a/indra/newview/skins/default/xui/de/panel_login.xml +++ b/indra/newview/skins/default/xui/de/panel_login.xml @@ -32,10 +32,12 @@ <combo_box.item label="Mein Zuhause" name="MyHome"/> <combo_box.item label="<Region eingeben>" 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">�</text> </layout_panel> <layout_panel name="links"> <text name="create_account_text"> diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index b26ec31c30..8a1dd6750b 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -135,18 +135,6 @@ name="MyHome" label="<Type region name>" 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"> - � -</text> <combo_box allow_text_entry="true" font="SansSerifSmall" @@ -164,11 +152,20 @@ width="135" 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 diff --git a/indra/newview/skins/default/xui/es/panel_login.xml b/indra/newview/skins/default/xui/es/panel_login.xml index f7d436f76e..5fb7ea1b10 100644 --- a/indra/newview/skins/default/xui/es/panel_login.xml +++ b/indra/newview/skins/default/xui/es/panel_login.xml @@ -32,12 +32,12 @@ <combo_box.item label="Mi Base" name="MyHome"/> <combo_box.item label="<Escribe en qué región>" 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"> - � - </text> </layout_panel> <layout_panel name="links"> <text name="create_account_text"> diff --git a/indra/newview/skins/default/xui/fr/panel_login.xml b/indra/newview/skins/default/xui/fr/panel_login.xml index e40cde79cc..ccc8be05b8 100644 --- a/indra/newview/skins/default/xui/fr/panel_login.xml +++ b/indra/newview/skins/default/xui/fr/panel_login.xml @@ -32,12 +32,12 @@ <combo_box.item label="Domicile" name="MyHome"/> <combo_box.item label="<Saisir le nom de la région>" name="Typeregionname"/> </combo_box> + <text name="login_help"> + Besoin d'aide ? + </text> <text name="forgot_password_text"> Nom d'utilisateur ou mot de passe oublié ? </text> - <text name="login_help" left="410"> - � - </text> </layout_panel> <layout_panel name="links"> <text name="create_account_text"> diff --git a/indra/newview/skins/default/xui/it/panel_login.xml b/indra/newview/skins/default/xui/it/panel_login.xml index 42ae3a47ae..2019eadc70 100644 --- a/indra/newview/skins/default/xui/it/panel_login.xml +++ b/indra/newview/skins/default/xui/it/panel_login.xml @@ -32,6 +32,9 @@ <combo_box.item label="Casa mia" name="MyHome"/> <combo_box.item label="<Scrivi nome regione>" 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> diff --git a/indra/newview/skins/default/xui/ja/panel_login.xml b/indra/newview/skins/default/xui/ja/panel_login.xml index 77d42e8ee3..f883d65a92 100644 --- a/indra/newview/skins/default/xui/ja/panel_login.xml +++ b/indra/newview/skins/default/xui/ja/panel_login.xml @@ -32,6 +32,9 @@ <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> diff --git a/indra/newview/skins/default/xui/pl/panel_login.xml b/indra/newview/skins/default/xui/pl/panel_login.xml index 833610a76b..c21d9bc684 100644 --- a/indra/newview/skins/default/xui/pl/panel_login.xml +++ b/indra/newview/skins/default/xui/pl/panel_login.xml @@ -32,12 +32,12 @@ <combo_box.item label="Moje Miejsce Startu" name="MyHome"/> <combo_box.item label="<Wpisz Region>" 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"> - � - </text> </layout_panel> <layout_panel name="links"> <text name="create_account_text"> diff --git a/indra/newview/skins/default/xui/pt/panel_login.xml b/indra/newview/skins/default/xui/pt/panel_login.xml index d457816902..0b99e2a70e 100644 --- a/indra/newview/skins/default/xui/pt/panel_login.xml +++ b/indra/newview/skins/default/xui/pt/panel_login.xml @@ -31,12 +31,12 @@ <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"> - � - </text> </layout_panel> <layout_panel name="links"> <text name="create_account_text"> 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="<Введите название региона>" name="Typeregionname"/> </combo_box> + <text name="login_help"> + Нужна помощь при входе? + </text> <text name="forgot_password_text"> Забыли имя или пароль? </text> - <text name="login_help" left="410"> - � - </text> </layout_panel> <layout_panel name="links"> <text name="create_account_text"> diff --git a/indra/newview/skins/default/xui/tr/panel_login.xml b/indra/newview/skins/default/xui/tr/panel_login.xml index dffa0e9058..2628755fe2 100644 --- a/indra/newview/skins/default/xui/tr/panel_login.xml +++ b/indra/newview/skins/default/xui/tr/panel_login.xml @@ -32,12 +32,12 @@ <combo_box.item label="Ana Konumum" name="MyHome"/> <combo_box.item label="<Bölge adını girin>" 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"> - � - </text> </layout_panel> <layout_panel name="links"> <text name="create_account_text"> diff --git a/indra/newview/skins/default/xui/zh/panel_login.xml b/indra/newview/skins/default/xui/zh/panel_login.xml index 9d00f302da..ef501f3f88 100644 --- a/indra/newview/skins/default/xui/zh/panel_login.xml +++ b/indra/newview/skins/default/xui/zh/panel_login.xml @@ -32,6 +32,9 @@ <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> |