inetcpl.cpl: Add support for setting automatic proxy configuration.

Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dlls/inetcpl.cpl/connections.c

@@ -31,6 +31,7 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(inetcpl);
 
+static const WCHAR auto_config_url[] = {'A','u','t','o','C','o','n','f','i','g','U','R','L',0};
 static const WCHAR internet_settings[] = {'S','o','f','t','w','a','r','e','\\',
     'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\',
     'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\',
@@ -44,7 +45,9 @@ static const WCHAR default_connection_settings[] = {'D','e','f','a','u','l','t',
 static BOOL initdialog_done;
 
 #define CONNECTION_SETTINGS_VERSION 0x46
-#define MANUAL_PROXY 0x2
+#define CONNECTION_SETTINGS_MANUAL_PROXY 0x2
+#define CONNECTION_SETTINGS_PAC_SCRIPT 0x4
+#define CONNECTION_SETTINGS_WPAD 0x8
 
 typedef struct {
     DWORD version;
@@ -61,10 +64,11 @@ typedef struct {
 } connection_settings;
 
 static DWORD create_connection_settings(BOOL manual_proxy, const WCHAR *proxy_server,
-        connection_settings **ret)
+        BOOL use_wpad, BOOL use_pac_script, const WCHAR *pac_url, connection_settings **ret)
 {
     DWORD size = FIELD_OFFSET(connection_settings, data), pos;
     DWORD proxy_server_len;
+    DWORD pac_url_len;
 
     size += sizeof(DWORD);
     if(proxy_server)
@@ -77,6 +81,15 @@ static DWORD create_connection_settings(BOOL manual_proxy, const WCHAR *proxy_se
     else
         proxy_server_len = 0;
     size += proxy_server_len;
+    if(pac_url)
+    {
+        pac_url_len = WideCharToMultiByte(CP_UTF8, 0, pac_url, -1,
+                NULL, 0, NULL, NULL);
+        if(!pac_url_len) return 0;
+        pac_url_len--;
+    }
+    else
+        pac_url_len = 0;
     size += sizeof(DWORD)*10;
 
     *ret = heap_alloc_zero(size);
@@ -84,7 +97,9 @@ static DWORD create_connection_settings(BOOL manual_proxy, const WCHAR *proxy_se
 
     (*ret)->version = CONNECTION_SETTINGS_VERSION;
     (*ret)->flags = 1;
-    if(manual_proxy) (*ret)->flags |= MANUAL_PROXY;
+    if(manual_proxy) (*ret)->flags |= CONNECTION_SETTINGS_MANUAL_PROXY;
+    if(use_pac_script) (*ret)->flags |= CONNECTION_SETTINGS_PAC_SCRIPT;
+    if(use_wpad) (*ret)->flags |= CONNECTION_SETTINGS_WPAD;
     ((DWORD*)(*ret)->data)[0] = proxy_server_len;
     pos = sizeof(DWORD);
     if(proxy_server_len)
@@ -93,6 +108,15 @@ static DWORD create_connection_settings(BOOL manual_proxy, const WCHAR *proxy_se
                 (char*)(*ret)->data+pos, proxy_server_len, NULL, NULL);
         pos += proxy_server_len;
     }
+    pos += sizeof(DWORD); /* skip proxy bypass list */
+    ((DWORD*)((*ret)->data+pos))[0] = pac_url_len;
+    pos += sizeof(DWORD);
+    if(pac_url_len)
+    {
+        WideCharToMultiByte(CP_UTF8, 0, pac_url, -1,
+                (char*)(*ret)->data+pos, pac_url_len, NULL, NULL);
+        pos += pac_url_len;
+    }
     return size;
 }
 
@@ -100,9 +124,12 @@ static void connections_on_initdialog(HWND hwnd)
 {
     DWORD type, size, enabled;
     WCHAR address[INTERNET_MAX_URL_LENGTH], *port;
-    HKEY hkey;
+    WCHAR pac_url[INTERNET_MAX_URL_LENGTH];
+    HKEY hkey, con;
     LONG res;
 
+    SendMessageW(GetDlgItem(hwnd, IDC_EDIT_PAC_SCRIPT),
+            EM_LIMITTEXT, INTERNET_MAX_URL_LENGTH, 0);
     SendMessageW(GetDlgItem(hwnd, IDC_EDIT_PROXY_SERVER),
             EM_LIMITTEXT, INTERNET_MAX_URL_LENGTH-10, 0);
     SendMessageW(GetDlgItem(hwnd, IDC_EDIT_PROXY_PORT), EM_LIMITTEXT, 8, 0);
@@ -119,10 +146,45 @@ static void connections_on_initdialog(HWND hwnd)
     res = RegQueryValueExW(hkey, proxy_server, NULL, &type, (BYTE*)address, &size);
     if(res || type != REG_SZ)
         address[0] = 0;
+    size = sizeof(pac_url);
+    res = RegQueryValueExW(hkey, auto_config_url, NULL, &type, (BYTE*)pac_url, &size);
+    if(res || type != REG_SZ)
+        pac_url[0] = 0;
+
+    res = RegOpenKeyW(hkey, connections, &con);
     RegCloseKey(hkey);
+    if(!res)
+    {
+        connection_settings *settings = NULL;
+        size = 0;
+
+        while((res = RegQueryValueExW(con, default_connection_settings, NULL, &type,
+                        (BYTE*)settings, &size)) == ERROR_MORE_DATA || !settings)
+        {
+            connection_settings *new_settings = heap_realloc(settings, size);
+            if(!new_settings)
+            {
+                RegCloseKey(con);
+                heap_free(settings);
+                return;
+            }
+            settings = new_settings;
+        }
+        RegCloseKey(con);
+
+        if(!res && type == REG_BINARY)
+        {
+            if(settings->version != CONNECTION_SETTINGS_VERSION)
+                FIXME("unexpected structure version (%x)\n", settings->version);
+            else if(settings->flags & CONNECTION_SETTINGS_WPAD)
+                CheckDlgButton(hwnd, IDC_USE_WPAD, BST_CHECKED);
+        }
+        heap_free(settings);
+    }
 
     TRACE("ProxyEnable = %x\n", enabled);
     TRACE("ProxyServer = %s\n", wine_dbgstr_w(address));
+    TRACE("AutoConfigURL = %s\n", wine_dbgstr_w(auto_config_url));
 
     if(enabled)
     {
@@ -141,6 +203,13 @@ static void connections_on_initdialog(HWND hwnd)
     if(port)
         SetDlgItemTextW(hwnd, IDC_EDIT_PROXY_PORT, port);
 
+    if(pac_url[0])
+    {
+        CheckDlgButton(hwnd, IDC_USE_PAC_SCRIPT, BST_CHECKED);
+        EnableWindow(GetDlgItem(hwnd, IDC_EDIT_PAC_SCRIPT), TRUE);
+        SetDlgItemTextW(hwnd, IDC_EDIT_PAC_SCRIPT, pac_url);
+    }
+
     return;
 }
 
@@ -150,11 +219,22 @@ static INT_PTR connections_on_command(HWND hwnd, WPARAM wparam)
 
     switch (wparam)
     {
+        case IDC_USE_PAC_SCRIPT:
+            checked = IsDlgButtonChecked(hwnd, IDC_USE_PAC_SCRIPT);
+            EnableWindow(GetDlgItem(hwnd, IDC_EDIT_PAC_SCRIPT), checked);
+            break;
         case IDC_USE_PROXY_SERVER:
             checked = IsDlgButtonChecked(hwnd, IDC_USE_PROXY_SERVER);
             EnableWindow(GetDlgItem(hwnd, IDC_EDIT_PROXY_SERVER), checked);
             EnableWindow(GetDlgItem(hwnd, IDC_EDIT_PROXY_PORT), checked);
-            /* fallthrough */
+    }
+
+    switch (wparam)
+    {
+        case IDC_USE_WPAD:
+        case IDC_USE_PAC_SCRIPT:
+        case IDC_USE_PROXY_SERVER:
+        case MAKEWPARAM(IDC_EDIT_PAC_SCRIPT, EN_CHANGE):
         case MAKEWPARAM(IDC_EDIT_PROXY_SERVER, EN_CHANGE):
         case MAKEWPARAM(IDC_EDIT_PROXY_PORT, EN_CHANGE):
             if(initdialog_done)
@@ -168,9 +248,11 @@ static INT_PTR connections_on_command(HWND hwnd, WPARAM wparam)
 static INT_PTR connections_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam)
 {
     connection_settings *default_connection;
-    WCHAR addr[INTERNET_MAX_URL_LENGTH];
+    WCHAR proxy[INTERNET_MAX_URL_LENGTH];
+    WCHAR pac_script[INTERNET_MAX_URL_LENGTH];
     PSHNOTIFY *psn = (PSHNOTIFY*)lparam;
-    DWORD addr_len, port_len, enabled, size;
+    DWORD proxy_len, port_len, pac_script_len;
+    DWORD use_proxy, use_pac_script, use_wpad, size;
     LRESULT res;
     HKEY hkey, con;
 
@@ -181,32 +263,32 @@ static INT_PTR connections_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam)
     if(res)
         return FALSE;
 
-    enabled = IsDlgButtonChecked(hwnd, IDC_USE_PROXY_SERVER);
+    use_proxy = IsDlgButtonChecked(hwnd, IDC_USE_PROXY_SERVER);
     res = RegSetValueExW(hkey, proxy_enable, 0, REG_DWORD,
-            (BYTE*)&enabled, sizeof(enabled));
+            (BYTE*)&use_proxy, sizeof(use_proxy));
     if(res)
     {
         RegCloseKey(hkey);
         return FALSE;
     }
-    TRACE("ProxyEnable set to %x\n", enabled);
+    TRACE("ProxyEnable set to %x\n", use_proxy);
 
-    addr_len = GetDlgItemTextW(hwnd, IDC_EDIT_PROXY_SERVER,
+    proxy_len = GetDlgItemTextW(hwnd, IDC_EDIT_PROXY_SERVER,
-            addr, sizeof(addr)/sizeof(addr[0]));
+            proxy, sizeof(proxy)/sizeof(proxy[0]));
-    if(addr_len)
+    if(proxy_len)
     {
-        addr[addr_len++] = ':';
+        proxy[proxy_len++] = ':';
         port_len = GetDlgItemTextW(hwnd, IDC_EDIT_PROXY_PORT,
-            addr+addr_len, sizeof(addr)/sizeof(addr[0])-addr_len);
+            proxy+proxy_len, sizeof(proxy)/sizeof(proxy[0])-proxy_len);
         if(!port_len)
         {
-            addr[addr_len++] = '8';
+            proxy[proxy_len++] = '8';
-            addr[addr_len++] = '0';
+            proxy[proxy_len++] = '0';
-            addr[addr_len] = 0;
+            proxy[proxy_len] = 0;
         }
 
         res = RegSetValueExW(hkey, proxy_server, 0, REG_SZ,
-                (BYTE*)addr, (addr_len+port_len)*sizeof(WCHAR));
+                (BYTE*)proxy, (proxy_len+port_len)*sizeof(WCHAR));
     }
     else
     {
@@ -219,14 +301,39 @@ static INT_PTR connections_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam)
         RegCloseKey(hkey);
         return FALSE;
     }
