diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-24 18:04:26 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-24 18:04:26 +0200 |
| commit | d3a606f8323a32c660c71675257e3abd95cb097e (patch) | |
| tree | 11e272b194cb42bd9b11b861395f44793d3fa9f6 /indra/newview/skins/default/xui/it/panel_login.xml | |
| parent | 5f46430a1aa16212838dd7a9493a42fcb5e92ec3 (diff) | |
| parent | 7857f59f9e7c673f1ddbf32d6a66e85f78004445 (diff) | |
Manual merge from default branch.
Resolved conflicts in llpanellandmarks.cpp.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/it/panel_login.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/it/panel_login.xml | 54 |
1 files changed, 25 insertions, 29 deletions
diff --git a/indra/newview/skins/default/xui/it/panel_login.xml b/indra/newview/skins/default/xui/it/panel_login.xml index aec58738b8..eeed465080 100644 --- a/indra/newview/skins/default/xui/it/panel_login.xml +++ b/indra/newview/skins/default/xui/it/panel_login.xml @@ -6,33 +6,29 @@ <panel.string name="forgot_password_url"> http://secondlife.com/account/request.php?lang=it </panel.string> - <panel name="login_widgets"> - <text name="first_name_text"> - Nome: - </text> - <line_editor name="first_name_edit" tool_tip="[SECOND_LIFE] Nome"/> - <text name="last_name_text"> - Cognome: - </text> - <line_editor name="last_name_edit" tool_tip="[SECOND_LIFE] Cognome"/> - <text name="password_text"> - Password: - </text> - <button label="Accedi" label_selected="Accedi" name="connect_btn"/> - <text name="start_location_text"> - Luogo di partenza: - </text> - <combo_box name="start_location_combo"> - <combo_box.item label="La mia ultima ubicazione" name="MyLastLocation"/> - <combo_box.item label="La mia casa" name="MyHome"/> - <combo_box.item label="<Scrivi nome regione>" name="Typeregionname"/> - </combo_box> - <check_box label="Ricorda password" name="remember_check"/> - <text name="create_new_account_text"> - Crea nuovo account - </text> - <text name="forgot_password_text"> - Hai dimenticato il nome o la password? - </text> - </panel> + <layout_stack name="login_widgets"> + <layout_panel name="login"> + <text name="first_name_text"> + Nome: + </text> + <line_editor label="Nome" name="first_name_edit" tool_tip="[SECOND_LIFE] First Name"/> + <line_editor label="Cognome" name="last_name_edit" tool_tip="[SECOND_LIFE] Last Name"/> + <check_box label="Ricorda" name="remember_check"/> + <text name="start_location_text"> + Inizia da: + </text> + <combo_box name="start_location_combo"> + <combo_box.item label="Casa mia" name="MyHome"/> + </combo_box> + <button label="Accedi" name="connect_btn"/> + </layout_panel> + <layout_panel name="links"> + <text name="create_new_account_text"> + Iscriviti + </text> + <text name="login_help"> + Ti serve aiuto con la fase di accesso? + </text> + </layout_panel> + </layout_stack> </panel> |