Index: /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/zh-hk/proxy.dtd
===================================================================
--- /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/zh-hk/proxy.dtd (revision 341)
+++ /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/zh-hk/proxy.dtd (revision 342)
@@ -9,13 +9,8 @@
 <!ENTITY  manualTypeRadio.label         "手動蚭定 Proxy:">
 <!ENTITY  autoTypeRadio.label           "Proxy 自動蚭定網址 (URL):(若造成無法連線請改甚手動蚭定)">
-<!ENTITY  configAutoconfigText.label    "é
-çœ®ç¶²å€ (URL):">
 <!ENTITY  reload.label                  "重新茉å
 ¥">
-<!ENTITY  http.label                    "HTTP Proxy:">
-<!ENTITY  ssl.label                     "SSL Proxy:">
 <!ENTITY  socks.label                   "SOCKS 䞻機:">
 <!ENTITY  socks4.label                  "SOCKS v4">
 <!ENTITY  socks5.label                  "SOCKS v5">
 <!ENTITY  port.label                    "Port:">
-<!ENTITY  shareproxy.label              "所有通蚊協定郜䜿甚歀 Proxy 代理䌺服噚">
Index: /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/ko-kr/proxy.dtd
===================================================================
--- /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/ko-kr/proxy.dtd (revision 341)
+++ /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/ko-kr/proxy.dtd (revision 342)
@@ -9,11 +9,7 @@
 <!ENTITY  manualTypeRadio.label         "프록시 수동 섀정:">
 <!ENTITY  autoTypeRadio.label           "프록시 자동 섀정 죌소 (URL):">
-<!ENTITY  configAutoconfigText.label    "섀정 죌소 (URL):">
 <!ENTITY  reload.label                  "새로 고칚">
-<!ENTITY  http.label                    "HTTP 프록시:">
-<!ENTITY  ssl.label                     "SSL 프록시:">
 <!ENTITY  socks.label                   "SOCKS 혞슀튞:">
 <!ENTITY  socks4.label                  "SOCKS v4">
 <!ENTITY  socks5.label                  "SOCKS v5">
 <!ENTITY  port.label                    "포튞:">
-<!ENTITY  noproxy.label                 "프록시 사용 안 핹: ">
Index: /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/pt-br/proxy.dtd
===================================================================
--- /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/pt-br/proxy.dtd (revision 341)
+++ /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/pt-br/proxy.dtd (revision 342)
@@ -9,11 +9,7 @@
 <!ENTITY  manualTypeRadio.label         "Configuração manual de proxy:">
 <!ENTITY  autoTypeRadio.label           "Endereço para configuração automática de proxy:">
-<!ENTITY  configAutoconfigText.label    "Endereço de configuração:">
 <!ENTITY  reload.label                  "Recarregar">
-<!ENTITY  http.label                    "HTTP:">
-<!ENTITY  ssl.label                     "SSL:">
 <!ENTITY  socks.label                   "SOCKS:">
 <!ENTITY  socks4.label                  "SOCKS v4">
 <!ENTITY  socks5.label                  "SOCKS v5">
 <!ENTITY  port.label                    "Porta:">
-<!ENTITY  shareproxy.label              "Usar este proxy para todos os protocolos">
Index: /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/it-it/proxy.dtd
===================================================================
--- /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/it-it/proxy.dtd (revision 341)
+++ /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/it-it/proxy.dtd (revision 342)
@@ -9,11 +9,7 @@
 <!ENTITY  manualTypeRadio.label         "Configurazione manuale dei proxy">
 <!ENTITY  autoTypeRadio.label           "Configurazione automatica dei proxy (URL):">
-<!ENTITY  configAutoconfigText.label    "Indirizzo per la configurazione (URL):">
 <!ENTITY  reload.label                  "Ricarica">
