[IPCONFIG] Improve adapter type and name output

base/applications/network/ipconfig/ipconfig.c

@@ -222,11 +222,12 @@ VOID DoFormatMessage(LONG ErrorCode)
 }
 
 VOID
-PrintAdapterFriendlyName(LPSTR lpClass)
+GetAdapterFriendlyName(
+    _In_ LPSTR lpClass,
+    _In_ DWORD cchFriendlyNameLength,
+    _Out_ PWSTR pszFriendlyName)
 {
     HKEY hKey = NULL;
-    LPSTR ConType = NULL;
-    LPSTR ConTypeTmp = NULL;
     CHAR Path[256];
     LPSTR PrePath  = "SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}\\";
     LPSTR PostPath = "\\Connection";
@@ -247,47 +248,13 @@ PrintAdapterFriendlyName(LPSTR lpClass)
                       KEY_READ,
                       &hKey) == ERROR_SUCCESS)
     {
-        if (RegQueryValueExA(hKey,
+        dwDataSize = cchFriendlyNameLength * sizeof(WCHAR);
-                             "Name",
+        RegQueryValueExW(hKey,
-                             NULL,
+                         L"Name",
-                             &dwType,
+                         NULL,
-                             NULL,
+                         &dwType,
-                             &dwDataSize) == ERROR_SUCCESS)
+                         (PBYTE)pszFriendlyName,
-        {
+                         &dwDataSize);
-            ConTypeTmp = (LPSTR)HeapAlloc(ProcessHeap,
-                                          0,
-                                          dwDataSize);
-            if (ConTypeTmp == NULL)
-                return;
-
-            ConType = (LPSTR)HeapAlloc(ProcessHeap,
-                                       0,
-                                       dwDataSize);
-            if (ConType == NULL)
-            {
-                HeapFree(ProcessHeap, 0, ConTypeTmp);
-                return;
-            }
-
-            if (RegQueryValueExA(hKey,
-                                 "Name",
-                                 NULL,
-                                 &dwType,
-                                 (PBYTE)ConTypeTmp,
-                                 &dwDataSize) != ERROR_SUCCESS)
-            {
-                HeapFree(ProcessHeap, 0, ConType);
-                ConType = NULL;
-            }
-
-            if (ConType)
-                CharToOemA(ConTypeTmp, ConType);
-
-            printf("%s\n", ConType);
-
-            HeapFree(ProcessHeap, 0, ConTypeTmp);
-            HeapFree(ProcessHeap, 0, ConType);
-        }
     }
 
     if (hKey != NULL)
@@ -477,50 +444,48 @@ VOID
 PrintAdapterTypeAndName(
     PIP_ADAPTER_INFO pAdapterInfo)
 {
-    printf("\n");
+    WCHAR szFriendlyName[MAX_PATH];
+
+    GetAdapterFriendlyName(pAdapterInfo->AdapterName, MAX_PATH, szFriendlyName);
 
     switch (pAdapterInfo->Type)
     {
         case MIB_IF_TYPE_OTHER:
-            ConResPrintf(StdOut, IDS_OTHER);
+            ConResPrintf(StdOut, IDS_OTHER, szFriendlyName);
             break;
 
         case MIB_IF_TYPE_ETHERNET:
-            ConResPrintf(StdOut, IDS_ETH);
+            ConResPrintf(StdOut, IDS_ETH, szFriendlyName);
             break;
 
         case MIB_IF_TYPE_TOKENRING:
-            ConResPrintf(StdOut, IDS_TOKEN);
+            ConResPrintf(StdOut, IDS_TOKEN, szFriendlyName);
             break;
 
         case MIB_IF_TYPE_FDDI:
-            ConResPrintf(StdOut, IDS_FDDI);
+            ConResPrintf(StdOut, IDS_FDDI, szFriendlyName);
             break;
 
         case MIB_IF_TYPE_PPP:
-            ConResPrintf(StdOut, IDS_PPP);
+            ConResPrintf(StdOut, IDS_PPP, szFriendlyName);
             break;
 
         case MIB_IF_TYPE_LOOPBACK:
-            ConResPrintf(StdOut, IDS_LOOP);
+            ConResPrintf(StdOut, IDS_LOOP, szFriendlyName);
             break;
 
         case MIB_IF_TYPE_SLIP:
-            ConResPrintf(StdOut, IDS_SLIP);
+            ConResPrintf(StdOut, IDS_SLIP, szFriendlyName);
             break;
 
         case IF_TYPE_IEEE80211:
-            ConResPrintf(StdOut, IDS_WIFI);
+            ConResPrintf(StdOut, IDS_WIFI, szFriendlyName);
             break;
 
         default:
-            ConResPrintf(StdOut, IDS_UNKNOWNADAPTER);
+            ConResPrintf(StdOut, IDS_UNKNOWNADAPTER, szFriendlyName);
             break;
     }
-
-    printf(": ");
-    PrintAdapterFriendlyName(pAdapterInfo->AdapterName);
-    printf("\n");
 }
 
 VOID ShowInfo(BOOL bAll)

