diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-08-08 18:27:52 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-08-08 18:27:52 -0400 |
| commit | 559b39c5d133ef1adf7b8db8b5ff67c2f196172e (patch) | |
| tree | 0c95aec32ed7851e33c8a639654dc6a35c742a5d /indra/newview/skins/default/xui | |
| parent | 337976096530729a7d671df68907cd59a7986972 (diff) | |
| parent | 2d0e91125652561b6485ffb0ed48d820fcc5c373 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/skins/default/xui')
26 files changed, 295 insertions, 274 deletions
diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml index cf6f1ccdd9..33b876bdb9 100644 --- a/indra/newview/skins/default/xui/da/notifications.xml +++ b/indra/newview/skins/default/xui/da/notifications.xml @@ -481,7 +481,6 @@ Du kan bruge [SECOND_LIFE] normalt og andre personer vil se dig korrekt. [APP_NAME] installationen er færdig. Hvis det er første gang du bruger [SECOND_LIFE], skal du først oprette en konto for at logge på. -Vend tilbage til [http://join.secondlife.com secondlife.com] for at oprette en ny konto? </notification> <notification name="LoginPacketNeverReceived"> Der er problemer med at koble på. Der kan være et problem med din Internet forbindelse eller [SECOND_LIFE_GRID]. diff --git a/indra/newview/skins/default/xui/da/panel_login.xml b/indra/newview/skins/default/xui/da/panel_login.xml index 2e0f726e1a..b7cb76d4cb 100644 --- a/indra/newview/skins/default/xui/da/panel_login.xml +++ b/indra/newview/skins/default/xui/da/panel_login.xml @@ -1,13 +1,13 @@ <?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> <layout_stack name="login_widgets"> <layout_panel name="login"> + <text name="log_in_text"> + LOG PÅ + </text> <text name="username_text"> Brugernavn: </text> @@ -15,15 +15,8 @@ <text name="password_text"> Password: </text> - <check_box label="Husk password" name="remember_check"/> - <button label="Log på" name="connect_btn"/> - <text name="mode_selection_text"> - Tilstand: - </text> - <combo_box name="mode_combo" tool_tip="Vælg ønsket tilstand. Vælg basis for hurtig og nem udforskning og chat. Vælg avanceret for at få adgang til flere muligheder."> - <combo_box.item label="Basis" name="Basic"/> - <combo_box.item label="Avanceret" name="Advanced"/> - </combo_box> + </layout_panel> + <layout_panel name="start_location_panel"> <text name="start_location_text"> Start ved: </text> @@ -33,16 +26,21 @@ <combo_box.item label="<Indtast regionnavn>" name="Typeregionname"/> </combo_box> </layout_panel> - <layout_panel name="links"> - <text name="create_new_account_text"> - Opret bruger + <layout_panel name="links_login_panel"> + <text name="login_help"> + Hjælp til login </text> <text name="forgot_password_text"> Har du glemt brugernavn eller password? </text> - <text name="login_help"> - Hjælp til login + <button label="Log på" name="connect_btn"/> + <check_box label="Husk password" name="remember_check"/> + </layout_panel> + <layout_panel name="links"> + <text name="create_account_text"> + CREATE YǾUR ACCǾUNT </text> + <button name="create_new_account_btn" label="Opret bruger"/> </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml index f7274d31e1..a5923526e5 100644 --- a/indra/newview/skins/default/xui/de/notifications.xml +++ b/indra/newview/skins/default/xui/de/notifications.xml @@ -367,7 +367,7 @@ Sie müssen den Benutzernamen Ihres Avatars eingeben. Sie benötigen ein Konto, um [SECOND_LIFE] betreten zu können. Möchten Sie jetzt ein Konto erstellen? <url name="url"> - https://join.secondlife.com/index.php?lang=de-DE + [create_account_url] </url> <usetemplate name="okcancelbuttons" notext="Erneut versuchen" yestext="Neues Benutzerkonto anlegen"/> </notification> @@ -1190,7 +1190,6 @@ Sie können [SECOND_LIFE] normal verwenden. Andere Benutzer können Sie korrekt Installation von [APP_NAME] vollständig abgeschlossen. Falls Sie [SECOND_LIFE] zum ersten Mal verwenden, müssen Sie zuerst ein Konto erstellen, bevor Sie sich anmelden können. -Zurück zu [http://join.secondlife.com secondlife.com], um ein neues Konto zu erstellen? <usetemplate name="okcancelbuttons" notext="Weiter" yestext="Neues Konto..."/> </notification> <notification name="LoginPacketNeverReceived"> diff --git a/indra/newview/skins/default/xui/de/panel_login.xml b/indra/newview/skins/default/xui/de/panel_login.xml index 553bd3e2ff..2203b6d310 100644 --- a/indra/newview/skins/default/xui/de/panel_login.xml +++ b/indra/newview/skins/default/xui/de/panel_login.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="panel_login"> - <panel.string name="create_account_url"> - http://de.secondlife.com/registration/ - </panel.string> <panel.string name="forgot_password_url"> http://secondlife.com/account/request.php?lang=de </panel.string> <layout_stack name="login_widgets"> <layout_panel name="login"> + <text name="log_in_text"> + ANMELDEN + </text> <text name="username_text"> Benutzername: </text> @@ -15,15 +15,8 @@ <text name="password_text"> Kennwort: </text> - <check_box label="Kennwort merken" name="remember_check"/> - <button label="Anmelden" name="connect_btn"/> - <text name="mode_selection_text"> - Modus: - </text> - <combo_box name="mode_combo" tool_tip="Wählen Sie den gewünschten Modus aus. Basis: Second Life schnell und einfach erkunden und chatten. Erweitert: Zugriff auf zusätzliche Funktionen."> - <combo_box.item label="Basis" name="Basic"/> - <combo_box.item label="Erweitert" name="Advanced"/> - </combo_box> + </layout_panel> + <layout_panel name="start_location_panel"> <text name="start_location_text"> Hier anfangen: </text> @@ -33,16 +26,21 @@ <combo_box.item label="<Region eingeben>" name="Typeregionname"/> </combo_box> </layout_panel> - <layout_panel name="links"> - <text name="create_new_account_text"> - Registrieren + <layout_panel name="links_login_panel"> + <text name="login_help"> + Sie brauchen Hilfe? </text> <text name="forgot_password_text"> Benutzernamen oder Kennwort vergessen? </text> - <text name="login_help"> - Sie brauchen Hilfe? + <button label="Anmelden" name="connect_btn"/> + <check_box label="Kennwort merken" name="remember_check"/> + </layout_panel> + <layout_panel name="links"> + <text name="create_account_text"> + CREATE YǾUR ACCǾUNT </text> + <button name="create_new_account_btn" label="Registrieren"/> </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 13f073a1c2..7da676dae8 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -896,8 +896,7 @@ You need an account to enter [SECOND_LIFE]. Would you like to create one now? option="0" name="url" target = "_external"> - - http://join.secondlife.com/ + [create_account_url] </url> <usetemplate name="okcancelbuttons" @@ -2929,12 +2928,11 @@ You can use [SECOND_LIFE] normally and other people will see you correctly. [APP_NAME] installation is complete. If this is your first time using [SECOND_LIFE], you will need to create an account before you can log in. -Return to [http://join.secondlife.com secondlife.com] to create a new account? <tag>confirm</tag> <usetemplate name="okcancelbuttons" notext="Continue" - yestext="New Account..."/> + yestext="Create Account..."/> </notification> <notification diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index 44702c828f..9c96143aa3 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -7,11 +7,7 @@ name="panel_login" focus_root="true" top="600" - width="996"> - <panel.string - name="create_account_url"> - http://join.secondlife.com/ - </panel.string> + width="1130"> <string name="reg_in_client_url" translate="false"> http://secondlife.eniac15.lindenlab.com/reg-in-client/ </string> @@ -32,30 +28,43 @@ start_url="" top="0" height="600" - width="980"/> + width="996"/> <layout_stack + animate="false" follows="left|bottom|right" name="login_widgets" layout="topleft" orientation="horizontal" top="519" - width="996" + width="1130" height="80"> <layout_panel auto_resize="false" follows="left|bottom" name="login" layout="topleft" - width="705" - min_width="705" + width="310" + min_width="310" height="80"> <text follows="left|bottom" + font="SansSerif" + font.style="BOLD" + font.size="Large" + height="16" + name="log_in_text" + top="8" + left="15" + width="150"> + LOG IN + </text> + <text + follows="left|bottom" font="SansSerifSmall" height="16" name="username_text" - top="20" - left="20" + top="35" + left="15" width="150"> Username: </text> @@ -70,18 +79,20 @@ top_pad="0" name="username_combo" width="178"> +<!-- empirically, displayed width is 150 anyway?!? --> <combo_box.combo_button visible ="false"/> <combo_box.drop_down_button visible ="false"/> </combo_box> +<!-- left="175" based on actual "username_combo" width of 150 vs. 178 --> <text follows="left|bottom" font="SansSerifSmall" - height="15" - left_pad="-19" + height="16" name="password_text" - top="20" + top="35" + left="175" width="150"> Password: </text> @@ -94,34 +105,22 @@ select_on_focus="true" top_pad="0" width="135" /> - <check_box - control_name="RememberPassword" - follows="left|bottom" - font="SansSerifSmall" - height="16" - label="Remember password" - top_pad="3" - name="remember_check" - width="135" /> - <button - follows="left|bottom" - height="23" - image_unselected="PushButton_On" - image_selected="PushButton_On_Selected" - label="Log In" - label_color="White" - layout="topleft" - left_pad="10" - name="connect_btn" - top="35" - width="90" /> + </layout_panel> + <layout_panel + auto_resize="false" + follows="left|bottom" + name="start_location_panel" + layout="topleft" + width="175" + min_width="175" + height="80"> <text follows="left|bottom" font="SansSerifSmall" - height="15" - left_pad="8" + height="16" + left="10" name="start_location_text" - top="20" + top="35" width="130"> Start at: </text> @@ -129,7 +128,7 @@ allow_text_entry="true" control_name="NextLoginLocation" follows="left|bottom" - height="23" + height="22" max_chars="128" top_pad="0" name="start_location_combo" @@ -146,60 +145,112 @@ label="<Type region name>" name="Typeregionname" value="" /> </combo_box> + </layout_panel> + <layout_panel + auto_resize="false" + follows="left|bottom" + name="grid_panel" + layout="topleft" + width="145" + height="80" + visible="false"> <combo_box allow_text_entry="false" font="SansSerifSmall" follows="left|right|bottom" height="23" max_chars="256" + left="10" + top="51" layout="topleft" top_pad="2" name="server_combo" - width="250" - visible="false" /> + width="135" /> </layout_panel> <layout_panel - tab_stop="false" - follows="right|bottom" - name="links" - width="205" - min_width="205" + auto_resize="false" + follows="left|bottom" + name="links_login_panel" + layout="topleft" + width="290" height="80"> <text - follows="right|bottom" + follows="left|bottom" font="SansSerifSmall" text_color="EmphasisColor" - halign="right" + left="10" height="16" - top="12" - right="-10" - name="create_new_account_text" - width="200"> - Sign up + name="login_help" + top="19" + width="280"> + Need help logging in? </text> <text - follows="right|bottom" + follows="left|bottom" font="SansSerifSmall" text_color="EmphasisColor" - halign="right" height="16" name="forgot_password_text" - top_pad="12" - right="-10" - width="200"> + top="35" + width="280"> Forgot your username or password? </text> + <button + follows="left|bottom" + top_pad="0" + height="23" + image_unselected="PushButton_On" + image_selected="PushButton_On_Selected" + label="Log In" + label_color="White" + layout="topleft" + name="connect_btn" + width="90" /> + <check_box + control_name="RememberPassword" + follows="left|bottom" + font="SansSerifSmall" + left="110" + top="56" + height="16" + label="Remember password" + top_pad="3" + name="remember_check" + width="145" /> + </layout_panel> + <layout_panel + tab_stop="false" + follows="right|bottom" + name="links" + width="210" + min_width="210" + height="80"> <text follows="right|bottom" - font="SansSerifSmall" - text_color="EmphasisColor" + font="SansSerif" + font.style="BOLD" + font.size="Large" halign="right" height="16" - name="login_help" - top_pad="2" - right="-10" + name="create_account_text" + top="8" + right="-15" width="200"> - Need help logging in? </text> + CREATE YOUR ACCOUNT + </text> + <button + follows="right|bottom" + top="35" + right="-15" + height="23" + image_unselected="PushButton_On" + image_selected="PushButton_On_Selected" + label="Start now" + label_color="White" + layout="topleft" + left_pad="10" + name="create_new_account_btn" + width="90" /> </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml index af7a7b088a..b298f6d050 100644 --- a/indra/newview/skins/default/xui/es/notifications.xml +++ b/indra/newview/skins/default/xui/es/notifications.xml @@ -357,7 +357,7 @@ Tienes que volver a introducir el nombre de usuario de tu avatar. Necesitas una cuenta para acceder a [SECOND_LIFE]. ¿Te gustaría crear una ahora? <url name="url"> - https://join.secondlife.com/index.php?lang=es-ES + [create_account_url] </url> <usetemplate name="okcancelbuttons" notext="Volver a intentarlo" yestext="Crear una cuenta nueva"/> </notification> @@ -1180,7 +1180,6 @@ Puedes usar [SECOND_LIFE] de forma normal; los demás residentes te verán corre Se ha completado la instalación de [SECOND_LIFE]. Si es la primera vez que usas [SECOND_LIFE], debes crear una cuenta antes de poder iniciar una sesión. -¿Volver a [http://join.secondlife.com secondlife.com] para crear una cuenta nueva? <usetemplate name="okcancelbuttons" notext="Continuar" yestext="Cuenta nueva..."/> </notification> <notification name="LoginPacketNeverReceived"> diff --git a/indra/newview/skins/default/xui/es/panel_login.xml b/indra/newview/skins/default/xui/es/panel_login.xml index 0e94cbe70b..683e0a096a 100644 --- a/indra/newview/skins/default/xui/es/panel_login.xml +++ b/indra/newview/skins/default/xui/es/panel_login.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="panel_login"> - <panel.string name="create_account_url"> - http://join.secondlife.com/index.php?lang=es-ES - </panel.string> <panel.string name="forgot_password_url"> http://secondlife.com/account/request.php?lang=es </panel.string> <layout_stack name="login_widgets"> <layout_panel name="login"> + <text name="log_in_text"> + INICIAR SESIÓN + </text> <text name="username_text"> Nombre de usuario: </text> @@ -15,15 +15,8 @@ <text name="password_text"> Contraseña: </text> - <check_box label="Recordar la contraseña" name="remember_check"/> - <button label="Iniciar sesión" name="connect_btn"/> - <text name="mode_selection_text"> - Modo: - </text> - <combo_box name="mode_combo" tool_tip="Selecciona el modo. Elige Básico para una exploración rápida y fácil y para chatear. Elige Avanzado para tener acceso a más funciones."> - <combo_box.item label="Básico" name="Basic"/> - <combo_box.item label="Avanzado" name="Advanced"/> - </combo_box> + </layout_panel> + <layout_panel name="start_location_panel"> <text name="start_location_text"> Empezar en: </text> @@ -33,16 +26,21 @@ <combo_box.item label="<Escribe en qué región>" name="Typeregionname"/> </combo_box> </layout_panel> - <layout_panel name="links"> - <text name="create_new_account_text"> - Registrarme + <layout_panel name="links_login_panel"> + <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"> - ¿Necesitas ayuda para conectarte? + <button label="Iniciar sesión" name="connect_btn"/> + <check_box label="Recordar la contraseña" name="remember_check"/> + </layout_panel> + <layout_panel name="links"> + <text name="create_account_text"> + CREATE YǾUR ACCǾUNT </text> + <button name="create_new_account_btn" label="Registrarme"/> </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml index 729c06b50f..abd22e4c7b 100644 --- a/indra/newview/skins/default/xui/fr/notifications.xml +++ b/indra/newview/skins/default/xui/fr/notifications.xml @@ -359,7 +359,7 @@ Vous devez saisir le nom d'utilisateur de votre avatar. Pour entrer dans [SECOND_LIFE], vous devez disposer d'un compte. Voulez-vous en créer un maintenant ? <url name="url"> - https://join.secondlife.com/index.php?lang=fr-FR + [create_account_url] </url> <usetemplate name="okcancelbuttons" notext="Réessayer" yestext="Créer un compte"/> </notification> @@ -1171,7 +1171,6 @@ Vous pouvez utiliser [SECOND_LIFE] normalement, les autres résidents vous voien L'installation de [APP_NAME] est terminée. Si vous utilisez [SECOND_LIFE] pour la première fois, vous devez ouvrir un compte avant de pouvoir vous connecter. -Retourner sur [http://join.secondlife.com secondlife.com] pour ouvrir un nouveau compte ? <usetemplate name="okcancelbuttons" notext="Continuer" yestext="Nouveau compte..."/> </notification> <notification name="LoginPacketNeverReceived"> diff --git a/indra/newview/skins/default/xui/fr/panel_login.xml b/indra/newview/skins/default/xui/fr/panel_login.xml index e54b36644c..7843513e00 100644 --- a/indra/newview/skins/default/xui/fr/panel_login.xml +++ b/indra/newview/skins/default/xui/fr/panel_login.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="panel_login"> - <panel.string name="create_account_url"> - http://fr.secondlife.com/registration/ - </panel.string> <panel.string name="forgot_password_url"> http://secondlife.com/account/request.php?lang=fr </panel.string> <layout_stack name="login_widgets"> <layout_panel name="login"> + <text name="log_in_text"> + CONNEXION + </text> <text name="username_text"> Nom d'utilisateur : </text> @@ -15,15 +15,8 @@ <text name="password_text"> Mot de passe : </text> - <check_box label="Enregistrer" name="remember_check"/> - <button label="Connexion" name="connect_btn"/> - <text name="mode_selection_text"> - Mode : - </text> - <combo_box name="mode_combo" tool_tip="Sélectionnez un mode. Pour une exploration facile et rapide avec chat, choisissez Basique. Pour accéder à plus de fonctionnalités, choisissez Avancé."> - <combo_box.item label="Basique" name="Basic"/> - <combo_box.item label="Avancé" name="Advanced"/> - </combo_box> + </layout_panel> + <layout_panel name="start_location_panel"> <text name="start_location_text"> Lieu de départ : </text> @@ -33,16 +26,21 @@ <combo_box.item label="<Saisir le nom de la région>" name="Typeregionname"/> </combo_box> </layout_panel> - <layout_panel name="links"> - <text name="create_new_account_text"> - S'inscrire + <layout_panel name="links_login_panel"> + <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"> - Besoin d'aide ? + <button label="Connexion" name="connect_btn"/> + <check_box label="Enregistrer" name="remember_check"/> + </layout_panel> + <layout_panel name="links"> + <text name="create_account_text"> + CREATE YǾUR ACCǾUNT </text> + <button name="create_new_account_btn" label="S'inscrire"/> </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml index 9660c8f851..78034d736f 100644 --- a/indra/newview/skins/default/xui/it/notifications.xml +++ b/indra/newview/skins/default/xui/it/notifications.xml @@ -360,7 +360,7 @@ Inserisci il Nome utente del tuo avatar. Devi avere un account per entrare in [SECOND_LIFE]. Vuoi crearne uno adesso? <url name="url"> - https://join.secondlife.com/index.php?lang=it-IT + [create_account_url] </url> <usetemplate name="okcancelbuttons" notext="Riprova" yestext="Crea un nuovo account"/> </notification> @@ -1176,7 +1176,6 @@ Puoi comunque usare [SECOND_LIFE] normalmente e gli altri residenti ti vedranno L'installazione di [APP_NAME] è terminata. Se questa è la prima volta che usi [SECOND_LIFE], devi creare un account prima che tu possa effettuare l'accesso. -Vuoi tornare a [http://join.secondlife.com secondlife.com] per creare un nuovo account? <usetemplate name="okcancelbuttons" notext="Continua" yestext="Nuovo Account..."/> </notification> <notification name="LoginPacketNeverReceived"> diff --git a/indra/newview/skins/default/xui/it/panel_login.xml b/indra/newview/skins/default/xui/it/panel_login.xml index f88230ed11..02a3f8271c 100644 --- a/indra/newview/skins/default/xui/it/panel_login.xml +++ b/indra/newview/skins/default/xui/it/panel_login.xml @@ -1,13 +1,13 @@ <?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?lang=it </panel.string> <layout_stack name="login_widgets"> <layout_panel name="login"> + <text name="log_in_text"> + ACCEDI + </text> <text name="username_text"> Nome utente: </text> @@ -15,15 +15,8 @@ <text name="password_text"> Password: </text> - <check_box label="Ricorda password" name="remember_check"/> - <button label="Accedi" name="connect_btn"/> - <text name="mode_selection_text"> - Modalità: - </text> - <combo_box name="mode_combo" tool_tip="Seleziona la modalità. Seleziona Di base per esplorare facilmente e rapidamente e per la chat. Seleziona Avanzata per accedere ad altre funzionalità."> - <combo_box.item label="Di base" name="Basic"/> - <combo_box.item label="Avanzate" name="Advanced"/> - </combo_box> + </layout_panel> + <layout_panel name="start_location_panel"> <text name="start_location_text"> Inizia da: </text> @@ -33,16 +26,21 @@ <combo_box.item label="<Scrivi nome regione>" name="Typeregionname"/> </combo_box> </layout_panel> - <layout_panel name="links"> - <text name="create_new_account_text"> - Iscriviti + <layout_panel name="links_login_panel"> + <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> - <text name="login_help"> - Ti serve aiuto con la fase di accesso? + <button label="Accedi" name="connect_btn"/> + <check_box label="Ricorda password" name="remember_check"/> + </layout_panel> + <layout_panel name="links"> + <text name="create_account_text"> + CREATE YǾUR ACCǾUNT </text> + <button name="create_new_account_btn" label="Iscriviti"/> </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml index f35c0f0d14..6d13306ab2 100644 --- a/indra/newview/skins/default/xui/ja/notifications.xml +++ b/indra/newview/skins/default/xui/ja/notifications.xml @@ -382,7 +382,7 @@ L$ が不足しているのでこのグループに参加することができ [SECOND_LIFE] に入るにはアカウントが必要です。今すぐアカウントを作成しますか？ <url name="url"> - https://join.secondlife.com/index.php?lang=ja-JP + [create_account_url] </url> <usetemplate name="okcancelbuttons" notext="もう一度試す" yestext="新しいアカウントを作成"/> </notification> @@ -1210,7 +1210,6 @@ L$ は返金されません。 [APP_NAME] のインストールが完了しました。 [SECOND_LIFE] を使ったことがない場合は、ログインする前にアカウントの作成を行ってください。 -[http://join.secondlife.com/?lang=ja-JP] で新しいアカウントを作成しますか？ <usetemplate name="okcancelbuttons" notext="続行" yestext="新規アカウント..."/> </notification> <notification name="LoginPacketNeverReceived"> diff --git a/indra/newview/skins/default/xui/ja/panel_login.xml b/indra/newview/skins/default/xui/ja/panel_login.xml index ac1fe455c7..780f7aa1ae 100644 --- a/indra/newview/skins/default/xui/ja/panel_login.xml +++ b/indra/newview/skins/default/xui/ja/panel_login.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="panel_login"> - <panel.string name="create_account_url"> - http://jp.secondlife.com/registration/ - </panel.string> <panel.string name="forgot_password_url"> http://secondlife.com/account/request.php?lang=ja </panel.string> <layout_stack name="login_widgets"> <layout_panel name="login"> + <text name="log_in_text"> + ログイン + </text> <text name="username_text"> ユーザーネーム： </text> @@ -15,15 +15,8 @@ <text name="password_text"> パスワード： </text> - <check_box label="パスワードを記憶" name="remember_check"/> - <button label="ログイン" left_pad="30" name="connect_btn" width="60"/> - <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> @@ -33,16 +26,21 @@ <combo_box.item label="＜地域名を入力＞" name="Typeregionname"/> </combo_box> </layout_panel> - <layout_panel name="links"> - <text name="create_new_account_text"> - お申し込み + <layout_panel name="links_login_panel"> + <text name="login_help"> + ログインの方法 </text> <text name="forgot_password_text"> ユーザー名またはパスワードをお忘れですか？ </text> - <text name="login_help"> - ログインの方法 + <button label="ログイン" left_pad="30" name="connect_btn" width="60"/> + <check_box label="パスワードを記憶" name="remember_check"/> + </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> diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml index 0194293642..f255b1b8ea 100644 --- a/indra/newview/skins/default/xui/pl/notifications.xml +++ b/indra/newview/skins/default/xui/pl/notifications.xml @@ -1106,7 +1106,6 @@ Możesz normalnie używać [SECOND_LIFE], inni użytkownicy będą Cię widzieli Instalacja [APP_NAME] zakończona. Jeżeli używasz [SECOND_LIFE] po raz pierwszy to musisz stworzyć konto żeby móc się zalogować. -Czy chcesz przejść na stronę [http://join.secondlife.com secondlife.com] żeby stworzyć nowe konto? <usetemplate name="okcancelbuttons" notext="Kontynuuj" yestext="Nowe konto..."/> </notification> <notification name="LoginPacketNeverReceived"> diff --git a/indra/newview/skins/default/xui/pl/panel_login.xml b/indra/newview/skins/default/xui/pl/panel_login.xml index dc8e7399af..c87a3d3bd4 100644 --- a/indra/newview/skins/default/xui/pl/panel_login.xml +++ b/indra/newview/skins/default/xui/pl/panel_login.xml @@ -5,6 +5,9 @@ </panel.string> <layout_stack name="login_widgets"> <layout_panel name="login"> + <text name="log_in_text"> + POŁĄCZ + </text> <text name="username_text"> Użytkownik: </text> @@ -12,15 +15,8 @@ <text name="password_text"> Hasło: </text> - <check_box label="Zapamiętaj hasło" name="remember_check"/> - <button label="Połącz" name="connect_btn"/> - <text name="mode_selection_text"> - Tryb życia: - </text> - <combo_box name="mode_combo" tool_tip="Wybierz tryb życia. Wybierz tryb turystyczny dla łatwego zwiedzania i czatowania. Wybierz tryb zaawansowany aby mieć dostęp do większej ilości opcji."> - <combo_box.item label="Turystyczny" name="Basic"/> - <combo_box.item label="Zaawansowany" name="Advanced"/> - </combo_box> + </layout_panel> + <layout_panel name="start_location_panel"> <text name="start_location_text"> Rozpocznij w: </text> @@ -30,16 +26,23 @@ <combo_box.item label="<Wpisz Region>" name="Typeregionname"/> </combo_box> </layout_panel> - <layout_panel name="links"> - <text name="create_new_account_text"> - Utwórz nowe konto + <layout_panel name="links_login_panel"> + <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"> - Potrzebujesz pomocy z logowaniem się? + <button label="Połącz" name="connect_btn"/> + <check_box label="Zapamiętaj hasło" name="remember_check"/> + </layout_panel> + <layout_panel name="links"> + <text name="create_account_text"> + CREATE YǾUR ACCǾUNT </text> + <button name="create_new_account_btn" + label="Utwórz nowe konto" + width="120"/> </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml index 500a7f0c01..5484dd2007 100644 --- a/indra/newview/skins/default/xui/pt/notifications.xml +++ b/indra/newview/skins/default/xui/pt/notifications.xml @@ -357,7 +357,7 @@ Digite o nome de usuário de seu avatar. É preciso ter uma conta para entrar no [SECOND_LIFE]. Deseja criar uma conta agora? <url name="url"> - https://join.secondlife.com/index.php?lang=pt-BR + [create_account_url] </url> <usetemplate name="okcancelbuttons" notext="Tentar novamente" yestext="Abrir conta"/> </notification> @@ -1165,7 +1165,6 @@ Enquando isso, use o [SECOND_LIFE] normalmente. Seu visual será exibido correta A instalação do [APP_NAME] está pronta. Se você ainda não conhece o [SECOND_LIFE], basta criar uma conta para começar. -Voltar para [http://join.secondlife.com secondlife.com] para criar sua conta? <usetemplate name="okcancelbuttons" notext="Continuar" yestext="Nova conta.."/> </notification> <notification name="LoginPacketNeverReceived"> diff --git a/indra/newview/skins/default/xui/pt/panel_login.xml b/indra/newview/skins/default/xui/pt/panel_login.xml index f4af6a7108..25a2c9fda0 100644 --- a/indra/newview/skins/default/xui/pt/panel_login.xml +++ b/indra/newview/skins/default/xui/pt/panel_login.xml @@ -1,13 +1,13 @@ <?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?lang=pt </panel.string> <layout_stack name="login_widgets"> <layout_panel name="login"> + <text name="log_in_text"> + CONECTAR + </text> <text name="username_text"> Nome de usuário: </text> @@ -15,15 +15,8 @@ <text name="password_text"> Senha: </text> - <check_box label="Lembrar senha" name="remember_check"/> - <button label="conectar" name="connect_btn"/> - <text name="mode_selection_text"> - Modo: - </text> - <combo_box name="mode_combo" tool_tip="Selecione o modo. O modo Básico é mais rápido e ideal para explorar e conversar. Use o modo Avançado para acessar mais recursos."> - <combo_box.item label="Básico" name="Basic"/> - <combo_box.item label="Avançado" name="Advanced"/> - </combo_box> + </layout_panel> + <layout_panel name="start_location_panel"> <text name="start_location_text"> Começar em: </text> @@ -32,16 +25,21 @@ <combo_box.item label="Meu início" name="MyHome"/> </combo_box> </layout_panel> - <layout_panel name="links"> - <text name="create_new_account_text"> - Cadastre-se + <layout_panel name="links_login_panel"> + <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"> - Precisa de ajuda ao conectar? + <button label="conectar" name="connect_btn"/> + <check_box label="Lembrar senha" name="remember_check"/> + </layout_panel> + <layout_panel name="links"> + <text name="create_account_text"> + CREATE YǾUR ACCǾUNT </text> + <button name="create_new_account_btn" label="Cadastre-se"/> </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml index 97e5ee8c65..d4b3c06719 100644 --- a/indra/newview/skins/default/xui/ru/notifications.xml +++ b/indra/newview/skins/default/xui/ru/notifications.xml @@ -360,7 +360,7 @@ Для входа в [SECOND_LIFE] нужен аккаунт. Создать его? <url name="url"> - http://join.secondlife.com/ + [create_account_url] </url> <usetemplate name="okcancelbuttons" notext="Повторить попытку" yestext="Создать новый аккаунт"/> </notification> @@ -1176,7 +1176,6 @@ Установка [APP_NAME] завершена. Если вы используете [SECOND_LIFE] впервые, для входа в программу вам потребуется создать аккаунт. -Вернуться на [http://join.secondlife.com secondlife.com] для создания аккаунта? <usetemplate name="okcancelbuttons" notext="Продолжить" yestext="Создать аккаунт..."/> </notification> <notification name="LoginPacketNeverReceived"> diff --git a/indra/newview/skins/default/xui/ru/panel_login.xml b/indra/newview/skins/default/xui/ru/panel_login.xml index 7928191fa6..7ead924c1f 100644 --- a/indra/newview/skins/default/xui/ru/panel_login.xml +++ b/indra/newview/skins/default/xui/ru/panel_login.xml @@ -1,13 +1,13 @@ <?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> <layout_stack name="login_widgets"> <layout_panel name="login"> + <text name="log_in_text"> + ВОЙТИ + </text> <text name="username_text"> Имя пользователя: </text> @@ -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> @@ -33,16 +26,21 @@ <combo_box.item label="<Введите название региона>" name="Typeregionname"/> </combo_box> </layout_panel> - <layout_panel name="links"> - <text name="create_new_account_text"> - Регистрация + <layout_panel name="links_login_panel"> + <text name="login_help"> + Нужна помощь при входе? </text> <text name="forgot_password_text"> Забыли имя или пароль? </text> - <text name="login_help"> - Нужна помощь при входе? + <button label="Войти" name="connect_btn"/> + <check_box label="Запомнить пароль" name="remember_check"/> + </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> diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml index 6461e10e2d..78e4b134fb 100644 --- a/indra/newview/skins/default/xui/ru/strings.xml +++ b/indra/newview/skins/default/xui/ru/strings.xml @@ -137,7 +137,7 @@ Выйти </string> <string name="create_account_url"> - http://join.secondlife.com/ + http://join.secondlife.com/index.php?lang=ru-RU </string> <string name="LoginFailedViewerNotPermitted"> У клиента, которым вы пользуетесь, больше нет доступа к игре Second Life. Загрузить новую версию клиента можно по адресу diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml index 27f0deaf4a..1d7334be49 100644 --- a/indra/newview/skins/default/xui/tr/notifications.xml +++ b/indra/newview/skins/default/xui/tr/notifications.xml @@ -360,7 +360,7 @@ Avatarınızın Kullanıcı adını girmeniz gerekmektedir. [SECOND_LIFE]'a giriş yapmak için bir hesabınız olması gerekir. Şimdi bir hesap oluşturmak ister misiniz? <url name="url"> - http://join.secondlife.com/ + [create_account_url] </url> <usetemplate name="okcancelbuttons" notext="Tekrar dene" yestext="Yeni bir hesap oluştur"/> </notification> @@ -1176,7 +1176,6 @@ Yeni bir ana konum ayarlamak isteyebilirsiniz. [APP_NAME] kurulumu tamamlandı. [SECOND_LIFE]'ı ilk kez kullanıyorsanız, oturum açmadan önce bir hesap oluşturmalısınız. -Yeni bir hesap oluşturmak için [http://join.secondlife.com secondlife.com] adresine dönülsün mü? <usetemplate name="okcancelbuttons" notext="Devam" yestext="Yeni Hesap..."/> </notification> <notification name="LoginPacketNeverReceived"> diff --git a/indra/newview/skins/default/xui/tr/panel_login.xml b/indra/newview/skins/default/xui/tr/panel_login.xml index acd6aa1921..15684ba402 100644 --- a/indra/newview/skins/default/xui/tr/panel_login.xml +++ b/indra/newview/skins/default/xui/tr/panel_login.xml @@ -1,13 +1,13 @@ <?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> <layout_stack name="login_widgets"> <layout_panel name="login"> + <text name="log_in_text"> + OTURUM AÇ + </text> <text name="username_text"> Kullanıcı Adı: </text> @@ -15,15 +15,8 @@ <text name="password_text"> Parola: </text> - <check_box label="Parolayı hatırla" name="remember_check"/> - <button label="Oturum Aç" name="connect_btn"/> - <text name="mode_selection_text"> - Mod: - </text> - <combo_box name="mode_combo" tool_tip="Modunuzu seçin. Hızlı, kolay keşif yapmak ve sohbet için Temel seçimini yapın. Daha fazla özelliğe erişmek için Gelişmiş seçimini yapın."> - <combo_box.item label="Temel" name="Basic"/> - <combo_box.item label="Gelişmiş" name="Advanced"/> - </combo_box> + </layout_panel> + <layout_panel name="start_location_panel"> <text name="start_location_text"> Buradan başla: </text> @@ -33,16 +26,21 @@ <combo_box.item label="<Bölge adını girin>" name="Typeregionname"/> </combo_box> </layout_panel> - <layout_panel name="links"> - <text name="create_new_account_text"> - Kaydolun + <layout_panel name="links_login_panel"> + <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"> - Oturum açarken yardım mı gerekiyor? + <button label="Oturum Aç" name="connect_btn"/> + <check_box label="Parolayı hatırla" name="remember_check"/> + </layout_panel> + <layout_panel name="links"> + <text name="create_account_text"> + CREATE YǾUR ACCǾUNT </text> + <button name="create_new_account_btn" label="Kaydolun"/> </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml index a8a691a98e..1be0970e4e 100644 --- a/indra/newview/skins/default/xui/tr/strings.xml +++ b/indra/newview/skins/default/xui/tr/strings.xml @@ -137,7 +137,7 @@ Çık </string> <string name="create_account_url"> - http://join.secondlife.com/ + http://join.secondlife.com/index.php?lang=tr-TR </string> <string name="LoginFailedViewerNotPermitted"> Kullandığınız görüntüleyici ile artık Second Life'a erişemezsiniz. Yeni bir görüntüleyiciyi karşıdan yüklemek için lütfen şu sayfayı ziyaret edin: diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml index 3fa8ff3f78..ef59b15db1 100644 --- a/indra/newview/skins/default/xui/zh/notifications.xml +++ b/indra/newview/skins/default/xui/zh/notifications.xml @@ -326,7 +326,7 @@ You need to enter the Username name of your avatar. You need an account to enter [SECOND_LIFE]. Would you like to create one now? <url name="url"> - http://join.secondlife.com/ + [create_account_url] </url> <usetemplate name="okcancelbuttons" notext="再試一次" yestext="創造新帳戶"/> </notification> @@ -1128,7 +1128,6 @@ You may want to set a new home location. [APP_NAME] 安裝完成。 If this is your first time using [SECOND_LIFE], you will need to create an account before you can log in. -Return to [http://join.secondlife.com secondlife.com] to create a new account? <usetemplate name="okcancelbuttons" notext="繼續" yestext="新帳戶..."/> </notification> <notification name="LoginPacketNeverReceived"> diff --git a/indra/newview/skins/default/xui/zh/panel_login.xml b/indra/newview/skins/default/xui/zh/panel_login.xml index b227fbcfc8..efd8e22bf0 100644 --- a/indra/newview/skins/default/xui/zh/panel_login.xml +++ b/indra/newview/skins/default/xui/zh/panel_login.xml @@ -1,13 +1,13 @@ <?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> <layout_stack name="login_widgets"> <layout_panel name="login"> + <text name="log_in_text"> + 登入 + </text> <text name="username_text"> 使用者名稱： </text> @@ -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> @@ -33,16 +26,21 @@ <combo_box.item label="< 請輸入地區名稱 >" name="Typeregionname"/> </combo_box> </layout_panel> - <layout_panel name="links"> - <text name="create_new_account_text"> - 註冊 + <layout_panel name="links_login_panel"> + <text name="login_help"> + 登入時需要幫助？ </text> <text name="forgot_password_text"> 忘記你的使用者名稱或密碼？ </text> - <text name="login_help"> - 登入時需要幫助？ + <button label="登入" name="connect_btn"/> + <check_box label="記住密碼：" name="remember_check"/> + </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> |