-<!ENTITY  http.label                    "Proxy HTTP:">
-<!ENTITY  ssl.label                     "Proxy SSL:">
 <!ENTITY  socks.label                   "Host SOCKS:">
 <!ENTITY  socks4.label                  "SOCKS v4">
 <!ENTITY  socks5.label                  "SOCKS v5">
 <!ENTITY  port.label                    "Porta:">
-<!ENTITY  shareproxy.label              "Utilizzare lo stesso proxy per tutti i protocolli">
Index: /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/en-US/proxy.dtd
===================================================================
--- /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/en-US/proxy.dtd (revision 340)
+++ /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/en-US/proxy.dtd (revision 342)
@@ -9,11 +9,7 @@
 <!ENTITY  manualTypeRadio.label         "Manual proxy configuration:">
 <!ENTITY  autoTypeRadio.label           "Automatic proxy configuration URL:">
-<!ENTITY  configAutoconfigText.label    "Configuration location (URL):">
 <!ENTITY  reload.label                  "Reload">
-<!ENTITY  http.label                    "HTTP Proxy:">
-<!ENTITY  ssl.label                     "SSL Proxy:">
 <!ENTITY  socks.label                   "SOCKS Host:">
 <!ENTITY  socks4.label                  "SOCKS v4">
 <!ENTITY  socks5.label                  "SOCKS v5">
 <!ENTITY  port.label                    "Port:">
-<!ENTITY  shareproxy.label              "Use this proxy server for all protocols">
Index: /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/es-us/proxy.dtd
===================================================================
--- /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/es-us/proxy.dtd (revision 341)
+++ /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/es-us/proxy.dtd (revision 342)
@@ -9,11 +9,7 @@
 <!ENTITY  manualTypeRadio.label         "Configuración manual del proxy">
 <!ENTITY  autoTypeRadio.label           "URL para la configuración automática del proxy:">
-<!ENTITY  configAutoconfigText.label    "Ubicación de la configuración (URL)">
 <!ENTITY  reload.label                  "Recargar">
-<!ENTITY  http.label                    "Proxy HTTP:">
-<!ENTITY  ssl.label                     "Proxy SSL:">
 <!ENTITY  socks.label                   "Servidor SOCKS:">
 <!ENTITY  socks4.label                  "SOCKS v4">
 <!ENTITY  socks5.label                  "SOCKS v5">
 <!ENTITY  port.label                    "Puerto:">
-<!ENTITY  shareproxy.label              "Usar el mismo proxy para todo">
Index: /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/fr-fr/proxy.dtd
===================================================================
--- /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/fr-fr/proxy.dtd (revision 341)
+++ /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/fr-fr/proxy.dtd (revision 342)
@@ -9,11 +9,7 @@
 <!ENTITY  manualTypeRadio.label         "Configuration manuelle du proxy :">
 <!ENTITY  autoTypeRadio.label           "Adresse de configuration automatique du proxy :">
-<!ENTITY  configAutoconfigText.label    "Emplacement de la configuration (URL) :">
 <!ENTITY  reload.label                  "Actualiser">
-<!ENTITY  http.label                    "Proxy HTTP :">
-<!ENTITY  ssl.label                     "Proxy SSL :">
 <!ENTITY  socks.label                   "HÎte SOCKS :">
 <!ENTITY  socks4.label                  "SOCKS v4">
 <!ENTITY  socks5.label                  "SOCKS v5">
 <!ENTITY  port.label                    "Port :">
-<!ENTITY  shareproxy.label              "Utiliser ce serveur proxy pour tous les protocoles">
Index: /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/de-de/proxy.dtd
===================================================================
--- /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/de-de/proxy.dtd (revision 341)
+++ /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/de-de/proxy.dtd (revision 342)
@@ -9,11 +9,7 @@
 <!ENTITY  manualTypeRadio.label         "Manuelle Proxy-Konfiguration">
 <!ENTITY  autoTypeRadio.label           "Automatische Proxy-Konfigurations-URL:">
