diff --git a/dll/win32/netcfgx/lang/bg-BG.rc b/dll/win32/netcfgx/lang/bg-BG.rc
index 768da45df10..1786d84c737 100644
--- a/dll/win32/netcfgx/lang/bg-BG.rc
+++ b/dll/win32/netcfgx/lang/bg-BG.rc
@@ -32,18 +32,18 @@ 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
-    CONTROL "На&строено от потребителя", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
+    CONTROL "&Автоматични лични IP адреси", IDC_ALTAPIPA, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
+    CONTROL "На&строено от потребителя", IDC_ALTSTATIC, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
     LTEXT "Адрес за IP:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
+    CONTROL "", IDC_ALTIPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "Под&мрежова маска:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
+    CONTROL "", IDC_ALTSUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
     LTEXT "&Подразбиран разпределител:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
+    CONTROL "", IDC_ALTDEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
     LTEXT "Пре&дпочитан DNS:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
+    CONTROL "", IDC_ALTDNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
     LTEXT "За&местващ DNS:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
+    CONTROL "", IDC_ALTDNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
diff --git a/dll/win32/netcfgx/lang/cs-CZ.rc b/dll/win32/netcfgx/lang/cs-CZ.rc
index d90523afddc..d9c85feb1d2 100644
--- a/dll/win32/netcfgx/lang/cs-CZ.rc
+++ b/dll/win32/netcfgx/lang/cs-CZ.rc
@@ -35,18 +35,18 @@ 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
-    CONTROL "&Uživatelské nastavení", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
+    CONTROL "Au&tomatická privátní IP adresa", IDC_ALTAPIPA, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
+    CONTROL "&Uživatelské nastavení", IDC_ALTSTATIC, "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
+    CONTROL "", IDC_ALTIPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "&Maska podsítě:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
+    CONTROL "", IDC_ALTSUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
     LTEXT "&Výchozí brána:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
+    CONTROL "", IDC_ALTDEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
     LTEXT "&Preferovaný DNS server:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
+    CONTROL "", IDC_ALTDNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
     LTEXT "&Alternativní DNS server:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
+    CONTROL "", IDC_ALTDNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
diff --git a/dll/win32/netcfgx/lang/da-DK.rc b/dll/win32/netcfgx/lang/da-DK.rc
index 771fa1b3a5b..951d0d88455 100644
--- a/dll/win32/netcfgx/lang/da-DK.rc
+++ b/dll/win32/netcfgx/lang/da-DK.rc
@@ -32,18 +32,18 @@ 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
-    CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
+    CONTROL "Au&tomatic private IP address", IDC_ALTAPIPA, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
+    CONTROL "U&ser configured", IDC_ALTSTATIC, "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
+    CONTROL "", IDC_ALTIPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
+    CONTROL "", IDC_ALTSUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
     LTEXT "&Default gateway:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
+    CONTROL "", IDC_ALTDEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
     LTEXT "&Preferred DNS server:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
+    CONTROL "", IDC_ALTDNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
     LTEXT "&Alternate DNS server:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
+    CONTROL "", IDC_ALTDNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
diff --git a/dll/win32/netcfgx/lang/de-DE.rc b/dll/win32/netcfgx/lang/de-DE.rc
index 8c817bde4d9..77717495994 100644
--- a/dll/win32/netcfgx/lang/de-DE.rc
+++ b/dll/win32/netcfgx/lang/de-DE.rc
@@ -32,18 +32,18 @@ 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
-    CONTROL "B&enutzerdefiniert", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
+    CONTROL "Au&tomatisch zugewiesene, private IP-Adresse", IDC_ALTAPIPA, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
+    CONTROL "B&enutzerdefiniert", IDC_ALTSTATIC, "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
+    CONTROL "", IDC_ALTIPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "S&ubnetzmaske:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
+    CONTROL "", IDC_ALTSUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
     LTEXT "&Standardgateway:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
+    CONTROL "", IDC_ALTDEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
     LTEXT "&Bevorzugter DNS-Server:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
+    CONTROL "", IDC_ALTDNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
     LTEXT "A&lternativer DNS-Server:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
+    CONTROL "", IDC_ALTDNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
diff --git a/dll/win32/netcfgx/lang/el-GR.rc b/dll/win32/netcfgx/lang/el-GR.rc
index 8f6861498fe..0106530a686 100644
--- a/dll/win32/netcfgx/lang/el-GR.rc
+++ b/dll/win32/netcfgx/lang/el-GR.rc
@@ -32,18 +32,18 @@ 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
-    CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
+    CONTROL "Au&tomatic private IP address", IDC_ALTAPIPA, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
+    CONTROL "U&ser configured", IDC_ALTSTATIC, "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
+    CONTROL "", IDC_ALTIPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
+    CONTROL "", IDC_ALTSUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
     LTEXT "&Default gateway:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
+    CONTROL "", IDC_ALTDEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
     LTEXT "&Preferred DNS server:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
+    CONTROL "", IDC_ALTDNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
     LTEXT "&Alternate DNS server:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
+    CONTROL "", IDC_ALTDNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
diff --git a/dll/win32/netcfgx/lang/en-US.rc b/dll/win32/netcfgx/lang/en-US.rc
index 77f4b31e540..2e08c9c7c2e 100644
--- a/dll/win32/netcfgx/lang/en-US.rc
+++ b/dll/win32/netcfgx/lang/en-US.rc
@@ -32,18 +32,18 @@ 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
-    CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
+    CONTROL "Au&tomatic private IP address", IDC_ALTAPIPA, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
+    CONTROL "U&ser configured", IDC_ALTSTATIC, "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
+    CONTROL "", IDC_ALTIPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
+    CONTROL "", IDC_ALTSUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
     LTEXT "&Default gateway:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
+    CONTROL "", IDC_ALTDEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
     LTEXT "&Preferred DNS server:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
+    CONTROL "", IDC_ALTDNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
     LTEXT "&Alternate DNS server:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
+    CONTROL "", IDC_ALTDNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
diff --git a/dll/win32/netcfgx/lang/es-ES.rc b/dll/win32/netcfgx/lang/es-ES.rc
index 61edf02b566..883350978dd 100644
--- a/dll/win32/netcfgx/lang/es-ES.rc
+++ b/dll/win32/netcfgx/lang/es-ES.rc
@@ -40,18 +40,18 @@ 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
-    CONTROL "Configurada por el u&suario:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 100, 12
+    CONTROL "&Dirección IP privada automática", IDC_ALTAPIPA, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
+    CONTROL "Configurada por el u&suario:", IDC_ALTSTATIC, "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
+    CONTROL "", IDC_ALTIPADDR, "SysIPAddress32", WS_TABSTOP, 140, 75, 85, 12
     LTEXT "Máscara de s&ubred:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 140, 95, 85, 12
+    CONTROL "", IDC_ALTSUBNETMASK, "SysIPAddress32", WS_TABSTOP, 140, 95, 85, 12
     LTEXT "&Puerta de enlace predeterminada:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 140, 115, 85, 12
+    CONTROL "", IDC_ALTDEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 140, 115, 85, 12
     LTEXT "S&ervidor DNS preferido:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 140, 150, 85, 12
+    CONTROL "", IDC_ALTDNS1, "SysIPAddress32", WS_TABSTOP, 140, 150, 85, 12
     LTEXT "Servidor DNS alternati&vo:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 140, 165, 85, 12
+    CONTROL "", IDC_ALTDNS2, "SysIPAddress32", WS_TABSTOP, 140, 165, 85, 12
 END
 
 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
diff --git a/dll/win32/netcfgx/lang/fr-FR.rc b/dll/win32/netcfgx/lang/fr-FR.rc
index fafa5d4b6c1..74d80dfb650 100644
--- a/dll/win32/netcfgx/lang/fr-FR.rc
+++ b/dll/win32/netcfgx/lang/fr-FR.rc
@@ -32,18 +32,18 @@ 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 "&Obtenir automatiquement l'adresse IP", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
-    CONTROL "&Utiliser l'adresse IP suivante :", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 120, 12
+    CONTROL "&Obtenir automatiquement l'adresse IP", IDC_ALTAPIPA, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
+    CONTROL "&Utiliser l'adresse IP suivante :", IDC_ALTSTATIC, "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
+    CONTROL "", IDC_ALTIPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "&Masque de sous-réseau :", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
+    CONTROL "", IDC_ALTSUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
     LTEXT "Passerelle par &défaut :", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