-    TRACE("ProxtServer set to %s\n", wine_dbgstr_w(addr));
+    TRACE("ProxtServer set to %s\n", wine_dbgstr_w(proxy));
+
+    use_pac_script = IsDlgButtonChecked(hwnd, IDC_USE_PAC_SCRIPT);
+    pac_script_len = GetDlgItemTextW(hwnd, IDC_EDIT_PAC_SCRIPT,
+            pac_script, sizeof(pac_script)/sizeof(pac_script[0]));
+    if(!pac_script_len) use_pac_script = FALSE;
+    if(use_pac_script)
+    {
+        res = RegSetValueExW(hkey, auto_config_url, 0, REG_SZ,
+                (BYTE*)pac_script, pac_script_len*sizeof(WCHAR));
+    }
+    else
+    {
+        res = RegDeleteValueW(hkey, auto_config_url);
+        if(res == ERROR_FILE_NOT_FOUND)
+            res = ERROR_SUCCESS;
+    }
+    if(res)
+    {
+        RegCloseKey(hkey);
+        return FALSE;
+    }
+    TRACE("AutoConfigURL set to %s\n", wine_dbgstr_w(use_pac_script ? pac_script : NULL));
+
+    use_wpad = IsDlgButtonChecked(hwnd, IDC_USE_WPAD);
 
     res = RegCreateKeyExW(hkey, connections, 0, NULL, 0, KEY_WRITE, NULL, &con, NULL);
     RegCloseKey(hkey);
     if(res)
         return FALSE;
 
