summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
diff options
context:
space:
mode:
authorDave SIMmONs <simon@lindenlab.com>2010-11-12 12:24:15 -0800
committerDave SIMmONs <simon@lindenlab.com>2010-11-12 12:24:15 -0800
commit187b21e6d22204e8989b1c7d5e75f8b7880dd79f (patch)
tree8f60e069433afa48fc9a20ecc165863a0108c1aa /indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
parente3677f9ee2223cc13d12456e1eee4f7f9a90c474 (diff)
parent5b86f60a13f28f5978ff3a53371cb3bae7f0d837 (diff)
Merge latest from lindenlab/viewer-development
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 :