+    CONTROL "", IDC_ALTDEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
     LTEXT "Serveur DNS &préféré :", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
+    CONTROL "", IDC_ALTDNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
     LTEXT "Serveur DNS &alternatif :", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
+    CONTROL "", IDC_ALTDNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
diff --git a/dll/win32/netcfgx/lang/he-IL.rc b/dll/win32/netcfgx/lang/he-IL.rc
index c7aaaaad49f..28435ede055 100644
--- a/dll/win32/netcfgx/lang/he-IL.rc
+++ b/dll/win32/netcfgx/lang/he-IL.rc
@@ -32,18 +32,18 @@ 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
-    CONTROL "הגדרת משתמש", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
+    CONTROL "כתובת IP פרטית אוטומטית", IDC_ALTAPIPA, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
+    CONTROL "הגדרת משתמש", IDC_ALTSTATIC, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
     LTEXT "כתובת IP:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
+    CONTROL "", IDC_ALTIPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "מסכת רשת משנה:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
+    CONTROL "", IDC_ALTSUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
     LTEXT "שער ברירת מחדל:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
+    CONTROL "", IDC_ALTDEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
     LTEXT "שרת DNS מועדף:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
+    CONTROL "", IDC_ALTDNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
     LTEXT "שרת DNS חלופי:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
+    CONTROL "", IDC_ALTDNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
diff --git a/dll/win32/netcfgx/lang/hu-HU.rc b/dll/win32/netcfgx/lang/hu-HU.rc
index 97bedb1b6c4..3464815496c 100644
--- a/dll/win32/netcfgx/lang/hu-HU.rc
+++ b/dll/win32/netcfgx/lang/hu-HU.rc
@@ -32,18 +32,18 @@ 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
-    CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
+    CONTROL "Au&tomatic private IP address", IDC_ALTAPIPA, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
+    CONTROL "U&ser configured", IDC_ALTSTATIC, "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
+    CONTROL "", IDC_ALTIPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
+    CONTROL "", IDC_ALTSUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
     LTEXT "&Default gateway:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
+    CONTROL "", IDC_ALTDEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
     LTEXT "&Preferred DNS server:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
+    CONTROL "", IDC_ALTDNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
     LTEXT "&Alternate DNS server:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
+    CONTROL "", IDC_ALTDNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
diff --git a/dll/win32/netcfgx/lang/id-ID.rc b/dll/win32/netcfgx/lang/id-ID.rc
index 19c45e514ed..7bcc44756be 100644
--- a/dll/win32/netcfgx/lang/id-ID.rc
+++ b/dll/win32/netcfgx/lang/id-ID.rc
@@ -32,18 +32,18 @@ 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
-    CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
+    CONTROL "Au&tomatic private IP address", IDC_ALTAPIPA, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
+    CONTROL "U&ser configured", IDC_ALTAPIPA, "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
+    CONTROL "", IDC_ALTIPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
+    CONTROL "", IDC_ALTSUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
     LTEXT "&Default gateway:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
+    CONTROL "", IDC_ALTDEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
     LTEXT "&Preferred DNS server:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
+    CONTROL "", IDC_ALTDNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
     LTEXT "&Alternate DNS server:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
+    CONTROL "", IDC_ALTDNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
diff --git a/dll/win32/netcfgx/lang/it-IT.rc b/dll/win32/netcfgx/lang/it-IT.rc
index 35a43781b95..29175f8b069 100644
--- a/dll/win32/netcfgx/lang/it-IT.rc
+++ b/dll/win32/netcfgx/lang/it-IT.rc
@@ -32,18 +32,18 @@ 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
-    CONTROL "Configurato dall'&utente", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
+    CONTROL "Indirizzo IP privato &automatico", IDC_ALTAPIPA, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
+    CONTROL "Configurato dall'&utente", IDC_ALTSTATIC, "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
+    CONTROL "", IDC_ALTIPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
+    CONTROL "", IDC_ALTSUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
     LTEXT "&Default gateway:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
+    CONTROL "", IDC_ALTDEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
     LTEXT "&DNS server preferenziale:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
+    CONTROL "", IDC_ALTDNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
     LTEXT "DNS server alternativo:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
+    CONTROL "", IDC_ALTDNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
diff --git a/dll/win32/netcfgx/lang/ja-JP.rc b/dll/win32/netcfgx/lang/ja-JP.rc
index 21873777e11..8873e0436f5 100644
--- a/dll/win32/netcfgx/lang/ja-JP.rc
+++ b/dll/win32/netcfgx/lang/ja-JP.rc
@@ -32,18 +32,18 @@ FONT 9, "MS UI Gothic"
 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
-    CONTROL "ユーザー設定(&S)", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
+    CONTROL "自動プライベート IP アドレス(&T)", IDC_ALTAPIPA, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
+    CONTROL "ユーザー設定(&S)", IDC_ALTSTATIC, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
     LTEXT "&IP アドレス:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
+    CONTROL "", IDC_ALTIPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "サブネット マスク(&U):", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
+    CONTROL "", IDC_ALTSUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
     LTEXT "デフォルト ゲートウェイ(&D):", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
+    CONTROL "", IDC_ALTDEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
     LTEXT "優先DNSサーバー(&P):", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
+    CONTROL "", IDC_ALTDNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
     LTEXT "代替DNSサーバー(&A):", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
+    CONTROL "", IDC_ALTDNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
diff --git a/dll/win32/netcfgx/lang/nl-NL.rc b/dll/win32/netcfgx/lang/nl-NL.rc
index a6313685134..eab20c415f3 100644
--- a/dll/win32/netcfgx/lang/nl-NL.rc
+++ b/dll/win32/netcfgx/lang/nl-NL.rc
@@ -32,18 +32,18 @@ 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
-    CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
+    CONTROL "Au&tomatic private IP address", IDC_ALTAPIPA, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
+    CONTROL "U&ser configured", IDC_ALTSTATIC, "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
+    CONTROL "", IDC_ALTIPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
+    CONTROL "", IDC_ALTSUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
     LTEXT "&Default gateway:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
+    CONTROL "", IDC_ALTDEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
     LTEXT "&Preferred DNS server:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
+    CONTROL "", IDC_ALTDNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
     LTEXT "&Alternate DNS server:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
+    CONTROL "", IDC_ALTDNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
diff --git a/dll/win32/netcfgx/lang/no-NO.rc b/dll/win32/netcfgx/lang/no-NO.rc
index 1c1fa43d4b9..86b8b79d902 100644
--- a/dll/win32/netcfgx/lang/no-NO.rc
+++ b/dll/win32/netcfgx/lang/no-NO.rc
@@ -32,18 +32,18 @@ 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
-    CONTROL "B&ruker konfigurert", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
+    CONTROL "Au&tomatisk privat IP addresse", IDC_ALTAPIPA, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
+    CONTROL "B&ruker konfigurert", IDC_ALTSTATIC, "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
+    CONTROL "", IDC_ALTIPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "S&ubnet maske:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
+    CONTROL "", IDC_ALTSUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
     LTEXT "&Standard gateway:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
+    CONTROL "", IDC_ALTDEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
     LTEXT "&Valgt DNS server:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
+    CONTROL "", IDC_ALTDNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
     LTEXT "&Alternativ DNS server:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
+    CONTROL "", IDC_ALTDNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
diff --git a/dll/win32/netcfgx/lang/pl-PL.rc b/dll/win32/netcfgx/lang/pl-PL.rc
index 985bf9d0800..f397fc45d2f 100644
--- a/dll/win32/netcfgx/lang/pl-PL.rc
+++ b/dll/win32/netcfgx/lang/pl-PL.rc
@@ -34,18 +34,18 @@ 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
-    CONTROL "&Ustawienia konfigurowane przez użytkownika", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 210, 12
+    CONTROL "Au&tomatyczny prywatny adres IP", IDC_ALTAPIPA, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
+    CONTROL "&Ustawienia konfigurowane przez użytkownika", IDC_ALTSTATIC, "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
+    CONTROL "", IDC_ALTIPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "&Maska podsieci:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
+    CONTROL "", IDC_ALTSUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
     LTEXT "&Brama domyślna:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
