[ros-diffs] [reactos] 01/01: [NET][MC] Move NET USER strings from net.exe to netmsg.dll.

[Eric Kohl]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=050db4facb385cebd4d7b…

commit 050db4facb385cebd4d7b232e94b59efea2a6c82
Author:     Eric Kohl <eric.kohl(a)reactos.org>
AuthorDate: Sat Apr 6 15:32:00 2019 +0200
Commit:     Eric Kohl <eric.kohl(a)reactos.org>
CommitDate: Sat Apr 6 15:42:10 2019 +0200

    [NET][MC] Move NET USER strings from net.exe to netmsg.dll.
    
    Translators, please check the translations!
---
 base/applications/network/net/cmdUser.c     |  48 ++---
 base/applications/network/net/lang/en-US.rc |  22 --
 base/applications/network/net/lang/es-ES.rc |  22 --
 base/applications/network/net/lang/pl-PL.rc |  22 --
 base/applications/network/net/lang/ro-RO.rc |  22 --
 base/applications/network/net/lang/ru-RU.rc |  22 --
 base/applications/network/net/lang/tr-TR.rc |  22 --
 base/applications/network/net/lang/zh-CN.rc |  22 --
 base/applications/network/net/lang/zh-TW.rc |  22 --
 base/applications/network/net/resource.h    |  22 --
 sdk/include/reactos/mc/netmsgmsg.mc         | 314 ++++++++++++++--------------
 11 files changed, 181 insertions(+), 379 deletions(-)

diff --git a/base/applications/network/net/cmdUser.c
b/base/applications/network/net/cmdUser.c
index a2d092613f..517e2c028b 100644
--- a/base/applications/network/net/cmdUser.c
+++ b/base/applications/network/net/cmdUser.c
@@ -73,8 +73,8 @@ EnumerateUsers(VOID)
         return Status;
 
     ConPuts(StdOut, L"\n");
-    ConResPrintf(StdOut, IDS_USER_ACCOUNTS, pServer->sv100_name);
-    ConPuts(StdOut, L"\n\n");
+    PrintMessageStringV(4410, pServer->sv100_name);
+    ConPuts(StdOut, L"\n");
     PrintPadding(L'-', 79);
     ConPuts(StdOut, L"\n");
 
@@ -209,7 +209,7 @@ DisplayUser(LPWSTR lpUserName)
     DWORD dwLastSet;
     DWORD i;
     WCHAR szCountry[40];
-    INT nPaddedLength = 29;
+    INT nPaddedLength = 36;
     NET_API_STATUS Status;
 
     /* Modify the user */
@@ -247,93 +247,93 @@ DisplayUser(LPWSTR lpUserName)
     if (Status != NERR_Success)
         goto done;
 
-    PrintPaddedResourceString(IDS_USER_NAME, nPaddedLength);
+    PrintPaddedMessageString(4411, nPaddedLength);
     ConPrintf(StdOut, L"%s\n", pUserInfo->usri4_name);
 
-    PrintPaddedResourceString(IDS_USER_FULL_NAME, nPaddedLength);
+    PrintPaddedMessageString(4412, nPaddedLength);
     ConPrintf(StdOut, L"%s\n", pUserInfo->usri4_full_name);
 
-    PrintPaddedResourceString(IDS_USER_COMMENT, nPaddedLength);
+    PrintPaddedMessageString(4413, nPaddedLength);
     ConPrintf(StdOut, L"%s\n", pUserInfo->usri4_comment);
 
-    PrintPaddedResourceString(IDS_USER_USER_COMMENT, nPaddedLength);
+    PrintPaddedMessageString(4414, nPaddedLength);
     ConPrintf(StdOut, L"%s\n", pUserInfo->usri4_usr_comment);
 
-    PrintPaddedResourceString(IDS_USER_COUNTRY_CODE, nPaddedLength);
+    PrintPaddedMessageString(4416, nPaddedLength);
     GetCountryFromCountryCode(pUserInfo->usri4_country_code,
                               ARRAYSIZE(szCountry), szCountry);
     ConPrintf(StdOut, L"%03ld (%s)\n", pUserInfo->usri4_country_code,
szCountry);
 
-    PrintPaddedResourceString(IDS_USER_ACCOUNT_ACTIVE, nPaddedLength);
+    PrintPaddedMessageString(4419, nPaddedLength);
     if (pUserInfo->usri4_flags & UF_ACCOUNTDISABLE)
         ConResPuts(StdOut, IDS_GENERIC_NO);
     else if (pUserInfo->usri4_flags & UF_LOCKOUT)
-        ConResPuts(StdOut, IDS_GENERIC_LOCKED);
+        PrintMessageString(4440);
     else
         ConResPuts(StdOut, IDS_GENERIC_YES);
     ConPuts(StdOut, L"\n");
 
-    PrintPaddedResourceString(IDS_USER_ACCOUNT_EXPIRES, nPaddedLength);
+    PrintPaddedMessageString(4420, nPaddedLength);
     if (pUserInfo->usri4_acct_expires == TIMEQ_FOREVER)
         ConResPuts(StdOut, IDS_GENERIC_NEVER);
     else
         PrintDateTime(pUserInfo->usri4_acct_expires);
     ConPuts(StdOut, L"\n\n");
 
-    PrintPaddedResourceString(IDS_USER_PW_LAST_SET, nPaddedLength);
+    PrintPaddedMessageString(4421, nPaddedLength);
     dwLastSet = GetTimeInSeconds() - pUserInfo->usri4_password_age;
     PrintDateTime(dwLastSet);
     ConPuts(StdOut, L"\n");
 
