diff --git a/dll/win32/netcfgx/lang/bg-BG.rc b/dll/win32/netcfgx/lang/bg-BG.rc
index 6fdbf38152f..768da45df10 100644
--- a/dll/win32/netcfgx/lang/bg-BG.rc
+++ b/dll/win32/netcfgx/lang/bg-BG.rc
@@ -62,9 +62,9 @@ BEGIN
     PUSHBUTTON "Обработка...", IDC_GWMOD, 120, 155, 50, 14
     PUSHBUTTON "Премахване", IDC_GWDEL, 180, 155, 50, 14
     GROUPBOX "", -1, 5, 181, 240, 30
-    CHECKBOX "Автоматични мерни единици", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "Автоматични мерни единици", IDC_IFAUTOMETRIC, 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
+    EDITTEXT IDC_IFMETRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
 IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
@@ -127,9 +127,9 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
     LTEXT "Разпределител:", -1, 5, 15, 70, 12
-    CHECKBOX "Автоматични мерни единици", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
-    EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
+    CHECKBOX "Автоматични мерни единици", IDC_GWAUTOMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "&Metric:", IDC_GWMETRICTXT, 5, 45, 45, 12, WS_DISABLED
+    EDITTEXT IDC_GWMETRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
     DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14
     PUSHBUTTON "Отказ", IDCANCEL, 110, 60, 50, 14
 END
@@ -241,4 +241,5 @@ BEGIN
     IDS_DUP_SUFFIX "DNS наставката вече е в списъка."
     IDS_DUP_IPADDR "IP адресът вече е в списъка."
     IDS_DUP_GW "Подразбираният разпределител вече е в списъка."
+    IDS_METRIC_RANGE "Please enter a metric value between 1 and 9999."
 END
diff --git a/dll/win32/netcfgx/lang/cs-CZ.rc b/dll/win32/netcfgx/lang/cs-CZ.rc
index 818380a11c5..d90523afddc 100644
--- a/dll/win32/netcfgx/lang/cs-CZ.rc
+++ b/dll/win32/netcfgx/lang/cs-CZ.rc
@@ -65,9 +65,9 @@ BEGIN
     PUSHBUTTON "Upravit...", IDC_GWMOD, 120, 155, 50, 14
     PUSHBUTTON "Odebrat", IDC_GWDEL, 180, 155, 50, 14
     GROUPBOX "", -1, 5, 181, 240, 30
-    CHECKBOX "Automatická metrika", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "Automatická metrika", IDC_IFAUTOMETRIC, 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
+    EDITTEXT IDC_IFMETRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
 IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
@@ -130,9 +130,9 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
     LTEXT "Brána:", -1, 5, 15, 70, 12
-    CHECKBOX "Automatická metrika", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "&Metrika:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
-    EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
+    CHECKBOX "Automatická metrika", IDC_GWAUTOMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "&Metrika:", IDC_GWMETRICTXT, 5, 45, 45, 12, WS_DISABLED
+    EDITTEXT IDC_GWMETRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
     DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14
     PUSHBUTTON "Storno", IDCANCEL, 110, 60, 50, 14
 END
@@ -244,4 +244,5 @@ BEGIN
     IDS_DUP_SUFFIX "DNS přípona se už nachází v seznamu."
     IDS_DUP_IPADDR "IP adresa se už nachází v seznamu."
     IDS_DUP_GW "Výchozí brána se už nachází v seznamu."
+    IDS_METRIC_RANGE "Please enter a metric value between 1 and 9999."
 END
diff --git a/dll/win32/netcfgx/lang/da-DK.rc b/dll/win32/netcfgx/lang/da-DK.rc
index de6b8de4363..771fa1b3a5b 100644
--- a/dll/win32/netcfgx/lang/da-DK.rc
+++ b/dll/win32/netcfgx/lang/da-DK.rc
@@ -62,9 +62,9 @@ BEGIN
     PUSHBUTTON "Edit...", IDC_GWMOD, 120, 155, 50, 14
     PUSHBUTTON "Remove", IDC_GWDEL, 180, 155, 50, 14
     GROUPBOX "", -1, 5, 181, 240, 30
-    CHECKBOX "Automatic metric", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "Automatic metric", IDC_IFAUTOMETRIC, 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
+    EDITTEXT IDC_IFMETRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
 IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
@@ -127,9 +127,9 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
     LTEXT "Gateway:", -1, 5, 15, 70, 12
-    CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
-    EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
+    CHECKBOX "Automatic metric", IDC_GWAUTOMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "&Metric:", IDC_GWMETRICTXT, 5, 45, 45, 12, WS_DISABLED
+    EDITTEXT IDC_GWMETRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
     DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14
 END
@@ -241,4 +241,5 @@ BEGIN
     IDS_DUP_SUFFIX "The DNS suffix is already on the list."
     IDS_DUP_IPADDR "The IP address is already on the list."
     IDS_DUP_GW "The default gateway is already on the list."
+    IDS_METRIC_RANGE "Please enter a metric value between 1 and 9999."
 END
diff --git a/dll/win32/netcfgx/lang/de-DE.rc b/dll/win32/netcfgx/lang/de-DE.rc
index 5b2748f2fc2..8c817bde4d9 100644
--- a/dll/win32/netcfgx/lang/de-DE.rc
+++ b/dll/win32/netcfgx/lang/de-DE.rc
@@ -62,9 +62,9 @@ BEGIN
     PUSHBUTTON "Bea&rbeiten...", IDC_GWMOD, 120, 155, 50, 14
     PUSHBUTTON "&Entfernen", IDC_GWDEL, 180, 155, 50, 14
     GROUPBOX "", -1, 5, 181, 240, 30
-    CHECKBOX "A&utomatische Metrik", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "A&utomatische Metrik", IDC_IFAUTOMETRIC, 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
+    EDITTEXT IDC_IFMETRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
 IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
@@ -127,9 +127,9 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
     LTEXT "&Gateway:", -1, 5, 15, 70, 12
-    CHECKBOX "A&utomatische Metrik", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "&Metrik:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
-    EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
+    CHECKBOX "A&utomatische Metrik", IDC_GWAUTOMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "&Metrik:", IDC_GWMETRICTXT, 5, 45, 45, 12, WS_DISABLED
+    EDITTEXT IDC_GWMETRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
     DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14
     PUSHBUTTON "Abbrechen", IDCANCEL, 110, 60, 50, 14
 END
@@ -241,4 +241,5 @@ BEGIN
     IDS_DUP_SUFFIX "Das DNS-Suffix ist bereits in der Liste vorhanden."
     IDS_DUP_IPADDR "Die IP-Adresse ist bereits in der Liste vorhanden."
     IDS_DUP_GW "Der Standardgateway ist bereits in der Liste vorhanden."
+    IDS_METRIC_RANGE "Geben Sie eine Metrik zwischen 1 und 9999 ein."
 END
diff --git a/dll/win32/netcfgx/lang/el-GR.rc b/dll/win32/netcfgx/lang/el-GR.rc
index 0eb5a31c824..8f6861498fe 100644
--- a/dll/win32/netcfgx/lang/el-GR.rc
+++ b/dll/win32/netcfgx/lang/el-GR.rc
@@ -62,9 +62,9 @@ BEGIN
     PUSHBUTTON "Edit...", IDC_GWMOD, 120, 155, 50, 14
     PUSHBUTTON "Remove", IDC_GWDEL, 180, 155, 50, 14
     GROUPBOX "", -1, 5, 181, 240, 30