base/applications/network/ipconfig/lang/bg-BG.rc

@@ -55,15 +55,15 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_UNKNOWNADAPTER "Unknown Adapter"
+    IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n"
-    IDS_OTHER "Друг вид карта"
+    IDS_OTHER "\nДруг вид карта: %ls\n"
-    IDS_ETH "Карта Ethernet"
+    IDS_ETH "\nКарта Ethernet: %ls\n"
-    IDS_TOKEN "Карта Token Ring"
+    IDS_TOKEN "\nКарта Token Ring: %ls\n"
-    IDS_FDDI "Карта FDDI"
+    IDS_FDDI "\nКарта FDDI: %ls\n"
-    IDS_PPP "Карта PPP"
+    IDS_PPP "\nКарта PPP: %ls\n"
-    IDS_LOOP "Карта Loopback"
+    IDS_LOOP "\nКарта Loopback: %ls\n"
-    IDS_SLIP "Карта SLIP"
+    IDS_SLIP "\nКарта SLIP: %ls\n"
-    IDS_WIFI "Wireless Network Adapter"
+    IDS_WIFI "\nWireless Network Adapter: %ls\n"
 END
 
 STRINGTABLE

base/applications/network/ipconfig/lang/de-DE.rc

@@ -57,15 +57,15 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_UNKNOWNADAPTER "Unbekannter Adapter"
+    IDS_UNKNOWNADAPTER "\nUnbekannter Adapter: %ls\n"
-    IDS_OTHER "Anderer Adapter"
+    IDS_OTHER "\nAnderer Adapter: %ls\n"
-    IDS_ETH "Ethernet-Adapter"
+    IDS_ETH "\nEthernet-Adapter: %ls\n"
-    IDS_TOKEN "Token-Ring-Adapter"
+    IDS_TOKEN "\nToken-Ring-Adapter: %ls\n"
-    IDS_FDDI "FDDI-Adapter"
+    IDS_FDDI "\nFDDI-Adapter: %ls\n"
-    IDS_PPP "PPP-Adapter"
+    IDS_PPP "\nPPP-Adapter: %ls\n"
-    IDS_LOOP "Loopback-Adapter"
+    IDS_LOOP "\nLoopback-Adapter: %ls\n"
-    IDS_SLIP "SLIP-Adapter"
+    IDS_SLIP "\nSLIP-Adapter: %ls\n"
-    IDS_WIFI "Drahtlos-LAN-Adapter"
+    IDS_WIFI "\nDrahtlos-LAN-Adapter: %ls\n"
 END
 
 STRINGTABLE

base/applications/network/ipconfig/lang/el-GR.rc

@@ -55,15 +55,15 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_UNKNOWNADAPTER "Unknown Adapter"
+    IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n"
-    IDS_OTHER "Άλλος τύπος προσαρμογέα"
+    IDS_OTHER "\nΆλλος τύπος προσαρμογέα: %ls\n"
-    IDS_ETH "Προσαρμογέας Ethernet"
+    IDS_ETH "\nΠροσαρμογέας Ethernet: %ls\n"
-    IDS_TOKEN "Προσαρμογέας Token Ring"
+    IDS_TOKEN "\nΠροσαρμογέας Token Ring: %ls\n"
-    IDS_FDDI "Προσαρμογέας FDDI"
+    IDS_FDDI "\nΠροσαρμογέας FDDI: %ls\n"
-    IDS_PPP "Προσαρμογέας PPP"
+    IDS_PPP "\nΠροσαρμογέας PPP: %ls\n"
-    IDS_LOOP "Προσαρμογέας Loopback"
+    IDS_LOOP "\nΠροσαρμογέας Loopback: %ls\n"
-    IDS_SLIP "Προσαρμογέας SLIP"
+    IDS_SLIP "\nΠροσαρμογέας SLIP: %ls\n"
-    IDS_WIFI "Wireless Network Adapter"
+    IDS_WIFI "\nWireless Network Adapter: %ls\n"
 END
 
 STRINGTABLE

