diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-10-05 16:39:32 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-10-05 16:39:32 -0700 |
| commit | d8489166645f2e3ea7edd252997f9f48aa0871c3 (patch) | |
| tree | e2f5c52f0c397b0dfb1d0e3cb47ca59d609292dc /indra/newview/skins/default/xui/de/panel_preferences_setup.xml | |
| parent | 17c699e4281ffff58e24c5db960a5c33018f1747 (diff) | |
| parent | a88bb3231b2685eb640710d7617d26b7f3a2c0d2 (diff) | |
Merge with latest
Diffstat (limited to 'indra/newview/skins/default/xui/de/panel_preferences_setup.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/de/panel_preferences_setup.xml | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml index 490cead17d..8b18bf8659 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml @@ -11,17 +11,6 @@ </text> <check_box label="Eigener Port" name="connection_port_enabled"/> <spinner label="Port-Nummer:" name="connection_port"/> - <text name="cache_size_label_l"> - Cachegröße - </text> - <text name="text_box5"> - MB - </text> - <text name="Cache location"> - Cache-Ordner: - </text> - <button label="Durchsuchen" label_selected="Durchsuchen" name="set_cache"/> - <button label="Zurücksetzen" label_selected="Zurücksetzen" name="reset_cache"/> <text name="Web:"> Web: </text> @@ -33,12 +22,6 @@ <check_box initial_value="true" label="Cookies annehmen" name="cookies_enabled"/> <check_box initial_value="true" label="Javascript aktivieren" name="browser_javascript_enabled"/> <check_box initial_value="false" label="Medienbrowser-Popups aktivieren" name="media_popup_enabled"/> - <check_box initial_value="false" label="Web-Proxy aktivieren" name="web_proxy_enabled"/> - <text name="Proxy location"> - Proxy-Standort: - </text> - <line_editor name="web_proxy_editor" tool_tip="Name oder IP Adresse des Proxyservers, den Sie benutzen möchten"/> - <spinner label="Portnummer:" name="web_proxy_port"/> <text name="Software updates:"> Softwareupdates: </text> @@ -46,4 +29,8 @@ <combo_box.item label="Automatisch installieren" name="Install_automatically"/> <combo_box.item label="Updates manuell herunterladen und installieren" name="Install_manual"/> </combo_box> + <text name="Proxy Settings:"> + Proxy-Einstellungen: + </text> + <button label="Proxy-Einstellungen ändern" label_selected="Durchsuchen" name="set_proxy"/> </panel> |