-    CHECKBOX "Automatic metric", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "Automatic metric", IDC_IFAUTOMETRIC, 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
+    EDITTEXT IDC_IFMETRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
 IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
@@ -127,9 +127,9 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
     LTEXT "Gateway:", -1, 5, 15, 70, 12
-    CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
-    EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
+    CHECKBOX "Automatic metric", IDC_GWAUTOMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "&Metric:", IDC_GWMETRICTXT, 5, 45, 45, 12, WS_DISABLED
+    EDITTEXT IDC_GWMETRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
     DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14
 END
@@ -241,4 +241,5 @@ BEGIN
     IDS_DUP_SUFFIX "The DNS suffix is already on the list."
     IDS_DUP_IPADDR "The IP address is already on the list."
     IDS_DUP_GW "The default gateway is already on the list."
+    IDS_METRIC_RANGE "Please enter a metric value between 1 and 9999."
 END
diff --git a/dll/win32/netcfgx/lang/en-US.rc b/dll/win32/netcfgx/lang/en-US.rc
index 2d0adb6b2e3..77f4b31e540 100644
--- a/dll/win32/netcfgx/lang/en-US.rc
+++ b/dll/win32/netcfgx/lang/en-US.rc
@@ -62,9 +62,9 @@ BEGIN
     PUSHBUTTON "Edi&t...", IDC_GWMOD, 120, 155, 50, 14
     PUSHBUTTON "Re&move", IDC_GWDEL, 180, 155, 50, 14
     GROUPBOX "", -1, 5, 181, 240, 30
-    CHECKBOX "A&utomatic metric", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "A&utomatic metric", IDC_IFAUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "I&nterface metric:", -1, 15, 195, 90, 12
-    EDITTEXT IDC_METRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
+    EDITTEXT IDC_IFMETRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
 IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
@@ -127,9 +127,9 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
     LTEXT "Gateway:", -1, 5, 15, 70, 12
-    CHECKBOX "A&utomatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
-    EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
+    CHECKBOX "A&utomatic metric", IDC_GWAUTOMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "&Metric:", IDC_GWMETRICTXT, 5, 45, 45, 12, WS_DISABLED
+    EDITTEXT IDC_GWMETRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
     DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14
 END
@@ -241,4 +241,5 @@ BEGIN
     IDS_DUP_SUFFIX "The DNS suffix is already on the list."
     IDS_DUP_IPADDR "The IP address is already on the list."
     IDS_DUP_GW "The default gateway is already on the list."
+    IDS_METRIC_RANGE "Please enter a metric value between 1 and 9999."
 END
diff --git a/dll/win32/netcfgx/lang/es-ES.rc b/dll/win32/netcfgx/lang/es-ES.rc
index 4105a21fe6a..61edf02b566 100644
--- a/dll/win32/netcfgx/lang/es-ES.rc
+++ b/dll/win32/netcfgx/lang/es-ES.rc
@@ -70,9 +70,9 @@ BEGIN
     PUSHBUTTON "Modificar...", IDC_GWMOD, 120, 155, 50, 14
     PUSHBUTTON "Quitar", IDC_GWDEL, 180, 155, 50, 14
     GROUPBOX "", -1, 5, 181, 240, 30
-    CHECKBOX "Métrica automática", IDC_AUTOMETRIC, 9, 179, 85, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "Métrica automática", IDC_IFAUTOMETRIC, 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
+    EDITTEXT IDC_IFMETRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
 IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
@@ -135,9 +135,9 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 85, 12
     LTEXT "Puerta de enlace:", -1, 5, 15, 70, 12
-    CHECKBOX "Métrica automática", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "&Métrica:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
-    EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
+    CHECKBOX "Métrica automática", IDC_GWAUTOMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "&Métrica:", IDC_GWMETRICTXT, 5, 45, 45, 12, WS_DISABLED
+    EDITTEXT IDC_GWMETRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
     DEFPUSHBUTTON "Aceptar", IDC_OK, 50, 60, 50, 14
     PUSHBUTTON "Cancelar", IDCANCEL, 110, 60, 50, 14
 END
@@ -249,4 +249,5 @@ BEGIN
     IDS_DUP_SUFFIX "El sufijo DNS ya está en la lista."
     IDS_DUP_IPADDR "La dirección IP ya está en la lista."
     IDS_DUP_GW "La puerta de enlace predeterminada ya está en la lista."
+    IDS_METRIC_RANGE "Please enter a metric value between 1 and 9999."
 END
diff --git a/dll/win32/netcfgx/lang/fr-FR.rc b/dll/win32/netcfgx/lang/fr-FR.rc
index 48736205dcf..fafa5d4b6c1 100644
--- a/dll/win32/netcfgx/lang/fr-FR.rc
+++ b/dll/win32/netcfgx/lang/fr-FR.rc
@@ -62,9 +62,9 @@ BEGIN
     PUSHBUTTON "Éditer...", IDC_GWMOD, 120, 155, 50, 14
     PUSHBUTTON "Supprimer", IDC_GWDEL, 180, 155, 50, 14
     GROUPBOX "", -1, 5, 181, 240, 30
-    CHECKBOX "Métrique automatique", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "Métrique automatique", IDC_IFAUTOMETRIC, 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
+    EDITTEXT IDC_IFMETRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
 IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
@@ -127,9 +127,9 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
     LTEXT "Passerelle :", -1, 5, 15, 70, 12
-    CHECKBOX "Métrique automatique", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "Métrique :", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
-    EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
+    CHECKBOX "Métrique automatique", IDC_GWAUTOMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "Métrique :", IDC_GWMETRICTXT, 5, 45, 45, 12, WS_DISABLED
+    EDITTEXT IDC_GWMETRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
     DEFPUSHBUTTON "Ajouter", IDC_OK, 50, 60, 50, 14
     PUSHBUTTON "Annuler", IDCANCEL, 110, 60, 50, 14
 END
@@ -241,4 +241,5 @@ BEGIN
     IDS_DUP_SUFFIX "Le suffixe DNS est déjà dans la liste."
     IDS_DUP_IPADDR "L'adresse IP est déjà dans la liste."
     IDS_DUP_GW "La passerelle par défaut est déjà dans la liste."
+    IDS_METRIC_RANGE "Please enter a metric value between 1 and 9999."
 END
diff --git a/dll/win32/netcfgx/lang/he-IL.rc b/dll/win32/netcfgx/lang/he-IL.rc
index 0b2ff7102c3..c7aaaaad49f 100644
--- a/dll/win32/netcfgx/lang/he-IL.rc
+++ b/dll/win32/netcfgx/lang/he-IL.rc
@@ -62,9 +62,9 @@ BEGIN
     PUSHBUTTON "ערוך...", IDC_GWMOD, 120, 155, 50, 14
     PUSHBUTTON "הסר", IDC_GWDEL, 180, 155, 50, 14
     GROUPBOX "", -1, 5, 181, 240, 30
-    CHECKBOX "Automatic metric", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "Automatic metric", IDC_IFAUTOMETRIC, 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
+    EDITTEXT IDC_IFMETRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
 IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