-    PrintPaddedResourceString(IDS_USER_PW_EXPIRES, nPaddedLength);
+    PrintPaddedMessageString(4422, nPaddedLength);
     if ((pUserInfo->usri4_flags & UF_DONT_EXPIRE_PASSWD) ||
pUserModals->usrmod0_max_passwd_age == TIMEQ_FOREVER)
         ConResPuts(StdOut, IDS_GENERIC_NEVER);
     else
         PrintDateTime(dwLastSet + pUserModals->usrmod0_max_passwd_age);
     ConPuts(StdOut, L"\n");
 
-    PrintPaddedResourceString(IDS_USER_PW_CHANGEABLE, nPaddedLength);
+    PrintPaddedMessageString(4423, nPaddedLength);
     PrintDateTime(dwLastSet + pUserModals->usrmod0_min_passwd_age);
     ConPuts(StdOut, L"\n");
 
-    PrintPaddedResourceString(IDS_USER_PW_REQUIRED, nPaddedLength);
+    PrintPaddedMessageString(4437, nPaddedLength);
     ConResPuts(StdOut, (pUserInfo->usri4_flags & UF_PASSWD_NOTREQD) ?
IDS_GENERIC_NO : IDS_GENERIC_YES);
     ConPuts(StdOut, L"\n");
 
-    PrintPaddedResourceString(IDS_USER_CHANGE_PW, nPaddedLength);
+    PrintPaddedMessageString(4438, nPaddedLength);
     ConResPuts(StdOut, (pUserInfo->usri4_flags & UF_PASSWD_CANT_CHANGE) ?
IDS_GENERIC_NO : IDS_GENERIC_YES);
     ConPuts(StdOut, L"\n\n");
 
-    PrintPaddedResourceString(IDS_USER_WORKSTATIONS, nPaddedLength);
+    PrintPaddedMessageString(4424, nPaddedLength);
     if (pUserInfo->usri4_workstations == NULL ||
wcslen(pUserInfo->usri4_workstations) == 0)
         ConResPuts(StdOut, IDS_GENERIC_ALL);
     else
         ConPrintf(StdOut, L"%s", pUserInfo->usri4_workstations);
     ConPuts(StdOut, L"\n");
 
-    PrintPaddedResourceString(IDS_USER_LOGON_SCRIPT, nPaddedLength);
+    PrintPaddedMessageString(4429, nPaddedLength);
     ConPrintf(StdOut, L"%s\n", pUserInfo->usri4_script_path);
 
-    PrintPaddedResourceString(IDS_USER_PROFILE, nPaddedLength);
+    PrintPaddedMessageString(4439, nPaddedLength);
     ConPrintf(StdOut, L"%s\n", pUserInfo->usri4_profile);
 
-    PrintPaddedResourceString(IDS_USER_HOME_DIR, nPaddedLength);
+    PrintPaddedMessageString(4436, nPaddedLength);
     ConPrintf(StdOut, L"%s\n", pUserInfo->usri4_home_dir);
 
-    PrintPaddedResourceString(IDS_USER_LAST_LOGON, nPaddedLength);
+    PrintPaddedMessageString(4430, nPaddedLength);
     if (pUserInfo->usri4_last_logon == 0)
         ConResPuts(StdOut, IDS_GENERIC_NEVER);
     else
         PrintDateTime(pUserInfo->usri4_last_logon);
     ConPuts(StdOut, L"\n\n");
 
-    PrintPaddedResourceString(IDS_USER_LOGON_HOURS, nPaddedLength);
+    PrintPaddedMessageString(4432, nPaddedLength);
     if (pUserInfo->usri4_logon_hours == NULL)
         ConResPuts(StdOut, IDS_GENERIC_ALL);
     ConPuts(StdOut, L"\n\n");
 
     ConPuts(StdOut, L"\n");
-    PrintPaddedResourceString(IDS_USER_LOCAL_GROUPS, nPaddedLength);
+    PrintPaddedMessageString(4427, nPaddedLength);
     if (dwLocalGroupTotal != 0 && pLocalGroupInfo != NULL)
     {
         for (i = 0; i < dwLocalGroupTotal; i++)
@@ -348,7 +348,7 @@ DisplayUser(LPWSTR lpUserName)
         ConPuts(StdOut, L"\n");
     }
 
