diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-29 18:41:08 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-29 18:41:08 +0300 |
| commit | 6e0770908dc151b09a2863b95dc0c132d242acc0 (patch) | |
| tree | c72c7070cc0438dc4165ef8d5c6b329fc16448b5 /indra/newview/skins/default/xui/it/panel_notes.xml | |
| parent | f55af5fcdfdd0b4520e382d315afefd41c534820 (diff) | |
| parent | 61657d2e7904ba7274a0ab5d451669d2ee7bb7cc (diff) | |
Manual merge from default branch
Resolved conflicts in indra/newview/llchathistory.cpp in favor of trunk version.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/it/panel_notes.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/it/panel_notes.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/skins/default/xui/it/panel_notes.xml b/indra/newview/skins/default/xui/it/panel_notes.xml index cb805dae49..9ce6b47a32 100644 --- a/indra/newview/skins/default/xui/it/panel_notes.xml +++ b/indra/newview/skins/default/xui/it/panel_notes.xml @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="Note & Privacy" name="panel_notes"> +<panel label="Note e Privacy" name="panel_notes"> <layout_stack name="layout"> <panel name="notes_stack"> <scroll_container name="profile_scroll"> <panel name="profile_scroll_panel"> <text name="status_message" value="Le mie note private:"/> - <text name="status_message2" value="Permetti a questa persona di:"/> - <check_box label="Vedermi On-line" name="status_check"/> - <check_box label="Vedermi sull mappa" name="map_check"/> - <check_box label="Modificare, cancellare o prendere i miei oggetti" name="objects_check"/> + <text name="status_message2" value="Consenti a questa persona di:"/> + <check_box label="Vedere se sono online" name="status_check"/> + <check_box label="Vedermi sulla mappa" name="map_check"/> + <check_box label="Modificare, eliminare o prendere i miei oggetti" name="objects_check"/> </panel> </scroll_container> </panel> <panel name="notes_buttons_panel"> <button label="Aggiungi amico" name="add_friend" tool_tip="Offri amicizia a questo residente"/> - <button label="IM" name="im" tool_tip="Apri una sessione di messaggio istantaneo"/> + <button label="IM" name="im" tool_tip="Apri una sessione messaggio istantaneo"/> <button label="Chiama" name="call" tool_tip="Chiama questo residente"/> <button label="Mappa" name="show_on_map_btn" tool_tip="Mostra il residente sulla mappa"/> <button label="Teleport" name="teleport" tool_tip="Offri teleport"/> |