-<!ENTITY  configAutoconfigText.label    "Konfigurationsadresse (URL):">
 <!ENTITY  reload.label                  "Neu laden">
-<!ENTITY  http.label                    "HTTP-Proxy:">
-<!ENTITY  ssl.label                     "SSL-Proxy:">
 <!ENTITY  socks.label                   "SOCKS-Host:">
 <!ENTITY  socks4.label                  "SOCKS v4">
 <!ENTITY  socks5.label                  "SOCKS v5">
 <!ENTITY  port.label                    "Port:">
-<!ENTITY  shareproxy.label              "FÃŒr alle Protokolle diesen Proxyserver verwenden">
Index: /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/content/uploadr/proxy.js
===================================================================
--- /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/content/uploadr/proxy.js (revision 340)
+++ /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/content/uploadr/proxy.js (revision 342)
@@ -1,143 +1,60 @@
+/*
+ * Flickr Uploadr
+ *
+ * Copyright (c) 2007-2008 Yahoo! Inc.  All rights reserved.  This library is
+ * free software; you can redistribute it and/or modify it under the terms of
+ * the GNU General Public License (GPL), version 2 only.  This library is
+ * distributed WITHOUT ANY WARRANTY, whether express or implied. See the GNU
+ * GPL for more details (http://www.gnu.org/licenses/gpl.html)
+ */
 
 var gProxyDialog = {
-  beforeAccept: function ()
-  {
-    var proxyTypePref = document.getElementById("network.proxy.type");
-    if (proxyTypePref.value == 2) {
-      this.doAutoconfigURLFixup();
-      return true;
-    }
 
-    if (proxyTypePref.value != 1)
-      return true;
+	beforeAccept: function (){
 
-    var httpProxyURLPref = document.getElementById("network.proxy.http");
-    var httpProxyPortPref = document.getElementById("network.proxy.http_port");
-    var shareProxiesPref = document.getElementById("network.proxy.share_proxy_settings");
-    if (shareProxiesPref.value) {
-      var proxyPrefs = ["ssl", "socks"];
-      for (var i = 0; i < proxyPrefs.length; ++i) {
-        var proxyServerURLPref = document.getElementById("network.proxy." + proxyPrefs[i]);
-        var proxyPortPref = document.getElementById("network.proxy." + proxyPrefs[i] + "_port");
-        var backupServerURLPref = document.getElementById("network.proxy.backup." + proxyPrefs[i]);
-        var backupPortPref = document.getElementById("network.proxy.backup." + proxyPrefs[i] + "_port");
-        backupServerURLPref.value = proxyServerURLPref.value;
-        backupPortPref.value = proxyPortPref.value;
-        proxyServerURLPref.value = httpProxyURLPref.value;
-        proxyPortPref.value = httpProxyPortPref.value;
-      }
-    }
-    
-    return true;
-  },
+		var proxyTypePref = document.getElementById("network.proxy.type");
+
+		if (proxyTypePref.value == 2) {
+			this.doAutoconfigURLFixup();
+			return true;
+    		}
+
+		return true;
+	},
+
+	proxyTypeChanged: function (){
+
+		var proxyTypePref = document.getElementById("network.proxy.type");
+
+		document.getElementById("network.proxy.socks").disabled			= proxyTypePref.value != 1;
+		document.getElementById("network.proxy.socks_port").disabled		= proxyTypePref.value != 1;
+		document.getElementById("network.proxy.socks_version").disabled		= proxyTypePref.value != 1;
+		document.getElementById("network.proxy.autoconfig_url").disabled	= proxyTypePref.value != 2;
+		document.getElementById("flickr.proxy.disable_reload_button").disabled	= proxyTypePref.value != 2;
+	},
   
-  proxyTypeChanged: function ()
-  {
-    var proxyTypePref = document.getElementById("network.proxy.type");
-    
-    // Update http
-    var httpProxyURLPref = document.getElementById("network.proxy.http");
-    httpProxyURLPref.disabled = proxyTypePref.value != 1;
-    var httpProxyPortPref = document.getElementById("network.proxy.http_port");
-    httpProxyPortPref.disabled = proxyTypePref.value != 1;
+	readProxyType: function(){
 
-    // Now update the other protocols
-    this.updateProtocolPrefs();
+		this.proxyTypeChanged();
+		return undefined;
+	},
 
-    var shareProxiesPref = document.getElementById("network.proxy.share_proxy_settings");
-    shareProxiesPref.disabled = proxyTypePref.value != 1;
-    
-    var autoconfigURLPref = document.getElementById("network.proxy.autoconfig_url");
-    autoconfigURLPref.disabled = proxyTypePref.value != 2;
-    
-    var disableReloadPref = document.getElementById("pref.advanced.proxies.disable_button.reload");
-    disableReloadPref.disabled = proxyTypePref.value != 2;
-  },
-  
-  readProxyType: function ()
-  {
-    this.proxyTypeChanged();
-    return undefined;
-  },
-  
-  updateProtocolPrefs: function ()
-  {
-    var proxyTypePref = document.getElementById("network.proxy.type");
-    var shareProxiesPref = document.getElementById("network.proxy.share_proxy_settings");
-    var proxyPrefs = ["ssl", "socks"];
-    for (var i = 0; i < proxyPrefs.length; ++i) {
-      var proxyServerURLPref = document.getElementById("network.proxy." + proxyPrefs[i]);
-      var proxyPortPref = document.getElementById("network.proxy." + proxyPrefs[i] + "_port");
-      
-      // Restore previous per-proxy custom settings, if present. 
-      if (!shareProxiesPref.value) {
-        var backupServerURLPref = document.getElementById("network.proxy.backup." + proxyPrefs[i]);
-        var backupPortPref = document.getElementById("network.proxy.backup." + proxyPrefs[i] + "_port");
-        if (backupServerURLPref.hasUserValue) {
-          proxyServerURLPref.value = backupServerURLPref.value;
-          backupServerURLPref.reset();
-        }
-        if (backupPortPref.hasUserValue) {
-          proxyPortPref.value = backupPortPref.value;
-          backupPortPref.reset();
-        }
-      }
+	reloadPAC: function (){
 
-      proxyServerURLPref.updateElements();
-      proxyPortPref.updateElements();
-      proxyServerURLPref.disabled = proxyTypePref.value != 1 || shareProxiesPref.value;
-      proxyPortPref.disabled = proxyServerURLPref.disabled;
-    }
-    var socksVersionPref = document.getElementById("network.proxy.socks_version");
-    socksVersionPref.disabled = proxyTypePref.value != 1 || shareProxiesPref.value;
-    
-    return undefined;
-  },
-  
-  readProxyProtocolPref: function (aProtocol, aIsPort)
-  {
-    var shareProxiesPref = document.getElementById("network.proxy.share_proxy_settings");
-    if (shareProxiesPref.value) {
-      var pref = document.getElementById("network.proxy.http" + (aIsPort ? "_port" : ""));    
-      return pref.value;
-    }
-    
-    var backupPref = document.getElementById("network.proxy.backup." + aProtocol + (aIsPort ? "_port" : ""));
-    return backupPref.hasUserValue ? backupPref.value : undefined;
-  },
+		var autoURL = document.getElementById("networkProxyAutoconfigURL");
+		var pps = Components.classes["@mozilla.org/network/protocol-proxy-service;1"].getService(Components.interfaces.nsPIProtocolProxyService);
+		pps.configureFromPAC(autoURL.value);
+	},
 
-  reloadPAC: function ()
-  {
-    var autoURL = document.getElementById("networkProxyAutoconfigURL");
-    var pps = Components.classes["@mozilla.org/network/protocol-proxy-service;1"]
-                        .getService(Components.interfaces.nsPIProtocolProxyService);
-    pps.configureFromPAC(autoURL.value);
-  },
-  
-  doAutoconfigURLFixup: function ()
-  {
-    var autoURL = document.getElementById("networkProxyAutoconfigURL");
-    var autoURLPref = document.getElementById("network.proxy.autoconfig_url");
-    var URIFixup = Components.classes["@mozilla.org/docshell/urifixup;1"]
-                             .getService(Components.interfaces.nsIURIFixup);
-    try {
-      autoURLPref.value = autoURL.value = URIFixup.createFixupURI(autoURL.value, 0).spec;
-    } catch(ex) {}
-  },
-  
-  readHTTPProxyServer: function ()
-  {
-    var shareProxiesPref = document.getElementById("network.proxy.share_proxy_settings");
-    if (shareProxiesPref.value)
-      this.updateProtocolPrefs();
-    return undefined;
-  },
-  
-  readHTTPProxyPort: function ()
-  {
-    var shareProxiesPref = document.getElementById("network.proxy.share_proxy_settings");
-    if (shareProxiesPref.value)
-      this.updateProtocolPrefs();
-    return undefined;
-  }
+	doAutoconfigURLFixup: function(){
+
+		var autoURL = document.getElementById("networkProxyAutoconfigURL");
+		var autoURLPref = document.getElementById("network.proxy.autoconfig_url");
+		var URIFixup = Components.classes["@mozilla.org/docshell/urifixup;1"].getService(Components.interfaces.nsIURIFixup);
+
+		try {
+			autoURLPref.value = autoURL.value = URIFixup.createFixupURI(autoURL.value, 0).spec;
+		} catch(ex) {}
+	}
+
 };
