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_media_settings_permissions.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_media_settings_permissions.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/it/panel_media_settings_permissions.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/it/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/it/panel_media_settings_permissions.xml index 551d86864d..53dac1299f 100644 --- a/indra/newview/skins/default/xui/it/panel_media_settings_permissions.xml +++ b/indra/newview/skins/default/xui/it/panel_media_settings_permissions.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Personalizza" name="Media settings for controls"> <text name="controls_label"> - Controlli: + Regolazioni: </text> <combo_box name="controls"> <combo_item name="Standard"> @@ -11,10 +11,10 @@ Mini </combo_item> </combo_box> - <check_box initial_value="false" label="Permetti Navigazione & Interattività" name="perms_owner_interact"/> + <check_box initial_value="false" label="Permetti navigazione e interattività" name="perms_owner_interact"/> <check_box initial_value="false" label="Mostra la barra di controllo" name="perms_owner_control"/> - <check_box initial_value="false" label="Permetti Navigazione & Interattività" name="perms_group_interact"/> + <check_box initial_value="false" label="Permetti navigazione e interattività" name="perms_group_interact"/> <check_box initial_value="false" label="Mostra la barra di controllo" name="perms_group_control"/> - <check_box initial_value="false" label="Permetti Navigazione & Interattività" name="perms_anyone_interact"/> + <check_box initial_value="false" label="Permetti navigazione e interattività" name="perms_anyone_interact"/> <check_box initial_value="false" label="Mostra la barra di controllo" name="perms_anyone_control"/> </panel> |