-    size = create_connection_settings(enabled, addr, &default_connection);
+    size = create_connection_settings(use_proxy, proxy, use_wpad,
+        use_pac_script, pac_script, &default_connection);
     if(!size)
     {
         RegCloseKey(con);

dlls/inetcpl.cpl/inetcpl.h

@@ -86,8 +86,11 @@ INT_PTR CALLBACK security_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN;
 #define IDC_CERT_PUBLISHER  4101
 
 #define IDD_CONNECTIONS         5000
-#define IDC_USE_PROXY_SERVER    5100
+#define IDC_USE_WPAD            5100
-#define IDC_EDIT_PROXY_SERVER   5101
+#define IDC_USE_PAC_SCRIPT      5101
-#define IDC_EDIT_PROXY_PORT     5102
+#define IDC_EDIT_PAC_SCRIPT     5102
+#define IDC_USE_PROXY_SERVER    5200
+#define IDC_EDIT_PROXY_SERVER   5201
+#define IDC_EDIT_PROXY_PORT     5202
 
 #endif

dlls/inetcpl.cpl/inetcpl.rc

@@ -121,12 +121,17 @@ STYLE WS_CAPTION | WS_CHILD | WS_DISABLED
 FONT 8, "MS Shell Dlg"
 CAPTION "Connections"
 BEGIN
-    GROUPBOX        "Proxy server", IDC_STATIC, 4, 4, 312, 42
+    GROUPBOX        "Automatic configuration", IDC_STATIC, 4, 4, 312, 56
-    AUTOCHECKBOX    "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 14, 200, 14, BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX    "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP
-    LTEXT           "Address:", IDC_STATIC, 10, 28, 40, 14
+    AUTOCHECKBOX    "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP
-    EDITTEXT        IDC_EDIT_PROXY_SERVER, 50, 28, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    LTEXT           "Address:", IDC_STATIC, 10, 42, 40, 14
-    LTEXT           "Port:", IDC_STATIC, 140, 28, 30, 14
+    EDITTEXT        IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
-    EDITTEXT        IDC_EDIT_PROXY_PORT, 170, 28, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER
+    GROUPBOX        "Proxy server", IDC_STATIC, 4, 66, 312, 42
+    AUTOCHECKBOX    "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE
+    LTEXT           "Address:", IDC_STATIC, 10, 90, 40, 14
+    EDITTEXT        IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
+    LTEXT           "Port:", IDC_STATIC, 140, 90, 30, 14
+    EDITTEXT        IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER
 END
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

po/ar.po

@@ -3428,21 +3428,35 @@ msgstr "اتصالات الشبكة المحلية"
 
 #: inetcpl.rc:125
 #, fuzzy
-#| msgid "&Local server"
+#| msgid "Wine configuration"
-msgid "Proxy server"
+msgid "Automatic configuration"
-msgstr "الخاد&وم المحلي"
+msgstr "إعدادات واين"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 #, fuzzy
 #| msgid "Address"
 msgid "Address:"
 msgstr "العنوان"
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+#, fuzzy
+#| msgid "&Local server"
+msgid "Proxy server"
+msgstr "الخاد&وم المحلي"
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 #, fuzzy
 #| msgid "No Ports"
 msgid "Port:"

po/bg.po

@@ -3449,19 +3449,33 @@ msgstr "LAN връзка"
 
 #: inetcpl.rc:125
 #, fuzzy
-msgid "Proxy server"
+#| msgid "Wine configuration"
-msgstr "Локален порт"
+msgid "Automatic configuration"
+msgstr "Настройки на Wine"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 #, fuzzy
 msgid "Address:"
 msgstr "Локален порт"
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+#, fuzzy
+msgid "Proxy server"
+msgstr "Локален порт"
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 #, fuzzy
 #| msgid "Local Port"
 msgid "Port:"

po/ca.po

@@ -3454,21 +3454,35 @@ msgstr "Connexió LAN"
 
 #: inetcpl.rc:125
 #, fuzzy
-#| msgid "&Local server"
+#| msgid "Wine configuration"
-msgid "Proxy server"
+msgid "Automatic configuration"
-msgstr "Servidor &local"
+msgstr "Configuració del Wine"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 #, fuzzy
 #| msgid "Address"
 msgid "Address:"
 msgstr "Adreça"
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+#, fuzzy
+#| msgid "&Local server"
+msgid "Proxy server"
+msgstr "Servidor &local"
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 #, fuzzy
 #| msgid "No Ports"
 msgid "Port:"

po/cs.po

@@ -3377,21 +3377,35 @@ msgstr "Připojení lokální sítě"
 
 #: inetcpl.rc:125
 #, fuzzy
-#| msgid "&Local server"
+#| msgid "Wine configuration"
-msgid "Proxy server"
+msgid "Automatic configuration"
-msgstr "&Místní server"
+msgstr "Konfigurace Wine"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 #, fuzzy
 #| msgid "Address"
 msgid "Address:"
 msgstr "Adresa"
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+#, fuzzy
+#| msgid "&Local server"
+msgid "Proxy server"
+msgstr "&Místní server"
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 #, fuzzy
 #| msgid "No Ports"
 msgid "Port:"

po/da.po

@@ -3459,21 +3459,35 @@ msgstr "Lokal netværksforbindelse"
 
 #: inetcpl.rc:125
 #, fuzzy
-#| msgid "&Local server"
+#| msgid "Wine configuration"
-msgid "Proxy server"
+msgid "Automatic configuration"
-msgstr "Lokal maskine"
+msgstr "Wine konfiguration"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 #, fuzzy
 #| msgid "Address"
 msgid "Address:"
 msgstr "Adresse"
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+#, fuzzy
+#| msgid "&Local server"
+msgid "Proxy server"
+msgstr "Lokal maskine"
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 #, fuzzy
 #| msgid "Local Port"
 msgid "Port:"

po/de.po

@@ -3441,18 +3441,32 @@ msgid "Connections"
 msgstr "Verbindungen"
 
 #: inetcpl.rc:125
-msgid "Proxy server"
+#, fuzzy
-msgstr "Proxyserver"
+#| msgid "Wine configuration"
+msgid "Automatic configuration"
+msgstr "Wine-Konfiguration"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
-msgstr "Proxy verwenden"
+msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 msgid "Address:"
 msgstr "Adresse:"
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+msgid "Proxy server"
+msgstr "Proxyserver"
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr "Proxy verwenden"
+
+#: inetcpl.rc:134
 msgid "Port:"
 msgstr "Port:"
 

po/el.po

@@ -3372,19 +3372,32 @@ msgstr "Επιλογές"
 
 #: inetcpl.rc:125
 #, fuzzy
-msgid "Proxy server"
+msgid "Automatic configuration"
-msgstr "Τοπικοί Σκληροί Δίσκοι"
+msgstr "Επιλογές"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 #, fuzzy
 msgid "Address:"
 msgstr "Τοπικοί Σκληροί Δίσκοι"
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+#, fuzzy
+msgid "Proxy server"
+msgstr "Τοπικοί Σκληροί Δίσκοι"
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 msgid "Port:"
 msgstr ""
 

po/en.po

@@ -3434,18 +3434,30 @@ msgid "Connections"
 msgstr "Connections"
 
 #: inetcpl.rc:125
-msgid "Proxy server"
+msgid "Automatic configuration"
-msgstr "Proxy server"
+msgstr "Automatic configuration"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
-msgstr "Use a proxy server"
+msgstr "Use Web Proxy Auto-Discovery (WPAD)"
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr "Use Proxy Auto-Config (PAC) script"
+
+#: inetcpl.rc:128 inetcpl.rc:132
 msgid "Address:"
 msgstr "Address:"
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+msgid "Proxy server"
+msgstr "Proxy server"
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr "Use a proxy server"
+
+#: inetcpl.rc:134
 msgid "Port:"
 msgstr "Port:"
 

po/en_US.po

@@ -3434,18 +3434,30 @@ msgid "Connections"
 msgstr "Connections"
 
 #: inetcpl.rc:125
-msgid "Proxy server"
+msgid "Automatic configuration"
-msgstr "Proxy server"
+msgstr "Automatic configuration"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
-msgstr "Use a proxy server"
+msgstr "Use Web Proxy Auto-Discovery (WPAD)"
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr "Use Proxy Auto-Config (PAC) script"
+
+#: inetcpl.rc:128 inetcpl.rc:132
 msgid "Address:"
 msgstr "Address:"
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+msgid "Proxy server"
+msgstr "Proxy server"
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr "Use a proxy server"
+
+#: inetcpl.rc:134
 msgid "Port:"
 msgstr "Port:"
 

po/eo.po

@@ -3349,21 +3349,35 @@ msgstr "LAN konektiĝo"
 
 #: inetcpl.rc:125
 #, fuzzy
-#| msgid "&Local server"
+#| msgid "Wine configuration"
-msgid "Proxy server"
+msgid "Automatic configuration"
-msgstr "Loka servilo"
+msgstr "Wine-agordo"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 #, fuzzy
 #| msgid "&Address bar"
 msgid "Address:"
 msgstr "&Adresa zono"
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+#, fuzzy
+#| msgid "&Local server"
+msgid "Proxy server"
+msgstr "Loka servilo"
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 #, fuzzy
 #| msgid "Local Port"
 msgid "Port:"

po/es.po

@@ -3468,21 +3468,35 @@ msgstr "Conexión LAN"
 
 #: inetcpl.rc:125
 #, fuzzy
-#| msgid "&Local server"
+#| msgid "Wine configuration"
-msgid "Proxy server"
+msgid "Automatic configuration"
-msgstr "Servidor &local"
+msgstr "Configuración de Wine"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 #, fuzzy
 #| msgid "Address"
 msgid "Address:"
 msgstr "Dirección"
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+#, fuzzy
+#| msgid "&Local server"
+msgid "Proxy server"
+msgstr "Servidor &local"
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 #, fuzzy
 #| msgid "Local Port"
 msgid "Port:"

po/fa.po

@@ -3411,18 +3411,31 @@ msgid "Connections"
 msgstr "اطلاعات"
 
 #: inetcpl.rc:125
-msgid "Proxy server"
+#, fuzzy
-msgstr ""
+msgid "Automatic configuration"
+msgstr "اطلاعات"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 msgid "Address:"
 msgstr ""
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+msgid "Proxy server"
+msgstr ""
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 msgid "Port:"
 msgstr ""
 

po/fi.po

@@ -3428,18 +3428,32 @@ msgid "Connections"
 msgstr "Yhteydet"
 
 #: inetcpl.rc:125
-msgid "Proxy server"
+#, fuzzy
-msgstr "Välityspalvelin"
+#| msgid "Wine configuration"
+msgid "Automatic configuration"
+msgstr "Winen asetukset"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
-msgstr "Käytä välityspalvelinta"
+msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 msgid "Address:"
 msgstr "Osoite:"
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+msgid "Proxy server"
+msgstr "Välityspalvelin"
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr "Käytä välityspalvelinta"
+
+#: inetcpl.rc:134
 msgid "Port:"
 msgstr "Portti:"
 

po/fr.po

@@ -3459,21 +3459,35 @@ msgstr "Connexion réseau local (LAN)"
 
 #: inetcpl.rc:125
 #, fuzzy
-#| msgid "&Local server"
+#| msgid "Wine configuration"
-msgid "Proxy server"
+msgid "Automatic configuration"
-msgstr "Serveur &local"
+msgstr "Configuration de Wine"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 #, fuzzy
 #| msgid "Address"
 msgid "Address:"
 msgstr "Adresse"
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+#, fuzzy
+#| msgid "&Local server"
+msgid "Proxy server"
+msgstr "Serveur &local"
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 #, fuzzy
 #| msgid "No Ports"
 msgid "Port:"

po/he.po

@@ -3432,20 +3432,33 @@ msgstr "חיבור רשת מקומית"
 
 #: inetcpl.rc:125
 #, fuzzy
-msgid "Proxy server"
+msgid "Automatic configuration"
-msgstr "שגיאה מקומית"
+msgstr "תצורת Wine"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 #, fuzzy
 #| msgid "Address"
 msgid "Address:"
 msgstr "כתובת"
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+#, fuzzy
+msgid "Proxy server"
+msgstr "שגיאה מקומית"
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 #, fuzzy
 #| msgid "No Ports"
 msgid "Port:"

po/hi.po

@@ -3346,18 +3346,30 @@ msgid "Connections"
 msgstr ""
 
 #: inetcpl.rc:125
-msgid "Proxy server"
+msgid "Automatic configuration"
 msgstr ""
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 msgid "Address:"
 msgstr ""
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+msgid "Proxy server"
+msgstr ""
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 msgid "Port:"
 msgstr ""
 

po/hr.po

@@ -3433,21 +3433,35 @@ msgstr "LAN veza"
 
 #: inetcpl.rc:125
 #, fuzzy
-#| msgid "&Local server"
+#| msgid "Wine configuration"
-msgid "Proxy server"
+msgid "Automatic configuration"
-msgstr "&Lokalni poslužitelj"
+msgstr "Wine konfiguracija"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 #, fuzzy
 #| msgid "Address"
 msgid "Address:"
 msgstr "Adresa"
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+#, fuzzy
+#| msgid "&Local server"
+msgid "Proxy server"
+msgstr "&Lokalni poslužitelj"
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 #, fuzzy
 #| msgid "No Ports"
 msgid "Port:"

po/hu.po

@@ -3475,21 +3475,35 @@ msgstr "LAN kapcsolat"
 
 #: inetcpl.rc:125
 #, fuzzy
-#| msgid "&Local server"
+#| msgid "Wine configuration"
-msgid "Proxy server"
+msgid "Automatic configuration"
-msgstr "&Helyi szerver"
+msgstr "Wine konfiguráció"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 #, fuzzy
 #| msgid "Address"
 msgid "Address:"
 msgstr "Cím"
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+#, fuzzy
+#| msgid "&Local server"
+msgid "Proxy server"
+msgstr "&Helyi szerver"
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 #, fuzzy
 #| msgid "Local Port"
 msgid "Port:"

po/it.po

@@ -3483,21 +3483,35 @@ msgstr "Connessione LAN"
 
 #: inetcpl.rc:125
 #, fuzzy
-#| msgid "&Local server"
+#| msgid "Wine configuration"
-msgid "Proxy server"
+msgid "Automatic configuration"
-msgstr "Server &locale"
+msgstr "Configurazione di Wine"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 #, fuzzy
 #| msgid "Address"
 msgid "Address:"
 msgstr "Indirizzo"
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+#, fuzzy
+#| msgid "&Local server"
+msgid "Proxy server"
+msgstr "Server &locale"
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 #, fuzzy
 #| msgid "Local Port"
 msgid "Port:"

po/ja.po

@@ -3429,21 +3429,35 @@ msgstr "LAN 接続"
 
 #: inetcpl.rc:125
 #, fuzzy
-#| msgid "&Local server"
+#| msgid "Wine configuration"
-msgid "Proxy server"
+msgid "Automatic configuration"
-msgstr "ローカル サーバ(&L)"
+msgstr "Wine 設定"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 #, fuzzy
 #| msgid "Address"
 msgid "Address:"
 msgstr "アドレス"
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+#, fuzzy
+#| msgid "&Local server"
+msgid "Proxy server"
+msgstr "ローカル サーバ(&L)"
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 #, fuzzy
 #| msgid "No Ports"
 msgid "Port:"

po/ko.po

@@ -3427,21 +3427,35 @@ msgstr "랜 연결"
 
 #: inetcpl.rc:125
 #, fuzzy
-#| msgid "&Local server"
+#| msgid "Wine configuration"
-msgid "Proxy server"
+msgid "Automatic configuration"
-msgstr "지역 서버(&L)"
+msgstr "Wine 설정"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 #, fuzzy
 #| msgid "Address"
 msgid "Address:"
 msgstr "주소"
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+#, fuzzy
+#| msgid "&Local server"
+msgid "Proxy server"
+msgstr "지역 서버(&L)"
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 #, fuzzy
 #| msgid "No Ports"
 msgid "Port:"

po/lt.po

@@ -3437,18 +3437,32 @@ msgid "Connections"
 msgstr "Ryšiai"
 
 #: inetcpl.rc:125
-msgid "Proxy server"
+#, fuzzy
-msgstr "Įgaliotasis serveris"
+#| msgid "Wine configuration"
+msgid "Automatic configuration"
+msgstr "„Wine“ konfigūravimas"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
-msgstr "Naudoti įgaliotąjį serverį"
+msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 msgid "Address:"
 msgstr "Adresas:"
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+msgid "Proxy server"
+msgstr "Įgaliotasis serveris"
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr "Naudoti įgaliotąjį serverį"
+
+#: inetcpl.rc:134
 msgid "Port:"
 msgstr "Prievadas:"
 

po/ml.po

@@ -3346,18 +3346,30 @@ msgid "Connections"
 msgstr ""
 
 #: inetcpl.rc:125
-msgid "Proxy server"
+msgid "Automatic configuration"
 msgstr ""
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 msgid "Address:"
 msgstr ""
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+msgid "Proxy server"
+msgstr ""
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 msgid "Port:"
 msgstr ""
 

po/nb_NO.po

@@ -3440,18 +3440,32 @@ msgid "Connections"
 msgstr "Nettverksforbindelser"
 
 #: inetcpl.rc:125
-msgid "Proxy server"
+#, fuzzy
-msgstr "Mellomtjener"
+#| msgid "Wine configuration"
+msgid "Automatic configuration"
+msgstr "Oppsett av Wine"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
-msgstr "Bruk en mellomtjener"
+msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 msgid "Address:"
 msgstr "Adresse:"
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+msgid "Proxy server"
+msgstr "Mellomtjener"
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr "Bruk en mellomtjener"
+
+#: inetcpl.rc:134
 msgid "Port:"
 msgstr "Port:"
 

po/nl.po

@@ -3468,21 +3468,35 @@ msgstr "LAN Verbinding"
 
 #: inetcpl.rc:125
 #, fuzzy
-#| msgid "&Local server"
+#| msgid "Wine configuration"
-msgid "Proxy server"
+msgid "Automatic configuration"
-msgstr "&Lokale server"
+msgstr "Wine configuratie"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 #, fuzzy
 #| msgid "Address"
 msgid "Address:"
 msgstr "Adres"
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+#, fuzzy
+#| msgid "&Local server"
+msgid "Proxy server"
+msgstr "&Lokale server"
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 #, fuzzy
 #| msgid "No Ports"
 msgid "Port:"

po/or.po

@@ -3346,18 +3346,30 @@ msgid "Connections"
 msgstr ""
 
 #: inetcpl.rc:125
-msgid "Proxy server"
+msgid "Automatic configuration"
 msgstr ""
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 msgid "Address:"
 msgstr ""
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+msgid "Proxy server"
+msgstr ""
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 msgid "Port:"
 msgstr ""
 

po/pa.po

@@ -3346,18 +3346,30 @@ msgid "Connections"
 msgstr ""
 
 #: inetcpl.rc:125
-msgid "Proxy server"
+msgid "Automatic configuration"
 msgstr ""
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 msgid "Address:"
 msgstr ""
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+msgid "Proxy server"
+msgstr ""
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 msgid "Port:"
 msgstr ""
 

po/pl.po

@@ -3455,21 +3455,35 @@ msgstr "Połączenie LAN"
 
 #: inetcpl.rc:125
 #, fuzzy
-#| msgid "&Local server"
+#| msgid "Wine configuration"
-msgid "Proxy server"
+msgid "Automatic configuration"
-msgstr "Serwer &lokalny"
+msgstr "Ustawienia Wine"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 #, fuzzy
 #| msgid "Address"
 msgid "Address:"
 msgstr "Adres"
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+#, fuzzy
+#| msgid "&Local server"
+msgid "Proxy server"
+msgstr "Serwer &lokalny"
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 #, fuzzy
 #| msgid "No Ports"
 msgid "Port:"

po/pt_BR.po

@@ -3449,21 +3449,35 @@ msgstr "Conexão LAN"
 
 #: inetcpl.rc:125
 #, fuzzy
-#| msgid "&Local server"
+#| msgid "Wine configuration"
-msgid "Proxy server"
+msgid "Automatic configuration"
-msgstr "Servidor &local"
+msgstr "Configuração do Wine"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 #, fuzzy
 #| msgid "Address"
 msgid "Address:"
 msgstr "Endereço"
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+#, fuzzy
+#| msgid "&Local server"
+msgid "Proxy server"
+msgstr "Servidor &local"
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 #, fuzzy
 #| msgid "No Ports"
 msgid "Port:"

po/pt_PT.po

@@ -3459,21 +3459,35 @@ msgstr "Ligação LAN"
 
 #: inetcpl.rc:125
 #, fuzzy
-#| msgid "&Local server"
+#| msgid "Wine configuration"
-msgid "Proxy server"
+msgid "Automatic configuration"
-msgstr "Servidor &Local"
+msgstr "Configuração Wine"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 #, fuzzy
 #| msgid "Address"
 msgid "Address:"
 msgstr "Endereço"
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+#, fuzzy
+#| msgid "&Local server"
+msgid "Proxy server"
+msgstr "Servidor &Local"
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 #, fuzzy
 #| msgid "No Ports"
 msgid "Port:"

po/rm.po

@@ -3375,18 +3375,31 @@ msgstr ""
 
 #: inetcpl.rc:125
 #, fuzzy
-msgid "Proxy server"
+msgid "Automatic configuration"
-msgstr "&Annotaziun..."
+msgstr "INFUORMAZIUN"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 msgid "Address:"
 msgstr ""
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+#, fuzzy
+msgid "Proxy server"
+msgstr "&Annotaziun..."
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 msgid "Port:"
 msgstr ""
 

po/ro.po

@@ -3416,21 +3416,35 @@ msgstr "Conexiune LAN"
 
 #: inetcpl.rc:125
 #, fuzzy
-#| msgid "&Local server"
+#| msgid "Wine configuration"
-msgid "Proxy server"
+msgid "Automatic configuration"
-msgstr "Server &local"
+msgstr "Setări Wine"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 #, fuzzy
 #| msgid "Address"
 msgid "Address:"
 msgstr "Adresa"
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+#, fuzzy
+#| msgid "&Local server"
+msgid "Proxy server"
+msgstr "Server &local"
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 #, fuzzy
 #| msgid "No Ports"
 msgid "Port:"

po/ru.po

@@ -3442,18 +3442,32 @@ msgid "Connections"
 msgstr "Подключения"
 
 #: inetcpl.rc:125
-msgid "Proxy server"
+#, fuzzy
-msgstr "Прокси-сервер"
+#| msgid "Wine configuration"
+msgid "Automatic configuration"
+msgstr "Настройка Wine"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
-msgstr "Использовать прокси-сервер"
+msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 msgid "Address:"
 msgstr "Адрес:"
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+msgid "Proxy server"
+msgstr "Прокси-сервер"
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr "Использовать прокси-сервер"
+
+#: inetcpl.rc:134
 msgid "Port:"
 msgstr "Порт:"
 

po/sk.po

@@ -3391,21 +3391,34 @@ msgstr "Aktivácia"
 
 #: inetcpl.rc:125
 #, fuzzy
-#| msgid "&Local server"
+msgid "Automatic configuration"
-msgid "Proxy server"
+msgstr "Informácie"
-msgstr "Lokálny server"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 #, fuzzy
 #| msgid "Address"
 msgid "Address:"
 msgstr "Adresa"
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+#, fuzzy
+#| msgid "&Local server"
+msgid "Proxy server"
+msgstr "Lokálny server"
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 msgid "Port:"
 msgstr ""
 

po/sl.po

@@ -3477,21 +3477,35 @@ msgstr "Povezava LAN"
 
 #: inetcpl.rc:125
 #, fuzzy
-#| msgid "&Local server"
+#| msgid "Wine configuration"
-msgid "Proxy server"
+msgid "Automatic configuration"
-msgstr "&Krajevni strežnik"
+msgstr "Nastavitve Wine"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 #, fuzzy
 #| msgid "Address"
 msgid "Address:"
 msgstr "Naslov"
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+#, fuzzy
+#| msgid "&Local server"
+msgid "Proxy server"
+msgstr "&Krajevni strežnik"
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 #, fuzzy
 #| msgid "Local Port"
 msgid "Port:"

po/sr_RS@cyrillic.po

@@ -3465,20 +3465,33 @@ msgstr "LAN веза"
 
 #: inetcpl.rc:125
 #, fuzzy
-msgid "Proxy server"
+msgid "Automatic configuration"
-msgstr "Локална грешка"
+msgstr "Подаци"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 #, fuzzy
 #| msgid "Address"
 msgid "Address:"
 msgstr "Адреса"
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+#, fuzzy
+msgid "Proxy server"
+msgstr "Локална грешка"
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 #, fuzzy
 #| msgid "Local Port"
 msgid "Port:"

po/sr_RS@latin.po

@@ -3542,20 +3542,34 @@ msgstr "LAN veza"
 
 #: inetcpl.rc:125
 #, fuzzy
-msgid "Proxy server"
+#| msgid "Wine configuration"
-msgstr "Lokalna greška"
+msgid "Automatic configuration"
+msgstr "Wine konfiguracija"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 #, fuzzy
 #| msgid "Address"
 msgid "Address:"
 msgstr "Adresa"
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+#, fuzzy
+msgid "Proxy server"
+msgstr "Lokalna greška"
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 #, fuzzy
 #| msgid "Local Port"
 msgid "Port:"

po/sv.po

@@ -3438,21 +3438,35 @@ msgstr "LAN-anslutning"
 
 #: inetcpl.rc:125
 #, fuzzy
-#| msgid "&Local server"
+#| msgid "Wine configuration"
-msgid "Proxy server"
+msgid "Automatic configuration"
-msgstr "&Lokal server"
+msgstr "Konfiguration av Wine"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 #, fuzzy
 #| msgid "Address"
 msgid "Address:"
 msgstr "Adress"
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+#, fuzzy
+#| msgid "&Local server"
+msgid "Proxy server"
+msgstr "&Lokal server"
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 #, fuzzy
 #| msgid "No Ports"
 msgid "Port:"

po/te.po

@@ -3346,18 +3346,30 @@ msgid "Connections"
 msgstr ""
 
 #: inetcpl.rc:125
-msgid "Proxy server"
+msgid "Automatic configuration"
 msgstr ""
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 msgid "Address:"
 msgstr ""
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+msgid "Proxy server"
+msgstr ""
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 msgid "Port:"
 msgstr ""
 

po/th.po

@@ -3388,19 +3388,32 @@ msgstr "รายละเอียด"
 
 #: inetcpl.rc:125
 #, fuzzy
-msgid "Proxy server"
+msgid "Automatic configuration"
-msgstr "ฮาร์ดดิสก์เครื่องส่วนตัว"
+msgstr "รายละเอียด"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 #, fuzzy
 msgid "Address:"
 msgstr "ฮาร์ดดิสก์เครื่องส่วนตัว"
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+#, fuzzy
+msgid "Proxy server"
+msgstr "ฮาร์ดดิสก์เครื่องส่วนตัว"
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 msgid "Port:"
 msgstr ""
 

po/tr.po

@@ -3438,21 +3438,35 @@ msgstr "LAN Bağlantısı"
 
 #: inetcpl.rc:125
 #, fuzzy
-#| msgid "&Local server"
+#| msgid "Wine configuration"
-msgid "Proxy server"
+msgid "Automatic configuration"
-msgstr "&Yerel sunucu"
+msgstr "Wine yapılandırması"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 #, fuzzy
 #| msgid "Address"
 msgid "Address:"
 msgstr "Adres"
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+#, fuzzy
+#| msgid "&Local server"
+msgid "Proxy server"
+msgstr "&Yerel sunucu"
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 #, fuzzy
 #| msgid "No Ports"
 msgid "Port:"

po/uk.po

@@ -3439,21 +3439,35 @@ msgstr "Підключення по локальній мережі"
 
 #: inetcpl.rc:125
 #, fuzzy
-#| msgid "&Local server"
+#| msgid "Wine configuration"
-msgid "Proxy server"
+msgid "Automatic configuration"
-msgstr "&Локальний сервер"
+msgstr "Параметри Wine"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 #, fuzzy
 #| msgid "Address"
 msgid "Address:"
 msgstr "Адреса"
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+#, fuzzy
+#| msgid "&Local server"
+msgid "Proxy server"
+msgstr "&Локальний сервер"
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 #, fuzzy
 #| msgid "No Ports"
 msgid "Port:"

po/wa.po

@@ -3403,18 +3403,31 @@ msgstr "Direccion"
 
 #: inetcpl.rc:125
 #, fuzzy
-msgid "Proxy server"
+msgid "Automatic configuration"
-msgstr "&Sicrîre..."
+msgstr "Informåcion"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 msgid "Address:"
 msgstr ""
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+#, fuzzy
+msgid "Proxy server"
+msgstr "&Sicrîre..."
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 msgid "Port:"
 msgstr ""
 

po/wine.pot

@@ -3307,18 +3307,30 @@ msgid "Connections"
 msgstr ""
 
 #: inetcpl.rc:125
-msgid "Proxy server"
+msgid "Automatic configuration"
 msgstr ""
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 msgid "Address:"
 msgstr ""
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+msgid "Proxy server"
+msgstr ""
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 msgid "Port:"
 msgstr ""
 

po/zh_CN.po

@@ -3386,21 +3386,35 @@ msgstr "局域网连接"
 
 #: inetcpl.rc:125
 #, fuzzy
-#| msgid "&Local server"
+#| msgid "Wine configuration"
-msgid "Proxy server"
+msgid "Automatic configuration"
-msgstr "本地服务器(&L)"
+msgstr "Wine 设置"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 #, fuzzy
 #| msgid "Address"
 msgid "Address:"
 msgstr "地址"
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+#, fuzzy
+#| msgid "&Local server"
+msgid "Proxy server"
+msgstr "本地服务器(&L)"
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 #, fuzzy
 #| msgid "No Ports"
 msgid "Port:"

po/zh_TW.po

@@ -3400,21 +3400,35 @@ msgstr "區域網路連線"
 
 #: inetcpl.rc:125
 #, fuzzy
-#| msgid "&Local server"
+#| msgid "Wine configuration"
-msgid "Proxy server"
+msgid "Automatic configuration"
-msgstr "本機伺服器(&L)"
+msgstr "Wine 設定"
 
 #: inetcpl.rc:126
-msgid "Use a proxy server"
+msgid "Use Web Proxy Auto-Discovery (WPAD)"
 msgstr ""
 
 #: inetcpl.rc:127
+msgid "Use Proxy Auto-Config (PAC) script"
+msgstr ""
+
+#: inetcpl.rc:128 inetcpl.rc:132
 #, fuzzy
 #| msgid "Address"
 msgid "Address:"
 msgstr "位址"
 
-#: inetcpl.rc:129
+#: inetcpl.rc:130
+#, fuzzy
+#| msgid "&Local server"
+msgid "Proxy server"
+msgstr "本機伺服器(&L)"
+
+#: inetcpl.rc:131
+msgid "Use a proxy server"
+msgstr ""
+
+#: inetcpl.rc:134
 #, fuzzy
 #| msgid "No Ports"
 msgid "Port:"