summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
diff options
context:
space:
mode:
authorTofu Buzzard <no-email>2010-11-09 10:05:17 +0000
committerTofu Buzzard <no-email>2010-11-09 10:05:17 +0000
commitcaa53cc8cdd69bd48bd6c07fa6c98234e81f8a42 (patch)
tree682c2571bad71cf52e5157f4703163ca2ce21f57 /indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
parent179e9e37ecbdcd1ad2133733047707ddd42e8c30 (diff)
parentb657516f72f016a918e0ff627105dd380a94394c (diff)
merge up from v-d
Diffstat (limited to 'indra/newview/skins/default/xui/fr/panel_preferences_setup.xml')
-rw-r--r--indra/newview/skins/default/xui/fr/panel_preferences_setup.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
index eae49e7810..c1cec7537e 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Configuration" name="Input panel">
- <button label="Autres accessoires" name="joystick_setup_button" width="175"/>
<text name="Mouselook:">
Vue subjective :
</text>
@@ -40,6 +39,7 @@
<check_box initial_value="true" label="Activer les plugins" name="browser_plugins_enabled"/>
<check_box initial_value="true" label="Accepter les cookies" name="cookies_enabled"/>
<check_box initial_value="true" label="Activer Javascript" name="browser_javascript_enabled"/>
+ <check_box initial_value="false" label="Activer les fenĂȘtres popup de navigateur de mĂ©dias" name="media_popup_enabled"/>
<check_box initial_value="false" label="Activer le proxy Web" name="web_proxy_enabled"/>
<text name="Proxy location">
Emplacement du proxy :