+    CONTROL "", IDC_ALTDEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
     LTEXT "&Preferowany serwer DNS:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
+    CONTROL "", IDC_ALTDNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
     LTEXT "&Alternatywny serwer DNS:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
+    CONTROL "", IDC_ALTDNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
diff --git a/dll/win32/netcfgx/lang/pt-PT.rc b/dll/win32/netcfgx/lang/pt-PT.rc
index fb6435aae4f..2ce3f743123 100644
--- a/dll/win32/netcfgx/lang/pt-PT.rc
+++ b/dll/win32/netcfgx/lang/pt-PT.rc
@@ -34,18 +34,18 @@ 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
-    CONTROL "&Config. do utilizador", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
+    CONTROL "IP privado &automático", IDC_ALTAPIPA, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
+    CONTROL "&Config. do utilizador", IDC_ALTSTATIC, "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
+    CONTROL "", IDC_ALTIPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "Máscara S&ubnet:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
+    CONTROL "", IDC_ALTSUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
     LTEXT "&Gateway padrão:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
+    CONTROL "", IDC_ALTDEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
     LTEXT "&Servidor DNS perferido:", -1, 14, 150, 135, 8 //FIXME: accelerator collision &S
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
+    CONTROL "", IDC_ALTDNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
     LTEXT "&Servidor DNS alternativo:", -1, 14, 165, 180, 8 //FIXME: accelerator collision &S
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
+    CONTROL "", IDC_ALTDNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
diff --git a/dll/win32/netcfgx/lang/ro-RO.rc b/dll/win32/netcfgx/lang/ro-RO.rc
index 749f0e3497e..a2446563ad6 100644
--- a/dll/win32/netcfgx/lang/ro-RO.rc
+++ b/dll/win32/netcfgx/lang/ro-RO.rc
@@ -40,18 +40,18 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Dacă acest computer este utilizat în mai mult de o reţea, introduceţi setările IP alternative de mai jos.", -1, 9, 9, 220, 20
     GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX
-    CONTROL "Ad&resă privată IP automată", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
-    CONTROL "&Configurat de utilizator", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 90, 12
+    CONTROL "Ad&resă privată IP automată", IDC_ALTAPIPA, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
+    CONTROL "&Configurat de utilizator", IDC_ALTSTATIC, "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
+    CONTROL "", IDC_ALTIPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "&Mască subreţea:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
+    CONTROL "", IDC_ALTSUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
     LTEXT "&Gateway implicit:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
+    CONTROL "", IDC_ALTDEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
     LTEXT "Server &DNS preferat:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
+    CONTROL "", IDC_ALTDNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
     LTEXT "Server DNS &alternativ:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
+    CONTROL "", IDC_ALTDNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
diff --git a/dll/win32/netcfgx/lang/ru-RU.rc b/dll/win32/netcfgx/lang/ru-RU.rc
index 059aec9602d..4ef0590efb6 100644
--- a/dll/win32/netcfgx/lang/ru-RU.rc
+++ b/dll/win32/netcfgx/lang/ru-RU.rc
@@ -32,18 +32,18 @@ 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
-    CONTROL "Настраиваем&ый пользователем", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 130, 12
+    CONTROL "А&втоматический частный IP-адрес", IDC_ALTAPIPA, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
+    CONTROL "Настраиваем&ый пользователем", IDC_ALTSTATIC, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 130, 12
     LTEXT "IP-&адрес:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
+    CONTROL "", IDC_ALTIPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "Ма&ска подсети:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
+    CONTROL "", IDC_ALTSUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
     LTEXT "&Основной шлюз:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
+    CONTROL "", IDC_ALTDEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
     LTEXT "Пр&едпочитаемый DNS-сервер:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
+    CONTROL "", IDC_ALTDNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
     LTEXT "Ал&ьтернативный DNS-сервер:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
+    CONTROL "", IDC_ALTDNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
diff --git a/dll/win32/netcfgx/lang/sk-SK.rc b/dll/win32/netcfgx/lang/sk-SK.rc
index 3a83e185e78..b0629b67ac5 100644
--- a/dll/win32/netcfgx/lang/sk-SK.rc
+++ b/dll/win32/netcfgx/lang/sk-SK.rc
@@ -32,18 +32,18 @@ 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
-    CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
+    CONTROL "Au&tomatic private IP address", IDC_ALTAPIPA, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
+    CONTROL "U&ser configured", IDC_ALTSTATIC, "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
+    CONTROL "", IDC_ALTIPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
+    CONTROL "", IDC_ALTSUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
     LTEXT "&Default gateway:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
+    CONTROL "", IDC_ALTDEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
     LTEXT "&Preferred DNS server:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
+    CONTROL "", IDC_ALTDNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
     LTEXT "&Alternate DNS server:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
+    CONTROL "", IDC_ALTDNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
diff --git a/dll/win32/netcfgx/lang/sq-AL.rc b/dll/win32/netcfgx/lang/sq-AL.rc
index daa2e8a47ed..2b952bcccb0 100644
--- a/dll/win32/netcfgx/lang/sq-AL.rc
+++ b/dll/win32/netcfgx/lang/sq-AL.rc
@@ -34,18 +34,18 @@ 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
-    CONTROL "Përdorue&si konfiguruar", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
+    CONTROL "Adresë IP private auto%matike", IDC_ALTAPIPA, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
+    CONTROL "Përdorue&si konfiguruar", IDC_ALTSTATIC, "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
+    CONTROL "", IDC_ALTIPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
+    CONTROL "", IDC_ALTSUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
     LTEXT "Gateway Parazgjedhur:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
+    CONTROL "", IDC_ALTDEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
     LTEXT "DNS'ja serverit e &preferuar:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
+    CONTROL "", IDC_ALTDNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
     LTEXT "&Alterno DNS'në e server-it:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
+    CONTROL "", IDC_ALTDNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
diff --git a/dll/win32/netcfgx/lang/sv-SE.rc b/dll/win32/netcfgx/lang/sv-SE.rc
index 493c24ef5eb..5aef385ac06 100644
--- a/dll/win32/netcfgx/lang/sv-SE.rc
+++ b/dll/win32/netcfgx/lang/sv-SE.rc
@@ -32,18 +32,18 @@ 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
-    CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
+    CONTROL "Au&tomatic private IP address", IDC_ALTAPIPA, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
+    CONTROL "U&ser configured", IDC_ALTSTATIC, "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
+    CONTROL "", IDC_ALTIPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
+    CONTROL "", IDC_ALTSUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
     LTEXT "&Default gateway:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
+    CONTROL "", IDC_ALTDEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
     LTEXT "&Preferred DNS server:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
+    CONTROL "", IDC_ALTDNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
     LTEXT "&Alternate DNS server:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
+    CONTROL "", IDC_ALTDNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
diff --git a/dll/win32/netcfgx/lang/tr-TR.rc b/dll/win32/netcfgx/lang/tr-TR.rc
index 405ddc83314..8528d73420a 100644
--- a/dll/win32/netcfgx/lang/tr-TR.rc
+++ b/dll/win32/netcfgx/lang/tr-TR.rc
@@ -40,18 +40,18 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Eğer bu bilgisayar birden çok ağda kullanılıyorsa, aşağıya alternatif IP ayarlarını giriniz.", -1, 9, 9, 220, 20
     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
+    CONTROL "&Otomatik özel IP adresi", IDC_ALTAPIPA, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
+    CONTROL "K&ullanıcının yapılandırdığı", IDC_ALTSTATIC, "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
+    CONTROL "", IDC_ALTIPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "&Alt ağ maskesi:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
+    CONTROL "", IDC_ALTSUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
     LTEXT "&Varsayılan geçit:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
