8 Apr
2019
8 Apr
'19
8:48 p.m.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=88f899e132768dd68f560…
commit 88f899e132768dd68f56043e041063eda0310ff4
Author: Eric Kohl <eric.kohl(a)reactos.org>
AuthorDate: Mon Apr 8 22:48:06 2019 +0200
Commit: Eric Kohl <eric.kohl(a)reactos.org>
CommitDate: Mon Apr 8 22:48:06 2019 +0200
[NET][MC] Move generic strings from net.exe to netmsg.dll.
Translators, please check the translations!
---
base/applications/network/net/cmdAccounts.c | 6 +--
base/applications/network/net/cmdConfig.c | 4 +-
base/applications/network/net/cmdUser.c | 18 +++----
base/applications/network/net/lang/en-US.rc | 7 ---
base/applications/network/net/lang/es-ES.rc | 7 ---
base/applications/network/net/lang/pl-PL.rc | 7 ---
base/applications/network/net/lang/ro-RO.rc | 7 ---
base/applications/network/net/lang/ru-RU.rc | 7 ---
base/applications/network/net/lang/tr-TR.rc | 7 ---
base/applications/network/net/lang/zh-CN.rc | 7 ---
base/applications/network/net/lang/zh-TW.rc | 7 ---
base/applications/network/net/resource.h | 7 ---
sdk/include/reactos/mc/netmsgmsg.mc | 74 ++++++++++++++---------------
13 files changed, 51 insertions(+), 114 deletions(-)
diff --git a/base/applications/network/net/cmdAccounts.c
b/base/applications/network/net/cmdAccounts.c
index 8c940f03262..db1f1cd98be 100644
--- a/base/applications/network/net/cmdAccounts.c
+++ b/base/applications/network/net/cmdAccounts.c
@@ -174,7 +174,7 @@ cmdAccounts(
PrintPaddedResourceString(IDS_ACCOUNTS_FORCE_LOGOFF, nPaddedLength);
if (Info0->usrmod0_force_logoff == TIMEQ_FOREVER)
- ConResPuts(StdOut, IDS_GENERIC_NEVER);
+ PrintMessageString(4305);
else
ConResPrintf(StdOut, IDS_ACCOUNTS_LOGOFF_SECONDS,
Info0->usrmod0_force_logoff);
ConPuts(StdOut, L"\n");
@@ -190,14 +190,14 @@ cmdAccounts(
PrintPaddedMessageString(4575, nPaddedLength);
if (Info0->usrmod0_password_hist_len == 0)
- ConResPuts(StdOut, IDS_GENERIC_NONE);
+ PrintMessageString(4303);
else
ConPrintf(StdOut, L"%lu", Info0->usrmod0_password_hist_len);
ConPuts(StdOut, L"\n");
PrintPaddedMessageString(4578, nPaddedLength);
if (Info3->usrmod3_lockout_threshold == 0)
- ConResPuts(StdOut, IDS_GENERIC_NEVER);
+ PrintMessageString(4305);
else
ConPrintf(StdOut, L"%lu", Info3->usrmod3_lockout_threshold);
ConPuts(StdOut, L"\n");
diff --git a/base/applications/network/net/cmdConfig.c
b/base/applications/network/net/cmdConfig.c
index d8dc28290ed..c26281718d5 100644
--- a/base/applications/network/net/cmdConfig.c
+++ b/base/applications/network/net/cmdConfig.c
@@ -47,7 +47,7 @@ DisplayServerConfig(
ConPuts(StdOut, L"\n");
PrintPaddedMessageString(4492, nPaddedLength);
- ConResPuts(StdOut, (ServerInfo->sv102_hidden == SV_HIDDEN) ? IDS_GENERIC_YES :
IDS_GENERIC_NO);
+ PrintMessageString((ServerInfo->sv102_hidden == SV_HIDDEN) ? 4300 : 4301);
ConPuts(StdOut, L"\n");
PrintPaddedMessageString(4506, nPaddedLength);
@@ -58,7 +58,7 @@ DisplayServerConfig(
PrintPaddedMessageString(4520, nPaddedLength);
if (ServerInfo->sv102_disc == SV_NODISC)
- ConResPuts(StdOut, IDS_GENERIC_UNLIMITED);
+ PrintMessageString(4306);
else
ConPrintf(StdOut, L"%lu\n", ServerInfo->sv102_disc);
diff --git a/base/applications/network/net/cmdUser.c
b/base/applications/network/net/cmdUser.c
index 1adce8858c7..e64094b011c 100644
--- a/base/applications/network/net/cmdUser.c
+++ b/base/applications/network/net/cmdUser.c
@@ -266,16 +266,16 @@ DisplayUser(LPWSTR lpUserName)
PrintPaddedMessageString(4419, nPaddedLength);
if (pUserInfo->usri4_flags & UF_ACCOUNTDISABLE)
- ConResPuts(StdOut, IDS_GENERIC_NO);
+ PrintMessageString(4301);
else if (pUserInfo->usri4_flags & UF_LOCKOUT)
PrintMessageString(4440);
else
- ConResPuts(StdOut, IDS_GENERIC_YES);
+ PrintMessageString(4300);
ConPuts(StdOut, L"\n");
PrintPaddedMessageString(4420, nPaddedLength);
if (pUserInfo->usri4_acct_expires == TIMEQ_FOREVER)
- ConResPuts(StdOut, IDS_GENERIC_NEVER);
+ PrintMessageString(4305);
else
PrintDateTime(pUserInfo->usri4_acct_expires);
ConPuts(StdOut, L"\n\n");
@@ -287,7 +287,7 @@ DisplayUser(LPWSTR lpUserName)
PrintPaddedMessageString(4422, nPaddedLength);
if ((pUserInfo->usri4_flags & UF_DONT_EXPIRE_PASSWD) ||
pUserModals->usrmod0_max_passwd_age == TIMEQ_FOREVER)
- ConResPuts(StdOut, IDS_GENERIC_NEVER);
+ PrintMessageString(4305);
else
PrintDateTime(dwLastSet + pUserModals->usrmod0_max_passwd_age);
ConPuts(StdOut, L"\n");
@@ -297,16 +297,16 @@ DisplayUser(LPWSTR lpUserName)
ConPuts(StdOut, L"\n");
PrintPaddedMessageString(4437, nPaddedLength);
- ConResPuts(StdOut, (pUserInfo->usri4_flags & UF_PASSWD_NOTREQD) ?
IDS_GENERIC_NO : IDS_GENERIC_YES);
+ PrintMessageString((pUserInfo->usri4_flags & UF_PASSWD_NOTREQD) ? 4301 :
4300);
ConPuts(StdOut, L"\n");
PrintPaddedMessageString(4438, nPaddedLength);
- ConResPuts(StdOut, (pUserInfo->usri4_flags & UF_PASSWD_CANT_CHANGE) ?
IDS_GENERIC_NO : IDS_GENERIC_YES);
+ PrintMessageString((pUserInfo->usri4_flags & UF_PASSWD_CANT_CHANGE) ? 4301 :
4300);
ConPuts(StdOut, L"\n\n");
PrintPaddedMessageString(4424, nPaddedLength);
if (pUserInfo->usri4_workstations == NULL ||
wcslen(pUserInfo->usri4_workstations) == 0)
- ConResPuts(StdOut, IDS_GENERIC_ALL);
+ PrintMessageString(4302);
else
ConPrintf(StdOut, L"%s", pUserInfo->usri4_workstations);
ConPuts(StdOut, L"\n");
@@ -322,14 +322,14 @@ DisplayUser(LPWSTR lpUserName)
PrintPaddedMessageString(4430, nPaddedLength);
if (pUserInfo->usri4_last_logon == 0)
- ConResPuts(StdOut, IDS_GENERIC_NEVER);
+ PrintMessageString(4305);
else
PrintDateTime(pUserInfo->usri4_last_logon);
ConPuts(StdOut, L"\n\n");
PrintPaddedMessageString(4432, nPaddedLength);
if (pUserInfo->usri4_logon_hours == NULL)
- ConResPuts(StdOut, IDS_GENERIC_ALL);
+ PrintMessageString(4302);
ConPuts(StdOut, L"\n\n");
ConPuts(StdOut, L"\n");
diff --git a/base/applications/network/net/lang/en-US.rc
b/base/applications/network/net/lang/en-US.rc
index 4473e7c4cc9..2b22b11b1af 100644
--- a/base/applications/network/net/lang/en-US.rc
+++ b/base/applications/network/net/lang/en-US.rc
@@ -11,13 +11,6 @@ BEGIN
IDS_USE_NOW_CONNECTED "%s is now connected to %s\n"
- IDS_GENERIC_YES "Yes"
- IDS_GENERIC_NO "No"
- IDS_GENERIC_NEVER "Never"
- IDS_GENERIC_NONE "None"
- IDS_GENERIC_ALL "All"
- IDS_GENERIC_LOCKED "Locked"
- IDS_GENERIC_UNLIMITED "Unlimited"
IDS_GENERIC_SYNTAX "The syntax of this command is:\n\n"
IDS_ERROR_OPTION_NOT_SUPPORTED "The %s option is not supported yet.\n"
diff --git a/base/applications/network/net/lang/es-ES.rc
b/base/applications/network/net/lang/es-ES.rc
index 2f9b8335bf4..6daeda790f2 100644
--- a/base/applications/network/net/lang/es-ES.rc
+++ b/base/applications/network/net/lang/es-ES.rc
@@ -14,13 +14,6 @@ BEGIN
IDS_USE_NOW_CONNECTED "%s is now connected to %s\n"
- IDS_GENERIC_YES "Sí"
- IDS_GENERIC_NO "No"
- IDS_GENERIC_NEVER "Nunca"
- IDS_GENERIC_NONE "Ninguno"
- IDS_GENERIC_ALL "Todos"
- IDS_GENERIC_LOCKED "Bloqueado"
- IDS_GENERIC_UNLIMITED "Unlimited"
IDS_GENERIC_SYNTAX "The syntax of this command is:\n\n"
IDS_ERROR_OPTION_NOT_SUPPORTED "La opción %s todavía no está
disponible.\n"
diff --git a/base/applications/network/net/lang/pl-PL.rc
b/base/applications/network/net/lang/pl-PL.rc
index 54ed8767567..fab498e45bd 100644
--- a/base/applications/network/net/lang/pl-PL.rc
+++ b/base/applications/network/net/lang/pl-PL.rc
@@ -10,13 +10,6 @@ BEGIN
IDS_USE_NOW_CONNECTED "%s jest obecnie podłączony do %s\n"
- IDS_GENERIC_YES "Tak"
- IDS_GENERIC_NO "Nie"
- IDS_GENERIC_NEVER "Nigdy"
- IDS_GENERIC_NONE "Brak"
- IDS_GENERIC_ALL "Wszystkie"
- IDS_GENERIC_LOCKED "Zablokowane"
- IDS_GENERIC_UNLIMITED "Bez ograniczeń"
IDS_GENERIC_SYNTAX "Składnia tego polecenia jest następująca:\n\n"
IDS_ERROR_OPTION_NOT_SUPPORTED "Opcja %s nie jest jeszcze obsługiwana.\n"
diff --git a/base/applications/network/net/lang/ro-RO.rc
b/base/applications/network/net/lang/ro-RO.rc
index 4623835a55c..5f7eb64ae83 100644
--- a/base/applications/network/net/lang/ro-RO.rc
+++ b/base/applications/network/net/lang/ro-RO.rc
@@ -17,13 +17,6 @@ BEGIN
IDS_USE_NOW_CONNECTED "Conectarea %s la %s a fost realizată.\n"
- IDS_GENERIC_YES "Da"
- IDS_GENERIC_NO "Nu"
- IDS_GENERIC_NEVER "Niciodată"
- IDS_GENERIC_NONE "Nespecificat"
- IDS_GENERIC_ALL "Toate"
- IDS_GENERIC_LOCKED "Blocat"
- IDS_GENERIC_UNLIMITED "Nelimitat"
IDS_GENERIC_SYNTAX "Sintaxa acestei comenzi:\n\n"
IDS_ERROR_OPTION_NOT_SUPPORTED "Opțiunea %s încă nu este admisă.\n"
diff --git a/base/applications/network/net/lang/ru-RU.rc
b/base/applications/network/net/lang/ru-RU.rc
index 6b43a7f1d72..8e680f05344 100644
--- a/base/applications/network/net/lang/ru-RU.rc
+++ b/base/applications/network/net/lang/ru-RU.rc
@@ -13,13 +13,6 @@ BEGIN
IDS_USE_NOW_CONNECTED "%s сейчас подключен к %s\n"
- IDS_GENERIC_YES "Да"
- IDS_GENERIC_NO "Нет"
- IDS_GENERIC_NEVER "Никогда"
- IDS_GENERIC_NONE "Нет"
- IDS_GENERIC_ALL "Все"
- IDS_GENERIC_LOCKED "Заблокировано"
- IDS_GENERIC_UNLIMITED "Не ограничено"
IDS_GENERIC_SYNTAX "Синтаксис данной команды:\n\n"
IDS_ERROR_OPTION_NOT_SUPPORTED "Опция %s в данный момент не
поддерживается.\n"
diff --git a/base/applications/network/net/lang/tr-TR.rc
b/base/applications/network/net/lang/tr-TR.rc
index c812bc2a4aa..7e2a04224cb 100644
--- a/base/applications/network/net/lang/tr-TR.rc
+++ b/base/applications/network/net/lang/tr-TR.rc
@@ -13,13 +13,6 @@ BEGIN
IDS_USE_NOW_CONNECTED "%s şuna bağlandı: %s\n"
- IDS_GENERIC_YES "Evet"
- IDS_GENERIC_NO "Hayır"
- IDS_GENERIC_NEVER "Hiçbir Zaman"
- IDS_GENERIC_NONE "Yok"
- IDS_GENERIC_ALL "Tümü"
- IDS_GENERIC_LOCKED "Kilitli"
- IDS_GENERIC_UNLIMITED "Unlimited"
IDS_GENERIC_SYNTAX "The syntax of this command is:\n\n"
IDS_ERROR_OPTION_NOT_SUPPORTED "%s seçeneği daha desteklenmiyor.\n"
diff --git a/base/applications/network/net/lang/zh-CN.rc
b/base/applications/network/net/lang/zh-CN.rc
index 4662ec29af2..0874b2c4e58 100644
--- a/base/applications/network/net/lang/zh-CN.rc
+++ b/base/applications/network/net/lang/zh-CN.rc
@@ -13,13 +13,6 @@ BEGIN
IDS_USE_NOW_CONNECTED "%s 现在连接到 %s\n"
- IDS_GENERIC_YES "是"
- IDS_GENERIC_NO "否"
- IDS_GENERIC_NEVER "永不"
- IDS_GENERIC_NONE "无"
- IDS_GENERIC_ALL "所有"
- IDS_GENERIC_LOCKED "锁定"
- IDS_GENERIC_UNLIMITED "Unlimited"
IDS_GENERIC_SYNTAX "The syntax of this command is:\n\n"
IDS_ERROR_OPTION_NOT_SUPPORTED "尚不支持 %s 选项。\n"
diff --git a/base/applications/network/net/lang/zh-TW.rc
b/base/applications/network/net/lang/zh-TW.rc
index 43fdc9dab65..202a8e733c1 100644
--- a/base/applications/network/net/lang/zh-TW.rc
+++ b/base/applications/network/net/lang/zh-TW.rc
@@ -13,13 +13,6 @@ BEGIN
IDS_USE_NOW_CONNECTED "%s is now connected to %s\n"
- IDS_GENERIC_YES "是"
- IDS_GENERIC_NO "否"
- IDS_GENERIC_NEVER "永不"
- IDS_GENERIC_NONE "無"
- IDS_GENERIC_ALL "所有"
- IDS_GENERIC_LOCKED "鎖定"
- IDS_GENERIC_UNLIMITED "Unlimited"
IDS_GENERIC_SYNTAX "The syntax of this command is:\n\n"
IDS_ERROR_OPTION_NOT_SUPPORTED "尚不支援 %s 選項。\n"
diff --git a/base/applications/network/net/resource.h
b/base/applications/network/net/resource.h
index e1a58c88461..1c418c1b61c 100644
--- a/base/applications/network/net/resource.h
+++ b/base/applications/network/net/resource.h
@@ -9,13 +9,6 @@
#define IDS_USE_NOW_CONNECTED 500
-#define IDS_GENERIC_YES 600
-#define IDS_GENERIC_NO 601
-#define IDS_GENERIC_NEVER 602
-#define IDS_GENERIC_NONE 603
-#define IDS_GENERIC_ALL 604
-#define IDS_GENERIC_LOCKED 605
-#define IDS_GENERIC_UNLIMITED 606
#define IDS_GENERIC_SYNTAX 607
#define IDS_ERROR_OPTION_NOT_SUPPORTED 700
diff --git a/sdk/include/reactos/mc/netmsgmsg.mc b/sdk/include/reactos/mc/netmsgmsg.mc
index 9bb0ff92f88..39630f6e1a2 100644
--- a/sdk/include/reactos/mc/netmsgmsg.mc
+++ b/sdk/include/reactos/mc/netmsgmsg.mc
@@ -20778,25 +20778,25 @@ Language=English
Yes%0
.
Language=Polish
-Yes%0
+Tak%0
.
Language=Romanian
-Yes%0
+Da%0
.
Language=Russian
-Yes%0
+Да%0
.
Language=Spanish
-Yes%0
+Sí%0
.
Language=Turkish
-Yes%0
+Evet%0
.
Language=Chinese
-Yes%0
+是%0
.
Language=Taiwanese
-Yes%0
+是%0
.
MessageId=4301
@@ -20807,25 +20807,25 @@ Language=English
No%0
.
Language=Polish
-No%0
+Nie%0
.
Language=Romanian
-No%0
+Nu%0
.
Language=Russian
-No%0
+Нет%0
.
Language=Spanish
No%0
.
Language=Turkish
-No%0
+Hayır%0
.
Language=Chinese
-No%0
+否%0
.
Language=Taiwanese
-No%0
+否%0
.
MessageId=4302
@@ -20836,25 +20836,25 @@ Language=English
All%0
.
Language=Polish
-All%0
+Wszystkie%0
.
Language=Romanian
-All%0
+Toate%0
.
Language=Russian
-All%0
+Все%0
.
Language=Spanish
-All%0
+Todos%0
.
Language=Turkish
-All%0
+Tümü%0
.
Language=Chinese
-All%0
+所有%0
.
Language=Taiwanese
-All%0
+所有%0
.
MessageId=4303
@@ -20865,25 +20865,25 @@ Language=English
None%0
.
Language=Polish
-None%0
+Brak%0
.
Language=Romanian
-None%0
+Nespecificat%0
.
Language=Russian
-None%0
+Нет%0
.
Language=Spanish
-None%0
+Ninguno%0
.
Language=Turkish
-None%0
+Yok%0
.
Language=Chinese
-None%0
+无%0
.
Language=Taiwanese
-None%0
+無%0
.
MessageId=4304
@@ -20923,25 +20923,25 @@ Language=English
Never%0
.
Language=Polish
-Never%0
+Nigdy%0
.
Language=Romanian
-Never%0
+Niciodată%0
.
Language=Russian
-Never%0
+Никогда%0
.
Language=Spanish
-Never%0
+Nunca%0
.
Language=Turkish
-Never%0
+Hiçbir Zaman%0
.
Language=Chinese
-Never%0
+永不%0
.
Language=Taiwanese
-Never%0
+永不%0
.
MessageId=4306
@@ -20952,13 +20952,13 @@ Language=English
Unlimited%0
.
Language=Polish
-Unlimited%0
+Bez ograniczeń%0
.
Language=Romanian
-Unlimited%0
+Nelimitat%0
.
Language=Russian
-Unlimited%0
+Не ограничено%0
.
Language=Spanish
Unlimited%0
2089
days inactive
2089
days old
0 comments
1 participants
participants (1)
-
Eric Kohl