@@ -127,9 +127,9 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
     LTEXT "שער:", -1, 5, 15, 70, 12
-    CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
-    EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
+    CHECKBOX "Automatic metric", IDC_GWAUTOMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "&Metric:", IDC_GWMETRICTXT, 5, 45, 45, 12, WS_DISABLED
+    EDITTEXT IDC_GWMETRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
     DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14
     PUSHBUTTON "ביטול", IDCANCEL, 110, 60, 50, 14
 END
@@ -241,4 +241,5 @@ BEGIN
     IDS_DUP_SUFFIX "The DNS suffix is already on the list."
     IDS_DUP_IPADDR "The IP address is already on the list."
     IDS_DUP_GW "The default gateway is already on the list."
+    IDS_METRIC_RANGE "Please enter a metric value between 1 and 9999."
 END
diff --git a/dll/win32/netcfgx/lang/hu-HU.rc b/dll/win32/netcfgx/lang/hu-HU.rc
index 220303362c3..97bedb1b6c4 100644
--- a/dll/win32/netcfgx/lang/hu-HU.rc
+++ b/dll/win32/netcfgx/lang/hu-HU.rc
@@ -62,9 +62,9 @@ BEGIN
     PUSHBUTTON "Edit...", IDC_GWMOD, 120, 155, 50, 14
     PUSHBUTTON "Remove", IDC_GWDEL, 180, 155, 50, 14
     GROUPBOX "", -1, 5, 181, 240, 30
-    CHECKBOX "Automatic metric", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "Automatic metric", IDC_IFAUTOMETRIC, 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
+    EDITTEXT IDC_IFMETRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
 IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
@@ -127,9 +127,9 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
     LTEXT "Gateway:", -1, 5, 15, 70, 12
-    CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
-    EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
+    CHECKBOX "Automatic metric", IDC_GWAUTOMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "&Metric:", IDC_GWMETRICTXT, 5, 45, 45, 12, WS_DISABLED
+    EDITTEXT IDC_GWMETRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
     DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14
 END
@@ -241,4 +241,5 @@ BEGIN
     IDS_DUP_SUFFIX "The DNS suffix is already on the list."
     IDS_DUP_IPADDR "The IP address is already on the list."
     IDS_DUP_GW "The default gateway is already on the list."
+    IDS_METRIC_RANGE "Please enter a metric value between 1 and 9999."
 END
diff --git a/dll/win32/netcfgx/lang/id-ID.rc b/dll/win32/netcfgx/lang/id-ID.rc
index 43e7957d3f5..19c45e514ed 100644
--- a/dll/win32/netcfgx/lang/id-ID.rc
+++ b/dll/win32/netcfgx/lang/id-ID.rc
@@ -62,9 +62,9 @@ BEGIN
     PUSHBUTTON "Edit...", IDC_GWMOD, 120, 155, 50, 14
     PUSHBUTTON "Remove", IDC_GWDEL, 180, 155, 50, 14
     GROUPBOX "", -1, 5, 181, 240, 30
-    CHECKBOX "Automatic metric", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "Automatic metric", IDC_IFAUTOMETRIC, 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
+    EDITTEXT IDC_IFMETRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
 IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
@@ -127,9 +127,9 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
     LTEXT "Gateway:", -1, 5, 15, 70, 12
-    CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
-    EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
+    CHECKBOX "Automatic metric", IDC_GWAUTOMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "&Metric:", IDC_GWMETRICTXT, 5, 45, 45, 12, WS_DISABLED
+    EDITTEXT IDC_GWMETRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
     DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14
 END
@@ -241,4 +241,5 @@ BEGIN
     IDS_DUP_SUFFIX "The DNS suffix is already on the list."
     IDS_DUP_IPADDR "The IP address is already on the list."
     IDS_DUP_GW "The default gateway is already on the list."
+    IDS_METRIC_RANGE "Please enter a metric value between 1 and 9999."
 END
diff --git a/dll/win32/netcfgx/lang/it-IT.rc b/dll/win32/netcfgx/lang/it-IT.rc
index 6cf84c0b641..35a43781b95 100644
--- a/dll/win32/netcfgx/lang/it-IT.rc
+++ b/dll/win32/netcfgx/lang/it-IT.rc
@@ -62,9 +62,9 @@ BEGIN
     PUSHBUTTON "Modifica...", IDC_GWMOD, 120, 155, 50, 14
     PUSHBUTTON "Rimuovi", IDC_GWDEL, 180, 155, 50, 14
     GROUPBOX "", -1, 5, 181, 240, 30
-    CHECKBOX "Metriche automatiche", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "Metriche automatiche", IDC_IFAUTOMETRIC, 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
+    EDITTEXT IDC_IFMETRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
 IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
@@ -127,9 +127,9 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
     LTEXT "Gateway:", -1, 5, 15, 70, 12
-    CHECKBOX "Metriche automatiche", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "&Metrica:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
-    EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
+    CHECKBOX "Metriche automatiche", IDC_GWAUTOMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "&Metrica:", IDC_GWMETRICTXT, 5, 45, 45, 12, WS_DISABLED
+    EDITTEXT IDC_GWMETRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
     DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14
     PUSHBUTTON "Annulla", IDCANCEL, 110, 60, 50, 14
 END
@@ -241,4 +241,5 @@ BEGIN
     IDS_DUP_SUFFIX "Il suffisso è già nella lista."
     IDS_DUP_IPADDR "L'indirizzo IP è già nella lista."
     IDS_DUP_GW "Il default gateway è già nella lista."
+    IDS_METRIC_RANGE "Please enter a metric value between 1 and 9999."
 END
diff --git a/dll/win32/netcfgx/lang/ja-JP.rc b/dll/win32/netcfgx/lang/ja-JP.rc
index 5705d4f0f6e..21873777e11 100644
--- a/dll/win32/netcfgx/lang/ja-JP.rc
+++ b/dll/win32/netcfgx/lang/ja-JP.rc
@@ -62,9 +62,9 @@ BEGIN
     PUSHBUTTON "編集...", IDC_GWMOD, 120, 155, 50, 14
     PUSHBUTTON "削除", IDC_GWDEL, 180, 155, 50, 14
     GROUPBOX "", -1, 5, 181, 240, 30
-    CHECKBOX "自動メトリック", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "自動メトリック", IDC_IFAUTOMETRIC, 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
+    EDITTEXT IDC_IFMETRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
 IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
@@ -127,9 +127,9 @@ FONT 9, "MS UI Gothic"
 BEGIN
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
     LTEXT "ゲートウェイ:", -1, 5, 15, 70, 12
-    CHECKBOX "自動メトリック", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "メトリック(&M):", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
-    EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
+    CHECKBOX "自動メトリック", IDC_GWAUTOMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "メトリック(&M):", IDC_GWMETRICTXT, 5, 45, 45, 12, WS_DISABLED
+    EDITTEXT IDC_GWMETRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
     DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14
     PUSHBUTTON "キャンセル", IDCANCEL, 110, 60, 50, 14
 END
@@ -241,4 +241,5 @@ BEGIN
     IDS_DUP_SUFFIX "DNS サフィックスはすでにリストに存在します。"
     IDS_DUP_IPADDR "IP アドレスはすでにリストに存在します。"
     IDS_DUP_GW "デフォルト ゲートウェイはすでにリストに存在します。"
