Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 23:05:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NET] Move TIME, USE, USER, VIEW and NET command syntax and help texts into a message table and add the translators names to the message file.

Browse source
This commit is contained in:
Eric Kohl 2018-12-24 11:48:23 +01:00
parent 4984e1b810
commit 4e28e65490
13 changed files with 365 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

30
base/applications/network/net/cmdUser.c
View file

@ -636,19 +636,6 @@ cmdUser(
BOOL bPasswordAllocated = FALSE;
NET_API_STATUS Status;
if (argc == 2)
{
Status = EnumerateUsers();
ConPrintf(StdOut, L"Status: %lu\n", Status);
return 0;
}
else if (argc == 3)
{
Status = DisplayUser(argv[2]);
ConPrintf(StdOut, L"Status: %lu\n", Status);
return 0;
}
i = 2;
if (argv[i][0] != L'/')
{
@ -668,7 +655,7 @@ cmdUser(
{
if (_wcsicmp(argv[j], L"/help") == 0)
{
ConResPuts(StdOut, IDS_USER_HELP);
PrintNetMessage(MSG_USER_HELP);
return 0;
}
else if (_wcsicmp(argv[j], L"/add") == 0)
@ -694,6 +681,19 @@ cmdUser(
}
}
if (lpUserName == NULL && lpPassword == NULL)
{
Status = EnumerateUsers();
ConPrintf(StdOut, L"Status: %lu\n", Status);
return 0;
}
else if (lpUserName != NULL && lpPassword == NULL)
{
Status = DisplayUser(lpUserName);
ConPrintf(StdOut, L"Status: %lu\n", Status);
return 0;
}
if (bAdd && bDelete)
{
result = 1;
@ -923,7 +923,7 @@ done:
if (result != 0)
{
ConResPuts(StdOut, IDS_GENERIC_SYNTAX);
ConResPuts(StdOut, IDS_USER_SYNTAX);
PrintNetMessage(MSG_USER_SYNTAX);
}
return result;

16
base/applications/network/net/help.c
View file

@ -155,29 +155,29 @@ INT cmdHelp(INT argc, WCHAR **argv)
if (_wcsicmp(argv[2], L"TIME") == 0)
{
ConResPuts(StdOut, IDS_TIME_SYNTAX);
ConResPuts(StdOut, IDS_TIME_HELP);
PrintNetMessage(MSG_TIME_SYNTAX);
PrintNetMessage(MSG_TIME_HELP);
return 0;
}
if (_wcsicmp(argv[2], L"USE") == 0)
{
ConResPuts(StdOut, IDS_USE_SYNTAX);
ConResPuts(StdOut, IDS_USE_HELP);
PrintNetMessage(MSG_USE_SYNTAX);
PrintNetMessage(MSG_USE_HELP);
return 0;
}
if (_wcsicmp(argv[2], L"USER") == 0)
{
ConResPuts(StdOut, IDS_USER_SYNTAX);
ConResPuts(StdOut, IDS_USER_HELP);
PrintNetMessage(MSG_USER_SYNTAX);
PrintNetMessage(MSG_USER_HELP);
return 0;
}
if (_wcsicmp(argv[2], L"VIEW") == 0)
{
ConResPuts(StdOut, IDS_VIEW_SYNTAX);
ConResPuts(StdOut, IDS_VIEW_HELP);
PrintNetMessage(MSG_VIEW_SYNTAX);
PrintNetMessage(MSG_VIEW_HELP);
return 0;
}

15
base/applications/network/net/lang/en-US.rc
View file

@ -2,21 +2,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
STRINGTABLE
BEGIN
IDS_TIME_SYNTAX "NET TIME ...\n\n"
IDS_TIME_HELP "TIME\n...\n\n"
IDS_USE_SYNTAX "NET USE ...\n\n"
IDS_USE_HELP "USE\n...\n\n"
IDS_USER_SYNTAX "NET USER [username [password | *] [options]] [/DOMAIN]\n\
username {password | *} /ADD [options] [/DOMAIN]\n\
username [/DELETE] [/DOMAIN]\n\n"
IDS_USER_HELP "USER\n...\n\n"
IDS_VIEW_SYNTAX "NET VIEW ...\n\n"
IDS_VIEW_HELP "VIEW\n...\n\n"
IDS_NET_SYNTAX "NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\
HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\
SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ]\n"
IDS_ACCOUNTS_FORCE_LOGOFF "Force logoff after"
IDS_ACCOUNTS_LOGOFF_SECONDS "%lu seconds"
IDS_ACCOUNTS_MIN_PW_AGE "Minimum password age (in days)"

14
base/applications/network/net/lang/es-ES.rc
View file

@ -5,20 +5,6 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
STRINGTABLE
BEGIN
IDS_TIME_SYNTAX "NET TIME ...\n\n"
IDS_TIME_HELP "TIME\n...\n\n"
IDS_USE_SYNTAX "NET USE ...\n\n"
IDS_USE_HELP "USE\n...\n\n"
IDS_USER_SYNTAX "NET USER [usuario [contraseña | *] [opciones]] [/DOMAIN]\n\
usuario {contraseña | *} /ADD [opciones] [/DOMAIN]\n\
usuario [/DELETE] [/DOMAIN]\n\n"
IDS_USER_HELP "USER\n...\n\n"
IDS_VIEW_SYNTAX "NET VIEW ...\n\n"
IDS_VIEW_HELP "VIEW\n...\n\n"
IDS_NET_SYNTAX "NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\
HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\
SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ]\n"
IDS_ACCOUNTS_FORCE_LOGOFF "Forzar cierre de sesión tras"
IDS_ACCOUNTS_LOGOFF_SECONDS "%lu segundos"
IDS_ACCOUNTS_MIN_PW_AGE "Validez mínima de contraseña (en días)"

15
base/applications/network/net/lang/pl-PL.rc
View file

@ -1,21 +1,6 @@
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
STRINGTABLE
BEGIN
IDS_TIME_SYNTAX "NET TIME ...\n\n"
IDS_TIME_HELP "TIME\n...\n\n"
IDS_USE_SYNTAX "NET USE ...\n\n"
IDS_USE_HELP "USE\n...\n\n"
IDS_USER_SYNTAX "NET USER [nazwa_użytkownika [hasło | *] [opcje]] [/DOMAIN]\n\
nazwa_użytkownika {hasło | *} /ADD [opcje] [/DOMAIN]\n\
nazwa_użytkownika [/DELETE] [/DOMAIN]\n\n"
IDS_USER_HELP "USER\n...\n\n"
IDS_VIEW_SYNTAX "NET VIEW ...\n\n"
IDS_VIEW_HELP "VIEW\n...\n\n"
IDS_NET_SYNTAX "NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\
HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\
SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ]\n"
IDS_ACCOUNTS_FORCE_LOGOFF "Wymuś wylogowanie po upływie"
IDS_ACCOUNTS_LOGOFF_SECONDS "%lu sekund"
IDS_ACCOUNTS_MIN_PW_AGE "Minimalny okres ważności hasła (dni)"

14
base/applications/network/net/lang/ro-RO.rc
View file

@ -8,20 +8,6 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
STRINGTABLE
BEGIN
IDS_TIME_SYNTAX "NET TIME ...\n\n"
IDS_TIME_HELP "TIME\n...\n\n"
IDS_USE_SYNTAX "NET USE ...\n\n"
IDS_USE_HELP "USE\n...\n\n"
IDS_USER_SYNTAX "NET USER [nume-utilizator [parolă | *] [opțiuni]] [/DOMAIN]\n\
nume-utilizator {parolă | *} /ADD [opțiuni] [/DOMAIN]\n\
nume-utilizator [/DELETE] [/DOMAIN]\n\n"
IDS_USER_HELP "USER\n...\n\n"
IDS_VIEW_SYNTAX "NET VIEW ...\n\n"
IDS_VIEW_HELP "VIEW\n...\n\n"
IDS_NET_SYNTAX "NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\
HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\
SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ]\n"
IDS_ACCOUNTS_FORCE_LOGOFF "Forțează deautentificarea după"
IDS_ACCOUNTS_LOGOFF_SECONDS "%lu secunde"
IDS_ACCOUNTS_MIN_PW_AGE "Vârsta minimă a parolei (în zile)"

14
base/applications/network/net/lang/ru-RU.rc
View file

@ -4,20 +4,6 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
STRINGTABLE
BEGIN
IDS_TIME_SYNTAX "NET TIME ...\n\n"
IDS_TIME_HELP "TIME\n...\n\n"
IDS_USE_SYNTAX "NET USE ...\n\n"
IDS_USE_HELP "USE\n...\n\n"
IDS_USER_SYNTAX "NET USER [имя_пользователя [пароль | *] [параметры]] [/DOMAIN]\n\
имя_пользователя {пароль | *} /ADD [параметры] [/DOMAIN]\n\
имя_пользователя [/DELETE] [/DOMAIN]\n\n"
IDS_USER_HELP "USER\n...\n\n"
IDS_VIEW_SYNTAX "NET VIEW ...\n\n"
IDS_VIEW_HELP "VIEW\n...\n\n"
IDS_NET_SYNTAX "NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\
HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\
SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ]\n"
IDS_ACCOUNTS_FORCE_LOGOFF "Принудительный выход через"
IDS_ACCOUNTS_LOGOFF_SECONDS "%lu секунд"
IDS_ACCOUNTS_MIN_PW_AGE "Минимальный срок действия пароля (дней)"

14
base/applications/network/net/lang/tr-TR.rc
View file

@ -4,20 +4,6 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
STRINGTABLE
BEGIN
IDS_TIME_SYNTAX "NET TIME ...\n\n"
IDS_TIME_HELP "TIME\n...\n\n"
IDS_USE_SYNTAX "NET USE ...\n\n"
IDS_USE_HELP "USE\n...\n\n"
IDS_USER_SYNTAX "NET USER [kullanıcı adı [şifre | *] [seçenekler]] [/DOMAIN]\n\
kullanıcı adı {şifre | *} /ADD [seçenekler] [/DOMAIN]\n\
kullanıcı adı [/DELETE] [/DOMAIN]\n\n"
IDS_USER_HELP "USER\n...\n\n"
IDS_VIEW_SYNTAX "NET VIEW ...\n\n"
IDS_VIEW_HELP "VIEW\n...\n\n"
IDS_NET_SYNTAX "NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\
HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\
SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ]\n"
IDS_ACCOUNTS_FORCE_LOGOFF "Sonra oturum kapatmaya zorla"
IDS_ACCOUNTS_LOGOFF_SECONDS "%lu sâniye"
IDS_ACCOUNTS_MIN_PW_AGE "En az şifre yaşı (gün)"

14
base/applications/network/net/lang/zh-CN.rc
View file

@ -4,20 +4,6 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
STRINGTABLE
BEGIN
IDS_TIME_SYNTAX "NET TIME ...\n\n"
IDS_TIME_HELP "TIME\n...\n\n"
IDS_USE_SYNTAX "NET USE ...\n\n"
IDS_USE_HELP "USE\n...\n\n"
IDS_USER_SYNTAX "NET USER [username [password | *] [options]] [/DOMAIN]\n\
username {password | *} /ADD [options] [/DOMAIN]\n\
username [/DELETE] [/DOMAIN]\n\n"
IDS_USER_HELP "USER\n...\n\n"
IDS_VIEW_SYNTAX "NET VIEW ...\n\n"
IDS_VIEW_HELP "VIEW\n...\n\n"
IDS_NET_SYNTAX "NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\
HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\
SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ]\n"
IDS_ACCOUNTS_FORCE_LOGOFF "强制注销后"
IDS_ACCOUNTS_LOGOFF_SECONDS "%lu 秒"
IDS_ACCOUNTS_MIN_PW_AGE "密码最短使用期限 (以天为单位)"

14
base/applications/network/net/lang/zh-TW.rc
View file

@ -4,20 +4,6 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
STRINGTABLE
BEGIN
IDS_TIME_SYNTAX "NET TIME ...\n\n"
IDS_TIME_HELP "TIME\n...\n\n"
IDS_USE_SYNTAX "NET USE ...\n\n"
IDS_USE_HELP "USE\n...\n\n"
IDS_USER_SYNTAX "NET USER [使用者名 [密碼 | *] [選項]] [/DOMAIN]\n\
使用者名 {密碼 | *} /ADD [選項] [/DOMAIN]\n\
使用者名 [/DELETE] [/DOMAIN]\n\n"
IDS_USER_HELP "USER\n...\n\n"
IDS_VIEW_SYNTAX "NET VIEW ...\n\n"
IDS_VIEW_HELP "VIEW\n...\n\n"
IDS_NET_SYNTAX "NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\
HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\
SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ]\n"
IDS_ACCOUNTS_FORCE_LOGOFF "強制登出後"
IDS_ACCOUNTS_LOGOFF_SECONDS "%lu 秒"
IDS_ACCOUNTS_MIN_PW_AGE "密碼最短使用期限 (以天)"

2
base/applications/network/net/main.c
View file

@ -246,7 +246,7 @@ int wmain(int argc, WCHAR **argv)
done:
if (bRun == FALSE)
ConResPuts(StdOut, IDS_NET_SYNTAX);
PrintNetMessage(MSG_NET_SYNTAX);
if (hModuleNetMsg != NULL)
FreeLibrary(hModuleNetMsg);

10
base/applications/network/net/resource.h
View file

@ -1,15 +1,5 @@
#pragma once
#define IDS_TIME_SYNTAX 174
#define IDS_TIME_HELP 175
#define IDS_USE_SYNTAX 176
#define IDS_USE_HELP 177
#define IDS_USER_SYNTAX 178
#define IDS_USER_HELP 179
#define IDS_VIEW_SYNTAX 180
#define IDS_VIEW_HELP 181
#define IDS_NET_SYNTAX 182
#define IDS_ACCOUNTS_FORCE_LOGOFF 200
#define IDS_ACCOUNTS_LOGOFF_SECONDS 201
#define IDS_ACCOUNTS_MIN_PW_AGE 202