Index: /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/content/uploadr/settings_dialog.js
===================================================================
--- /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/content/uploadr/settings_dialog.js (revision 282)
+++ /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/content/uploadr/settings_dialog.js (revision 345)
@@ -128,5 +128,7 @@
 	resize: function(value) {
 		settings.list[settings.nsid].settings.resize = parseInt(value);
+	},
+	config_proxy: function(){
+		window.openDialog('chrome://uploadr/content/proxy.xul', 'dialog_proxy', 'chrome,titlebar,toolbar,centerscreen,modal');
 	}
-
 };
Index: /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/content/uploadr/settings.xul
===================================================================
--- /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/content/uploadr/settings.xul (revision 252)
+++ /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/content/uploadr/settings.xul (revision 345)
@@ -13,5 +13,12 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://uploadr/skin/settings.css" type="text/css"?>
-<!DOCTYPE dialog SYSTEM "chrome://uploadr/locale/main.dtd">
+<!DOCTYPE dialog [
+<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
+%brandDTD;
+<!ENTITY % mainDTD SYSTEM "chrome://uploadr/locale/main.dtd">
+%mainDTD;
+<!ENTITY % proxyDTD SYSTEM "chrome://uploadr/locale/proxy.dtd">
+%proxyDTD;
+]>
 <dialog id="dialog_settings" title="&settings;" buttons="accept,cancel"
 ondialogaccept="settings.ok(); return true;"
@@ -50,19 +57,30 @@
 			</hbox>
 		</groupbox>
-		<groupbox flex="1">
-			<caption label="&settings.resize;" />
-			<html:p id="resize_prompt"> </html:p>
-			<box>
-				<menulist id="resize" oncommand="settings.resize(this.value);">
-					<menupopup>
-						<menuitem value="-1" label="&settings.resize.dont;" selected="true" />
-						<menuitem value="800" label="&settings.resize.800;" />
-						<menuitem value="1280" label="&settings.resize.1280;" />
-						<menuitem value="1600" label="&settings.resize.1600;" />
-						<menuitem value="2048" label="&settings.resize.2048;" />
-					</menupopup>
-				</menulist>
-			</box>
-		</groupbox>
+		<hbox flex="1">
+			<groupbox flex="1">
+				<caption label="&settings.resize;" />
+				<html:p id="resize_prompt"> </html:p>
+				<box>
+					<menulist id="resize" oncommand="settings.resize(this.value);">
+						<menupopup>
+							<menuitem value="-1" label="&settings.resize.dont;" selected="true" />
+							<menuitem value="800" label="&settings.resize.800;" />
+							<menuitem value="1280" label="&settings.resize.1280;" />
+							<menuitem value="1600" label="&settings.resize.1600;" />
+							<menuitem value="2048" label="&settings.resize.2048;" />
+						</menupopup>
+					</menulist>
+				</box>
+			</groupbox>
+			<groupbox flex="1">
+				<caption label="&connection.label;" />
+				<html:p>&connectionDesc.label;</html:p>
+				<hbox>
+					<spacer flex="1" />
+					<button label="&connectionSettings.label;" oncommand="settings.config_proxy();" />
+					<spacer flex="1" />
+				</hbox>
+			</groupbox>
+		</hbox>
 		<hbox flex="1">
 			<groupbox flex="1">