+    IDS_METRIC_RANGE "Please enter a metric value between 1 and 9999."
 END
diff --git a/dll/win32/netcfgx/lang/nl-NL.rc b/dll/win32/netcfgx/lang/nl-NL.rc
index 5f23b3d6250..a6313685134 100644
--- a/dll/win32/netcfgx/lang/nl-NL.rc
+++ b/dll/win32/netcfgx/lang/nl-NL.rc
@@ -62,9 +62,9 @@ BEGIN
     PUSHBUTTON "Edit...", IDC_GWMOD, 120, 155, 50, 14
     PUSHBUTTON "Remove", IDC_GWDEL, 180, 155, 50, 14
     GROUPBOX "", -1, 5, 181, 240, 30
-    CHECKBOX "Automatic metric", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "Automatic metric", IDC_IFAUTOMETRIC, 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
+    EDITTEXT IDC_IFMETRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
 IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
@@ -127,9 +127,9 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
     LTEXT "Gateway:", -1, 5, 15, 70, 12
-    CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
-    EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
+    CHECKBOX "Automatic metric", IDC_GWAUTOMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "&Metric:", IDC_GWMETRICTXT, 5, 45, 45, 12, WS_DISABLED
+    EDITTEXT IDC_GWMETRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
     DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14
 END
@@ -241,4 +241,5 @@ BEGIN
     IDS_DUP_SUFFIX "The DNS suffix is already on the list."
     IDS_DUP_IPADDR "The IP address is already on the list."
     IDS_DUP_GW "The default gateway is already on the list."
+    IDS_METRIC_RANGE "Please enter a metric value between 1 and 9999."
 END
diff --git a/dll/win32/netcfgx/lang/no-NO.rc b/dll/win32/netcfgx/lang/no-NO.rc
index ab52a136758..1c1fa43d4b9 100644
--- a/dll/win32/netcfgx/lang/no-NO.rc
+++ b/dll/win32/netcfgx/lang/no-NO.rc
@@ -62,9 +62,9 @@ BEGIN
     PUSHBUTTON "Rediger...", IDC_GWMOD, 120, 155, 50, 14
     PUSHBUTTON "Fjern", IDC_GWDEL, 180, 155, 50, 14
     GROUPBOX "", -1, 5, 181, 240, 30
-    CHECKBOX "Automatisk metrisk", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "Automatisk metrisk", IDC_IFAUTOMETRIC, 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
+    EDITTEXT IDC_IFMETRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
 IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
@@ -127,9 +127,9 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
     LTEXT "Gateway:", -1, 5, 15, 70, 12
-    CHECKBOX "Automatisk metrisk", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "&Metrisk:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
-    EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
+    CHECKBOX "Automatisk metrisk", IDC_GWAUTOMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "&Metrisk:", IDC_GWMETRICTXT, 5, 45, 45, 12, WS_DISABLED
+    EDITTEXT IDC_GWMETRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
     DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14
     PUSHBUTTON "Avbryt", IDCANCEL, 110, 60, 50, 14
 END
@@ -241,4 +241,5 @@ BEGIN
     IDS_DUP_SUFFIX "DNS suffiks er allerede på listen."
     IDS_DUP_IPADDR "IP adresse er allerede på listen."
     IDS_DUP_GW "Standard gateway er allerede på listen."
+    IDS_METRIC_RANGE "Please enter a metric value between 1 and 9999."
 END
diff --git a/dll/win32/netcfgx/lang/pl-PL.rc b/dll/win32/netcfgx/lang/pl-PL.rc
index 4c865793fbc..985bf9d0800 100644
--- a/dll/win32/netcfgx/lang/pl-PL.rc
+++ b/dll/win32/netcfgx/lang/pl-PL.rc
@@ -64,9 +64,9 @@ BEGIN
     PUSHBUTTON "Edytuj...", IDC_GWMOD, 120, 155, 50, 14
     PUSHBUTTON "Usuń", IDC_GWDEL, 180, 155, 50, 14
     GROUPBOX "", -1, 5, 181, 240, 30
-    CHECKBOX "Metryka automatyczna", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "Metryka automatyczna", IDC_IFAUTOMETRIC, 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
+    EDITTEXT IDC_IFMETRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
 IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
@@ -129,9 +129,9 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
     LTEXT "Brama:", -1, 5, 15, 70, 12
-    CHECKBOX "Metryka automatyczna", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "&Metryka:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
-    EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
+    CHECKBOX "Metryka automatyczna", IDC_GWAUTOMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "&Metryka:", IDC_GWMETRICTXT, 5, 45, 45, 12, WS_DISABLED
+    EDITTEXT IDC_GWMETRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
     DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14
     PUSHBUTTON "Anuluj", IDCANCEL, 110, 60, 50, 14
 END
@@ -243,4 +243,5 @@ BEGIN
     IDS_DUP_SUFFIX "Sufiks DNS znajduje się już na liście."
     IDS_DUP_IPADDR "Adres IP znajduje się już na liście."
     IDS_DUP_GW "Domyślna brama znajduje się już na liście."
+    IDS_METRIC_RANGE "Please enter a metric value between 1 and 9999."
 END
diff --git a/dll/win32/netcfgx/lang/pt-PT.rc b/dll/win32/netcfgx/lang/pt-PT.rc
index c2d5f63de1f..fb6435aae4f 100644
--- a/dll/win32/netcfgx/lang/pt-PT.rc
+++ b/dll/win32/netcfgx/lang/pt-PT.rc
@@ -64,9 +64,9 @@ BEGIN
     PUSHBUTTON "Editar", IDC_GWMOD, 120, 155, 50, 14
     PUSHBUTTON "Remover", IDC_GWDEL, 180, 155, 50, 14
     GROUPBOX "", -1, 5, 181, 240, 30
-    CHECKBOX "Métrica automática", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "Métrica automática", IDC_IFAUTOMETRIC, 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
+    EDITTEXT IDC_IFMETRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
 IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
@@ -129,9 +129,9 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
     LTEXT "Gateway:", -1, 5, 15, 70, 12
-    CHECKBOX "Métrica Automática", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "&Métrica:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
-    EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
+    CHECKBOX "Métrica Automática", IDC_GWAUTOMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "&Métrica:", IDC_GWMETRICTXT, 5, 45, 45, 12, WS_DISABLED
+    EDITTEXT IDC_GWMETRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
     DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14
     PUSHBUTTON "Cancelar", IDCANCEL, 110, 60, 50, 14
 END
@@ -243,4 +243,5 @@ BEGIN
     IDS_DUP_SUFFIX "O sufixo DNS já existe na lista."
     IDS_DUP_IPADDR "O endereço IP já existe na lista."
     IDS_DUP_GW "O gateway padrão já existe na lista."
+    IDS_METRIC_RANGE "Please enter a metric value between 1 and 9999."
 END