Index: /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/content/uploadr/proxy.xul
===================================================================
--- /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/content/uploadr/proxy.xul (revision 340)
+++ /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/content/uploadr/proxy.xul (revision 342)
@@ -1,118 +1,78 @@
 <?xml version="1.0"?>
+<!--
 
+Flickr Uploadr
 
+Copyright (c) 2007-2008 Yahoo! Inc.  All rights reserved.  This library is
+free software; you can redistribute it and/or modify it under the terms of
+the GNU General Public License (GPL), version 2 only.  This library is
+distributed WITHOUT ANY WARRANTY, whether express or implied. See the GNU
+GPL for more details (http://www.gnu.org/licenses/gpl.html)
+
+-->
 <!DOCTYPE prefwindow SYSTEM "chrome://uploadr/locale/proxy.dtd">
+<?xml-stylesheet href="chrome://global/skin/"?>
+<prefwindow id="ProxyDialog" type="prefwindow"
+	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+	title="&ProxyDialog.title;"
+	dlgbuttons="accept,cancel"
+	onbeforeaccept="return gProxyDialog.beforeAccept();"
+	style="width: &window.width; !important;">
 
-<?xml-stylesheet href="chrome://global/skin/"?>
+	<prefpane id="ProxyDialogPane">
 
-<prefwindow id="ProxyDialog" type="prefwindow"
-            xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-            title="&ProxyDialog.title;"
-            dlgbuttons="accept,cancel"
-            onbeforeaccept="return gProxyDialog.beforeAccept();"
-            style="width: &window.width; !important;">
+		<preferences>
 
-  <prefpane id="ProxyDialogPane">
+			<preference id="network.proxy.type"			name="network.proxy.type"			type="int"	onchange="gProxyDialog.proxyTypeChanged();"/>
+			<preference id="network.proxy.socks"			name="network.proxy.socks"			type="string" />
+			<preference id="network.proxy.socks_port"		name="network.proxy.socks_port"			type="int" />
+			<preference id="network.proxy.socks_version"		name="network.proxy.socks_version"		type="int" />
+			<preference id="network.proxy.autoconfig_url"		name="network.proxy.autoconfig_url"		type="string" />
+			<preference id="flickr.proxy.disable_reload_button"	name="flickr.proxy.disable_reload_button"	type="bool" />
+		</preferences>
+    
+		<script type="application/x-javascript" src="chrome://uploadr/content/proxy.js"/>
 
-    <preferences>
-      <preference id="network.proxy.type"         name="network.proxy.type"         type="int" onchange="gProxyDialog.proxyTypeChanged();"/>
-      <preference id="network.proxy.http"         name="network.proxy.http"         type="string"/>
-      <preference id="network.proxy.http_port"    name="network.proxy.http_port"    type="int"/>
-      <preference id="network.proxy.ssl"          name="network.proxy.ssl"          type="string"/>
-      <preference id="network.proxy.ssl_port"     name="network.proxy.ssl_port"     type="int"/>
-      <preference id="network.proxy.socks"        name="network.proxy.socks"        type="string"/>
-      <preference id="network.proxy.socks_port"   name="network.proxy.socks_port"   type="int"/>
-      <preference id="network.proxy.socks_version"  name="network.proxy.socks_version"  type="int"/>
-      <preference id="network.proxy.autoconfig_url" name="network.proxy.autoconfig_url" type="string"/>
-      <preference id="network.proxy.share_proxy_settings" name="network.proxy.share_proxy_settings" type="bool"/>
-      <preference id="pref.advanced.proxies.disable_button.reload" name="pref.advanced.proxies.disable_button.reload" type="bool"/>
-      <preference id="network.proxy.backup.ssl"          name="network.proxy.backup.ssl"          type="string"/>
-      <preference id="network.proxy.backup.ssl_port"     name="network.proxy.backup.ssl_port"     type="int"/>
-      <preference id="network.proxy.backup.socks"        name="network.proxy.backup.socks"        type="string"/>
-      <preference id="network.proxy.backup.socks_port"   name="network.proxy.backup.socks_port"   type="int"/>
-    </preferences>
-    
-    <script type="application/x-javascript" src="chrome://uploadr/content/proxy.js"/>
+		<groupbox>
+			<caption label="&proxyTitle.label;"/>
 
-    <groupbox>
-      <caption label="&proxyTitle.label;"/>
+			<radiogroup id="networkProxyType" preference="network.proxy.type" onsyncfrompreference="return gProxyDialog.readProxyType();">
+				<radio value="0" label="&directTypeRadio.label;" />
+				<radio value="4" label="&WPADTypeRadio.label;" />
+				<radio value="1" label="&manualTypeRadio.label;" />
 
-      <radiogroup id="networkProxyType" preference="network.proxy.type"
-                  onsyncfrompreference="return gProxyDialog.readProxyType();">
-        <radio value="0" label="&directTypeRadio.label;" />
-        <radio value="4" label="&WPADTypeRadio.label;" />
-        <radio value="1" label="&manualTypeRadio.label;" />
-        <grid class="indent" flex="1">
-          <columns>
-            <column/>
-            <column flex="1"/>
-          </columns>
-          <rows>
-            <row align="center">
-              <hbox pack="end">
-                <label value="&http.label;" control="networkProxyHTTP"/>
-              </hbox>
-              <hbox align="center">
-                <textbox id="networkProxyHTTP" flex="1"
-                         preference="network.proxy.http" onsyncfrompreference="return gProxyDialog.readHTTPProxyServer();"/>
-                <label value="&port.label;" control="networkProxyHTTP_Port"/>
-                <textbox id="networkProxyHTTP_Port" size="5"
-                         preference="network.proxy.http_port" onsyncfrompreference="return gProxyDialog.readHTTPProxyPort();"/>
-              </hbox>
-            </row>
-            <row>
-              <hbox/>
-              <hbox>
-                <checkbox id="shareAllProxies" label="&shareproxy.label;" 
-                          preference="network.proxy.share_proxy_settings"
-                          onsyncfrompreference="return gProxyDialog.updateProtocolPrefs();"/>
-              </hbox>
-            </row>
-            <row align="center">
-              <hbox pack="end">
-                <label value="&ssl.label;" control="networkProxySSL"/>
-              </hbox>
-              <hbox align="center">
-                <textbox id="networkProxySSL" flex="1" preference="network.proxy.ssl"
-                         onsyncfrompreference="return gProxyDialog.readProxyProtocolPref('ssl', false);"/>
-                <label value="&port.label;" control="networkProxySSL_Port"/>
-                <textbox id="networkProxySSL_Port" size="5" preference="network.proxy.ssl_port"
-                         onsyncfrompreference="return gProxyDialog.readProxyProtocolPref('ssl', true);"/>
-              </hbox>
-            </row>
-            <row align="center">
-              <hbox pack="end">
-                <label value="&socks.label;" control="networkProxySOCKS"/>
-              </hbox>
-              <hbox align="center">
-                <textbox id="networkProxySOCKS" flex="1" preference="network.proxy.socks"
-                         onsyncfrompreference="return gProxyDialog.readProxyProtocolPref('socks', false);"/>
-                <label value="&port.label;" control="networkProxySOCKS_Port"/>
-                <textbox id="networkProxySOCKS_Port" size="5" preference="network.proxy.socks_port"
-                         onsyncfrompreference="return gProxyDialog.readProxyProtocolPref('socks', true);"/>
-              </hbox>
-            </row>
-            <row>
-              <spacer/>
-              <radiogroup id="networkProxySOCKSVersion" orient="horizontal"
-                          preference="network.proxy.socks_version">
-                <radio id="networkProxySOCKSVersion4" value="4" label="&socks4.label;" />
-                <radio id="networkProxySOCKSVersion5" value="5" label="&socks5.label;" />
-              </radiogroup>
-            </row>
+				<grid class="indent" flex="1">
+					<columns>
+						<column/>
+						<column flex="1"/>
+					</columns>
+					<rows>
+						<row align="center">
+							<hbox pack="end">
+								<label value="&socks.label;" control="networkProxyHost"/>
+							</hbox>
+							<hbox align="center">
+								<textbox id="networkProxyHost" flex="1" preference="network.proxy.socks" />
+								<label value="&port.label;" control="networkProxyPort"/>
+								<textbox id="networkProxyPort" size="5" preference="network.proxy.socks_port" />
+							</hbox>
+						</row>
+						<row>
+							<spacer />
+							<radiogroup id="networkProxySOCKSVersion" orient="horizontal" preference="network.proxy.socks_version">
+								<radio id="networkProxySOCKSVersion4" value="4" label="&socks4.label;" />
+								<radio id="networkProxySOCKSVersion5" value="5" label="&socks5.label;" />
+							</radiogroup>
+						</row>
+					</rows>
+				</grid>
 
-          </rows>
-        </grid>
-        <radio value="2" label="&autoTypeRadio.label;" />
-        <hbox class="indent" flex="1" align="center">
-          <textbox id="networkProxyAutoconfigURL" flex="1" preference="network.proxy.autoconfig_url"/>
-          <button id="autoReload" icon="refresh"
-                  label="&reload.label;" 
-                  oncommand="gProxyDialog.reloadPAC();" 
-                  preference="pref.advanced.proxies.disable_button.reload"/>
-        </hbox>
-      </radiogroup>
-    </groupbox>
-  </prefpane>
+				<radio value="2" label="&autoTypeRadio.label;" />
+				<hbox class="indent" flex="1" align="center">
+					<textbox id="networkProxyAutoconfigURL" flex="1" preference="network.proxy.autoconfig_url"/>
+					<button id="autoReload" icon="refresh" label="&reload.label;" oncommand="gProxyDialog.reloadPAC();" preference="flickr.proxy.disable_reload_button"/>
+				</hbox>
+			</radiogroup>
+		</groupbox>
+	</prefpane>
 </prefwindow>
-