base/applications/network/ipconfig/lang/en-US.rc

@@ -55,15 +55,15 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_UNKNOWNADAPTER "Unknown Adapter"
+    IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n"
-    IDS_OTHER "Other Type Of Adapter"
+    IDS_OTHER "\nOther Type Of Adapter: %ls\n"
-    IDS_ETH "Ethernet Adapter"
+    IDS_ETH "\nEthernet Adapter: %ls\n"
-    IDS_TOKEN "Token Ring Adapter"
+    IDS_TOKEN "\nToken Ring Adapter: %ls\n"
-    IDS_FDDI "FDDI Adapter"
+    IDS_FDDI "\nFDDI Adapter: %ls\n"
-    IDS_PPP "PPP Adapter"
+    IDS_PPP "\nPPP Adapter: %ls\n"
-    IDS_LOOP "Loopback Adapter"
+    IDS_LOOP "\nLoopback Adapter: %ls\n"
-    IDS_SLIP "SLIP Adapter"
+    IDS_SLIP "\nSLIP Adapter: %ls\n"
-    IDS_WIFI "Wireless Network Adapter"
+    IDS_WIFI "\nWireless Network Adapter: %ls\n"
 END
 
 STRINGTABLE

base/applications/network/ipconfig/lang/es-ES.rc

@@ -56,15 +56,15 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_UNKNOWNADAPTER "Unknown Adapter"
+    IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n"
-    IDS_OTHER "Otro tipo de adaptador"
+    IDS_OTHER "\nOtro tipo de adaptador: %ls\n"
-    IDS_ETH   "Adaptador Ethernet"
+    IDS_ETH   "\nAdaptador Ethernet: %ls\n"
-    IDS_TOKEN "Adaptador de red en anillo"
+    IDS_TOKEN "\nAdaptador de red en anillo: %ls\n"
-    IDS_FDDI  "Adaptador FDDI"
+    IDS_FDDI  "\nAdaptador FDDI: %ls\n"
-    IDS_PPP   "Adaptador PPP"
+    IDS_PPP   "\nAdaptador PPP: %ls\n"
-    IDS_LOOP  "Adaptador de bucle invertido"
+    IDS_LOOP  "\nAdaptador de bucle invertido: %ls\n"
-    IDS_SLIP  "Adaptador SLIP"
+    IDS_SLIP  "\nAdaptador SLIP: %ls\n"
-    IDS_WIFI  "Wireless Network Adapter"
+    IDS_WIFI  "\nWireless Network Adapter: %ls\n"
 END
 
 STRINGTABLE

base/applications/network/ipconfig/lang/fr-FR.rc

@@ -57,15 +57,15 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_UNKNOWNADAPTER "Unknown Adapter"
+    IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n"
-    IDS_OTHER "Autre Type d'adapteur"
+    IDS_OTHER "\nAutre Type d'adapteur: %ls\n"
-    IDS_ETH "Adapteur Ethernet"
+    IDS_ETH "\nAdapteur Ethernet: %ls\n"
-    IDS_TOKEN "Adapteur Token Ring"
+    IDS_TOKEN "\nAdapteur Token Ring: %ls\n"
-    IDS_FDDI "Adapteur FDDI"
+    IDS_FDDI "\nAdapteur FDDI: %ls\n"
-    IDS_PPP "Adapteur PPP"
+    IDS_PPP "\nAdapteur PPP: %ls\n"
-    IDS_LOOP "Adapteur Loopback"
+    IDS_LOOP "\nAdapteur Loopback: %ls\n"
-    IDS_SLIP "Adapteur SLIP"
+    IDS_SLIP "\nAdapteur SLIP: %ls\n"
-    IDS_WIFI "Wireless Network Adapter"
+    IDS_WIFI "\nWireless Network Adapter: %ls\n"
 END
 
 STRINGTABLE

