From eb15b6f93618f34516e00d3ba96237fde8663f58 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed 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/de/panel_login.xml | 3 --- 1 file changed, 3 deletions(-) (limited to 'indra/newview/skins/default/xui/de') diff --git a/indra/newview/skins/default/xui/de/panel_login.xml b/indra/newview/skins/default/xui/de/panel_login.xml index 553bd3e2ff..f92f68a544 100644 --- a/indra/newview/skins/default/xui/de/panel_login.xml +++ b/indra/newview/skins/default/xui/de/panel_login.xml @@ -1,8 +1,5 @@ - - http://de.secondlife.com/registration/ - http://secondlife.com/account/request.php?lang=de -- cgit v1.2.3 From e4ee7cbc6046b23f40f144b9b1ec8bd946d138fc Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 29 Jun 2012 14:43:31 -0400 Subject: Use [create_account_url] from strings.xml consistently in notifications.xml. The URL whose simple form is http://join.secondlife.com actually appears in a number of places in the localized notifications.xml files. It's supposed to be localized for the current viewer language -- and in strings.xml, it is. But the same URL is restated a couple times in notifications.xml, sometimes localized, sometimes not. Add "create_account_url" to init_default_trans_args(), permitting us to embed [create_account_url] anywhere in the skin files. Then replace all known occurrences of that URL in notifications.xml files with [create_account_url]. --- indra/newview/skins/default/xui/de/notifications.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins/default/xui/de') diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml index ac068fcd4e..dc9bb0e37e 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? - https://join.secondlife.com/index.php?lang=de-DE + [create_account_url] @@ -1181,7 +1181,7 @@ 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? +Zurück zu [[create_account_url] secondlife.com], um ein neues Konto zu erstellen? -- cgit v1.2.3 From da69ec0138c818cd5c0668b10ec977d87a10fdd3 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed 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/de/panel_login.xml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'indra/newview/skins/default/xui/de') diff --git a/indra/newview/skins/default/xui/de/panel_login.xml b/indra/newview/skins/default/xui/de/panel_login.xml index f92f68a544..5a88a01fe7 100644 --- a/indra/newview/skins/default/xui/de/panel_login.xml +++ b/indra/newview/skins/default/xui/de/panel_login.xml @@ -5,6 +5,9 @@ + + ANMELDEN + Benutzername: @@ -29,17 +32,16 @@ - - - - Registrieren - Benutzernamen oder Kennwort vergessen? - - Sie brauchen Hilfe? + ☠ + + + + CREATE YǾUR ACCǾUNT +