diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-26 19:00:27 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-26 19:00:27 +0200 |
| commit | a5227864bd7ca930b41041ff80b20c30474f5f8c (patch) | |
| tree | 0a7f77c543184209717be29dfc24e1d05d320a00 /indra/newview/skins/default/xui/it/panel_edit_profile.xml | |
| parent | 3f3c9c7e255e090c7f09dafd08ec20f2d8a09c6d (diff) | |
| parent | b74e1d942352e81e0cc00e21ef3b351152b32248 (diff) | |
Manual merge from default branch
Resolved conflict in indra/newview/llviewerwindow.cpp.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/it/panel_edit_profile.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/it/panel_edit_profile.xml | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/indra/newview/skins/default/xui/it/panel_edit_profile.xml b/indra/newview/skins/default/xui/it/panel_edit_profile.xml index 92ec6f9450..3ecf4bcaf2 100644 --- a/indra/newview/skins/default/xui/it/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_profile.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="Modifica del profilo" name="edit_profile_panel"> +<panel label="Modifica profilo" name="edit_profile_panel"> <string name="CaptionTextAcctInfo"> [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION] </string> <string name="RegisterDateFormat"> - [REG_DATE] ([ETA']) + [REG_DATE] ([AGE]) </string> <string name="AcctTypeResident" value="Residente"/> <string name="AcctTypeTrial" value="Prova"/> @@ -26,26 +26,26 @@ <icon label="" name="2nd_life_edit_icon" tool_tip="Clicca per selezionare un'immagine"/> </panel> <panel name="first_life_image_panel"> - <text name="real_world_photo_title_text" value="Mondo Reale:"/> + <text name="real_world_photo_title_text" value="Mondo reale:"/> </panel> <icon label="" name="real_world_edit_icon" tool_tip="Clicca per selezionare un'immagine"/> <text name="title_homepage_text"> - Homepage: + Home page: </text> <check_box label="Mostrami nei risultati della ricerca" name="show_in_search_checkbox"/> - <text name="title_acc_status_text" value="Mio Account:"/> - <text_editor name="acc_status_text" value="Residente. No payment info on file."/> - <text name="my_account_link" value="[[URL] Vai al mio pannello personale]"/> - <text name="title_partner_text" value="Mio Partner:"/> + <text name="title_acc_status_text" value="Il mio account:"/> + <text_editor name="acc_status_text" value="Residente. Nessuna informazione di pagamento disponibile."/> + <text name="my_account_link" value="[[URL] Go to My Dashboard]"/> + <text name="title_partner_text" value="Il mio partner:"/> <panel name="partner_data_panel"> <name_box initial_value="(recupero)" name="partner_text"/> </panel> - <text name="partner_edit_link" value="[[URL] Modifica]"/> + <text name="partner_edit_link" value="[[URL] Edit]"/> </panel> </panel> </scroll_container> <panel name="profile_me_buttons_panel"> - <button label="Salva le modifiche" name="save_btn"/> - <button label="Cancella" name="cancel_btn"/> + <button label="Salva modifiche" name="save_btn"/> + <button label="Annulla" name="cancel_btn"/> </panel> </panel> |