base/applications/network/ipconfig/lang/id-ID.rc

@@ -55,15 +55,15 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_UNKNOWNADAPTER "Unknown Adapter"
+    IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n"
-    IDS_OTHER "Adapter Tipe Lainnya"
+    IDS_OTHER "\nAdapter Tipe Lainnya: %ls\n"
-    IDS_ETH "Adapter Ethernet"
+    IDS_ETH "\nAdapter Ethernet: %ls\n"
-    IDS_TOKEN "Adapter Token Ring"
+    IDS_TOKEN "\nAdapter Token Ring: %ls\n"
-    IDS_FDDI "Adapter FDDI"
+    IDS_FDDI "\nAdapter FDDI: %ls\n"
-    IDS_PPP "Adapter PPP"
+    IDS_PPP "\nAdapter PPP: %ls\n"
-    IDS_LOOP "Adapter Loopback"
+    IDS_LOOP "\nAdapter Loopback: %ls\n"
-    IDS_SLIP "Adapter SLIP"
+    IDS_SLIP "\nAdapter SLIP: %ls\n"
-    IDS_WIFI "Wireless Network Adapter"
+    IDS_WIFI "\nWireless Network Adapter: %ls\n"
 END
 
 STRINGTABLE

base/applications/network/ipconfig/lang/it-IT.rc

@@ -55,15 +55,15 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_UNKNOWNADAPTER "Unknown Adapter"
+    IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n"
-    IDS_OTHER "Altro tipo di adattatore"
+    IDS_OTHER "\nAltro tipo di adattatore: %ls\n"
-    IDS_ETH "Adattatore Ethernet"
+    IDS_ETH "\nAdattatore Ethernet: %ls\n"
-    IDS_TOKEN "Adattatore Token Ring"
+    IDS_TOKEN "\nAdattatore Token Ring: %ls\n"
-    IDS_FDDI "Adattatore FDDI"
+    IDS_FDDI "\nAdattatore FDDI: %ls\n"
-    IDS_PPP "Adattatore PPP"
+    IDS_PPP "\nAdattatore PPP: %ls\n"
-    IDS_LOOP "Adattatore Loopback"
+    IDS_LOOP "\nAdattatore Loopback: %ls\n"
-    IDS_SLIP "Adattatore SLIP"
+    IDS_SLIP "\nAdattatore SLIP: %ls\n"
-    IDS_WIFI "Wireless Network Adapter"
+    IDS_WIFI "\nWireless Network Adapter: %ls\n"
 END
 
 STRINGTABLE

base/applications/network/ipconfig/lang/no-NO.rc

@@ -55,15 +55,15 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_UNKNOWNADAPTER "Unknown Adapter"
+    IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n"
-    IDS_OTHER "Other Type Of Adapter"
+    IDS_OTHER "\nOther Type Of Adapter: %ls\n"
-    IDS_ETH "Ethernet Adapter"
+    IDS_ETH "\nEthernet Adapter: %ls\n"
-    IDS_TOKEN "Token Ring Adapter"
+    IDS_TOKEN "\nToken Ring Adapter: %ls\n"
-    IDS_FDDI "FDDI Adapter"
+    IDS_FDDI "\nFDDI Adapter: %ls\n"
-    IDS_PPP "PPP Adapter"
+    IDS_PPP "\nPPP Adapter: %ls\n"
-    IDS_LOOP "Loopback Adapter"
+    IDS_LOOP "\nLoopback Adapter: %ls\n"
-    IDS_SLIP "SLIP Adapter"
+    IDS_SLIP "\nSLIP Adapter: %ls\n"
-    IDS_WIFI "Wireless Network Adapter"
+    IDS_WIFI "\nWireless Network Adapter: %ls\n"
 END
 
 STRINGTABLE

base/applications/network/ipconfig/lang/pl-PL.rc