+    CONTROL "", IDC_ALTDEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
     LTEXT "&Tercih edilen DNS Sunucusu:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
+    CONTROL "", IDC_ALTDNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
     LTEXT "A&lternatif DNS Sunucusu:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
+    CONTROL "", IDC_ALTDNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
diff --git a/dll/win32/netcfgx/lang/uk-UA.rc b/dll/win32/netcfgx/lang/uk-UA.rc
index ec0bc1cea87..5d4a5705433 100644
--- a/dll/win32/netcfgx/lang/uk-UA.rc
+++ b/dll/win32/netcfgx/lang/uk-UA.rc
@@ -32,18 +32,18 @@ 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
-    CONTROL "Н&алаштована користувачем", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 120, 12
+    CONTROL "А&втоматична приватна IP-адреса", IDC_ALTAPIPA, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
+    CONTROL "Н&алаштована користувачем", IDC_ALTSTATIC, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 120, 12
     LTEXT "&IP-адреса:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
+    CONTROL "", IDC_ALTIPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "Ма&ска підмережі:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
+    CONTROL "", IDC_ALTSUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
     LTEXT "&Шлюз за замовчуванням:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
+    CONTROL "", IDC_ALTDEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
     LTEXT "&Основний DNS-сервер:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
+    CONTROL "", IDC_ALTDNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
     LTEXT "&Альтернативний DNS-сервер:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
+    CONTROL "", IDC_ALTDNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
diff --git a/dll/win32/netcfgx/lang/zh-CN.rc b/dll/win32/netcfgx/lang/zh-CN.rc
index 7725c7c8aca..b887bc5a6c6 100644
--- a/dll/win32/netcfgx/lang/zh-CN.rc
+++ b/dll/win32/netcfgx/lang/zh-CN.rc
@@ -41,18 +41,18 @@ 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
-    CONTROL "用户配置(&S)", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
+    CONTROL "自动专用 IP 地址(&T)", IDC_ALTAPIPA, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
+    CONTROL "用户配置(&S)", IDC_ALTSTATIC, "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
+    CONTROL "", IDC_ALTIPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "子网掩码(&U)：", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
+    CONTROL "", IDC_ALTSUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
     LTEXT "网关(&D)：", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
+    CONTROL "", IDC_ALTDEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
     LTEXT "首选的 DNS 服务器(&P)：", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
+    CONTROL "", IDC_ALTDNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
     LTEXT "备用的 DNS 服务器(&A)：", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
+    CONTROL "", IDC_ALTDNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
diff --git a/dll/win32/netcfgx/lang/zh-HK.rc b/dll/win32/netcfgx/lang/zh-HK.rc
index 9d9bb7aee8c..45ca5d470cf 100644
--- a/dll/win32/netcfgx/lang/zh-HK.rc
+++ b/dll/win32/netcfgx/lang/zh-HK.rc
@@ -40,18 +40,18 @@ 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
-    CONTROL "使用者設定(&S)", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
+    CONTROL "自動專用 IP 位址(&T)", IDC_ALTAPIPA, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
+    CONTROL "使用者設定(&S)", IDC_ALTSTATIC, "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
+    CONTROL "", IDC_ALTIPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "子網絡遮罩(&U)：", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
+    CONTROL "", IDC_ALTSUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
     LTEXT "預設閘道(&D)：", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
+    CONTROL "", IDC_ALTDEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
     LTEXT "首選 DNS 伺服器(&P)：", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
+    CONTROL "", IDC_ALTDNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
     LTEXT "備用 DNS 伺服器(&A)：", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
+    CONTROL "", IDC_ALTDNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
diff --git a/dll/win32/netcfgx/lang/zh-TW.rc b/dll/win32/netcfgx/lang/zh-TW.rc
index 57476a03744..54288d77589 100644
--- a/dll/win32/netcfgx/lang/zh-TW.rc
+++ b/dll/win32/netcfgx/lang/zh-TW.rc
@@ -40,18 +40,18 @@ 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
-    CONTROL "使用者設定(&S)", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12
+    CONTROL "自動專用 IP 位址(&T)", IDC_ALTAPIPA, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
+    CONTROL "使用者設定(&S)", IDC_ALTSTATIC, "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
+    CONTROL "", IDC_ALTIPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
     LTEXT "子網路遮罩(&U)：", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
+    CONTROL "", IDC_ALTSUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
     LTEXT "預設閘道(&D)：", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
+    CONTROL "", IDC_ALTDEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
     LTEXT "首選 DNS 伺服器(&P)：", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
+    CONTROL "", IDC_ALTDNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
     LTEXT "備用 DNS 伺服器(&A)：", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
+    CONTROL "", IDC_ALTDNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 220
diff --git a/dll/win32/netcfgx/resource.h b/dll/win32/netcfgx/resource.h
index e4d9a3e3c7c..63071f65695 100644
--- a/dll/win32/netcfgx/resource.h
+++ b/dll/win32/netcfgx/resource.h
@@ -31,6 +31,14 @@
 #define IDC_DNS2       1008
 #define IDC_ADVANCED   1009
 
+#define IDC_ALTAPIPA      1050
+#define IDC_ALTSTATIC     1051
+#define IDC_ALTIPADDR     1052
+#define IDC_ALTSUBNETMASK 1053
+#define IDC_ALTDEFGATEWAY 1054
+#define IDC_ALTDNS1       1057
+#define IDC_ALTDNS2       1058
+
 #define IDC_IPLIST     2000
 #define IDC_IPADD      2001
 #define IDC_IPMOD      2002
diff --git a/dll/win32/netcfgx/tcpipconf_notify.c b/dll/win32/netcfgx/tcpipconf_notify.c
index a4defac4acb..aff9777fcda 100644
--- a/dll/win32/netcfgx/tcpipconf_notify.c
+++ b/dll/win32/netcfgx/tcpipconf_notify.c
@@ -51,6 +51,15 @@ typedef enum
     IPADDR = 3
 } COPY_TYPE;
 
+typedef struct
+{
+    DWORD IpAddress;
+    DWORD SubnetMask;
+    DWORD DefaultGateway;
+    DWORD DnsServer1;
+    DWORD DnsServer2;
+} AlternateConfiguration;
+
 typedef struct
 {
     IP_ADDR *Ip;
@@ -58,9 +67,10 @@ typedef struct
     IP_ADDR *Gw;
 
     UINT DhcpEnabled;
-    UINT AutoconfigActive;
     DWORD Metric;
     DWORD Index;
+    AlternateConfiguration AltConfig;
+    AlternateConfiguration OldAltConfig;
     TcpFilterSettings *pFilter;
     TcpipAdvancedDNSDlgSettings *pDNS;
 } TcpipSettings;
@@ -1832,7 +1842,6 @@ StoreDNSSettings(
         pLast = pCur;
         pCur = pCur->Next;
     }
-    This->pCurrentConfig->AutoconfigActive = FALSE;
 }
 
 INT_PTR
@@ -2171,70 +2180,135 @@ LaunchAdvancedTcpipSettings(
     }
 }
 
