https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3acec58fb5e7a8af2c8b94...
commit 3acec58fb5e7a8af2c8b949d3b16e3fedc2f0e49 Author: Eric Kohl eric.kohl@reactos.org AuthorDate: Sat May 4 21:08:27 2019 +0200 Commit: Eric Kohl eric.kohl@reactos.org CommitDate: Sat May 4 21:12:09 2019 +0200
[NET] Replace remaining strings of the NET ACCOUNTS command by messages --- base/applications/network/net/cmdAccounts.c | 12 ++++++------ 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 | 9 --------- 10 files changed, 6 insertions(+), 71 deletions(-)
diff --git a/base/applications/network/net/cmdAccounts.c b/base/applications/network/net/cmdAccounts.c index 55586c4962..7fad061c5c 100644 --- a/base/applications/network/net/cmdAccounts.c +++ b/base/applications/network/net/cmdAccounts.c @@ -174,11 +174,11 @@ cmdAccounts(
RtlGetNtProductType(&ProductType);
- PrintPaddedResourceString(IDS_ACCOUNTS_FORCE_LOGOFF, nPaddedLength); + PrintPaddedMessageString(4570, nPaddedLength); if (Info0->usrmod0_force_logoff == TIMEQ_FOREVER) PrintMessageString(4305); else - ConResPrintf(StdOut, IDS_ACCOUNTS_LOGOFF_SECONDS, Info0->usrmod0_force_logoff); + ConPrintf(StdOut, L"%lu", Info0->usrmod0_force_logoff); ConPuts(StdOut, L"\n");
PrintPaddedMessageString(4572, nPaddedLength); @@ -215,20 +215,20 @@ cmdAccounts( { if (ProductType == NtProductLanManNt) { - ConResPuts(StdOut, IDS_ACCOUNTS_PRIMARY_SERVER); + PrintMessageString(5070); } else if (ProductType == NtProductServer) { - ConResPuts(StdOut, IDS_ACCOUNTS_STANDALONE_SERVER); + PrintMessageString(5073); } else { - ConResPuts(StdOut, IDS_ACCOUNTS_WORKSTATION); + PrintMessageString(5072); } } else { - ConResPuts(StdOut, IDS_ACCOUNTS_BACKUP_SERVER); + PrintMessageString(5071); } 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 11b0a59e8c..38ae6cab44 100644 --- a/base/applications/network/net/lang/en-US.rc +++ b/base/applications/network/net/lang/en-US.rc @@ -2,12 +2,5 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
STRINGTABLE BEGIN - IDS_ACCOUNTS_FORCE_LOGOFF "Force logoff after" - IDS_ACCOUNTS_LOGOFF_SECONDS "%lu seconds" - IDS_ACCOUNTS_PRIMARY_SERVER "Primary server" - IDS_ACCOUNTS_BACKUP_SERVER "Backup server" - IDS_ACCOUNTS_STANDALONE_SERVER "Standalone server" - IDS_ACCOUNTS_WORKSTATION "Workstation" - IDS_USE_NOW_CONNECTED "%s is now connected to %s\n" END diff --git a/base/applications/network/net/lang/es-ES.rc b/base/applications/network/net/lang/es-ES.rc index 1e6c9cb4c5..dbafe64de6 100644 --- a/base/applications/network/net/lang/es-ES.rc +++ b/base/applications/network/net/lang/es-ES.rc @@ -5,12 +5,5 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
STRINGTABLE BEGIN - IDS_ACCOUNTS_FORCE_LOGOFF "Forzar cierre de sesión tras" - IDS_ACCOUNTS_LOGOFF_SECONDS "%lu segundos" - IDS_ACCOUNTS_PRIMARY_SERVER "Servidor primario" - IDS_ACCOUNTS_BACKUP_SERVER "Servidor de respaldo" - IDS_ACCOUNTS_STANDALONE_SERVER "Servidor independiente" - IDS_ACCOUNTS_WORKSTATION "Estación de trabajo" - IDS_USE_NOW_CONNECTED "%s is now connected to %s\n" END diff --git a/base/applications/network/net/lang/pl-PL.rc b/base/applications/network/net/lang/pl-PL.rc index 31ce03a706..8a09e17ef9 100644 --- a/base/applications/network/net/lang/pl-PL.rc +++ b/base/applications/network/net/lang/pl-PL.rc @@ -1,12 +1,5 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_ACCOUNTS_FORCE_LOGOFF "Wymuś wylogowanie po upływie" - IDS_ACCOUNTS_LOGOFF_SECONDS "%lu sekund" - IDS_ACCOUNTS_PRIMARY_SERVER "Serwer podstawowy" - IDS_ACCOUNTS_BACKUP_SERVER "Serwer zapasowy" - IDS_ACCOUNTS_STANDALONE_SERVER "Serwer autonomiczny" - IDS_ACCOUNTS_WORKSTATION "Stacja robocza" - IDS_USE_NOW_CONNECTED "%s jest obecnie podłączony do %s\n" END diff --git a/base/applications/network/net/lang/ro-RO.rc b/base/applications/network/net/lang/ro-RO.rc index 7379b9175e..094ecb1fec 100644 --- a/base/applications/network/net/lang/ro-RO.rc +++ b/base/applications/network/net/lang/ro-RO.rc @@ -8,12 +8,5 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
STRINGTABLE BEGIN - IDS_ACCOUNTS_FORCE_LOGOFF "Forțează deautentificarea după" - IDS_ACCOUNTS_LOGOFF_SECONDS "%lu secunde" - IDS_ACCOUNTS_PRIMARY_SERVER "Server primar" - IDS_ACCOUNTS_BACKUP_SERVER "Server de rezervă" - IDS_ACCOUNTS_STANDALONE_SERVER "Server de sine stătător" - IDS_ACCOUNTS_WORKSTATION "Stație de lucru" - IDS_USE_NOW_CONNECTED "Conectarea %s la %s a fost realizată.\n" END diff --git a/base/applications/network/net/lang/ru-RU.rc b/base/applications/network/net/lang/ru-RU.rc index cc81e5a17e..453eade937 100644 --- a/base/applications/network/net/lang/ru-RU.rc +++ b/base/applications/network/net/lang/ru-RU.rc @@ -4,12 +4,5 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
STRINGTABLE BEGIN - IDS_ACCOUNTS_FORCE_LOGOFF "Принудительный выход через" - IDS_ACCOUNTS_LOGOFF_SECONDS "%lu секунд" - IDS_ACCOUNTS_PRIMARY_SERVER "Основной сервер" - IDS_ACCOUNTS_BACKUP_SERVER "Резервный сервер" - IDS_ACCOUNTS_STANDALONE_SERVER "Автономный сервер" - IDS_ACCOUNTS_WORKSTATION "Рабочая станция" - IDS_USE_NOW_CONNECTED "%s сейчас подключен к %s\n" END diff --git a/base/applications/network/net/lang/tr-TR.rc b/base/applications/network/net/lang/tr-TR.rc index e0a083033f..d2e8689ca1 100644 --- a/base/applications/network/net/lang/tr-TR.rc +++ b/base/applications/network/net/lang/tr-TR.rc @@ -4,12 +4,5 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
STRINGTABLE BEGIN - IDS_ACCOUNTS_FORCE_LOGOFF "Sonra oturum kapatmaya zorla" - IDS_ACCOUNTS_LOGOFF_SECONDS "%lu sâniye" - IDS_ACCOUNTS_PRIMARY_SERVER "Birinci sunucu" - IDS_ACCOUNTS_BACKUP_SERVER "Yedekleme sunucusu" - IDS_ACCOUNTS_STANDALONE_SERVER "Bağımsız sunucu" - IDS_ACCOUNTS_WORKSTATION "İş istasyonu" - IDS_USE_NOW_CONNECTED "%s şuna bağlandı: %s\n" END diff --git a/base/applications/network/net/lang/zh-CN.rc b/base/applications/network/net/lang/zh-CN.rc index 4f6ab0ea00..7b04b492c6 100644 --- a/base/applications/network/net/lang/zh-CN.rc +++ b/base/applications/network/net/lang/zh-CN.rc @@ -4,12 +4,5 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
STRINGTABLE BEGIN - IDS_ACCOUNTS_FORCE_LOGOFF "强制注销后" - IDS_ACCOUNTS_LOGOFF_SECONDS "%lu 秒" - IDS_ACCOUNTS_PRIMARY_SERVER "主服务器" - IDS_ACCOUNTS_BACKUP_SERVER "备份服务器" - IDS_ACCOUNTS_STANDALONE_SERVER "独立服务器" - IDS_ACCOUNTS_WORKSTATION "工作站" - IDS_USE_NOW_CONNECTED "%s 现在连接到 %s\n" END diff --git a/base/applications/network/net/lang/zh-TW.rc b/base/applications/network/net/lang/zh-TW.rc index 648d849efb..51fddd57f9 100644 --- a/base/applications/network/net/lang/zh-TW.rc +++ b/base/applications/network/net/lang/zh-TW.rc @@ -4,12 +4,5 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
STRINGTABLE BEGIN - IDS_ACCOUNTS_FORCE_LOGOFF "強制登出後" - IDS_ACCOUNTS_LOGOFF_SECONDS "%lu 秒" - IDS_ACCOUNTS_PRIMARY_SERVER "主伺服器" - IDS_ACCOUNTS_BACKUP_SERVER "備份伺服器" - IDS_ACCOUNTS_STANDALONE_SERVER "獨立伺服器" - IDS_ACCOUNTS_WORKSTATION "工作站" - IDS_USE_NOW_CONNECTED "%s is now connected to %s\n" END diff --git a/base/applications/network/net/resource.h b/base/applications/network/net/resource.h index fc178baa3b..6ce6880835 100644 --- a/base/applications/network/net/resource.h +++ b/base/applications/network/net/resource.h @@ -1,12 +1,3 @@ #pragma once
-#define IDS_ACCOUNTS_FORCE_LOGOFF 200 -#define IDS_ACCOUNTS_LOGOFF_SECONDS 201 -#define IDS_ACCOUNTS_PRIMARY_SERVER 210 -#define IDS_ACCOUNTS_BACKUP_SERVER 211 -#define IDS_ACCOUNTS_STANDALONE_SERVER 212 -#define IDS_ACCOUNTS_WORKSTATION 213 - #define IDS_USE_NOW_CONNECTED 500 - -