@@ -57,15 +57,15 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_UNKNOWNADAPTER "Unknown Adapter"
+    IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n"
-    IDS_OTHER "inny rodzaj karty"
+    IDS_OTHER "\ninny rodzaj karty: %ls\n"
-    IDS_ETH "karta Ethernet"
+    IDS_ETH "\nkarta Ethernet: %ls\n"
-    IDS_TOKEN "karta Token Ring"
+    IDS_TOKEN "\nkarta Token Ring: %ls\n"
-    IDS_FDDI "karta FDDI"
+    IDS_FDDI "\nkarta FDDI: %ls\n"
-    IDS_PPP "karta PPP"
+    IDS_PPP "\nkarta PPP: %ls\n"
-    IDS_LOOP "karta Loopback"
+    IDS_LOOP "\nkarta Loopback: %ls\n"
-    IDS_SLIP "karta SLIP"
+    IDS_SLIP "\nkarta SLIP: %ls\n"
-    IDS_WIFI "Wireless Network Adapter"
+    IDS_WIFI "\nWireless Network Adapter: %ls\n"
 END
 
 STRINGTABLE

base/applications/network/ipconfig/lang/ro-RO.rc

@@ -55,15 +55,15 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_UNKNOWNADAPTER "Unknown Adapter"
+    IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n"
-    IDS_OTHER "alt tip de adaptor"
+    IDS_OTHER "\nalt tip de adaptor: %ls\n"
-    IDS_ETH "adaptor Ethernet"
+    IDS_ETH "\nadaptor Ethernet: %ls\n"
-    IDS_TOKEN "adaptor Token Ring"
+    IDS_TOKEN "\nadaptor Token Ring: %ls\n"
-    IDS_FDDI "adaptor FDDI"
+    IDS_FDDI "\nadaptor FDDI: %ls\n"
-    IDS_PPP "adaptor PPP"
+    IDS_PPP "\nadaptor PPP: %ls\n"
-    IDS_LOOP "adaptor Loopback"
+    IDS_LOOP "\nadaptor Loopback: %ls\n"
-    IDS_SLIP "adaptor SLIP"
+    IDS_SLIP "\nadaptor SLIP: %ls\n"
-    IDS_WIFI "Wireless Network Adapter"
+    IDS_WIFI "\nWireless Network Adapter: %ls\n"
 END
 
 STRINGTABLE

base/applications/network/ipconfig/lang/ru-RU.rc

@@ -56,15 +56,15 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_UNKNOWNADAPTER "Неизвестный адаптер"
+    IDS_UNKNOWNADAPTER "\nНеизвестный адаптер: %ls\n"
-    IDS_OTHER "Другой тип адаптера"
+    IDS_OTHER "\nДругой тип адаптера: %ls\n"
-    IDS_ETH "Ethernet адаптер"
+    IDS_ETH "\nEthernet адаптер: %ls\n"
-    IDS_TOKEN "Адаптер Token Ring"
+    IDS_TOKEN "\nАдаптер Token Ring: %ls\n"
-    IDS_FDDI "Адаптер FDDI"
+    IDS_FDDI "\nАдаптер FDDI: %ls\n"
-    IDS_PPP "Адаптер PPP"
+    IDS_PPP "\nАдаптер PPP: %ls\n"
-    IDS_LOOP "Адаптер замыкания на себя"
+    IDS_LOOP "\nАдаптер замыкания на себя: %ls\n"
-    IDS_SLIP "Адаптер SLIP"
+    IDS_SLIP "\nАдаптер SLIP: %ls\n"
-    IDS_WIFI "Адаптер беспроводной сети"
+    IDS_WIFI "\nАдаптер беспроводной сети: %ls\n"
 END
 
 STRINGTABLE

base/applications/network/ipconfig/lang/sk-SK.rc