+INT_PTR
+StoreTcpipAlternateSettings(
+    HWND hwndDlg,
+    TcpipConfNotifyImpl *This,
+    BOOL bApply)
+{
+    DWORD dwAddr;
+
+    if (IsDlgButtonChecked(hwndDlg, IDC_ALTSTATIC) == BST_CHECKED)
+    {
+        if (SendDlgItemMessageW(hwndDlg, IDC_ALTIPADDR, IPM_GETADDRESS, 0, (LPARAM)&dwAddr) != 4)
+        {
+            if (bApply)
+            {
+                DisplayError(IDS_NO_IPADDR_SET, IDS_TCPIP, MB_ICONWARNING);
+                SetFocus(GetDlgItem(hwndDlg, IDC_ALTIPADDR));
+                return E_FAIL;
+            }
+        }
+
+        if (SendDlgItemMessageW(hwndDlg, IDC_ALTSUBNETMASK, IPM_GETADDRESS, 0, (LPARAM)&dwAddr) != 4)
+        {
+            if (bApply)
+                DisplayError(IDS_NO_SUBMASK_SET, IDS_TCPIP, MB_ICONWARNING);
+            if (SendDlgItemMessageW(hwndDlg, IDC_ALTIPADDR, IPM_GETADDRESS, 0, (LPARAM)&dwAddr) == 4)
+            {
+                if (dwAddr <= MAKEIPADDRESS(127, 255, 255, 255))
+                    dwAddr = MAKEIPADDRESS(255, 0, 0, 0);
+                else if (dwAddr <= MAKEIPADDRESS(191, 255, 255, 255))
+                    dwAddr = MAKEIPADDRESS(255, 255, 0, 0);
+                else if (dwAddr <= MAKEIPADDRESS(223, 255, 255, 255))
+                    dwAddr = MAKEIPADDRESS(255, 255, 255, 0);
+
+                SendDlgItemMessageW(hwndDlg, IDC_ALTSUBNETMASK, IPM_SETADDRESS, 0, (LPARAM)dwAddr);
+            }
+            if (bApply)
+            {
+                SetFocus(GetDlgItem(hwndDlg, IDC_ALTSUBNETMASK));
+                return E_FAIL;
+            }
+        }
+
+        if (SendDlgItemMessageW(hwndDlg, IDC_ALTIPADDR, IPM_GETADDRESS, 0, (LPARAM)&dwAddr) == 4)
+            This->pCurrentConfig->AltConfig.IpAddress = dwAddr;
+
+        if (SendDlgItemMessageW(hwndDlg, IDC_ALTSUBNETMASK, IPM_GETADDRESS, 0, (LPARAM)&dwAddr) == 4)
+            This->pCurrentConfig->AltConfig.SubnetMask = dwAddr;
+
+        if (SendDlgItemMessageW(hwndDlg, IDC_ALTDEFGATEWAY, IPM_GETADDRESS, 0, (LPARAM)&dwAddr) == 4)
+            This->pCurrentConfig->AltConfig.DefaultGateway = dwAddr;
+
+        if (SendDlgItemMessageW(hwndDlg, IDC_ALTDNS1, IPM_GETADDRESS, 0, (LPARAM)&dwAddr) == 4)
+            This->pCurrentConfig->AltConfig.DnsServer1 = dwAddr;
+
+        if (SendDlgItemMessageW(hwndDlg, IDC_ALTDNS2, IPM_GETADDRESS, 0, (LPARAM)&dwAddr) == 4)
+            This->pCurrentConfig->AltConfig.DnsServer2 = dwAddr;
+    }
+    else
+    {
+        ZeroMemory(&This->pCurrentConfig->AltConfig, sizeof(AlternateConfiguration));
+    }
+
+    return S_OK;
+}
+
+
+
 HRESULT
 InitializeTcpipAltDlgCtrls(
     HWND hwndDlg,
     TcpipSettings *pCurSettings)
 {
-    SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_SETRANGE, 0, MAKEIPRANGE(1, 223));
-    SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_SETRANGE, 1, MAKEIPRANGE(0, 255));
-    SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_SETRANGE, 2, MAKEIPRANGE(0, 255));
-    SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_SETRANGE, 3, MAKEIPRANGE(0, 255));
+    SendDlgItemMessageW(hwndDlg, IDC_ALTIPADDR, IPM_SETRANGE, 0, MAKEIPRANGE(1, 223));
+    SendDlgItemMessageW(hwndDlg, IDC_ALTIPADDR, IPM_SETRANGE, 1, MAKEIPRANGE(0, 255));
+    SendDlgItemMessageW(hwndDlg, IDC_ALTIPADDR, IPM_SETRANGE, 2, MAKEIPRANGE(0, 255));
+    SendDlgItemMessageW(hwndDlg, IDC_ALTIPADDR, IPM_SETRANGE, 3, MAKEIPRANGE(0, 255));
 
-    SendDlgItemMessageW(hwndDlg, IDC_SUBNETMASK, IPM_SETRANGE, 0, MAKEIPRANGE(0, 255));
-    SendDlgItemMessageW(hwndDlg, IDC_SUBNETMASK, IPM_SETRANGE, 1, MAKEIPRANGE(0, 255));
-    SendDlgItemMessageW(hwndDlg, IDC_SUBNETMASK, IPM_SETRANGE, 2, MAKEIPRANGE(0, 255));
-    SendDlgItemMessageW(hwndDlg, IDC_SUBNETMASK, IPM_SETRANGE, 3, MAKEIPRANGE(0, 255));
+    SendDlgItemMessageW(hwndDlg, IDC_ALTSUBNETMASK, IPM_SETRANGE, 0, MAKEIPRANGE(0, 255));
+    SendDlgItemMessageW(hwndDlg, IDC_ALTSUBNETMASK, IPM_SETRANGE, 1, MAKEIPRANGE(0, 255));
+    SendDlgItemMessageW(hwndDlg, IDC_ALTSUBNETMASK, IPM_SETRANGE, 2, MAKEIPRANGE(0, 255));
+    SendDlgItemMessageW(hwndDlg, IDC_ALTSUBNETMASK, IPM_SETRANGE, 3, MAKEIPRANGE(0, 255));
 
-    SendDlgItemMessageW(hwndDlg, IDC_DEFGATEWAY, IPM_SETRANGE, 0, MAKEIPRANGE(1, 223));
-    SendDlgItemMessageW(hwndDlg, IDC_DEFGATEWAY, IPM_SETRANGE, 1, MAKEIPRANGE(0, 255));
-    SendDlgItemMessageW(hwndDlg, IDC_DEFGATEWAY, IPM_SETRANGE, 2, MAKEIPRANGE(0, 255));
-    SendDlgItemMessageW(hwndDlg, IDC_DEFGATEWAY, IPM_SETRANGE, 3, MAKEIPRANGE(0, 255));
+    SendDlgItemMessageW(hwndDlg, IDC_ALTDEFGATEWAY, IPM_SETRANGE, 0, MAKEIPRANGE(1, 223));
+    SendDlgItemMessageW(hwndDlg, IDC_ALTDEFGATEWAY, IPM_SETRANGE, 1, MAKEIPRANGE(0, 255));
+    SendDlgItemMessageW(hwndDlg, IDC_ALTDEFGATEWAY, IPM_SETRANGE, 2, MAKEIPRANGE(0, 255));
+    SendDlgItemMessageW(hwndDlg, IDC_ALTDEFGATEWAY, IPM_SETRANGE, 3, MAKEIPRANGE(0, 255));
 
-    SendDlgItemMessageW(hwndDlg, IDC_DNS1, IPM_SETRANGE, 0, MAKEIPRANGE(1, 223));
-    SendDlgItemMessageW(hwndDlg, IDC_DNS1, IPM_SETRANGE, 1, MAKEIPRANGE(0, 255));
-    SendDlgItemMessageW(hwndDlg, IDC_DNS1, IPM_SETRANGE, 2, MAKEIPRANGE(0, 255));
-    SendDlgItemMessageW(hwndDlg, IDC_DNS1, IPM_SETRANGE, 3, MAKEIPRANGE(0, 255));
+    SendDlgItemMessageW(hwndDlg, IDC_ALTDNS1, IPM_SETRANGE, 0, MAKEIPRANGE(1, 223));
+    SendDlgItemMessageW(hwndDlg, IDC_ALTDNS1, IPM_SETRANGE, 1, MAKEIPRANGE(0, 255));
+    SendDlgItemMessageW(hwndDlg, IDC_ALTDNS1, IPM_SETRANGE, 2, MAKEIPRANGE(0, 255));
+    SendDlgItemMessageW(hwndDlg, IDC_ALTDNS1, IPM_SETRANGE, 3, MAKEIPRANGE(0, 255));
 
