https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d0bd954a8644142665866...
commit 0d0bd954a864414266586650a57bed83555ecfa0 Author: Eric Kohl eric.kohl@reactos.org AuthorDate: Mon Jun 26 12:26:04 2023 +0200 Commit: Eric Kohl eric.kohl@reactos.org CommitDate: Mon Jun 26 12:26:04 2023 +0200
[IPCONFIG] Simplify the not type output --- base/applications/network/ipconfig/ipconfig.c | 16 +++---- base/applications/network/ipconfig/lang/bg-BG.rc | 15 ++---- base/applications/network/ipconfig/lang/de-DE.rc | 15 ++---- base/applications/network/ipconfig/lang/el-GR.rc | 15 ++---- base/applications/network/ipconfig/lang/en-US.rc | 15 ++---- base/applications/network/ipconfig/lang/es-ES.rc | 15 ++---- base/applications/network/ipconfig/lang/fr-FR.rc | 15 ++---- base/applications/network/ipconfig/lang/id-ID.rc | 15 ++---- base/applications/network/ipconfig/lang/it-IT.rc | 15 ++---- base/applications/network/ipconfig/lang/no-NO.rc | 15 ++---- base/applications/network/ipconfig/lang/pl-PL.rc | 15 ++---- base/applications/network/ipconfig/lang/ro-RO.rc | 15 ++---- base/applications/network/ipconfig/lang/ru-RU.rc | 15 ++---- base/applications/network/ipconfig/lang/sk-SK.rc | 15 ++---- base/applications/network/ipconfig/lang/sq-AL.rc | 15 ++---- base/applications/network/ipconfig/lang/sv-SE.rc | 15 ++---- base/applications/network/ipconfig/lang/tr-TR.rc | 15 ++---- base/applications/network/ipconfig/lang/uk-UA.rc | 15 ++---- base/applications/network/ipconfig/lang/zh-CN.rc | 15 ++---- base/applications/network/ipconfig/lang/zh-TW.rc | 15 ++---- base/applications/network/ipconfig/resource.h | 59 ++++++++++++------------ 21 files changed, 131 insertions(+), 229 deletions(-)
diff --git a/base/applications/network/ipconfig/ipconfig.c b/base/applications/network/ipconfig/ipconfig.c index 5ce159fd7b6..fdbdda545e1 100644 --- a/base/applications/network/ipconfig/ipconfig.c +++ b/base/applications/network/ipconfig/ipconfig.c @@ -410,33 +410,31 @@ CLEANUP:
static VOID -PrintNodeType(UINT NodeType) +PrintNodeType( + _In_ UINT NodeType) { - ConResPrintf(StdOut, IDS_NODETYPE); - switch (NodeType) { case 1: - ConResPrintf(StdOut, IDS_BCAST); + ConResPrintf(StdOut, IDS_NODETYPEBCAST); break;
case 2: - ConResPrintf(StdOut, IDS_P2P); + ConResPrintf(StdOut, IDS_NODETYPEP2P); break;
case 4: - ConResPrintf(StdOut, IDS_MIXED); + ConResPrintf(StdOut, IDS_NODETYPEMIXED); break;
case 8: - ConResPrintf(StdOut, IDS_HYBRID); + ConResPrintf(StdOut, IDS_NODETYPEHYBRID); break;
default : - ConResPrintf(StdOut, IDS_UNKNOWN); + ConResPrintf(StdOut, IDS_NODETYPEUNKNOWN); break; } - printf("\n"); }
static diff --git a/base/applications/network/ipconfig/lang/bg-BG.rc b/base/applications/network/ipconfig/lang/bg-BG.rc index 836b3c35033..01235582af1 100644 --- a/base/applications/network/ipconfig/lang/bg-BG.rc +++ b/base/applications/network/ipconfig/lang/bg-BG.rc @@ -12,7 +12,11 @@ BEGIN IDS_HEADER "\nReactOS IP Configuration\n\n" IDS_HOSTNAME "\tHost Name . . . . . . . . . . . . : %hs\n" IDS_PRIMARYDNSSUFFIX "\tPrimary DNS Suffix. . . . . . . . : %hs\n" - IDS_NODETYPE "\tNode Type . . . . . . . . . . . . : " + IDS_NODETYPEBCAST "\tNode Type . . . . . . . . . . . . : Разпръскване\n" + IDS_NODETYPEP2P "\tNode Type . . . . . . . . . . . . : Равен с равен (P2P)\n" + IDS_NODETYPEMIXED "\tNode Type . . . . . . . . . . . . : Смесен\n" + IDS_NODETYPEHYBRID "\tNode Type . . . . . . . . . . . . : Хибриден\n" + IDS_NODETYPEUNKNOWN "\tNode Type . . . . . . . . . . . . : неизвестен\n" IDS_IPROUTINGNO "\tIP Routing Enabled. . . . . . . . : No\n" IDS_IPROUTINGYES "\tIP Routing Enabled. . . . . . . . : Yes\n" IDS_WINSPROXYNO "\tWINS Proxy enabled. . . . . . . . : No\n" @@ -38,15 +42,6 @@ BEGIN IDS_LEASEEXPIRES "\tLease Expires . . . . . . . . . . : %s\n" END
-STRINGTABLE -BEGIN - IDS_BCAST "Разпръскване" - IDS_P2P "Равен с равен (P2P)" - IDS_MIXED "Смесен" - IDS_HYBRID "Хибриден" - IDS_UNKNOWN "неизвестен" -END - STRINGTABLE BEGIN IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n" diff --git a/base/applications/network/ipconfig/lang/de-DE.rc b/base/applications/network/ipconfig/lang/de-DE.rc index 9159ffbe2f6..38bf2a5306e 100644 --- a/base/applications/network/ipconfig/lang/de-DE.rc +++ b/base/applications/network/ipconfig/lang/de-DE.rc @@ -14,7 +14,11 @@ BEGIN IDS_HEADER "\nReactOS-IP-Konfiguration\n\n" IDS_HOSTNAME "\tHostname. . . . . . . . . . . . . : %hs\n" IDS_PRIMARYDNSSUFFIX "\tPrimäres DNS-Suffix . . . . . . . : %hs\n" - IDS_NODETYPE "\tKnotentyp . . . . . . . . . . . . : " + IDS_NODETYPEBCAST "\tKnotentyp . . . . . . . . . . . . : Broadcast\n" + IDS_NODETYPEP2P "\tKnotentyp . . . . . . . . . . . . : Peer-to-Peer\n" + IDS_NODETYPEMIXED "\tKnotentyp . . . . . . . . . . . . : Gemischt\n" + IDS_NODETYPEHYBRID "\tKnotentyp . . . . . . . . . . . . : Hybrid\n" + IDS_NODETYPEUNKNOWN "\tKnotentyp . . . . . . . . . . . . : Unbekannt\n" IDS_IPROUTINGNO "\tIP-Routing aktiviert. . . . . . . : Nein\n" IDS_IPROUTINGYES "\tIP-Routing aktiviert. . . . . . . : Ja\n" IDS_WINSPROXYNO "\tWINS-Proxy aktiviert. . . . . . . : Nein\n" @@ -40,15 +44,6 @@ BEGIN IDS_LEASEEXPIRES "\tLease läuft ab. . . . . . . . . . : %s\n" END
-STRINGTABLE -BEGIN - IDS_BCAST "Broadcast" - IDS_P2P "Peer-to-Peer" - IDS_MIXED "Gemischt" - IDS_HYBRID "Hybrid" - IDS_UNKNOWN "Unbekannt" -END - STRINGTABLE BEGIN IDS_UNKNOWNADAPTER "\nUnbekannter Adapter: %ls\n" diff --git a/base/applications/network/ipconfig/lang/el-GR.rc b/base/applications/network/ipconfig/lang/el-GR.rc index 4be19f6bb0f..07465226f71 100644 --- a/base/applications/network/ipconfig/lang/el-GR.rc +++ b/base/applications/network/ipconfig/lang/el-GR.rc @@ -12,7 +12,11 @@ BEGIN IDS_HEADER "\nReactOS IP Configuration\n\n" IDS_HOSTNAME "\tHost Name . . . . . . . . . . . . : %hs\n" IDS_PRIMARYDNSSUFFIX "\tPrimary DNS Suffix. . . . . . . . : %hs\n" - IDS_NODETYPE "\tNode Type . . . . . . . . . . . . : " + IDS_NODETYPEBCAST "\tNode Type . . . . . . . . . . . . : Broadcast\n" + IDS_NODETYPEP2P "\tNode Type . . . . . . . . . . . . : Peer To Peer\n" + IDS_NODETYPEMIXED "\tNode Type . . . . . . . . . . . . : Mixed\n" + IDS_NODETYPEHYBRID "\tNode Type . . . . . . . . . . . . : Hybrid\n" + IDS_NODETYPEUNKNOWN "\tNode Type . . . . . . . . . . . . : unknown\n" IDS_IPROUTINGNO "\tIP Routing Enabled. . . . . . . . : No\n" IDS_IPROUTINGYES "\tIP Routing Enabled. . . . . . . . : Yes\n" IDS_WINSPROXYNO "\tWINS Proxy enabled. . . . . . . . : No\n" @@ -38,15 +42,6 @@ BEGIN IDS_LEASEEXPIRES "\tLease Expires . . . . . . . . . . : %s\n" END
-STRINGTABLE -BEGIN - IDS_BCAST "Broadcast" - IDS_P2P "Peer To Peer" - IDS_MIXED "Mixed" - IDS_HYBRID "Hybrid" - IDS_UNKNOWN "unknown" -END - STRINGTABLE BEGIN IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n" diff --git a/base/applications/network/ipconfig/lang/en-US.rc b/base/applications/network/ipconfig/lang/en-US.rc index 6b76877c170..a7ac4081d6e 100644 --- a/base/applications/network/ipconfig/lang/en-US.rc +++ b/base/applications/network/ipconfig/lang/en-US.rc @@ -12,7 +12,11 @@ BEGIN IDS_HEADER "\nReactOS IP Configuration\n\n" IDS_HOSTNAME "\tHost Name . . . . . . . . . . . . : %hs\n" IDS_PRIMARYDNSSUFFIX "\tPrimary DNS Suffix. . . . . . . . : %hs\n" - IDS_NODETYPE "\tNode Type . . . . . . . . . . . . : " + IDS_NODETYPEBCAST "\tNode Type . . . . . . . . . . . . : Broadcast\n" + IDS_NODETYPEP2P "\tNode Type . . . . . . . . . . . . : Peer To Peer\n" + IDS_NODETYPEMIXED "\tNode Type . . . . . . . . . . . . : Mixed\n" + IDS_NODETYPEHYBRID "\tNode Type . . . . . . . . . . . . : Hybrid\n" + IDS_NODETYPEUNKNOWN "\tNode Type . . . . . . . . . . . . : Unknown\n" IDS_IPROUTINGNO "\tIP Routing Enabled. . . . . . . . : No\n" IDS_IPROUTINGYES "\tIP Routing Enabled. . . . . . . . : Yes\n" IDS_WINSPROXYNO "\tWINS Proxy enabled. . . . . . . . : No\n" @@ -38,15 +42,6 @@ BEGIN IDS_LEASEEXPIRES "\tLease Expires . . . . . . . . . . : %s\n" END
-STRINGTABLE -BEGIN - IDS_BCAST "Broadcast" - IDS_P2P "Peer To Peer" - IDS_MIXED "Mixed" - IDS_HYBRID "Hybrid" - IDS_UNKNOWN "Unknown" -END - STRINGTABLE BEGIN IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n" diff --git a/base/applications/network/ipconfig/lang/es-ES.rc b/base/applications/network/ipconfig/lang/es-ES.rc index 649b8fc4c03..6f3e50ab052 100644 --- a/base/applications/network/ipconfig/lang/es-ES.rc +++ b/base/applications/network/ipconfig/lang/es-ES.rc @@ -14,7 +14,11 @@ BEGIN IDS_HEADER "\nReactOS IP Configuration\n\n" IDS_HOSTNAME "\tHost Name . . . . . . . . . . . . : %hs\n" IDS_PRIMARYDNSSUFFIX "\tPrimary DNS Suffix. . . . . . . . : %hs\n" - IDS_NODETYPE "\tNode Type . . . . . . . . . . . . : " + IDS_NODETYPEBCAST "\tNode Type . . . . . . . . . . . . : Difusión\n" + IDS_NODETYPEP2P "\tNode Type . . . . . . . . . . . . : Punto a punto\n" + IDS_NODETYPEMIXED "\tNode Type . . . . . . . . . . . . : Mixto\n" + IDS_NODETYPEHYBRID "\tNode Type . . . . . . . . . . . . : Híbrido\n" + IDS_NODETYPEUNKNOWN "\tNode Type . . . . . . . . . . . . : Desconocido\n" IDS_IPROUTINGNO "\tIP Routing Enabled. . . . . . . . : No\n" IDS_IPROUTINGYES "\tIP Routing Enabled. . . . . . . . : Yes\n" IDS_WINSPROXYNO "\tWINS Proxy enabled. . . . . . . . : No\n" @@ -39,15 +43,6 @@ BEGIN IDS_LEASEEXPIRES "\tLease Expires . . . . . . . . . . : %s\n" END
-STRINGTABLE -BEGIN - IDS_BCAST "Difusión" - IDS_P2P "Punto a punto" - IDS_MIXED "Mixto" - IDS_HYBRID "Híbrido" - IDS_UNKNOWN "Desconocido" -END - STRINGTABLE BEGIN IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n" diff --git a/base/applications/network/ipconfig/lang/fr-FR.rc b/base/applications/network/ipconfig/lang/fr-FR.rc index a4191e7d3ce..4f0faf0b659 100644 --- a/base/applications/network/ipconfig/lang/fr-FR.rc +++ b/base/applications/network/ipconfig/lang/fr-FR.rc @@ -14,7 +14,11 @@ BEGIN IDS_HEADER "\nReactOS IP Configuration\n\n" IDS_HOSTNAME "\tHost Name . . . . . . . . . . . . : %hs\n" IDS_PRIMARYDNSSUFFIX "\tPrimary DNS Suffix. . . . . . . . : %hs\n" - IDS_NODETYPE "\tNode Type . . . . . . . . . . . . : " + IDS_NODETYPEBCAST "\tNode Type . . . . . . . . . . . . : Broadcast\n" + IDS_NODETYPEP2P "\tNode Type . . . . . . . . . . . . : Peer To Peer\n" + IDS_NODETYPEMIXED "\tNode Type . . . . . . . . . . . . : Mixte\n" + IDS_NODETYPEHYBRID "\tNode Type . . . . . . . . . . . . : Hybride\n" + IDS_NODETYPEUNKNOWN "\tNode Type . . . . . . . . . . . . : Inconnu\n" IDS_IPROUTINGNO "\tIP Routing Enabled. . . . . . . . : No\n" IDS_IPROUTINGYES "\tIP Routing Enabled. . . . . . . . : Yes\n" IDS_WINSPROXYNO "\tWINS Proxy enabled. . . . . . . . : No\n" @@ -40,15 +44,6 @@ BEGIN IDS_LEASEEXPIRES "\tLease Expires . . . . . . . . . . : %s\n" END
-STRINGTABLE -BEGIN - IDS_BCAST "Broadcast" - IDS_P2P "Peer To Peer" - IDS_MIXED "Mixte" - IDS_HYBRID "Hybride" - IDS_UNKNOWN "Inconnu" -END - STRINGTABLE BEGIN IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n" diff --git a/base/applications/network/ipconfig/lang/id-ID.rc b/base/applications/network/ipconfig/lang/id-ID.rc index 0cb757fceee..22e6feed929 100644 --- a/base/applications/network/ipconfig/lang/id-ID.rc +++ b/base/applications/network/ipconfig/lang/id-ID.rc @@ -12,7 +12,11 @@ BEGIN IDS_HEADER "\nReactOS IP Configuration\n\n" IDS_HOSTNAME "\tHost Name . . . . . . . . . . . . : %hs\n" IDS_PRIMARYDNSSUFFIX "\tPrimary DNS Suffix. . . . . . . . : %hs\n" - IDS_NODETYPE "\tNode Type . . . . . . . . . . . . : " + IDS_NODETYPEBCAST "\tNode Type . . . . . . . . . . . . : Siarkan\n" + IDS_NODETYPEP2P "\tNode Type . . . . . . . . . . . . : Peer To Peer\n" + IDS_NODETYPEMIXED "\tNode Type . . . . . . . . . . . . : Campuran\n" + IDS_NODETYPEHYBRID "\tNode Type . . . . . . . . . . . . : Hibrid\n" + IDS_NODETYPEUNKNOWN "\tNode Type . . . . . . . . . . . . : tidak dikenal\n" IDS_IPROUTINGNO "\tIP Routing Enabled. . . . . . . . : No\n" IDS_IPROUTINGYES "\tIP Routing Enabled. . . . . . . . : Yes\n" IDS_WINSPROXYNO "\tWINS Proxy enabled. . . . . . . . : No\n" @@ -38,15 +42,6 @@ BEGIN IDS_LEASEEXPIRES "\tLease Expires . . . . . . . . . . : %s\n" END
-STRINGTABLE -BEGIN - IDS_BCAST "Siarkan" - IDS_P2P "Peer To Peer" - IDS_MIXED "Campuran" - IDS_HYBRID "Hibrid" - IDS_UNKNOWN "tidak dikenal" -END - STRINGTABLE BEGIN IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n" diff --git a/base/applications/network/ipconfig/lang/it-IT.rc b/base/applications/network/ipconfig/lang/it-IT.rc index 79e72ee2e88..e32cb06a273 100644 --- a/base/applications/network/ipconfig/lang/it-IT.rc +++ b/base/applications/network/ipconfig/lang/it-IT.rc @@ -12,7 +12,11 @@ BEGIN IDS_HEADER "\nReactOS IP Configuration\n\n" IDS_HOSTNAME "\tHost Name . . . . . . . . . . . . : %hs\n" IDS_PRIMARYDNSSUFFIX "\tPrimary DNS Suffix. . . . . . . . : %hs\n" - IDS_NODETYPE "\tNode Type . . . . . . . . . . . . : " + IDS_NODETYPEBCAST "\tNode Type . . . . . . . . . . . . : Broadcast\n" + IDS_NODETYPEP2P "\tNode Type . . . . . . . . . . . . : Peer To Peer\n" + IDS_NODETYPEMIXED "\tNode Type . . . . . . . . . . . . : Misto\n" + IDS_NODETYPEHYBRID "\tNode Type . . . . . . . . . . . . : Ibrido\n" + IDS_NODETYPEUNKNOWN "\tNode Type . . . . . . . . . . . . : sconosciuto\n" IDS_IPROUTINGNO "\tIP Routing Enabled. . . . . . . . : No\n" IDS_IPROUTINGYES "\tIP Routing Enabled. . . . . . . . : Yes\n" IDS_WINSPROXYNO "\tWINS Proxy enabled. . . . . . . . : No\n" @@ -38,15 +42,6 @@ BEGIN IDS_LEASEEXPIRES "\tLease Expires . . . . . . . . . . : %s\n" END
-STRINGTABLE -BEGIN - IDS_BCAST "Broadcast" - IDS_P2P "Peer To Peer" - IDS_MIXED "Misto" - IDS_HYBRID "Ibrido" - IDS_UNKNOWN "sconosciuto" -END - STRINGTABLE BEGIN IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n" diff --git a/base/applications/network/ipconfig/lang/no-NO.rc b/base/applications/network/ipconfig/lang/no-NO.rc index fdce149d248..54fea726deb 100644 --- a/base/applications/network/ipconfig/lang/no-NO.rc +++ b/base/applications/network/ipconfig/lang/no-NO.rc @@ -12,7 +12,11 @@ BEGIN IDS_HEADER "\nReactOS IP Configuration\n\n" IDS_HOSTNAME "\tHost Name . . . . . . . . . . . . : %hs\n" IDS_PRIMARYDNSSUFFIX "\tPrimary DNS Suffix. . . . . . . . : %hs\n" - IDS_NODETYPE "\tNode Type . . . . . . . . . . . . : " + IDS_NODETYPEBCAST "\tNode Type . . . . . . . . . . . . : Broadcast\n" + IDS_NODETYPEP2P "\tNode Type . . . . . . . . . . . . : Peer To Peer\n" + IDS_NODETYPEMIXED "\tNode Type . . . . . . . . . . . . : Mikset\n" + IDS_NODETYPEHYBRID "\tNode Type . . . . . . . . . . . . : Hybrid\n" + IDS_NODETYPEUNKNOWN "\tNode Type . . . . . . . . . . . . : Ukjent\n" IDS_IPROUTINGNO "\tIP Routing Enabled. . . . . . . . : No\n" IDS_IPROUTINGYES "\tIP Routing Enabled. . . . . . . . : Yes\n" IDS_WINSPROXYNO "\tWINS Proxy enabled. . . . . . . . : No\n" @@ -38,15 +42,6 @@ BEGIN IDS_LEASEEXPIRES "\tLease Expires . . . . . . . . . . : %s\n" END
-STRINGTABLE -BEGIN - IDS_BCAST "Broadcast" - IDS_P2P "Peer To Peer" - IDS_MIXED "Mikset" - IDS_HYBRID "Hybrid" - IDS_UNKNOWN "Ukjent" -END - STRINGTABLE BEGIN IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n" diff --git a/base/applications/network/ipconfig/lang/pl-PL.rc b/base/applications/network/ipconfig/lang/pl-PL.rc index b605772da65..223d8a70835 100644 --- a/base/applications/network/ipconfig/lang/pl-PL.rc +++ b/base/applications/network/ipconfig/lang/pl-PL.rc @@ -14,7 +14,11 @@ BEGIN IDS_HEADER "\nReactOS IP Configuration\n\n" IDS_HOSTNAME "\tHost Name . . . . . . . . . . . . : %hs\n" IDS_PRIMARYDNSSUFFIX "\tPrimary DNS Suffix. . . . . . . . : %hs\n" - IDS_NODETYPE "\tNode Type . . . . . . . . . . . . : " + IDS_NODETYPEBCAST "\tNode Type . . . . . . . . . . . . : Transmisja\n" + IDS_NODETYPEP2P "\tNode Type . . . . . . . . . . . . : Peer To Peer\n" + IDS_NODETYPEMIXED "\tNode Type . . . . . . . . . . . . : Mieszany\n" + IDS_NODETYPEHYBRID "\tNode Type . . . . . . . . . . . . : Hybrydowy\n" + IDS_NODETYPEUNKNOWN "\tNode Type . . . . . . . . . . . . : nieznany\n" IDS_IPROUTINGNO "\tIP Routing Enabled. . . . . . . . : No\n" IDS_IPROUTINGYES "\tIP Routing Enabled. . . . . . . . : Yes\n" IDS_WINSPROXYNO "\tWINS Proxy enabled. . . . . . . . : No\n" @@ -40,15 +44,6 @@ BEGIN IDS_LEASEEXPIRES "\tLease Expires . . . . . . . . . . : %s\n" END
-STRINGTABLE -BEGIN - IDS_BCAST "Transmisja" - IDS_P2P "Peer To Peer" - IDS_MIXED "Mieszany" - IDS_HYBRID "Hybrydowy" - IDS_UNKNOWN "nieznany" -END - STRINGTABLE BEGIN IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n" diff --git a/base/applications/network/ipconfig/lang/ro-RO.rc b/base/applications/network/ipconfig/lang/ro-RO.rc index e8c745624ea..156b8204314 100644 --- a/base/applications/network/ipconfig/lang/ro-RO.rc +++ b/base/applications/network/ipconfig/lang/ro-RO.rc @@ -12,7 +12,11 @@ BEGIN IDS_HEADER "\nReactOS IP Configuration\n\n" IDS_HOSTNAME "\tHost Name . . . . . . . . . . . . : %hs\n" IDS_PRIMARYDNSSUFFIX "\tPrimary DNS Suffix. . . . . . . . : %hs\n" - IDS_NODETYPE "\tNode Type . . . . . . . . . . . . : " + IDS_NODETYPEBCAST "\tNode Type . . . . . . . . . . . . : Difuzare\n" + IDS_NODETYPEP2P "\tNode Type . . . . . . . . . . . . : Egal la egal\n" + IDS_NODETYPEMIXED "\tNode Type . . . . . . . . . . . . : Mixtă\n" + IDS_NODETYPEHYBRID "\tNode Type . . . . . . . . . . . . : Hibridă\n" + IDS_NODETYPEUNKNOWN "\tNode Type . . . . . . . . . . . . : necunoscută\n" IDS_IPROUTINGNO "\tIP Routing Enabled. . . . . . . . : No\n" IDS_IPROUTINGYES "\tIP Routing Enabled. . . . . . . . : Yes\n" IDS_WINSPROXYNO "\tWINS Proxy enabled. . . . . . . . : No\n" @@ -38,15 +42,6 @@ BEGIN IDS_LEASEEXPIRES "\tLease Expires . . . . . . . . . . : %s\n" END
-STRINGTABLE -BEGIN - IDS_BCAST "Difuzare" - IDS_P2P "Egal la egal" - IDS_MIXED "Mixtă" - IDS_HYBRID "Hibridă" - IDS_UNKNOWN "necunoscută" -END - STRINGTABLE BEGIN IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n" diff --git a/base/applications/network/ipconfig/lang/ru-RU.rc b/base/applications/network/ipconfig/lang/ru-RU.rc index a64a906d78a..51153460344 100644 --- a/base/applications/network/ipconfig/lang/ru-RU.rc +++ b/base/applications/network/ipconfig/lang/ru-RU.rc @@ -13,7 +13,11 @@ BEGIN IDS_HEADER "\nНастройка протокола IP для ReactOS\n\n" IDS_HOSTNAME "\tИмя компьютера . . . . . . . . . : %hs\n" IDS_PRIMARYDNSSUFFIX "\tОсновной DNS-суффикс . . . . . . : %hs\n" - IDS_NODETYPE "\tТип узла. . . . . . . . . . . . . : " + IDS_NODETYPEBCAST "\tТип узла. . . . . . . . . . . . . : Широковещательный\n" + IDS_NODETYPEP2P "\tТип узла. . . . . . . . . . . . . : Одноранговый\n" + IDS_NODETYPEMIXED "\tТип узла. . . . . . . . . . . . . : Смешанный\n" + IDS_NODETYPEHYBRID "\tТип узла. . . . . . . . . . . . . : Гибридный\n" + IDS_NODETYPEUNKNOWN "\tТип узла. . . . . . . . . . . . . : неизвестный\n" IDS_IPROUTINGNO "\tIP-маршрутизация включена . . . . : нет\n" IDS_IPROUTINGYES "\tIP-маршрутизация включена . . . . : да\n" IDS_WINSPROXYNO "\tWINS-прокси включён . . . . . . . : нет\n" @@ -39,15 +43,6 @@ BEGIN IDS_LEASEEXPIRES "\tАренда истекает . . . . . . . . . : %s\n" END
-STRINGTABLE -BEGIN - IDS_BCAST "Широковещательный" - IDS_P2P "Одноранговый" - IDS_MIXED "Смешанный" - IDS_HYBRID "Гибридный" - IDS_UNKNOWN "неизвестный" -END - STRINGTABLE BEGIN IDS_UNKNOWNADAPTER "\nНеизвестный адаптер: %ls\n" diff --git a/base/applications/network/ipconfig/lang/sk-SK.rc b/base/applications/network/ipconfig/lang/sk-SK.rc index 0cf504d0a49..fa112bef80f 100644 --- a/base/applications/network/ipconfig/lang/sk-SK.rc +++ b/base/applications/network/ipconfig/lang/sk-SK.rc @@ -12,7 +12,11 @@ BEGIN IDS_HEADER "\nReactOS IP Configuration\n\n" IDS_HOSTNAME "\tHost Name . . . . . . . . . . . . : %hs\n" IDS_PRIMARYDNSSUFFIX "\tPrimary DNS Suffix. . . . . . . . : %hs\n" - IDS_NODETYPE "\tNode Type . . . . . . . . . . . . : " + IDS_NODETYPEBCAST "\tNode Type . . . . . . . . . . . . : Vysielací\n" + IDS_NODETYPEP2P "\tNode Type . . . . . . . . . . . . : Rovný s rovným\n" + IDS_NODETYPEMIXED "\tNode Type . . . . . . . . . . . . : Zmiešaný\n" + IDS_NODETYPEHYBRID "\tNode Type . . . . . . . . . . . . : Hybridný\n" + IDS_NODETYPEUNKNOWN "\tNode Type . . . . . . . . . . . . : Neznámy\n" IDS_IPROUTINGNO "\tIP Routing Enabled. . . . . . . . : No\n" IDS_IPROUTINGYES "\tIP Routing Enabled. . . . . . . . : Yes\n" IDS_WINSPROXYNO "\tWINS Proxy enabled. . . . . . . . : No\n" @@ -38,15 +42,6 @@ BEGIN IDS_LEASEEXPIRES "\tLease Expires . . . . . . . . . . : %s\n" END
-STRINGTABLE -BEGIN - IDS_BCAST "Vysielací" - IDS_P2P "Rovný s rovným" - IDS_MIXED "Zmiešaný" - IDS_HYBRID "Hybridný" - IDS_UNKNOWN "Neznámy" -END - STRINGTABLE BEGIN IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n" diff --git a/base/applications/network/ipconfig/lang/sq-AL.rc b/base/applications/network/ipconfig/lang/sq-AL.rc index 6f906cf1e02..9c231eb18a1 100644 --- a/base/applications/network/ipconfig/lang/sq-AL.rc +++ b/base/applications/network/ipconfig/lang/sq-AL.rc @@ -12,7 +12,11 @@ BEGIN IDS_HEADER "\nReactOS IP Configuration\n\n" IDS_HOSTNAME "\tHost Name . . . . . . . . . . . . : %hs\n" IDS_PRIMARYDNSSUFFIX "\tPrimary DNS Suffix. . . . . . . . : %hs\n" - IDS_NODETYPE "\tNode Type . . . . . . . . . . . . : " + IDS_NODETYPEBCAST "\tNode Type . . . . . . . . . . . . : Transmeto\n" + IDS_NODETYPEP2P "\tNode Type . . . . . . . . . . . . : Peer To Peer\n" + IDS_NODETYPEMIXED "\tNode Type . . . . . . . . . . . . : Mixuar\n" + IDS_NODETYPEHYBRID "\tNode Type . . . . . . . . . . . . : Hybrid\n" + IDS_NODETYPEUNKNOWN "\tNode Type . . . . . . . . . . . . : P'anjohur\n" IDS_IPROUTINGNO "\tIP Routing Enabled. . . . . . . . : No\n" IDS_IPROUTINGYES "\tIP Routing Enabled. . . . . . . . : Yes\n" IDS_WINSPROXYNO "\tWINS Proxy enabled. . . . . . . . : No\n" @@ -38,15 +42,6 @@ BEGIN IDS_LEASEEXPIRES "\tLease Expires . . . . . . . . . . : %s\n" END
-STRINGTABLE -BEGIN - IDS_BCAST "Transmeto" - IDS_P2P "Peer To Peer" - IDS_MIXED "Mixuar" - IDS_HYBRID "Hybrid" - IDS_UNKNOWN "P'anjohur" -END - STRINGTABLE BEGIN IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n" diff --git a/base/applications/network/ipconfig/lang/sv-SE.rc b/base/applications/network/ipconfig/lang/sv-SE.rc index 3700b297c8b..ac76e246c5e 100644 --- a/base/applications/network/ipconfig/lang/sv-SE.rc +++ b/base/applications/network/ipconfig/lang/sv-SE.rc @@ -13,7 +13,11 @@ BEGIN IDS_HEADER "\nReactOS IP Configuration\n\n" IDS_HOSTNAME "\tHost Name . . . . . . . . . . . . : %hs\n" IDS_PRIMARYDNSSUFFIX "\tPrimary DNS Suffix. . . . . . . . : %hs\n" - IDS_NODETYPE "\tNode Type . . . . . . . . . . . . : " + IDS_NODETYPEBCAST "\tNode Type . . . . . . . . . . . . : Broadcast\n" + IDS_NODETYPEP2P "\tNode Type . . . . . . . . . . . . : Peer-till-Peer\n" + IDS_NODETYPEMIXED "\tNode Type . . . . . . . . . . . . : Mixad\n" + IDS_NODETYPEHYBRID "\tNode Type . . . . . . . . . . . . : Hybrid\n" + IDS_NODETYPEUNKNOWN "\tNode Type . . . . . . . . . . . . : Okänd\n" IDS_IPROUTINGNO "\tIP Routing Enabled. . . . . . . . : No\n" IDS_IPROUTINGYES "\tIP Routing Enabled. . . . . . . . : Yes\n" IDS_WINSPROXYNO "\tWINS Proxy enabled. . . . . . . . : No\n" @@ -39,15 +43,6 @@ BEGIN IDS_LEASEEXPIRES "\tLease Expires . . . . . . . . . . : %s\n" END
-STRINGTABLE -BEGIN - IDS_BCAST "Broadcast" - IDS_P2P "Peer-till-Peer" - IDS_MIXED "Mixad" - IDS_HYBRID "Hybrid" - IDS_UNKNOWN "Okänd" -END - STRINGTABLE BEGIN IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n" diff --git a/base/applications/network/ipconfig/lang/tr-TR.rc b/base/applications/network/ipconfig/lang/tr-TR.rc index f50af73b103..c753f14e573 100644 --- a/base/applications/network/ipconfig/lang/tr-TR.rc +++ b/base/applications/network/ipconfig/lang/tr-TR.rc @@ -13,7 +13,11 @@ BEGIN IDS_HEADER "\nReactOS IP Configuration\n\n" IDS_HOSTNAME "\tHost Name . . . . . . . . . . . . : %hs\n" IDS_PRIMARYDNSSUFFIX "\tPrimary DNS Suffix. . . . . . . . : %hs\n" - IDS_NODETYPE "\tNode Type . . . . . . . . . . . . : " + IDS_NODETYPEBCAST "\tNode Type . . . . . . . . . . . . : Yayın\n" + IDS_NODETYPEP2P "\tNode Type . . . . . . . . . . . . : Eşler Arası (P2P)\n" + IDS_NODETYPEMIXED "\tNode Type . . . . . . . . . . . . : Karışık\n" + IDS_NODETYPEHYBRID "\tNode Type . . . . . . . . . . . . : Hibrit\n" + IDS_NODETYPEUNKNOWN "\tNode Type . . . . . . . . . . . . : Bilinmeyen\n" IDS_IPROUTINGNO "\tIP Routing Enabled. . . . . . . . : No\n" IDS_IPROUTINGYES "\tIP Routing Enabled. . . . . . . . : Yes\n" IDS_WINSPROXYNO "\tWINS Proxy enabled. . . . . . . . : No\n" @@ -39,15 +43,6 @@ BEGIN IDS_LEASEEXPIRES "\tLease Expires . . . . . . . . . . : %s\n" END
-STRINGTABLE -BEGIN - IDS_BCAST "Yayın" - IDS_P2P "Eşler Arası (P2P)" - IDS_MIXED "Karışık" - IDS_HYBRID "Hibrit" - IDS_UNKNOWN "Bilinmeyen" -END - STRINGTABLE BEGIN IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n" diff --git a/base/applications/network/ipconfig/lang/uk-UA.rc b/base/applications/network/ipconfig/lang/uk-UA.rc index b582488f100..e8376a2522e 100644 --- a/base/applications/network/ipconfig/lang/uk-UA.rc +++ b/base/applications/network/ipconfig/lang/uk-UA.rc @@ -13,7 +13,11 @@ BEGIN IDS_HEADER "\nReactOS IP Configuration\n\n" IDS_HOSTNAME "\tHost Name . . . . . . . . . . . . : %hs\n" IDS_PRIMARYDNSSUFFIX "\tPrimary DNS Suffix. . . . . . . . : %hs\n" - IDS_NODETYPE "\tNode Type . . . . . . . . . . . . : " + IDS_NODETYPEBCAST "\tNode Type . . . . . . . . . . . . : Broadcast\n" + IDS_NODETYPEP2P "\tNode Type . . . . . . . . . . . . : Peer To Peer\n" + IDS_NODETYPEMIXED "\tNode Type . . . . . . . . . . . . : Mixed\n" + IDS_NODETYPEHYBRID "\tNode Type . . . . . . . . . . . . : Hybrid\n" + IDS_NODETYPEUNKNOWN "\tNode Type . . . . . . . . . . . . : Невідомий\n" IDS_IPROUTINGNO "\tIP Routing Enabled. . . . . . . . : No\n" IDS_IPROUTINGYES "\tIP Routing Enabled. . . . . . . . : Yes\n" IDS_WINSPROXYNO "\tWINS Proxy enabled. . . . . . . . : No\n" @@ -39,15 +43,6 @@ BEGIN IDS_LEASEEXPIRES "\tLease Expires . . . . . . . . . . : %s\n" END
-STRINGTABLE -BEGIN - IDS_BCAST "Broadcast" - IDS_P2P "Peer To Peer" - IDS_MIXED "Mixed" - IDS_HYBRID "Hybrid" - IDS_UNKNOWN "Невідомий" -END - STRINGTABLE BEGIN IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n" diff --git a/base/applications/network/ipconfig/lang/zh-CN.rc b/base/applications/network/ipconfig/lang/zh-CN.rc index fcc771974d5..b80af964fb4 100644 --- a/base/applications/network/ipconfig/lang/zh-CN.rc +++ b/base/applications/network/ipconfig/lang/zh-CN.rc @@ -13,7 +13,11 @@ BEGIN IDS_HEADER "\nReactOS IP Configuration\n\n" IDS_HOSTNAME "\tHost Name . . . . . . . . . . . . : %hs\n" IDS_PRIMARYDNSSUFFIX "\tPrimary DNS Suffix. . . . . . . . : %hs\n" - IDS_NODETYPE "\tNode Type . . . . . . . . . . . . : " + IDS_NODETYPEBCAST "\tNode Type . . . . . . . . . . . . : 广播\n" + IDS_NODETYPEP2P "\tNode Type . . . . . . . . . . . . : 点对点\n" + IDS_NODETYPEMIXED "\tNode Type . . . . . . . . . . . . : 混合\n" + IDS_NODETYPEHYBRID "\tNode Type . . . . . . . . . . . . : 混杂\n" + IDS_NODETYPEUNKNOWN "\tNode Type . . . . . . . . . . . . : 未知\n" IDS_IPROUTINGNO "\tIP Routing Enabled. . . . . . . . : No\n" IDS_IPROUTINGYES "\tIP Routing Enabled. . . . . . . . : Yes\n" IDS_WINSPROXYNO "\tWINS Proxy enabled. . . . . . . . : No\n" @@ -39,15 +43,6 @@ BEGIN IDS_LEASEEXPIRES "\tLease Expires . . . . . . . . . . : %s\n" END
-STRINGTABLE -BEGIN - IDS_BCAST "广播" - IDS_P2P "点对点" - IDS_MIXED "混合" - IDS_HYBRID "混杂" - IDS_UNKNOWN "未知" -END - STRINGTABLE BEGIN IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n" diff --git a/base/applications/network/ipconfig/lang/zh-TW.rc b/base/applications/network/ipconfig/lang/zh-TW.rc index 437899dc63e..64f7a3e9b3d 100644 --- a/base/applications/network/ipconfig/lang/zh-TW.rc +++ b/base/applications/network/ipconfig/lang/zh-TW.rc @@ -13,7 +13,11 @@ BEGIN IDS_HEADER "\nReactOS IP Configuration\n\n" IDS_HOSTNAME "\tHost Name . . . . . . . . . . . . : %hs\n" IDS_PRIMARYDNSSUFFIX "\tPrimary DNS Suffix. . . . . . . . : %hs\n" - IDS_NODETYPE "\tNode Type . . . . . . . . . . . . : " + IDS_NODETYPEBCAST "\tNode Type . . . . . . . . . . . . : 廣播\n" + IDS_NODETYPEP2P "\tNode Type . . . . . . . . . . . . : 點對點\n" + IDS_NODETYPEMIXED "\tNode Type . . . . . . . . . . . . : 混合\n" + IDS_NODETYPEHYBRID "\tNode Type . . . . . . . . . . . . : 混合\n" + IDS_NODETYPEUNKNOWN "\tNode Type . . . . . . . . . . . . : 不明\n" IDS_IPROUTINGNO "\tIP Routing Enabled. . . . . . . . : No\n" IDS_IPROUTINGYES "\tIP Routing Enabled. . . . . . . . : Yes\n" IDS_WINSPROXYNO "\tWINS Proxy enabled. . . . . . . . : No\n" @@ -39,15 +43,6 @@ BEGIN IDS_LEASEEXPIRES "\tLease Expires . . . . . . . . . . : %s\n" END
-STRINGTABLE -BEGIN - IDS_BCAST "廣播" - IDS_P2P "點對點" - IDS_MIXED "混合" - IDS_HYBRID "混合" - IDS_UNKNOWN "不明" -END - STRINGTABLE BEGIN IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n" diff --git a/base/applications/network/ipconfig/resource.h b/base/applications/network/ipconfig/resource.h index 9e6acba7b36..28d94f9393d 100644 --- a/base/applications/network/ipconfig/resource.h +++ b/base/applications/network/ipconfig/resource.h @@ -3,37 +3,36 @@ #define IDS_HEADER 100 #define IDS_HOSTNAME 101 #define IDS_PRIMARYDNSSUFFIX 102 -#define IDS_NODETYPE 103 -#define IDS_IPROUTINGNO 104 -#define IDS_IPROUTINGYES 105 -#define IDS_WINSPROXYNO 106 -#define IDS_WINSPROXYYES 107 -#define IDS_DNSSUFFIXLIST 108 -#define IDS_EMPTYLINE 109 -#define IDS_UNKNOWNADAPTER 110 -#define IDS_MEDIADISCONNECTED 111 -#define IDS_CONNECTIONDNSSUFFIX 112 -#define IDS_DESCRIPTION 113 -#define IDS_PHYSICALADDRESS 114 -#define IDS_DHCPNO 115 -#define IDS_DHCPYES 116 -#define IDS_AUTOCONFIGNO 117 -#define IDS_AUTOCONFIGYES 118 -#define IDS_IPADDRESS 119 -#define IDS_SUBNETMASK 120 -#define IDS_DEFAULTGATEWAY 121 -#define IDS_DHCPSERVER 122 -#define IDS_DNSSERVERS 123 -#define IDS_PRIMARYWINSSERVER 124 -#define IDS_SECONDARYWINSSERVER 125 -#define IDS_LEASEOBTAINED 126 -#define IDS_LEASEEXPIRES 127 +#define IDS_NODETYPEBCAST 103 +#define IDS_NODETYPEP2P 104 +#define IDS_NODETYPEMIXED 105 +#define IDS_NODETYPEHYBRID 106 +#define IDS_NODETYPEUNKNOWN 107 +#define IDS_IPROUTINGNO 108 +#define IDS_IPROUTINGYES 109 +#define IDS_WINSPROXYNO 110 +#define IDS_WINSPROXYYES 111 +#define IDS_DNSSUFFIXLIST 112 +#define IDS_EMPTYLINE 113 +#define IDS_UNKNOWNADAPTER 114 +#define IDS_MEDIADISCONNECTED 115 +#define IDS_CONNECTIONDNSSUFFIX 116 +#define IDS_DESCRIPTION 117 +#define IDS_PHYSICALADDRESS 118 +#define IDS_DHCPNO 119 +#define IDS_DHCPYES 120 +#define IDS_AUTOCONFIGNO 121 +#define IDS_AUTOCONFIGYES 122 +#define IDS_IPADDRESS 123 +#define IDS_SUBNETMASK 124 +#define IDS_DEFAULTGATEWAY 125 +#define IDS_DHCPSERVER 126 +#define IDS_DNSSERVERS 127 +#define IDS_PRIMARYWINSSERVER 128 +#define IDS_SECONDARYWINSSERVER 129 +#define IDS_LEASEOBTAINED 130 +#define IDS_LEASEEXPIRES 131
-#define IDS_UNKNOWN 141 -#define IDS_BCAST 142 -#define IDS_P2P 143 -#define IDS_MIXED 144 -#define IDS_HYBRID 145
/* adapter types */ #define IDS_OTHER 146
-
Eric Kohl