@@ -55,15 +55,15 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_UNKNOWNADAPTER "Unknown Adapter"
+    IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n"
-    IDS_OTHER "Iný adaptér"
+    IDS_OTHER "\nIný adaptér: %ls\n"
-    IDS_ETH "Adaptér siete Ethernet"
+    IDS_ETH "\nAdaptér siete Ethernet: %ls\n"
-    IDS_TOKEN "Adaptér siete Token Ring"
+    IDS_TOKEN "\nAdaptér siete Token Ring: %ls\n"
-    IDS_FDDI "Adaptér FDDI"
+    IDS_FDDI "\nAdaptér FDDI: %ls\n"
-    IDS_PPP "Adaptér PPP"
+    IDS_PPP "\nAdaptér PPP: %ls\n"
-    IDS_LOOP "Adaptér pre spätnú slučku"
+    IDS_LOOP "\nAdaptér pre spätnú slučku: %ls\n"
-    IDS_SLIP "Adaptér SLIP"
+    IDS_SLIP "\nAdaptér SLIP: %ls\n"
-    IDS_WIFI "Wireless Network Adapter"
+    IDS_WIFI "\nWireless Network Adapter: %ls\n"
 END
 
 STRINGTABLE

base/applications/network/ipconfig/lang/sq-AL.rc

@@ -55,15 +55,15 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_UNKNOWNADAPTER "Unknown Adapter"
+    IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n"
-    IDS_OTHER "Tipe te tjera adaptuesi"
+    IDS_OTHER "\nTipe te tjera adaptuesi: %ls\n"
-    IDS_ETH "Adapter Ethernet"
+    IDS_ETH "\nAdapter Ethernet: %ls\n"
-    IDS_TOKEN "Adapter Token Ring"
+    IDS_TOKEN "\nAdapter Token Ring: %ls\n"
-    IDS_FDDI "Adapter FDDI"
+    IDS_FDDI "\nAdapter FDDI: %ls\n"
-    IDS_PPP "Adapter PPP"
+    IDS_PPP "\nAdapter PPP: %ls\n"
-    IDS_LOOP "Adapter Loopback"
+    IDS_LOOP "\nAdapter Loopback: %ls\n"
-    IDS_SLIP "Adapter SLIP"
+    IDS_SLIP "\nAdapter SLIP: %ls\n"
-    IDS_WIFI "Wireless Network Adapter"
+    IDS_WIFI "\nWireless Network Adapter: %ls\n"
 END
 
 STRINGTABLE

base/applications/network/ipconfig/lang/sv-SE.rc

@@ -56,15 +56,15 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_UNKNOWNADAPTER "Unknown Adapter"
+    IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n"
-    IDS_OTHER "Annan typ av adapter"
+    IDS_OTHER "\nAnnan typ av adapter: %ls\n"
-    IDS_ETH "Ethernet-adapter"
+    IDS_ETH "\nEthernet-adapter: %ls\n"
-    IDS_TOKEN "Tokenring-adapter"
+    IDS_TOKEN "\nTokenring-adapter: %ls\n"
-    IDS_FDDI "FDDI-adapter"
+    IDS_FDDI "\nFDDI-adapter: %ls\n"
-    IDS_PPP "PPP-adapter"
+    IDS_PPP "\nPPP-adapter: %ls\n"
-    IDS_LOOP "Loopback-adapter"
+    IDS_LOOP "\nLoopback-adapter: %ls\n"
-    IDS_SLIP "SLIP-adapter"
+    IDS_SLIP "\nSLIP-adapter: %ls\n"
-    IDS_WIFI "Wireless Network Adapter"
+    IDS_WIFI "\nWireless Network Adapter: %ls\n"
 END
 
 STRINGTABLE

base/applications/network/ipconfig/lang/tr-TR.rc

@@ -56,15 +56,15 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_UNKNOWNADAPTER "Unknown Adapter"
+    IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n"
-    IDS_OTHER "Diğer Bağdaştırıcı"
+    IDS_OTHER "\nDiğer Bağdaştırıcı: %ls\n"
-    IDS_ETH "Ethernet Bağdaştırıcısı"
+    IDS_ETH "\nEthernet Bağdaştırıcısı: %ls\n"
-    IDS_TOKEN "Simgeli Halka Bağdaştırıcısı"
+    IDS_TOKEN "\nSimgeli Halka Bağdaştırıcısı: %ls\n"
-    IDS_FDDI "FDDI Bağdaştırıcısı"
+    IDS_FDDI "\nFDDI Bağdaştırıcısı: %ls\n"
-    IDS_PPP "PPP Bağdaştırıcısı"
+    IDS_PPP "\nPPP Bağdaştırıcısı: %ls\n"
-    IDS_LOOP "Geri Döngü Bağdaştırıcısı"
+    IDS_LOOP "\nGeri Döngü Bağdaştırıcısı: %ls\n"
-    IDS_SLIP "SLIP Bağdaştırıcısı"
+    IDS_SLIP "\nSLIP Bağdaştırıcısı: %ls\n"
-    IDS_WIFI "Wireless Network Adapter"
+    IDS_WIFI "\nWireless Network Adapter: %ls\n"
 END
 
 STRINGTABLE