-    SendDlgItemMessageW(hwndDlg, IDC_DNS2, IPM_SETRANGE, 0, MAKEIPRANGE(1, 223));
-    SendDlgItemMessageW(hwndDlg, IDC_DNS2, IPM_SETRANGE, 1, MAKEIPRANGE(0, 255));
-    SendDlgItemMessageW(hwndDlg, IDC_DNS2, IPM_SETRANGE, 2, MAKEIPRANGE(0, 255));
-    SendDlgItemMessageW(hwndDlg, IDC_DNS2, IPM_SETRANGE, 3, MAKEIPRANGE(0, 255));
+    SendDlgItemMessageW(hwndDlg, IDC_ALTDNS2, IPM_SETRANGE, 0, MAKEIPRANGE(1, 223));
+    SendDlgItemMessageW(hwndDlg, IDC_ALTDNS2, IPM_SETRANGE, 1, MAKEIPRANGE(0, 255));
+    SendDlgItemMessageW(hwndDlg, IDC_ALTDNS2, IPM_SETRANGE, 2, MAKEIPRANGE(0, 255));
+    SendDlgItemMessageW(hwndDlg, IDC_ALTDNS2, IPM_SETRANGE, 3, MAKEIPRANGE(0, 255));
 
-    if (pCurSettings->DhcpEnabled)
+    if (pCurSettings->AltConfig.IpAddress == 0)
     {
-        CheckRadioButton(hwndDlg, IDC_USEDHCP, IDC_NODHCP, IDC_USEDHCP);
-        EnableWindow(GetDlgItem(hwndDlg, IDC_IPADDR), FALSE);
-        EnableWindow(GetDlgItem(hwndDlg, IDC_SUBNETMASK), FALSE);
-        EnableWindow(GetDlgItem(hwndDlg, IDC_DEFGATEWAY), FALSE);
-        EnableWindow(GetDlgItem(hwndDlg, IDC_DNS1), FALSE);
-        EnableWindow(GetDlgItem(hwndDlg, IDC_DNS2), FALSE);
+        CheckRadioButton(hwndDlg, IDC_ALTAPIPA, IDC_ALTSTATIC, IDC_ALTAPIPA);
+        EnableWindow(GetDlgItem(hwndDlg, IDC_ALTIPADDR), FALSE);
+        EnableWindow(GetDlgItem(hwndDlg, IDC_ALTSUBNETMASK), FALSE);
+        EnableWindow(GetDlgItem(hwndDlg, IDC_ALTDEFGATEWAY), FALSE);
+        EnableWindow(GetDlgItem(hwndDlg, IDC_ALTDNS1), FALSE);
+        EnableWindow(GetDlgItem(hwndDlg, IDC_ALTDNS2), FALSE);
     }
     else
     {
-        CheckRadioButton(hwndDlg, IDC_USEDHCP, IDC_NODHCP, IDC_NODHCP);
+        CheckRadioButton(hwndDlg, IDC_ALTAPIPA, IDC_ALTSTATIC, IDC_ALTSTATIC);
 
-        if (pCurSettings->Ip)
-        {
-            /* Set current ip address */
-            SendDlgItemMessageA(hwndDlg, IDC_IPADDR, IPM_SETADDRESS, 0, (LPARAM)pCurSettings->Ip->IpAddress);
-            /* Set current hostmask */
-            SendDlgItemMessageA(hwndDlg, IDC_SUBNETMASK, IPM_SETADDRESS, 0, (LPARAM)pCurSettings->Ip->u.Subnetmask);
-        }
+        /* Set ip address */
+        if (pCurSettings->AltConfig.IpAddress)
+            SendDlgItemMessageW(hwndDlg, IDC_ALTIPADDR, IPM_SETADDRESS, 0, (LPARAM)pCurSettings->AltConfig.IpAddress);
 
-        if (pCurSettings->Gw && pCurSettings->Gw->IpAddress)
-        {
-            /* Set current gateway */
-            SendDlgItemMessageA(hwndDlg, IDC_DEFGATEWAY, IPM_SETADDRESS, 0, (LPARAM)pCurSettings->Gw->IpAddress);
-        }
+        /* Set subnet mask */
+        if (pCurSettings->AltConfig.SubnetMask)
+            SendDlgItemMessageW(hwndDlg, IDC_ALTSUBNETMASK, IPM_SETADDRESS, 0, (LPARAM)pCurSettings->AltConfig.SubnetMask);
 
-        if (pCurSettings->Ns)
-        {
-            /* Set name server addresses */
-            SendDlgItemMessageW(hwndDlg, IDC_DNS1, IPM_SETADDRESS, 0, (LPARAM)pCurSettings->Ns->IpAddress);
-            if (pCurSettings->Ns->Next)
-                SendDlgItemMessageW(hwndDlg, IDC_DNS2, IPM_SETADDRESS, 0, (LPARAM)pCurSettings->Ns->Next->IpAddress);
-        }
+        /* Set default gateway */
+        if (pCurSettings->AltConfig.DefaultGateway)
+            SendDlgItemMessageW(hwndDlg, IDC_ALTDEFGATEWAY, IPM_SETADDRESS, 0, (LPARAM)pCurSettings->AltConfig.DefaultGateway);
+
+        /* Set primary dns server */
+        if (pCurSettings->AltConfig.DnsServer1)
+            SendDlgItemMessageW(hwndDlg, IDC_ALTDNS1, IPM_SETADDRESS, 0, (LPARAM)pCurSettings->AltConfig.DnsServer1);
+
+        /* Set secondary dns server */
+        if (pCurSettings->AltConfig.DnsServer2)
+            SendDlgItemMessageW(hwndDlg, IDC_ALTDNS2, IPM_SETADDRESS, 0, (LPARAM)pCurSettings->AltConfig.DnsServer2);
     }
 
     return S_OK;