-    PrintPaddedResourceString(IDS_USER_GLOBAL_GROUPS, nPaddedLength);
+    PrintPaddedMessageString(4431, nPaddedLength);
     if (dwGroupTotal != 0 && pGroupInfo != NULL)
     {
         for (i = 0; i < dwGroupTotal; i++)
diff --git a/base/applications/network/net/lang/en-US.rc
b/base/applications/network/net/lang/en-US.rc
index 0692ff5da8..d95ed0dded 100644
--- a/base/applications/network/net/lang/en-US.rc
+++ b/base/applications/network/net/lang/en-US.rc
@@ -48,28 +48,6 @@ BEGIN
     IDS_STATISTICS_WKS_USECOUNT "Use count"
     IDS_STATISTICS_WKS_FAILUSECOUNT "Failed use count"
 
-    IDS_USER_ACCOUNTS "User accounts for \\\\%s"
-    IDS_USER_NAME "User name"
-    IDS_USER_FULL_NAME "Full name"
-    IDS_USER_COMMENT "Comment"
-    IDS_USER_USER_COMMENT "User comment"
-    IDS_USER_COUNTRY_CODE "Country code"
-    IDS_USER_ACCOUNT_ACTIVE "Account active"
-    IDS_USER_ACCOUNT_EXPIRES "Account expires"
-    IDS_USER_PW_LAST_SET "Password last set"
-    IDS_USER_PW_EXPIRES "Password expires"
-    IDS_USER_PW_CHANGEABLE "Password changeable"
-    IDS_USER_PW_REQUIRED "Password required"
-    IDS_USER_CHANGE_PW "User may change password"
-    IDS_USER_WORKSTATIONS "Workstations allowed"
-    IDS_USER_LOGON_SCRIPT "Logon script"
-    IDS_USER_PROFILE "User profile"
-    IDS_USER_HOME_DIR "Home directory"
-    IDS_USER_LAST_LOGON "Last logon"
-    IDS_USER_LOGON_HOURS "Logon hours allowed"
-    IDS_USER_LOCAL_GROUPS "Local group memberships"
-    IDS_USER_GLOBAL_GROUPS "Global group memberships"
-
     IDS_USER_ENTER_PASSWORD1 "Enter a new password for the user: "
     IDS_USER_ENTER_PASSWORD2 "Enter the password again: "
     IDS_USER_NO_PASSWORD_MATCH "The passwords do not match!"
diff --git a/base/applications/network/net/lang/es-ES.rc
b/base/applications/network/net/lang/es-ES.rc
index c193438f57..9a70556e90 100644
--- a/base/applications/network/net/lang/es-ES.rc
+++ b/base/applications/network/net/lang/es-ES.rc
@@ -51,28 +51,6 @@ BEGIN
     IDS_STATISTICS_WKS_USECOUNT "Use count"
     IDS_STATISTICS_WKS_FAILUSECOUNT "Failed use count"
 
-    IDS_USER_ACCOUNTS "Cuentas de usuario en \\\\%s"
-    IDS_USER_NAME "Nombre de usuario"
-    IDS_USER_FULL_NAME "Nombre completo"
-    IDS_USER_COMMENT "Comentario"
-    IDS_USER_USER_COMMENT "Comentario de usuario"
-    IDS_USER_COUNTRY_CODE "Código de país"
-    IDS_USER_ACCOUNT_ACTIVE "Cuenta activa"
-    IDS_USER_ACCOUNT_EXPIRES "Fecha de expiración"
-    IDS_USER_PW_LAST_SET "La contraseña se cambió por última vez"
-    IDS_USER_PW_EXPIRES "La contraseña expira"
-    IDS_USER_PW_CHANGEABLE "La contraseña se puede cambiar"
-    IDS_USER_PW_REQUIRED "Se necesita contraseña"
-    IDS_USER_CHANGE_PW "El usuario puede cambiar la contraseña"
-    IDS_USER_WORKSTATIONS "Se permiten estaciones de trabajo"
-    IDS_USER_LOGON_SCRIPT "Script de inicio"
-    IDS_USER_PROFILE "Perfil de usuario"
-    IDS_USER_HOME_DIR "Carpeta raíz"
-    IDS_USER_LAST_LOGON "Último inicio de sesión"
-    IDS_USER_LOGON_HOURS "Horas de inicio permitidas"
-    IDS_USER_LOCAL_GROUPS "Miembro de los grupos locales"
-    IDS_USER_GLOBAL_GROUPS "Miembro de los grupos globales"
-
     IDS_USER_ENTER_PASSWORD1 "Escriba una contraseña: "
     IDS_USER_ENTER_PASSWORD2 "Vuelva a escribir la contraseña: "
     IDS_USER_NO_PASSWORD_MATCH "Las contraseñas no coinciden."
diff --git a/base/applications/network/net/lang/pl-PL.rc
b/base/applications/network/net/lang/pl-PL.rc
index df499fc1fe..3ece6822dd 100644
--- a/base/applications/network/net/lang/pl-PL.rc
+++ b/base/applications/network/net/lang/pl-PL.rc
@@ -47,28 +47,6 @@ BEGIN
     IDS_STATISTICS_WKS_USECOUNT "Liczba pomyślnych prób użycia"
     IDS_STATISTICS_WKS_FAILUSECOUNT "Liczba niepomyślnych prób użycia"
 
-    IDS_USER_ACCOUNTS "Konta użytkowników dla \\\\%s"
-    IDS_USER_NAME "Nazwa użytkownika"
-    IDS_USER_FULL_NAME "Pełna nazwa"
-    IDS_USER_COMMENT "Komentarz"
-    IDS_USER_USER_COMMENT "Komentarz użytkownika"
-    IDS_USER_COUNTRY_CODE "Kod kraju"
-    IDS_USER_ACCOUNT_ACTIVE "Konto jest aktywne"
-    IDS_USER_ACCOUNT_EXPIRES "Wygasanie konta"
-    IDS_USER_PW_LAST_SET "Hasło ostatnio ustawiano"
-    IDS_USER_PW_EXPIRES "Ważność hasła wygasa"
-    IDS_USER_PW_CHANGEABLE "Hasło może być zmieniane"
-    IDS_USER_PW_REQUIRED "Wymagane jest hasło"
-    IDS_USER_CHANGE_PW "Użytkownik może zmieniać hasło"
-    IDS_USER_WORKSTATIONS "Dozwolone stacje robocze"
-    IDS_USER_LOGON_SCRIPT "Skrypt logowania"
-    IDS_USER_PROFILE "Profil użytkownika"
-    IDS_USER_HOME_DIR "Katalog macierzysty"
-    IDS_USER_LAST_LOGON "Ostatnie logowanie"
-    IDS_USER_LOGON_HOURS "Dozwolone godziny logowania"
-    IDS_USER_LOCAL_GROUPS "Członkostwa grup lokalnych"
-    IDS_USER_GLOBAL_GROUPS "Członkostwa grup globalnych"
-
     IDS_USER_ENTER_PASSWORD1 "Wpisz nowe hasło dla użytkownika: "
     IDS_USER_ENTER_PASSWORD2 "Wpisz hasło ponownie w celu potwierdzenia: "
     IDS_USER_NO_PASSWORD_MATCH "Hasła są niezgodne!"
diff --git a/base/applications/network/net/lang/ro-RO.rc
b/base/applications/network/net/lang/ro-RO.rc
index cb98767518..1608837557 100644
--- a/base/applications/network/net/lang/ro-RO.rc
+++ b/base/applications/network/net/lang/ro-RO.rc
@@ -54,28 +54,6 @@ BEGIN
     IDS_STATISTICS_WKS_USECOUNT "Număr de utilizări"
     IDS_STATISTICS_WKS_FAILUSECOUNT "Utilizări eșuate"
 
-    IDS_USER_ACCOUNTS "Conturi de utilizator pentru \\\\%s"
-    IDS_USER_NAME "Nume utilizator"
-    IDS_USER_FULL_NAME "Nume complet"
-    IDS_USER_COMMENT "Comentariu"
-    IDS_USER_USER_COMMENT "Comentariu de utilizator"
-    IDS_USER_COUNTRY_CODE "Cod de țară"
-    IDS_USER_ACCOUNT_ACTIVE "Cont activ"
-    IDS_USER_ACCOUNT_EXPIRES "Cont expiră"
-    IDS_USER_PW_LAST_SET "Parolă recent instituită"
-    IDS_USER_PW_EXPIRES "Parolă expiră"
-    IDS_USER_PW_CHANGEABLE "Parolă modificabilă"
-    IDS_USER_PW_REQUIRED "Parolă necesară"
-    IDS_USER_CHANGE_PW "Utilizatorul poate schimba parola"
-    IDS_USER_WORKSTATIONS "Stații de lucru permise"
-    IDS_USER_LOGON_SCRIPT "Script de autentificare"
-    IDS_USER_PROFILE "Profil de utilizator"
-    IDS_USER_HOME_DIR "Director personal"
-    IDS_USER_LAST_LOGON "Ultimă autentificare"
-    IDS_USER_LOGON_HOURS "Ore de autentificare permise"
-    IDS_USER_LOCAL_GROUPS "Apartenență grup local"
-    IDS_USER_GLOBAL_GROUPS "Apartenență grup global"
-
     IDS_USER_ENTER_PASSWORD1 "Introduceți o parolă nouă pentru utilizatorul
(curent): "
     IDS_USER_ENTER_PASSWORD2 "Introduceți din nou parola: "
     IDS_USER_NO_PASSWORD_MATCH "Parolele diferă!"
diff --git a/base/applications/network/net/lang/ru-RU.rc
b/base/applications/network/net/lang/ru-RU.rc
index e69d2c086c..d951c8a30b 100644
--- a/base/applications/network/net/lang/ru-RU.rc
+++ b/base/applications/network/net/lang/ru-RU.rc
@@ -50,28 +50,6 @@ BEGIN
     IDS_STATISTICS_WKS_USECOUNT "Счетчик использования"
     IDS_STATISTICS_WKS_FAILUSECOUNT "Счетчик сбоев при использовании"
 
-    IDS_USER_ACCOUNTS "Учетные записи пользователей для \\\\%s"
-    IDS_USER_NAME "Имя пользователя"
-    IDS_USER_FULL_NAME "Полное имя"
-    IDS_USER_COMMENT "Комментарий"
-    IDS_USER_USER_COMMENT "Комментарий пользователя"
-    IDS_USER_COUNTRY_CODE "Код страны"
-    IDS_USER_ACCOUNT_ACTIVE "Учетная запись активна"
-    IDS_USER_ACCOUNT_EXPIRES "Учетная запись просрочена"
-    IDS_USER_PW_LAST_SET "Последний пароль задан"
-    IDS_USER_PW_EXPIRES "Действие пароля завершается"
-    IDS_USER_PW_CHANGEABLE "Пароль допускает изменение"
-    IDS_USER_PW_REQUIRED "Требуется пароль"
-    IDS_USER_CHANGE_PW "Пользователь может изменить пароль"
-    IDS_USER_WORKSTATIONS "Разрешенные рабочие станции"
-    IDS_USER_LOGON_SCRIPT "Сценарий входа"
-    IDS_USER_PROFILE "Конфигурация пользователя"
-    IDS_USER_HOME_DIR "Основной каталог"
-    IDS_USER_LAST_LOGON "Последний вход"
-    IDS_USER_LOGON_HOURS "Разрешенные часы входа"
-    IDS_USER_LOCAL_GROUPS "Членство в локальных группах"
-    IDS_USER_GLOBAL_GROUPS "Членство в глобальных группах"
-
     IDS_USER_ENTER_PASSWORD1 "Введите пароль для пользователя: "
     IDS_USER_ENTER_PASSWORD2 "Повторите ввод пароля для подтверждения: "
     IDS_USER_NO_PASSWORD_MATCH "Пароли не совпадают!"
diff --git a/base/applications/network/net/lang/tr-TR.rc
b/base/applications/network/net/lang/tr-TR.rc
index 9527f4a23b..9af60f8d53 100644
--- a/base/applications/network/net/lang/tr-TR.rc
+++ b/base/applications/network/net/lang/tr-TR.rc
@@ -50,28 +50,6 @@ BEGIN
     IDS_STATISTICS_WKS_USECOUNT "Use count"
     IDS_STATISTICS_WKS_FAILUSECOUNT "Failed use count"
 
-    IDS_USER_ACCOUNTS "\\\\%s için kullanıcı hesapları"
-    IDS_USER_NAME "Kullanıcı adı"
-    IDS_USER_FULL_NAME "Tüm ad"
-    IDS_USER_COMMENT "Açıklama"
-    IDS_USER_USER_COMMENT "Kullanıcı açıklaması"
-    IDS_USER_COUNTRY_CODE "Ülke kodu"
-    IDS_USER_ACCOUNT_ACTIVE "Hesap etkin"
-    IDS_USER_ACCOUNT_EXPIRES "Hesap süresi bitimi"
-    IDS_USER_PW_LAST_SET "Şifre son ayarlama"
-    IDS_USER_PW_EXPIRES "Şifre süresi bitimi"
-    IDS_USER_PW_CHANGEABLE "Şifre değiştirilebilir"
-    IDS_USER_PW_REQUIRED "Şifre gerekli"
-    IDS_USER_CHANGE_PW "Kullanıcı şifre değiştirebilir"
-    IDS_USER_WORKSTATIONS "İzin verilen iş istsyonları"
-    IDS_USER_LOGON_SCRIPT "Oturum açma betiği"
-    IDS_USER_PROFILE "Kullanıcı profili"
-    IDS_USER_HOME_DIR "Ev dizini"
-    IDS_USER_LAST_LOGON "Son oturum açma"
-    IDS_USER_LOGON_HOURS "İzin verilen oturum açma saatleri"
-    IDS_USER_LOCAL_GROUPS "Yerli takım üyelikleri"
-    IDS_USER_GLOBAL_GROUPS "Umûmî takım üyelikleri"
-
     IDS_USER_ENTER_PASSWORD1 "Bu kullanıcı için yeni bir şifre giriniz: "
     IDS_USER_ENTER_PASSWORD2 "Şifreyi yeniden giriniz: "
     IDS_USER_NO_PASSWORD_MATCH "Şifreler uyuşmuyor!"
diff --git a/base/applications/network/net/lang/zh-CN.rc
b/base/applications/network/net/lang/zh-CN.rc
index 245d624797..7404eea5f4 100644
--- a/base/applications/network/net/lang/zh-CN.rc
+++ b/base/applications/network/net/lang/zh-CN.rc
@@ -50,28 +50,6 @@ BEGIN
     IDS_STATISTICS_WKS_USECOUNT "Use count"
     IDS_STATISTICS_WKS_FAILUSECOUNT "Failed use count"
 
-    IDS_USER_ACCOUNTS "\\\\%s 的用户帐户"
-    IDS_USER_NAME "用户名"
-    IDS_USER_FULL_NAME "全名"
-    IDS_USER_COMMENT "注释"
-    IDS_USER_USER_COMMENT "用户注释"
-    IDS_USER_COUNTRY_CODE "国家/地区代码"
-    IDS_USER_ACCOUNT_ACTIVE "帐户活动"
-    IDS_USER_ACCOUNT_EXPIRES "帐户过期"
-    IDS_USER_PW_LAST_SET "上次设置的密码"
-    IDS_USER_PW_EXPIRES "密码过期"
-    IDS_USER_PW_CHANGEABLE "密码可更改"
-    IDS_USER_PW_REQUIRED "需要密码"
-    IDS_USER_CHANGE_PW "用户可以更改密码"
-    IDS_USER_WORKSTATIONS "允许的工作站"
-    IDS_USER_LOGON_SCRIPT "登录脚本"
-    IDS_USER_PROFILE "用户配置文件"
-    IDS_USER_HOME_DIR "主目录"
-    IDS_USER_LAST_LOGON "最后一次登录"
-    IDS_USER_LOGON_HOURS "允许的登录的时常 (以小时为单位)"
-    IDS_USER_LOCAL_GROUPS "本地组成员身份"
-    IDS_USER_GLOBAL_GROUPS "全局组成员身份"
-
     IDS_USER_ENTER_PASSWORD1 "为用户输入新的密码: "
     IDS_USER_ENTER_PASSWORD2 "再次输入密码: "
     IDS_USER_NO_PASSWORD_MATCH "密码不匹配！"
diff --git a/base/applications/network/net/lang/zh-TW.rc
b/base/applications/network/net/lang/zh-TW.rc
index 451d66d0ca..c93babe320 100644
--- a/base/applications/network/net/lang/zh-TW.rc
+++ b/base/applications/network/net/lang/zh-TW.rc
@@ -50,28 +50,6 @@ BEGIN
     IDS_STATISTICS_WKS_USECOUNT "Use count"
     IDS_STATISTICS_WKS_FAILUSECOUNT "Failed use count"
 
-    IDS_USER_ACCOUNTS "使用者帳戶 \\\\%s"
-    IDS_USER_NAME "使用者名稱"
-    IDS_USER_FULL_NAME "全名"
-    IDS_USER_COMMENT "評論"
-    IDS_USER_USER_COMMENT "使用者註釋"
-    IDS_USER_COUNTRY_CODE "國家/地區程式碼"
-    IDS_USER_ACCOUNT_ACTIVE "帳戶活動"
-    IDS_USER_ACCOUNT_EXPIRES "帳戶過期"
-    IDS_USER_PW_LAST_SET "上次設定的密碼"
-    IDS_USER_PW_EXPIRES "密碼過期"
-    IDS_USER_PW_CHANGEABLE "密碼多變"
-    IDS_USER_PW_REQUIRED "需要密碼"
-    IDS_USER_CHANGE_PW "使用者可以更改密碼"
-    IDS_USER_WORKSTATIONS "允許的工作站"
-    IDS_USER_LOGON_SCRIPT "登入指令碼"
-    IDS_USER_PROFILE "使用者配置檔案"
-    IDS_USER_HOME_DIR "主目錄"
-    IDS_USER_LAST_LOGON "最後一次登入"
-    IDS_USER_LOGON_HOURS "幾個小時允許的登入"
-    IDS_USER_LOCAL_GROUPS "本地組成員身份"
-    IDS_USER_GLOBAL_GROUPS "全局組成員身份"
-
     IDS_USER_ENTER_PASSWORD1 "為使用者輸入新的密碼: "
     IDS_USER_ENTER_PASSWORD2 "再次輸入密碼: "
     IDS_USER_NO_PASSWORD_MATCH "密碼不匹配!"
diff --git a/base/applications/network/net/resource.h
b/base/applications/network/net/resource.h
index d1750a285a..c65cc77bcf 100644
--- a/base/applications/network/net/resource.h
+++ b/base/applications/network/net/resource.h
@@ -45,28 +45,6 @@
 #define IDS_STATISTICS_WKS_USECOUNT     355
 #define IDS_STATISTICS_WKS_FAILUSECOUNT 356
 
-#define IDS_USER_ACCOUNTS              449
-#define IDS_USER_NAME                  450
-#define IDS_USER_FULL_NAME             451
-#define IDS_USER_COMMENT               452
-#define IDS_USER_USER_COMMENT          453
-#define IDS_USER_COUNTRY_CODE          454
-#define IDS_USER_ACCOUNT_ACTIVE        455
-#define IDS_USER_ACCOUNT_EXPIRES       456
-#define IDS_USER_PW_LAST_SET           457
-#define IDS_USER_PW_EXPIRES            458
-#define IDS_USER_PW_CHANGEABLE         459
-#define IDS_USER_PW_REQUIRED           460
-#define IDS_USER_CHANGE_PW             461
-#define IDS_USER_WORKSTATIONS          462
-#define IDS_USER_LOGON_SCRIPT          463
-#define IDS_USER_PROFILE               464
-#define IDS_USER_HOME_DIR              465
-#define IDS_USER_LAST_LOGON            466
-#define IDS_USER_LOGON_HOURS           467
-#define IDS_USER_LOCAL_GROUPS          468
-#define IDS_USER_GLOBAL_GROUPS         469
-
 #define IDS_USER_ENTER_PASSWORD1       490
 #define IDS_USER_ENTER_PASSWORD2       491
 #define IDS_USER_NO_PASSWORD_MATCH     492
diff --git a/sdk/include/reactos/mc/netmsgmsg.mc b/sdk/include/reactos/mc/netmsgmsg.mc
index 4a045f9478..9e9ee29fc5 100644
--- a/sdk/include/reactos/mc/netmsgmsg.mc
+++ b/sdk/include/reactos/mc/netmsgmsg.mc
@@ -23822,13 +23822,13 @@ Language=Spanish
 Alias de \\\\%1
 .
 Language=Turkish
-\\\\%s için başka adlar
+\\\\%1 için başka adlar
 .
 Language=Chinese
-\\\\%s 的别名
+\\\\%1 的别名
 .
 Language=Taiwanese
-別名 \\\\%s
+別名 \\\\%1
 .
 
 MessageId=4406
@@ -23926,25 +23926,25 @@ Language=English
 User Accounts for \\\\%1
 .
 Language=Polish
-User Accounts for \\\\%1
+Konta użytkowników dla \\\\%1
 .
 Language=Romanian
-User Accounts for \\\\%1
+Conturi de utilizator pentru \\\\%1
 .
 Language=Russian
-User Accounts for \\\\%1
+Учетные записи пользователей для \\\\%1
 .
 Language=Spanish
-User Accounts for \\\\%1
+Cuentas de usuario en \\\\%1
 .
 Language=Turkish
-User Accounts for \\\\%1
+\\\\%1 için kullanıcı hesapları
 .
 Language=Chinese
-User Accounts for \\\\%1
+\\\\%1 的用户帐户
 .
 Language=Taiwanese
-User Accounts for \\\\%1
+使用者帳戶 \\\\%1
 .
 
 MessageId=4411
@@ -23955,25 +23955,25 @@ Language=English
 User name%0
 .
 Language=Polish
-User name%0
+Nazwa użytkownika%0
 .
 Language=Romanian
-User name%0
+Nume utilizator%0
 .
 Language=Russian
-User name%0
+Имя пользователя%0
 .
 Language=Spanish
-User name%0
+Nombre de usuario%0
 .
 Language=Turkish
-User name%0
+Kullanıcı adı%0
 .
 Language=Chinese
-User name%0
+用户名%0
 .
 Language=Taiwanese
-User name%0
+使用者名稱%0
 .
 
 MessageId=4412
@@ -23984,25 +23984,25 @@ Language=English
 Full Name%0
 .
 Language=Polish
-Full Name%0
+Pełna nazwa%0
 .
 Language=Romanian
-Full Name%0
+Nume complet%0
 .
 Language=Russian
-Full Name%0
+Полное имя%0
 .
 Language=Spanish
-Full Name%0
+Nombre completo%0
 .
 Language=Turkish
-Full Name%0
+Tüm ad%0
 .
 Language=Chinese
-Full Name%0
+全名%0
 .
 Language=Taiwanese
-Full Name%0
+全名%0
 .
 
 MessageId=4413
@@ -24013,25 +24013,25 @@ Language=English
 Comment%0
 .
 Language=Polish
-Comment%0
+Komentarz%0
 .
 Language=Romanian
-Comment%0
+Comentariu%0
 .
 Language=Russian
-Comment%0
+Комментарий%0
 .
 Language=Spanish
-Comment%0
+Comentario%0
 .
 Language=Turkish
-Comment%0
+Açıklama%0
 .
 Language=Chinese
-Comment%0
+注释%0
 .
 Language=Taiwanese
-Comment%0
+評論%0
 .
 
 MessageId=4414
@@ -24042,25 +24042,25 @@ Language=English
 User's comment%0
 .
 Language=Polish
-User's comment%0
+Komentarz użytkownika%0
 .
 Language=Romanian
-User's comment%0
+Comentariu de utilizator%0
 .
 Language=Russian
-User's comment%0
+Комментарий пользователя%0
 .
 Language=Spanish
-User's comment%0
+Comentario de usuario%0
 .
 Language=Turkish
-User's comment%0
+Kullanıcı açıklaması%0
 .
 Language=Chinese
-User's comment%0
+用户注释%0
 .
 Language=Taiwanese
-User's comment%0
+使用者註釋%0
 .
 
 MessageId=4415
@@ -24100,25 +24100,25 @@ Language=English
 Country code%0
 .
 Language=Polish
-Country code%0
+Kod kraju%0
 .
 Language=Romanian
-Country code%0
+Cod de țară%0
 .
 Language=Russian
-Country code%0
+Код страны%0
 .
 Language=Spanish
-Country code%0
+Código de país%0
 .
 Language=Turkish
-Country code%0
+Ülke kodu%0
 .
 Language=Chinese
-Country code%0
+国家/地区代码%0
 .
 Language=Taiwanese
-Country code%0
+國家/地區程式碼%0
 .
 
 MessageId=4417
@@ -24187,25 +24187,25 @@ Language=English
 Account active%0
 .
 Language=Polish
-Account active%0
+Konto jest aktywne%0
 .
 Language=Romanian
-Account active%0
+Cont activ%0
 .
 Language=Russian
-Account active%0
+Учетная запись активна%0
 .
 Language=Spanish
-Account active%0
+Cuenta activa%0
 .
 Language=Turkish
-Account active%0
+Hesap etkin%0
 .
 Language=Chinese
-Account active%0
+帐户活动%0
 .
 Language=Taiwanese
-Account active%0
+帳戶活動%0
 .
 
 MessageId=4420
@@ -24216,25 +24216,25 @@ Language=English
 Account expires%0
 .
 Language=Polish
-Account expires%0
+Wygasanie konta%0
 .
 Language=Romanian
-Account expires%0
+Cont expiră%0
 .
 Language=Russian
-Account expires%0
+Учетная запись просрочена%0
 .
 Language=Spanish
-Account expires%0
+Fecha de expiración%0
 .
 Language=Turkish
-Account expires%0
+Hesap süresi bitimi%0
 .
 Language=Chinese
-Account expires%0
+帐户过期%0
 .
 Language=Taiwanese
-Account expires%0
+帳戶過期%0
 .
 
 MessageId=4421
@@ -24245,25 +24245,25 @@ Language=English
 Password last set%0
 .
 Language=Polish
-Password last set%0
+Hasło ostatnio ustawiano%0
 .
 Language=Romanian
-Password last set%0
+Parolă recent instituită%0
 .
 Language=Russian
-Password last set%0
+Последний пароль задан%0
 .
 Language=Spanish
-Password last set%0
+La contraseña se cambió por última vez%0
 .
 Language=Turkish
-Password last set%0
+Şifre son ayarlama%0
 .
 Language=Chinese
-Password last set%0
+上次设置的密码%0
 .
 Language=Taiwanese
-Password last set%0
+上次設定的密碼%0
 .
 
 MessageId=4422
@@ -24274,25 +24274,25 @@ Language=English
 Password expires%0
 .
 Language=Polish
-Password expires%0
+Ważność hasła wygasa%0
 .
 Language=Romanian
-Password expires%0
+Parolă expiră%0
 .
 Language=Russian
-Password expires%0
+Действие пароля завершается%0
 .
 Language=Spanish
-Password expires%0
+La contraseña expira%0
 .
 Language=Turkish
-Password expires%0
+Şifre süresi bitimi%0
 .
 Language=Chinese
-Password expires%0
+密码过期%0
 .
 Language=Taiwanese
-Password expires%0
+密碼過期%0
 .
 
 MessageId=4423
@@ -24303,25 +24303,25 @@ Language=English
 Password changeable%0
 .
 Language=Polish
-Password changeable%0
+Hasło może być zmieniane%0
 .
 Language=Romanian
-Password changeable%0
+Parolă modificabilă%0
 .
 Language=Russian
-Password changeable%0
+Пароль допускает изменение%0
 .
 Language=Spanish
-Password changeable%0
+La contraseña se puede cambiar%0
 .
 Language=Turkish
-Password changeable%0
+Şifre değiştirilebilir%0
 .
 Language=Chinese
-Password changeable%0
+密码可更改%0
 .
 Language=Taiwanese
-Password changeable%0
+密碼多變%0
 .
 
 MessageId=4424
@@ -24332,25 +24332,25 @@ Language=English
 Workstations allowed%0
 .
 Language=Polish
-Workstations allowed%0
+Dozwolone stacje robocze%0
 .
 Language=Romanian
-Workstations allowed%0
+Stații de lucru permise%0
 .
 Language=Russian
-Workstations allowed%0
+Разрешенные рабочие станции%0
 .
 Language=Spanish
-Workstations allowed%0
+Se permiten estaciones de trabajo%0
 .
 Language=Turkish
-Workstations allowed%0
+İzin verilen iş istsyonları%0
 .
 Language=Chinese
-Workstations allowed%0
+允许的工作站%0
 .
 Language=Taiwanese
-Workstations allowed%0
+允許的工作站%0
 .
 
 MessageId=4425
@@ -24419,25 +24419,25 @@ Language=English
 Local Group Memberships%0
 .
 Language=Polish
-Local Group Memberships%0
+Członkostwa grup lokalnych%0
 .
 Language=Romanian
-Local Group Memberships%0
+Apartenență grup local%0
 .
 Language=Russian
-Local Group Memberships%0
+Членство в локальных группах%0
 .
 Language=Spanish
-Local Group Memberships%0
+Miembro de los grupos locales%0
 .
 Language=Turkish
-Local Group Memberships%0
+Yerli takım üyelikleri%0
 .
 Language=Chinese
-Local Group Memberships%0
+本地组成员身份%0
 .
 Language=Taiwanese
-Local Group Memberships%0
+本地組成員身份%0
 .
 
 MessageId=4428
@@ -24477,25 +24477,25 @@ Language=English
 Logon script%0
 .
 Language=Polish
-Logon script%0
+Skrypt logowania%0
 .
 Language=Romanian
-Logon script%0
+Script de autentificare%0
 .
 Language=Russian
-Logon script%0
+Сценарий входа%0
 .
 Language=Spanish
-Logon script%0
+Script de inicio%0
 .
 Language=Turkish
-Logon script%0
+Oturum açma betiği%0
 .
 Language=Chinese
-Logon script%0
+登录脚本%0
 .
 Language=Taiwanese
-Logon script%0
+登入指令碼%0
 .
 
 MessageId=4430
@@ -24506,25 +24506,25 @@ Language=English
 Last logon%0
 .
 Language=Polish
-Last logon%0
+Ostatnie logowanie%0
 .
 Language=Romanian
-Last logon%0
+Ultimă autentificare%0
 .
 Language=Russian
-Last logon%0
+Последний вход%0
 .
 Language=Spanish
-Last logon%0
+Último inicio de sesión%0
 .
 Language=Turkish
-Last logon%0
+Son oturum açma%0
 .
 Language=Chinese
-Last logon%0
+最后一次登录%0
 .
 Language=Taiwanese
-Last logon%0
+最後一次登入%0
 .
 
 MessageId=4431
@@ -24535,25 +24535,25 @@ Language=English
 Global Group memberships%0
 .
 Language=Polish
-Global Group memberships%0
+Członkostwa grup globalnych%0
 .
 Language=Romanian
-Global Group memberships%0
+Apartenență grup global%0
 .
 Language=Russian
-Global Group memberships%0
+Членство в глобальных группах%0
 .
 Language=Spanish
-Global Group memberships%0
+Miembro de los grupos globales%0
 .
 Language=Turkish
-Global Group memberships%0
+Umûmî takım üyelikleri%0
 .
 Language=Chinese
-Global Group memberships%0
+全局组成员身份%0
 .
 Language=Taiwanese
-Global Group memberships%0
+全局組成員身份%0
 .
 
 MessageId=4432
@@ -24564,25 +24564,25 @@ Language=English
 Logon hours allowed%0
 .
 Language=Polish
-Logon hours allowed%0
+Dozwolone godziny logowania%0
 .
 Language=Romanian
-Logon hours allowed%0
+Ore de autentificare permise%0
 .
 Language=Russian
-Logon hours allowed%0
+Разрешенные часы входа%0
 .
 Language=Spanish
-Logon hours allowed%0
+Horas de inicio permitidas%0
 .
 Language=Turkish
-Logon hours allowed%0
+İzin verilen oturum açma saatleri%0
 .
 Language=Chinese
-Logon hours allowed%0
+允许的登录的时常 (以小时为单位)%0
 .
 Language=Taiwanese
-Logon hours allowed%0
+幾個小時允許的登入%0
 .
 
 MessageId=4433
@@ -24680,25 +24680,25 @@ Language=English
 Home directory%0
 .
 Language=Polish
-Home directory%0
+Katalog macierzysty%0
 .
 Language=Romanian
-Home directory%0
+Director personal%0
 .
 Language=Russian
-Home directory%0
+Основной каталог%0
 .
 Language=Spanish
-Home directory%0
+Carpeta raíz%0
 .
 Language=Turkish
-Home directory%0
+Ev dizini%0
 .
 Language=Chinese
-Home directory%0
+主目录%0
 .
 Language=Taiwanese
-Home directory%0
+主目錄%0
 .
 
 MessageId=4437
@@ -24709,25 +24709,25 @@ Language=English
 Password required%0
 .
 Language=Polish
-Password required%0
+Wymagane jest hasło%0
 .
 Language=Romanian
-Password required%0
+Parolă necesară%0
 .
 Language=Russian
-Password required%0
+Требуется пароль%0
 .
 Language=Spanish
-Password required%0
+Se necesita contraseña%0
 .
 Language=Turkish
-Password required%0
+Şifre gerekli%0
 .
 Language=Chinese
-Password required%0
+需要密码%0
 .
 Language=Taiwanese
-Password required%0
+需要密碼%0
 .
 
 MessageId=4438
@@ -24738,25 +24738,25 @@ Language=English
 User may change password%0
 .
 Language=Polish
-User may change password%0
+Użytkownik może zmieniać hasło%0
 .
 Language=Romanian
-User may change password%0
+Utilizatorul poate schimba parola%0
 .
 Language=Russian
-User may change password%0
+Пользователь может изменить пароль%0
 .
 Language=Spanish
-User may change password%0
+El usuario puede cambiar la contraseña%0
 .
 Language=Turkish
-User may change password%0
+Kullanıcı şifre değiştirebilir%0
 .
 Language=Chinese
-User may change password%0
+用户可以更改密码%0
 .
 Language=Taiwanese
-User may change password%0
+使用者可以更改密碼%0
 .
 
 MessageId=4439
@@ -24767,25 +24767,25 @@ Language=English
 User profile%0
 .
 Language=Polish
-User profile%0
+Profil użytkownika%0
 .
 Language=Romanian
-User profile%0
+Profil de utilizator%0
 .
 Language=Russian
-User profile%0
+Конфигурация пользователя%0
 .
 Language=Spanish
-User profile%0
+Perfil de usuario%0
 .
 Language=Turkish
-User profile%0
+Kullanıcı profili%0
 .
 Language=Chinese
-User profile%0
+用户配置文件%0
 .
 Language=Taiwanese
-User profile%0
+使用者配置檔案%0
 .
 
 MessageId=4440
@@ -24796,25 +24796,25 @@ Language=English
 Locked%0
 .
 Language=Polish
-Locked%0
+Zablokowane%0
 .
 Language=Romanian
-Locked%0
+Blocat%0
 .
 Language=Russian
-Locked%0
+Заблокировано%0
 .
 Language=Spanish
-Locked%0
+Bloqueado%0
 .
 Language=Turkish
-Locked%0
+Kilitli%0
 .
 Language=Chinese
-Locked%0
+锁定%0
 .
 Language=Taiwanese
-Locked%0
+鎖定%0
 .
 
 MessageId=4450