diff --git a/dll/win32/netcfgx/lang/ro-RO.rc b/dll/win32/netcfgx/lang/ro-RO.rc
index 4628dd16685..749f0e3497e 100644
--- a/dll/win32/netcfgx/lang/ro-RO.rc
+++ b/dll/win32/netcfgx/lang/ro-RO.rc
@@ -70,9 +70,9 @@ BEGIN
     PUSHBUTTON "Edi&tare…", IDC_GWMOD, 120, 155, 50, 14
     PUSHBUTTON "Eli&minare", IDC_GWDEL, 180, 155, 50, 14
     GROUPBOX "", -1, 5, 181, 240, 30
-    CHECKBOX "Metrică aut&omată", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "Metrică aut&omată", IDC_IFAUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "Metrică i&nterfaţă:", -1, 15, 195, 90, 12
-    EDITTEXT IDC_METRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
+    EDITTEXT IDC_IFMETRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
 IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
@@ -135,9 +135,9 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
     LTEXT "&Gateway:", -1, 5, 15, 70, 12
-    CHECKBOX "Metrică &automată", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "&Metrică:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
-    EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
+    CHECKBOX "Metrică &automată", IDC_GWAUTOMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "&Metrică:", IDC_GWMETRICTXT, 5, 45, 45, 12, WS_DISABLED
+    EDITTEXT IDC_GWMETRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
     DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14
     PUSHBUTTON "Revocare", IDCANCEL, 110, 60, 50, 14
 END
@@ -249,4 +249,5 @@ BEGIN
     IDS_DUP_SUFFIX "Sufixul DNS există deja în listă."
     IDS_DUP_IPADDR "Adresa IP există deja în listă."
     IDS_DUP_GW "Gateway-ul implicit există deja în listă."
+    IDS_METRIC_RANGE "Please enter a metric value between 1 and 9999."
 END
diff --git a/dll/win32/netcfgx/lang/ru-RU.rc b/dll/win32/netcfgx/lang/ru-RU.rc
index f0d3419f848..059aec9602d 100644
--- a/dll/win32/netcfgx/lang/ru-RU.rc
+++ b/dll/win32/netcfgx/lang/ru-RU.rc
@@ -62,9 +62,9 @@ BEGIN
     PUSHBUTTON "И&зменить...", IDC_GWMOD, 120, 155, 50, 14
     PUSHBUTTON "Уда&лить", IDC_GWDEL, 180, 155, 50, 14
     GROUPBOX "", -1, 5, 181, 240, 30
-    CHECKBOX "А&втоматическое назначение метрики", IDC_AUTOMETRIC, 9, 179, 146, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "А&втоматическое назначение метрики", IDC_IFAUTOMETRIC, 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
+    EDITTEXT IDC_IFMETRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
 IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
@@ -127,9 +127,9 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
     LTEXT "Шлюз:", -1, 5, 15, 70, 12
-    CHECKBOX "Автоматическая метрика", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "&Метрика:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
-    EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
+    CHECKBOX "Автоматическая метрика", IDC_GWAUTOMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "&Метрика:", IDC_GWMETRICTXT, 5, 45, 45, 12, WS_DISABLED
+    EDITTEXT IDC_GWMETRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
     DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14
     PUSHBUTTON "Отмена", IDCANCEL, 110, 60, 50, 14
 END
@@ -241,4 +241,5 @@ BEGIN
     IDS_DUP_SUFFIX "DNS-суффикс уже имеется в списке."
     IDS_DUP_IPADDR "IP-адрес уже имеется в списке."
     IDS_DUP_GW "Шлюз по умолчанию уже в списке."
+    IDS_METRIC_RANGE "Please enter a metric value between 1 and 9999."
 END
diff --git a/dll/win32/netcfgx/lang/sk-SK.rc b/dll/win32/netcfgx/lang/sk-SK.rc
index fdb2dd04afa..3a83e185e78 100644
--- a/dll/win32/netcfgx/lang/sk-SK.rc
+++ b/dll/win32/netcfgx/lang/sk-SK.rc
@@ -62,9 +62,9 @@ BEGIN
     PUSHBUTTON "Upraviť...", IDC_GWMOD, 120, 155, 50, 14
     PUSHBUTTON "Odstrániť", IDC_GWDEL, 180, 155, 50, 14
     GROUPBOX "", -1, 5, 181, 240, 30
-    CHECKBOX "Automatická metrika", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "Automatická metrika", IDC_IFAUTOMETRIC, 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
+    EDITTEXT IDC_IFMETRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
 IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
@@ -127,9 +127,9 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
     LTEXT "Brána:", -1, 5, 15, 70, 12
-    CHECKBOX "Automatická metrika", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "&Metrika:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
-    EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
+    CHECKBOX "Automatická metrika", IDC_GWAUTOMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "&Metrika:", IDC_GWMETRICTXT, 5, 45, 45, 12, WS_DISABLED
+    EDITTEXT IDC_GWMETRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
     DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14
     PUSHBUTTON "Zrušiť", IDCANCEL, 110, 60, 50, 14
 END
@@ -241,4 +241,5 @@ BEGIN
     IDS_DUP_SUFFIX "The DNS suffix is already on the list."
     IDS_DUP_IPADDR "The IP address is already on the list."
     IDS_DUP_GW "The default gateway is already on the list."
+    IDS_METRIC_RANGE "Please enter a metric value between 1 and 9999."
 END
diff --git a/dll/win32/netcfgx/lang/sq-AL.rc b/dll/win32/netcfgx/lang/sq-AL.rc
index 63b9b523714..daa2e8a47ed 100644
--- a/dll/win32/netcfgx/lang/sq-AL.rc
+++ b/dll/win32/netcfgx/lang/sq-AL.rc
@@ -64,9 +64,9 @@ BEGIN
     PUSHBUTTON "Modifiko...", IDC_GWMOD, 120, 155, 50, 14
     PUSHBUTTON "Heq", IDC_GWDEL, 180, 155, 50, 14
     GROUPBOX "", -1, 5, 181, 240, 30
-    CHECKBOX "Automatik metrik", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "Automatik metrik", IDC_IFAUTOMETRIC, 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
+    EDITTEXT IDC_IFMETRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
 IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
@@ -129,9 +129,9 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
     LTEXT "Gateway:", -1, 5, 15, 70, 12
-    CHECKBOX "Automatik metrik", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "&Metrik:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
-    EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
+    CHECKBOX "Automatik metrik", IDC_GWAUTOMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "&Metrik:", IDC_GWMETRICTXT, 5, 45, 45, 12, WS_DISABLED
+    EDITTEXT IDC_GWMETRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
     DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14
     PUSHBUTTON "Anulo", IDCANCEL, 110, 60, 50, 14
 END
@@ -243,4 +243,5 @@ BEGIN
     IDS_DUP_SUFFIX "Prapashtesë DNS[së është tashmë në listë."
     IDS_DUP_IPADDR "Adresa IP është tashmë në listë."
     IDS_DUP_GW "Gateway parazgjedhjes është tashmë në listë."
+    IDS_METRIC_RANGE "Please enter a metric value between 1 and 9999."
 END
diff --git a/dll/win32/netcfgx/lang/sv-SE.rc b/dll/win32/netcfgx/lang/sv-SE.rc
index f4584f7a489..493c24ef5eb 100644
--- a/dll/win32/netcfgx/lang/sv-SE.rc
+++ b/dll/win32/netcfgx/lang/sv-SE.rc
@@ -62,9 +62,9 @@ BEGIN
     PUSHBUTTON "Edit...", IDC_GWMOD, 120, 155, 50, 14
     PUSHBUTTON "Remove", IDC_GWDEL, 180, 155, 50, 14
     GROUPBOX "", -1, 5, 181, 240, 30