@@ -2250,7 +2324,8 @@ TcpipAltConfDlg(
 {
     TcpipConfNotifyImpl *This;
     LPPROPSHEETPAGE page;
-    BOOL bNoDHCP;
+    LPNMIPADDRESS lpnmipa;
+    LPPSHNOTIFY lppsn;
 
     switch (uMsg)
     {
@@ -2263,30 +2338,63 @@ TcpipAltConfDlg(
                 InitializeTcpipAltDlgCtrls(hwndDlg, This->pCurrentConfig);
             return TRUE;
         }
+        case WM_NOTIFY:
+            lppsn = (LPPSHNOTIFY) lParam;
+            lpnmipa = (LPNMIPADDRESS) lParam;
+            if (lpnmipa->hdr.code == IPN_FIELDCHANGED)
+            {
+                PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
+                if (lpnmipa->hdr.idFrom == IDC_ALTIPADDR)
+                {
+                    DWORD dwIpAddr;
+
+                    if (SendDlgItemMessageW(hwndDlg, IDC_ALTIPADDR, IPM_GETADDRESS, 0, (LPARAM)&dwIpAddr) == 4)
+                    {
+                        if (dwIpAddr <= MAKEIPADDRESS(127, 255, 255, 255))
+                            SendDlgItemMessageW(hwndDlg, IDC_ALTSUBNETMASK, IPM_SETADDRESS, 0, (LPARAM)MAKEIPADDRESS(255, 0, 0, 0));
+                        else if (dwIpAddr <= MAKEIPADDRESS(191, 255, 255, 255))
+                            SendDlgItemMessageW(hwndDlg, IDC_ALTSUBNETMASK, IPM_SETADDRESS, 0, (LPARAM)MAKEIPADDRESS(255, 255, 0, 0));
+                        else if (dwIpAddr <= MAKEIPADDRESS(223, 255, 255, 255))
+                            SendDlgItemMessageW(hwndDlg, IDC_ALTSUBNETMASK, IPM_SETADDRESS, 0, (LPARAM)MAKEIPADDRESS(255, 255, 255, 0));
+                     }
+                }
+            }
+            else if (lppsn->hdr.code == PSN_APPLY)
+            {
+                This = (TcpipConfNotifyImpl*)GetWindowLongPtr(hwndDlg, DWLP_USER);
+                if (SUCCEEDED(StoreTcpipAlternateSettings(hwndDlg, This, TRUE)))
+                    SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, PSNRET_NOERROR);
+                else
+                    SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, PSNRET_INVALID);
+
+                return TRUE;
+            }
+            break;
+
         case WM_COMMAND:
         {
             switch (LOWORD(wParam))
             {
-                case IDC_USEDHCP:
-                case IDC_NODHCP:
+                case IDC_ALTAPIPA:
+                case IDC_ALTSTATIC:
                 {
                     if (HIWORD(wParam) == BN_CLICKED)
                     {
-                        bNoDHCP = (IsDlgButtonChecked(hwndDlg, IDC_NODHCP) == BST_CHECKED);
-                        if (bNoDHCP)
+                        BOOL bStatic = (IsDlgButtonChecked(hwndDlg, IDC_ALTSTATIC) == BST_CHECKED);
+                        if (bStatic)
                         {
-                            SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_CLEARADDRESS, 0, 0);
-                            SendDlgItemMessageW(hwndDlg, IDC_SUBNETMASK, IPM_CLEARADDRESS, 0, 0);
-                            SendDlgItemMessageW(hwndDlg, IDC_DEFGATEWAY, IPM_CLEARADDRESS, 0, 0);
-                            SendDlgItemMessageW(hwndDlg, IDC_DNS1, IPM_CLEARADDRESS, 0, 0);
-                            SendDlgItemMessageW(hwndDlg, IDC_DNS2, IPM_CLEARADDRESS, 0, 0);
+                            SendDlgItemMessageW(hwndDlg, IDC_ALTIPADDR, IPM_CLEARADDRESS, 0, 0);
+                            SendDlgItemMessageW(hwndDlg, IDC_ALTSUBNETMASK, IPM_CLEARADDRESS, 0, 0);
+                            SendDlgItemMessageW(hwndDlg, IDC_ALTDEFGATEWAY, IPM_CLEARADDRESS, 0, 0);
+                            SendDlgItemMessageW(hwndDlg, IDC_ALTDNS1, IPM_CLEARADDRESS, 0, 0);
+                            SendDlgItemMessageW(hwndDlg, IDC_ALTDNS2, IPM_CLEARADDRESS, 0, 0);
                         }
 
-                        EnableWindow(GetDlgItem(hwndDlg, IDC_IPADDR), bNoDHCP);
-                        EnableWindow(GetDlgItem(hwndDlg, IDC_SUBNETMASK), bNoDHCP);
-                        EnableWindow(GetDlgItem(hwndDlg, IDC_DEFGATEWAY), bNoDHCP);
-                        EnableWindow(GetDlgItem(hwndDlg, IDC_DNS1), bNoDHCP);
-                        EnableWindow(GetDlgItem(hwndDlg, IDC_DNS2), bNoDHCP);
+                        EnableWindow(GetDlgItem(hwndDlg, IDC_ALTIPADDR), bStatic);
+                        EnableWindow(GetDlgItem(hwndDlg, IDC_ALTSUBNETMASK), bStatic);
+                        EnableWindow(GetDlgItem(hwndDlg, IDC_ALTDEFGATEWAY), bStatic);
+                        EnableWindow(GetDlgItem(hwndDlg, IDC_ALTDNS1), bStatic);
+                        EnableWindow(GetDlgItem(hwndDlg, IDC_ALTDNS2), bStatic);
 
                         PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
                     }
@@ -2396,7 +2504,6 @@ StoreTcpipBasicSettings(
     if (IsDlgButtonChecked(hwndDlg, IDC_FIXEDDNS) == BST_CHECKED)
     {
         BOOL bSkip = FALSE;
-        This->pCurrentConfig->AutoconfigActive = FALSE;
         if (SendDlgItemMessageW(hwndDlg, IDC_DNS1, IPM_GETADDRESS, 0, (LPARAM)&dwIpAddr) == 4)
         {
             if (!This->pCurrentConfig->Ns)
@@ -2462,10 +2569,7 @@ StoreTcpipBasicSettings(
             }
         }
     }
-    else
-    {
-        This->pCurrentConfig->AutoconfigActive = TRUE;
-    }
+
     return S_OK;
 }
 
@@ -2526,7 +2630,7 @@ InitializeTcpipBasicDlgCtrls(
         }
     }
 
-    if (pCurSettings->AutoconfigActive)
+    if (pCurSettings->DhcpEnabled && (pCurSettings->Ns == NULL))
     {
         CheckRadioButton(hwndDlg, IDC_AUTODNS, IDC_FIXEDDNS, IDC_AUTODNS);
         EnableWindow(GetDlgItem(hwndDlg, IDC_DNS1), FALSE);
@@ -2887,26 +2991,68 @@ INetCfgComponentPropertyUi_fnSetContext(
 }
 
 HRESULT
-LoadDNSSettings(
-    TcpipConfNotifyImpl * This)
+LoadTcpIpSettings(
+    TcpipConfNotifyImpl * This,
+    LPOLESTR pAdapterName)
+{
+    HKEY hKey;
+    WCHAR szBuffer[200];
+    DWORD dwSize;
+    BOOL bAltConfig = FALSE;
+
+    _swprintf(szBuffer, L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces\\%s", pAdapterName);
+    if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szBuffer, 0, KEY_READ, &hKey) != ERROR_SUCCESS)
+    {
+        return E_FAIL;
+    }
+
+    dwSize = 0;
+    RegQueryValueExW(hKey, L"ActiveConfigurations", NULL, NULL, NULL, &dwSize);
+    if (dwSize != 0)
+    {
+        bAltConfig = TRUE;
+    }
+
+    RegCloseKey(hKey);
+
+    if (bAltConfig)
+    {
+        _swprintf(szBuffer, L"SYSTEM\\CurrentControlSet\\Services\\DHCP\\Configurations\\Alternate_%s", pAdapterName);
+        if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szBuffer, 0, KEY_READ, &hKey) != ERROR_SUCCESS)
+        {
+            return E_FAIL;
+        }
+
+        dwSize = sizeof(AlternateConfiguration);
+        if (RegQueryValueExW(hKey, L"Options", NULL, NULL, (LPBYTE)&This->pCurrentConfig->AltConfig, &dwSize) == ERROR_SUCCESS)
+        {
+            CopyMemory(&This->pCurrentConfig->OldAltConfig,
+                       &This->pCurrentConfig->AltConfig,
+                       sizeof(AlternateConfiguration));
+        }
+
+        RegCloseKey(hKey);
+    }
+
+    return S_OK;
+}
+
+HRESULT
+LoadDNSSettings(
+    TcpipConfNotifyImpl * This,
+    LPOLESTR pAdapterName)
 {
-    LPOLESTR pStr;
     WCHAR szBuffer[200];
     HKEY hKey;
     DWORD dwSize;
 
-
     This->pCurrentConfig->pDNS = (TcpipAdvancedDNSDlgSettings*) CoTaskMemAlloc(sizeof(TcpipAdvancedDNSDlgSettings));
     if (!This->pCurrentConfig->pDNS)
         return E_FAIL;
 
     ZeroMemory(This->pCurrentConfig->pDNS, sizeof(TcpipAdvancedDNSDlgSettings));
 
-    if (FAILED(StringFromCLSID(&This->NetCfgInstanceId, &pStr)))
-        return E_FAIL;
-
-    swprintf(szBuffer, L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces\\%s", pStr);
-    CoTaskMemFree(pStr);
+    _swprintf(szBuffer, L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces\\%s", pAdapterName);
     if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szBuffer, 0, KEY_READ, &hKey) == ERROR_SUCCESS)
     {
         dwSize = sizeof(DWORD);
@@ -2972,12 +3118,12 @@ LoadTcpFilterSettingsFromRegistry(HKEY hKey, LPCWSTR szName, LPDWORD Size)
 
 HRESULT
 LoadFilterSettings(
-    TcpipConfNotifyImpl * This)
+    TcpipConfNotifyImpl * This,
+    LPOLESTR pAdapterName)
 {
     HKEY hKey;
     TcpFilterSettings *pFilter;
     WCHAR szBuffer[200];
-    LPOLESTR pStr;
     DWORD dwVal, dwSize;
 
     pFilter = (TcpFilterSettings*)CoTaskMemAlloc(sizeof(TcpFilterSettings));
@@ -3000,11 +3146,7 @@ LoadFilterSettings(
         pFilter->EnableSecurityFilters = FALSE;
     }
 
-    if (FAILED(StringFromCLSID(&This->NetCfgInstanceId, &pStr)))
-        return E_FAIL;
-
-    swprintf(szBuffer, L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces\\%s", pStr);
-    CoTaskMemFree(pStr);
+    _swprintf(szBuffer, L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces\\%s", pAdapterName);
     if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szBuffer, 0, KEY_READ, &hKey) != ERROR_SUCCESS)
     {
         return S_OK;
@@ -3026,7 +3168,7 @@ Initialize(TcpipConfNotifyImpl * This)
     IP_ADAPTER_INFO * pInfo;
     PIP_PER_ADAPTER_INFO pPerInfo;
     IP_PER_ADAPTER_INFO Info;
-    LPOLESTR pStr;
+    LPOLESTR pAdapterName;
     HRESULT hr;
     BOOL bFound;
     TcpipSettings * pCurSettings;
@@ -3035,7 +3177,7 @@ Initialize(TcpipConfNotifyImpl * This)
     if (This->pCurrentConfig)
         return S_OK;
 
-    hr = StringFromCLSID(&This->NetCfgInstanceId, &pStr);
+    hr = StringFromCLSID(&This->NetCfgInstanceId, &pAdapterName);
     if (FAILED(hr))
         return hr;
 
@@ -3043,20 +3185,20 @@ Initialize(TcpipConfNotifyImpl * This)
     dwSize = 0;
     if (GetAdaptersInfo(NULL, &dwSize) != ERROR_BUFFER_OVERFLOW)
     {
-        CoTaskMemFree(pStr);
+        CoTaskMemFree(pAdapterName);
         return E_FAIL;
     }
 
     pInfo = CoTaskMemAlloc(dwSize);
     if (!pInfo)
     {
-        CoTaskMemFree(pStr);
+        CoTaskMemFree(pAdapterName);
         return E_FAIL;
     }
 
     if (GetAdaptersInfo(pInfo, &dwSize) != ERROR_SUCCESS)
     {
-        CoTaskMemFree(pStr);
+        CoTaskMemFree(pAdapterName);
         CoTaskMemFree(pInfo);
         return E_FAIL;
     }
@@ -3070,17 +3212,17 @@ Initialize(TcpipConfNotifyImpl * This)
         {
             szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0';
         }
-        if (!_wcsicmp(szBuffer, pStr))
+        if (!_wcsicmp(szBuffer, pAdapterName))
         {
             bFound = TRUE;
             break;
         }
         pCurrentAdapter = pCurrentAdapter->Next;
     }
-    CoTaskMemFree(pStr);
 
     if (!bFound)
     {
+        CoTaskMemFree(pAdapterName);
         CoTaskMemFree(pInfo);
         return E_FAIL;
     }
@@ -3088,6 +3230,7 @@ Initialize(TcpipConfNotifyImpl * This)
     pCurSettings = CoTaskMemAlloc(sizeof(TcpipSettings));
     if (!pCurSettings)
     {
+        CoTaskMemFree(pAdapterName);
         CoTaskMemFree(pInfo);
         return E_FAIL;
     }
@@ -3115,30 +3258,26 @@ Initialize(TcpipConfNotifyImpl * This)
             Status = GetPerAdapterInfo(pCurrentAdapter->Index, pPerInfo, &uLength);
             if (Status == NOERROR)
             {
-                if (!pPerInfo->AutoconfigActive)
-                {
-                    CopyIpAddrString(&pPerInfo->DnsServerList, &pCurSettings->Ns, IPADDR, NULL);
-                }
-                pCurSettings->AutoconfigActive = pPerInfo->AutoconfigActive;
+                CopyIpAddrString(&pPerInfo->DnsServerList, &pCurSettings->Ns, IPADDR, NULL);
             }
             CoTaskMemFree(pPerInfo);
         }
     }
     else
     {
-        if (!Info.AutoconfigActive)
-        {
-            CopyIpAddrString(&Info.DnsServerList, &pCurSettings->Ns, IPADDR, NULL);
-        }
-        pCurSettings->AutoconfigActive = Info.AutoconfigActive;
+        CopyIpAddrString(&Info.DnsServerList, &pCurSettings->Ns, IPADDR, NULL);
     }
 