base/applications/network/ipconfig/lang/uk-UA.rc

@@ -56,15 +56,15 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_UNKNOWNADAPTER "Unknown Adapter"
+    IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n"
-    IDS_OTHER "Інший тип адаптера"
+    IDS_OTHER "\nІнший тип адаптера: %ls\n"
-    IDS_ETH "Ethernet адаптер"
+    IDS_ETH "\nEthernet адаптер: %ls\n"
-    IDS_TOKEN "Token Ring адаптер"
+    IDS_TOKEN "\nToken Ring адаптер: %ls\n"
-    IDS_FDDI "FDDI адаптер"
+    IDS_FDDI "\nFDDI адаптер: %ls\n"
-    IDS_PPP "PPP адаптер"
+    IDS_PPP "\nPPP адаптер: %ls\n"
-    IDS_LOOP "Loopback адаптер"
+    IDS_LOOP "\nLoopback адаптер: %ls\n"
-    IDS_SLIP "SLIP адаптер"
+    IDS_SLIP "\nSLIP адаптер: %ls\n"
-    IDS_WIFI "Wireless Network Adapter"
+    IDS_WIFI "\nWireless Network Adapter: %ls\n"
 END
 
 STRINGTABLE

base/applications/network/ipconfig/lang/zh-CN.rc

@@ -56,15 +56,15 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_UNKNOWNADAPTER "Unknown Adapter"
+    IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n"
-    IDS_OTHER "其他类型的适配器"
+    IDS_OTHER "\n其他类型的适配器: %ls\n"
-    IDS_ETH "以太网适配器"
+    IDS_ETH "\n以太网适配器: %ls\n"
-    IDS_TOKEN "令牌环适配器"
+    IDS_TOKEN "\n令牌环适配器: %ls\n"
-    IDS_FDDI "FDDI 适配器"
+    IDS_FDDI "\nFDDI 适配器: %ls\n"
-    IDS_PPP "PPP 适配器"
+    IDS_PPP "\nPPP 适配器: %ls\n"
-    IDS_LOOP "本地环回适配器"
+    IDS_LOOP "\n本地环回适配器: %ls\n"
-    IDS_SLIP "SLIP 适配器"
+    IDS_SLIP "\nSLIP 适配器: %ls\n"
-    IDS_WIFI "Wireless Network Adapter"
+    IDS_WIFI "\nWireless Network Adapter: %ls\n"
 END
 
 STRINGTABLE

base/applications/network/ipconfig/lang/zh-TW.rc

@@ -56,15 +56,15 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_UNKNOWNADAPTER "Unknown Adapter"
+    IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n"
-    IDS_OTHER "其他類型的配接器"
+    IDS_OTHER "\n其他類型的配接器: %ls\n"
-    IDS_ETH "乙太網配接器"
+    IDS_ETH "\n乙太網配接器: %ls\n"
-    IDS_TOKEN "權杖環配接器"
+    IDS_TOKEN "\n權杖環配接器: %ls\n"
-    IDS_FDDI "FDDI 配接器"
+    IDS_FDDI "\nFDDI 配接器: %ls\n"
-    IDS_PPP "PPP 配接器"
+    IDS_PPP "\nPPP 配接器: %ls\n"
-    IDS_LOOP "本地環回配接器"
+    IDS_LOOP "\n本地環回配接器: %ls\n"
-    IDS_SLIP "SLIP 配接器"
+    IDS_SLIP "\nSLIP 配接器: %ls\n"
-    IDS_WIFI "Wireless Network Adapter"
+    IDS_WIFI "\nWireless Network Adapter: %ls\n"
 END
 
 STRINGTABLE