diff --git a/dlls/inetcpl.cpl/connections.c b/dlls/inetcpl.cpl/connections.c index 925182a0325..707fb3c4f7f 100644 --- a/dlls/inetcpl.cpl/connections.c +++ b/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, - addr, sizeof(addr)/sizeof(addr[0])); - if(addr_len) + proxy_len = GetDlgItemTextW(hwnd, IDC_EDIT_PROXY_SERVER, + proxy, sizeof(proxy)/sizeof(proxy[0])); + 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'; - addr[addr_len++] = '0'; - addr[addr_len] = 0; + proxy[proxy_len++] = '8'; + proxy[proxy_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); diff --git a/dlls/inetcpl.cpl/inetcpl.h b/dlls/inetcpl.cpl/inetcpl.h index f56cfcf5d54..73d9034346d 100644 --- a/dlls/inetcpl.cpl/inetcpl.h +++ b/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_EDIT_PROXY_SERVER 5101 -#define IDC_EDIT_PROXY_PORT 5102 +#define IDC_USE_WPAD 5100 +#define IDC_USE_PAC_SCRIPT 5101 +#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 diff --git a/dlls/inetcpl.cpl/inetcpl.rc b/dlls/inetcpl.cpl/inetcpl.rc index 11f31fa8bd9..0c997da59ff 100644 --- a/dlls/inetcpl.cpl/inetcpl.rc +++ b/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 - AUTOCHECKBOX "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 14, 200, 14, BS_TOP | BS_MULTILINE - LTEXT "Address:", IDC_STATIC, 10, 28, 40, 14 - EDITTEXT IDC_EDIT_PROXY_SERVER, 50, 28, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED - LTEXT "Port:", IDC_STATIC, 140, 28, 30, 14 - EDITTEXT IDC_EDIT_PROXY_PORT, 170, 28, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER + GROUPBOX "Automatic configuration", IDC_STATIC, 4, 4, 312, 56 + AUTOCHECKBOX "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP + AUTOCHECKBOX "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP + LTEXT "Address:", IDC_STATIC, 10, 42, 40, 14 + EDITTEXT IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + 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 diff --git a/po/ar.po b/po/ar.po index 9d358b28727..70d8f95be1d 100644 --- a/po/ar.po +++ b/po/ar.po @@ -3428,21 +3428,35 @@ msgstr "اتصالات الشبكة المحلية" #: inetcpl.rc:125 #, fuzzy -#| msgid "&Local server" -msgid "Proxy server" -msgstr "الخاد&وم المحلي" +#| msgid "Wine configuration" +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 #, 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:" diff --git a/po/bg.po b/po/bg.po index b4d65346164..ffd764df89d 100644 --- a/po/bg.po +++ b/po/bg.po @@ -3449,19 +3449,33 @@ msgstr "LAN връзка" #: inetcpl.rc:125 #, fuzzy -msgid "Proxy server" -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 "" #: 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:" diff --git a/po/ca.po b/po/ca.po index 44ba5834796..94953ef7195 100644 --- a/po/ca.po +++ b/po/ca.po @@ -3454,21 +3454,35 @@ msgstr "Connexió LAN" #: inetcpl.rc:125 #, fuzzy -#| msgid "&Local server" -msgid "Proxy server" -msgstr "Servidor &local" +#| msgid "Wine configuration" +msgid "Automatic configuration" +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:" diff --git a/po/cs.po b/po/cs.po index 9247932b2b7..02d03eb5724 100644 --- a/po/cs.po +++ b/po/cs.po @@ -3377,21 +3377,35 @@ msgstr "Připojení lokální sítě" #: inetcpl.rc:125 #, fuzzy -#| msgid "&Local server" -msgid "Proxy server" -msgstr "&Místní server" +#| msgid "Wine configuration" +msgid "Automatic configuration" +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:" diff --git a/po/da.po b/po/da.po index 3353f2bab55..799185d8d6b 100644 --- a/po/da.po +++ b/po/da.po @@ -3459,21 +3459,35 @@ msgstr "Lokal netværksforbindelse" #: inetcpl.rc:125 #, fuzzy -#| msgid "&Local server" -msgid "Proxy server" -msgstr "Lokal maskine" +#| 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 "" #: 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:" diff --git a/po/de.po b/po/de.po index 5a05d59b75b..8fe04710ae3 100644 --- a/po/de.po +++ b/po/de.po @@ -3441,18 +3441,32 @@ msgid "Connections" msgstr "Verbindungen" #: inetcpl.rc:125 -msgid "Proxy server" -msgstr "Proxyserver" +#, fuzzy +#| msgid "Wine configuration" +msgid "Automatic configuration" +msgstr "Wine-Konfiguration" #: inetcpl.rc:126 -msgid "Use a proxy server" -msgstr "Proxy verwenden" +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 "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:" diff --git a/po/el.po b/po/el.po index 1a94c7e31d3..4121abb134c 100644 --- a/po/el.po +++ b/po/el.po @@ -3372,19 +3372,32 @@ msgstr "Επιλογές" #: inetcpl.rc:125 #, fuzzy -msgid "Proxy server" -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 #, 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 "" diff --git a/po/en.po b/po/en.po index c0af22e33ef..50fa9fb5886 100644 --- a/po/en.po +++ b/po/en.po @@ -3434,18 +3434,30 @@ msgid "Connections" msgstr "Connections" #: inetcpl.rc:125 -msgid "Proxy server" -msgstr "Proxy server" +msgid "Automatic configuration" +msgstr "Automatic configuration" #: inetcpl.rc:126 -msgid "Use a proxy server" -msgstr "Use a proxy server" +msgid "Use Web Proxy Auto-Discovery (WPAD)" +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:" diff --git a/po/en_US.po b/po/en_US.po index d67cc032f0e..e0da8ece24e 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -3434,18 +3434,30 @@ msgid "Connections" msgstr "Connections" #: inetcpl.rc:125 -msgid "Proxy server" -msgstr "Proxy server" +msgid "Automatic configuration" +msgstr "Automatic configuration" #: inetcpl.rc:126 -msgid "Use a proxy server" -msgstr "Use a proxy server" +msgid "Use Web Proxy Auto-Discovery (WPAD)" +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:" diff --git a/po/eo.po b/po/eo.po index 3fc82333fa8..720d78fdbea 100644 --- a/po/eo.po +++ b/po/eo.po @@ -3349,21 +3349,35 @@ msgstr "LAN konektiĝo" #: inetcpl.rc:125 #, fuzzy -#| msgid "&Local server" -msgid "Proxy server" -msgstr "Loka servilo" +#| msgid "Wine configuration" +msgid "Automatic configuration" +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:" diff --git a/po/es.po b/po/es.po index 023349b8820..f285e78fa07 100644 --- a/po/es.po +++ b/po/es.po @@ -3468,21 +3468,35 @@ msgstr "Conexión LAN" #: inetcpl.rc:125 #, fuzzy -#| msgid "&Local server" -msgid "Proxy server" -msgstr "Servidor &local" +#| msgid "Wine configuration" +msgid "Automatic configuration" +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:" diff --git a/po/fa.po b/po/fa.po index 08e69b7a4b2..7f111b15bf8 100644 --- a/po/fa.po +++ b/po/fa.po @@ -3411,18 +3411,31 @@ msgid "Connections" msgstr "اطلاعات" #: inetcpl.rc:125 -msgid "Proxy server" -msgstr "" +#, fuzzy +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 "" diff --git a/po/fi.po b/po/fi.po index c563ff60438..f80b2aaaa90 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3428,18 +3428,32 @@ msgid "Connections" msgstr "Yhteydet" #: inetcpl.rc:125 -msgid "Proxy server" -msgstr "Välityspalvelin" +#, fuzzy +#| msgid "Wine configuration" +msgid "Automatic configuration" +msgstr "Winen asetukset" #: inetcpl.rc:126 -msgid "Use a proxy server" -msgstr "Käytä välityspalvelinta" +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 "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:" diff --git a/po/fr.po b/po/fr.po index 6e7071fd5f7..9f5d46ec3e2 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3459,21 +3459,35 @@ msgstr "Connexion réseau local (LAN)" #: inetcpl.rc:125 #, fuzzy -#| msgid "&Local server" -msgid "Proxy server" -msgstr "Serveur &local" +#| msgid "Wine configuration" +msgid "Automatic configuration" +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:" diff --git a/po/he.po b/po/he.po index 5d328abee53..44389a3364f 100644 --- a/po/he.po +++ b/po/he.po @@ -3432,20 +3432,33 @@ msgstr "חיבור רשת מקומית" #: inetcpl.rc:125 #, fuzzy -msgid "Proxy server" -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" 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:" diff --git a/po/hi.po b/po/hi.po index 7500d036bea..f4e9da55026 100644 --- a/po/hi.po +++ b/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 "" diff --git a/po/hr.po b/po/hr.po index c02ab6f9d10..a214e853743 100644 --- a/po/hr.po +++ b/po/hr.po @@ -3433,21 +3433,35 @@ msgstr "LAN veza" #: inetcpl.rc:125 #, fuzzy -#| msgid "&Local server" -msgid "Proxy server" -msgstr "&Lokalni poslužitelj" +#| msgid "Wine configuration" +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 "&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:" diff --git a/po/hu.po b/po/hu.po index 35a635be136..440e478dac6 100644 --- a/po/hu.po +++ b/po/hu.po @@ -3475,21 +3475,35 @@ msgstr "LAN kapcsolat" #: inetcpl.rc:125 #, fuzzy -#| msgid "&Local server" -msgid "Proxy server" -msgstr "&Helyi szerver" +#| msgid "Wine configuration" +msgid "Automatic configuration" +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:" diff --git a/po/it.po b/po/it.po index 27ed2797b78..6effec0fcb7 100644 --- a/po/it.po +++ b/po/it.po @@ -3483,21 +3483,35 @@ msgstr "Connessione LAN" #: inetcpl.rc:125 #, fuzzy -#| msgid "&Local server" -msgid "Proxy server" -msgstr "Server &locale" +#| msgid "Wine configuration" +msgid "Automatic configuration" +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:" diff --git a/po/ja.po b/po/ja.po index d2e7774db09..c11099f6bff 100644 --- a/po/ja.po +++ b/po/ja.po @@ -3429,21 +3429,35 @@ msgstr "LAN 接続" #: inetcpl.rc:125 #, fuzzy -#| msgid "&Local server" -msgid "Proxy server" -msgstr "ローカル サーバ(&L)" +#| msgid "Wine configuration" +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" 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:" diff --git a/po/ko.po b/po/ko.po index 9e7f05c3906..befd75713af 100644 --- a/po/ko.po +++ b/po/ko.po @@ -3427,21 +3427,35 @@ msgstr "랜 연결" #: inetcpl.rc:125 #, fuzzy -#| msgid "&Local server" -msgid "Proxy server" -msgstr "지역 서버(&L)" +#| msgid "Wine configuration" +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" 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:" diff --git a/po/lt.po b/po/lt.po index c2fca3a091c..34974c2b355 100644 --- a/po/lt.po +++ b/po/lt.po @@ -3437,18 +3437,32 @@ msgid "Connections" msgstr "Ryšiai" #: inetcpl.rc:125 -msgid "Proxy server" -msgstr "Įgaliotasis serveris" +#, fuzzy +#| msgid "Wine configuration" +msgid "Automatic configuration" +msgstr "„Wine“ konfigūravimas" #: inetcpl.rc:126 -msgid "Use a proxy server" -msgstr "Naudoti įgaliotąjį 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 "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:" diff --git a/po/ml.po b/po/ml.po index 6ab6ed01572..f456a78d82a 100644 --- a/po/ml.po +++ b/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 "" diff --git a/po/nb_NO.po b/po/nb_NO.po index 40775b064ed..bc8b06065bd 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -3440,18 +3440,32 @@ msgid "Connections" msgstr "Nettverksforbindelser" #: inetcpl.rc:125 -msgid "Proxy server" -msgstr "Mellomtjener" +#, fuzzy +#| msgid "Wine configuration" +msgid "Automatic configuration" +msgstr "Oppsett av Wine" #: inetcpl.rc:126 -msgid "Use a proxy server" -msgstr "Bruk en mellomtjener" +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 "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:" diff --git a/po/nl.po b/po/nl.po index 63fd14abde5..65dd247ba69 100644 --- a/po/nl.po +++ b/po/nl.po @@ -3468,21 +3468,35 @@ msgstr "LAN Verbinding" #: inetcpl.rc:125 #, fuzzy -#| msgid "&Local server" -msgid "Proxy server" -msgstr "&Lokale server" +#| msgid "Wine configuration" +msgid "Automatic configuration" +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:" diff --git a/po/or.po b/po/or.po index ee9293709ee..12cf3a9ecb3 100644 --- a/po/or.po +++ b/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 "" diff --git a/po/pa.po b/po/pa.po index 2b5e49e6a8e..f2f532da3c8 100644 --- a/po/pa.po +++ b/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 "" diff --git a/po/pl.po b/po/pl.po index 402efd0a2b0..90ccb5a21cc 100644 --- a/po/pl.po +++ b/po/pl.po @@ -3455,21 +3455,35 @@ msgstr "Połączenie LAN" #: inetcpl.rc:125 #, fuzzy -#| msgid "&Local server" -msgid "Proxy server" -msgstr "Serwer &lokalny" +#| msgid "Wine configuration" +msgid "Automatic configuration" +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:" diff --git a/po/pt_BR.po b/po/pt_BR.po index 27bb9df77bb..a9f31b481b5 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -3449,21 +3449,35 @@ msgstr "Conexão LAN" #: inetcpl.rc:125 #, fuzzy -#| msgid "&Local server" -msgid "Proxy server" -msgstr "Servidor &local" +#| msgid "Wine configuration" +msgid "Automatic configuration" +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:" diff --git a/po/pt_PT.po b/po/pt_PT.po index 6d22e30767b..0e352d31f31 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -3459,21 +3459,35 @@ msgstr "Ligação LAN" #: inetcpl.rc:125 #, fuzzy -#| msgid "&Local server" -msgid "Proxy server" -msgstr "Servidor &Local" +#| msgid "Wine configuration" +msgid "Automatic configuration" +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:" diff --git a/po/rm.po b/po/rm.po index 5a976f94d09..62932c0d883 100644 --- a/po/rm.po +++ b/po/rm.po @@ -3375,18 +3375,31 @@ msgstr "" #: inetcpl.rc:125 #, fuzzy -msgid "Proxy server" -msgstr "&Annotaziun..." +msgid "Automatic configuration" +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 "" diff --git a/po/ro.po b/po/ro.po index 07233d3cd29..a2452f629e8 100644 --- a/po/ro.po +++ b/po/ro.po @@ -3416,21 +3416,35 @@ msgstr "Conexiune LAN" #: inetcpl.rc:125 #, fuzzy -#| msgid "&Local server" -msgid "Proxy server" -msgstr "Server &local" +#| msgid "Wine configuration" +msgid "Automatic configuration" +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:" diff --git a/po/ru.po b/po/ru.po index 9caec7dc403..156642be652 100644 --- a/po/ru.po +++ b/po/ru.po @@ -3442,18 +3442,32 @@ msgid "Connections" msgstr "Подключения" #: inetcpl.rc:125 -msgid "Proxy server" -msgstr "Прокси-сервер" +#, fuzzy +#| msgid "Wine configuration" +msgid "Automatic configuration" +msgstr "Настройка Wine" #: inetcpl.rc:126 -msgid "Use a proxy server" -msgstr "Использовать прокси-сервер" +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 "Порт:" diff --git a/po/sk.po b/po/sk.po index cb7ad88e812..c029a497d3c 100644 --- a/po/sk.po +++ b/po/sk.po @@ -3391,21 +3391,34 @@ msgstr "Aktivácia" #: inetcpl.rc:125 #, fuzzy -#| msgid "&Local server" -msgid "Proxy server" -msgstr "Lokálny server" +msgid "Automatic configuration" +msgstr "Informácie" #: 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 "" diff --git a/po/sl.po b/po/sl.po index 82d504fe7eb..6b92c4e0154 100644 --- a/po/sl.po +++ b/po/sl.po @@ -3477,21 +3477,35 @@ msgstr "Povezava LAN" #: inetcpl.rc:125 #, fuzzy -#| msgid "&Local server" -msgid "Proxy server" -msgstr "&Krajevni strežnik" +#| msgid "Wine configuration" +msgid "Automatic configuration" +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:" diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po index 7a5e8cc36af..601f88b68f7 100644 --- a/po/sr_RS@cyrillic.po +++ b/po/sr_RS@cyrillic.po @@ -3465,20 +3465,33 @@ msgstr "LAN веза" #: inetcpl.rc:125 #, fuzzy -msgid "Proxy server" -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 #, 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:" diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po index 63ed3dff08d..3d7c18c2ff0 100644 --- a/po/sr_RS@latin.po +++ b/po/sr_RS@latin.po @@ -3542,20 +3542,34 @@ msgstr "LAN veza" #: inetcpl.rc:125 #, fuzzy -msgid "Proxy server" -msgstr "Lokalna greška" +#| msgid "Wine configuration" +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:" diff --git a/po/sv.po b/po/sv.po index d9b3fb6dc9d..a425c019cf8 100644 --- a/po/sv.po +++ b/po/sv.po @@ -3438,21 +3438,35 @@ msgstr "LAN-anslutning" #: inetcpl.rc:125 #, fuzzy -#| msgid "&Local server" -msgid "Proxy server" -msgstr "&Lokal server" +#| msgid "Wine configuration" +msgid "Automatic configuration" +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:" diff --git a/po/te.po b/po/te.po index 6485c1d0574..9a09faae710 100644 --- a/po/te.po +++ b/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 "" diff --git a/po/th.po b/po/th.po index ae8074d135e..ea9c408440d 100644 --- a/po/th.po +++ b/po/th.po @@ -3388,19 +3388,32 @@ msgstr "รายละเอียด" #: inetcpl.rc:125 #, fuzzy -msgid "Proxy server" -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 #, 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 "" diff --git a/po/tr.po b/po/tr.po index 66f84c8007f..6b983c55726 100644 --- a/po/tr.po +++ b/po/tr.po @@ -3438,21 +3438,35 @@ msgstr "LAN Bağlantısı" #: inetcpl.rc:125 #, fuzzy -#| msgid "&Local server" -msgid "Proxy server" -msgstr "&Yerel sunucu" +#| msgid "Wine configuration" +msgid "Automatic configuration" +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:" diff --git a/po/uk.po b/po/uk.po index 65573514cf6..85264edf92b 100644 --- a/po/uk.po +++ b/po/uk.po @@ -3439,21 +3439,35 @@ msgstr "Підключення по локальній мережі" #: inetcpl.rc:125 #, fuzzy -#| msgid "&Local server" -msgid "Proxy server" -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 "" #: 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:" diff --git a/po/wa.po b/po/wa.po index 0f6cb983475..db3c8b68f5c 100644 --- a/po/wa.po +++ b/po/wa.po @@ -3403,18 +3403,31 @@ msgstr "Direccion" #: inetcpl.rc:125 #, fuzzy -msgid "Proxy server" -msgstr "&Sicrîre..." +msgid "Automatic configuration" +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 "" diff --git a/po/wine.pot b/po/wine.pot index ffa909b5921..62ef8819200 100644 --- a/po/wine.pot +++ b/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 "" diff --git a/po/zh_CN.po b/po/zh_CN.po index d6a2ff53630..2bc58eff3d0 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -3386,21 +3386,35 @@ msgstr "局域网连接" #: inetcpl.rc:125 #, fuzzy -#| msgid "&Local server" -msgid "Proxy server" -msgstr "本地服务器(&L)" +#| msgid "Wine configuration" +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" 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:" diff --git a/po/zh_TW.po b/po/zh_TW.po index 6edf5a87037..83e59e36a86 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -3400,21 +3400,35 @@ msgstr "區域網路連線" #: inetcpl.rc:125 #, fuzzy -#| msgid "&Local server" -msgid "Proxy server" -msgstr "本機伺服器(&L)" +#| msgid "Wine configuration" +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" 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:"