-    if (FAILED(LoadFilterSettings(This)))
+    if (FAILED(LoadTcpIpSettings(This, pAdapterName)))
         return E_FAIL;
 
-    if (FAILED(LoadDNSSettings(This)))
+    if (FAILED(LoadFilterSettings(This, pAdapterName)))
         return E_FAIL;
 
+    if (FAILED(LoadDNSSettings(This, pAdapterName)))
+        return E_FAIL;
+
+    CoTaskMemFree(pAdapterName);
     CoTaskMemFree(pInfo);
 
     return S_OK;
@@ -3414,7 +3553,7 @@ INetCfgComponentControl_fnApplyRegistryChanges(
     INetCfgComponentControl * iface)
 {
     HKEY hKey;
-    LPOLESTR pStr;
+    LPOLESTR pStr, pAdapterName;
     DWORD dwSize;
     WCHAR szBuffer[200];
     TcpipSettings * pCurrentConfig, *pOldConfig;
@@ -3453,15 +3592,14 @@ INetCfgComponentControl_fnApplyRegistryChanges(
         RegCloseKey(hKey);
     }
 
-    if (FAILED(StringFromCLSID(&This->NetCfgInstanceId, &pStr)))
+    if (FAILED(StringFromCLSID(&This->NetCfgInstanceId, &pAdapterName)))
     {
         if (pOldConfig)
             FreeSettings(pOldConfig);
         return E_FAIL;
     }
 
-    swprintf(szBuffer, L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces\\%s", pStr);
-    CoTaskMemFree(pStr);
+    _swprintf(szBuffer, L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces\\%s", pAdapterName);
 
     if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, szBuffer, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) == ERROR_SUCCESS)
     {
@@ -3633,7 +3771,7 @@ INetCfgComponentControl_fnApplyRegistryChanges(
             RegSetValueExW(hKey, L"DefaultGatewayMetric", 0, REG_MULTI_SZ, (LPBYTE)L"\0", sizeof(WCHAR) * 2);
         }
 
-        if (!pCurrentConfig->Ns || pCurrentConfig->AutoconfigActive)
+        if (!pCurrentConfig->Ns)
         {
             RegDeleteValueW(hKey, L"NameServer");
         }
@@ -3648,9 +3786,40 @@ INetCfgComponentControl_fnApplyRegistryChanges(
             }
         }
 
+        if (!RtlEqualMemory(&pCurrentConfig->AltConfig, &pCurrentConfig->OldAltConfig, sizeof(AlternateConfiguration)))
+        {
+            if (pCurrentConfig->AltConfig.IpAddress == 0)
+            {
+                RegDeleteValueW(hKey, L"ActiveConfigurations");
+            }
+            else
+            {
+                HKEY hConfigKey;
+
+                dwSize = (wcslen(L"Alternate_") + wcslen(pAdapterName) + 2) * sizeof(WCHAR);
+                pStr = CoTaskMemAlloc(dwSize);
+                if (pStr)
+                {
+                    ZeroMemory(pStr, dwSize);
+                    _swprintf(pStr, L"Alternate_%s", pAdapterName);
+                    RegSetValueExW(hKey, L"ActiveConfigurations", 0, REG_MULTI_SZ, (LPBYTE)pStr, dwSize);
+                    CoTaskMemFree(pStr);
+                }
+
+                _swprintf(szBuffer, L"SYSTEM\\CurrentControlSet\\Services\\DHCP\\Configurations\\Alternate_%s", pAdapterName);
+                if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, szBuffer, 0, NULL, 0, KEY_WRITE, NULL, &hConfigKey, NULL) == ERROR_SUCCESS)
+                {
+                    RegSetValueExW(hConfigKey, L"Options", 0, REG_BINARY, (LPBYTE)&pCurrentConfig->AltConfig, sizeof(AlternateConfiguration));
+                    RegCloseKey(hConfigKey);
+                }
+            }
+        }
+
         RegCloseKey(hKey);
     }
 
+    CoTaskMemFree(pAdapterName);
+
     if (pOldConfig)
         FreeSettings(pOldConfig);