diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-11 09:22:56 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-11 09:22:56 -0500 |
| commit | fc22e2cf5bfc97caaf1ad69814b7dd217cbafef0 (patch) | |
| tree | 8ac101cbfb2b3a47dff9cc4b33b95013feba3c66 /indra/newview/skins/default/xui/fr/panel_preferences_setup.xml | |
| parent | 024e5ff23542cf0604b73901311bb4d024957b1c (diff) | |
| parent | ee8df375449e97476408417ec6dea0d6a8853d73 (diff) | |
merge fix for STORM-559
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.xml | 2 |
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 : |