-    CHECKBOX "Automatic metric", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "Automatic metric", IDC_IFAUTOMETRIC, 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
+    EDITTEXT IDC_IFMETRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
 IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
@@ -127,9 +127,9 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
     LTEXT "Gateway:", -1, 5, 15, 70, 12
-    CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
-    EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
+    CHECKBOX "Automatic metric", IDC_GWAUTOMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "&Metric:", IDC_GWMETRICTXT, 5, 45, 45, 12, WS_DISABLED
+    EDITTEXT IDC_GWMETRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
     DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14
 END
@@ -241,4 +241,5 @@ BEGIN
     IDS_DUP_SUFFIX "The DNS suffix is already on the list."
     IDS_DUP_IPADDR "The IP address is already on the list."
     IDS_DUP_GW "The default gateway is already on the list."
+    IDS_METRIC_RANGE "Please enter a metric value between 1 and 9999."
 END
diff --git a/dll/win32/netcfgx/lang/tr-TR.rc b/dll/win32/netcfgx/lang/tr-TR.rc
index 75907d5524d..405ddc83314 100644
--- a/dll/win32/netcfgx/lang/tr-TR.rc
+++ b/dll/win32/netcfgx/lang/tr-TR.rc
@@ -70,9 +70,9 @@ BEGIN
     PUSHBUTTON "Düzenle...", IDC_GWMOD, 120, 155, 50, 14
     PUSHBUTTON "Kaldır", IDC_GWDEL, 180, 155, 50, 14
     GROUPBOX "", -1, 5, 181, 240, 30
-    CHECKBOX "Ölçülendirmeyi ayarla", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "Ölçülendirmeyi ayarla", IDC_IFAUTOMETRIC, 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
+    EDITTEXT IDC_IFMETRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
 IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
@@ -135,9 +135,9 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
     LTEXT "Geçit:", -1, 5, 15, 70, 12
-    CHECKBOX "Ölçülendirmeyi ayarla", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "&Ölçü:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
-    EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
+    CHECKBOX "Ölçülendirmeyi ayarla", IDC_GWAUTOMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "&Ölçü:", IDC_GWMETRICTXT, 5, 45, 45, 12, WS_DISABLED
+    EDITTEXT IDC_GWMETRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
     DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14
     PUSHBUTTON "İptal", IDCANCEL, 110, 60, 50, 14
 END
@@ -249,4 +249,5 @@ BEGIN
     IDS_DUP_SUFFIX "DNS son eki zaten listede."
     IDS_DUP_IPADDR "IP adresi zaten listede."
     IDS_DUP_GW "Varsayılan geçit zaten listede."
+    IDS_METRIC_RANGE "Please enter a metric value between 1 and 9999."
 END
diff --git a/dll/win32/netcfgx/lang/uk-UA.rc b/dll/win32/netcfgx/lang/uk-UA.rc
index 077f91f8c82..ec0bc1cea87 100644
--- a/dll/win32/netcfgx/lang/uk-UA.rc
+++ b/dll/win32/netcfgx/lang/uk-UA.rc
@@ -62,9 +62,9 @@ BEGIN
     PUSHBUTTON "Редагувати...", IDC_GWMOD, 120, 155, 50, 14
     PUSHBUTTON "Видалити", IDC_GWDEL, 180, 155, 50, 14
     GROUPBOX "", -1, 5, 181, 240, 30
-    CHECKBOX "Автоматична метрика", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "Автоматична метрика", IDC_IFAUTOMETRIC, 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
+    EDITTEXT IDC_IFMETRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
 IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
@@ -127,9 +127,9 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
     LTEXT "Шлюз:", -1, 5, 15, 70, 12
-    CHECKBOX "Автоматична метрика", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "&Метрика:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
-    EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
+    CHECKBOX "Автоматична метрика", IDC_GWAUTOMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "&Метрика:", IDC_GWMETRICTXT, 5, 45, 45, 12, WS_DISABLED
+    EDITTEXT IDC_GWMETRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
     DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14
     PUSHBUTTON "Скасувати", IDCANCEL, 110, 60, 50, 14
 END
@@ -241,4 +241,5 @@ BEGIN
     IDS_DUP_SUFFIX "DNS-суфікс вже присутній в списку."
     IDS_DUP_IPADDR "IP-адреса вже є всписку."
     IDS_DUP_GW "Шлюз по замовчуванню вже є в списку."
+    IDS_METRIC_RANGE "Please enter a metric value between 1 and 9999."
 END
diff --git a/dll/win32/netcfgx/lang/zh-CN.rc b/dll/win32/netcfgx/lang/zh-CN.rc
index 272befe010b..7725c7c8aca 100644
--- a/dll/win32/netcfgx/lang/zh-CN.rc
+++ b/dll/win32/netcfgx/lang/zh-CN.rc
@@ -71,9 +71,9 @@ BEGIN
     PUSHBUTTON "编辑(&T)...", IDC_GWMOD, 120, 155, 50, 14
     PUSHBUTTON "删除(&M)", IDC_GWDEL, 180, 155, 50, 14
     GROUPBOX "", -1, 5, 181, 240, 30
-    CHECKBOX "自动跃点计数(&U)", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "自动跃点计数(&U)", IDC_IFAUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "接口跃点数(&N)：", -1, 15, 195, 90, 12
-    EDITTEXT IDC_METRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
+    EDITTEXT IDC_IFMETRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
 IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
@@ -136,9 +136,9 @@ FONT 9, "宋体"
 BEGIN
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
     LTEXT "网关：", -1, 5, 15, 70, 12
-    CHECKBOX "自动跃点计数", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "权值(&M)：", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
-    EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
+    CHECKBOX "自动跃点计数", IDC_GWAUTOMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "权值(&M)：", IDC_GWMETRICTXT, 5, 45, 45, 12, WS_DISABLED
+    EDITTEXT IDC_GWMETRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
     DEFPUSHBUTTON "确定", IDC_OK, 50, 60, 50, 14
     PUSHBUTTON "取消", IDCANCEL, 110, 60, 50, 14
 END
@@ -250,4 +250,5 @@ BEGIN
     IDS_DUP_SUFFIX "此 DNS 后缀已经位于列表中。"
     IDS_DUP_IPADDR "此 IP 地址已在列表中。"
     IDS_DUP_GW "此默认网关已在列表中。"
+    IDS_METRIC_RANGE "Please enter a metric value between 1 and 9999."
 END
diff --git a/dll/win32/netcfgx/lang/zh-HK.rc b/dll/win32/netcfgx/lang/zh-HK.rc
index 49ffc1847c1..9d9bb7aee8c 100644
--- a/dll/win32/netcfgx/lang/zh-HK.rc
+++ b/dll/win32/netcfgx/lang/zh-HK.rc
@@ -70,9 +70,9 @@ BEGIN
     PUSHBUTTON "編輯...", IDC_GWMOD, 120, 155, 50, 14
     PUSHBUTTON "刪除", IDC_GWDEL, 180, 155, 50, 14
     GROUPBOX "", -1, 5, 181, 240, 30
