https://git.reactos.org/?p=reactos.git;a=commitdiff;h=29bf209767e0bac0695dfb1769e72f2082d01f83
commit 29bf209767e0bac0695dfb1769e72f2082d01f83 Author: Eric Kohl <[email protected]> AuthorDate: Tue Apr 9 21:44:03 2019 +0200 Commit: Eric Kohl <[email protected]> CommitDate: Tue Apr 9 21:44:03 2019 +0200 [NET][MC] Move remaining generic strings from net.exe to netmsg.dll. Translators, please check the translations! --- base/applications/network/net/cmdAccounts.c | 20 ++++++++------ base/applications/network/net/cmdComputer.c | 9 ++++-- base/applications/network/net/cmdConfig.c | 21 ++++++++------ base/applications/network/net/cmdContinue.c | 6 ++-- base/applications/network/net/cmdGroup.c | 8 ++++-- base/applications/network/net/cmdHelp.c | 6 ++-- base/applications/network/net/cmdHelpMsg.c | 9 ++++-- base/applications/network/net/cmdLocalGroup.c | 8 ++++-- base/applications/network/net/cmdPause.c | 6 ++-- base/applications/network/net/cmdStart.c | 3 +- base/applications/network/net/cmdStatistics.c | 6 ++-- base/applications/network/net/cmdStop.c | 6 ++-- base/applications/network/net/cmdUse.c | 16 ++++++----- base/applications/network/net/cmdUser.c | 17 ++++++------ 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/main.c | 3 +- base/applications/network/net/resource.h | 5 ---- sdk/include/reactos/mc/netmsgmsg.mc | 40 +++++++++++++-------------- 25 files changed, 108 insertions(+), 137 deletions(-) diff --git a/base/applications/network/net/cmdAccounts.c b/base/applications/network/net/cmdAccounts.c index db1f1cd98be..55586c4962f 100644 --- a/base/applications/network/net/cmdAccounts.c +++ b/base/applications/network/net/cmdAccounts.c @@ -36,7 +36,8 @@ cmdAccounts( if (_wcsicmp(argv[i], L"help") == 0) { /* Print short syntax help */ - ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + PrintMessageString(4381); + ConPuts(StdOut, L"\n"); PrintNetMessage(MSG_ACCOUNTS_SYNTAX); return 0; } @@ -44,7 +45,8 @@ cmdAccounts( if (_wcsicmp(argv[i], L"/help") == 0) { /* Print full help text*/ - ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + PrintMessageString(4381); + ConPuts(StdOut, L"\n"); PrintNetMessage(MSG_ACCOUNTS_SYNTAX); PrintNetMessage(MSG_ACCOUNTS_HELP); return 0; @@ -52,7 +54,7 @@ cmdAccounts( if (_wcsicmp(argv[i], L"/domain") == 0) { - ConResPrintf(StdErr, IDS_ERROR_OPTION_NOT_SUPPORTED, L"/DOMAIN"); + ConPuts(StdErr, L"The /DOMAIN option is not supported yet.\n"); #if 0 Domain = TRUE; #endif @@ -68,7 +70,7 @@ cmdAccounts( if (_wcsnicmp(argv[i], L"/forcelogoff:", 13) == 0) { p = &argv[i][13]; - if (wcsicmp(p, L"no")) + if (wcsicmp(p, L"no") == 0) { Info0->usrmod0_force_logoff = TIMEQ_FOREVER; Modified = TRUE; @@ -78,7 +80,7 @@ cmdAccounts( value = wcstoul(p, &endptr, 10); if (*endptr != 0) { - ConResPrintf(StdErr, IDS_ERROR_INVALID_OPTION_VALUE, L"/FORCELOGOFF"); + PrintMessageStringV(3952, L"/FORCELOGOFF"); result = 1; goto done; } @@ -93,7 +95,7 @@ cmdAccounts( value = wcstoul(p, &endptr, 10); if (*endptr != 0) { - ConResPrintf(StdErr, IDS_ERROR_INVALID_OPTION_VALUE, L"/MINPWLEN"); + PrintMessageStringV(3952, L"/MINPWLEN"); result = 1; goto done; } @@ -115,7 +117,7 @@ cmdAccounts( value = wcstoul(p, &endptr, 10); if (*endptr != 0) { - ConResPrintf(StdErr, IDS_ERROR_INVALID_OPTION_VALUE, L"/MAXPWLEN"); + PrintMessageStringV(3952, L"/MAXPWLEN"); result = 1; goto done; } @@ -130,7 +132,7 @@ cmdAccounts( value = wcstoul(p, &endptr, 10); if (*endptr != 0) { - ConResPrintf(StdErr, IDS_ERROR_INVALID_OPTION_VALUE, L"/MINPWAGE"); + PrintMessageStringV(3952, L"/MINPWAGE"); result = 1; goto done; } @@ -144,7 +146,7 @@ cmdAccounts( value = wcstoul(p, &endptr, 10); if (*endptr != 0) { - ConResPrintf(StdErr, IDS_ERROR_INVALID_OPTION_VALUE, L"/UNIQUEPW"); + PrintMessageStringV(3952, L"/UNIQUEPW"); result = 1; goto done; } diff --git a/base/applications/network/net/cmdComputer.c b/base/applications/network/net/cmdComputer.c index f6ddf3c0377..5ca22a40dc0 100644 --- a/base/applications/network/net/cmdComputer.c +++ b/base/applications/network/net/cmdComputer.c @@ -49,7 +49,8 @@ cmdComputer( if (_wcsicmp(argv[i], L"help") == 0) { /* Print short syntax help */ - ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + PrintMessageString(4381); + ConPuts(StdOut, L"\n"); PrintNetMessage(MSG_COMPUTER_SYNTAX); return 0; } @@ -57,7 +58,8 @@ cmdComputer( if (_wcsicmp(argv[i], L"/help") == 0) { /* Print full help text*/ - ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + PrintMessageString(4381); + ConPuts(StdOut, L"\n"); PrintNetMessage(MSG_COMPUTER_SYNTAX); PrintNetMessage(MSG_COMPUTER_HELP); return 0; @@ -84,7 +86,8 @@ cmdComputer( (bAdd == FALSE && bDelete == FALSE) || (bAdd == TRUE && bDelete == TRUE)) { - ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + PrintMessageString(4381); + ConPuts(StdOut, L"\n"); PrintNetMessage(MSG_COMPUTER_SYNTAX); return 1; } diff --git a/base/applications/network/net/cmdConfig.c b/base/applications/network/net/cmdConfig.c index c26281718d5..59245279b3f 100644 --- a/base/applications/network/net/cmdConfig.c +++ b/base/applications/network/net/cmdConfig.c @@ -196,12 +196,14 @@ cmdConfig( /* Print short syntax help */ if (bServer == TRUE) { - ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + PrintMessageString(4381); + ConPuts(StdOut, L"\n"); PrintNetMessage(MSG_CONFIG_SERVER_SYNTAX); } else { - ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + PrintMessageString(4381); + ConPuts(StdOut, L"\n"); PrintNetMessage(MSG_CONFIG_SYNTAX); } return 0; @@ -212,13 +214,15 @@ cmdConfig( /* Print full help text*/ if (bServer == TRUE) { - ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + PrintMessageString(4381); + ConPuts(StdOut, L"\n"); PrintNetMessage(MSG_CONFIG_SERVER_SYNTAX); PrintNetMessage(MSG_CONFIG_SERVER_HELP); } else { - ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + PrintMessageString(4381); + ConPuts(StdOut, L"\n"); PrintNetMessage(MSG_CONFIG_SYNTAX); PrintNetMessage(MSG_CONFIG_HELP); } @@ -243,14 +247,14 @@ cmdConfig( lValue = wcstol(p, &endptr, 10); if (*endptr != 0) { - ConResPrintf(StdErr, IDS_ERROR_INVALID_OPTION_VALUE, L"/AUTODISCONNECT"); + PrintMessageStringV(3952, L"/AUTODISCONNECT"); result = 1; goto done; } if (lValue < -1 || lValue > 65535) { - ConResPrintf(StdErr, IDS_ERROR_INVALID_OPTION_VALUE, L"/AUTODISCONNECT"); + PrintMessageStringV(3952, L"/AUTODISCONNECT"); result = 1; goto done; } @@ -268,7 +272,7 @@ cmdConfig( p = &argv[i][8]; if (_wcsicmp(p, L"yes") != 0 && _wcsicmp(p, L"no") != 0) { - ConResPrintf(StdErr, IDS_ERROR_INVALID_OPTION_VALUE, L"/HIDDEN"); + PrintMessageStringV(3952, L"/HIDDEN"); result = 1; goto done; } @@ -278,7 +282,8 @@ cmdConfig( } else { - ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + PrintMessageString(4381); + ConPuts(StdOut, L"\n"); PrintNetMessage(MSG_CONFIG_SERVER_SYNTAX); result = 1; goto done; diff --git a/base/applications/network/net/cmdContinue.c b/base/applications/network/net/cmdContinue.c index 8b4716a411b..9721a6c1e0a 100644 --- a/base/applications/network/net/cmdContinue.c +++ b/base/applications/network/net/cmdContinue.c @@ -19,7 +19,8 @@ INT cmdContinue(INT argc, WCHAR **argv) if (argc != 3) { - ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + PrintMessageString(4381); + ConPuts(StdOut, L"\n"); PrintNetMessage(MSG_CONTINUE_SYNTAX); return 1; } @@ -28,7 +29,8 @@ INT cmdContinue(INT argc, WCHAR **argv) { if (_wcsicmp(argv[i], L"/help") == 0) { - ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + PrintMessageString(4381); + ConPuts(StdOut, L"\n"); PrintNetMessage(MSG_CONTINUE_SYNTAX); PrintNetMessage(MSG_CONTINUE_HELP); return 1; diff --git a/base/applications/network/net/cmdGroup.c b/base/applications/network/net/cmdGroup.c index b5bf316f229..087665d7d59 100644 --- a/base/applications/network/net/cmdGroup.c +++ b/base/applications/network/net/cmdGroup.c @@ -222,7 +222,8 @@ cmdGroup( { if (_wcsicmp(argv[i], L"/help") == 0) { - ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + PrintMessageString(4381); + ConPuts(StdOut, L"\n"); PrintNetMessage(MSG_GROUP_SYNTAX); PrintNetMessage(MSG_GROUP_HELP); return 0; @@ -241,7 +242,7 @@ cmdGroup( } else if (_wcsicmp(argv[i], L"/domain") == 0) { - ConResPrintf(StdErr, IDS_ERROR_OPTION_NOT_SUPPORTED, L"/DOMAIN"); + ConPuts(StdErr, L"The /DOMAIN option is not supported yet.\n"); #if 0 bDomain = TRUE; #endif @@ -350,7 +351,8 @@ done: if (result != 0) { - ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + PrintMessageString(4381); + ConPuts(StdOut, L"\n"); PrintNetMessage(MSG_GROUP_SYNTAX); } diff --git a/base/applications/network/net/cmdHelp.c b/base/applications/network/net/cmdHelp.c index 449a2a00ef8..dc668db1b59 100644 --- a/base/applications/network/net/cmdHelp.c +++ b/base/applications/network/net/cmdHelp.c @@ -11,7 +11,8 @@ INT cmdHelp(INT argc, WCHAR **argv) { - ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + PrintMessageString(4381); + ConPuts(StdOut, L"\n"); if (argc != 3) { @@ -199,7 +200,8 @@ INT cmdHelp(INT argc, WCHAR **argv) INT cmdSyntax(INT argc, WCHAR **argv) { - ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + PrintMessageString(4381); + ConPuts(StdOut, L"\n"); PrintNetMessage(MSG_SYNTAX_HELP); return 0; } diff --git a/base/applications/network/net/cmdHelpMsg.c b/base/applications/network/net/cmdHelpMsg.c index c2250ef9efc..85349c14221 100644 --- a/base/applications/network/net/cmdHelpMsg.c +++ b/base/applications/network/net/cmdHelpMsg.c @@ -23,7 +23,8 @@ INT cmdHelpMsg(INT argc, WCHAR **argv) if (argc < 3) { - ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + PrintMessageString(4381); + ConPuts(StdOut, L"\n"); PrintNetMessage(MSG_HELPMSG_SYNTAX); return 1; } @@ -32,7 +33,8 @@ INT cmdHelpMsg(INT argc, WCHAR **argv) { if (_wcsicmp(argv[i], L"/help") == 0) { - ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + PrintMessageString(4381); + ConPuts(StdOut, L"\n"); PrintNetMessage(MSG_HELPMSG_SYNTAX); PrintNetMessage(MSG_HELPMSG_HELP); return 1; @@ -42,7 +44,8 @@ INT cmdHelpMsg(INT argc, WCHAR **argv) errNum = wcstol(argv[2], &endptr, 10); if (*endptr != 0) { - ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + PrintMessageString(4381); + ConPuts(StdOut, L"\n"); PrintNetMessage(MSG_HELPMSG_SYNTAX); return 1; } diff --git a/base/applications/network/net/cmdLocalGroup.c b/base/applications/network/net/cmdLocalGroup.c index bd6647c63ad..53f813d065f 100644 --- a/base/applications/network/net/cmdLocalGroup.c +++ b/base/applications/network/net/cmdLocalGroup.c @@ -242,7 +242,8 @@ cmdLocalGroup( { if (_wcsicmp(argv[i], L"/help") == 0) { - ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + PrintMessageString(4381); + ConPuts(StdOut, L"\n"); PrintNetMessage(MSG_LOCALGROUP_SYNTAX); PrintNetMessage(MSG_LOCALGROUP_HELP); return 0; @@ -261,7 +262,7 @@ cmdLocalGroup( } else if (_wcsicmp(argv[i], L"/domain") == 0) { - ConResPrintf(StdErr, IDS_ERROR_OPTION_NOT_SUPPORTED, L"/DOMAIN"); + ConPuts(StdErr, L"The /DOMAIN option is not supported yet.\n"); #if 0 bDomain = TRUE; #endif @@ -380,7 +381,8 @@ done: if (result != 0) { - ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + PrintMessageString(4381); + ConPuts(StdOut, L"\n"); PrintNetMessage(MSG_LOCALGROUP_SYNTAX); } diff --git a/base/applications/network/net/cmdPause.c b/base/applications/network/net/cmdPause.c index afd583595cd..8f3ee8273ba 100644 --- a/base/applications/network/net/cmdPause.c +++ b/base/applications/network/net/cmdPause.c @@ -19,7 +19,8 @@ INT cmdPause(INT argc, WCHAR **argv) if (argc != 3) { - ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + PrintMessageString(4381); + ConPuts(StdOut, L"\n"); PrintNetMessage(MSG_PAUSE_SYNTAX); return 1; } @@ -28,7 +29,8 @@ INT cmdPause(INT argc, WCHAR **argv) { if (_wcsicmp(argv[i], L"/help") == 0) { - ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + PrintMessageString(4381); + ConPuts(StdOut, L"\n"); PrintNetMessage(MSG_PAUSE_SYNTAX); PrintNetMessage(MSG_PAUSE_HELP); return 1; diff --git a/base/applications/network/net/cmdStart.c b/base/applications/network/net/cmdStart.c index 082fa79d1dc..50029b129d9 100644 --- a/base/applications/network/net/cmdStart.c +++ b/base/applications/network/net/cmdStart.c @@ -173,7 +173,8 @@ cmdStart(INT argc, WCHAR **argv) { if (_wcsicmp(argv[i], L"/help") == 0) { - ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + PrintMessageString(4381); + ConPuts(StdOut, L"\n"); PrintNetMessage(MSG_START_SYNTAX); PrintNetMessage(MSG_START_HELP); return 1; diff --git a/base/applications/network/net/cmdStatistics.c b/base/applications/network/net/cmdStatistics.c index 8d4f68db865..db51641c6c1 100644 --- a/base/applications/network/net/cmdStatistics.c +++ b/base/applications/network/net/cmdStatistics.c @@ -272,7 +272,8 @@ cmdStatistics( if (_wcsicmp(argv[i], L"help") == 0) { /* Print short syntax help */ - ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + PrintMessageString(4381); + ConPuts(StdOut, L"\n"); PrintNetMessage(MSG_STATISTICS_SYNTAX); return 0; } @@ -280,7 +281,8 @@ cmdStatistics( if (_wcsicmp(argv[i], L"/help") == 0) { /* Print full help text*/ - ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + PrintMessageString(4381); + ConPuts(StdOut, L"\n"); PrintNetMessage(MSG_STATISTICS_SYNTAX); PrintNetMessage(MSG_STATISTICS_HELP); return 0; diff --git a/base/applications/network/net/cmdStop.c b/base/applications/network/net/cmdStop.c index dbb0cdd023b..b23ce7cd398 100644 --- a/base/applications/network/net/cmdStop.c +++ b/base/applications/network/net/cmdStop.c @@ -20,7 +20,8 @@ INT cmdStop(INT argc, WCHAR **argv) if (argc != 3) { - ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + PrintMessageString(4381); + ConPuts(StdOut, L"\n"); PrintNetMessage(MSG_STOP_SYNTAX); return 1; } @@ -29,7 +30,8 @@ INT cmdStop(INT argc, WCHAR **argv) { if (_wcsicmp(argv[i], L"/help") == 0) { - ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + PrintMessageString(4381); + ConPuts(StdOut, L"\n"); PrintNetMessage(MSG_STOP_SYNTAX); PrintNetMessage(MSG_STOP_HELP); return 1; diff --git a/base/applications/network/net/cmdUse.c b/base/applications/network/net/cmdUse.c index 1c1c479eff6..71c03803c7a 100644 --- a/base/applications/network/net/cmdUse.c +++ b/base/applications/network/net/cmdUse.c @@ -67,9 +67,11 @@ static VOID PrintError(DWORD Status) { + WCHAR szStatusBuffer[16]; LPWSTR Buffer; - ConResPrintf(StdErr, IDS_ERROR_SYSTEM_ERROR, Status); + swprintf(szStatusBuffer, L"%lu", Status); + PrintMessageStringV(3502, szStatusBuffer); if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, Status, 0, (LPWSTR)&Buffer, 0, NULL)) { @@ -119,7 +121,7 @@ cmdUse( { if (!ValidateDeviceName(argv[2])) { - ConResPrintf(StdErr, IDS_ERROR_INVALID_OPTION_VALUE, L"DeviceName"); + PrintMessageStringV(3952, L"DeviceName"); return 1; } @@ -142,7 +144,7 @@ cmdUse( if ((argv[2][0] != '*' && argv[2][1] != 0) && !ValidateDeviceName(argv[2])) { - ConResPrintf(StdErr, IDS_ERROR_INVALID_OPTION_VALUE, L"DeviceName"); + PrintMessageStringV(3952, L"DeviceName"); return 1; } } @@ -156,7 +158,7 @@ cmdUse( { if (!ValidateDeviceName(argv[Delete]) || argv[Delete][0] == L'*') { - ConResPrintf(StdErr, IDS_ERROR_INVALID_OPTION_VALUE, L"DeviceName"); + PrintMessageStringV(3952, L"DeviceName"); return 1; } @@ -176,13 +178,13 @@ cmdUse( Len = wcslen(argv[3]); if (Len < 4) { - ConResPrintf(StdErr, IDS_ERROR_INVALID_OPTION_VALUE, L"Name"); + PrintMessageStringV(3952, L"Name"); return 1; } if (argv[3][0] != L'\\' || argv[3][1] != L'\\') { - ConResPrintf(StdErr, IDS_ERROR_INVALID_OPTION_VALUE, L"Name"); + PrintMessageStringV(3952, L"Name"); return 1; } @@ -213,7 +215,7 @@ cmdUse( else { HeapFree(GetProcessHeap(), 0, Cpy); - ConResPrintf(StdErr, IDS_ERROR_INVALID_OPTION_VALUE, L"Persistent"); + PrintMessageStringV(3952, L"Persistent"); return 1; } } diff --git a/base/applications/network/net/cmdUser.c b/base/applications/network/net/cmdUser.c index e64094b011c..50cdbf7aee7 100644 --- a/base/applications/network/net/cmdUser.c +++ b/base/applications/network/net/cmdUser.c @@ -736,7 +736,7 @@ cmdUser( } else if (_wcsicmp(argv[j], L"/domain") == 0) { - ConResPrintf(StdErr, IDS_ERROR_OPTION_NOT_SUPPORTED, L"/DOMAIN"); + ConPuts(StdErr, L"The /DOMAIN option is not supported yet.\n"); #if 0 bDomain = TRUE; #endif @@ -818,7 +818,7 @@ cmdUser( } else { - ConResPrintf(StdErr, IDS_ERROR_INVALID_OPTION_VALUE, L"/ACTIVE"); + PrintMessageStringV(3952, L"/ACTIVE"); result = 1; goto done; } @@ -833,7 +833,7 @@ cmdUser( value = wcstoul(p, &endptr, 10); if (*endptr != 0) { - ConResPrintf(StdErr, IDS_ERROR_INVALID_OPTION_VALUE, L"/COUNTRYCODE"); + PrintMessageStringV(3952, L"/COUNTRYCODE"); result = 1; goto done; } @@ -851,7 +851,7 @@ cmdUser( } else if (!ParseDate(p, &pUserInfo->usri4_acct_expires)) { - ConResPrintf(StdErr, IDS_ERROR_INVALID_OPTION_VALUE, L"/EXPIRES"); + PrintMessageStringV(3952, L"/EXPIRES"); result = 1; goto done; } @@ -877,7 +877,7 @@ cmdUser( } else { - ConResPrintf(StdErr, IDS_ERROR_INVALID_OPTION_VALUE, L"/PASSWORDCHG"); + PrintMessageStringV(3952, L"/PASSWORDCHG"); result = 1; goto done; } @@ -895,7 +895,7 @@ cmdUser( } else { - ConResPrintf(StdErr, IDS_ERROR_INVALID_OPTION_VALUE, L"/PASSWORDREQ"); + PrintMessageStringV(3952, L"/PASSWORDREQ"); result = 1; goto done; } @@ -911,7 +911,7 @@ cmdUser( else if (_wcsnicmp(argv[j], L"/times:", 7) == 0) { /* FIXME */ - ConResPrintf(StdErr, IDS_ERROR_OPTION_NOT_SUPPORTED, L"/TIMES"); + ConPuts(StdErr, L"The /TIMES option is not supported yet.\n"); } else if (_wcsnicmp(argv[j], L"/usercomment:", 13) == 0) { @@ -987,7 +987,8 @@ done: if (result != 0) { - ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + PrintMessageString(4381); + ConPuts(StdOut, L"\n"); PrintNetMessage(MSG_USER_SYNTAX); } diff --git a/base/applications/network/net/lang/en-US.rc b/base/applications/network/net/lang/en-US.rc index 2b22b11b1af..11b0a59e8c6 100644 --- a/base/applications/network/net/lang/en-US.rc +++ b/base/applications/network/net/lang/en-US.rc @@ -10,11 +10,4 @@ BEGIN IDS_ACCOUNTS_WORKSTATION "Workstation" IDS_USE_NOW_CONNECTED "%s is now connected to %s\n" - - IDS_GENERIC_SYNTAX "The syntax of this command is:\n\n" - - IDS_ERROR_OPTION_NOT_SUPPORTED "The %s option is not supported yet.\n" - IDS_ERROR_INVALID_OPTION_VALUE "You entered an invalid value for the %s option.\n" - IDS_ERROR_SYSTEM_ERROR "The system error %d happened.\n" - IDS_ERROR_NO_ERROR "The command completed successfully.\n\n" END diff --git a/base/applications/network/net/lang/es-ES.rc b/base/applications/network/net/lang/es-ES.rc index 6daeda790f2..1e6c9cb4c55 100644 --- a/base/applications/network/net/lang/es-ES.rc +++ b/base/applications/network/net/lang/es-ES.rc @@ -13,11 +13,4 @@ BEGIN IDS_ACCOUNTS_WORKSTATION "Estación de trabajo" IDS_USE_NOW_CONNECTED "%s is now connected to %s\n" - - 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" - IDS_ERROR_INVALID_OPTION_VALUE "El valor para la opción %s no es válido.\n" - IDS_ERROR_SYSTEM_ERROR "The system error %d happened.\n" - IDS_ERROR_NO_ERROR "The command completed successfully.\n\n" END diff --git a/base/applications/network/net/lang/pl-PL.rc b/base/applications/network/net/lang/pl-PL.rc index fab498e45bd..31ce03a7062 100644 --- a/base/applications/network/net/lang/pl-PL.rc +++ b/base/applications/network/net/lang/pl-PL.rc @@ -9,11 +9,4 @@ BEGIN IDS_ACCOUNTS_WORKSTATION "Stacja robocza" IDS_USE_NOW_CONNECTED "%s jest obecnie podłączony do %s\n" - - 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" - IDS_ERROR_INVALID_OPTION_VALUE "Wprowadzono nieprawidłową wartość dla opcji %s.\n" - IDS_ERROR_SYSTEM_ERROR "Wystąpił błąd systemu %d.\n" - IDS_ERROR_NO_ERROR "Polecenie zostało wykonane pomyślnie.\n\n" END diff --git a/base/applications/network/net/lang/ro-RO.rc b/base/applications/network/net/lang/ro-RO.rc index 5f7eb64ae83..7379b9175ec 100644 --- a/base/applications/network/net/lang/ro-RO.rc +++ b/base/applications/network/net/lang/ro-RO.rc @@ -16,11 +16,4 @@ BEGIN IDS_ACCOUNTS_WORKSTATION "Stație de lucru" IDS_USE_NOW_CONNECTED "Conectarea %s la %s a fost realizată.\n" - - IDS_GENERIC_SYNTAX "Sintaxa acestei comenzi:\n\n" - - IDS_ERROR_OPTION_NOT_SUPPORTED "Opțiunea %s încă nu este admisă.\n" - IDS_ERROR_INVALID_OPTION_VALUE "Ați introdus o valoare nevalidă pentru opțiunea %s.\n" - IDS_ERROR_SYSTEM_ERROR "A survenit eroarea de sistem %d.\n" - IDS_ERROR_NO_ERROR "Comanda a fost executată cu succes.\n\n" END diff --git a/base/applications/network/net/lang/ru-RU.rc b/base/applications/network/net/lang/ru-RU.rc index 8e680f05344..cc81e5a17e5 100644 --- a/base/applications/network/net/lang/ru-RU.rc +++ b/base/applications/network/net/lang/ru-RU.rc @@ -12,11 +12,4 @@ BEGIN IDS_ACCOUNTS_WORKSTATION "Рабочая станция" IDS_USE_NOW_CONNECTED "%s сейчас подключен к %s\n" - - IDS_GENERIC_SYNTAX "Синтаксис данной команды:\n\n" - - IDS_ERROR_OPTION_NOT_SUPPORTED "Опция %s в данный момент не поддерживается.\n" - IDS_ERROR_INVALID_OPTION_VALUE "Вы ввели неверный данные для данной опции %s.\n" - IDS_ERROR_SYSTEM_ERROR "Произошла системная ошибка: %d.\n" - IDS_ERROR_NO_ERROR "Команда успешно выполнена.\n\n" END diff --git a/base/applications/network/net/lang/tr-TR.rc b/base/applications/network/net/lang/tr-TR.rc index 7e2a04224cb..e0a083033f9 100644 --- a/base/applications/network/net/lang/tr-TR.rc +++ b/base/applications/network/net/lang/tr-TR.rc @@ -12,11 +12,4 @@ BEGIN IDS_ACCOUNTS_WORKSTATION "İş istasyonu" IDS_USE_NOW_CONNECTED "%s şuna bağlandı: %s\n" - - IDS_GENERIC_SYNTAX "The syntax of this command is:\n\n" - - IDS_ERROR_OPTION_NOT_SUPPORTED "%s seçeneği daha desteklenmiyor.\n" - IDS_ERROR_INVALID_OPTION_VALUE "%s seçeneği için geçersiz bir değer girdiniz.\n" - IDS_ERROR_SYSTEM_ERROR "%d dizge hatâsı oldu.\n" - IDS_ERROR_NO_ERROR "Komut başarılı bir şekilde çalıştırıldı.\n\n" END diff --git a/base/applications/network/net/lang/zh-CN.rc b/base/applications/network/net/lang/zh-CN.rc index 0874b2c4e58..4f6ab0ea000 100644 --- a/base/applications/network/net/lang/zh-CN.rc +++ b/base/applications/network/net/lang/zh-CN.rc @@ -12,11 +12,4 @@ BEGIN IDS_ACCOUNTS_WORKSTATION "工作站" IDS_USE_NOW_CONNECTED "%s 现在连接到 %s\n" - - IDS_GENERIC_SYNTAX "The syntax of this command is:\n\n" - - IDS_ERROR_OPTION_NOT_SUPPORTED "尚不支持 %s 选项。\n" - IDS_ERROR_INVALID_OPTION_VALUE "您输入了 %s 选项的无效的值。\n" - IDS_ERROR_SYSTEM_ERROR "发生了系统错误 %d。\n" - IDS_ERROR_NO_ERROR "命令执行成功。\n\n" END diff --git a/base/applications/network/net/lang/zh-TW.rc b/base/applications/network/net/lang/zh-TW.rc index 202a8e733c1..648d849efb4 100644 --- a/base/applications/network/net/lang/zh-TW.rc +++ b/base/applications/network/net/lang/zh-TW.rc @@ -12,11 +12,4 @@ BEGIN IDS_ACCOUNTS_WORKSTATION "工作站" IDS_USE_NOW_CONNECTED "%s is now connected to %s\n" - - IDS_GENERIC_SYNTAX "The syntax of this command is:\n\n" - - IDS_ERROR_OPTION_NOT_SUPPORTED "尚不支援 %s 選項。\n" - IDS_ERROR_INVALID_OPTION_VALUE "您輸入了無效的值為 %s 選項。\n" - IDS_ERROR_SYSTEM_ERROR "The system error %d happened.\n" - IDS_ERROR_NO_ERROR "The command completed successfully.\n\n" END diff --git a/base/applications/network/net/main.c b/base/applications/network/net/main.c index 75baf1b1109..964ccceddcd 100644 --- a/base/applications/network/net/main.c +++ b/base/applications/network/net/main.c @@ -327,7 +327,8 @@ int wmain(int argc, WCHAR **argv) done: if (bRun == FALSE) { - ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + PrintMessageString(4381); + ConPuts(StdOut, L"\n"); PrintNetMessage(MSG_NET_SYNTAX); } diff --git a/base/applications/network/net/resource.h b/base/applications/network/net/resource.h index 1c418c1b61c..fc178baa3b9 100644 --- a/base/applications/network/net/resource.h +++ b/base/applications/network/net/resource.h @@ -9,9 +9,4 @@ #define IDS_USE_NOW_CONNECTED 500 -#define IDS_GENERIC_SYNTAX 607 -#define IDS_ERROR_OPTION_NOT_SUPPORTED 700 -#define IDS_ERROR_INVALID_OPTION_VALUE 701 -#define IDS_ERROR_SYSTEM_ERROR 702 -#define IDS_ERROR_NO_ERROR 703 diff --git a/sdk/include/reactos/mc/netmsgmsg.mc b/sdk/include/reactos/mc/netmsgmsg.mc index 39630f6e1a2..907db0989c8 100644 --- a/sdk/include/reactos/mc/netmsgmsg.mc +++ b/sdk/include/reactos/mc/netmsgmsg.mc @@ -15823,22 +15823,22 @@ Language=English The command completed successfully. . Language=Polish -The command completed successfully. +Polecenie zostało wykonane pomyślnie. . Language=Romanian -The command completed successfully. +Comanda a fost executată cu succes. . Language=Russian -The command completed successfully. +Команда успешно выполнена. . Language=Spanish The command completed successfully. . Language=Turkish -The command completed successfully. +Komut başarılı bir şekilde çalıştırıldı. . Language=Chinese -The command completed successfully. +命令执行成功。 . Language=Taiwanese The command completed successfully. @@ -15881,22 +15881,22 @@ Language=English System error %1 has occurred. . Language=Polish -System error %1 has occurred. +Wystąpił błąd systemu %1. . Language=Romanian -System error %1 has occurred. +A survenit eroarea de sistem %1. . Language=Russian -System error %1 has occurred. +Произошла системная ошибка: %1. . Language=Spanish System error %1 has occurred. . Language=Turkish -System error %1 has occurred. +%1 dizge hatâsı oldu. . Language=Chinese -System error %1 has occurred. +发生了系统错误 %1。 . Language=Taiwanese System error %1 has occurred. @@ -20475,25 +20475,25 @@ Language=English You entered an invalid value for the %1 option. . Language=Polish -You entered an invalid value for the %1 option. +Wprowadzono nieprawidłową wartość dla opcji %1. . Language=Romanian -You entered an invalid value for the %1 option. +Ați introdus o valoare nevalidă pentru opțiunea %1. . Language=Russian -You entered an invalid value for the %1 option. +Вы ввели неверный данные для данной опции %1. . Language=Spanish -You entered an invalid value for the %1 option. +El valor para la opción %1 no es válido. . Language=Turkish -You entered an invalid value for the %1 option. +%1 seçeneği için geçersiz bir değer girdiniz. . Language=Chinese -You entered an invalid value for the %1 option. +您输入了 %1 选项的无效的值。 . Language=Taiwanese -You entered an invalid value for the %1 option. +您輸入了無效的值為 %1 選項。 . MessageId=3953 @@ -23135,13 +23135,13 @@ Language=English The syntax of this command is: . Language=Polish -The syntax of this command is: +Składnia tego polecenia jest następująca: . Language=Romanian -The syntax of this command is: +Sintaxa acestei comenzi: . Language=Russian -The syntax of this command is: +Синтаксис данной команды: . Language=Spanish The syntax of this command is:
