From 96a8e405c8fd1feedbf0d187428697657a5b3ac7 Mon Sep 17 00:00:00 2001
From: Joachim Henze <Joachim.Henze@reactos.org>
Date: Sun, 4 Feb 2024 20:35:34 +0100
Subject: [PATCH] [0.4.13][NETCFGX] RC-fixes, Radiobuttons, optimization

This backports the following commits:
0.4.15-dev-7247-g 8f349ab3c28a6e13c671b0393fee4784d1ef218e [NETCFGX] Create only one "Alternative Configuration" tab CORE-19328
0.4.15-dev-7124-g 6a7315228cca84e85619c54d7b2a755697fa55a6 [NETCFGX] IDD_TCPIP_ALTCF_DLG Fix radiobutton (#6083) CORE-19327
0.4.15-dev-7099-g 5012c6a2b02930397856f2e7271d96fd6b790205 [NETCFGX] IDD_TCPIP_BASIC_DLG Radiobuttons need 2 arrow-down-presses instead of one (#6049) CORE-19327
*PARTIALLY* 0.4.15-dev-7023-g a95863b1320b3735ab52669e7c9d615a1b084ec3 [NETCFGX] Half-implement TCP/IP alternate configuration (#6009) (I picked only some formatting, and the RC changes from that, not the initialization implementation yet) CORE-19331
0.4.15-dev-7015-g 9e42809fc1ea712c77dec62d0939700a12da8a8c [NETCFGX] Use CheckDlgButton/IsDlgButtonChecked instead of BM_GETCHECK/BM_SETCHECK CORE-19331
0.4.15-dev-6990-g 49399361652f291a3190e5599dc92df0b81183cb [NETCFGX] Strip 2x wrong WS_DISABLED style on dlgs (#5987)
0.4.15-dev-6904-g 1997c12252e3ae3d034550e99b0afd944587c120 [NETCFGX] 640x480-ify (#5946)
0.4.15-dev-6858-g 0177b1af45ee8b2161cab9bed18984eae110a551 [NETCFGX] *.rc 640x480-ify IDD_TCPIP_BASIC_DLG and IDD_TCPIP_ALTCF_DLG (#5902)

The binary size shrinks slightly on all branches:

master          RosBEWin2.2.2 GCC8.4.0 dbg x86                602.112 (0.4.15-dev-7264-ga328886)
releases/0.4.14 RosBEWin2.1.6 GCC4.7.2 dbg x86     570.880 -> 568.832
releases/0.4.13 RosBEWin2.1.6 GCC4.7.2 dbg x86     569.344 -> 567.808
releases/0.4.12 RosBEWin2.1.6 GCC4.7.2 dbg x86     548.864 -> 547.328
releases/0.4.11 RosBEWin2.1.6 GCC4.7.2 dbg x86     502.272 -> 500.736
releases/0.4.10 RosBEWin2.1.6 GCC4.7.2 dbg x86     452.096 -> 450.560
releases/0.4. 9 RosBEWin2.1.6 GCC4.7.2 dbg x86     452.096 -> 450.560
releases/0.4. 8 RosBEWin2.1.6 GCC4.7.2 dbg x86     452.096 -> 450.560
releases/0.4. 7 RosBEWin2.1.6 GCC4.7.2 dbg x86     452.096 -> 450.560
---
 dll/win32/netcfgx/classfactory.c             |   6 +-
 dll/win32/netcfgx/installer.c                |   2 -
 dll/win32/netcfgx/lang/bg-BG.rc              | 104 +++++------
 dll/win32/netcfgx/lang/cs-CZ.rc              | 113 ++++++------
 dll/win32/netcfgx/lang/da-DK.rc              | 106 +++++------
 dll/win32/netcfgx/lang/de-DE.rc              | 102 +++++------
 dll/win32/netcfgx/lang/el-GR.rc              | 104 +++++------
 dll/win32/netcfgx/lang/en-US.rc              | 104 +++++------
 dll/win32/netcfgx/lang/es-ES.rc              | 116 ++++++------
 dll/win32/netcfgx/lang/fr-FR.rc              | 108 ++++++------
 dll/win32/netcfgx/lang/he-IL.rc              | 104 +++++------
 dll/win32/netcfgx/lang/hu-HU.rc              | 106 +++++------
 dll/win32/netcfgx/lang/id-ID.rc              | 104 +++++------
 dll/win32/netcfgx/lang/it-IT.rc              | 104 +++++------
 dll/win32/netcfgx/lang/ja-JP.rc              | 108 ++++++------
 dll/win32/netcfgx/lang/nl-NL.rc              | 106 +++++------
 dll/win32/netcfgx/lang/no-NO.rc              | 104 +++++------
 dll/win32/netcfgx/lang/pl-PL.rc              | 111 ++++++------
 dll/win32/netcfgx/lang/pt-PT.rc              | 113 ++++++------
 dll/win32/netcfgx/lang/ro-RO.rc              | 110 ++++++------
 dll/win32/netcfgx/lang/ru-RU.rc              | 106 +++++------
 dll/win32/netcfgx/lang/sk-SK.rc              | 104 +++++------
 dll/win32/netcfgx/lang/sq-AL.rc              | 109 ++++++------
 dll/win32/netcfgx/lang/sv-SE.rc              | 106 +++++------
 dll/win32/netcfgx/lang/tr-TR.rc              | 142 +++++++--------
 dll/win32/netcfgx/lang/uk-UA.rc              | 104 +++++------
 dll/win32/netcfgx/lang/zh-CN.rc              | 141 +++++++--------
 dll/win32/netcfgx/lang/zh-TW.rc              | 142 +++++++--------
 dll/win32/netcfgx/netcfg_iface.c             |   4 +-
 dll/win32/netcfgx/res/Icon_Licence/Tango.txt |   2 +-
 dll/win32/netcfgx/resource.h                 |   2 +-
 dll/win32/netcfgx/tcpipconf_notify.c         | 176 +++++++++----------
 32 files changed, 1516 insertions(+), 1557 deletions(-)

diff --git a/dll/win32/netcfgx/classfactory.c b/dll/win32/netcfgx/classfactory.c
index 0ef66c5497e..37d6ade2107 100644
--- a/dll/win32/netcfgx/classfactory.c
+++ b/dll/win32/netcfgx/classfactory.c
@@ -101,10 +101,10 @@ static const IClassFactoryVtbl dclfvt =
 };
 
 
-IClassFactory * 
+IClassFactory *
 IClassFactory_fnConstructor(
-    LPFNCREATEINSTANCE lpfnCI, 
-    PLONG pcRefDll, 
+    LPFNCREATEINSTANCE lpfnCI,
+    PLONG pcRefDll,
     REFIID riidInst)
 {
     IClassFactoryImpl* lpclf;
diff --git a/dll/win32/netcfgx/installer.c b/dll/win32/netcfgx/installer.c
index a9eb0a710ba..76983353d18 100644
--- a/dll/win32/netcfgx/installer.c
+++ b/dll/win32/netcfgx/installer.c
@@ -360,9 +360,7 @@ InstallNetDevice(
     }
 
     if (!LoadStringW(netcfgx_hInstance, IDS_NET_CONNECT, szBuffer, sizeof(szBuffer)/sizeof(WCHAR)))
-    {
         wcscpy(szBuffer, L"Network Connection");
-    }
 
     rc = RegSetValueExW(hConnectionKey, L"Name", 0, REG_SZ, (const BYTE*)szBuffer, (wcslen(szBuffer) + 1) * sizeof(WCHAR));
     if (rc != ERROR_SUCCESS)
diff --git a/dll/win32/netcfgx/lang/bg-BG.rc b/dll/win32/netcfgx/lang/bg-BG.rc
index 7f2ca37b5ab..2a21a94e116 100644
--- a/dll/win32/netcfgx/lang/bg-BG.rc
+++ b/dll/win32/netcfgx/lang/bg-BG.rc
@@ -1,13 +1,13 @@
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
-IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 228
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Общи"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "IP настройките ви могат да се получат сами, ако мрежата ви го поддържа. В противен случай, трябва да попитате мрежовия си управител за правилните IP настройки.", -1, 9, 9, 235, 27
+    GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
     CONTROL "Самополучаване на IP адрес", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
-    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
     CONTROL "Из&ползване на следния IP адрес:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
     LTEXT "IP адрес:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
@@ -15,25 +15,25 @@ BEGIN
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
     LTEXT "Разпределител (gateway):", -1, 14, 105, 135, 8
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
-    CONTROL "Самополучаване на адреса на DNS сървъра", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
-    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
-    CONTROL "Из&ползване на следните адреси за DNS сървър", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
-    LTEXT "Предпочитан DNS сървър:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
-    LTEXT "Заместващ DNS сървър:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
-    PUSHBUTTON "Раз&ширени", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
+    CONTROL "Самополучаване на адреса на DNS сървъра", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
+    CONTROL "Из&ползване на следните адреси за DNS сървър", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    LTEXT "Предпочитан DNS сървър:", -1, 14, 161, 135, 8
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
+    LTEXT "Заместващ DNS сървър:", -1, 14, 176, 135, 8
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 176 - 2, 85, 12
+    PUSHBUTTON "Раз&ширени", IDC_ADVANCED, 186, 199, 50, 14, WS_TABSTOP
 END
 
-IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 228
+IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 216
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Заместваща настройка"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Ако компютърът се използва в повече от една мрежа, въведете заместващи IP настройки отдолу", -1, 9, 9, 220, 20
+    GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX
     CONTROL "&Автоматични лични IP адреси", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
-    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
-    CONTROL "На&строено от потребителя", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
+    CONTROL "На&строено от потребителя", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
     LTEXT "Адрес за IP:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "Под&мрежова маска:", -1, 14, 95, 135, 8
@@ -46,56 +46,56 @@ BEGIN
     CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
-IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Настройки на IP"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "IP адреси", -1, 5, 5, 240, 90
-    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 55
-    PUSHBUTTON "Добавяне...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Обработка...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Премахване", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP
-    GROUPBOX "Подразбирани разпределители:", -1, 5, 100, 240, 90
-    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 215, 55
-    PUSHBUTTON "Добавяне...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Обработка...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Премахване", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP
-    GROUPBOX "", -1, 5, 200, 240, 30
-    CHECKBOX "Автоматични мерни единици", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "МЕрни единици на интерфейса:", -1, 15, 215, 90, 12
-    EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER
+    GROUPBOX "IP адреси", -1, 5, 5, 240, 83
+    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 50
+    PUSHBUTTON "Добавяне...", IDC_IPADD, 60, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Обработка...", IDC_IPMOD, 120, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Премахване", IDC_IPDEL, 180, 67, 50, 14, WS_TABSTOP
+    GROUPBOX "Подразбирани разпределители:", -1, 5, 93, 240, 83
+    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 103, 215, 50
+    PUSHBUTTON "Добавяне...", IDC_GWADD, 60, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Обработка...", IDC_GWMOD, 120, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Премахване", IDC_GWDEL, 180, 155, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 5, 181, 240, 30
+    CHECKBOX "Автоматични мерни единици", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "МЕрни единици на интерфейса:", -1, 15, 195, 90, 12
+    EDITTEXT IDC_METRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
-IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 270
+IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "DNS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 50, LBS_NOTIFY
+    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
     LTEXT "Адреси на DNS, по реда на използване:", -1, 5, 5, 180, 12
-    PUSHBUTTON "Нагоре", IDC_DNSADDRUP, 190, 25, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Надолу", IDC_DNSADDRDOWN, 190, 45, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Добавяне...", IDC_DNSADDRADD, 15, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Обработка...", IDC_DNSADDRMOD, 75, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Пре&махване", IDC_DNSADDRDEL, 135, 69, 50, 14, WS_TABSTOP
-    LTEXT "Следните три настройки се прилагат на всички свързвания, за които е позволен TCP/IP. За разрешаване на негодни имена:", -1, 5, 90, 220, 24
-    CONTROL "Наставяне на &първичните и обособените за връзките DNS наставки", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 220, 12
-    CHECKBOX "Наставяне на родителските на&ставки към първичната DNS наставка", IDC_TOPPRIMSUFFIX, 15, 125, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CONTROL "Добавяне на &тези DNS наставки (подред):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 220, 12
-    LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY
-    PUSHBUTTON "Нагоре", IDC_DNSSUFFIXUP, 190, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Надолу", IDC_DNSSUFFIXDOWN, 190, 180, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Добавяне...", IDC_DNSSUFFIXADD, 15, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Обработка...", IDC_DNSSUFFIXMOD, 75, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Пре&махване", IDC_DNSSUFFIXDEL, 135, 207, 50, 14, WS_TABSTOP
-    LTEXT "DNS &наставка за това свързване:", -1, 5, 228, 110, 14
-    EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP
-    CHECKBOX "Вписване на адресите на това свързване в DNS:", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX "Из&ползване на DNS наставката при вписването на DNS", IDC_USESUFFIX, 15, 255, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    PUSHBUTTON "Нагоре", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Надолу", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Добавяне...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Обработка...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Пре&махване", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
+    LTEXT "Следните три настройки се прилагат на всички свързвания, за които е позволен TCP/IP. За разрешаване на негодни имена:", -1, 5, 70, 220, 24
+    CONTROL "Наставяне на &първичните и обособените за връзките DNS наставки", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
+    CHECKBOX "Наставяне на родителските на&ставки към първичната DNS наставка", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CONTROL "Добавяне на &тези DNS наставки (подред):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 115, 220, 12
+    LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
+    PUSHBUTTON "Нагоре", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Надолу", IDC_DNSSUFFIXDOWN, 190, 145, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Добавяне...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Обработка...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Пре&махване", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
+    LTEXT "DNS &наставка за това свързване:", -1, 5, 183, 110, 14
+    EDITTEXT IDC_SUFFIX, 120, 180, 100, 12, WS_TABSTOP
+    CHECKBOX "Вписване на адресите на това свързване в DNS:", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "Из&ползване на DNS наставката при вписването на DNS", IDC_USESUFFIX, 15, 207, 227, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 END
 
-IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Настройки"
 FONT 8, "MS Shell Dlg"
@@ -196,7 +196,7 @@ BEGIN
 END
 
 IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Advanced"
 FONT 8, "MS Shell Dlg"
 BEGIN
diff --git a/dll/win32/netcfgx/lang/cs-CZ.rc b/dll/win32/netcfgx/lang/cs-CZ.rc
index 46e2f78a09e..cbb5a3a5870 100644
--- a/dll/win32/netcfgx/lang/cs-CZ.rc
+++ b/dll/win32/netcfgx/lang/cs-CZ.rc
@@ -1,19 +1,16 @@
-/* FILE:       dll/win32/netcfgx/lang/cs-CZ.rc
- * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com)
- * UPDATED:    2010-03-14
- * THANKS TO:  potapnik, who translated part of this file
- */
+// COPYRIGHT: 2010 Radek Liska aka Black_Fox <radekliska@gmail.com>
+//            potapnik
 
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
-IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 228
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Obecné nastavení"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Konfigurace IP adres může proběhnout automaticky, pokud to síť dovoluje. V opačném případě kontaktujte správce sítě pro správné nastavení.", -1, 9, 9, 228, 27
-    CONTROL "Získat IP adresu automaticky", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 43, 210, 12
-    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
+    GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
+    CONTROL "Získat IP adresu automaticky", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
     CONTROL "&Použít následující IP adresu:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
     LTEXT "IP adresa:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
@@ -21,25 +18,25 @@ BEGIN
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
     LTEXT "Výchozí brána:", -1, 14, 105, 135, 8
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
-    CONTROL "Získat adresy DNS serverů automaticky", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 139, 210, 12
-    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
-    CONTROL "&Použít následující adresy DNS serverů", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
-    LTEXT "Upřednostňovaný DNS server:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
-    LTEXT "Záložní DNS server:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
-    PUSHBUTTON "&Rozšířené", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
+    CONTROL "Získat adresy DNS serverů automaticky", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
+    CONTROL "&Použít následující adresy DNS serverů", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    LTEXT "Upřednostňovaný DNS server:", -1, 14, 161, 135, 8
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
+    LTEXT "Záložní DNS server:", -1, 14, 176, 135, 8
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 176 - 2, 85, 12
+    PUSHBUTTON "&Rozšířené", IDC_ADVANCED, 186, 199, 50, 14, WS_TABSTOP
 END
 
-IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 228
+IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 216
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Alternativní konfigurace"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Pokud je tento počítač používán ve více než jedné síti, lze zadat alternativní nastavení níže", -1, 9, 9, 220, 20
+    GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX
     CONTROL "Au&tomatická privátní IP adresa", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
-    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
-    CONTROL "&Uživatelské nastavení", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
+    CONTROL "&Uživatelské nastavení", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
     LTEXT "&IP adresa:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "&Maska podsítě:", -1, 14, 95, 135, 8
@@ -52,56 +49,56 @@ BEGIN
     CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
-IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "IP nastavení"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "IP adresy", -1, 5, 5, 240, 90
-    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 55
-    PUSHBUTTON "Přidat...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Upravit...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Odebrat", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP
-    GROUPBOX "Výchozí brány:", -1, 5, 100, 240, 90
-    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 215, 55
-    PUSHBUTTON "Přidat...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Upravit...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Odebrat", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP
-    GROUPBOX "", -1, 5, 200, 240, 30
-    CHECKBOX "Automatická metrika", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "Metrika rozhraní:", -1, 15, 215, 90, 12
-    EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER
+    GROUPBOX "IP adresy", -1, 5, 5, 240, 83
+    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 50
+    PUSHBUTTON "Přidat...", IDC_IPADD, 60, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Upravit...", IDC_IPMOD, 120, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Odebrat", IDC_IPDEL, 180, 67, 50, 14, WS_TABSTOP
+    GROUPBOX "Výchozí brány:", -1, 5, 93, 240, 83
+    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 103, 215, 50
+    PUSHBUTTON "Přidat...", IDC_GWADD, 60, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Upravit...", IDC_GWMOD, 120, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Odebrat", IDC_GWDEL, 180, 155, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 5, 181, 240, 30
+    CHECKBOX "Automatická metrika", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "Metrika rozhraní:", -1, 15, 195, 90, 12
+    EDITTEXT IDC_METRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
-IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 270
+IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "DNS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 50, LBS_NOTIFY
+    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
     LTEXT "&Adresy DNS serverů v pořadí využití:", -1, 5, 5, 180, 12
-    PUSHBUTTON "Nahoru", IDC_DNSADDRUP, 190, 25, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Dolů", IDC_DNSADDRDOWN, 190, 45, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Přidat...", IDC_DNSADDRADD, 15, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Upravit...", IDC_DNSADDRMOD, 75, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Odebrat", IDC_DNSADDRDEL, 135, 69, 50, 14, WS_TABSTOP
-    LTEXT "Následující tři nastavení jsou aplikována na všechna připojení s povoleným TCP/IP. Při překladu nekvalifikovaných jmen:", -1, 5, 90, 220, 24
-    CONTROL "Připojit p&rimární a připojením dané DNS přípony", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 220, 12
-    CHECKBOX "Připojit rodičovské přípony primární DNS přípony", IDC_TOPPRIMSUFFIX, 15, 125, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CONTROL "Připojit &tyto DNS přípony (v tomto pořadí):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 220, 12
-    LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY
-    PUSHBUTTON "Nahoru", IDC_DNSSUFFIXUP, 190, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Dolů", IDC_DNSSUFFIXDOWN, 190, 180, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Přidat...", IDC_DNSSUFFIXADD, 15, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Upravit...", IDC_DNSSUFFIXMOD, 75, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Odebrat", IDC_DNSSUFFIXDEL, 135, 207, 50, 14, WS_TABSTOP
-    LTEXT "DNS přípo&na tohoto připojení:", -1, 5, 228, 110, 14
-    EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP
-    CHECKBOX "Registrovat &adresy tohoto připojení v DNS", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX "P&oužít DNS příponu tohoto připojení při DNS registraci", IDC_USESUFFIX, 15, 255, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    PUSHBUTTON "Nahoru", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Dolů", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Přidat...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Upravit...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Odebrat", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
+    LTEXT "Následující tři nastavení jsou aplikována na všechna připojení s povoleným TCP/IP. Při překladu nekvalifikovaných jmen:", -1, 5, 70, 220, 24
+    CONTROL "Připojit p&rimární a připojením dané DNS přípony", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
+    CHECKBOX "Připojit rodičovské přípony primární DNS přípony", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CONTROL "Připojit &tyto DNS přípony (v tomto pořadí):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 115, 220, 12
+    LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
+    PUSHBUTTON "Nahoru", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Dolů", IDC_DNSSUFFIXDOWN, 190, 145, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Přidat...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Upravit...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Odebrat", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
+    LTEXT "DNS přípo&na tohoto připojení:", -1, 5, 183, 110, 14
+    EDITTEXT IDC_SUFFIX, 120, 180, 100, 12, WS_TABSTOP
+    CHECKBOX "Registrovat &adresy tohoto připojení v DNS", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "P&oužít DNS příponu tohoto připojení při DNS registraci", IDC_USESUFFIX, 15, 207, 227, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 END
 
-IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Volby"
 FONT 8, "MS Shell Dlg"
@@ -202,7 +199,7 @@ BEGIN
 END
 
 IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Advanced"
 FONT 8, "MS Shell Dlg"
 BEGIN
diff --git a/dll/win32/netcfgx/lang/da-DK.rc b/dll/win32/netcfgx/lang/da-DK.rc
index dda0cbce765..1bf06b53e04 100644
--- a/dll/win32/netcfgx/lang/da-DK.rc
+++ b/dll/win32/netcfgx/lang/da-DK.rc
@@ -1,13 +1,13 @@
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
-IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 228
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Du kan få din IP opsætning indstillet automatisk, hvis dit Netværkskort understøtter denne mulighed. Ellers, er du nød til at spørge din 'Netværks Administrator' omkring din IP opsætning.", -1, 9, 9, 235, 27
-    CONTROL "Tildel Automatisk en IP Adresse", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 43, 210, 12
-    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
+    GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
+    CONTROL "Tildel Automatisk en IP Adresse", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
     CONTROL "&Brug følge IP Adresse:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
     LTEXT "IP Adresse:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
@@ -15,25 +15,25 @@ BEGIN
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
     LTEXT "Standard gateway:", -1, 14, 105, 135, 8
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
-    CONTROL "Tildel automatisk en DNS server adresse.", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 139, 210, 12
-    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
-    CONTROL "&Brug følgende DNS Server Adresse:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
-    LTEXT "Fortrukket DNS server:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
-    LTEXT "Alternativ DNS server:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
-    PUSHBUTTON "&Avanceret", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
+    CONTROL "Tildel automatisk en DNS server adresse", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
+    CONTROL "&Brug følgende DNS Server Adresse:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    LTEXT "Fortrukket DNS server:", -1, 14, 161, 135, 8
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
+    LTEXT "Alternativ DNS server:", -1, 14, 176, 135, 8
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 176 - 2, 85, 12
+    PUSHBUTTON "&Avanceret", IDC_ADVANCED, 186, 199, 50, 14, WS_TABSTOP
 END
 
-IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 228
+IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 216
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Alternate Configuration"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "If this computer is used on more than one network, enter the alternate IP settings below", -1, 9, 9, 220, 20
+    GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX
     CONTROL "Au&tomatic private IP address", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
-    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
-    CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
+    CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
     LTEXT "&IP address:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8
@@ -46,56 +46,56 @@ BEGIN
     CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
-IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "IP Settings"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "IP addresses", -1, 5, 5, 240, 90
-    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 55
-    PUSHBUTTON "Add...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Edit...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remove", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP
-    GROUPBOX "Default gateways:", -1, 5, 100, 240, 90
-    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 215, 55
-    PUSHBUTTON "Add...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Edit...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remove", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP
-    GROUPBOX "", -1, 5, 200, 240, 30
-    CHECKBOX "Automatic metric", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "Interface metric:", -1, 15, 215, 90, 12
-    EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER
+    GROUPBOX "IP addresses", -1, 5, 5, 240, 83
+    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 50
+    PUSHBUTTON "Add...", IDC_IPADD, 60, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Edit...", IDC_IPMOD, 120, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remove", IDC_IPDEL, 180, 67, 50, 14, WS_TABSTOP
+    GROUPBOX "Default gateways:", -1, 5, 93, 240, 83
+    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 103, 215, 50
+    PUSHBUTTON "Add...", IDC_GWADD, 60, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Edit...", IDC_GWMOD, 120, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remove", IDC_GWDEL, 180, 155, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 5, 181, 240, 30
+    CHECKBOX "Automatic metric", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "Interface metric:", -1, 15, 195, 90, 12
+    EDITTEXT IDC_METRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
-IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 270
+IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "DNS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 50, LBS_NOTIFY
+    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
     LTEXT "D&NS server addresses, in order of use:", -1, 5, 5, 180, 12
-    PUSHBUTTON "Up", IDC_DNSADDRUP, 190, 25, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Down", IDC_DNSADDRDOWN, 190, 45, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Add...", IDC_DNSADDRADD, 15, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Edit...", IDC_DNSADDRMOD, 75, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remo&ve", IDC_DNSADDRDEL, 135, 69, 50, 14, WS_TABSTOP
-    LTEXT "The following three settings are applied to all connections with TCP/IP enabled. For resolution of unqualified names:", -1, 5, 90, 220, 24
-    CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 220, 12
-    CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 125, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CONTROL "Append t&hese DNS suffixes(in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 220, 12
-    LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY
-    PUSHBUTTON "Up", IDC_DNSSUFFIXUP, 190, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Down", IDC_DNSSUFFIXDOWN, 190, 180, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Add...", IDC_DNSSUFFIXADD, 15, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Edit...", IDC_DNSSUFFIXMOD, 75, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remo&ve", IDC_DNSSUFFIXDEL, 135, 207, 50, 14, WS_TABSTOP
-    LTEXT "DNS &suffix for this connection:", -1, 5, 228, 110, 14
-    EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP
-    CHECKBOX "&Register this connection's addresses in DNS", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX "&Use this connection's DNS suffix in DNS registration", IDC_USESUFFIX, 15, 255, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    PUSHBUTTON "Up", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Down", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Add...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Edit...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remo&ve", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
+    LTEXT "The following three settings are applied to all connections with TCP/IP enabled. For resolution of unqualified names:", -1, 5, 70, 220, 24
+    CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
+    CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CONTROL "Append t&hese DNS suffixes(in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 115, 220, 12
+    LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
+    PUSHBUTTON "Up", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Down", IDC_DNSSUFFIXDOWN, 190, 145, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Add...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Edit...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remo&ve", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
+    LTEXT "DNS &suffix for this connection:", -1, 5, 183, 110, 14
+    EDITTEXT IDC_SUFFIX, 120, 180, 100, 12, WS_TABSTOP
+    CHECKBOX "&Register this connection's addresses in DNS", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "&Use this connection's DNS suffix in DNS registration", IDC_USESUFFIX, 15, 207, 227, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 END
 
-IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Options"
 FONT 8, "MS Shell Dlg"
@@ -196,7 +196,7 @@ BEGIN
 END
 
 IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Advanced"
 FONT 8, "MS Shell Dlg"
 BEGIN
diff --git a/dll/win32/netcfgx/lang/de-DE.rc b/dll/win32/netcfgx/lang/de-DE.rc
index 642e8acb156..5fc8047dced 100644
--- a/dll/win32/netcfgx/lang/de-DE.rc
+++ b/dll/win32/netcfgx/lang/de-DE.rc
@@ -1,13 +1,13 @@
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
-IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 228
+IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Allgemein"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "IP-Einstellungen können automatisch zugewiesen werden, wenn das Netzwerk diese Funktion unterstützt. Wenden Sie sich andernfalls an den Netzwerkadministrator, um die geeigneten IP-Einstellungen zu beziehen.", -1, 9, 9, 235, 27
+    GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
     CONTROL "I&P-Adresse automatisch beziehen", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
-    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
     CONTROL "Folgende IP-&Adresse verwenden:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
     LTEXT "&IP-Adresse:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
@@ -15,25 +15,25 @@ BEGIN
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
     LTEXT "&Standardgateway:", -1, 14, 105, 135, 8
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
-    CONTROL "D&NS-Serveradresse automatisch beziehen", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
-    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
-    CONTROL "Folgende DNS-Serveradressen &verwenden:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
-    LTEXT "&Bevorzugter DNS-Server:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
-    LTEXT "A&lternativer DNS-Server:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
-    PUSHBUTTON "&Erweitert...", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
+    CONTROL "D&NS-Serveradresse automatisch beziehen", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
+    CONTROL "Folgende DNS-Serveradressen &verwenden:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    LTEXT "&Bevorzugter DNS-Server:", -1, 14, 161, 135, 8
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
+    LTEXT "A&lternativer DNS-Server:", -1, 14, 176, 135, 8
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 176 - 2, 85, 12
+    PUSHBUTTON "&Erweitert...", IDC_ADVANCED, 186, 199, 50, 14, WS_TABSTOP
 END
 
-IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 228
+IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 216
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Alternative Konfiguration"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Geben Sie alternative IP-Einstellungen an, falls dieser Computer in mehreren Netzwerken verwendet wird.", -1, 9, 9, 220, 20
+    GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX
     CONTROL "Au&tomatisch zugewiesene, private IP-Adresse", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
-    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
-    CONTROL "B&enutzerdefiniert", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
+    CONTROL "B&enutzerdefiniert", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
     LTEXT "&IP-Adresse:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "S&ubnetzmaske:", -1, 14, 95, 135, 8
@@ -46,56 +46,56 @@ BEGIN
     CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
-IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "IP-Einstellungen"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "IP-Adressen", -1, 5, 5, 240, 90
-    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 55
-    PUSHBUTTON "Hinzufügen...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Bearbeiten...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Entfernen", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP
-    GROUPBOX "Standardgateways", -1, 5, 100, 240, 90
-    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 215, 55
-    PUSHBUTTON "Hinzufügen...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Bearbeiten...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Entfernen", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP
-    GROUPBOX "", -1, 5, 200, 240, 30
-    CHECKBOX "A&utomatische Metrik", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "Schnittstellenmetrik:", -1, 15, 215, 90, 12
-    EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER
+    GROUPBOX "IP-Adressen", -1, 5, 5, 240, 83
+    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 50
+    PUSHBUTTON "Hinzufügen...", IDC_IPADD, 60, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Bearbeiten...", IDC_IPMOD, 120, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Entfernen", IDC_IPDEL, 180, 67, 50, 14, WS_TABSTOP
+    GROUPBOX "Standardgateways", -1, 5, 93, 240, 83
+    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 103, 215, 50
+    PUSHBUTTON "Hinzufügen...", IDC_GWADD, 60, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Bearbeiten...", IDC_GWMOD, 120, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Entfernen", IDC_GWDEL, 180, 155, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 5, 181, 240, 30
+    CHECKBOX "A&utomatische Metrik", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "Schnittstellenmetrik:", -1, 15, 195, 90, 12
+    EDITTEXT IDC_METRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
-IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 270
+IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "DNS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 50, LBS_NOTIFY
+    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
     LTEXT "D&NS-Serveradressen in Verwendungsreihenfolge:", -1, 5, 5, 180, 12
-    PUSHBUTTON "Aufwärts", IDC_DNSADDRUP, 190, 25, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Abwärts", IDC_DNSADDRDOWN, 190, 45, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Hinzufügen...", IDC_DNSADDRADD, 15, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Bearbeiten...", IDC_DNSADDRMOD, 75, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Entfernen", IDC_DNSADDRDEL, 135, 69, 50, 14, WS_TABSTOP
-    LTEXT "Die folgenden drei Einstellungen gelten für alle Verbindungen, für die TCP/IP aktiviert ist: Für die Auflösung unvollständiger Namen:", -1, 5, 90, 220, 24
-    CONTROL "Primäre und verbindungspezifische DNS-Suffixe anhängen", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 220, 12
-    CHECKBOX "Übergeor&dnete Suffixe des primären DNS-Suffixes anhängen", IDC_TOPPRIMSUFFIX, 15, 125, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CONTROL "Diese DNS-Suffixe anhängen (in Reihenfolge):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 220, 12
-    LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY
-    PUSHBUTTON "Aufwärts", IDC_DNSSUFFIXUP, 190, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Abwärts", IDC_DNSSUFFIXDOWN, 190, 180, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Hinzufügen...", IDC_DNSSUFFIXADD, 15, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Bearbe&iten...", IDC_DNSSUFFIXMOD, 75, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Entfernen", IDC_DNSSUFFIXDEL, 135, 207, 50, 14, WS_TABSTOP
-    LTEXT "DNS-Suffix für diese Verbindung:", -1, 5, 228, 110, 14
-    EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP
-    CHECKBOX "Adressen dieser Verbindung in DNS registrieren", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX "DNS-Suffix dieser Verbindung in DNS-Registrierung verwenden", IDC_USESUFFIX, 15, 255, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    PUSHBUTTON "Aufwärts", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Abwärts", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Hinzufügen...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Bearbeiten...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Entfernen", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
+    LTEXT "Die folgenden drei Einstellungen gelten für alle Verbindungen, für die TCP/IP aktiviert ist: Für die Auflösung unvollständiger Namen:", -1, 5, 70, 220, 24
+    CONTROL "Primäre und verbindungspezifische DNS-Suffixe anhängen", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
+    CHECKBOX "Übergeor&dnete Suffixe des primären DNS-Suffixes anhängen", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CONTROL "Diese DNS-Suffixe anhängen (in Reihenfolge):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 115, 220, 12
+    LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
+    PUSHBUTTON "Aufwärts", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Abwärts", IDC_DNSSUFFIXDOWN, 190, 145, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Hinzufügen...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Bearbe&iten...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Entfernen", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
+    LTEXT "DNS-Suffix für diese Verbindung:", -1, 5, 183, 110, 14
+    EDITTEXT IDC_SUFFIX, 120, 180, 100, 12, WS_TABSTOP
+    CHECKBOX "Adressen dieser Verbindung in DNS registrieren", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "DNS-Suffix dieser Verbindung in DNS-Registrierung verwenden", IDC_USESUFFIX, 15, 207, 227, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 END
 
-IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Optionen"
 FONT 8, "MS Shell Dlg"
@@ -196,7 +196,7 @@ BEGIN
 END
 
 IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Erweitert"
 FONT 8, "MS Shell Dlg"
 BEGIN
diff --git a/dll/win32/netcfgx/lang/el-GR.rc b/dll/win32/netcfgx/lang/el-GR.rc
index 3821ba2667e..1e440055f26 100644
--- a/dll/win32/netcfgx/lang/el-GR.rc
+++ b/dll/win32/netcfgx/lang/el-GR.rc
@@ -1,13 +1,13 @@
 LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
 
-IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 228
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Γενικά"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Μπορείτε να ορίσετε τις IP παραμέτρους αυτόματα, εάν το δίκτυό σας υποστηρίζει αυτήξ τη δυνατότητα. Ειδάλλως θα πρέπει να ρωτήσετε τον διαχειριστή δικτύου σας για τις  for the κατάλληλες ρυθμίσεις IP.", -1, 9, 9, 235, 27
+    GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
     CONTROL "Να γίνεται εύρεση της διεύθυνσης IP αυτόματα", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
-    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
     CONTROL "&Use the following IP address:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
     LTEXT "Διεύθυνση IP:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
@@ -15,25 +15,25 @@ BEGIN
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
     LTEXT "Default gateway:", -1, 14, 105, 135, 8
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
-    CONTROL "Να γίνεται εύρεση της διεύθυνσης του DNS διακομιστή αυτόματα", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
-    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
-    CONTROL "&Χρήση των παρακάτω διευθύσεων DNS διακομιστών", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
-    LTEXT "Προτιμητέος DNS διακομιστής:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
-    LTEXT "Επιπλέον DNS διακομιστής:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
-    PUSHBUTTON "&Για Προχωρημένους", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
+    CONTROL "Να γίνεται εύρεση της διεύθυνσης του DNS διακομιστή αυτόματα", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
+    CONTROL "&Χρήση των παρακάτω διευθύσεων DNS διακομιστών", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    LTEXT "Προτιμητέος DNS διακομιστής:", -1, 14, 161, 135, 8
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
+    LTEXT "Επιπλέον DNS διακομιστής:", -1, 14, 176, 135, 8
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 176 - 2, 85, 12
+    PUSHBUTTON "&Για Προχωρημένους", IDC_ADVANCED, 186, 199, 50, 14, WS_TABSTOP
 END
 
-IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 228
+IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 216
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Alternate Configuration"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "If this computer is used on more than one network, enter the alternate IP settings below", -1, 9, 9, 220, 20
+    GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX
     CONTROL "Au&tomatic private IP address", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
-    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
-    CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
+    CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
     LTEXT "&IP address:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8
@@ -46,56 +46,56 @@ BEGIN
     CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
-IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "IP Settings"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "IP addresses", -1, 5, 5, 240, 90
-    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 55
-    PUSHBUTTON "Add...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Edit...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remove", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP
-    GROUPBOX "Default gateways:", -1, 5, 100, 240, 90
-    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 215, 55
-    PUSHBUTTON "Add...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Edit...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remove", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP
-    GROUPBOX "", -1, 5, 200, 240, 30
-    CHECKBOX "Automatic metric", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "Interface metric:", -1, 15, 215, 90, 12
-    EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER
+    GROUPBOX "IP addresses", -1, 5, 5, 240, 83
+    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 50
+    PUSHBUTTON "Add...", IDC_IPADD, 60, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Edit...", IDC_IPMOD, 120, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remove", IDC_IPDEL, 180, 67, 50, 14, WS_TABSTOP
+    GROUPBOX "Default gateways:", -1, 5, 93, 240, 83
+    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 103, 215, 50
+    PUSHBUTTON "Add...", IDC_GWADD, 60, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Edit...", IDC_GWMOD, 120, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remove", IDC_GWDEL, 180, 155, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 5, 181, 240, 30
+    CHECKBOX "Automatic metric", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "Interface metric:", -1, 15, 195, 90, 12
+    EDITTEXT IDC_METRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
-IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 270
+IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "DNS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 50, LBS_NOTIFY
+    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
     LTEXT "D&NS server addresses, in order of use:", -1, 5, 5, 180, 12
-    PUSHBUTTON "Up", IDC_DNSADDRUP, 190, 25, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Down", IDC_DNSADDRDOWN, 190, 45, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Add...", IDC_DNSADDRADD, 15, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Edit...", IDC_DNSADDRMOD, 75, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remo&ve", IDC_DNSADDRDEL, 135, 69, 50, 14, WS_TABSTOP
-    LTEXT "The following three settings are applied to all connections with TCP/IP enabled. For resolution of unqualified names:", -1, 5, 90, 220, 24
-    CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 220, 12
-    CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 125, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CONTROL "Append t&hese DNS suffixes(in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 220, 12
-    LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY
-    PUSHBUTTON "Up", IDC_DNSSUFFIXUP, 190, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Down", IDC_DNSSUFFIXDOWN, 190, 180, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Add...", IDC_DNSSUFFIXADD, 15, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Edit...", IDC_DNSSUFFIXMOD, 75, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remo&ve", IDC_DNSSUFFIXDEL, 135, 207, 50, 14, WS_TABSTOP
-    LTEXT "DNS &suffix for this connection:", -1, 5, 228, 110, 14
-    EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP
-    CHECKBOX "&Register this connection's addresses in DNS", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX "&Use this connection's DNS suffix in DNS registration", IDC_USESUFFIX, 15, 255, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    PUSHBUTTON "Up", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Down", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Add...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Edit...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remo&ve", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
+    LTEXT "The following three settings are applied to all connections with TCP/IP enabled. For resolution of unqualified names:", -1, 5, 70, 220, 24
+    CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
+    CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CONTROL "Append t&hese DNS suffixes(in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 115, 220, 12
+    LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
+    PUSHBUTTON "Up", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Down", IDC_DNSSUFFIXDOWN, 190, 145, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Add...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Edit...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remo&ve", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
+    LTEXT "DNS &suffix for this connection:", -1, 5, 183, 110, 14
+    EDITTEXT IDC_SUFFIX, 120, 180, 100, 12, WS_TABSTOP
+    CHECKBOX "&Register this connection's addresses in DNS", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "&Use this connection's DNS suffix in DNS registration", IDC_USESUFFIX, 15, 207, 227, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 END
 
-IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Options"
 FONT 8, "MS Shell Dlg"
@@ -196,7 +196,7 @@ BEGIN
 END
 
 IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Advanced"
 FONT 8, "MS Shell Dlg"
 BEGIN
diff --git a/dll/win32/netcfgx/lang/en-US.rc b/dll/win32/netcfgx/lang/en-US.rc
index c4650e90596..acbc0f2b70c 100644
--- a/dll/win32/netcfgx/lang/en-US.rc
+++ b/dll/win32/netcfgx/lang/en-US.rc
@@ -1,13 +1,13 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
-IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 228
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "You can get IP settings assigned automatically if your network supports this capability. Otherwise, you need to ask your network administrator for the appropriate IP settings.", -1, 9, 9, 235, 27
+    GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
     CONTROL "Obtain the IP address automatically", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
-    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
     CONTROL "&Use the following IP address:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
     LTEXT "IP address:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
@@ -15,25 +15,25 @@ BEGIN
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
     LTEXT "Default gateway:", -1, 14, 105, 135, 8
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
-    CONTROL "Obtain the DNS server address automatically", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
-    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
-    CONTROL "&Use the following DNS server addresses:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
-    LTEXT "Preferred DNS server:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
-    LTEXT "Alternate DNS server:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
-    PUSHBUTTON "&Advanced", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
+    CONTROL "Obtain the DNS server address automatically", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
+    CONTROL "&Use the following DNS server addresses:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    LTEXT "Preferred DNS server:", -1, 14, 161, 135, 8
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
+    LTEXT "Alternate DNS server:", -1, 14, 176, 135, 8
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 176 - 2, 85, 12
+    PUSHBUTTON "&Advanced", IDC_ADVANCED, 186, 199, 50, 14, WS_TABSTOP
 END
 
-IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 228
+IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 216
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Alternate Configuration"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "If this computer is used on more than one network, enter the alternate IP settings below", -1, 9, 9, 220, 20
+    GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX
     CONTROL "Au&tomatic private IP address", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
-    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
-    CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
+    CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
     LTEXT "&IP address:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8
@@ -46,56 +46,56 @@ BEGIN
     CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
-IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "IP Settings"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "IP addresses", -1, 5, 5, 240, 90
-    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 55
-    PUSHBUTTON "Add...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Edit...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remove", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP
-    GROUPBOX "Default gateways:", -1, 5, 100, 240, 90
-    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 215, 55
-    PUSHBUTTON "Add...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Edit...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remove", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP
-    GROUPBOX "", -1, 5, 200, 240, 30
-    CHECKBOX "Automatic metric", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "Interface metric:", -1, 15, 215, 90, 12
-    EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER
+    GROUPBOX "IP addresses", -1, 5, 5, 240, 83
+    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 50
+    PUSHBUTTON "Add...", IDC_IPADD, 60, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Edit...", IDC_IPMOD, 120, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remove", IDC_IPDEL, 180, 67, 50, 14, WS_TABSTOP
+    GROUPBOX "Default gateways:", -1, 5, 93, 240, 83
+    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 103, 215, 50
+    PUSHBUTTON "Add...", IDC_GWADD, 60, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Edit...", IDC_GWMOD, 120, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remove", IDC_GWDEL, 180, 155, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 5, 181, 240, 30
+    CHECKBOX "Automatic metric", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "Interface metric:", -1, 15, 195, 90, 12
+    EDITTEXT IDC_METRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
-IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 270
+IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "DNS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 50, LBS_NOTIFY
+    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
     LTEXT "D&NS server addresses, in order of use:", -1, 5, 5, 180, 12
-    PUSHBUTTON "Up", IDC_DNSADDRUP, 190, 25, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Down", IDC_DNSADDRDOWN, 190, 45, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Add...", IDC_DNSADDRADD, 15, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Edit...", IDC_DNSADDRMOD, 75, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remo&ve", IDC_DNSADDRDEL, 135, 69, 50, 14, WS_TABSTOP
-    LTEXT "The following three settings are applied to all connections with TCP/IP enabled. For resolution of unqualified names:", -1, 5, 90, 220, 24
-    CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 220, 12
-    CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 125, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CONTROL "Append t&hese DNS suffixes (in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 220, 12
-    LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY
-    PUSHBUTTON "Up", IDC_DNSSUFFIXUP, 190, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Down", IDC_DNSSUFFIXDOWN, 190, 180, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Add...", IDC_DNSSUFFIXADD, 15, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Edit...", IDC_DNSSUFFIXMOD, 75, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remo&ve", IDC_DNSSUFFIXDEL, 135, 207, 50, 14, WS_TABSTOP
-    LTEXT "DNS &suffix for this connection:", -1, 5, 228, 110, 14
-    EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP
-    CHECKBOX "&Register this connection's addresses in DNS", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX "&Use this connection's DNS suffix in DNS registration", IDC_USESUFFIX, 15, 255, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    PUSHBUTTON "Up", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Down", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Add...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Edit...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remo&ve", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
+    LTEXT "The following three settings are applied to all connections with TCP/IP enabled. For resolution of unqualified names:", -1, 5, 70, 220, 24
+    CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
+    CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CONTROL "Append t&hese DNS suffixes (in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 115, 220, 12
+    LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
+    PUSHBUTTON "Up", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Down", IDC_DNSSUFFIXDOWN, 190, 145, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Add...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Edit...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remo&ve", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
+    LTEXT "DNS &suffix for this connection:", -1, 5, 183, 110, 14
+    EDITTEXT IDC_SUFFIX, 120, 180, 100, 12, WS_TABSTOP
+    CHECKBOX "&Register this connection's addresses in DNS", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "&Use this connection's DNS suffix in DNS registration", IDC_USESUFFIX, 15, 207, 227, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 END
 
-IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Options"
 FONT 8, "MS Shell Dlg"
@@ -196,7 +196,7 @@ BEGIN
 END
 
 IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Advanced"
 FONT 8, "MS Shell Dlg"
 BEGIN
diff --git a/dll/win32/netcfgx/lang/es-ES.rc b/dll/win32/netcfgx/lang/es-ES.rc
index b21bf0ffefb..4301781b47e 100644
--- a/dll/win32/netcfgx/lang/es-ES.rc
+++ b/dll/win32/netcfgx/lang/es-ES.rc
@@ -1,21 +1,17 @@
-/*
- * PROJECT:     ReactOS Network Shell Extension
- * LICENSE:     GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
- * PURPOSE:     Spanish locale file
- * COPYRIGHT:   Ismael Ferreras Morezuelas
- *              Julio Carchi Ruiz
- */
+// LICENSE:   GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+// COPYRIGHT: Ismael Ferreras Morezuelas
+//            Julio Carchi Ruiz
 
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
-IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 228
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Se pueden asignar las propiedades de IP automáticamente si su red soporta esta capacidad. Si no, debe contactar a su administrador de red para obtener los ajustes necesarios.", -1, 9, 9, 235, 27
-    CONTROL "Obtener dirección IP automáticamente", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 43, 210, 12
-    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
+    GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
+    CONTROL "Obtener dirección IP automáticamente", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
     CONTROL "&Usar la siguiente dirección IP:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 110, 12
     LTEXT "Dirección IP:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 140, 75 - 2, 85, 12
@@ -23,25 +19,25 @@ BEGIN
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 140, 90 - 2, 85, 12
     LTEXT "Puerta de enlace predeterminada:", -1, 14, 105, 135, 8
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 140, 105 - 2, 85, 12
-    CONTROL "Obtener dirección del servidor DNS automáticamente", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 139, 210, 12
-    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
-    CONTROL "&Usar las siguientes direcciones DNS:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 130, 12
-    LTEXT "Servidor DNS preferido:", -1, 14, 171, 160, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 140, 171 - 2, 85, 12
-    LTEXT "Servidor DNS alternativo:", -1, 14, 186, 160, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 140, 186 - 2, 85, 12
-    PUSHBUTTON "Opciones &avanzadas", IDC_ADVANCED, 156, 209, 80, 14, WS_TABSTOP
+    GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
+    CONTROL "Obtener dirección del servidor DNS automáticamente", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
+    CONTROL "&Usar las siguientes direcciones DNS:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 130, 12
+    LTEXT "Servidor DNS preferido:", -1, 14, 161, 160, 8
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 140, 161 - 2, 85, 12
+    LTEXT "Servidor DNS alternativo:", -1, 14, 176, 160, 8
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 140, 176 - 2, 85, 12
+    PUSHBUTTON "Opciones &avanzadas", IDC_ADVANCED, 156, 199, 80, 14, WS_TABSTOP
 END
 
-IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 228
+IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 216
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Configuración alternativa"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Escriba a continuación la configuración IP alternativa si este equipo  se utiliza en más de una red.", -1, 9, 9, 220, 20
+    GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX
     CONTROL "&Dirección IP privada automática", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
-    GROUPBOX "", -1, 9, 55, 228, 130, BS_GROUPBOX
-    CONTROL "Configurada por el u&suario:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 100, 12
+    CONTROL "Configurada por el u&suario:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 100, 12
     LTEXT "Dire&cción IP:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 140, 75, 85, 12
     LTEXT "Máscara de s&ubred:", -1, 14, 95, 135, 8
@@ -54,56 +50,56 @@ BEGIN
     CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 140, 165, 85, 12
 END
 
-IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Configuración de IP"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Direcciones &IP ", -1, 5, 5, 240, 90
-    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 55
-    PUSHBUTTON "Agregar...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Modificar...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Quitar", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP
-    GROUPBOX "Puertas de enlace predeterminadas:", -1, 5, 100, 240, 90
-    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 215, 55
-    PUSHBUTTON "Agregar...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Modificar...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Quitar", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP
-    GROUPBOX "", -1, 5, 200, 240, 30
-    CHECKBOX "Métrica automática", IDC_AUTOMETRIC, 9, 200, 85, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "Métrica de la interfaz:", -1, 15, 215, 90, 12
-    EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER
+    GROUPBOX "Direcciones &IP ", -1, 5, 5, 240, 83
+    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 50
+    PUSHBUTTON "Agregar...", IDC_IPADD, 60, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Modificar...", IDC_IPMOD, 120, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Quitar", IDC_IPDEL, 180, 67, 50, 14, WS_TABSTOP
+    GROUPBOX "Puertas de enlace predeterminadas:", -1, 5, 93, 240, 83
+    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 103, 215, 50
+    PUSHBUTTON "Agregar...", IDC_GWADD, 60, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Modificar...", IDC_GWMOD, 120, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Quitar", IDC_GWDEL, 180, 155, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 5, 181, 240, 30
+    CHECKBOX "Métrica automática", IDC_AUTOMETRIC, 9, 179, 85, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "Métrica de la interfaz:", -1, 15, 195, 90, 12
+    EDITTEXT IDC_METRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
-IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 270
+IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "DNS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 50, LBS_NOTIFY
+    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
     LTEXT "Direcciones de servidores DNS, por orden de utili&zación:", -1, 5, 5, 180, 12
-    PUSHBUTTON "Subir", IDC_DNSADDRUP, 190, 25, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Bajar", IDC_DNSADDRDOWN, 190, 45, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Agr&egar...", IDC_DNSADDRADD, 15, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Modifi&car...", IDC_DNSADDRMOD, 75, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Quitar", IDC_DNSADDRDEL, 135, 69, 50, 14, WS_TABSTOP
-    LTEXT "Los siguientes tres parámetros se aplican a todas las conexiones que tienen habilitado TCP/IP. Para resolución de nombres no cualificados:", -1, 5, 90, 225, 24
-    CONTROL "Anexar sufijos DNS principa&les y de conexiones específicas", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 220, 12
-    CHECKBOX "Anexar sufijos primarios del su&fijo DNS principal", IDC_TOPPRIMSUFFIX, 15, 125, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CONTROL "A&nexar estos sufijos DNS (en este orden):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 220, 12
-    LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY
-    PUSHBUTTON "Subir", IDC_DNSSUFFIXUP, 190, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Bajar", IDC_DNSSUFFIXDOWN, 190, 180, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Ag&regar...", IDC_DNSSUFFIXADD, 15, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Mo&dificar...", IDC_DNSSUFFIXMOD, 75, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Qui&tar", IDC_DNSSUFFIXDEL, 135, 207, 50, 14, WS_TABSTOP
-    LTEXT "&Sufijo DNS para esta conexión:", -1, 5, 228, 110, 14
-    EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP
-    CHECKBOX "&Registrar estas direcciones de cone&xiones en DNS", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX "&Utilizar este sufijo DNS de conexión para registro DNS", IDC_USESUFFIX, 15, 255, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    PUSHBUTTON "Subir", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Bajar", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Agr&egar...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Modifi&car...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Quitar", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
+    LTEXT "Los siguientes tres parámetros se aplican a todas las conexiones que tienen habilitado TCP/IP. Para resolución de nombres no cualificados:", -1, 5, 70, 225, 24
+    CONTROL "Anexar sufijos DNS principa&les y de conexiones específicas", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
+    CHECKBOX "Anexar sufijos primarios del su&fijo DNS principal", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CONTROL "A&nexar estos sufijos DNS (en este orden):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 115, 220, 12
+    LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
+    PUSHBUTTON "Subir", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Bajar", IDC_DNSSUFFIXDOWN, 190, 145, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Ag&regar...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Mo&dificar...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Qui&tar", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
+    LTEXT "&Sufijo DNS para esta conexión:", -1, 5, 183, 110, 14
+    EDITTEXT IDC_SUFFIX, 120, 180, 100, 12, WS_TABSTOP
+    CHECKBOX "&Registrar estas direcciones de cone&xiones en DNS", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "&Utilizar este sufijo DNS de conexión para registro DNS", IDC_USESUFFIX, 15, 207, 227, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 END
 
-IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Opciones"
 FONT 8, "MS Shell Dlg"
@@ -204,7 +200,7 @@ BEGIN
 END
 
 IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Avanzado"
 FONT 8, "MS Shell Dlg"
 BEGIN
diff --git a/dll/win32/netcfgx/lang/fr-FR.rc b/dll/win32/netcfgx/lang/fr-FR.rc
index d7827337393..8a077d3017c 100644
--- a/dll/win32/netcfgx/lang/fr-FR.rc
+++ b/dll/win32/netcfgx/lang/fr-FR.rc
@@ -1,13 +1,13 @@
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
-IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 228
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Général"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Vous pouvez automatiquement régler les paramètres si votre réseau supporte cette possibilité. Sinon, vous devez demander les réglages IP nécessaires à votre administrateur réseau.", -1, 9, 9, 235, 27
+    GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
     CONTROL "Obtenir automatiquement l'adresse IP", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
-    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
     CONTROL "&Utiliser l'adresse IP suivante :", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
     LTEXT "Adresse IP :", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
@@ -15,25 +15,25 @@ BEGIN
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
     LTEXT "Passerelle par défaut :", -1, 14, 105, 135, 8
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
-    CONTROL "Obtenir automatiquement l'adresse du serveur DNS", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
-    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
-    CONTROL "&Utiliser les adresses de serveur DNS suivantes", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
-    LTEXT "Serveur DNS primaire :", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
-    LTEXT "Serveur DNS secondaire :", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
-    PUSHBUTTON "&Avancé", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
+    CONTROL "Obtenir automatiquement l'adresse du serveur DNS", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
+    CONTROL "&Utiliser les adresses de serveur DNS suivantes", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    LTEXT "Serveur DNS primaire :", -1, 14, 161, 135, 8
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
+    LTEXT "Serveur DNS secondaire :", -1, 14, 176, 135, 8
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 176 - 2, 85, 12
+    PUSHBUTTON "&Avancé", IDC_ADVANCED, 186, 199, 50, 14, WS_TABSTOP
 END
 
-IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 228
+IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 216
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Configuration alternative"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Si cet ordinateur est utilisé sur plusieurs réseaux, entrez les paramètres alternatifs IP ci-dessous", -1, 9, 9, 220, 20
+    GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX
     CONTROL "Adresse IP privée au&tomatique", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
-    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
-    CONTROL "Utili&sateur configuré", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
+    CONTROL "Utili&sateur configuré", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 120, 12
     LTEXT "Adresse &IP :", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "Masque de so&us-réseau :", -1, 14, 95, 135, 8
@@ -46,56 +46,56 @@ BEGIN
     CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
-IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Paramètres IP"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Adresse IP", -1, 5, 5, 240, 90
-    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 55
-    PUSHBUTTON "Ajouter...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Éditer...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Supprimer", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP
-    GROUPBOX "Passerelles par défaut:", -1, 5, 100, 240, 90
-    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 215, 55
-    PUSHBUTTON "Ajouter...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Éditer...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Supprimer", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP
-    GROUPBOX "", -1, 5, 200, 240, 30
-    CHECKBOX "Métrique automatique", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "Métrique de l'interface :", -1, 15, 215, 90, 12
-    EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER
+    GROUPBOX "Adresse IP", -1, 5, 5, 240, 83
+    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 50
+    PUSHBUTTON "Ajouter...", IDC_IPADD, 60, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Éditer...", IDC_IPMOD, 120, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Supprimer", IDC_IPDEL, 180, 67, 50, 14, WS_TABSTOP
+    GROUPBOX "Passerelles par défaut:", -1, 5, 93, 240, 83
+    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 103, 215, 50
+    PUSHBUTTON "Ajouter...", IDC_GWADD, 60, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Éditer...", IDC_GWMOD, 120, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Supprimer", IDC_GWDEL, 180, 155, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 5, 181, 240, 30
+    CHECKBOX "Métrique automatique", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "Métrique de l'interface :", -1, 15, 195, 90, 12
+    EDITTEXT IDC_METRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
-IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 270
+IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "DNS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 50, LBS_NOTIFY
+    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
     LTEXT "Adresses des serveurs DNS, dans l'ordre d'utilisation:", -1, 5, 5, 180, 12
-    PUSHBUTTON "Monter", IDC_DNSADDRUP, 190, 25, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Descendre", IDC_DNSADDRDOWN, 190, 45, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Ajouter...", IDC_DNSADDRADD, 15, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Éditer...", IDC_DNSADDRMOD, 75, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Supprimer", IDC_DNSADDRDEL, 135, 69, 50, 14, WS_TABSTOP
-    LTEXT "Les trois paramètres suivants sont appliqués à toutes les connexions ayant TCP/IP activé. Pour la résolution des noms non qualifiés :", -1, 5, 90, 220, 24
-    CONTROL "Ajouter des suffixes DNS primaires et spécifiques aux connexions", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 220, 12
-    CHECKBOX "Ajouter des suffixes parents du suffixe DNS primaire", IDC_TOPPRIMSUFFIX, 15, 125, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CONTROL "Ajouter ces suffixes DNS (dans l'ordre) :", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 220, 12
-    LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY
-    PUSHBUTTON "Monter", IDC_DNSSUFFIXUP, 190, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Descendre", IDC_DNSSUFFIXDOWN, 190, 180, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Ajouter...", IDC_DNSSUFFIXADD, 15, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Éditer...", IDC_DNSSUFFIXMOD, 75, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Supprimer", IDC_DNSSUFFIXDEL, 135, 207, 50, 14, WS_TABSTOP
-    LTEXT "Suffixe DNS pour cette connexion :", -1, 5, 228, 110, 14
-    EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP
-    CHECKBOX "Enregistrer les adresses de cette connexion dans le DNS", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX "Utiliser le suffixe DNS de cette connexion pour l'enregistrement DNS", IDC_USESUFFIX, 15, 255, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    PUSHBUTTON "Monter", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Descendre", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Ajouter...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Éditer...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Supprimer", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
+    LTEXT "Les trois paramètres suivants sont appliqués à toutes les connexions ayant TCP/IP activé. Pour la résolution des noms non qualifiés :", -1, 5, 70, 220, 24
+    CONTROL "Ajouter des suffixes DNS primaires et spécifiques aux connexions", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
+    CHECKBOX "Ajouter des suffixes parents du suffixe DNS primaire", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CONTROL "Ajouter ces suffixes DNS (dans l'ordre) :", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 115, 220, 12
+    LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
+    PUSHBUTTON "Monter", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Descendre", IDC_DNSSUFFIXDOWN, 190, 145, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Ajouter...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Éditer...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Supprimer", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
+    LTEXT "Suffixe DNS pour cette connexion :", -1, 5, 183, 110, 14
+    EDITTEXT IDC_SUFFIX, 120, 180, 100, 12, WS_TABSTOP
+    CHECKBOX "Enregistrer les adresses de cette connexion dans le DNS", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "Utiliser le suffixe DNS de cette connexion pour l'enregistrement DNS", IDC_USESUFFIX, 15, 207, 227, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 END
 
-IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Options"
 FONT 8, "MS Shell Dlg"
@@ -196,8 +196,8 @@ BEGIN
 END
 
 IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Advanced"
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
+CAPTION "Avancé"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "The following properties are available for this network adapter. Click the property you want to change on the left, and then select its value on the right.", -1, 7, 7, 218, 24, WS_GROUP
@@ -208,7 +208,7 @@ BEGIN
     CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12
     COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     AUTORADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP
-    AUTORADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP
+    AUTORADIOBUTTON "&Absent", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP
 END
 
 STRINGTABLE
diff --git a/dll/win32/netcfgx/lang/he-IL.rc b/dll/win32/netcfgx/lang/he-IL.rc
index 165e30ffef7..13334c256da 100644
--- a/dll/win32/netcfgx/lang/he-IL.rc
+++ b/dll/win32/netcfgx/lang/he-IL.rc
@@ -1,13 +1,13 @@
 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 
-IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 228
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "כללי"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "You can get IP settings assigned automatically if your network supports this capability. Otherwise, you need to ask your network administrator for the appropriate IP settings.", -1, 9, 9, 235, 27
+    GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
     CONTROL "השג כתובת IP באופן אוטומטי", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
-    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
     CONTROL "השתמש בכתובת הIP הבאה:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
     LTEXT "כתובת IP:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
@@ -15,25 +15,25 @@ BEGIN
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
     LTEXT "שער ברירת מחדל:", -1, 14, 105, 135, 8
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
-    CONTROL "השג כתובת שרת DNS באופן אוטומטי.", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
-    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
-    CONTROL "השתמש בכתובות שרתי הDNS הבאים:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
-    LTEXT "שרת DNS מועדף:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
-    LTEXT "שרת DNS חלופי:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
-    PUSHBUTTON "מתקדם", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
+    CONTROL "השג כתובת שרת DNS באופן אוטומטי", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
+    CONTROL "השתמש בכתובות שרתי הDNS הבאים:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    LTEXT "שרת DNS מועדף:", -1, 14, 161, 135, 8
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
+    LTEXT "שרת DNS חלופי:", -1, 14, 176, 135, 8
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 176 - 2, 85, 12
+    PUSHBUTTON "מתקדם", IDC_ADVANCED, 186, 199, 50, 14, WS_TABSTOP
 END
 
-IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 228
+IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 216
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "הגדרה חלופית"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "If this computer is used on more than one network, enter the alternate IP settings below", -1, 9, 9, 220, 20
+    GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX
     CONTROL "כתובת IP פרטית אוטומטית", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
-    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
-    CONTROL "הגדרת משתמש", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
+    CONTROL "הגדרת משתמש", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
     LTEXT "כתובת IP:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "מסכת רשת משנה:", -1, 14, 95, 135, 8
@@ -46,56 +46,56 @@ BEGIN
     CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
-IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "הגדרות IP"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "כתובות IP", -1, 5, 5, 240, 90
-    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 55
-    PUSHBUTTON "הוסף...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "ערוך...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "הסר", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP
-    GROUPBOX "שערי רשת ברירת מחדל:", -1, 5, 100, 240, 90
-    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 215, 55
-    PUSHBUTTON "הוסף...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "ערוך...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "הסר", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP
-    GROUPBOX "", -1, 5, 200, 240, 30
-    CHECKBOX "Automatic metric", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "Interface metric:", -1, 15, 215, 90, 12
-    EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER
+    GROUPBOX "כתובות IP", -1, 5, 5, 240, 83
+    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 50
+    PUSHBUTTON "הוסף...", IDC_IPADD, 60, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "ערוך...", IDC_IPMOD, 120, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "הסר", IDC_IPDEL, 180, 67, 50, 14, WS_TABSTOP
+    GROUPBOX "שערי רשת ברירת מחדל:", -1, 5, 93, 240, 83
+    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 103, 215, 50
+    PUSHBUTTON "הוסף...", IDC_GWADD, 60, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "ערוך...", IDC_GWMOD, 120, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "הסר", IDC_GWDEL, 180, 155, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 5, 181, 240, 30
+    CHECKBOX "Automatic metric", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "Interface metric:", -1, 15, 195, 90, 12
+    EDITTEXT IDC_METRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
-IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 270
+IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "DNS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 50, LBS_NOTIFY
+    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
     LTEXT "D&NS server addresses, in order of use:", -1, 5, 5, 180, 12
-    PUSHBUTTON "הזז למעלה", IDC_DNSADDRUP, 190, 25, 50, 14, WS_TABSTOP
-    PUSHBUTTON "הזז למטה", IDC_DNSADDRDOWN, 190, 45, 50, 14, WS_TABSTOP
-    PUSHBUTTON "הוסף...", IDC_DNSADDRADD, 15, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "ערוך...", IDC_DNSADDRMOD, 75, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "הסר", IDC_DNSADDRDEL, 135, 69, 50, 14, WS_TABSTOP
-    LTEXT "The following three settings are applied to all connections with TCP/IP enabled. For resolution of unqualified names:", -1, 5, 90, 220, 24
-    CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 220, 12
-    CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 125, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CONTROL "Append t&hese DNS suffixes(in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 220, 12
-    LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY
-    PUSHBUTTON "הזז למעלה", IDC_DNSSUFFIXUP, 190, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "הזז למעטה", IDC_DNSSUFFIXDOWN, 190, 180, 50, 14, WS_TABSTOP
-    PUSHBUTTON "הוסף...", IDC_DNSSUFFIXADD, 15, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "ערוך...", IDC_DNSSUFFIXMOD, 75, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "הסר", IDC_DNSSUFFIXDEL, 135, 207, 50, 14, WS_TABSTOP
-    LTEXT "DNS &suffix for this connection:", -1, 5, 228, 110, 14
-    EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP
-    CHECKBOX "&Register this connection's addresses in DNS", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX "&Use this connection's DNS suffix in DNS registration", IDC_USESUFFIX, 15, 255, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    PUSHBUTTON "הזז למעלה", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
+    PUSHBUTTON "הזז למטה", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
+    PUSHBUTTON "הוסף...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "ערוך...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "הסר", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
+    LTEXT "The following three settings are applied to all connections with TCP/IP enabled. For resolution of unqualified names:", -1, 5, 70, 220, 24
+    CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
+    CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CONTROL "Append t&hese DNS suffixes(in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 115, 220, 12
+    LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
+    PUSHBUTTON "הזז למעלה", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
+    PUSHBUTTON "הזז למעטה", IDC_DNSSUFFIXDOWN, 190, 145, 50, 14, WS_TABSTOP
+    PUSHBUTTON "הוסף...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "ערוך...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "הסר", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
+    LTEXT "DNS &suffix for this connection:", -1, 5, 183, 110, 14
+    EDITTEXT IDC_SUFFIX, 120, 180, 100, 12, WS_TABSTOP
+    CHECKBOX "&Register this connection's addresses in DNS", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "&Use this connection's DNS suffix in DNS registration", IDC_USESUFFIX, 15, 207, 227, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 END
 
-IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "אפשרויות"
 FONT 8, "MS Shell Dlg"
@@ -196,7 +196,7 @@ BEGIN
 END
 
 IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Advanced"
 FONT 8, "MS Shell Dlg"
 BEGIN
diff --git a/dll/win32/netcfgx/lang/hu-HU.rc b/dll/win32/netcfgx/lang/hu-HU.rc
index 171f29baed4..a72c31aeffd 100644
--- a/dll/win32/netcfgx/lang/hu-HU.rc
+++ b/dll/win32/netcfgx/lang/hu-HU.rc
@@ -1,13 +1,13 @@
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
-IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 228
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Általános"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Az IP-beállításokat automatikusan is megkaphatja, ha hálózata támogatja ezt a képességet. Eltérõ esetben keresse meg hálózati rendszergazdáját a helyes IP-beállításokért.", -1, 9, 9, 235, 27
-    CONTROL "IP-cím automatikus lekérése", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 43, 210, 12
-    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
+    GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
+    CONTROL "IP-cím automatikus lekérése", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
     CONTROL "A &következõ IP-cím használata:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
     LTEXT "IP cím:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
@@ -15,25 +15,25 @@ BEGIN
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
     LTEXT "Alapértelmezett átjáró:", -1, 14, 105, 135, 8
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
-    CONTROL "A DNS-kiszolgáló címének automatikus lekérése", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 139, 210, 12
-    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
-    CONTROL "A kö&vetkezõ DNS-kiszolgálók használata", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
-    LTEXT "Elsõdleges DNS-kiszolgáló:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
-    LTEXT "Másodlagos DNS-kiszolgáló:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
-    PUSHBUTTON "&Haladóknak", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
+    CONTROL "A DNS-kiszolgáló címének automatikus lekérése", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
+    CONTROL "A kö&vetkezõ DNS-kiszolgálók használata", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    LTEXT "Elsõdleges DNS-kiszolgáló:", -1, 14, 161, 135, 8
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
+    LTEXT "Másodlagos DNS-kiszolgáló:", -1, 14, 176, 135, 8
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 176 - 2, 85, 12
+    PUSHBUTTON "&Haladóknak", IDC_ADVANCED, 186, 199, 50, 14, WS_TABSTOP
 END
 
-IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 228
+IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 216
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Alternate Configuration"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "If this computer is used on more than one network, enter the alternate IP settings below", -1, 9, 9, 220, 20
+    GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX
     CONTROL "Au&tomatic private IP address", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
-    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
-    CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
+    CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
     LTEXT "&IP address:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8
@@ -46,56 +46,56 @@ BEGIN
     CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
-IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "IP Settings"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "IP addresses", -1, 5, 5, 240, 90
-    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 55
-    PUSHBUTTON "Add...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Edit...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remove", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP
-    GROUPBOX "Default gateways:", -1, 5, 100, 240, 90
-    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 215, 55
-    PUSHBUTTON "Add...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Edit...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remove", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP
-    GROUPBOX "", -1, 5, 200, 240, 30
-    CHECKBOX "Automatic metric", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "Interface metric:", -1, 15, 215, 90, 12
-    EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER
+    GROUPBOX "IP addresses", -1, 5, 5, 240, 83
+    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 50
+    PUSHBUTTON "Add...", IDC_IPADD, 60, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Edit...", IDC_IPMOD, 120, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remove", IDC_IPDEL, 180, 67, 50, 14, WS_TABSTOP
+    GROUPBOX "Default gateways:", -1, 5, 93, 240, 83
+    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 103, 215, 50
+    PUSHBUTTON "Add...", IDC_GWADD, 60, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Edit...", IDC_GWMOD, 120, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remove", IDC_GWDEL, 180, 155, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 5, 181, 240, 30
+    CHECKBOX "Automatic metric", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "Interface metric:", -1, 15, 195, 90, 12
+    EDITTEXT IDC_METRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
-IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 270
+IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "DNS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 50, LBS_NOTIFY
+    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
     LTEXT "D&NS server addresses, in order of use:", -1, 5, 5, 180, 12
-    PUSHBUTTON "Up", IDC_DNSADDRUP, 190, 25, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Down", IDC_DNSADDRDOWN, 190, 45, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Add...", IDC_DNSADDRADD, 15, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Edit...", IDC_DNSADDRMOD, 75, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remo&ve", IDC_DNSADDRDEL, 135, 69, 50, 14, WS_TABSTOP
-    LTEXT "The following three settings are applied to all connections with TCP/IP enabled. For resolution of unqualified names:", -1, 5, 90, 220, 24
-    CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 220, 12
-    CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 125, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CONTROL "Append t&hese DNS suffixes(in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 220, 12
-    LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY
-    PUSHBUTTON "Up", IDC_DNSSUFFIXUP, 190, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Down", IDC_DNSSUFFIXDOWN, 190, 180, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Add...", IDC_DNSSUFFIXADD, 15, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Edit...", IDC_DNSSUFFIXMOD, 75, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remo&ve", IDC_DNSSUFFIXDEL, 135, 207, 50, 14, WS_TABSTOP
-    LTEXT "DNS &suffix for this connection:", -1, 5, 228, 110, 14
-    EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP
-    CHECKBOX "&Register this connection's addresses in DNS", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX "&Use this connection's DNS suffix in DNS registration", IDC_USESUFFIX, 15, 255, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    PUSHBUTTON "Up", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Down", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Add...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Edit...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remo&ve", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
+    LTEXT "The following three settings are applied to all connections with TCP/IP enabled. For resolution of unqualified names:", -1, 5, 70, 220, 24
+    CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
+    CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CONTROL "Append t&hese DNS suffixes(in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 115, 220, 12
+    LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
+    PUSHBUTTON "Up", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Down", IDC_DNSSUFFIXDOWN, 190, 145, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Add...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Edit...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remo&ve", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
+    LTEXT "DNS &suffix for this connection:", -1, 5, 183, 110, 14
+    EDITTEXT IDC_SUFFIX, 120, 180, 100, 12, WS_TABSTOP
+    CHECKBOX "&Register this connection's addresses in DNS", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "&Use this connection's DNS suffix in DNS registration", IDC_USESUFFIX, 15, 207, 227, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 END
 
-IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Options"
 FONT 8, "MS Shell Dlg"
@@ -196,7 +196,7 @@ BEGIN
 END
 
 IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Advanced"
 FONT 8, "MS Shell Dlg"
 BEGIN
diff --git a/dll/win32/netcfgx/lang/id-ID.rc b/dll/win32/netcfgx/lang/id-ID.rc
index 53676d4c901..4f8dd3fa76d 100644
--- a/dll/win32/netcfgx/lang/id-ID.rc
+++ b/dll/win32/netcfgx/lang/id-ID.rc
@@ -1,13 +1,13 @@
 LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT
 
-IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 228
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Umum"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Anda bisa mendapatkan setelan IP terisi secara otomatis ika jaringan anda mendukung kemampuan ini. Sebaliknya, anda perlu untuk meminta administrator jaringan anda setelan IP yang benar.", -1, 9, 9, 235, 27
+    GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
     CONTROL "Peroleh alamat IP secara otomatis", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
-    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
     CONTROL "&Gunakan alamat IP berikut:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
     LTEXT "Alamat IP:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
@@ -15,25 +15,25 @@ BEGIN
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
     LTEXT "Gateway standar:", -1, 14, 105, 135, 8
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
-    CONTROL "Peroleh alamat serverO DNS secara otomatis", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
-    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
-    CONTROL "&Gunakan alamat server DNS berikut", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
-    LTEXT "Server DNS Disukai:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
-    LTEXT "Server DNS alternatif:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
-    PUSHBUTTON "&Lanjutan", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
+    CONTROL "Peroleh alamat serverO DNS secara otomatis", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
+    CONTROL "&Gunakan alamat server DNS berikut", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    LTEXT "Server DNS Disukai:", -1, 14, 161, 135, 8
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
+    LTEXT "Server DNS alternatif:", -1, 14, 176, 135, 8
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 176 - 2, 85, 12
+    PUSHBUTTON "&Lanjutan", IDC_ADVANCED, 186, 199, 50, 14, WS_TABSTOP
 END
 
-IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 228
+IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 216
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Alternate Configuration"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "If this computer is used on more than one network, enter the alternate IP settings below", -1, 9, 9, 220, 20
+    GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX
     CONTROL "Au&tomatic private IP address", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
-    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
-    CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
+    CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
     LTEXT "&IP address:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8
@@ -46,56 +46,56 @@ BEGIN
     CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
-IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "IP Settings"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "IP addresses", -1, 5, 5, 240, 90
-    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 55
-    PUSHBUTTON "Add...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Edit...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remove", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP
-    GROUPBOX "Default gateways:", -1, 5, 100, 240, 90
-    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 215, 55
-    PUSHBUTTON "Add...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Edit...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remove", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP
-    GROUPBOX "", -1, 5, 200, 240, 30
-    CHECKBOX "Automatic metric", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "Interface metric:", -1, 15, 215, 90, 12
-    EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER
+    GROUPBOX "IP addresses", -1, 5, 5, 240, 83
+    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 50
+    PUSHBUTTON "Add...", IDC_IPADD, 60, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Edit...", IDC_IPMOD, 120, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remove", IDC_IPDEL, 180, 67, 50, 14, WS_TABSTOP
+    GROUPBOX "Default gateways:", -1, 5, 93, 240, 83
+    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 103, 215, 50
+    PUSHBUTTON "Add...", IDC_GWADD, 60, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Edit...", IDC_GWMOD, 120, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remove", IDC_GWDEL, 180, 155, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 5, 181, 240, 30
+    CHECKBOX "Automatic metric", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "Interface metric:", -1, 15, 195, 90, 12
+    EDITTEXT IDC_METRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
-IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 270
+IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "DNS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 50, LBS_NOTIFY
+    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
     LTEXT "D&NS server addresses, in order of use:", -1, 5, 5, 180, 12
-    PUSHBUTTON "Up", IDC_DNSADDRUP, 190, 25, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Down", IDC_DNSADDRDOWN, 190, 45, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Add...", IDC_DNSADDRADD, 15, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Edit...", IDC_DNSADDRMOD, 75, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remo&ve", IDC_DNSADDRDEL, 135, 69, 50, 14, WS_TABSTOP
-    LTEXT "The following three settings are applied to all connections with TCP/IP enabled. For resolution of unqualified names:", -1, 5, 90, 220, 24
-    CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 220, 12
-    CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 125, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CONTROL "Append t&hese DNS suffixes(in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 220, 12
-    LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY
-    PUSHBUTTON "Up", IDC_DNSSUFFIXUP, 190, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Down", IDC_DNSSUFFIXDOWN, 190, 180, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Add...", IDC_DNSSUFFIXADD, 15, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Edit...", IDC_DNSSUFFIXMOD, 75, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remo&ve", IDC_DNSSUFFIXDEL, 135, 207, 50, 14, WS_TABSTOP
-    LTEXT "DNS &suffix for this connection:", -1, 5, 228, 110, 14
-    EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP
-    CHECKBOX "&Register this connection's addresses in DNS", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX "&Use this connection's DNS suffix in DNS registration", IDC_USESUFFIX, 15, 255, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    PUSHBUTTON "Up", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Down", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Add...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Edit...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remo&ve", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
+    LTEXT "The following three settings are applied to all connections with TCP/IP enabled. For resolution of unqualified names:", -1, 5, 70, 220, 24
+    CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
+    CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CONTROL "Append t&hese DNS suffixes(in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 115, 220, 12
+    LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
+    PUSHBUTTON "Up", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Down", IDC_DNSSUFFIXDOWN, 190, 145, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Add...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Edit...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remo&ve", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
+    LTEXT "DNS &suffix for this connection:", -1, 5, 183, 110, 14
+    EDITTEXT IDC_SUFFIX, 120, 180, 100, 12, WS_TABSTOP
+    CHECKBOX "&Register this connection's addresses in DNS", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "&Use this connection's DNS suffix in DNS registration", IDC_USESUFFIX, 15, 207, 227, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 END
 
-IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Options"
 FONT 8, "MS Shell Dlg"
@@ -196,7 +196,7 @@ BEGIN
 END
 
 IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Advanced"
 FONT 8, "MS Shell Dlg"
 BEGIN
diff --git a/dll/win32/netcfgx/lang/it-IT.rc b/dll/win32/netcfgx/lang/it-IT.rc
index be3b8508b1f..5d1dc44ae16 100644
--- a/dll/win32/netcfgx/lang/it-IT.rc
+++ b/dll/win32/netcfgx/lang/it-IT.rc
@@ -1,13 +1,13 @@
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
-IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 228
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Generale"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Puoi ottenere automaticamente la configurazione IP se la vostra rete lo supporta. Altrimenti è necessario contattare l'amministratore di rete per farsi dare le impostazioni appropriate.", -1, 9, 9, 235, 27
+    GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
     CONTROL "Ottieni automaticamente l'indirizzo IP", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
-    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
     CONTROL "&Usa il seguente indirizzo IP:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
     LTEXT "Indirizzo IP:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
@@ -15,25 +15,25 @@ BEGIN
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
     LTEXT "Default gateway:", -1, 14, 105, 135, 8
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
-    CONTROL "Ottieni automaticamente l'indirizzo dei server DNS", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
-    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
-    CONTROL "&Usa i seguenti indirizzi DNS", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
-    LTEXT "Server DNS preferito:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
-    LTEXT "Server DNS alternativo:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
-    PUSHBUTTON "&Avanzata", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
+    CONTROL "Ottieni automaticamente l'indirizzo dei server DNS", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
+    CONTROL "&Usa i seguenti indirizzi DNS", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    LTEXT "Server DNS preferito:", -1, 14, 161, 135, 8
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
+    LTEXT "Server DNS alternativo:", -1, 14, 176, 135, 8
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 176 - 2, 85, 12
+    PUSHBUTTON "&Avanzata", IDC_ADVANCED, 186, 199, 50, 14, WS_TABSTOP
 END
 
-IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 228
+IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 216
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Configurazione alternativa"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Se questo computer viene utilizzato in più di una rete indicare di seguito le configurazioni di rete alternative", -1, 9, 9, 220, 20
+    GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX
     CONTROL "Indirizzo IP privato &automatico", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
-    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
-    CONTROL "Configurato dall'&utente", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
+    CONTROL "Configurato dall'&utente", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
     LTEXT "&Indirizzo IP:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8
@@ -46,56 +46,56 @@ BEGIN
     CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
-IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Impostazioni IP"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Indirizzo IP", -1, 5, 5, 240, 90
-    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 55
-    PUSHBUTTON "Aggiungi...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Modifica...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Rimuovi", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP
-    GROUPBOX "Default gateways:", -1, 5, 100, 240, 90
-    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 215, 55
-    PUSHBUTTON "Aggiungi...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Modifica...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Rimuovi", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP
-    GROUPBOX "", -1, 5, 200, 240, 30
-    CHECKBOX "Metriche automatiche", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "Metriche sull'interfaccia:", -1, 15, 215, 90, 12
-    EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER
+    GROUPBOX "Indirizzo IP", -1, 5, 5, 240, 83
+    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 50
+    PUSHBUTTON "Aggiungi...", IDC_IPADD, 60, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Modifica...", IDC_IPMOD, 120, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Rimuovi", IDC_IPDEL, 180, 67, 50, 14, WS_TABSTOP
+    GROUPBOX "Default gateways:", -1, 5, 93, 240, 83
+    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 103, 215, 50
+    PUSHBUTTON "Aggiungi...", IDC_GWADD, 60, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Modifica...", IDC_GWMOD, 120, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Rimuovi", IDC_GWDEL, 180, 155, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 5, 181, 240, 30
+    CHECKBOX "Metriche automatiche", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "Metriche sull'interfaccia:", -1, 15, 195, 90, 12
+    EDITTEXT IDC_METRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
-IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 270
+IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "DNS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 50, LBS_NOTIFY
+    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
     LTEXT "Indirizzi D&NS server in ordine di utilizzo:", -1, 5, 5, 180, 12
-    PUSHBUTTON "&Su", IDC_DNSADDRUP, 190, 25, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Giù", IDC_DNSADDRDOWN, 190, 45, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Aggiungi...", IDC_DNSADDRADD, 15, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Modifica...", IDC_DNSADDRMOD, 75, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Rimuovi", IDC_DNSADDRDEL, 135, 69, 50, 14, WS_TABSTOP
-    LTEXT "Le tre impostazioni seguenti sono applicate a tutte le connessioni dotate di TCP/IP abilitato. Per la risoluzione di nomi non qualificati:", -1, 5, 90, 220, 24
-    CONTROL "Aggiungere suffissi DNS principali e specifici della connessione", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 220, 12
-    CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 125, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CONTROL "Aggiungere questi suffissi DNS(in ordine):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 220, 12
-    LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY
-    PUSHBUTTON "Su", IDC_DNSSUFFIXUP, 190, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Giù", IDC_DNSSUFFIXDOWN, 190, 180, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Aggiungi...", IDC_DNSSUFFIXADD, 15, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Modifica...", IDC_DNSSUFFIXMOD, 75, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Rimuovi", IDC_DNSSUFFIXDEL, 135, 207, 50, 14, WS_TABSTOP
-    LTEXT "Suffisso DNS per questa connessione:", -1, 5, 228, 110, 14
-    EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP
-    CHECKBOX "&Registrare nel DNS gli indirizzi di questa connessione", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX "&Usare i suffissi DNS di questa connessione nella registrazione DNS", IDC_USESUFFIX, 15, 255, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    PUSHBUTTON "&Su", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Giù", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Aggiungi...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Modifica...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Rimuovi", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
+    LTEXT "Le tre impostazioni seguenti sono applicate a tutte le connessioni dotate di TCP/IP abilitato. Per la risoluzione di nomi non qualificati:", -1, 5, 70, 220, 24
+    CONTROL "Aggiungere suffissi DNS principali e specifici della connessione", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
+    CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CONTROL "Aggiungere questi suffissi DNS(in ordine):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 115, 220, 12
+    LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
+    PUSHBUTTON "Su", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Giù", IDC_DNSSUFFIXDOWN, 190, 145, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Aggiungi...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Modifica...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Rimuovi", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
+    LTEXT "Suffisso DNS per questa connessione:", -1, 5, 183, 110, 14
+    EDITTEXT IDC_SUFFIX, 120, 180, 100, 12, WS_TABSTOP
+    CHECKBOX "&Registrare nel DNS gli indirizzi di questa connessione", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "&Usare i suffissi DNS di questa connessione nella registrazione DNS", IDC_USESUFFIX, 15, 207, 227, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 END
 
-IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Opzioni"
 FONT 8, "MS Shell Dlg"
@@ -196,7 +196,7 @@ BEGIN
 END
 
 IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Advanced"
 FONT 8, "MS Shell Dlg"
 BEGIN
diff --git a/dll/win32/netcfgx/lang/ja-JP.rc b/dll/win32/netcfgx/lang/ja-JP.rc
index 0620a00a95e..8f4a99aa62a 100644
--- a/dll/win32/netcfgx/lang/ja-JP.rc
+++ b/dll/win32/netcfgx/lang/ja-JP.rc
@@ -1,13 +1,13 @@
 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 
-IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 228
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "全般"
 FONT 9, "MS UI Gothic"
 BEGIN
     LTEXT "ネットワークでこの機能がサポートされている場合は、IP 設定を自動的に取得することができます。サポートされていない場合は、ネットワーク管理者に適切な IP 設定を問い合わせてください。", -1, 9, 9, 235, 27
-    CONTROL "IP アドレスを自動的に取得する", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 43, 210, 12
-    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
+    GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
+    CONTROL "IP アドレスを自動的に取得する", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
     CONTROL "次の IP アドレスを使う(&U):", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
     LTEXT "IP アドレス:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
@@ -15,25 +15,25 @@ BEGIN
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
     LTEXT "デフォルト ゲートウェイ:", -1, 14, 105, 135, 8
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
-    CONTROL "DNS サーバーのアドレスを自動的に取得する", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 139, 210, 12
-    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
-    CONTROL "次の DNS サーバーのアドレスを使う(&U)", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
-    LTEXT "優先 DNS サーバー:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
-    LTEXT "代替 DNS サーバー:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
-    PUSHBUTTON "詳細設定(&A)", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
+    CONTROL "DNS サーバーのアドレスを自動的に取得する", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
+    CONTROL "次の DNS サーバーのアドレスを使う(&U)", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    LTEXT "優先 DNS サーバー:", -1, 14, 161, 135, 8
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
+    LTEXT "代替 DNS サーバー:", -1, 14, 176, 135, 8
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 176 - 2, 85, 12
+    PUSHBUTTON "詳細設定(&A)", IDC_ADVANCED, 186, 199, 50, 14, WS_TABSTOP
 END
 
-IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 228
+IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 216
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Alternate Configuration"
 FONT 9, "MS UI Gothic"
 BEGIN
     LTEXT "If this computer is used on more than one network, enter the alternate IP settings below", -1, 9, 9, 220, 20
+    GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX
     CONTROL "Au&tomatic private IP address", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
-    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
-    CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
+    CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
     LTEXT "&IP address:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8
@@ -46,56 +46,56 @@ BEGIN
     CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
-IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "IP Settings"
 FONT 9, "MS UI Gothic"
 BEGIN
-    GROUPBOX "IP addresses", -1, 5, 5, 240, 90
-    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 55
-    PUSHBUTTON "Add...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Edit...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remove", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP
-    GROUPBOX "Default gateways:", -1, 5, 100, 240, 90
-    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 215, 55
-    PUSHBUTTON "Add...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Edit...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remove", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP
-    GROUPBOX "", -1, 5, 200, 240, 30
-    CHECKBOX "Automatic metric", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "Interface metric:", -1, 15, 215, 90, 12
-    EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER
+    GROUPBOX "IP addresses", -1, 5, 5, 240, 83
+    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 50
+    PUSHBUTTON "Add...", IDC_IPADD, 60, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Edit...", IDC_IPMOD, 120, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remove", IDC_IPDEL, 180, 67, 50, 14, WS_TABSTOP
+    GROUPBOX "Default gateways:", -1, 5, 93, 240, 83
+    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 103, 215, 50
+    PUSHBUTTON "Add...", IDC_GWADD, 60, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Edit...", IDC_GWMOD, 120, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remove", IDC_GWDEL, 180, 155, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 5, 181, 240, 30
+    CHECKBOX "Automatic metric", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "Interface metric:", -1, 15, 195, 90, 12
+    EDITTEXT IDC_METRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
-IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 270
+IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "DNS"
 FONT 9, "MS UI Gothic"
 BEGIN
-    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 50, LBS_NOTIFY
+    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
     LTEXT "D&NS server addresses, in order of use:", -1, 5, 5, 180, 12
-    PUSHBUTTON "Up", IDC_DNSADDRUP, 190, 25, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Down", IDC_DNSADDRDOWN, 190, 45, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Add...", IDC_DNSADDRADD, 15, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Edit...", IDC_DNSADDRMOD, 75, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remo&ve", IDC_DNSADDRDEL, 135, 69, 50, 14, WS_TABSTOP
-    LTEXT "The following three settings are applied to all connections with TCP/IP enabled. For resolution of unqualified names:", -1, 5, 90, 220, 24
-    CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 220, 12
-    CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 125, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CONTROL "Append t&hese DNS suffixes(in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 220, 12
-    LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY
-    PUSHBUTTON "Up", IDC_DNSSUFFIXUP, 190, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Down", IDC_DNSSUFFIXDOWN, 190, 180, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Add...", IDC_DNSSUFFIXADD, 15, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Edit...", IDC_DNSSUFFIXMOD, 75, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remo&ve", IDC_DNSSUFFIXDEL, 135, 207, 50, 14, WS_TABSTOP
-    LTEXT "DNS &suffix for this connection:", -1, 5, 228, 110, 14
-    EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP
-    CHECKBOX "&Register this connection's addresses in DNS", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX "&Use this connection's DNS suffix in DNS registration", IDC_USESUFFIX, 15, 255, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    PUSHBUTTON "Up", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Down", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Add...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Edit...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remo&ve", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
+    LTEXT "The following three settings are applied to all connections with TCP/IP enabled. For resolution of unqualified names:", -1, 5, 70, 220, 24
+    CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
+    CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CONTROL "Append t&hese DNS suffixes(in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 115, 220, 12
+    LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
+    PUSHBUTTON "Up", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Down", IDC_DNSSUFFIXDOWN, 190, 145, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Add...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Edit...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remo&ve", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
+    LTEXT "DNS &suffix for this connection:", -1, 5, 183, 110, 14
+    EDITTEXT IDC_SUFFIX, 120, 180, 100, 12, WS_TABSTOP
+    CHECKBOX "&Register this connection's addresses in DNS", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "&Use this connection's DNS suffix in DNS registration", IDC_USESUFFIX, 15, 207, 227, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 END
 
-IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Options"
 FONT 9, "MS UI Gothic"
@@ -196,9 +196,9 @@ BEGIN
 END
 
 IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Advanced"
-FONT 8, "MS Shell Dlg"
+FONT 9, "MS UI Gothic"
 BEGIN
     LTEXT "The following properties are available for this network adapter. Click the property you want to change on the left, and then select its value on the right.", -1, 7, 7, 218, 24, WS_GROUP
     LTEXT "&Property:", -1, 7, 37, 60, 8, WS_GROUP
diff --git a/dll/win32/netcfgx/lang/nl-NL.rc b/dll/win32/netcfgx/lang/nl-NL.rc
index a578ca654b6..abf2ffa150e 100644
--- a/dll/win32/netcfgx/lang/nl-NL.rc
+++ b/dll/win32/netcfgx/lang/nl-NL.rc
@@ -1,13 +1,13 @@
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
-IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 228
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Algemeen"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Een IP-adres kan automatisch worden toegewezen aan deze computer. Als uw netwerk dit niet automatisch doet kunt u het adres zelf invullen.", -1, 9, 9, 235, 27
-    CONTROL "&Automatisch een IP-adres verkrijgen", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 43, 210, 12
-    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
+    GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
+    CONTROL "&Automatisch een IP-adres verkrijgen", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
     CONTROL "&Een IP-adres opgeven:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
     LTEXT "IP-adres:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
@@ -15,25 +15,25 @@ BEGIN
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
     LTEXT "Standaardgateway:", -1, 14, 105, 135, 8
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
-    CONTROL "DNS-serveradres automatisch verkrijgen", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 139, 210, 12
-    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
-    CONTROL "De volgende DNS-serveradressen gebruiken:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
-    LTEXT "Voorkeurs-DNS-server:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
-    LTEXT "Alternatieve-DNS-server:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
-    PUSHBUTTON "&Geavanceerd", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
+    CONTROL "DNS-serveradres automatisch verkrijgen", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
+    CONTROL "De volgende DNS-serveradressen gebruiken:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    LTEXT "Voorkeurs-DNS-server:", -1, 14, 161, 135, 8
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
+    LTEXT "Alternatieve-DNS-server:", -1, 14, 176, 135, 8
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 176 - 2, 85, 12
+    PUSHBUTTON "&Geavanceerd", IDC_ADVANCED, 186, 199, 50, 14, WS_TABSTOP
 END
 
-IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 228
+IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 216
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Alternate Configuration"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "If this computer is used on more than one network, enter the alternate IP settings below", -1, 9, 9, 220, 20
+    GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX
     CONTROL "Au&tomatic private IP address", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
-    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
-    CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
+    CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
     LTEXT "&IP address:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8
@@ -46,56 +46,56 @@ BEGIN
     CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
-IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "IP Settings"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "IP addresses", -1, 5, 5, 240, 90
-    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 55
-    PUSHBUTTON "Add...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Edit...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remove", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP
-    GROUPBOX "Default gateways:", -1, 5, 100, 240, 90
-    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 215, 55
-    PUSHBUTTON "Add...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Edit...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remove", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP
-    GROUPBOX "", -1, 5, 200, 240, 30
-    CHECKBOX "Automatic metric", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "Interface metric:", -1, 15, 215, 90, 12
-    EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER
+    GROUPBOX "IP addresses", -1, 5, 5, 240, 83
+    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 50
+    PUSHBUTTON "Add...", IDC_IPADD, 60, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Edit...", IDC_IPMOD, 120, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remove", IDC_IPDEL, 180, 67, 50, 14, WS_TABSTOP
+    GROUPBOX "Default gateways:", -1, 5, 93, 240, 83
+    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 103, 215, 50
+    PUSHBUTTON "Add...", IDC_GWADD, 60, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Edit...", IDC_GWMOD, 120, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remove", IDC_GWDEL, 180, 155, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 5, 181, 240, 30
+    CHECKBOX "Automatic metric", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "Interface metric:", -1, 15, 195, 90, 12
+    EDITTEXT IDC_METRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
-IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 270
+IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "DNS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 50, LBS_NOTIFY
+    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
     LTEXT "D&NS server addresses, in order of use:", -1, 5, 5, 180, 12
-    PUSHBUTTON "Up", IDC_DNSADDRUP, 190, 25, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Down", IDC_DNSADDRDOWN, 190, 45, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Add...", IDC_DNSADDRADD, 15, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Edit...", IDC_DNSADDRMOD, 75, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remo&ve", IDC_DNSADDRDEL, 135, 69, 50, 14, WS_TABSTOP
-    LTEXT "The following three settings are applied to all connections with TCP/IP enabled. For resolution of unqualified names:", -1, 5, 90, 220, 24
-    CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 220, 12
-    CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 125, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CONTROL "Append t&hese DNS suffixes(in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 220, 12
-    LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY
-    PUSHBUTTON "Up", IDC_DNSSUFFIXUP, 190, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Down", IDC_DNSSUFFIXDOWN, 190, 180, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Add...", IDC_DNSSUFFIXADD, 15, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Edit...", IDC_DNSSUFFIXMOD, 75, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remo&ve", IDC_DNSSUFFIXDEL, 135, 207, 50, 14, WS_TABSTOP
-    LTEXT "DNS &suffix for this connection:", -1, 5, 228, 110, 14
-    EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP
-    CHECKBOX "&Register this connection's addresses in DNS", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX "&Use this connection's DNS suffix in DNS registration", IDC_USESUFFIX, 15, 255, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    PUSHBUTTON "Up", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Down", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Add...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Edit...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remo&ve", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
+    LTEXT "The following three settings are applied to all connections with TCP/IP enabled. For resolution of unqualified names:", -1, 5, 70, 220, 24
+    CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
+    CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CONTROL "Append t&hese DNS suffixes(in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 115, 220, 12
+    LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
+    PUSHBUTTON "Up", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Down", IDC_DNSSUFFIXDOWN, 190, 145, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Add...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Edit...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remo&ve", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
+    LTEXT "DNS &suffix for this connection:", -1, 5, 183, 110, 14
+    EDITTEXT IDC_SUFFIX, 120, 180, 100, 12, WS_TABSTOP
+    CHECKBOX "&Register this connection's addresses in DNS", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "&Use this connection's DNS suffix in DNS registration", IDC_USESUFFIX, 15, 207, 227, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 END
 
-IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Options"
 FONT 8, "MS Shell Dlg"
@@ -196,7 +196,7 @@ BEGIN
 END
 
 IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Advanced"
 FONT 8, "MS Shell Dlg"
 BEGIN
diff --git a/dll/win32/netcfgx/lang/no-NO.rc b/dll/win32/netcfgx/lang/no-NO.rc
index 4537cfc0d46..21dcfab03bf 100644
--- a/dll/win32/netcfgx/lang/no-NO.rc
+++ b/dll/win32/netcfgx/lang/no-NO.rc
@@ -1,13 +1,13 @@
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
 
-IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 228
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Generielt"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Du kan få IP innstillinger automatisk hvis ditt nettverk støtter denne muligheten. Ellers, trenger du å spørre din nettverk administrator for å få IP innstillingene.", -1, 9, 9, 235, 27
+    GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
     CONTROL "Motta IP addressen automatisk", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
-    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
     CONTROL "&Bruk følgende IP addresse:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
     LTEXT "IP addresse:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
@@ -15,25 +15,25 @@ BEGIN
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
     LTEXT "Standard gateway:", -1, 14, 105, 135, 8
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
-    CONTROL "Motta DNS server addresse automatisk", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
-    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
-    CONTROL "&Bruk følgende DNS server addresser", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
-    LTEXT "Forvalgt DNS server:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
-    LTEXT "Alternativ DNS server:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
-    PUSHBUTTON "&Avansert", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
+    CONTROL "Motta DNS server addresse automatisk", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
+    CONTROL "&Bruk følgende DNS server addresser", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    LTEXT "Forvalgt DNS server:", -1, 14, 161, 135, 8
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
+    LTEXT "Alternativ DNS server:", -1, 14, 176, 135, 8
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 176 - 2, 85, 12
+    PUSHBUTTON "&Avansert", IDC_ADVANCED, 186, 199, 50, 14, WS_TABSTOP
 END
 
-IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 228
+IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 216
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Alternativ Konfigurasjon"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Hvis denne datamaskinen bruker mere en et nettverk, sett inn et alternativt IP adresse i innstilling under", -1, 9, 9, 220, 20
+    GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX
     CONTROL "Au&tomatisk privat IP addresse", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
-    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
-    CONTROL "B&ruker konfigurert", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
+    CONTROL "B&ruker konfigurert", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
     LTEXT "&IP addresse:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "S&ubnet maske:", -1, 14, 95, 135, 8
@@ -46,56 +46,56 @@ BEGIN
     CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
-IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "IP Innstillinger"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "IP addressen", -1, 5, 5, 240, 90
-    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 55
-    PUSHBUTTON "Legg til...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Rediger...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Fjern", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP
-    GROUPBOX "Standard gateway:", -1, 5, 100, 240, 90
-    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 215, 55
-    PUSHBUTTON "Legg til...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Rediger...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Fjern", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP
-    GROUPBOX "", -1, 5, 200, 240, 30
-    CHECKBOX "Automatisk metrisk", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "Brukergrensesnitt metrisk:", -1, 15, 215, 90, 12
-    EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER
+    GROUPBOX "IP addressen", -1, 5, 5, 240, 83
+    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 50
+    PUSHBUTTON "Legg til...", IDC_IPADD, 60, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Rediger...", IDC_IPMOD, 120, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Fjern", IDC_IPDEL, 180, 67, 50, 14, WS_TABSTOP
+    GROUPBOX "Standard gateway:", -1, 5, 93, 240, 83
+    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 103, 215, 50
+    PUSHBUTTON "Legg til...", IDC_GWADD, 60, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Rediger...", IDC_GWMOD, 120, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Fjern", IDC_GWDEL, 180, 155, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 5, 181, 240, 30
+    CHECKBOX "Automatisk metrisk", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "Brukergrensesnitt metrisk:", -1, 15, 195, 90, 12
+    EDITTEXT IDC_METRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
-IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 270
+IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "DNS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 50, LBS_NOTIFY
+    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
     LTEXT "D&NS server addresser, i system etter bruk:", -1, 5, 5, 180, 12
-    PUSHBUTTON "Opp", IDC_DNSADDRUP, 190, 25, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Ned", IDC_DNSADDRDOWN, 190, 45, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Legg til...", IDC_DNSADDRADD, 15, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Rediger...", IDC_DNSADDRMOD, 75, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Fjern", IDC_DNSADDRDEL, 135, 69, 50, 14, WS_TABSTOP
-    LTEXT "Følgende tre innstillinger er brukt til alle tilkoblinger med TCP/IP aktivert. For beslutning av ukvalifisert navn:", -1, 5, 90, 220, 24
-    CONTROL "Legg til &primær og tilkobling spesifikt DNS suffikser", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 220, 12
-    CHECKBOX "Legg til forelder  suffi&kser for primær DNS suffikser", IDC_TOPPRIMSUFFIX, 15, 125, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CONTROL "Vis d&isse DNS suffikser(i system):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 220, 12
-    LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY
-    PUSHBUTTON "Opp", IDC_DNSSUFFIXUP, 190, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Ned", IDC_DNSSUFFIXDOWN, 190, 180, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Legg til...", IDC_DNSSUFFIXADD, 15, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Rediger...", IDC_DNSSUFFIXMOD, 75, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "F&jern", IDC_DNSSUFFIXDEL, 135, 207, 50, 14, WS_TABSTOP
-    LTEXT "DNS &suffiks for denne tilkoblingen:", -1, 5, 228, 110, 14
-    EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP
-    CHECKBOX "&Register denne tilkoblings addressen i DNS", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX "&Bruk denne tilkoblingens DNS suffiks i DNS registrasjon", IDC_USESUFFIX, 15, 255, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    PUSHBUTTON "Opp", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Ned", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Legg til...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Rediger...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Fjern", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
+    LTEXT "Følgende tre innstillinger er brukt til alle tilkoblinger med TCP/IP aktivert. For beslutning av ukvalifisert navn:", -1, 5, 70, 220, 24
+    CONTROL "Legg til &primær og tilkobling spesifikt DNS suffikser", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
+    CHECKBOX "Legg til forelder suffi&kser for primær DNS suffikser", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CONTROL "Vis d&isse DNS suffikser(i system):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 115, 220, 12
+    LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
+    PUSHBUTTON "Opp", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Ned", IDC_DNSSUFFIXDOWN, 190, 145, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Legg til...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Rediger...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "F&jern", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
+    LTEXT "DNS &suffiks for denne tilkoblingen:", -1, 5, 183, 110, 14
+    EDITTEXT IDC_SUFFIX, 120, 180, 100, 12, WS_TABSTOP
+    CHECKBOX "&Register denne tilkoblings addressen i DNS", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "&Bruk denne tilkoblingens DNS suffiks i DNS registrasjon", IDC_USESUFFIX, 15, 207, 227, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 END
 
-IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Innstillinger"
 FONT 8, "MS Shell Dlg"
@@ -196,7 +196,7 @@ BEGIN
 END
 
 IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Advanced"
 FONT 8, "MS Shell Dlg"
 BEGIN
diff --git a/dll/win32/netcfgx/lang/pl-PL.rc b/dll/win32/netcfgx/lang/pl-PL.rc
index 888a7f7c3b3..0480786687f 100644
--- a/dll/win32/netcfgx/lang/pl-PL.rc
+++ b/dll/win32/netcfgx/lang/pl-PL.rc
@@ -1,20 +1,15 @@
-/*
- *    Translated by Polish Translation Team (Apr, 2007)
- *    Updated by Caemyr and Maciej Białas (2008)
- *    https://sourceforge.net/projects/reactospl
- *    UTF-8 conversion by Caemyr (May, 2011)
- */
+// COPYRIGHT: 2008 Caemyr, Maciej Białas
 
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
-IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 228
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Ogólne"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Możesz automatycznie pobrać ustawienia sieciowe protokołu IP, jeżeli Twoja sieć obsługuje te funkcje. W innym przypadku musisz skontaktować się z administratorem sieci w celu zdobycia odpowiednich ustawień.", -1, 9, 7, 235, 34
+    GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
     CONTROL "Pobierz adres IP automatycznie", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
-    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
     CONTROL "&Użyj następującego adresu IP:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
     LTEXT "Adres IP:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
@@ -22,25 +17,25 @@ BEGIN
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
     LTEXT "Brama domyślna:", -1, 14, 105, 135, 8
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
-    CONTROL "Pobierz adresy serwerów DNS automatycznie", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
-    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
-    CONTROL "&Użyj poniższych adresów serwera DNS", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
-    LTEXT "Pierwszy serwer DNS:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
-    LTEXT "Alternatywny serwer DNS:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
-    PUSHBUTTON "&Zaawansowane", IDC_ADVANCED, 178, 209, 60, 14, WS_TABSTOP
+    GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
+    CONTROL "Pobierz adresy serwerów DNS automatycznie", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
+    CONTROL "&Użyj poniższych adresów serwera DNS", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    LTEXT "Pierwszy serwer DNS:", -1, 14, 161, 135, 8
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
+    LTEXT "Alternatywny serwer DNS:", -1, 14, 176, 135, 8
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 176 - 2, 85, 12
+    PUSHBUTTON "&Zaawansowane", IDC_ADVANCED, 178, 199, 60, 14, WS_TABSTOP
 END
 
-IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 228
+IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 216
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Konfiguracja alternatywna"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Jeśli ten komputer jest używany w więcej niż jednej sieci, wprowadź poniżej alternatywne ustawienia protokołu IP", -1, 9, 9, 220, 20
+    GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX
     CONTROL "Au&tomatyczny prywatny adres IP", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
-    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
-    CONTROL "&Ustawienia konfigurowane przez użytkownika", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 210, 12
+    CONTROL "&Ustawienia konfigurowane przez użytkownika", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 210, 12
     LTEXT "Adres &IP:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "&Maska podsieci:", -1, 14, 95, 135, 8
@@ -53,56 +48,56 @@ BEGIN
     CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
-IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Ustawienia protokołu IP"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Adresy IP", -1, 5, 5, 240, 90
-    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 55
-    PUSHBUTTON "Dodaj...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Edytuj...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Usuń", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP
-    GROUPBOX "Bramy domyślne:", -1, 5, 100, 240, 90
-    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 215, 55
-    PUSHBUTTON "Dodaj...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Edytuj...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Usuń", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP
-    GROUPBOX "", -1, 5, 200, 240, 30
-    CHECKBOX "Metryka automatyczna", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "Metryka interfejsu:", -1, 15, 215, 90, 12
-    EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER
+    GROUPBOX "Adresy IP", -1, 5, 5, 240, 83
+    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 50
+    PUSHBUTTON "Dodaj...", IDC_IPADD, 60, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Edytuj...", IDC_IPMOD, 120, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Usuń", IDC_IPDEL, 180, 67, 50, 14, WS_TABSTOP
+    GROUPBOX "Bramy domyślne:", -1, 5, 93, 240, 83
+    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 103, 215, 50
+    PUSHBUTTON "Dodaj...", IDC_GWADD, 60, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Edytuj...", IDC_GWMOD, 120, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Usuń", IDC_GWDEL, 180, 155, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 5, 181, 240, 30
+    CHECKBOX "Metryka automatyczna", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "Metryka interfejsu:", -1, 15, 195, 90, 12
+    EDITTEXT IDC_METRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
-IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 270
+IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "DNS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 50, LBS_NOTIFY
+    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
     LTEXT "Adresy serwerów D&NS według kolejności używania:", -1, 5, 5, 180, 12
-    PUSHBUTTON "W górę", IDC_DNSADDRUP, 190, 25, 50, 14, WS_TABSTOP
-    PUSHBUTTON "W dół", IDC_DNSADDRDOWN, 190, 45, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Dodaj...", IDC_DNSADDRADD, 15, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Edytuj...", IDC_DNSADDRMOD, 75, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Usuń", IDC_DNSADDRDEL, 135, 69, 50, 14, WS_TABSTOP
-    LTEXT "Trzy poniższe ustawienia dotyczą wszystkich połączeń o włączonym protokole TCP/IP. W celu rozpoznawania nazw niekwalifikowanych:", -1, 5, 90, 220, 24
-    CONTROL "D&ołącz sufiksy DNS: podstawowy i konkretnego połączenia", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 220, 12
-    CHECKBOX "Dołącz su&fiksy nadrzędne podstawowego sufiksu DNS", IDC_TOPPRIMSUFFIX, 15, 125, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CONTROL "Dołą&cz poniższe sufiksy DNS (w podanej kolejności):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 220, 12
-    LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY
-    PUSHBUTTON "W górę", IDC_DNSSUFFIXUP, 190, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "W dół", IDC_DNSSUFFIXDOWN, 190, 180, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Dod&aj...", IDC_DNSSUFFIXADD, 15, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Ed&ytuj...", IDC_DNSSUFFIXMOD, 75, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "U&suń", IDC_DNSSUFFIXDEL, 135, 207, 50, 14, WS_TABSTOP
-    LTEXT "Sufiks DNS dla &tego połączenia:", -1, 5, 228, 110, 14
-    EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP
-    CHECKBOX "&Zarejestruj adresy tego połączenia w DNS", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX "Uży&j sufiksu DNS tego połączenia do rejestracji w DNS", IDC_USESUFFIX, 15, 255, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    PUSHBUTTON "W górę", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
+    PUSHBUTTON "W dół", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Dodaj...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Edytuj...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Usuń", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
+    LTEXT "Trzy poniższe ustawienia dotyczą wszystkich połączeń o włączonym protokole TCP/IP. W celu rozpoznawania nazw niekwalifikowanych:", -1, 5, 70, 220, 24
+    CONTROL "D&ołącz sufiksy DNS: podstawowy i konkretnego połączenia", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
+    CHECKBOX "Dołącz su&fiksy nadrzędne podstawowego sufiksu DNS", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CONTROL "Dołą&cz poniższe sufiksy DNS (w podanej kolejności):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 115, 220, 12
+    LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
+    PUSHBUTTON "W górę", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
+    PUSHBUTTON "W dół", IDC_DNSSUFFIXDOWN, 190, 145, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Dod&aj...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Ed&ytuj...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "U&suń", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
+    LTEXT "Sufiks DNS dla &tego połączenia:", -1, 5, 183, 110, 14
+    EDITTEXT IDC_SUFFIX, 120, 180, 100, 12, WS_TABSTOP
+    CHECKBOX "&Zarejestruj adresy tego połączenia w DNS", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "Uży&j sufiksu DNS tego połączenia do rejestracji w DNS", IDC_USESUFFIX, 15, 207, 227, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 END
 
-IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Opcje"
 FONT 8, "MS Shell Dlg"
@@ -203,7 +198,7 @@ BEGIN
 END
 
 IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Zaawansowane"
 FONT 8, "MS Shell Dlg"
 BEGIN
diff --git a/dll/win32/netcfgx/lang/pt-PT.rc b/dll/win32/netcfgx/lang/pt-PT.rc
index b077bfe94a0..93ea4377c3c 100644
--- a/dll/win32/netcfgx/lang/pt-PT.rc
+++ b/dll/win32/netcfgx/lang/pt-PT.rc
@@ -1,18 +1,15 @@
-/* Portuguese Language resource file
- *
- * Traduzido por: Jose Carlos Jesus 22-06-2019 zecarlos1957@hotmail.com
- */
+// COPYRIGHT: 2019 Jose Carlos Jesus <zecarlos1957@hotmail.com>
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 
-IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 228
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Geral"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Pode obter as configurações de IP atribuídas automaticamente se a sua rede suportar esse recurso. Caso contrário, precisará solicitar ao administrador da rede as configurações de IP apropriadas.", -1, 9, 9, 235, 27
+    GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
     CONTROL "Obter o endereço IP automaticamente", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
-    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
     CONTROL "&Usar o endereço IP:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
     LTEXT "Endereço IP:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
@@ -20,25 +17,25 @@ BEGIN
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
     LTEXT "Gateway padrão:", -1, 14, 105, 135, 8
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
-    CONTROL "Obter o endereço  DNS automaticamente", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
-    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
-    CONTROL "&Usar o endereço DNS :", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
-    LTEXT "Servidor DNS perferido:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
-    LTEXT "Alternar servidor DNS:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
-    PUSHBUTTON "&Avançado", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
+    CONTROL "Obter o endereço DNS automaticamente", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
+    CONTROL "&Usar o endereço DNS :", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    LTEXT "Servidor DNS perferido:", -1, 14, 161, 135, 8
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
+    LTEXT "Alternar servidor DNS:", -1, 14, 176, 135, 8
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 176 - 2, 85, 12
+    PUSHBUTTON "&Avançado", IDC_ADVANCED, 186, 199, 50, 14, WS_TABSTOP
 END
 
-IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 228
+IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 216
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Configuração alternativa"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Se este computador for usado em mais de uma rede, insira as configurações de IP alternativas abaixo.", -1, 9, 9, 220, 20
+    GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX
     CONTROL "IP privado &automático", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
-    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
-    CONTROL "&Config. do utilizador", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
+    CONTROL "&Config. do utilizador", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
     LTEXT "Endereço &IP:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "Mascara S&ubnet:", -1, 14, 95, 135, 8
@@ -51,63 +48,63 @@ BEGIN
     CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
-IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Definições de IP"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Endereço IP", -1, 5, 5, 240, 90
-    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 55
-    PUSHBUTTON "Adicionar", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Editar", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remover", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP
-    GROUPBOX "Gateway padrão:", -1, 5, 100, 240, 90
-    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 215, 55
-    PUSHBUTTON "Adicionar", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Editar", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remover", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP
-    GROUPBOX "", -1, 5, 200, 240, 30
-    CHECKBOX "Métrica automática", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "Interface métrica:", -1, 15, 215, 90, 12
-    EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER
+    GROUPBOX "Endereço IP", -1, 5, 5, 240, 83
+    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 50
+    PUSHBUTTON "Adicionar", IDC_IPADD, 60, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Editar", IDC_IPMOD, 120, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remover", IDC_IPDEL, 180, 67, 50, 14, WS_TABSTOP
+    GROUPBOX "Gateway padrão:", -1, 5, 93, 240, 83
+    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 103, 215, 50
+    PUSHBUTTON "Adicionar", IDC_GWADD, 60, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Editar", IDC_GWMOD, 120, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remover", IDC_GWDEL, 180, 155, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 5, 181, 240, 30
+    CHECKBOX "Métrica automática", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "Interface métrica:", -1, 15, 195, 90, 12
+    EDITTEXT IDC_METRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
-IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 270
+IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "DNS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 50, LBS_NOTIFY
+    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
     LTEXT "Endereços do servidor &DNS, em uso:", -1, 5, 5, 180, 12
-    PUSHBUTTON "A&cima", IDC_DNSADDRUP, 190, 25, 50, 14, WS_TABSTOP
-    PUSHBUTTON "A&baixo", IDC_DNSADDRDOWN, 190, 45, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Adicionar", IDC_DNSADDRADD, 15, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Editar", IDC_DNSADDRMOD, 75, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Remover", IDC_DNSADDRDEL, 135, 69, 50, 14, WS_TABSTOP
-    LTEXT "As três configurações seguintes, são aplicaveis a todas as ligações com o TCP / IP activo. Para resolução de nomes não qualificados:", -1, 5, 90, 220, 24
-    CONTROL "Anexar sufixos DNS específicos e primários à ligação", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 220, 12
-    CHECKBOX "Anexar sufixo pai ao sufixo DNS principal", IDC_TOPPRIMSUFFIX, 15, 125, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CONTROL "Anexar estes sufixos DNS (pela ordem):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 220, 12
-    LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY
-    PUSHBUTTON "Cima", IDC_DNSSUFFIXUP, 190, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "baixo", IDC_DNSSUFFIXDOWN, 190, 180, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Adicionar", IDC_DNSSUFFIXADD, 15, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Editar.", IDC_DNSSUFFIXMOD, 75, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remo&ver", IDC_DNSSUFFIXDEL, 135, 207, 50, 14, WS_TABSTOP
-    LTEXT "DNS e &sufixo para esta ligação:", -1, 5, 228, 110, 14
-    EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP
-    CHECKBOX "&Registe os endereços desta ligação no DNS", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX "&Use o sufixo DNS desta ligação no registo DNS", IDC_USESUFFIX, 15, 255, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    PUSHBUTTON "A&cima", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
+    PUSHBUTTON "A&baixo", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Adicionar", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Editar", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Remover", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
+    LTEXT "As três configurações seguintes, são aplicaveis a todas as ligações com o TCP / IP activo. Para resolução de nomes não qualificados:", -1, 5, 70, 220, 24
+    CONTROL "Anexar sufixos DNS específicos e primários à ligação", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
+    CHECKBOX "Anexar sufixo pai ao sufixo DNS principal", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CONTROL "Anexar estes sufixos DNS (pela ordem):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 115, 220, 12
+    LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
+    PUSHBUTTON "Cima", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
+    PUSHBUTTON "baixo", IDC_DNSSUFFIXDOWN, 190, 145, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Adicionar", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Editar.", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remo&ver", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
+    LTEXT "DNS e &sufixo para esta ligação:", -1, 5, 183, 110, 14
+    EDITTEXT IDC_SUFFIX, 120, 180, 100, 12, WS_TABSTOP
+    CHECKBOX "&Registe os endereços desta ligação no DNS", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "&Use o sufixo DNS desta ligação no registo DNS", IDC_USESUFFIX, 15, 207, 227, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 END
 
-IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Opções"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LISTBOX IDC_OPTLIST, 5, 30, 230, 70
     LTEXT "&Definições opcionais", -1, 5, 15, 130, 12
-    PUSHBUTTON "&Proppriedades", IDC_OPTPROP, 165, 100, 70, 14, WS_TABSTOP
+    PUSHBUTTON "&Propriedades", IDC_OPTPROP, 165, 100, 70, 14, WS_TABSTOP
     GROUPBOX "Descrição:", -1, 5, 120, 240, 70
     LTEXT "", IDC_OPTDESC, 15, 130, 220, 33
 END
@@ -174,7 +171,7 @@ BEGIN
     PUSHBUTTON "Adicionar", IDC_TCP_ADD, 15, 141, 50, 14, WS_TABSTOP
     PUSHBUTTON "Remover", IDC_TCP_DEL, 15, 161, 50, 14, WS_TABSTOP
     GROUPBOX "", -1, 105, 30, 90, 150
-    CONTROL "Permiirt todosl", IDC_UDP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 30, 70, 12
+    CONTROL "Permitir todos", IDC_UDP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 30, 70, 12
     CONTROL "Permitir só", IDC_UDP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 44, 70, 12
     CONTROL "", IDC_UDP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 111, 62, 72, 75
     PUSHBUTTON "Adicionar", IDC_UDP_ADD, 115, 141, 50, 14, WS_TABSTOP
@@ -201,7 +198,7 @@ BEGIN
 END
 
 IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Avançado"
 FONT 8, "MS Shell Dlg"
 BEGIN
diff --git a/dll/win32/netcfgx/lang/ro-RO.rc b/dll/win32/netcfgx/lang/ro-RO.rc
index 02d46456c99..f87bdcd46bf 100644
--- a/dll/win32/netcfgx/lang/ro-RO.rc
+++ b/dll/win32/netcfgx/lang/ro-RO.rc
@@ -1,19 +1,15 @@
-/* 
- * FILE:       dll/win32/netcfgx/lang/ro-RO.rc
- *             ReactOS Project (https://reactos.org)
- * TRANSLATOR: Ștefan Fulea (stefan dot fulea at mail dot com)
- */
+// COPYRIGHT: Ștefan Fulea <stefan.fulea@mail.com>
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
-IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 228
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Generale"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Puteți obține automat configurarea adresei IP în rețelele cu DHCP. Altfel, este necesară configurarea manuală de către administratorul de rețea.", -1, 9, 9, 235, 27
+    GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
     CONTROL "&Obține automat adresă IP", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
-    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
     CONTROL "Folosește adresa ur&mătoare:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
     LTEXT "Adresă I&P:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
@@ -21,25 +17,25 @@ BEGIN
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
     LTEXT "S&erver „poartă” implicit:", -1, 14, 105, 135, 8
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
-    CONTROL "Obține a&utomat adresa serverului DNS", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
-    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
-    CONTROL "Folosește adresa &DNS următoare", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
-    LTEXT "Server DNS p&referat:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
-    LTEXT "Server DNS &alternativ:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
-    PUSHBUTTON "A&vansate", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
+    CONTROL "Obține a&utomat adresa serverului DNS", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
+    CONTROL "Folosește adresa &DNS următoare", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    LTEXT "Server DNS p&referat:", -1, 14, 161, 135, 8
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
+    LTEXT "Server DNS &alternativ:", -1, 14, 176, 135, 8
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 176 - 2, 85, 12
+    PUSHBUTTON "A&vansate", IDC_ADVANCED, 186, 199, 50, 14, WS_TABSTOP
 END
 
-IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 228
+IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 216
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Configurație alternativă"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Dacă acest calculator este utilizat în mai multe rețele, puteți specifica mai jos o configurație alternativă.", -1, 9, 9, 220, 20
+    GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX
     CONTROL "Adresă IP p&rivată obținută automat", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
-    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
-    CONTROL "Configurată &manual", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 90, 12
+    CONTROL "Configurată &manual", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 90, 12
     LTEXT "Adresă I&P:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "Mască de su&brețea:", -1, 14, 95, 135, 8
@@ -52,56 +48,56 @@ BEGIN
     CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
-IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Parametri IP"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Ad&resă IP", -1, 5, 5, 240, 90
-    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 55
-    PUSHBUTTON "&Adăugare…", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Modificare…", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Elimină", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP
-    GROUPBOX "Ser&vere „porți” implicite:", -1, 5, 100, 240, 90
-    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 215, 55
-    PUSHBUTTON "A&dăugare…", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "M&odificare…", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "E&limină", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP
-    GROUPBOX "", -1, 5, 200, 240, 30
-    CHECKBOX "Metrică stabilită a&utomat", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "Metri&ca interfeței:", -1, 15, 215, 90, 12
-    EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER
+    GROUPBOX "Ad&resă IP", -1, 5, 5, 240, 83
+    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 50
+    PUSHBUTTON "&Adăugare…", IDC_IPADD, 60, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Modificare…", IDC_IPMOD, 120, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Elimină", IDC_IPDEL, 180, 67, 50, 14, WS_TABSTOP
+    GROUPBOX "Ser&vere „porți” implicite:", -1, 5, 93, 240, 83
+    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 103, 215, 50
+    PUSHBUTTON "A&dăugare…", IDC_GWADD, 60, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "M&odificare…", IDC_GWMOD, 120, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "E&limină", IDC_GWDEL, 180, 155, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 5, 181, 240, 30
+    CHECKBOX "Metrică stabilită a&utomat", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "Metri&ca interfeței:", -1, 15, 195, 90, 12
+    EDITTEXT IDC_METRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
-IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 270
+IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "DNS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 50, LBS_NOTIFY
+    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
     LTEXT "Adrese de ser&vere DNS, în ordinea utilizării:", -1, 5, 5, 180, 12
-    PUSHBUTTON "&Sus", IDC_DNSADDRUP, 190, 25, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Jos", IDC_DNSADDRDOWN, 190, 45, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Adăugare…", IDC_DNSADDRADD, 15, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Modificare…", IDC_DNSADDRMOD, 75, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Elimină", IDC_DNSADDRDEL, 135, 69, 50, 14, WS_TABSTOP
-    LTEXT "Următoarele opțiuni sunt aplicate tuturor conexiunilor cu TCP/IP active. Pentru rezoluția numelor necalificate:", -1, 5, 90, 220, 24
-    CONTROL "In&clude sufixul DNS primar și de conexiune", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 220, 12
-    CHECKBOX "In&clude sufixul părinte al sufixului DNS primar", IDC_TOPPRIMSUFFIX, 15, 125, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CONTROL "In&clude următoarele sufixe DNS (în ordine):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 220, 12
-    LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY
-    PUSHBUTTON "S&us", IDC_DNSSUFFIXUP, 190, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "J&os", IDC_DNSSUFFIXDOWN, 190, 180, 50, 14, WS_TABSTOP
-    PUSHBUTTON "A&dăugare…", IDC_DNSSUFFIXADD, 15, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Mod&ificare…", IDC_DNSSUFFIXMOD, 75, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "E&limină", IDC_DNSSUFFIXDEL, 135, 207, 50, 14, WS_TABSTOP
-    LTEXT "Sufixul DNS al conexiunii curente:", -1, 5, 228, 110, 14
-    EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP
-    CHECKBOX "În&registrează adresele conexiunii în DNS", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX "La înregistrare, utili&zează sufixul DNS al conexiunii", IDC_USESUFFIX, 15, 255, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    PUSHBUTTON "&Sus", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Jos", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Adăugare…", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Modificare…", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Elimină", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
+    LTEXT "Următoarele opțiuni sunt aplicate tuturor conexiunilor cu TCP/IP active. Pentru rezoluția numelor necalificate:", -1, 5, 70, 220, 24
+    CONTROL "In&clude sufixul DNS primar și de conexiune", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
+    CHECKBOX "In&clude sufixul părinte al sufixului DNS primar", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CONTROL "In&clude următoarele sufixe DNS (în ordine):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 115, 220, 12
+    LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
+    PUSHBUTTON "S&us", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
+    PUSHBUTTON "J&os", IDC_DNSSUFFIXDOWN, 190, 145, 50, 14, WS_TABSTOP
+    PUSHBUTTON "A&dăugare…", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Mod&ificare…", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "E&limină", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
+    LTEXT "Sufixul DNS al conexiunii curente:", -1, 5, 183, 110, 14
+    EDITTEXT IDC_SUFFIX, 120, 180, 100, 12, WS_TABSTOP
+    CHECKBOX "În&registrează adresele conexiunii în DNS", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "La înregistrare, utili&zează sufixul DNS al conexiunii", IDC_USESUFFIX, 15, 207, 227, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 END
 
-IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Opțiuni"
 FONT 8, "MS Shell Dlg"
@@ -202,7 +198,7 @@ BEGIN
 END
 
 IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Avansate"
 FONT 8, "MS Shell Dlg"
 BEGIN
diff --git a/dll/win32/netcfgx/lang/ru-RU.rc b/dll/win32/netcfgx/lang/ru-RU.rc
index b264aa58276..bb8bf0151d8 100644
--- a/dll/win32/netcfgx/lang/ru-RU.rc
+++ b/dll/win32/netcfgx/lang/ru-RU.rc
@@ -1,13 +1,13 @@
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
-IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 228
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Общие"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Параметры протокола IP могут назначаться автоматически, если сеть поддерживает эту возможность. В противном случае параметры IP можно получить у сетевого администратора.", -1, 9, 9, 235, 27
+    GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
     CONTROL "Получать IP-адрес автоматически", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
-    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
     CONTROL "&Использовать следующий IP-адрес:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 140, 12
     LTEXT "IP-адрес:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
@@ -15,25 +15,25 @@ BEGIN
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
     LTEXT "Шлюз по умолчанию:", -1, 14, 105, 135, 8
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
-    CONTROL "Получать адрес DNS-сервера автоматически", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
-    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
-    CONTROL "&Использовать следующие адреса DNS-серверов:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 185, 12
-    LTEXT "Предпочитаемый DNS-сервер:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
-    LTEXT "Альтернативный DNS-сервер:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
-    PUSHBUTTON "&Дополнительно", IDC_ADVANCED, 162, 209, 74, 14, WS_TABSTOP
+    GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
+    CONTROL "Получать адрес DNS-сервера автоматически", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
+    CONTROL "&Использовать следующие адреса DNS-серверов:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 185, 12
+    LTEXT "Предпочитаемый DNS-сервер:", -1, 14, 161, 135, 8
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
+    LTEXT "Альтернативный DNS-сервер:", -1, 14, 176, 135, 8
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 176 - 2, 85, 12
+    PUSHBUTTON "&Дополнительно", IDC_ADVANCED, 162, 199, 74, 14, WS_TABSTOP
 END
 
-IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 228
+IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 216
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Альтернативная конфигурация"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Если этот компьютер используется в нескольких сетях, введите параметры альтернативной конфигурации протокола IP:", -1, 9, 9, 230, 20
+    GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX
     CONTROL "А&втоматический частный IP-адрес", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
-    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
-    CONTROL "Настраиваем&ый пользователем", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 130, 12
+    CONTROL "Настраиваем&ый пользователем", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 130, 12
     LTEXT "IP-&адрес:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "Ма&ска подсети:", -1, 14, 95, 135, 8
@@ -46,56 +46,56 @@ BEGIN
     CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
-IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Параметры IP"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "IP-&адреса", -1, 5, 5, 240, 90
-    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 55
-    PUSHBUTTON "&Добавить...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Изменить...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Удалить", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP
-    GROUPBOX "&Основные шлюзы:", -1, 5, 100, 240, 90
-    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 215, 55
-    PUSHBUTTON "До&бавить...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "И&зменить...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Уда&лить", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP
-    GROUPBOX "", -1, 5, 200, 240, 30
-    CHECKBOX "А&втоматическое назначение метрики", IDC_AUTOMETRIC, 9, 200, 146, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "Метрика ин&терфейса:", -1, 15, 215, 90, 12
-    EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER
+    GROUPBOX "IP-&адреса", -1, 5, 5, 240, 83
+    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 50
+    PUSHBUTTON "&Добавить...", IDC_IPADD, 60, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Изменить...", IDC_IPMOD, 120, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Удалить", IDC_IPDEL, 180, 67, 50, 14, WS_TABSTOP
+    GROUPBOX "&Основные шлюзы:", -1, 5, 93, 240, 83
+    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 103, 215, 50
+    PUSHBUTTON "До&бавить...", IDC_GWADD, 60, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "И&зменить...", IDC_GWMOD, 120, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Уда&лить", IDC_GWDEL, 180, 155, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 5, 181, 240, 30
+    CHECKBOX "А&втоматическое назначение метрики", IDC_AUTOMETRIC, 9, 179, 146, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "Метрика ин&терфейса:", -1, 15, 195, 90, 12
+    EDITTEXT IDC_METRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
-IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 270
+IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "DNS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 50, LBS_NOTIFY
-    LTEXT "&Адреса DNS-серверов, в порядке использования:", -1, 5, 5, 180, 10
-    PUSHBUTTON "Вверх", IDC_DNSADDRUP, 190, 25, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Вниз", IDC_DNSADDRDOWN, 190, 45, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Добавить...", IDC_DNSADDRADD, 15, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "И&зменить...", IDC_DNSADDRMOD, 75, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Удалить", IDC_DNSADDRDEL, 135, 69, 50, 14, WS_TABSTOP
-    LTEXT "Следующие три параметра применяются для всех подключений, использующих TCP/IP. Для разрешения неизвестных имен:", -1, 5, 90, 238, 20
-    CONTROL "Дописывать &основной DNS-суффикс и суффикс подключения", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 234, 12
-    CHECKBOX "Дописывать роди&тельские суффиксы осн. DNS-суффикса", IDC_TOPPRIMSUFFIX, 15, 125, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CONTROL "Дописывать сл&едующие DNS-суффиксы (по порядку):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 220, 12
-    LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY
-    PUSHBUTTON "Вверх", IDC_DNSSUFFIXUP, 190, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Вниз", IDC_DNSSUFFIXDOWN, 190, 180, 50, 14, WS_TABSTOP
-    PUSHBUTTON "До&бавить...", IDC_DNSSUFFIXADD, 15, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Из&менить...", IDC_DNSSUFFIXMOD, 75, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Уда&лить", IDC_DNSSUFFIXDEL, 135, 207, 50, 14, WS_TABSTOP
-    LTEXT "DNS-&суффикс подключения:", -1, 5, 228, 110, 14
-    EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP
-    CHECKBOX "Заре&гистрировать адреса этого подключения в DNS", IDC_REGSUFFIX, 8, 240, 204, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX "&Использовать DNS-суффикс подключения при регистрации в DNS", IDC_USESUFFIX, 8, 255, 270, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
+    LTEXT "&Адреса DNS-серверов, в порядке использования:", -1, 5, 5, 180, 12
+    PUSHBUTTON "Вверх", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Вниз", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Добавить...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "И&зменить...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Удалить", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
+    LTEXT "Следующие три параметра применяются для всех подключений, использующих TCP/IP. Для разрешения неизвестных имен:", -1, 5, 70, 238, 24
+    CONTROL "Дописывать &основной DNS-суффикс и суффикс подключения", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
+    CHECKBOX "Дописывать роди&тельские суффиксы осн. DNS-суффикса", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CONTROL "Дописывать сл&едующие DNS-суффиксы (по порядку):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 115, 220, 12
+    LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
+    PUSHBUTTON "Вверх", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Вниз", IDC_DNSSUFFIXDOWN, 190, 145, 50, 14, WS_TABSTOP
+    PUSHBUTTON "До&бавить...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Из&менить...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Уда&лить", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
+    LTEXT "DNS-&суффикс подключения:", -1, 5, 183, 110, 14
+    EDITTEXT IDC_SUFFIX, 120, 180, 100, 12, WS_TABSTOP
+    CHECKBOX "Заре&гистрировать адреса этого подключения в DNS", IDC_REGSUFFIX, 8, 195, 204, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "&Использовать DNS-суффикс подключения при регистрации в DNS", IDC_USESUFFIX, 8, 207, 238, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 END
 
-IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Параметры"
 FONT 8, "MS Shell Dlg"
@@ -196,7 +196,7 @@ BEGIN
 END
 
 IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Дополнительно"
 FONT 8, "MS Shell Dlg"
 BEGIN
diff --git a/dll/win32/netcfgx/lang/sk-SK.rc b/dll/win32/netcfgx/lang/sk-SK.rc
index fa0952d793e..5ca8b476998 100644
--- a/dll/win32/netcfgx/lang/sk-SK.rc
+++ b/dll/win32/netcfgx/lang/sk-SK.rc
@@ -1,13 +1,13 @@
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 
-IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 228
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Všeobecné"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "You can get IP settings assigned automatically if your network supports this capability. Otherwise, you need to ask your network administrator for the appropriate IP settings.", -1, 9, 9, 235, 27
+    GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
     CONTROL "Obtain the IP address automatically", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
-    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
     CONTROL "&Use the following IP address:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
     LTEXT "Adresa IP:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
@@ -15,25 +15,25 @@ BEGIN
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
     LTEXT "Predvolená brána:", -1, 14, 105, 135, 8
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
-    CONTROL "Obtain the DNS server address automatically", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
-    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
-    CONTROL "&Use the following DNS server addresses", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
-    LTEXT "Preferovaný DNS server:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
-    LTEXT "Alternatívny DNS server:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
-    PUSHBUTTON "&Advanced", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
+    CONTROL "Obtain the DNS server address automatically", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
+    CONTROL "&Use the following DNS server addresses", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    LTEXT "Preferovaný DNS server:", -1, 14, 161, 135, 8
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
+    LTEXT "Alternatívny DNS server:", -1, 14, 176, 135, 8
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 176 - 2, 85, 12
+    PUSHBUTTON "&Advanced", IDC_ADVANCED, 186, 199, 50, 14, WS_TABSTOP
 END
 
-IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 228
+IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 216
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Alternate Configuration"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "If this computer is used on more than one network, enter the alternate IP settings below", -1, 9, 9, 220, 20
+    GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX
     CONTROL "Au&tomatic private IP address", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
-    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
-    CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
+    CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
     LTEXT "Adresa &IP:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8
@@ -46,56 +46,56 @@ BEGIN
     CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
-IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "IP nastavenia"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Adresy IP", -1, 5, 5, 240, 90
-    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 55
-    PUSHBUTTON "Pridať...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Upraviť...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Odstrániť", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP
-    GROUPBOX "Predvolené brány:", -1, 5, 100, 240, 90
-    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 215, 55
-    PUSHBUTTON "Pridať...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Upraviť...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Odstrániť", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP
-    GROUPBOX "", -1, 5, 200, 240, 30
-    CHECKBOX "Automatická metrika", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "Interface metric:", -1, 15, 215, 90, 12
-    EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER
+    GROUPBOX "Adresy IP", -1, 5, 5, 240, 83
+    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 50
+    PUSHBUTTON "Pridať...", IDC_IPADD, 60, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Upraviť...", IDC_IPMOD, 120, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Odstrániť", IDC_IPDEL, 180, 67, 50, 14, WS_TABSTOP
+    GROUPBOX "Predvolené brány:", -1, 5, 93, 240, 83
+    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 103, 215, 50
+    PUSHBUTTON "Pridať...", IDC_GWADD, 60, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Upraviť...", IDC_GWMOD, 120, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Odstrániť", IDC_GWDEL, 180, 155, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 5, 181, 240, 30
+    CHECKBOX "Automatická metrika", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "Interface metric:", -1, 15, 195, 90, 12
+    EDITTEXT IDC_METRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
-IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 270
+IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "DNS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 50, LBS_NOTIFY
+    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
     LTEXT "D&NS server addresses, in order of use:", -1, 5, 5, 180, 12
-    PUSHBUTTON "Up", IDC_DNSADDRUP, 190, 25, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Down", IDC_DNSADDRDOWN, 190, 45, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Add...", IDC_DNSADDRADD, 15, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Edit...", IDC_DNSADDRMOD, 75, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remo&ve", IDC_DNSADDRDEL, 135, 69, 50, 14, WS_TABSTOP
-    LTEXT "The following three settings are applied to all connections with TCP/IP enabled. For resolution of unqualified names:", -1, 5, 90, 220, 24
-    CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 220, 12
-    CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 125, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CONTROL "Append t&hese DNS suffixes(in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 220, 12
-    LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY
-    PUSHBUTTON "Up", IDC_DNSSUFFIXUP, 190, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Down", IDC_DNSSUFFIXDOWN, 190, 180, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Add...", IDC_DNSSUFFIXADD, 15, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Edit...", IDC_DNSSUFFIXMOD, 75, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remo&ve", IDC_DNSSUFFIXDEL, 135, 207, 50, 14, WS_TABSTOP
-    LTEXT "DNS &suffix for this connection:", -1, 5, 228, 110, 14
-    EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP
-    CHECKBOX "&Register this connection's addresses in DNS", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX "&Use this connection's DNS suffix in DNS registration", IDC_USESUFFIX, 15, 255, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    PUSHBUTTON "Up", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Down", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Add...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Edit...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remo&ve", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
+    LTEXT "The following three settings are applied to all connections with TCP/IP enabled. For resolution of unqualified names:", -1, 5, 70, 220, 24
+    CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
+    CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CONTROL "Append t&hese DNS suffixes(in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 115, 220, 12
+    LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
+    PUSHBUTTON "Up", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Down", IDC_DNSSUFFIXDOWN, 190, 145, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Add...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Edit...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remo&ve", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
+    LTEXT "DNS &suffix for this connection:", -1, 5, 183, 110, 14
+    EDITTEXT IDC_SUFFIX, 120, 180, 100, 12, WS_TABSTOP
+    CHECKBOX "&Register this connection's addresses in DNS", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "&Use this connection's DNS suffix in DNS registration", IDC_USESUFFIX, 15, 207, 227, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 END
 
-IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Možnosti"
 FONT 8, "MS Shell Dlg"
@@ -196,7 +196,7 @@ BEGIN
 END
 
 IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Advanced"
 FONT 8, "MS Shell Dlg"
 BEGIN
diff --git a/dll/win32/netcfgx/lang/sq-AL.rc b/dll/win32/netcfgx/lang/sq-AL.rc
index 4eac8f192cc..9ab94b5f3bb 100644
--- a/dll/win32/netcfgx/lang/sq-AL.rc
+++ b/dll/win32/netcfgx/lang/sq-AL.rc
@@ -1,18 +1,15 @@
-/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
- * DATE OF TRANSLATION:  23-01-2014
-*/
-
+// COPYRIGHT: 2014 Ardit Dani (Ard1t) <ardit.dani@gmail.com>
 
 LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
 
-IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 228
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Përgjithshëm"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Ju mund të merrni cilësimet e IP've të caktuara automatikisht në qoftë se rrjeti juaj mbështet këtë aftësi. Përndryshe, ju duhet të pyesni administratorin e rrjetit tuaj për cilësimet e duhura të IP've.", -1, 9, 9, 235, 27
+    GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
     CONTROL "Marrë adresë IP'sh automatikisht", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
-    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
     CONTROL "&Përdor adresën e mëposhtme IP'së:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
     LTEXT "Adresa IP:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
@@ -20,25 +17,25 @@ BEGIN
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
     LTEXT "Gateway parazgjedhur:", -1, 14, 105, 135, 8
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
-    CONTROL "Merr adresën e serverit DNS automatikisht", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
-    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
-    CONTROL "&Përdorni adresen DNS të server-it të mëposhtme", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
-    LTEXT "DNS'ja serverit e preferuar:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
-    LTEXT "Alterno DNS'në e server-it:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
-    PUSHBUTTON "&Përparuar", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
+    CONTROL "Merr adresën e serverit DNS automatikisht", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
+    CONTROL "&Përdorni adresen DNS të server-it të mëposhtme", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    LTEXT "DNS'ja serverit e preferuar:", -1, 14, 161, 135, 8
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
+    LTEXT "Alterno DNS'në e server-it:", -1, 14, 176, 135, 8
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 176 - 2, 85, 12
+    PUSHBUTTON "&Përparuar", IDC_ADVANCED, 186, 199, 50, 14, WS_TABSTOP
 END
 
-IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 228
+IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 216
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Alterno Konfigurimin"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Në qoftë se ky kompjuter është përdorur në më shumë se një rrjet, futni cilësimet alternative IP poshtë", -1, 9, 9, 220, 20
+    GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX
     CONTROL "Adresë IP private auto%matike", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
-    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
-    CONTROL "Përdorue&si konfiguruar", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
+    CONTROL "Përdorue&si konfiguruar", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
     LTEXT "Adresa &IP:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8
@@ -51,56 +48,56 @@ BEGIN
     CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
-IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Cilësimet IP've"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Adresat IP've", -1, 5, 5, 240, 90
-    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 55
-    PUSHBUTTON "Shto...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Modifiko...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Heq", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP
-    GROUPBOX "Gateway Parazgjedhur:", -1, 5, 100, 240, 90
-    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 215, 55
-    PUSHBUTTON "Shto...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Modifiko...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Heq", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP
-    GROUPBOX "", -1, 5, 200, 240, 30
-    CHECKBOX "Automatik metrik", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "Ndërfaqe metrike:", -1, 15, 215, 90, 12
-    EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER
+    GROUPBOX "Adresat IP've", -1, 5, 5, 240, 83
+    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 50
+    PUSHBUTTON "Shto...", IDC_IPADD, 60, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Modifiko...", IDC_IPMOD, 120, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Heq", IDC_IPDEL, 180, 67, 50, 14, WS_TABSTOP
+    GROUPBOX "Gateway Parazgjedhur:", -1, 5, 93, 240, 83
+    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 103, 215, 50
+    PUSHBUTTON "Shto...", IDC_GWADD, 60, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Modifiko...", IDC_GWMOD, 120, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Heq", IDC_GWDEL, 180, 155, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 5, 181, 240, 30
+    CHECKBOX "Automatik metrik", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "Ndërfaqe metrike:", -1, 15, 195, 90, 12
+    EDITTEXT IDC_METRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
-IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 270
+IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "DNS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 50, LBS_NOTIFY
+    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
     LTEXT "Adresa D&NS server, në rend përdorimi:", -1, 5, 5, 180, 12
-    PUSHBUTTON "Lart", IDC_DNSADDRUP, 190, 25, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Poshtë", IDC_DNSADDRDOWN, 190, 45, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Shto...", IDC_DNSADDRADD, 15, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Modifiko...", IDC_DNSADDRMOD, 75, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Heq", IDC_DNSADDRDEL, 135, 69, 50, 14, WS_TABSTOP
-    LTEXT "Tre cilësimet e mëposhtme zbatohen për të gjitha lidhjeve me TCP/IP të aktivizuara. Për zgjidhjen e emrave të pakualifikuar:", -1, 5, 90, 220, 24
-    CONTROL "Shto lidhjen primare dhe specifike suffixes për DNS'në", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 220, 12
-    CHECKBOX "Shto prindin prapashtesë të primarit DNS", IDC_TOPPRIMSUFFIX, 15, 125, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CONTROL "Shto këto DNS suffixes(në rend):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 220, 12
-    LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY
-    PUSHBUTTON "Lart", IDC_DNSSUFFIXUP, 190, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Poshtë", IDC_DNSSUFFIXDOWN, 190, 180, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Shto...", IDC_DNSSUFFIXADD, 15, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Modifiko...", IDC_DNSSUFFIXMOD, 75, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Heq", IDC_DNSSUFFIXDEL, 135, 207, 50, 14, WS_TABSTOP
-    LTEXT "Prapashtesa DNS'së për këtë lidhje:", -1, 5, 228, 110, 14
-    EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP
-    CHECKBOX "&Regjistrohu adresat e kësaj lidhje në DNS", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX "&Përdor lidhje prapashtesë të DNS'së në regjistrimin e DNS'së", IDC_USESUFFIX, 15, 255, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    PUSHBUTTON "Lart", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Poshtë", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Shto...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Modifiko...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Heq", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
+    LTEXT "Tre cilësimet e mëposhtme zbatohen për të gjitha lidhjeve me TCP/IP të aktivizuara. Për zgjidhjen e emrave të pakualifikuar:", -1, 5, 70, 220, 24
+    CONTROL "Shto lidhjen primare dhe specifike suffixes për DNS'në", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
+    CHECKBOX "Shto prindin prapashtesë të primarit DNS", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CONTROL "Shto këto DNS suffixes(në rend):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 115, 220, 12
+    LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
+    PUSHBUTTON "Lart", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Poshtë", IDC_DNSSUFFIXDOWN, 190, 145, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Shto...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Modifiko...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Heq", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
+    LTEXT "Prapashtesa DNS'së për këtë lidhje:", -1, 5, 183, 110, 14
+    EDITTEXT IDC_SUFFIX, 120, 180, 100, 12, WS_TABSTOP
+    CHECKBOX "&Regjistrohu adresat e kësaj lidhje në DNS", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "&Përdor lidhje prapashtesë të DNS'së në regjistrimin e DNS'së", IDC_USESUFFIX, 15, 207, 227, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 END
 
-IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Alternativë"
 FONT 8, "MS Shell Dlg"
@@ -201,7 +198,7 @@ BEGIN
 END
 
 IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Advanced"
 FONT 8, "MS Shell Dlg"
 BEGIN
diff --git a/dll/win32/netcfgx/lang/sv-SE.rc b/dll/win32/netcfgx/lang/sv-SE.rc
index c84639ce8be..d921f86ea33 100644
--- a/dll/win32/netcfgx/lang/sv-SE.rc
+++ b/dll/win32/netcfgx/lang/sv-SE.rc
@@ -1,13 +1,13 @@
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
-IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 228
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Allmänt"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Du kan erhålla en IP-adress automatiskt om ditt nätverk stödjer detta. Annars måste du kontakta nätverksadministratören för att få de korrekta inställningarna.", -1, 9, 9, 235, 27
-    CONTROL "Erhåll en IP-adress automatiskt", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 43, 210, 12
-    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
+    GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
+    CONTROL "Erhåll en IP-adress automatiskt", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
     CONTROL "&Använd följande IP-adress:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
     LTEXT "IP-adress:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
@@ -15,25 +15,25 @@ BEGIN
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
     LTEXT "Standard-gateway:", -1, 14, 105, 135, 8
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
-    CONTROL "Erhåll adress till DNS-server automatiskt", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 139, 210, 12
-    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
-    CONTROL "&Använd följande adress till DNS-server:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
-    LTEXT "Önskad DNS-server:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
-    LTEXT "Alternativ DNS-server:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
-    PUSHBUTTON "&Avancerat", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
+    CONTROL "Erhåll adress till DNS-server automatiskt", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
+    CONTROL "&Använd följande adress till DNS-server:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    LTEXT "Önskad DNS-server:", -1, 14, 161, 135, 8
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
+    LTEXT "Alternativ DNS-server:", -1, 14, 176, 135, 8
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 176 - 2, 85, 12
+    PUSHBUTTON "&Avancerat", IDC_ADVANCED, 186, 199, 50, 14, WS_TABSTOP
 END
 
-IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 228
+IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 216
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Alternate Configuration"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "If this computer is used on more than one network, enter the alternate IP settings below", -1, 9, 9, 220, 20
+    GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX
     CONTROL "Au&tomatic private IP address", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
-    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
-    CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
+    CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
     LTEXT "&IP address:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8
@@ -46,56 +46,56 @@ BEGIN
     CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
-IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "IP Settings"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "IP addresses", -1, 5, 5, 240, 90
-    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 55
-    PUSHBUTTON "Add...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Edit...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remove", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP
-    GROUPBOX "Default gateways:", -1, 5, 100, 240, 90
-    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 215, 55
-    PUSHBUTTON "Add...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Edit...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remove", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP
-    GROUPBOX "", -1, 5, 200, 240, 30
-    CHECKBOX "Automatic metric", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "Interface metric:", -1, 15, 215, 90, 12
-    EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER
+    GROUPBOX "IP addresses", -1, 5, 5, 240, 83
+    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 50
+    PUSHBUTTON "Add...", IDC_IPADD, 60, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Edit...", IDC_IPMOD, 120, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remove", IDC_IPDEL, 180, 67, 50, 14, WS_TABSTOP
+    GROUPBOX "Default gateways:", -1, 5, 93, 240, 83
+    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 103, 215, 50
+    PUSHBUTTON "Add...", IDC_GWADD, 60, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Edit...", IDC_GWMOD, 120, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remove", IDC_GWDEL, 180, 155, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 5, 181, 240, 30
+    CHECKBOX "Automatic metric", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "Interface metric:", -1, 15, 195, 90, 12
+    EDITTEXT IDC_METRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
-IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 270
+IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "DNS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 50, LBS_NOTIFY
+    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
     LTEXT "D&NS server addresses, in order of use:", -1, 5, 5, 180, 12
-    PUSHBUTTON "Up", IDC_DNSADDRUP, 190, 25, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Down", IDC_DNSADDRDOWN, 190, 45, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Add...", IDC_DNSADDRADD, 15, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Edit...", IDC_DNSADDRMOD, 75, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remo&ve", IDC_DNSADDRDEL, 135, 69, 50, 14, WS_TABSTOP
-    LTEXT "The following three settings are applied to all connections with TCP/IP enabled. For resolution of unqualified names:", -1, 5, 90, 220, 24
-    CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 220, 12
-    CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 125, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CONTROL "Append t&hese DNS suffixes(in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 220, 12
-    LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY
-    PUSHBUTTON "Up", IDC_DNSSUFFIXUP, 190, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Down", IDC_DNSSUFFIXDOWN, 190, 180, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Add...", IDC_DNSSUFFIXADD, 15, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Edit...", IDC_DNSSUFFIXMOD, 75, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remo&ve", IDC_DNSSUFFIXDEL, 135, 207, 50, 14, WS_TABSTOP
-    LTEXT "DNS &suffix for this connection:", -1, 5, 228, 110, 14
-    EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP
-    CHECKBOX "&Register this connection's addresses in DNS", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX "&Use this connection's DNS suffix in DNS registration", IDC_USESUFFIX, 15, 255, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    PUSHBUTTON "Up", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Down", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Add...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Edit...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remo&ve", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
+    LTEXT "The following three settings are applied to all connections with TCP/IP enabled. For resolution of unqualified names:", -1, 5, 70, 220, 24
+    CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
+    CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CONTROL "Append t&hese DNS suffixes(in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 115, 220, 12
+    LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
+    PUSHBUTTON "Up", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Down", IDC_DNSSUFFIXDOWN, 190, 145, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Add...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Edit...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remo&ve", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
+    LTEXT "DNS &suffix for this connection:", -1, 5, 183, 110, 14
+    EDITTEXT IDC_SUFFIX, 120, 180, 100, 12, WS_TABSTOP
+    CHECKBOX "&Register this connection's addresses in DNS", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "&Use this connection's DNS suffix in DNS registration", IDC_USESUFFIX, 15, 207, 227, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 END
 
-IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Options"
 FONT 8, "MS Shell Dlg"
@@ -196,7 +196,7 @@ BEGIN
 END
 
 IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Advanced"
 FONT 8, "MS Shell Dlg"
 BEGIN
diff --git a/dll/win32/netcfgx/lang/tr-TR.rc b/dll/win32/netcfgx/lang/tr-TR.rc
index 43a46c38a3b..37b584c35fb 100644
--- a/dll/win32/netcfgx/lang/tr-TR.rc
+++ b/dll/win32/netcfgx/lang/tr-TR.rc
@@ -1,41 +1,41 @@
-/* TRANSLATOR: 2014 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) */
+// COPYRIGHT: 2014 Erdem Ersoy
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
-IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 228
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Umûmî"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Eğer ağınız bu yeteneği destekliyorsa kendiliğinden atanmış IP ayarları alabilirsiniz. Yoksa uygun IP ayarları için ağ yöneticinize sormanız gerekir.", -1, 9, 9, 235, 27
-    CONTROL "IP Adresini Kendiliğinden Al", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
-    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
+    LTEXT "Eğer ağınız bu özelliği destekliyorsa otomatik atanmış IP ayarları alabilirsiniz. Yoksa, uygun IP ayarları için ağ yöneticinize başvurmanız gerekir.", -1, 9, 9, 235, 27
+    GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
+    CONTROL "IP adresini otomatik al", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
     CONTROL "&Aşağıdaki IP Adresini Kullan:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
     LTEXT "IP Adresi:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
     LTEXT "Alt Ağ Maskesi:", -1, 14, 90, 135, 8
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
-    LTEXT "Ön Tanımlı Geçit:", -1, 14, 105, 135, 8
+    LTEXT "Varsayılan geçit:", -1, 14, 105, 135, 8
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
-    CONTROL "DNS Sunucusu Adresini Kendiliğinden Al", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
-    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
-    CONTROL "A&şağıdaki DNS Sunucusu Adreslerini Kullan", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
-    LTEXT "Yeğlenen DNS Sunucusu:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
-    LTEXT "Başka DNS Sunucusu:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
-    PUSHBUTTON "&Gelişmiş", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
+    CONTROL "DNS sunucusu adresini otomatik al", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
+    CONTROL "A&şağıdaki DNS Sunucusu Adreslerini Kullan", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    LTEXT "Yeğlenen DNS Sunucusu:", -1, 14, 161, 135, 8
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
+    LTEXT "Başka DNS Sunucusu:", -1, 14, 176, 135, 8
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 176 - 2, 85, 12
+    PUSHBUTTON "&Gelişmiş", IDC_ADVANCED, 186, 199, 50, 14, WS_TABSTOP
 END
 
-IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 228
+IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 216
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Başka Yapılandırma"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Eğer bu bilgisayar birden çok ağda kullanılıyorsa aşağıda başka IP ayarlarını giriniz.", -1, 9, 9, 220, 20
-    CONTROL "&Kendiliğinden Husûsî IP Adresi", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
-    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
-    CONTROL "K&ullanıcının Yapılandırdığı", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
+    GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX
+    CONTROL "&Otomatik özel IP adresi", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
+    CONTROL "K&ullanıcının yapılandırdığı", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
     LTEXT "&IP Adresi:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "&Alt Ağ Maskesi:", -1, 14, 95, 135, 8
@@ -48,56 +48,56 @@ BEGIN
     CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
-IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "IP Ayarları"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "IP Adresleri", -1, 5, 5, 240, 90
-    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 55
-    PUSHBUTTON "Ekle...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Düzenle...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Sil", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP
-    GROUPBOX "Ön Tanımlı Geçitler:", -1, 5, 100, 240, 90
-    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 215, 55
-    PUSHBUTTON "Ekle...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Düzenle...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Sil", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP
-    GROUPBOX "", -1, 5, 200, 240, 30
-    CHECKBOX "Kendiliğinden Ölçü", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "Arayüz Ölçüsü:", -1, 15, 215, 90, 12
-    EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER
+    GROUPBOX "IP adresleri", -1, 5, 5, 240, 83
+    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 50
+    PUSHBUTTON "Ekle...", IDC_IPADD, 60, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Düzenle...", IDC_IPMOD, 120, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Sil", IDC_IPDEL, 180, 67, 50, 14, WS_TABSTOP
+    GROUPBOX "Varsayılan geçitler:", -1, 5, 93, 240, 83
+    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 103, 215, 50
+    PUSHBUTTON "Ekle...", IDC_GWADD, 60, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Düzenle...", IDC_GWMOD, 120, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Sil", IDC_GWDEL, 180, 155, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 5, 181, 240, 30
+    CHECKBOX "Kendiliğinden Ölçü", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "Arayüz ölçüsü:", -1, 15, 195, 90, 12
+    EDITTEXT IDC_METRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
-IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 270
+IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "DNS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 50, LBS_NOTIFY
+    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
     LTEXT "&Kullanmak için DNS sunucusu adresleri:", -1, 5, 5, 180, 12
-    PUSHBUTTON "Yukarı", IDC_DNSADDRUP, 190, 25, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Aşağı", IDC_DNSADDRDOWN, 190, 45, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Ekle...", IDC_DNSADDRADD, 15, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Düzenle...", IDC_DNSADDRMOD, 75, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Sil", IDC_DNSADDRDEL, 135, 69, 50, 14, WS_TABSTOP
-    LTEXT "Aşağıdaki üç ayar, TCP/IP'nin etkin olduğu tüm bağlantılara uygulanmıştır. Nitelenmemiş adların çözümü için:", -1, 5, 90, 220, 24
-    CONTROL "&Birinci ve Bağlantıya Özgü DNS Son Eklerini Ekle", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 220, 12
-    CHECKBOX "Bi&rinci DNS Son Ekinin Ana Son Eklerini Ekle", IDC_TOPPRIMSUFFIX, 15, 125, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CONTROL "Di&ziyle Şu DNS Son Eklerini Ekle:", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 220, 12
-    LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY
-    PUSHBUTTON "Yukarı", IDC_DNSSUFFIXUP, 190, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Aşağı", IDC_DNSSUFFIXDOWN, 190, 180, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Ek&le...", IDC_DNSSUFFIXADD, 15, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "D&üzenle...", IDC_DNSSUFFIXMOD, 75, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "S&il", IDC_DNSSUFFIXDEL, 135, 207, 50, 14, WS_TABSTOP
-    LTEXT "B&u Bağlantı İçin DNS Son Eki:", -1, 5, 228, 110, 14
-    EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP
-    CHECKBOX "D&NS'ye Bu Bağlantının Adreslerini Sakla", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX "DNS K&aydında Bu Bağlantının DNS Son Ekini Kullan", IDC_USESUFFIX, 15, 255, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    PUSHBUTTON "Yukarı", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Aşağı", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Ekle...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Düzenle...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Sil", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
+    LTEXT "Aşağıdaki üç ayar, TCP/IP'nin etkin olduğu tüm bağlantılara uygulanır. Nitelenmemiş adların çözümü için:", -1, 5, 70, 220, 24
+    CONTROL "&Birinci ve bağlantıya özgü DNS son eklerini ekle", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
+    CHECKBOX "Bi&rinci DNS son ekinin ana son eklerini ekle", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CONTROL "Di&ziyle Şu DNS Son Eklerini Ekle:", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 115, 220, 12
+    LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
+    PUSHBUTTON "Yukarı", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Aşağı", IDC_DNSSUFFIXDOWN, 190, 145, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Ek&le...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "D&üzenle...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "S&il", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
+    LTEXT "B&u bağlantı için DNS son eki:", -1, 5, 183, 110, 14
+    EDITTEXT IDC_SUFFIX, 120, 180, 100, 12, WS_TABSTOP
+    CHECKBOX "D&NS'ye Bu Bağlantının Adreslerini Sakla", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "DNS k&aydında bu bağlantının DNS son ekini kullan", IDC_USESUFFIX, 15, 207, 227, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 END
 
-IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Seçenekler"
 FONT 8, "MS Shell Dlg"
@@ -111,7 +111,7 @@ END
 
 IDD_TCPIPADDIP_DLG DIALOGEX 0, 0, 200, 70
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "TCP/IP Addresi"
+CAPTION "TCP/IP Adresi"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
@@ -188,7 +188,7 @@ END
 
 IDD_TCPIP_PORT_DLG DIALOGEX 0, 0, 200, 60
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Süzgeç Ekle"
+CAPTION "Filtre Ekle"
 FONT 8, "MS Shell Dlg"
 BEGIN
     EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER
@@ -198,12 +198,12 @@ BEGIN
 END
 
 IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Advanced"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "The following properties are available for this network adapter. Click the property you want to change on the left, and then select its value on the right.", -1, 7, 7, 218, 24, WS_GROUP
-    LTEXT "&Property:", -1, 7, 37, 60, 8, WS_GROUP
+    LTEXT "Bu ağ bağdaştırıcısı için aşağıdaki özellikler kullanılabilir. Solda değiştirmek istediğiniz özelliğe tıklayın, ardından sağda değerini seçin.", -1, 7, 7, 218, 24, WS_GROUP
+    LTEXT "Ö&zellik:", -1, 7, 37, 60, 8, WS_GROUP
     LISTBOX IDC_PROPERTY_NAME, 7, 48, 124, 124, LBS_STANDARD | WS_TABSTOP
     LTEXT "&Value:", -1, 151, 37, 60, 8, WS_GROUP
     EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
@@ -216,7 +216,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_NET_CONNECT "Ağ Bağlantısı"
-    IDS_NO_IPADDR_SET "Bağdaştırıcı, en az bir IP adresi gerektiriyor. Lütfen bir tâne giriniz."
+    IDS_NO_IPADDR_SET "Bağdaştırıcı, en az bir IP adresi gerektiriyor. Lütfen bir tane giriniz."
     IDS_NO_SUBMASK_SET "Alt ağ maskesi eksik olan bir adres girdiniz. Lütfen bir alt ağ maskesi giriniz."
     IDS_TCPFILTERDESC "TCP/IP süzmesi, bilgisayarınıza uzanan TCP/IP ağ gidişgelişinin türünü denetlemenize izin verir."
     IDS_TCPFILTER "TCP/IP Süzmesi"
@@ -225,22 +225,22 @@ BEGIN
     IDS_GATEWAY "Geçit"
     IDS_METRIC "Ölçü"
     IDS_DHCPACTIVE "DHCP Etkin"
-    IDS_AUTOMATIC "Kendiliğinden"
-    IDS_NOITEMSEL "Bir öğe seçmediniz. İlk önce birini seçiniz."
+    IDS_AUTOMATIC "Otomatik"
+    IDS_NOITEMSEL "Bir öge seçmediniz. İlk önce birini seçiniz."
     IDS_TCPIP "ReactOS TCP/IP"
     IDS_ADD "Ekle"
     IDS_MOD "Tamam"
     IDS_TCP_PORTS "TCP Girişleri"
     IDS_UDP_PORTS "UDP Girişleri"
-    IDS_IP_PROTO "IP İletişim Kâideleri"
+    IDS_IP_PROTO "IP protokolleri"
     IDS_PORT_RANGE "Giriş numaraları, 0'dan büyük ve 65536'dan küçük olmalıdır. Lütfen bu aralıkta bir numara giriniz."
-    IDS_PROT_RANGE "İletişim kâidesi numaraları, 0'dan büyük ve 256'dan küçük olmalıdır. Lütfen bu aralıkta bir numara giriniz."
-    IDS_DUP_NUMBER "Eklemeye çalıştığınız numara önceden dizelgede. Lütfen ayrı bir numara giriniz."
+    IDS_PROT_RANGE "Protokol numaraları, 0'dan büyük ve 256'dan küçük olmalıdır. Lütfen bu aralıkta bir numara giriniz."
+    IDS_DUP_NUMBER "Eklemeye çalıştığınız numara zaten listede. Lütfen başka bir numara giriniz."
     IDS_DISABLE_FILTER "Bu umûmî TCP/IP ayârını edilginleştirme tüm bağdaştırıcıları etkileyecektir."
-    IDS_NO_SUFFIX "Arama yönteminin şimdiki ayârı en az bir DNS son eki gerektiriyor. Lütfen bir tâne giriniz ya da ayârı değiştiriniz."
+    IDS_NO_SUFFIX "Arama yönteminin şimdiki ayarı en az bir DNS son eki gerektiriyor. Lütfen bir tane giriniz ya da ayarı değiştiriniz."
     IDS_DOMAIN_SUFFIX "Etki alanı son eki geçerli bir son ek değil."
     IDS_DNS_SUFFIX """%s"" DNS etki alanı adı geçerli bir DNS adı değil."
-    IDS_DUP_SUFFIX "DNS son eki önceden dizelgede."
-    IDS_DUP_IPADDR "IP adresi önceden dizelgede."
-    IDS_DUP_GW "Ön tanımlı geçit önceden dizelgede."
+    IDS_DUP_SUFFIX "DNS son eki zaten listede."
+    IDS_DUP_IPADDR "IP adresi zaten listede."
+    IDS_DUP_GW "Varsayılan geçit zaten listede."
 END
diff --git a/dll/win32/netcfgx/lang/uk-UA.rc b/dll/win32/netcfgx/lang/uk-UA.rc
index 63aa795461b..5f76b6f3928 100644
--- a/dll/win32/netcfgx/lang/uk-UA.rc
+++ b/dll/win32/netcfgx/lang/uk-UA.rc
@@ -1,13 +1,13 @@
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
-IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 228
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Загальні"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Параметри протоколу IP можуть призначатися автоматично, якщо мережа підтримує таку можливість. Інакше вам потрібно отримати ці параметри у адміністратора мережі.", -1, 9, 9, 235, 27
+    GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
     CONTROL "Отримувати IP-адресу автоматично", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
-    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
     CONTROL "&Використовувати наступну IP-адресу:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
     LTEXT "IP-адреса:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
@@ -15,25 +15,25 @@ BEGIN
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
     LTEXT "Шлюз за замовчуванням:", -1, 14, 105, 135, 8
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
-    CONTROL "Отримувати адресу DNS-сервера автоматично", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
-    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
-    CONTROL "В&икористовувати наступні адреси DNS-серверів", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
-    LTEXT "Основний DNS-сервер:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
-    LTEXT "Альтернативний DNS-сервер:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
-    PUSHBUTTON "&Додатково", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
+    CONTROL "Отримувати адресу DNS-сервера автоматично", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
+    CONTROL "В&икористовувати наступні адреси DNS-серверів", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    LTEXT "Основний DNS-сервер:", -1, 14, 161, 135, 8
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
+    LTEXT "Альтернативний DNS-сервер:", -1, 14, 176, 135, 8
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 176 - 2, 85, 12
+    PUSHBUTTON "&Додатково", IDC_ADVANCED, 186, 199, 50, 14, WS_TABSTOP
 END
 
-IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 228
+IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 216
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Альтернативна конфігурація"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Якщо цей комп'ютер використовується в декількох мережах, введіть параметри альтернативної конфігурації IP", -1, 9, 9, 220, 20
+    GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX
     CONTROL "А&втоматична приватна IP-адреса", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
-    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
-    CONTROL "Н&алаштована користувачем", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 120, 12
+    CONTROL "Н&алаштована користувачем", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 120, 12
     LTEXT "&IP-адреса:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "Ма&ска підмережі:", -1, 14, 95, 135, 8
@@ -46,56 +46,56 @@ BEGIN
     CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
-IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Параметри IP"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "IP-адреси", -1, 5, 5, 240, 90
-    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 55
-    PUSHBUTTON "Додати...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Редагувати...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Видалити", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP
-    GROUPBOX "Основні шлюзи:", -1, 5, 100, 240, 90
-    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 215, 55
-    PUSHBUTTON "Додати...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Редагувати...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Видалити", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP
-    GROUPBOX "", -1, 5, 200, 240, 30
-    CHECKBOX "Автоматична метрика", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "Метрика інтерфейсу:", -1, 15, 215, 90, 12
-    EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER
+    GROUPBOX "IP-адреси", -1, 5, 5, 240, 83
+    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 50
+    PUSHBUTTON "Додати...", IDC_IPADD, 60, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Редагувати...", IDC_IPMOD, 120, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Видалити", IDC_IPDEL, 180, 67, 50, 14, WS_TABSTOP
+    GROUPBOX "Основні шлюзи:", -1, 5, 93, 240, 83
+    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 103, 215, 50
+    PUSHBUTTON "Додати...", IDC_GWADD, 60, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Редагувати...", IDC_GWMOD, 120, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Видалити", IDC_GWDEL, 180, 155, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 5, 181, 240, 30
+    CHECKBOX "Автоматична метрика", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "Метрика інтерфейсу:", -1, 15, 195, 90, 12
+    EDITTEXT IDC_METRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
-IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 270
+IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "DNS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 50, LBS_NOTIFY
+    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
     LTEXT "Адреси D&NS серверів в порядку використання:", -1, 5, 5, 180, 12
-    PUSHBUTTON "Вверх", IDC_DNSADDRUP, 190, 25, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Вниз", IDC_DNSADDRDOWN, 190, 45, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Додати...", IDC_DNSADDRADD, 15, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Редагувати...", IDC_DNSADDRMOD, 75, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Видалити", IDC_DNSADDRDEL, 135, 69, 50, 14, WS_TABSTOP
-    LTEXT "Наступні три параметри застосовуються для всіх підключень, що використовують TCP/IP. Для дозволу невідомих імен:", -1, 5, 90, 220, 24
-    CONTROL "Додавати &основний DNS-суфікс і суфікс підключення", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 220, 12
-    CHECKBOX "Додавати &батьківські суфікси основного DNS-суфікса", IDC_TOPPRIMSUFFIX, 15, 125, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CONTROL "Додавати &наступні DNS-суфікси (по порядку):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 220, 12
-    LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY
-    PUSHBUTTON "Вверх", IDC_DNSSUFFIXUP, 190, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Вниз", IDC_DNSSUFFIXDOWN, 190, 180, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Додати...", IDC_DNSSUFFIXADD, 15, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Редагувати...", IDC_DNSSUFFIXMOD, 75, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Видалити", IDC_DNSSUFFIXDEL, 135, 207, 50, 14, WS_TABSTOP
-    LTEXT "DNS-&суфікс цього підключення:", -1, 5, 228, 110, 14
-    EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP
-    CHECKBOX "&Зареєструвати адреси цього підключення в DNS", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX "Вик&ористовувати DNS-суфікс підключення при реєстрації в DNS", IDC_USESUFFIX, 15, 255, 227, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    PUSHBUTTON "Вверх", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Вниз", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Додати...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Редагувати...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Видалити", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
+    LTEXT "Наступні три параметри застосовуються для всіх підключень, що використовують TCP/IP. Для дозволу невідомих імен:", -1, 5, 70, 220, 24
+    CONTROL "Додавати &основний DNS-суфікс і суфікс підключення", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
+    CHECKBOX "Додавати &батьківські суфікси основного DNS-суфікса", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CONTROL "Додавати &наступні DNS-суфікси (по порядку):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 115, 220, 12
+    LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
+    PUSHBUTTON "Вверх", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Вниз", IDC_DNSSUFFIXDOWN, 190, 145, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Додати...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Редагувати...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Видалити", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
+    LTEXT "DNS-&суфікс цього підключення:", -1, 5, 183, 110, 14
+    EDITTEXT IDC_SUFFIX, 120, 180, 100, 12, WS_TABSTOP
+    CHECKBOX "&Зареєструвати адреси цього підключення в DNS", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "Вик&ористовувати DNS-суфікс підключення при реєстрації в DNS", IDC_USESUFFIX, 15, 207, 227, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 END
 
-IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Параметри"
 FONT 8, "MS Shell Dlg"
@@ -196,7 +196,7 @@ BEGIN
 END
 
 IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Advanced"
 FONT 8, "MS Shell Dlg"
 BEGIN
diff --git a/dll/win32/netcfgx/lang/zh-CN.rc b/dll/win32/netcfgx/lang/zh-CN.rc
index 90a55c952b5..8e4d05f41ed 100644
--- a/dll/win32/netcfgx/lang/zh-CN.rc
+++ b/dll/win32/netcfgx/lang/zh-CN.rc
@@ -1,21 +1,16 @@
-/*
- * PROJECT:    ReactOS Configuration of network devices
- * COPYRIGHT:  GPL - See COPYING in the top level directory
- * FILE:       dll/win32/netcfgx/lang/zh-CN.rc
- * PURPOSE:    Chinese (Simplified) Language Resources
- * TRANSLATOR: Elton Chung aka MfldElton <elton328@gmail.com>
- */
+// LICENSE:   GPL - See COPYING in the top level directory
+// COPYRIGHT: Elton Chung aka MfldElton <elton328@gmail.com>
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
-IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 228
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "常规"
 FONT 9, "宋体"
 BEGIN
     LTEXT "你可以得到如果您的网络支持此功能自动分配的 IP 设置。 否则，您需要询问网络管理员以获得合适的 IP 设置。", -1, 9, 9, 235, 27
+    GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
     CONTROL "自动取得IP 地址", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
-    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
     CONTROL "使用下列的IP 地址(&U):", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
     LTEXT "IP 地址:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
@@ -23,25 +18,25 @@ BEGIN
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
     LTEXT "网关:", -1, 14, 105, 135, 8
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
-    CONTROL "自动获得 DNS 服务器地址", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
-    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
-    CONTROL "使用以下的 DNS 伺服器位址(&U)", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
-    LTEXT "首选的 DNS 服务器:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
-    LTEXT " DNS 服务器:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
-    PUSHBUTTON "高级(&A)", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
+    CONTROL "自动获得 DNS 服务器地址", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
+    CONTROL "使用以下的 DNS 伺服器位址(&U)", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    LTEXT "首选的 DNS 服务器:", -1, 14, 161, 135, 8
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
+    LTEXT "DNS 服务器:", -1, 14, 176, 135, 8
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 176 - 2, 85, 12
+    PUSHBUTTON "高级(&A)", IDC_ADVANCED, 186, 199, 50, 14, WS_TABSTOP
 END
 
-IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 228
+IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 216
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "备用配置"
 FONT 9, "宋体"
 BEGIN
     LTEXT "如果此计算机使用多个网络，输入下面的备用 IP 设置", -1, 9, 9, 220, 20
+    GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX
     CONTROL "自动专用 IP 地址(&T)", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
-    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
-    CONTROL "用户配置(&S)", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
+    CONTROL "用户配置(&S)", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
     LTEXT "IP 地址(&I):", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "子网掩码(&U):", -1, 14, 95, 135, 8
@@ -54,56 +49,56 @@ BEGIN
     CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
-IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "IP 设置"
 FONT 9, "宋体"
 BEGIN
-    GROUPBOX "IP 地址", -1, 5, 5, 240, 90
-    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 55
-    PUSHBUTTON "添加...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "编辑...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "删除", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP
-    GROUPBOX "默认网关:", -1, 5, 100, 240, 90
-    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 215, 55
-    PUSHBUTTON "添加...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "编辑...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "删除", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP
-    GROUPBOX "", -1, 5, 200, 240, 30
-    CHECKBOX "自动跃点计数", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "接口跃点数:", -1, 15, 215, 90, 12
-    EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER
+    GROUPBOX "IP 地址", -1, 5, 5, 240, 83
+    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 50
+    PUSHBUTTON "添加...", IDC_IPADD, 60, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "编辑...", IDC_IPMOD, 120, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "删除", IDC_IPDEL, 180, 67, 50, 14, WS_TABSTOP
+    GROUPBOX "默认网关:", -1, 5, 93, 240, 83
+    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 103, 215, 50
+    PUSHBUTTON "添加...", IDC_GWADD, 60, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "编辑...", IDC_GWMOD, 120, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "删除", IDC_GWDEL, 180, 155, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 5, 181, 240, 30
+    CHECKBOX "自动跃点计数", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "接口跃点数:", -1, 15, 195, 90, 12
+    EDITTEXT IDC_METRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
-IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 270
+IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "DNS"
 FONT 9, "宋体"
 BEGIN
-    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 50, LBS_NOTIFY
+    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
     LTEXT "DNS 服务器地址,按使用顺序排列(&N):", -1, 5, 5, 180, 12
-    PUSHBUTTON "向上", IDC_DNSADDRUP, 190, 25, 50, 14, WS_TABSTOP
-    PUSHBUTTON "向下", IDC_DNSADDRDOWN, 190, 45, 50, 14, WS_TABSTOP
-    PUSHBUTTON "添加...(&A)", IDC_DNSADDRADD, 15, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "编辑...(&E)", IDC_DNSADDRMOD, 75, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "删除(&V)", IDC_DNSADDRDEL, 135, 69, 50, 14, WS_TABSTOP
-    LTEXT "以下三种设置被应用到所有连接启用 TCP/IP。解析不合格的名称：", -1, 5, 90, 220, 24
-    CONTROL "附加主要的和连接特定的 DNS 后缀(&P)", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 220, 12
-    CHECKBOX "附加主 DNS 后缀的父后缀(&X)", IDC_TOPPRIMSUFFIX, 15, 125, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CONTROL "附加这些 DNS 后缀 (按顺序)(&H):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 220, 12
-    LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY
-    PUSHBUTTON "上", IDC_DNSSUFFIXUP, 190, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "下", IDC_DNSSUFFIXDOWN, 190, 180, 50, 14, WS_TABSTOP
-    PUSHBUTTON "添加...(&A)", IDC_DNSSUFFIXADD, 15, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "编辑...(&E)", IDC_DNSSUFFIXMOD, 75, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "删除(&V)", IDC_DNSSUFFIXDEL, 135, 207, 50, 14, WS_TABSTOP
-    LTEXT "用于此连接的 DNS 后缀(&S):", -1, 5, 228, 110, 14
-    EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP
-    CHECKBOX "在 DNS 中注册此连接的地址(&R)", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX "在 DNS 注册中使用此连接的 DNS 后缀(&U)", IDC_USESUFFIX, 15, 255, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    PUSHBUTTON "向上", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
+    PUSHBUTTON "向下", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
+    PUSHBUTTON "添加...(&A)", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "编辑...(&E)", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "删除(&V)", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
+    LTEXT "以下三种设置被应用到所有连接启用 TCP/IP。解析不合格的名称:", -1, 5, 70, 220, 24
+    CONTROL "附加主要的和连接特定的 DNS 后缀(&P)", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
+    CHECKBOX "附加主 DNS 后缀的父后缀(&X)", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CONTROL "附加这些 DNS 后缀 (按顺序)(&H):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 115, 220, 12
+    LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
+    PUSHBUTTON "上", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
+    PUSHBUTTON "下", IDC_DNSSUFFIXDOWN, 190, 145, 50, 14, WS_TABSTOP
+    PUSHBUTTON "添加...(&A)", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "编辑...(&E)", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "删除(&V)", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
+    LTEXT "用于此连接的 DNS 后缀(&S):", -1, 5, 183, 110, 14
+    EDITTEXT IDC_SUFFIX, 120, 180, 100, 12, WS_TABSTOP
+    CHECKBOX "在 DNS 中注册此连接的地址(&R)", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "在 DNS 注册中使用此连接的 DNS 后缀(&U)", IDC_USESUFFIX, 15, 207, 227, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 END
 
-IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "选项"
 FONT 9, "宋体"
@@ -169,7 +164,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP 筛选"
 FONT 9, "宋体"
 BEGIN
-    CHECKBOX "启用 TCP/IP 筛选 （所有适配器）", IDC_USE_FILTER, 15, 5, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "启用 TCP/IP 筛选（所有适配器）", IDC_USE_FILTER, 15, 5, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     GROUPBOX "", -1, 5, 30, 90, 150
     CONTROL "全部允许", IDC_TCP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 30, 70, 12
     CONTROL "仅允许", IDC_TCP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 44, 70, 12
@@ -204,27 +199,27 @@ BEGIN
 END
 
 IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Advanced"
-FONT 8, "MS Shell Dlg"
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
+CAPTION "高级选项"
+FONT 9, "宋体"
 BEGIN
-    LTEXT "The following properties are available for this network adapter. Click the property you want to change on the left, and then select its value on the right.", -1, 7, 7, 218, 24, WS_GROUP
-    LTEXT "&Property:", -1, 7, 37, 60, 8, WS_GROUP
+    LTEXT "该网络适配器具有如下属性。在左侧单击您想要更改的属性，然后在右侧选择它的值。", -1, 7, 7, 218, 24, WS_GROUP
+    LTEXT "属性(&P):", -1, 7, 37, 60, 8, WS_GROUP
     LISTBOX IDC_PROPERTY_NAME, 7, 48, 124, 124, LBS_STANDARD | WS_TABSTOP
-    LTEXT "&Value:", -1, 151, 37, 60, 8, WS_GROUP
+    LTEXT "值(&V):", -1, 151, 37, 60, 8, WS_GROUP
     EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
     CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12
     COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     AUTORADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP
-    AUTORADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP
+    AUTORADIOBUTTON "不存在(&N)", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP
 END
 
 STRINGTABLE
 BEGIN
     IDS_NET_CONNECT "网络连接"
     IDS_NO_IPADDR_SET "适配器需要至少一个 IP 地址。请输入一个。"
-    IDS_NO_SUBMASK_SET "您输入缺少及其子网掩码地址。请添加子网掩码。"
-    IDS_TCPFILTERDESC "TCP/IP 筛选允许您控制到达您的计算机的 TCP/IP 网络通信的类型。"
+    IDS_NO_SUBMASK_SET "您输入的地址缺少子网掩码。请添加子网掩码。"
+    IDS_TCPFILTERDESC "TCP/IP 筛选器可控制到达计算机的 TCP/IP 网络通信的类型。"
     IDS_TCPFILTER "TCP/IP 筛选"
     IDS_IPADDR "IP 地址"
     IDS_SUBMASK "子网掩码"
@@ -232,7 +227,7 @@ BEGIN
     IDS_METRIC "公制"
     IDS_DHCPACTIVE "启用 DHCP"
     IDS_AUTOMATIC "自动"
-    IDS_NOITEMSEL "您没有选择一个项目。先选择一个。"
+    IDS_NOITEMSEL "没有选择项目。先选择一个。"
     IDS_TCPIP "ReactOS-TCP/IP"
     IDS_ADD "添加"
     IDS_MOD "确定"
@@ -242,11 +237,11 @@ BEGIN
     IDS_PORT_RANGE "端口数目必须大于 0 且小于 65536。请输入此范围内的数字。"
     IDS_PROT_RANGE "协议编号必须大于 0 且小于 256。请输入此范围内的数字。"
     IDS_DUP_NUMBER "您试着添加的数量已在列表中。请输入一个不同的数字。"
-    IDS_DISABLE_FILTER "禁用这个全局 TCP/IP 设置将影响所有适配器。"
+    IDS_DISABLE_FILTER "禁用此全局 TCP/IP 设置将影响所有适配器。"
     IDS_NO_SUFFIX "搜索方法的当前设置，需要至少一个 DNS 后缀。请输入一个或改变设置。"
-    IDS_DOMAIN_SUFFIX "域后缀不是一个有效的后缀。"
-    IDS_DNS_SUFFIX "DNS 域名 ""%s"" 不是有效的 DNS 名称。"
-    IDS_DUP_SUFFIX "已经位于此列表中的 DNS 后缀。"
+    IDS_DOMAIN_SUFFIX "域后缀无效。"
+    IDS_DNS_SUFFIX "DNS 域名“%s”无效。"
+    IDS_DUP_SUFFIX "此 DNS 后缀已经位于列表中。"
     IDS_DUP_IPADDR "IP 地址已在列表中。"
     IDS_DUP_GW "默认网关已在列表中。"
 END
diff --git a/dll/win32/netcfgx/lang/zh-TW.rc b/dll/win32/netcfgx/lang/zh-TW.rc
index 04a4df120c2..8f9f8375d64 100644
--- a/dll/win32/netcfgx/lang/zh-TW.rc
+++ b/dll/win32/netcfgx/lang/zh-TW.rc
@@ -1,21 +1,16 @@
-/*
- * PROJECT:    ReactOS Configuration of network devices
- * COPYRIGHT:  GPL - See COPYING in the top level directory
- * FILE:       dll/win32/netcfgx/lang/zh-TW.rc
- * PURPOSE:    Chinese (Traditional) Language Resources
- * TRANSLATOR: Henry Tang Ih <2016> <henrytang2@hotmail.com>
- */
+// LICENSE:   GPL - See COPYING in the top level directory
+// COPYRIGHT: 2016 Henry Tang Ih <henrytang2@hotmail.com>
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 
-IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 228
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 216
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "一般"
 FONT 9, "新細明體"
 BEGIN
     LTEXT "你可以得到如果您的網路支援此功能自動分配的 IP 設定。 否則，您需要詢問網路管理員以獲得合適的 IP 設定。", -1, 9, 9, 235, 27
+    GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
     CONTROL "自動取得IP 地址", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
-    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
     CONTROL "使用下列的IP 地址(&U):", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
     LTEXT "IP 地址:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
@@ -23,87 +18,87 @@ BEGIN
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
     LTEXT "閘道器:", -1, 14, 105, 135, 8
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
-    CONTROL "自動獲得 DNS 伺服器地址", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
-    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
-    CONTROL "使用以下的 DNS 伺服器位址(&U)", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
-    LTEXT "首選的 DNS 伺服器:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
-    LTEXT " DNS 伺服器:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
-    PUSHBUTTON "高階(&A)", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
+    CONTROL "自動獲得 DNS 伺服器地址", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
+    CONTROL "使用以下的 DNS 伺服器位址(&U)", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    LTEXT "首選的 DNS 伺服器:", -1, 14, 161, 135, 8
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
+    LTEXT "DNS 伺服器:", -1, 14, 176, 135, 8
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 176 - 2, 85, 12
+    PUSHBUTTON "高階(&A)", IDC_ADVANCED, 186, 199, 50, 14, WS_TABSTOP
 END
 
-IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 228
+IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 216
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "備用配置"
 FONT 9, "新細明體"
 BEGIN
     LTEXT "如果這台電腦使用多個網路，輸入下面的備用 IP 設定", -1, 9, 9, 220, 20
+    GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX
     CONTROL "自動專用 IP 地址(&T)", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
-    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
-    CONTROL "使用者配置(&S)", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
+    CONTROL "使用者配置(&S)", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
     LTEXT "IP 地址(&I):", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "子網掩碼(&U):", -1, 14, 95, 135, 8
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
     LTEXT "閘道器(&D):", -1, 14, 115, 135, 8
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
-    LTEXT "首選的 DNS 伺服器(&P):", -1, 14, 150, 135, 8
+    LTEXT "首選 DNS 伺服器(&P):", -1, 14, 150, 135, 8
     CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
-    LTEXT "備用的 DNS 伺服器(&A):", -1, 14, 165, 180, 8
+    LTEXT "備用 DNS 伺服器(&A):", -1, 14, 165, 180, 8
     CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
-IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "IP 設定"
 FONT 9, "新細明體"
 BEGIN
-    GROUPBOX "IP 地址", -1, 5, 5, 240, 90
-    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 55
-    PUSHBUTTON "添加...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "編輯...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "刪除", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP
-    GROUPBOX "默認閘道器:", -1, 5, 100, 240, 90
-    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 215, 55
-    PUSHBUTTON "添加...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "編輯...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "刪除", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP
-    GROUPBOX "", -1, 5, 200, 240, 30
-    CHECKBOX "自動躍點計數", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "介面躍點數:", -1, 15, 215, 90, 12
-    EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER
+    GROUPBOX "IP 地址", -1, 5, 5, 240, 83
+    CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 50
+    PUSHBUTTON "添加...", IDC_IPADD, 60, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "編輯...", IDC_IPMOD, 120, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "刪除", IDC_IPDEL, 180, 67, 50, 14, WS_TABSTOP
+    GROUPBOX "默認閘道:", -1, 5, 93, 240, 83
+    CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 103, 215, 50
+    PUSHBUTTON "添加...", IDC_GWADD, 60, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "編輯...", IDC_GWMOD, 120, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "刪除", IDC_GWDEL, 180, 155, 50, 14, WS_TABSTOP
+    GROUPBOX "", -1, 5, 181, 240, 30
+    CHECKBOX "自動躍點計數", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "介面躍點數:", -1, 15, 195, 90, 12
+    EDITTEXT IDC_METRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
-IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 270
+IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "DNS"
 FONT 9, "新細明體"
 BEGIN
-    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 50, LBS_NOTIFY
+    LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
     LTEXT "DNS 伺服器地址,按使用順序排列(&N):", -1, 5, 5, 180, 12
-    PUSHBUTTON "向上", IDC_DNSADDRUP, 190, 25, 50, 14, WS_TABSTOP
-    PUSHBUTTON "向下", IDC_DNSADDRDOWN, 190, 45, 50, 14, WS_TABSTOP
-    PUSHBUTTON "添加...(&A)", IDC_DNSADDRADD, 15, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "編輯...(&E)", IDC_DNSADDRMOD, 75, 69, 50, 14, WS_TABSTOP
-    PUSHBUTTON "刪除(&V)", IDC_DNSADDRDEL, 135, 69, 50, 14, WS_TABSTOP
-    LTEXT "以下三種設定被應用到所有連線啟用 TCP/IP。解析不合格的名稱：", -1, 5, 90, 220, 24
-    CONTROL "附加主要的和連線特定的 DNS 字尾(&P)", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 220, 12
-    CHECKBOX "附加主 DNS 字尾的父字尾(&X)", IDC_TOPPRIMSUFFIX, 15, 125, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CONTROL "附加這些 DNS 字尾 (按順序)(&H):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 220, 12
-    LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY
-    PUSHBUTTON "上", IDC_DNSSUFFIXUP, 190, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "下", IDC_DNSSUFFIXDOWN, 190, 180, 50, 14, WS_TABSTOP
-    PUSHBUTTON "添加...(&A)", IDC_DNSSUFFIXADD, 15, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "編輯...(&E)", IDC_DNSSUFFIXMOD, 75, 207, 50, 14, WS_TABSTOP
-    PUSHBUTTON "刪除(&V)", IDC_DNSSUFFIXDEL, 135, 207, 50, 14, WS_TABSTOP
-    LTEXT "用於此連線的 DNS 字尾(&S):", -1, 5, 228, 110, 14
-    EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP
-    CHECKBOX "在 DNS 中註冊此連線的地址(&R)", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX "在 DNS 註冊中使用此連線的 DNS 字尾(&U)", IDC_USESUFFIX, 15, 255, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    PUSHBUTTON "向上", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
+    PUSHBUTTON "向下", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
+    PUSHBUTTON "添加...(&A)", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "編輯...(&E)", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "刪除(&V)", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
+    LTEXT "以下三種設定被應用到所有連線啟用 TCP/IP。解析不合格的名稱:", -1, 5, 70, 220, 24
+    CONTROL "附加主要的和連線特定的 DNS 字尾(&P)", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
+    CHECKBOX "附加主 DNS 字尾的父字尾(&X)", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CONTROL "附加這些 DNS 字尾 (按順序)(&H):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 115, 220, 12
+    LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
+    PUSHBUTTON "上", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
+    PUSHBUTTON "下", IDC_DNSSUFFIXDOWN, 190, 145, 50, 14, WS_TABSTOP
+    PUSHBUTTON "添加...(&A)", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "編輯...(&E)", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "刪除(&V)", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
+    LTEXT "用於此連線的 DNS 字尾(&S):", -1, 5, 183, 110, 14
+    EDITTEXT IDC_SUFFIX, 120, 180, 100, 12, WS_TABSTOP
+    CHECKBOX "在 DNS 中註冊此連線的地址(&R)", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "在 DNS 註冊中使用此連線的 DNS 字尾(&U)", IDC_USESUFFIX, 15, 207, 227, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 END
 
-IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 247
+IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "選項"
 FONT 9, "新細明體"
@@ -130,7 +125,7 @@ END
 
 IDD_TCPIPGW_DLG DIALOGEX 0, 0, 200, 80
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "TCP/IP 閘道器地址"
+CAPTION "TCP/IP 閘道位址"
 FONT 9, "新細明體"
 BEGIN
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
@@ -144,7 +139,7 @@ END
 
 IDD_TCPIPDNS_DLG DIALOGEX 0, 0, 200, 80
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "TCP/IP DNS Server"
+CAPTION "TCP/IP DNS 伺服器"
 FONT 9, "新細明體"
 BEGIN
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 85, 12
@@ -169,7 +164,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP 篩選"
 FONT 9, "新細明體"
 BEGIN
-    CHECKBOX "啟用 TCP/IP 篩選 （所有介面卡）", IDC_USE_FILTER, 15, 5, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "啟用 TCP/IP 篩選（所有介面卡）", IDC_USE_FILTER, 15, 5, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     GROUPBOX "", -1, 5, 30, 90, 150
     CONTROL "全部允許", IDC_TCP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 30, 70, 12
     CONTROL "僅允許", IDC_TCP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 44, 70, 12
@@ -204,19 +199,19 @@ BEGIN
 END
 
 IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Advanced"
-FONT 8, "MS Shell Dlg"
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
+CAPTION "進階"
+FONT 9, "新細明體"
 BEGIN
-    LTEXT "The following properties are available for this network adapter. Click the property you want to change on the left, and then select its value on the right.", -1, 7, 7, 218, 24, WS_GROUP
-    LTEXT "&Property:", -1, 7, 37, 60, 8, WS_GROUP
+    LTEXT "以下的內容可用在這個網路介面卡上。請先在左邊按一下您想要變更的內容，然後在右邊選取它的值。", -1, 7, 7, 218, 24, WS_GROUP
+    LTEXT "內容(&P):", -1, 7, 37, 60, 8, WS_GROUP
     LISTBOX IDC_PROPERTY_NAME, 7, 48, 124, 124, LBS_STANDARD | WS_TABSTOP
-    LTEXT "&Value:", -1, 151, 37, 60, 8, WS_GROUP
+    LTEXT "值(&V):", -1, 151, 37, 60, 8, WS_GROUP
     EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
     CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12
     COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     AUTORADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP
-    AUTORADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP
+    AUTORADIOBUTTON "不存在(&N)", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP
 END
 
 STRINGTABLE
@@ -243,11 +238,10 @@ BEGIN
     IDS_PROT_RANGE "協議編號必須大於 0 且小於 256。請輸入此範圍內的數字。"
     IDS_DUP_NUMBER "您試著添加的數量已在列表中。請輸入一個不同的數字。"
     IDS_DISABLE_FILTER "禁用這個全局 TCP/IP 設定將影響所有介面卡。"
-    IDS_NO_SUFFIX "搜索方法的當前設定，需要至少一個 DNS 字尾。請輸入一個或改變設定。"
+    IDS_NO_SUFFIX "目前的搜尋方法設定需要至少一個 DNS 尾碼。請輸入一個或更改設定。"
     IDS_DOMAIN_SUFFIX "域字尾不是一個有效的字尾。"
     IDS_DNS_SUFFIX "DNS 域名 ""%s"" 不是有效的 DNS 名稱。"
-    IDS_DUP_SUFFIX "已經位於此列表中的 DNS 字尾。"
+    IDS_DUP_SUFFIX "DNS 尾碼已經在列表中。"
     IDS_DUP_IPADDR "IP 地址已在列表中。"
-    IDS_DUP_GW "默認閘道器已在列表中。"
+    IDS_DUP_GW "預設閘道已在列表中。"
 END
-
diff --git a/dll/win32/netcfgx/netcfg_iface.c b/dll/win32/netcfgx/netcfg_iface.c
index fe4e69d11e0..3eda7af84ab 100644
--- a/dll/win32/netcfgx/netcfg_iface.c
+++ b/dll/win32/netcfgx/netcfg_iface.c
@@ -597,7 +597,7 @@ INetCfg_fnRelease(
     INetCfgImpl * This = (INetCfgImpl*)iface;
     ULONG refCount = InterlockedDecrement(&This->ref);
 
-    if (!refCount) 
+    if (!refCount)
     {
         CoTaskMemFree (This);
     }
@@ -674,7 +674,7 @@ ApplyOrCancelChanges(
                 if (bApply)
                 {
                     INetCfgComponentControl_ApplyRegistryChanges(pHead->pNCCC);
-                    //FIXME 
+                    //FIXME
                     // implement INetCfgPnpReconfigCallback and pass it to
                     //INetCfgComponentControl_ApplyPnpChanges(pHead->pNCCC, NULL);
                 }
diff --git a/dll/win32/netcfgx/res/Icon_Licence/Tango.txt b/dll/win32/netcfgx/res/Icon_Licence/Tango.txt
index 20f151d0942..cc724c3de29 100644
--- a/dll/win32/netcfgx/res/Icon_Licence/Tango.txt
+++ b/dll/win32/netcfgx/res/Icon_Licence/Tango.txt
@@ -1,4 +1,4 @@
-The following icons are the property of the Tango project and are 
+The following icons are the property of the Tango project and are
 released under Creative Commons Attribution-ShareAlike 2.5 License.
 Please see COPYING for details
 
diff --git a/dll/win32/netcfgx/resource.h b/dll/win32/netcfgx/resource.h
index c04a2eae9ba..be645900bd0 100644
--- a/dll/win32/netcfgx/resource.h
+++ b/dll/win32/netcfgx/resource.h
@@ -122,4 +122,4 @@
 #define IDS_DNS_SUFFIX     8024
 #define IDS_DUP_SUFFIX     8025
 #define IDS_DUP_IPADDR     8026
-#define IDS_DUP_GW         8027 
+#define IDS_DUP_GW         8027
diff --git a/dll/win32/netcfgx/tcpipconf_notify.c b/dll/win32/netcfgx/tcpipconf_notify.c
index 2844d3afb4e..38c1594d4d2 100644
--- a/dll/win32/netcfgx/tcpipconf_notify.c
+++ b/dll/win32/netcfgx/tcpipconf_notify.c
@@ -41,7 +41,7 @@ typedef struct tagIP_ADDR
         USHORT Metric;
     }u;
     ULONG NTEContext;
-    struct tagIP_ADDR * Next;
+    struct tagIP_ADDR *Next;
 }IP_ADDR;
 
 typedef enum
@@ -53,25 +53,25 @@ typedef enum
 
 typedef struct
 {
-    IP_ADDR * Ip;
-    IP_ADDR * Ns;
-    IP_ADDR * Gw;
+    IP_ADDR *Ip;
+    IP_ADDR *Ns;
+    IP_ADDR *Gw;
 
     UINT DhcpEnabled;
     UINT AutoconfigActive;
     DWORD Index;
-    TcpFilterSettings * pFilter;
-    TcpipAdvancedDNSDlgSettings * pDNS;
+    TcpFilterSettings *pFilter;
+    TcpipAdvancedDNSDlgSettings *pDNS;
 }TcpipSettings;
 
 typedef struct
 {
-    const INetCfgComponentPropertyUi * lpVtbl;
-    const INetCfgComponentControl * lpVtblCompControl;
-    LONG  ref;
-    IUnknown * pUnknown;
-    INetCfg * pNCfg;
-    INetCfgComponent * pNComp;
+    const INetCfgComponentPropertyUi *lpVtbl;
+    const INetCfgComponentControl *lpVtblCompControl;
+    LONG ref;
+    IUnknown *pUnknown;
+    INetCfg *pNCfg;
+    INetCfgComponent *pNComp;
     TcpipSettings *pCurrentConfig;
     CLSID NetCfgInstanceId;
 }TcpipConfNotifyImpl, *LPTcpipConfNotifyImpl;
@@ -86,7 +86,7 @@ typedef struct
 
 typedef struct
 {
-   BOOL bAdd;
+    BOOL bAdd;
     HWND hDlgCtrl;
     WCHAR szIP[16];
     WCHAR szMask[16];
@@ -236,7 +236,7 @@ InitFilterListBox(LPWSTR pData, HWND hwndDlg, HWND hDlgCtrl, UINT AllowButton, U
 
     if (!pData || !_wtoi(pData))
     {
-        SendDlgItemMessageW(hwndDlg, AllowButton, BM_SETCHECK, BST_CHECKED, 0);
+        CheckDlgButton(hwndDlg, AllowButton, BST_CHECKED);
         EnableWindow(GetDlgItem(hwndDlg, AddButton), FALSE);
         EnableWindow(GetDlgItem(hwndDlg, DelButton), FALSE);
         return;
@@ -257,9 +257,9 @@ InitFilterListBox(LPWSTR pData, HWND hwndDlg, HWND hDlgCtrl, UINT AllowButton, U
     }
 
     if (!iItem)
-        SendDlgItemMessageW(hwndDlg, AllowButton, BM_SETCHECK, BST_CHECKED, 0);
+        CheckDlgButton(hwndDlg, AllowButton, BST_CHECKED);
     else
-        SendDlgItemMessageW(hwndDlg, RestrictButton, BM_SETCHECK, BST_CHECKED, 0);
+        CheckDlgButton(hwndDlg, RestrictButton, BST_CHECKED);
 }
 
 LPWSTR
@@ -321,7 +321,7 @@ StoreTcpipFilterSettings(
     if (!pFilter)
         return NULL;
 
-    if (SendDlgItemMessageW(hwndDlg, IDC_USE_FILTER, BM_GETCHECK, 0, 0) == BST_CHECKED)
+    if (IsDlgButtonChecked(hwndDlg, IDC_USE_FILTER) == BST_CHECKED)
         pFilter->EnableSecurityFilters = TRUE;
     else
         pFilter->EnableSecurityFilters = FALSE;
@@ -390,71 +390,71 @@ TcpipFilterSettingsDlg(
                 InitFilterListBox(pContext->pCurrentConfig->pFilter->szUDPAllowedPorts, hwndDlg, GetDlgItem(hwndDlg, IDC_UDP_LIST), IDC_UDP_ALLOW_ALL, IDC_UDP_RESTRICT, IDC_UDP_ADD, IDC_UDP_DEL);
                 InitFilterListBox(pContext->pCurrentConfig->pFilter->szRawIPAllowedProtocols, hwndDlg, GetDlgItem(hwndDlg, IDC_IP_LIST), IDC_IP_ALLOW_ALL, IDC_IP_RESTRICT, IDC_IP_ADD, IDC_IP_DEL);
                 if (pContext->pCurrentConfig->pFilter->EnableSecurityFilters)
-                    SendDlgItemMessageW(hwndDlg, IDC_USE_FILTER, BM_SETCHECK, BST_CHECKED, 0);
+                    CheckDlgButton(hwndDlg, IDC_USE_FILTER, BST_CHECKED);
              }
             SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pContext);
             return TRUE;
         case WM_COMMAND:
             if (HIWORD(wParam) == BN_CLICKED)
             {
-                switch (LOWORD(wParam)) 
+                switch (LOWORD(wParam))
                 {
                     case IDC_TCP_ALLOW_ALL:
-                        if (SendDlgItemMessageW(hwndDlg, IDC_TCP_ALLOW_ALL, BM_GETCHECK, 0, 0) == BST_CHECKED)
+                        if (IsDlgButtonChecked(hwndDlg, IDC_TCP_ALLOW_ALL) == BST_CHECKED)
                         {
-                            SendDlgItemMessageW(hwndDlg, IDC_TCP_RESTRICT, BM_SETCHECK, BST_UNCHECKED, 0);
+                            CheckDlgButton(hwndDlg, IDC_TCP_RESTRICT, BST_UNCHECKED);
                             EnableWindow(GetDlgItem(hwndDlg, IDC_TCP_LIST), FALSE);
                             EnableWindow(GetDlgItem(hwndDlg, IDC_TCP_ADD), FALSE);
                             EnableWindow(GetDlgItem(hwndDlg, IDC_TCP_DEL), FALSE);
                         }
                         break;
                     case IDC_TCP_RESTRICT:
-                        if (SendDlgItemMessageW(hwndDlg, IDC_TCP_RESTRICT, BM_GETCHECK, 0, 0) == BST_CHECKED)
+                        if (IsDlgButtonChecked(hwndDlg, IDC_TCP_RESTRICT) == BST_CHECKED)
                         {
-                            SendDlgItemMessageW(hwndDlg, IDC_TCP_ALLOW_ALL, BM_SETCHECK, BST_UNCHECKED, 0);
+                            CheckDlgButton(hwndDlg, IDC_TCP_ALLOW_ALL, BST_UNCHECKED);
                             EnableWindow(GetDlgItem(hwndDlg, IDC_TCP_LIST), TRUE);
                             EnableWindow(GetDlgItem(hwndDlg, IDC_TCP_ADD), TRUE);
                             EnableWindow(GetDlgItem(hwndDlg, IDC_TCP_DEL), TRUE);
                         }
                         break;
                     case IDC_UDP_ALLOW_ALL:
-                        if (SendDlgItemMessageW(hwndDlg, IDC_UDP_ALLOW_ALL, BM_GETCHECK, 0, 0) == BST_CHECKED)
+                        if (IsDlgButtonChecked(hwndDlg, IDC_UDP_ALLOW_ALL) == BST_CHECKED)
                         {
-                            SendDlgItemMessageW(hwndDlg, IDC_UDP_RESTRICT, BM_SETCHECK, BST_UNCHECKED, 0);
+                            CheckDlgButton(hwndDlg, IDC_UDP_RESTRICT, BST_UNCHECKED);
                             EnableWindow(GetDlgItem(hwndDlg, IDC_UDP_LIST), FALSE);
                             EnableWindow(GetDlgItem(hwndDlg, IDC_UDP_ADD), FALSE);
                             EnableWindow(GetDlgItem(hwndDlg, IDC_UDP_DEL), FALSE);
                         }
                         break;
                     case IDC_UDP_RESTRICT:
-                        if (SendDlgItemMessageW(hwndDlg, IDC_UDP_RESTRICT, BM_GETCHECK, 0, 0) == BST_CHECKED)
+                        if (IsDlgButtonChecked(hwndDlg, IDC_UDP_RESTRICT) == BST_CHECKED)
                         {
-                            SendDlgItemMessageW(hwndDlg, IDC_UDP_ALLOW_ALL, BM_SETCHECK, BST_UNCHECKED, 0);
+                            CheckDlgButton(hwndDlg, IDC_UDP_ALLOW_ALL, BST_UNCHECKED);
                             EnableWindow(GetDlgItem(hwndDlg, IDC_UDP_LIST), TRUE);
                             EnableWindow(GetDlgItem(hwndDlg, IDC_UDP_ADD), TRUE);
                             EnableWindow(GetDlgItem(hwndDlg, IDC_UDP_DEL), TRUE);
                         }
                         break;
                     case IDC_IP_ALLOW_ALL:
-                        if (SendDlgItemMessageW(hwndDlg, IDC_IP_ALLOW_ALL, BM_GETCHECK, 0, 0) == BST_CHECKED)
+                        if (IsDlgButtonChecked(hwndDlg, IDC_IP_ALLOW_ALL) == BST_CHECKED)
                         {
-                            SendDlgItemMessageW(hwndDlg, IDC_IP_RESTRICT, BM_SETCHECK, BST_UNCHECKED, 0);
+                            CheckDlgButton(hwndDlg, IDC_IP_RESTRICT, BST_UNCHECKED);
                             EnableWindow(GetDlgItem(hwndDlg, IDC_IP_LIST), FALSE);
                             EnableWindow(GetDlgItem(hwndDlg, IDC_IP_ADD), FALSE);
                             EnableWindow(GetDlgItem(hwndDlg, IDC_IP_DEL), FALSE);
                         }
                         break;
                     case IDC_IP_RESTRICT:
-                        if (SendDlgItemMessageW(hwndDlg, IDC_IP_RESTRICT, BM_GETCHECK, 0, 0) == BST_CHECKED)
+                        if (IsDlgButtonChecked(hwndDlg, IDC_IP_RESTRICT) == BST_CHECKED)
                         {
-                            SendDlgItemMessageW(hwndDlg, IDC_IP_ALLOW_ALL, BM_SETCHECK, BST_UNCHECKED, 0);
+                            CheckDlgButton(hwndDlg, IDC_IP_ALLOW_ALL, BST_UNCHECKED);
                             EnableWindow(GetDlgItem(hwndDlg, IDC_IP_LIST), TRUE);
                             EnableWindow(GetDlgItem(hwndDlg, IDC_IP_ADD), TRUE);
                             EnableWindow(GetDlgItem(hwndDlg, IDC_IP_DEL), TRUE);
                         }
                         break;
                     case IDC_USE_FILTER:
-                        if (SendDlgItemMessageW(hwndDlg, IDC_USE_FILTER, BM_GETCHECK, 0, 0) == BST_UNCHECKED)
+                        if (IsDlgButtonChecked(hwndDlg, IDC_USE_FILTER) == BST_UNCHECKED)
                             DisplayError(IDS_DISABLE_FILTER, IDS_TCPIP, MB_OK);
 
                         break;
@@ -583,8 +583,8 @@ TcpipAdvancedOptDlg(
             if (LOWORD(wParam) == IDC_OPTPROP)
             {
                 DialogBoxParamW(netcfgx_hInstance,
-                                MAKEINTRESOURCEW(IDD_TCPIP_FILTER_DLG), 
-                                GetParent(hwndDlg), 
+                                MAKEINTRESOURCEW(IDD_TCPIP_FILTER_DLG),
+                                GetParent(hwndDlg),
                                 TcpipFilterSettingsDlg,
                                 (LPARAM)GetWindowLongPtr(hwndDlg, DWLP_USER));
                 break;
@@ -635,7 +635,7 @@ InsertIpAddressToListView(
         li.iItem = itemCount;
         li.iSubItem = 0;
         dwIpAddr = pAddr->IpAddress;
-        swprintf(szBuffer, L"%lu.%lu.%lu.%lu", 
+        swprintf(szBuffer, L"%lu.%lu.%lu.%lu",
                  FIRST_IPADDRESS(dwIpAddr), SECOND_IPADDRESS(dwIpAddr), THIRD_IPADDRESS(dwIpAddr), FOURTH_IPADDRESS(dwIpAddr));
 
         li.pszText = szBuffer;
@@ -645,7 +645,7 @@ InsertIpAddressToListView(
             if (bSubMask)
             {
                 dwIpAddr = pAddr->u.Subnetmask;
-                swprintf(szBuffer, L"%lu.%lu.%lu.%lu", 
+                swprintf(szBuffer, L"%lu.%lu.%lu.%lu",
                          FIRST_IPADDRESS(dwIpAddr), SECOND_IPADDRESS(dwIpAddr), THIRD_IPADDRESS(dwIpAddr), FOURTH_IPADDRESS(dwIpAddr));
             }
             else
@@ -744,7 +744,7 @@ TcpipAdvGwDlg(
                     SendDlgItemMessageW(hwndDlg, IDC_OK, WM_SETTEXT, 0, (LPARAM)szBuffer);
                 }
                 EnableWindow(GetDlgItem(hwndDlg, IDC_OK), FALSE);
-                SendDlgItemMessageW(hwndDlg, IDC_USEMETRIC, BM_SETCHECK, BST_CHECKED, 0);
+                CheckDlgButton(hwndDlg, IDC_USEMETRIC, BST_CHECKED);
             }
             else
             {
@@ -764,7 +764,7 @@ TcpipAdvGwDlg(
                 }
                 else
                 {
-                    SendDlgItemMessageW(hwndDlg, IDC_USEMETRIC, BM_SETCHECK, BST_CHECKED, 0);
+                    CheckDlgButton(hwndDlg, IDC_USEMETRIC, BST_CHECKED);
                     EnableWindow(GetDlgItem(hwndDlg, IDC_METRIC), FALSE);
                     EnableWindow(GetDlgItem(hwndDlg, IDC_METRICTXT), FALSE);
                 }
@@ -773,7 +773,7 @@ TcpipAdvGwDlg(
         case WM_COMMAND:
             if (LOWORD(wParam) == IDC_USEMETRIC)
             {
-                if (SendDlgItemMessage(hwndDlg, IDC_USEMETRIC, BM_GETCHECK, 0, 0) == BST_CHECKED)
+                if (IsDlgButtonChecked(hwndDlg, IDC_USEMETRIC) == BST_CHECKED)
                 {
                     EnableWindow(GetDlgItem(hwndDlg, IDC_METRIC), FALSE);
                     EnableWindow(GetDlgItem(hwndDlg, IDC_METRICTXT), FALSE);
@@ -802,7 +802,7 @@ TcpipAdvGwDlg(
                     find.flags = LVFI_STRING;
                     find.psz = pGwSettings->szIP;
 
-                    if (SendDlgItemMessage(hwndDlg, IDC_USEMETRIC, BM_GETCHECK, 0, 0) == BST_UNCHECKED)
+                    if (IsDlgButtonChecked(hwndDlg, IDC_USEMETRIC) == BST_UNCHECKED)
                         pGwSettings->Metric = GetDlgItemInt(hwndDlg, IDC_METRIC, NULL, FALSE);
                     else
                         pGwSettings->Metric = 0;
@@ -1335,7 +1335,7 @@ TcpipAdvancedIpDlg(
         case WM_COMMAND:
             if (LOWORD(wParam) == IDC_AUTOMETRIC)
             {
-                if (SendDlgItemMessageW(hwndDlg, IDC_AUTOMETRIC, BM_GETCHECK, 0, 0) == BST_CHECKED)
+                if (IsDlgButtonChecked(hwndDlg, IDC_AUTOMETRIC) == BST_CHECKED)
                     EnableWindow(GetDlgItem(hwndDlg, IDC_METRIC), FALSE);
                 else
                     EnableWindow(GetDlgItem(hwndDlg, IDC_METRIC), TRUE);
@@ -1576,7 +1576,7 @@ InitializeTcpipAdvancedDNSDlg(
     while(pAddr)
     {
         dwIpAddr = pAddr->IpAddress;
-        swprintf(szBuffer, L"%lu.%lu.%lu.%lu", 
+        swprintf(szBuffer, L"%lu.%lu.%lu.%lu",
                  FIRST_IPADDRESS(dwIpAddr), SECOND_IPADDRESS(dwIpAddr), THIRD_IPADDRESS(dwIpAddr), FOURTH_IPADDRESS(dwIpAddr));
 
         SendDlgItemMessageW(hwndDlg, IDC_DNSADDRLIST, LB_ADDSTRING, 0, (LPARAM)szBuffer);
@@ -1588,22 +1588,22 @@ InitializeTcpipAdvancedDNSDlg(
         return;
 
     if (This->pCurrentConfig->pDNS->RegisterAdapterName)
-        SendDlgItemMessageW(hwndDlg, IDC_REGSUFFIX, BM_SETCHECK, BST_CHECKED, 0);
+        CheckDlgButton(hwndDlg, IDC_REGSUFFIX, BST_CHECKED);
     else
         EnableWindow(GetDlgItem(hwndDlg, IDC_USESUFFIX), FALSE);
 
     if (This->pCurrentConfig->pDNS->RegistrationEnabled)
-        SendDlgItemMessageW(hwndDlg, IDC_USESUFFIX, BM_SETCHECK, BST_CHECKED, 0);
+        CheckDlgButton(hwndDlg, IDC_USESUFFIX, BST_CHECKED);
 
     if (This->pCurrentConfig->pDNS->szDomain[0])
         SendDlgItemMessageW(hwndDlg, IDC_SUFFIX, WM_SETTEXT, 0, (LPARAM)szBuffer);
 
     if (This->pCurrentConfig->pDNS->UseDomainNameDevolution)
-        SendDlgItemMessageW(hwndDlg, IDC_TOPPRIMSUFFIX, BM_SETCHECK, BST_CHECKED, 0);
+        CheckDlgButton(hwndDlg, IDC_TOPPRIMSUFFIX, BST_CHECKED);
 
     if (!This->pCurrentConfig->pDNS->szSearchList || (wcslen(This->pCurrentConfig->pDNS->szSearchList) == 0))
     {
-        SendDlgItemMessageW(hwndDlg, IDC_PRIMSUFFIX, BM_SETCHECK, BST_CHECKED, 0);
+        CheckDlgButton(hwndDlg, IDC_PRIMSUFFIX, BST_CHECKED);
         EnableWindow(GetDlgItem(hwndDlg, IDC_DNSSUFFIXADD), FALSE);
 
         return;
@@ -1631,7 +1631,7 @@ InitializeTcpipAdvancedDNSDlg(
         }while(TRUE);
 
         EnableWindow(GetDlgItem(hwndDlg, IDC_TOPPRIMSUFFIX), FALSE);
-        SendDlgItemMessageW(hwndDlg, IDC_SELSUFFIX, BM_SETCHECK, BST_CHECKED, 0);
+        CheckDlgButton(hwndDlg, IDC_SELSUFFIX, BST_CHECKED);
         SendDlgItemMessageW(hwndDlg, IDC_DNSSUFFIXLIST, LB_SETCURSEL, 0, 0);
     }
 }
@@ -1834,7 +1834,7 @@ TcpipAdvancedDnsDlg(
             lppsn = (LPPSHNOTIFY) lParam;
             if (lppsn->hdr.code == PSN_KILLACTIVE)
             {
-                if (SendDlgItemMessageW(hwndDlg, IDC_SELSUFFIX, BM_GETCHECK, 0, 0) == BST_CHECKED &&
+                if (IsDlgButtonChecked(hwndDlg, IDC_SELSUFFIX) == BST_CHECKED &&
                     SendDlgItemMessageW(hwndDlg, IDC_DNSSUFFIXLIST, LB_GETCOUNT, 0, 0) == 0)
                 {
                     DisplayError(IDS_NO_SUFFIX, IDS_TCPIP, MB_ICONWARNING);
@@ -1870,11 +1870,11 @@ TcpipAdvancedDnsDlg(
                    break;
 
                  StoreDNSSettings(GetDlgItem(hwndDlg, IDC_DNSADDRLIST), This);
-                 if (SendDlgItemMessageW(hwndDlg, IDC_PRIMSUFFIX, BM_GETCHECK, 0, 0) == BST_CHECKED)
+                 if (IsDlgButtonChecked(hwndDlg, IDC_PRIMSUFFIX) == BST_CHECKED)
                  {
                      CoTaskMemFree(This->pCurrentConfig->pDNS->szSearchList);
                      This->pCurrentConfig->pDNS->szSearchList = NULL;
-                     if (SendDlgItemMessageW(hwndDlg, IDC_TOPPRIMSUFFIX, BM_GETCHECK, 0, 0) == BST_CHECKED)
+                     if (IsDlgButtonChecked(hwndDlg, IDC_TOPPRIMSUFFIX) == BST_CHECKED)
                          This->pCurrentConfig->pDNS->UseDomainNameDevolution = TRUE;
                      else
                          This->pCurrentConfig->pDNS->UseDomainNameDevolution = FALSE;
@@ -1887,10 +1887,10 @@ TcpipAdvancedDnsDlg(
                      This->pCurrentConfig->pDNS->szSearchList = GetListViewEntries(GetDlgItem(hwndDlg, IDC_DNSSUFFIXLIST));
                  }
 
-                 if (SendDlgItemMessageW(hwndDlg, IDC_REGSUFFIX, BM_GETCHECK, 0, 0) == BST_CHECKED)
+                 if (IsDlgButtonChecked(hwndDlg, IDC_REGSUFFIX) == BST_CHECKED)
                  {
                      This->pCurrentConfig->pDNS->RegisterAdapterName = TRUE;
-                     if (SendDlgItemMessageW(hwndDlg, IDC_USESUFFIX, BM_GETCHECK, 0, 0) == BST_CHECKED)
+                     if (IsDlgButtonChecked(hwndDlg, IDC_USESUFFIX) == BST_CHECKED)
                          This->pCurrentConfig->pDNS->RegistrationEnabled = TRUE;
                      else
                          This->pCurrentConfig->pDNS->RegistrationEnabled = FALSE;
@@ -2144,7 +2144,7 @@ TcpipAltConfDlg(
     WPARAM wParam,
     LPARAM lParam)
 {
-    switch(uMsg)
+    switch (uMsg)
     {
         case WM_INITDIALOG:
             return TRUE;
@@ -2174,7 +2174,7 @@ StoreTcpipBasicSettings(
 {
     DWORD dwIpAddr;
 
-    if (SendDlgItemMessageW(hwndDlg, IDC_NODHCP, BM_GETCHECK, 0, 0) == BST_CHECKED)
+    if (IsDlgButtonChecked(hwndDlg, IDC_NODHCP) == BST_CHECKED)
     {
         This->pCurrentConfig->DhcpEnabled = FALSE;
         if (SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_GETADDRESS, 0, (LPARAM)&dwIpAddr) != 4)
@@ -2246,7 +2246,7 @@ StoreTcpipBasicSettings(
         }
     }
 
-    if (SendDlgItemMessageW(hwndDlg, IDC_FIXEDDNS, BM_GETCHECK, 0, 0) == BST_CHECKED)
+    if (IsDlgButtonChecked(hwndDlg, IDC_FIXEDDNS) == BST_CHECKED)
     {
         BOOL bSkip = FALSE;
         This->pCurrentConfig->AutoconfigActive = FALSE;
@@ -2354,7 +2354,7 @@ InitializeTcpipBasicDlgCtrls(
 
     if (pCurSettings->DhcpEnabled)
     {
-        SendDlgItemMessageW(hwndDlg, IDC_USEDHCP, BM_SETCHECK, BST_CHECKED, 0);
+        CheckDlgButton(hwndDlg, IDC_USEDHCP, BST_CHECKED);
         EnableWindow(GetDlgItem(hwndDlg, IDC_IPADDR), FALSE);
         EnableWindow(GetDlgItem(hwndDlg, IDC_SUBNETMASK), FALSE);
         EnableWindow(GetDlgItem(hwndDlg, IDC_DEFGATEWAY), FALSE);
@@ -2362,7 +2362,7 @@ InitializeTcpipBasicDlgCtrls(
     }
     else
     {
-        SendDlgItemMessageW(hwndDlg, IDC_NODHCP, BM_SETCHECK, BST_CHECKED, 0);
+        CheckDlgButton(hwndDlg, IDC_NODHCP, BST_CHECKED);
 
         if (pCurSettings->Ip)
         {
@@ -2381,13 +2381,13 @@ InitializeTcpipBasicDlgCtrls(
 
     if (pCurSettings->AutoconfigActive)
     {
-        SendDlgItemMessageW(hwndDlg, IDC_AUTODNS, BM_SETCHECK, BST_CHECKED, 0);
+        CheckDlgButton(hwndDlg, IDC_AUTODNS, BST_CHECKED);
         EnableWindow(GetDlgItem(hwndDlg, IDC_DNS1), FALSE);
         EnableWindow(GetDlgItem(hwndDlg, IDC_DNS2), FALSE);
     }
     else
     {
-        SendDlgItemMessageW(hwndDlg, IDC_FIXEDDNS, BM_SETCHECK, BST_CHECKED, 0);
+        CheckDlgButton(hwndDlg, IDC_FIXEDDNS, BST_CHECKED);
         EnableWindow(GetDlgItem(hwndDlg, IDC_DNS1), TRUE);
         EnableWindow(GetDlgItem(hwndDlg, IDC_DNS2), TRUE);
         if (pCurSettings->Ns)
@@ -2527,10 +2527,10 @@ TcpipBasicDlg(
         case WM_COMMAND:
             if (HIWORD(wParam) == BN_CLICKED)
             {
-                switch (LOWORD(wParam)) 
+                switch (LOWORD(wParam))
                 {
                     case IDC_USEDHCP:
-                        if (SendDlgItemMessageW(hwndDlg, IDC_USEDHCP, BM_GETCHECK, 0, 0) == BST_CHECKED)
+                        if (SendMessageW(GetParent(hwndDlg), PSM_INDEXTOID, 1, 0) == 0)
                         {
                             PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
                             SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_CLEARADDRESS, 0, 0);
@@ -2544,40 +2544,34 @@ TcpipBasicDlg(
                         }
                         break;
                     case IDC_NODHCP:
-                        if (SendDlgItemMessageW(hwndDlg, IDC_NODHCP, BM_GETCHECK, 0, 0) == BST_CHECKED)
+                        if (SendMessageW(GetParent(hwndDlg), PSM_INDEXTOID, 1, 0) != 0)
                         {
                             PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
                             EnableWindow(GetDlgItem(hwndDlg, IDC_IPADDR), TRUE);
                             EnableWindow(GetDlgItem(hwndDlg, IDC_SUBNETMASK), TRUE);
                             EnableWindow(GetDlgItem(hwndDlg, IDC_DEFGATEWAY), TRUE);
-                            if (SendDlgItemMessageW(hwndDlg, IDC_AUTODNS, BM_GETCHECK, 0, 0) == BST_CHECKED)
+                            if (IsDlgButtonChecked(hwndDlg, IDC_AUTODNS) == BST_CHECKED)
                             {
-                                SendDlgItemMessageW(hwndDlg, IDC_AUTODNS, BM_SETCHECK, BST_UNCHECKED, 0);
+                                CheckDlgButton(hwndDlg, IDC_AUTODNS, BST_UNCHECKED);
                             }
                             EnableWindow(GetDlgItem(hwndDlg, IDC_AUTODNS), FALSE);
-                            SendDlgItemMessageW(hwndDlg, IDC_FIXEDDNS, BM_SETCHECK, BST_CHECKED, 0);
+                            CheckDlgButton(hwndDlg, IDC_FIXEDDNS, BST_CHECKED);
                             EnableWindow(GetDlgItem(hwndDlg, IDC_DNS1), TRUE);
                             EnableWindow(GetDlgItem(hwndDlg, IDC_DNS2), TRUE);
                             SendMessageW(GetParent(hwndDlg), PSM_REMOVEPAGE, 1, 0);
                         }
                         break;
                     case IDC_AUTODNS:
-                        if (SendDlgItemMessageW(hwndDlg, IDC_AUTODNS, BM_GETCHECK, 0, 0) == BST_CHECKED)
-                        {
-                            PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
-                            SendDlgItemMessageW(hwndDlg, IDC_DNS1, IPM_CLEARADDRESS, 0, 0);
-                            SendDlgItemMessageW(hwndDlg, IDC_DNS2, IPM_CLEARADDRESS, 0, 0);
-                            EnableWindow(GetDlgItem(hwndDlg, IDC_DNS1), FALSE);
-                            EnableWindow(GetDlgItem(hwndDlg, IDC_DNS2), FALSE);
-                        }
+                        PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
+                        SendDlgItemMessageW(hwndDlg, IDC_DNS1, IPM_CLEARADDRESS, 0, 0);
+                        SendDlgItemMessageW(hwndDlg, IDC_DNS2, IPM_CLEARADDRESS, 0, 0);
+                        EnableWindow(GetDlgItem(hwndDlg, IDC_DNS1), FALSE);
+                        EnableWindow(GetDlgItem(hwndDlg, IDC_DNS2), FALSE);
                         break;
                     case IDC_FIXEDDNS:
-                        if (SendDlgItemMessageW(hwndDlg, IDC_FIXEDDNS, BM_GETCHECK, 0, 0) == BST_CHECKED)
-                        {
-                            PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
-                            EnableWindow(GetDlgItem(hwndDlg, IDC_DNS1), TRUE);
-                            EnableWindow(GetDlgItem(hwndDlg, IDC_DNS2), TRUE);
-                        }
+                        PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
+                        EnableWindow(GetDlgItem(hwndDlg, IDC_DNS1), TRUE);
+                        EnableWindow(GetDlgItem(hwndDlg, IDC_DNS2), TRUE);
                         break;
                     case IDC_ADVANCED:
                         LaunchAdvancedTcpipSettings(hwndDlg, (TcpipConfNotifyImpl*)GetWindowLongPtr(hwndDlg, DWLP_USER));
@@ -2948,7 +2942,7 @@ Initialize(TcpipConfNotifyImpl * This)
 
 HRESULT
 WINAPI
-INetCfgComponentPropertyUi_fnMergePropPages( 
+INetCfgComponentPropertyUi_fnMergePropPages(
     INetCfgComponentPropertyUi * iface,
     DWORD *pdwDefPages,
     BYTE **pahpspPrivate,
@@ -3074,7 +3068,7 @@ INetCfgComponentControl_fnRelease(
 
 HRESULT
 WINAPI
-INetCfgComponentControl_fnInitialize( 
+INetCfgComponentControl_fnInitialize(
     INetCfgComponentControl * iface,
     INetCfgComponent *pIComp,
     INetCfg *pINetCfg,
@@ -3104,12 +3098,12 @@ CreateMultiSzString(IP_ADDR * pAddr, COPY_TYPE Type, LPDWORD Size, BOOL bComma)
         if (Type == IPADDR)
         {
             dwIpAddr = pTemp->IpAddress;
-            swprintf(szBuffer, L"%lu.%lu.%lu.%lu", 
+            swprintf(szBuffer, L"%lu.%lu.%lu.%lu",
                     FIRST_IPADDRESS(dwIpAddr), SECOND_IPADDRESS(dwIpAddr), THIRD_IPADDRESS(dwIpAddr), FOURTH_IPADDRESS(dwIpAddr));
         }else if (Type == SUBMASK)
         {
             dwIpAddr = pTemp->u.Subnetmask;
-            swprintf(szBuffer, L"%lu.%lu.%lu.%lu", 
+            swprintf(szBuffer, L"%lu.%lu.%lu.%lu",
                     FIRST_IPADDRESS(dwIpAddr), SECOND_IPADDRESS(dwIpAddr), THIRD_IPADDRESS(dwIpAddr), FOURTH_IPADDRESS(dwIpAddr));
         }
         else if (Type == METRIC)
@@ -3134,12 +3128,12 @@ CreateMultiSzString(IP_ADDR * pAddr, COPY_TYPE Type, LPDWORD Size, BOOL bComma)
         if (Type == IPADDR)
         {
             dwIpAddr = pTemp->IpAddress;
-            swprintf(pStr, L"%lu.%lu.%lu.%lu", 
+            swprintf(pStr, L"%lu.%lu.%lu.%lu",
                     FIRST_IPADDRESS(dwIpAddr), SECOND_IPADDRESS(dwIpAddr), THIRD_IPADDRESS(dwIpAddr), FOURTH_IPADDRESS(dwIpAddr));
         }else if (Type == SUBMASK)
         {
             dwIpAddr = pTemp->u.Subnetmask;
-            swprintf(pStr, L"%lu.%lu.%lu.%lu", 
+            swprintf(pStr, L"%lu.%lu.%lu.%lu",
                     FIRST_IPADDRESS(dwIpAddr), SECOND_IPADDRESS(dwIpAddr), THIRD_IPADDRESS(dwIpAddr), FOURTH_IPADDRESS(dwIpAddr));
         }
         else if (Type == METRIC)
@@ -3207,7 +3201,7 @@ INetCfgComponentControl_fnApplyRegistryChanges(
         }
         if (pCurrentConfig->pFilter)
         {
-            RegSetValueExW(hKey, L"EnableSecurityFilters", 0, REG_DWORD, 
+            RegSetValueExW(hKey, L"EnableSecurityFilters", 0, REG_DWORD,
                       (LPBYTE)&pCurrentConfig->pFilter->EnableSecurityFilters, sizeof(DWORD));
         }
         RegCloseKey(hKey);
@@ -3233,19 +3227,19 @@ INetCfgComponentControl_fnApplyRegistryChanges(
         {
             if (pCurrentConfig->pFilter->szTCPAllowedPorts)
             {
-                RegSetValueExW(hKey, L"TCPAllowedPorts", 0, REG_MULTI_SZ, 
+                RegSetValueExW(hKey, L"TCPAllowedPorts", 0, REG_MULTI_SZ,
                        (LPBYTE)pCurrentConfig->pFilter->szTCPAllowedPorts,
                         pCurrentConfig->pFilter->TCPSize);
             }
             if (pCurrentConfig->pFilter->szUDPAllowedPorts)
             {
-                RegSetValueExW(hKey, L"UDPAllowedPorts", 0, REG_MULTI_SZ, 
+                RegSetValueExW(hKey, L"UDPAllowedPorts", 0, REG_MULTI_SZ,
                        (LPBYTE)pCurrentConfig->pFilter->szUDPAllowedPorts,
                         pCurrentConfig->pFilter->UDPSize);
             }
             if (pCurrentConfig->pFilter->szRawIPAllowedProtocols)
             {
-                RegSetValueExW(hKey, L"RawIPAllowedProtocols", 0, REG_MULTI_SZ, 
+                RegSetValueExW(hKey, L"RawIPAllowedProtocols", 0, REG_MULTI_SZ,
                        (LPBYTE)pCurrentConfig->pFilter->szRawIPAllowedProtocols,
                         pCurrentConfig->pFilter->IPSize);
             }
@@ -3310,14 +3304,14 @@ INetCfgComponentControl_fnApplyRegistryChanges(
                              &pCurrentConfig->Ip->NTEContext,
                              &NTEInstance);
             }
-            
+
             pStr = CreateMultiSzString(pCurrentConfig->Ip, IPADDR, &dwSize, FALSE);
             if(pStr)
             {
                 RegSetValueExW(hKey, L"IPAddress", 0, REG_MULTI_SZ, (LPBYTE)pStr, dwSize);
                 CoTaskMemFree(pStr);
             }
-            
+
             pStr = CreateMultiSzString(pCurrentConfig->Ip, SUBMASK, &dwSize, FALSE);
             if(pStr)
             {