-    CHECKBOX "自動躍點計數", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "自動躍點計數", IDC_IFAUTOMETRIC, 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
+    EDITTEXT IDC_IFMETRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
 IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
@@ -135,9 +135,9 @@ FONT 9, "新細明體"
 BEGIN
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
     LTEXT "閘道：", -1, 5, 15, 70, 12
-    CHECKBOX "自動躍點計數", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "計數(&M)：", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
-    EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
+    CHECKBOX "自動躍點計數", IDC_GWAUTOMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "計數(&M)：", IDC_GWMETRICTXT, 5, 45, 45, 12, WS_DISABLED
+    EDITTEXT IDC_GWMETRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
     DEFPUSHBUTTON "確定", IDC_OK, 50, 60, 50, 14
     PUSHBUTTON "取消", IDCANCEL, 110, 60, 50, 14
 END
@@ -249,4 +249,5 @@ BEGIN
     IDS_DUP_SUFFIX "DNS 尾碼已經在列表中。"
     IDS_DUP_IPADDR "IP 位址已經在列表中。"
     IDS_DUP_GW "預設閘道已在列表中。"
+    IDS_METRIC_RANGE "Please enter a metric value between 1 and 9999."
 END
diff --git a/dll/win32/netcfgx/lang/zh-TW.rc b/dll/win32/netcfgx/lang/zh-TW.rc
index a824ae1c8f5..57476a03744 100644
--- a/dll/win32/netcfgx/lang/zh-TW.rc
+++ b/dll/win32/netcfgx/lang/zh-TW.rc
@@ -70,9 +70,9 @@ BEGIN
     PUSHBUTTON "編輯...", IDC_GWMOD, 120, 155, 50, 14
     PUSHBUTTON "刪除", IDC_GWDEL, 180, 155, 50, 14
     GROUPBOX "", -1, 5, 181, 240, 30
-    CHECKBOX "自動躍點計數", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "自動躍點計數", IDC_IFAUTOMETRIC, 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
+    EDITTEXT IDC_IFMETRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
 IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 220
@@ -135,9 +135,9 @@ FONT 9, "新細明體"
 BEGIN
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
     LTEXT "閘道：", -1, 5, 15, 70, 12
-    CHECKBOX "自動躍點計數", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "計數(&M)：", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
-    EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
+    CHECKBOX "自動躍點計數", IDC_GWAUTOMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "計數(&M)：", IDC_GWMETRICTXT, 5, 45, 45, 12, WS_DISABLED
+    EDITTEXT IDC_GWMETRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
     DEFPUSHBUTTON "確定", IDC_OK, 50, 60, 50, 14
     PUSHBUTTON "取消", IDCANCEL, 110, 60, 50, 14
 END
@@ -249,4 +249,5 @@ BEGIN
     IDS_DUP_SUFFIX "DNS 尾碼已經在列表中。"
     IDS_DUP_IPADDR "IP 位址已經在列表中。"
     IDS_DUP_GW "預設閘道已在列表中。"
+    IDS_METRIC_RANGE "Please enter a metric value between 1 and 9999."
 END
diff --git a/dll/win32/netcfgx/resource.h b/dll/win32/netcfgx/resource.h
index be645900bd0..e4d9a3e3c7c 100644
--- a/dll/win32/netcfgx/resource.h
+++ b/dll/win32/netcfgx/resource.h
@@ -39,11 +39,12 @@
 #define IDC_GWADD      2005
 #define IDC_GWMOD      2006
 #define IDC_GWDEL      2007
-#define IDC_AUTOMETRIC 2008
-#define IDC_METRIC     2009
-#define IDC_METRICTXT  2010
-#define IDC_USEMETRIC  2011
-#define IDC_OK         2012
+#define IDC_IFAUTOMETRIC  2008
+#define IDC_IFMETRIC      2009
+#define IDC_GWAUTOMETRIC  2010
+#define IDC_GWMETRICTXT   2011
+#define IDC_GWMETRIC      2012
+#define IDC_OK            2013
 
 #define IDC_DNSADDRLIST   3000
 #define IDC_DNSADDRUP     3001
@@ -123,3 +124,4 @@
 #define IDS_DUP_SUFFIX     8025
 #define IDS_DUP_IPADDR     8026
 #define IDS_DUP_GW         8027
+#define IDS_METRIC_RANGE   8028
diff --git a/dll/win32/netcfgx/tcpipconf_notify.c b/dll/win32/netcfgx/tcpipconf_notify.c
index d662f7fdf33..b75b9a5f797 100644
--- a/dll/win32/netcfgx/tcpipconf_notify.c
+++ b/dll/win32/netcfgx/tcpipconf_notify.c
@@ -59,6 +59,7 @@ typedef struct
 
     UINT DhcpEnabled;
     UINT AutoconfigActive;
+    DWORD Metric;
     DWORD Index;
     TcpFilterSettings *pFilter;
     TcpipAdvancedDNSDlgSettings *pDNS;
@@ -707,7 +708,17 @@ InitializeTcpipAdvancedIpDlg(
     EnableWindow(GetDlgItem(hwndDlg, IDC_GWMOD), FALSE);
     EnableWindow(GetDlgItem(hwndDlg, IDC_GWDEL), FALSE);
 
-    SendDlgItemMessageW(hwndDlg, IDC_METRIC, EM_LIMITTEXT, 4, 0);
+    SendDlgItemMessageW(hwndDlg, IDC_IFMETRIC, EM_LIMITTEXT, 4, 0);
+    if (This->pCurrentConfig->Metric)
+    {
+        EnableWindow(GetDlgItem(hwndDlg, IDC_IFMETRIC), TRUE);
+        SetDlgItemInt(hwndDlg, IDC_IFMETRIC, This->pCurrentConfig->Metric, FALSE);
+    }
+    else
+    {
+        CheckDlgButton(hwndDlg, IDC_IFAUTOMETRIC, BST_CHECKED);
+        EnableWindow(GetDlgItem(hwndDlg, IDC_IFMETRIC), FALSE);
+    }
 }
 
 INT_PTR
@@ -744,7 +755,7 @@ TcpipAdvGwDlg(
                     SendDlgItemMessageW(hwndDlg, IDC_OK, WM_SETTEXT, 0, (LPARAM)szBuffer);
                 }
                 EnableWindow(GetDlgItem(hwndDlg, IDC_OK), FALSE);
