diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-20 13:54:34 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-20 13:54:34 -0800 |
| commit | a65188d85f75e848d224bd335a00ed8aa51f945e (patch) | |
| tree | f43b390cba45d047fc0fa31659f6969f62b925d1 /indra/newview/skins/default/xui/de/panel_login.xml | |
| parent | 1a8008ea150d1eb9a8f4036988ef971fb1901cb3 (diff) | |
| parent | 5ca943cd0279d35ffdf584fa0de3b795645f276c (diff) | |
Merge from viewer2. Minor conflict resolved.
Diffstat (limited to 'indra/newview/skins/default/xui/de/panel_login.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/de/panel_login.xml | 82 |
1 files changed, 41 insertions, 41 deletions
diff --git a/indra/newview/skins/default/xui/de/panel_login.xml b/indra/newview/skins/default/xui/de/panel_login.xml index e0b5fd687a..62973be4cb 100644 --- a/indra/newview/skins/default/xui/de/panel_login.xml +++ b/indra/newview/skins/default/xui/de/panel_login.xml @@ -1,41 +1,41 @@ -<?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>
- <panel name="login_widgets">
- <text name="first_name_text">
- Vorname:
- </text>
- <line_editor name="first_name_edit" tool_tip="[SECOND_LIFE] Vorname"/>
- <text name="last_name_text">
- Nachname:
- </text>
- <line_editor name="last_name_edit" tool_tip="[SECOND_LIFE] Nachname"/>
- <text name="password_text">
- Kennwort:
- </text>
- <button label="Login" label_selected="Login" name="connect_btn"/>
- <text name="start_location_text">
- Startposition:
- </text>
- <combo_box name="start_location_combo">
- <combo_box.item label="Mein letzter Standort" name="MyLastLocation"/>
- <combo_box.item label="Mein Zuhause" name="MyHome"/>
- <combo_box.item label="<Region eingeben>" name="Typeregionname"/>
- </combo_box>
- <check_box label="Kennwort merken" name="remember_check"/>
- <text name="create_new_account_text">
- Neues Konto erstellen
- </text>
- <text name="forgot_password_text">
- Namen oder Kennwort vergessen?
- </text>
- <text name="channel_text">
- [VERSION]
- </text>
- </panel>
-</panel>
+<?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> + <panel name="login_widgets"> + <text name="first_name_text"> + Vorname: + </text> + <line_editor name="first_name_edit" tool_tip="[SECOND_LIFE] Vorname"/> + <text name="last_name_text"> + Nachname: + </text> + <line_editor name="last_name_edit" tool_tip="[SECOND_LIFE] Nachname"/> + <text name="password_text"> + Kennwort: + </text> + <button label="Login" label_selected="Login" name="connect_btn"/> + <text name="start_location_text"> + Startposition: + </text> + <combo_box name="start_location_combo"> + <combo_box.item label="Mein letzter Standort" name="MyLastLocation"/> + <combo_box.item label="Mein Zuhause" name="MyHome"/> + <combo_box.item label="<Region eingeben>" name="Typeregionname"/> + </combo_box> + <check_box label="Kennwort merken" name="remember_check"/> + <text name="create_new_account_text"> + Neues Konto erstellen + </text> + <text name="forgot_password_text"> + Namen oder Kennwort vergessen? + </text> + <text name="channel_text"> + [VERSION] + </text> + </panel> +</panel> |