summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-03-04 13:15:43 -0500
committerOz Linden <oz@lindenlab.com>2014-03-04 13:15:43 -0500
commita373a7442c244712ab17d793072699ef82684816 (patch)
tree2ed20e24993c4bfbb4f943ed7794fcd06eeb8a23 /indra/newview/skins/default/xui/it/panel_preferences_setup.xml
parentb0c255f4e6141246f3575cb3d5b671af19966de9 (diff)
parentde8fea13627cc5978b8a6135802a52864a11c39a (diff)
merge changes for 3.7.2-release
Diffstat (limited to 'indra/newview/skins/default/xui/it/panel_preferences_setup.xml')
-rwxr-xr-xindra/newview/skins/default/xui/it/panel_preferences_setup.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_setup.xml b/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
index 0189d47f45..fcc9661d03 100755
--- a/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
@@ -21,7 +21,7 @@
<check_box initial_value="true" label="Abilita plugin" name="browser_plugins_enabled"/>
<check_box initial_value="true" label="Accetta cookie" name="cookies_enabled"/>
<check_box initial_value="true" label="Abilita Javascript" name="browser_javascript_enabled"/>
- <check_box initial_value="falso" label="Consenti pop-up nel browser media" name="media_popup_enabled"/>
+ <check_box initial_value="false" label="Consenti pop-up nel browser media" name="media_popup_enabled"/>
<text name="Software updates:">
Aggiornamenti software:
</text>
@@ -29,6 +29,7 @@
<combo_box.item label="Installa automaticamente" name="Install_automatically"/>
<combo_box.item label="Scarica e installa manualmente gli aggiornamenti" name="Install_manual"/>
</combo_box>
+ <check_box label="Disponibile agli aggiornamenti con versioni non rilasciate" name="update_willing_to_test"/>
<text name="Proxy Settings:">
Impostazioni proxy:
</text>