-                CheckDlgButton(hwndDlg, IDC_USEMETRIC, BST_CHECKED);
+                CheckDlgButton(hwndDlg, IDC_GWAUTOMETRIC, BST_CHECKED);
             }
             else
             {
@@ -758,31 +769,31 @@ TcpipAdvGwDlg(
 
                 if (pGwSettings->Metric)
                 {
-                    SetDlgItemInt(hwndDlg, IDC_METRIC, pGwSettings->Metric, FALSE);
-                    EnableWindow(GetDlgItem(hwndDlg, IDC_METRIC), TRUE);
-                    EnableWindow(GetDlgItem(hwndDlg, IDC_METRICTXT), TRUE);
+                    SetDlgItemInt(hwndDlg, IDC_GWMETRIC, pGwSettings->Metric, FALSE);
+                    EnableWindow(GetDlgItem(hwndDlg, IDC_GWMETRIC), TRUE);
+                    EnableWindow(GetDlgItem(hwndDlg, IDC_GWMETRICTXT), TRUE);
                 }
                 else
                 {
-                    CheckDlgButton(hwndDlg, IDC_USEMETRIC, BST_CHECKED);
-                    EnableWindow(GetDlgItem(hwndDlg, IDC_METRIC), FALSE);
-                    EnableWindow(GetDlgItem(hwndDlg, IDC_METRICTXT), FALSE);
+                    CheckDlgButton(hwndDlg, IDC_GWAUTOMETRIC, BST_CHECKED);
+                    EnableWindow(GetDlgItem(hwndDlg, IDC_GWMETRIC), FALSE);
+                    EnableWindow(GetDlgItem(hwndDlg, IDC_GWMETRICTXT), FALSE);
                 }
             }
             return TRUE;
         case WM_COMMAND:
-            if (LOWORD(wParam) == IDC_USEMETRIC)
+            if (LOWORD(wParam) == IDC_GWAUTOMETRIC)
             {
-                if (IsDlgButtonChecked(hwndDlg, IDC_USEMETRIC) == BST_CHECKED)
+                if (IsDlgButtonChecked(hwndDlg, IDC_GWAUTOMETRIC) == BST_CHECKED)
                 {
-                    EnableWindow(GetDlgItem(hwndDlg, IDC_METRIC), FALSE);
-                    EnableWindow(GetDlgItem(hwndDlg, IDC_METRICTXT), FALSE);
-                    SendDlgItemMessageW(hwndDlg, IDC_METRIC, WM_SETTEXT, 0, (LPARAM)L"");
+                    EnableWindow(GetDlgItem(hwndDlg, IDC_GWMETRIC), FALSE);
+                    EnableWindow(GetDlgItem(hwndDlg, IDC_GWMETRICTXT), FALSE);
+                    SendDlgItemMessageW(hwndDlg, IDC_GWMETRIC, WM_SETTEXT, 0, (LPARAM)L"");
                 }
                 else
                 {
-                    EnableWindow(GetDlgItem(hwndDlg, IDC_METRIC), TRUE);
-                    EnableWindow(GetDlgItem(hwndDlg, IDC_METRICTXT), TRUE);
+                    EnableWindow(GetDlgItem(hwndDlg, IDC_GWMETRIC), TRUE);
+                    EnableWindow(GetDlgItem(hwndDlg, IDC_GWMETRICTXT), TRUE);
                 }
                 break;
             }
@@ -802,8 +813,8 @@ TcpipAdvGwDlg(
                     find.flags = LVFI_STRING;
                     find.psz = pGwSettings->szIP;
 
-                    if (IsDlgButtonChecked(hwndDlg, IDC_USEMETRIC) == BST_UNCHECKED)
-                        pGwSettings->Metric = GetDlgItemInt(hwndDlg, IDC_METRIC, NULL, FALSE);
+                    if (IsDlgButtonChecked(hwndDlg, IDC_GWAUTOMETRIC) == BST_UNCHECKED)
+                        pGwSettings->Metric = GetDlgItemInt(hwndDlg, IDC_GWMETRIC, NULL, FALSE);
                     else
                         pGwSettings->Metric = 0;
 
@@ -1318,6 +1329,17 @@ TcpipAdvancedIpDlg(
                     SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, TRUE);
                     return TRUE;
                 }
+
+                if (IsDlgButtonChecked(hwndDlg, IDC_IFAUTOMETRIC) != BST_CHECKED)
+                {
+                    UINT val = GetDlgItemInt(hwndDlg, IDC_IFMETRIC, NULL, FALSE);
+                    if ((val < 1) || (val > 9999))
+                    {
+                        DisplayError(IDS_METRIC_RANGE, IDS_TCPIP, MB_ICONWARNING);
+                        SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, TRUE);
+                        return TRUE;
+                    }
+                }
             }
             else if (lppsn->hdr.code == PSN_APPLY)
             {
@@ -1328,17 +1350,23 @@ TcpipAdvancedIpDlg(
                 This->pCurrentConfig->Ip = NULL;
                 StoreIPSettings(GetDlgItem(hwndDlg, IDC_IPLIST), This, TRUE);
                 StoreIPSettings(GetDlgItem(hwndDlg, IDC_GWLIST), This, FALSE);
+
+                if (IsDlgButtonChecked(hwndDlg, IDC_IFAUTOMETRIC) == BST_CHECKED)
+                    This->pCurrentConfig->Metric = 0;
+                else
+                    This->pCurrentConfig->Metric = GetDlgItemInt(hwndDlg, IDC_IFMETRIC, NULL, FALSE);
+
                 SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, PSNRET_NOERROR);
                 return TRUE;
             }
             break;
         case WM_COMMAND:
-            if (LOWORD(wParam) == IDC_AUTOMETRIC)
+            if (LOWORD(wParam) == IDC_IFAUTOMETRIC)
             {
-                if (IsDlgButtonChecked(hwndDlg, IDC_AUTOMETRIC) == BST_CHECKED)
-                    EnableWindow(GetDlgItem(hwndDlg, IDC_METRIC), FALSE);
+                if (IsDlgButtonChecked(hwndDlg, IDC_IFAUTOMETRIC) == BST_CHECKED)
+                    EnableWindow(GetDlgItem(hwndDlg, IDC_IFMETRIC), FALSE);
                 else
-                    EnableWindow(GetDlgItem(hwndDlg, IDC_METRIC), TRUE);
+                    EnableWindow(GetDlgItem(hwndDlg, IDC_IFMETRIC), TRUE);
             }
             else if (LOWORD(wParam) == IDC_IPADD)
             {
@@ -1475,6 +1503,7 @@ TcpipAdvancedIpDlg(
                 DeleteItemFromList(GetDlgItem(hwndDlg, IDC_GWLIST));
                 break;
             }
+            break;
     }
     return FALSE;
 }
@@ -2838,6 +2867,10 @@ LoadDNSSettings(
         dwSize = sizeof(This->pCurrentConfig->pDNS->szDomain);
         RegQueryValueExW(hKey, L"Domain", NULL, NULL, (LPBYTE)This->pCurrentConfig->pDNS->szDomain, &dwSize);
 
+        dwSize = sizeof(DWORD);
+        if (RegQueryValueExW(hKey, L"InterfaceMetric", NULL, NULL, (LPBYTE)&This->pCurrentConfig->Metric, &dwSize) != ERROR_SUCCESS)
+            This->pCurrentConfig->Metric = 0;
+
         RegCloseKey(hKey);
     }
 
@@ -3335,6 +3368,11 @@ INetCfgComponentControl_fnApplyRegistryChanges(
 
     if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, szBuffer, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) == ERROR_SUCCESS)
     {
+        if (pCurrentConfig->Metric)
+            RegSetValueExW(hKey, L"InterfaceMetric", 0, REG_DWORD, (LPBYTE)&This->pCurrentConfig->Metric, sizeof(DWORD));
+        else
+            RegDeleteValueW(hKey, L"InterfaceMetric");
+
         if (pCurrentConfig->pDNS)
         {
             RegSetValueExW(hKey, L"RegisterAdapterName", 0, REG_DWORD, (LPBYTE)&This->pCurrentConfig->pDNS->RegisterAdapterName, sizeof(DWORD));