From: Eric Kohl <eric.kohl@reactos.org>
Date: Fri, 5 Apr 2019 21:14:07 +0000 (+0200)
Subject: [NET][MC] Replace strings for the ACCOUNTS, GROUP and LOCALGROUP commands by netmsg... 
X-Git-Tag: 0.4.13-dev~54
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=9f95e35ff3e8769233d7d4567231fb7f71b936cf

[NET][MC] Replace strings for the ACCOUNTS, GROUP and LOCALGROUP commands by netmsg.dll messages.
---

diff --git a/base/applications/network/net/cmdAccounts.c b/base/applications/network/net/cmdAccounts.c
index d04bc48f4f1..8c940f03262 100644
--- a/base/applications/network/net/cmdAccounts.c
+++ b/base/applications/network/net/cmdAccounts.c
@@ -179,36 +179,36 @@ cmdAccounts(
             ConResPrintf(StdOut, IDS_ACCOUNTS_LOGOFF_SECONDS, Info0->usrmod0_force_logoff);
         ConPuts(StdOut, L"\n");
 
-        PrintPaddedResourceString(IDS_ACCOUNTS_MIN_PW_AGE, nPaddedLength);
+        PrintPaddedMessageString(4572, nPaddedLength);
         ConPrintf(StdOut, L"%lu\n", Info0->usrmod0_min_passwd_age / 86400);
 
-        PrintPaddedResourceString(IDS_ACCOUNTS_MAX_PW_AGE, nPaddedLength);
+        PrintPaddedMessageString(4573, nPaddedLength);
         ConPrintf(StdOut, L"%lu\n", Info0->usrmod0_max_passwd_age / 86400);
 
-        PrintPaddedResourceString(IDS_ACCOUNTS_MIN_PW_LENGTH, nPaddedLength);
+        PrintPaddedMessageString(4574, nPaddedLength);
         ConPrintf(StdOut, L"%lu\n", Info0->usrmod0_min_passwd_len);
 
-        PrintPaddedResourceString(IDS_ACCOUNTS_PW_HIST_LENGTH, nPaddedLength);
+        PrintPaddedMessageString(4575, nPaddedLength);
         if (Info0->usrmod0_password_hist_len == 0)
             ConResPuts(StdOut, IDS_GENERIC_NONE);
         else
             ConPrintf(StdOut, L"%lu", Info0->usrmod0_password_hist_len);
         ConPuts(StdOut, L"\n");
 
-        PrintPaddedResourceString(IDS_ACCOUNTS_LOCKOUT_THRESHOLD, nPaddedLength);
+        PrintPaddedMessageString(4578, nPaddedLength);
         if (Info3->usrmod3_lockout_threshold == 0)
             ConResPuts(StdOut, IDS_GENERIC_NEVER);
         else
             ConPrintf(StdOut, L"%lu", Info3->usrmod3_lockout_threshold);
         ConPuts(StdOut, L"\n");
 
-        PrintPaddedResourceString(IDS_ACCOUNTS_LOCKOUT_DURATION, nPaddedLength);
+        PrintPaddedMessageString(4579, nPaddedLength);
         ConPrintf(StdOut, L"%lu\n", Info3->usrmod3_lockout_duration / 60);
 
-        PrintPaddedResourceString(IDS_ACCOUNTS_LOCKOUT_WINDOW, nPaddedLength);
+        PrintPaddedMessageString(4580, nPaddedLength);
         ConPrintf(StdOut, L"%lu\n", Info3->usrmod3_lockout_observation_window / 60);
 
-        PrintPaddedResourceString(IDS_ACCOUNTS_COMPUTER_ROLE, nPaddedLength);
+        PrintPaddedMessageString(4576, nPaddedLength);
         if (Info1->usrmod1_role == UAS_ROLE_PRIMARY)
         {
             if (ProductType == NtProductLanManNt)
diff --git a/base/applications/network/net/cmdGroup.c b/base/applications/network/net/cmdGroup.c
index 919e9ddeae6..b5bf316f229 100644
--- a/base/applications/network/net/cmdGroup.c
+++ b/base/applications/network/net/cmdGroup.c
@@ -36,8 +36,8 @@ EnumerateGroups(VOID)
         return Status;
 
     ConPuts(StdOut, L"\n");
-    ConResPrintf(StdOut, IDS_GROUP_GROUPS, pServer->sv100_name);
-    ConPuts(StdOut, L"\n\n");
+    PrintMessageStringV(4400, pServer->sv100_name);
+    ConPuts(StdOut, L"\n");
     PrintPadding(L'-', 79);
     ConPuts(StdOut, L"\n");
 
@@ -116,16 +116,16 @@ DisplayGroup(LPWSTR lpGroupName)
         pNames[i] = pUsers[i].grui0_name;
     }
 
-    PrintPaddedResourceString(IDS_GROUP_NAME, nPaddedLength);
+    PrintPaddedMessageString(4401, nPaddedLength);
     ConPrintf(StdOut, L"%s\n", pGroupInfo->grpi1_name);
 
-    PrintPaddedResourceString(IDS_GROUP_COMMENT, nPaddedLength);
+    PrintPaddedMessageString(4402, nPaddedLength);
     ConPrintf(StdOut, L"%s\n", pGroupInfo->grpi1_comment);
 
     ConPuts(StdOut, L"\n");
 
-    ConResPuts(StdOut, IDS_GROUP_MEMBERS);
-    ConPuts(StdOut, L"\n\n");
+    PrintMessageString(4403);
+    ConPuts(StdOut, L"\n");
 
     PrintPadding(L'-', 79);
     ConPuts(StdOut, L"\n");
diff --git a/base/applications/network/net/cmdLocalGroup.c b/base/applications/network/net/cmdLocalGroup.c
index 673c9a683de..bd6647c63ad 100644
--- a/base/applications/network/net/cmdLocalGroup.c
+++ b/base/applications/network/net/cmdLocalGroup.c
@@ -39,8 +39,8 @@ EnumerateLocalGroups(VOID)
         return Status;
 
     ConPuts(StdOut, L"\n");
-    ConResPrintf(StdOut, IDS_LOCALGROUP_ALIASES, pServer->sv100_name);
-    ConPuts(StdOut, L"\n\n");
+    PrintMessageStringV(4405, pServer->sv100_name);
+    ConPuts(StdOut, L"\n");
     PrintPadding(L'-', 79);
     ConPuts(StdOut, L"\n");
 
@@ -131,16 +131,16 @@ DisplayLocalGroup(LPWSTR lpGroupName)
              pNames[i] = pMembers[i].lgrmi3_domainandname;
     }
 
-    PrintPaddedResourceString(IDS_LOCALGROUP_ALIAS_NAME, nPaddedLength);
+    PrintPaddedMessageString(4406, nPaddedLength);
     ConPrintf(StdOut, L"%s\n", pGroupInfo->lgrpi1_name);
 
-    PrintPaddedResourceString(IDS_LOCALGROUP_COMMENT, nPaddedLength);
+    PrintPaddedMessageString(4407, nPaddedLength);
     ConPrintf(StdOut, L"%s\n", pGroupInfo->lgrpi1_comment);
 
     ConPuts(StdOut, L"\n");
 
-    ConResPuts(StdOut, IDS_LOCALGROUP_MEMBERS);
-    ConPuts(StdOut, L"\n\n");
+    PrintMessageString(4408);
+    ConPuts(StdOut, L"\n");
 
     PrintPadding(L'-', 79);
     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 18b5ca746b6..5cd4930a7cf 100644
--- a/base/applications/network/net/lang/en-US.rc
+++ b/base/applications/network/net/lang/en-US.rc
@@ -4,14 +4,6 @@ STRINGTABLE
 BEGIN
     IDS_ACCOUNTS_FORCE_LOGOFF "Force logoff after"
     IDS_ACCOUNTS_LOGOFF_SECONDS "%lu seconds"
-    IDS_ACCOUNTS_MIN_PW_AGE "Minimum password age (in days)"
-    IDS_ACCOUNTS_MAX_PW_AGE "Maximum password age (in days)"
-    IDS_ACCOUNTS_MIN_PW_LENGTH "Minimum password length"
-    IDS_ACCOUNTS_PW_HIST_LENGTH "Password history length"
-    IDS_ACCOUNTS_LOCKOUT_THRESHOLD "Lockout threshold"
-    IDS_ACCOUNTS_LOCKOUT_DURATION "Lockout duration (in minutes)"
-    IDS_ACCOUNTS_LOCKOUT_WINDOW "Lockout observation window (in minutes)"
-    IDS_ACCOUNTS_COMPUTER_ROLE "Computer role"
     IDS_ACCOUNTS_PRIMARY_SERVER "Primary server"
     IDS_ACCOUNTS_BACKUP_SERVER "Backup server"
     IDS_ACCOUNTS_STANDALONE_SERVER "Standalone server"
@@ -35,16 +27,6 @@ BEGIN
     IDS_CONFIG_WORKSTATION_DOMAIN "Workstation domain"
     IDS_CONFIG_WORKSTATION_LOGON "Logon domain"
 
-    IDS_GROUP_GROUPS "Group Accounts for \\\\%s"
-    IDS_GROUP_NAME "Group name"
-    IDS_GROUP_COMMENT "Comment"
-    IDS_GROUP_MEMBERS "Members"
-
-    IDS_LOCALGROUP_ALIASES "Aliases for \\\\%s"
-    IDS_LOCALGROUP_ALIAS_NAME "Alias name"
-    IDS_LOCALGROUP_COMMENT "Comment"
-    IDS_LOCALGROUP_MEMBERS "Members"
-
     IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\
    Server\n   Workstation\n\n"
     IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%02d %s\n\n\n"
diff --git a/base/applications/network/net/lang/es-ES.rc b/base/applications/network/net/lang/es-ES.rc
index 9e802f3d384..fffe8f175a5 100644
--- a/base/applications/network/net/lang/es-ES.rc
+++ b/base/applications/network/net/lang/es-ES.rc
@@ -7,14 +7,6 @@ STRINGTABLE
 BEGIN
     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)"
-    IDS_ACCOUNTS_MAX_PW_AGE "Validez máxima de contraseña (en días)"
-    IDS_ACCOUNTS_MIN_PW_LENGTH "Tamaño mínimo de contraseña"
-    IDS_ACCOUNTS_PW_HIST_LENGTH "Duración del historial de contraseñas"
-    IDS_ACCOUNTS_LOCKOUT_THRESHOLD "Umbral de bloqueo"
-    IDS_ACCOUNTS_LOCKOUT_DURATION "Duración del bloqueo (en minutos)"
-    IDS_ACCOUNTS_LOCKOUT_WINDOW "Ventana de cumpl. de bloqueo (en minutos)"
-    IDS_ACCOUNTS_COMPUTER_ROLE "Rol del equipo"
     IDS_ACCOUNTS_PRIMARY_SERVER "Servidor primario"
     IDS_ACCOUNTS_BACKUP_SERVER "Servidor de respaldo"
     IDS_ACCOUNTS_STANDALONE_SERVER "Servidor independiente"
@@ -38,16 +30,6 @@ BEGIN
     IDS_CONFIG_WORKSTATION_DOMAIN "Workstation domain"
     IDS_CONFIG_WORKSTATION_LOGON "Logon domain"
 
-    IDS_GROUP_GROUPS "Group Accounts for \\\\%s"
-    IDS_GROUP_NAME "Group name"
-    IDS_GROUP_COMMENT "Comment"
-    IDS_GROUP_MEMBERS "Members"
-
-    IDS_LOCALGROUP_ALIASES "Alias de \\\\%s"
-    IDS_LOCALGROUP_ALIAS_NAME "Nombre del alias"
-    IDS_LOCALGROUP_COMMENT "Comentario"
-    IDS_LOCALGROUP_MEMBERS "Miembros"
-
     IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\
    Server\n   Workstation\n\n"
     IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%02d %s\n\n\n"
diff --git a/base/applications/network/net/lang/pl-PL.rc b/base/applications/network/net/lang/pl-PL.rc
index 7fe511779c3..9bbbcd672cd 100644
--- a/base/applications/network/net/lang/pl-PL.rc
+++ b/base/applications/network/net/lang/pl-PL.rc
@@ -3,14 +3,6 @@ STRINGTABLE
 BEGIN
     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)"
-    IDS_ACCOUNTS_MAX_PW_AGE "Maksymalny okres ważności hasła (dni)"
-    IDS_ACCOUNTS_MIN_PW_LENGTH "Minimalna długość hasła"
-    IDS_ACCOUNTS_PW_HIST_LENGTH "Długość zapamiętywanej historii haseł"
-    IDS_ACCOUNTS_LOCKOUT_THRESHOLD "Próg blokady"
-    IDS_ACCOUNTS_LOCKOUT_DURATION "Czas trwania blokady (minuty)"
-    IDS_ACCOUNTS_LOCKOUT_WINDOW "Okno obserwowania blokady (minuty)"
-    IDS_ACCOUNTS_COMPUTER_ROLE "Rola komputera"
     IDS_ACCOUNTS_PRIMARY_SERVER "Serwer podstawowy"
     IDS_ACCOUNTS_BACKUP_SERVER "Serwer zapasowy"
     IDS_ACCOUNTS_STANDALONE_SERVER "Serwer autonomiczny"
@@ -34,16 +26,6 @@ BEGIN
     IDS_CONFIG_WORKSTATION_DOMAIN "Domena stacji roboczej"
     IDS_CONFIG_WORKSTATION_LOGON "Domena logowania"
 
-    IDS_GROUP_GROUPS "Konta grupowe dla \\\\%s"
-    IDS_GROUP_NAME "Nazwa grupy"
-    IDS_GROUP_COMMENT "Komentarz"
-    IDS_GROUP_MEMBERS "Członkowie"
-
-    IDS_LOCALGROUP_ALIASES "Aliasy dla \\\\%s"
-    IDS_LOCALGROUP_ALIAS_NAME "Nazwa aliasu"
-    IDS_LOCALGROUP_COMMENT "Komentarz"
-    IDS_LOCALGROUP_MEMBERS "Członkowie"
-
     IDS_STATISTICS_TEXT "Dostępne są statystyki dla następujących uruchomionych obecnie usług:\n\n\
    Serwer\n   Stacja robocza\n\n"
     IDS_STATISTICS_SINCE "Statystyka od %d/%d/%d %d:%02d %s\n\n\n"
diff --git a/base/applications/network/net/lang/ro-RO.rc b/base/applications/network/net/lang/ro-RO.rc
index 61328729ce9..e1399d65c5a 100644
--- a/base/applications/network/net/lang/ro-RO.rc
+++ b/base/applications/network/net/lang/ro-RO.rc
@@ -10,14 +10,6 @@ STRINGTABLE
 BEGIN
     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)"
-    IDS_ACCOUNTS_MAX_PW_AGE "Vârsta maximă a parolei (în zile)"
-    IDS_ACCOUNTS_MIN_PW_LENGTH "Lungimea minimă a parolei"
-    IDS_ACCOUNTS_PW_HIST_LENGTH "Lungimea istoricului parolei"
-    IDS_ACCOUNTS_LOCKOUT_THRESHOLD "Pragul de blocare"
-    IDS_ACCOUNTS_LOCKOUT_DURATION "Durata de blocare (în minute)"
-    IDS_ACCOUNTS_LOCKOUT_WINDOW "Fereastra de observare a blocării (în minute)"
-    IDS_ACCOUNTS_COMPUTER_ROLE "Rolul calculatorului"
     IDS_ACCOUNTS_PRIMARY_SERVER "Server primar"
     IDS_ACCOUNTS_BACKUP_SERVER "Server de rezervă"
     IDS_ACCOUNTS_STANDALONE_SERVER "Server de sine stătător"
@@ -41,16 +33,6 @@ BEGIN
     IDS_CONFIG_WORKSTATION_DOMAIN "Domeniu de calculator"
     IDS_CONFIG_WORKSTATION_LOGON "Domeniu de autentificare"
 
-    IDS_GROUP_GROUPS "Conturile de grup pentru \\\\%s"
-    IDS_GROUP_NAME "Nume de grup"
-    IDS_GROUP_COMMENT "Comentariu"
-    IDS_GROUP_MEMBERS "Membri"
-
-    IDS_LOCALGROUP_ALIASES "Alias pentru \\\\%s"
-    IDS_LOCALGROUP_ALIAS_NAME "Nume alias"
-    IDS_LOCALGROUP_COMMENT "Comentariu"
-    IDS_LOCALGROUP_MEMBERS "Membri"
-
     IDS_STATISTICS_TEXT "Statistici disponibile pentru următoarele servicii:\n\n\
    Server\n   Stație de lucru\n\n"
     IDS_STATISTICS_SINCE "Statistici începând din %d/%d/%d %d:%02d %s\n\n\n"
diff --git a/base/applications/network/net/lang/ru-RU.rc b/base/applications/network/net/lang/ru-RU.rc
index 70b4dd777b0..798df63c0fe 100644
--- a/base/applications/network/net/lang/ru-RU.rc
+++ b/base/applications/network/net/lang/ru-RU.rc
@@ -6,14 +6,6 @@ STRINGTABLE
 BEGIN
     IDS_ACCOUNTS_FORCE_LOGOFF "Принудительный выход через"
     IDS_ACCOUNTS_LOGOFF_SECONDS "%lu секунд"
-    IDS_ACCOUNTS_MIN_PW_AGE "Минимальный срок действия пароля (дней)"
-    IDS_ACCOUNTS_MAX_PW_AGE "Максимальный срок действия пароля (дней)"
-    IDS_ACCOUNTS_MIN_PW_LENGTH "Минимальная длина пароля"
-    IDS_ACCOUNTS_PW_HIST_LENGTH "Длина истории паролей"
-    IDS_ACCOUNTS_LOCKOUT_THRESHOLD "Блокировка после ошибок ввода пароля"
-    IDS_ACCOUNTS_LOCKOUT_DURATION "Длительность блокировки (минут)"
-    IDS_ACCOUNTS_LOCKOUT_WINDOW "Сброс счетчика блокировок через (минут)"
-    IDS_ACCOUNTS_COMPUTER_ROLE "Роль компьютера"
     IDS_ACCOUNTS_PRIMARY_SERVER "Основной сервер"
     IDS_ACCOUNTS_BACKUP_SERVER "Резервный сервер"
     IDS_ACCOUNTS_STANDALONE_SERVER "Автономный сервер"
@@ -37,16 +29,6 @@ BEGIN
     IDS_CONFIG_WORKSTATION_DOMAIN "Домен рабочей станции"
     IDS_CONFIG_WORKSTATION_LOGON "Домен входа"
 
-    IDS_GROUP_GROUPS "Учетные записи групп для \\\\%s"
-    IDS_GROUP_NAME "Имя группы"
-    IDS_GROUP_COMMENT "Комментарий"
-    IDS_GROUP_MEMBERS "Члены"
-
-    IDS_LOCALGROUP_ALIASES "Псевдонимы для \\\\%s"
-    IDS_LOCALGROUP_ALIAS_NAME "Имя псевдонима"
-    IDS_LOCALGROUP_COMMENT "Комментарий"
-    IDS_LOCALGROUP_MEMBERS "Члены"
-
     IDS_STATISTICS_TEXT "Статистика доступна для следующих выполняющихся служб:\n\n\
    Сервер\n   Рабочая станция\n\n"
     IDS_STATISTICS_SINCE "Статистика после %d/%d/%d %d:%02d %s\n\n\n"
diff --git a/base/applications/network/net/lang/tr-TR.rc b/base/applications/network/net/lang/tr-TR.rc
index 5c001e5429c..17ca953bfd8 100644
--- a/base/applications/network/net/lang/tr-TR.rc
+++ b/base/applications/network/net/lang/tr-TR.rc
@@ -6,14 +6,6 @@ STRINGTABLE
 BEGIN
     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)"
-    IDS_ACCOUNTS_MAX_PW_AGE "En çok şifre yaşı (gün)"
-    IDS_ACCOUNTS_MIN_PW_LENGTH "En az şifre uzunluğu"
-    IDS_ACCOUNTS_PW_HIST_LENGTH "Şifre geçmişi uzunluğu"
-    IDS_ACCOUNTS_LOCKOUT_THRESHOLD "Kilitleme başlangıcı"
-    IDS_ACCOUNTS_LOCKOUT_DURATION "Kilitleme süresi (dakîka)"
-    IDS_ACCOUNTS_LOCKOUT_WINDOW "Kilitleme gözlem penceresi (dakîka)"
-    IDS_ACCOUNTS_COMPUTER_ROLE "Bilgisayar görevi"
     IDS_ACCOUNTS_PRIMARY_SERVER "Birinci sunucu"
     IDS_ACCOUNTS_BACKUP_SERVER "Yedekleme sunucusu"
     IDS_ACCOUNTS_STANDALONE_SERVER "Bağımsız sunucu"
@@ -37,16 +29,6 @@ BEGIN
     IDS_CONFIG_WORKSTATION_DOMAIN "Workstation domain"
     IDS_CONFIG_WORKSTATION_LOGON "Logon domain"
 
-    IDS_GROUP_GROUPS "Group Accounts for \\\\%s"
-    IDS_GROUP_NAME "Group name"
-    IDS_GROUP_COMMENT "Comment"
-    IDS_GROUP_MEMBERS "Members"
-
-    IDS_LOCALGROUP_ALIASES "\\\\%s için başka adlar"
-    IDS_LOCALGROUP_ALIAS_NAME "Başka ad"
-    IDS_LOCALGROUP_COMMENT "Açıklama"
-    IDS_LOCALGROUP_MEMBERS "Üyeler"
-
     IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\
    Server\n   Workstation\n\n"
     IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%02d %s\n\n\n"
diff --git a/base/applications/network/net/lang/zh-CN.rc b/base/applications/network/net/lang/zh-CN.rc
index 35ae37150a3..fc055bb7e78 100644
--- a/base/applications/network/net/lang/zh-CN.rc
+++ b/base/applications/network/net/lang/zh-CN.rc
@@ -6,14 +6,6 @@ STRINGTABLE
 BEGIN
     IDS_ACCOUNTS_FORCE_LOGOFF "强制注销后"
     IDS_ACCOUNTS_LOGOFF_SECONDS "%lu 秒"
-    IDS_ACCOUNTS_MIN_PW_AGE "密码最短使用期限 (以天为单位)"
-    IDS_ACCOUNTS_MAX_PW_AGE "密码最长使用期限 (以天为单位)"
-    IDS_ACCOUNTS_MIN_PW_LENGTH "最小密码长度"
-    IDS_ACCOUNTS_PW_HIST_LENGTH "密码历史记录长度"
-    IDS_ACCOUNTS_LOCKOUT_THRESHOLD "锁定阈值"
-    IDS_ACCOUNTS_LOCKOUT_DURATION "锁定时间 (以分钟为单位)"
-    IDS_ACCOUNTS_LOCKOUT_WINDOW "锁定观察窗口 (以分钟为单位)"
-    IDS_ACCOUNTS_COMPUTER_ROLE "计算机角色"
     IDS_ACCOUNTS_PRIMARY_SERVER "主服务器"
     IDS_ACCOUNTS_BACKUP_SERVER "备份服务器"
     IDS_ACCOUNTS_STANDALONE_SERVER "独立服务器"
@@ -37,16 +29,6 @@ BEGIN
     IDS_CONFIG_WORKSTATION_DOMAIN "Workstation domain"
     IDS_CONFIG_WORKSTATION_LOGON "Logon domain"
 
-    IDS_GROUP_GROUPS "Group Accounts for \\\\%s"
-    IDS_GROUP_NAME "Group name"
-    IDS_GROUP_COMMENT "Comment"
-    IDS_GROUP_MEMBERS "Members"
-
-    IDS_LOCALGROUP_ALIASES "\\\\%s 的别名"
-    IDS_LOCALGROUP_ALIAS_NAME "别名名称"
-    IDS_LOCALGROUP_COMMENT "注释"
-    IDS_LOCALGROUP_MEMBERS "成员"
-
     IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\
    Server\n   Workstation\n\n"
     IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%02d %s\n\n\n"
diff --git a/base/applications/network/net/lang/zh-TW.rc b/base/applications/network/net/lang/zh-TW.rc
index b50e07c4e46..a19c8921d1c 100644
--- a/base/applications/network/net/lang/zh-TW.rc
+++ b/base/applications/network/net/lang/zh-TW.rc
@@ -6,14 +6,6 @@ STRINGTABLE
 BEGIN
     IDS_ACCOUNTS_FORCE_LOGOFF "強制登出後"
     IDS_ACCOUNTS_LOGOFF_SECONDS "%lu 秒"
-    IDS_ACCOUNTS_MIN_PW_AGE "密碼最短使用期限 (以天)"
-    IDS_ACCOUNTS_MAX_PW_AGE "密碼最長使用期限 (以天)"
-    IDS_ACCOUNTS_MIN_PW_LENGTH "最小密碼長度"
-    IDS_ACCOUNTS_PW_HIST_LENGTH "密碼歷史記錄長度"
-    IDS_ACCOUNTS_LOCKOUT_THRESHOLD "鎖定閾值"
-    IDS_ACCOUNTS_LOCKOUT_DURATION "鎖定時間 (以分鐘為單位)"
-    IDS_ACCOUNTS_LOCKOUT_WINDOW "鎖定觀察視窗 (以分鐘為單位)"
-    IDS_ACCOUNTS_COMPUTER_ROLE "電腦角色"
     IDS_ACCOUNTS_PRIMARY_SERVER "主伺服器"
     IDS_ACCOUNTS_BACKUP_SERVER "備份伺服器"
     IDS_ACCOUNTS_STANDALONE_SERVER "獨立伺服器"
@@ -37,16 +29,6 @@ BEGIN
     IDS_CONFIG_WORKSTATION_DOMAIN "Workstation domain"
     IDS_CONFIG_WORKSTATION_LOGON "Logon domain"
 
-    IDS_GROUP_GROUPS "Group Accounts for \\\\%s"
-    IDS_GROUP_NAME "Group name"
-    IDS_GROUP_COMMENT "Comment"
-    IDS_GROUP_MEMBERS "Members"
-
-    IDS_LOCALGROUP_ALIASES "別名 \\\\%s"
-    IDS_LOCALGROUP_ALIAS_NAME "別名名稱"
-    IDS_LOCALGROUP_COMMENT "評論"
-    IDS_LOCALGROUP_MEMBERS "成員"
-
     IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\
    Server\n   Workstation\n\n"
     IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%02d %s\n\n\n"
diff --git a/base/applications/network/net/main.c b/base/applications/network/net/main.c
index 4707c148cd6..75baf1b1109 100644
--- a/base/applications/network/net/main.c
+++ b/base/applications/network/net/main.c
@@ -78,6 +78,84 @@ PrintPadding(
 }
 
 
+VOID
+PrintMessageStringV(
+    DWORD dwMessage,
+    ...)
+{
+    PWSTR pBuffer;
+    va_list args = NULL;
+
+    va_start(args, dwMessage);
+
+    FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE,
+                   hModuleNetMsg,
+                   dwMessage,
+                   LANG_USER_DEFAULT,
+                   (LPWSTR)&pBuffer,
+                   0,
+                   &args);
+    va_end(args);
+
+    if (pBuffer)
+    {
+        ConPuts(StdOut, pBuffer);
+        LocalFree(pBuffer);
+        pBuffer = NULL;
+    }
+}
+
+VOID
+PrintMessageString(
+    DWORD dwMessage)
+{
+    PWSTR pBuffer;
+
+    FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE |
+                   FORMAT_MESSAGE_IGNORE_INSERTS,
+                   hModuleNetMsg,
+                   dwMessage,
+                   LANG_USER_DEFAULT,
+                   (LPWSTR)&pBuffer,
+                   0,
+                   NULL);
+    if (pBuffer)
+    {
+        ConPuts(StdOut, pBuffer);
+        LocalFree(pBuffer);
+        pBuffer = NULL;
+    }
+}
+
+
+VOID
+PrintPaddedMessageString(
+    DWORD dwMessage,
+    INT nPaddedLength)
+{
+    PWSTR pBuffer;
+    DWORD dwLength;
+
+    dwLength = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE |
+                              FORMAT_MESSAGE_IGNORE_INSERTS,
+                              hModuleNetMsg,
+                              dwMessage,
+                              LANG_USER_DEFAULT,
+                              (LPWSTR)&pBuffer,
+                              0,
+                              NULL);
+    if (pBuffer)
+    {
+        ConPuts(StdOut, pBuffer);
+        LocalFree(pBuffer);
+        pBuffer = NULL;
+    }
+
+    if (dwLength < (DWORD)nPaddedLength)
+        PrintPadding(L' ', (DWORD)nPaddedLength - dwLength);
+}
+
+
 VOID
 PrintErrorMessage(
     DWORD dwError)
diff --git a/base/applications/network/net/net.h b/base/applications/network/net/net.h
index 43c5ae5a6a1..13874a4eaad 100644
--- a/base/applications/network/net/net.h
+++ b/base/applications/network/net/net.h
@@ -39,6 +39,20 @@ PrintPadding(
     WCHAR chr,
     INT nPaddedLength);
 
+VOID
+PrintMessageString(
+    DWORD dwMessage);
+
+VOID
+PrintMessageStringV(
+    DWORD dwMessage,
+    ...);
+
+VOID
+PrintPaddedMessageString(
+    DWORD dwMessage,
+    INT nPaddedLength);
+
 VOID
 PrintErrorMessage(
     DWORD dwError);
diff --git a/base/applications/network/net/resource.h b/base/applications/network/net/resource.h
index 1be6288333a..0a024d2cf7f 100644
--- a/base/applications/network/net/resource.h
+++ b/base/applications/network/net/resource.h
@@ -2,14 +2,6 @@
 
 #define IDS_ACCOUNTS_FORCE_LOGOFF      200
 #define IDS_ACCOUNTS_LOGOFF_SECONDS    201
-#define IDS_ACCOUNTS_MIN_PW_AGE        202
-#define IDS_ACCOUNTS_MAX_PW_AGE        203
-#define IDS_ACCOUNTS_MIN_PW_LENGTH     204
-#define IDS_ACCOUNTS_PW_HIST_LENGTH    205
-#define IDS_ACCOUNTS_LOCKOUT_THRESHOLD 206
-#define IDS_ACCOUNTS_LOCKOUT_DURATION  207
-#define IDS_ACCOUNTS_LOCKOUT_WINDOW    208
-#define IDS_ACCOUNTS_COMPUTER_ROLE     209
 #define IDS_ACCOUNTS_PRIMARY_SERVER    210
 #define IDS_ACCOUNTS_BACKUP_SERVER     211
 #define IDS_ACCOUNTS_STANDALONE_SERVER 212
@@ -32,16 +24,6 @@
 #define IDS_CONFIG_WORKSTATION_DOMAIN   244
 #define IDS_CONFIG_WORKSTATION_LOGON    245
 
-#define IDS_GROUP_GROUPS                260
-#define IDS_GROUP_NAME                  261
-#define IDS_GROUP_COMMENT               262
-#define IDS_GROUP_MEMBERS               263
-
-#define IDS_LOCALGROUP_ALIASES          300
-#define IDS_LOCALGROUP_ALIAS_NAME       301
-#define IDS_LOCALGROUP_COMMENT          302
-#define IDS_LOCALGROUP_MEMBERS          303
-
 #define IDS_STATISTICS_TEXT             320
 #define IDS_STATISTICS_SINCE            321
 #define IDS_STATISTICS_SRV_NAME         322
diff --git a/sdk/include/reactos/mc/netmsgmsg.mc b/sdk/include/reactos/mc/netmsgmsg.mc
index 5f0a30d1945..b5b93e0b6c0 100644
--- a/sdk/include/reactos/mc/netmsgmsg.mc
+++ b/sdk/include/reactos/mc/netmsgmsg.mc
@@ -22428,13 +22428,13 @@ Language=English
 Group Accounts for \\\\%1
 .
 Language=Polish
-Group Accounts for \\\\%1
+Konta grupowe dla \\\\%1
 .
 Language=Romanian
-Group Accounts for \\\\%1
+Conturile de grup pentru \\\\%1
 .
 Language=Russian
-Group Accounts for \\\\%1
+Учетные записи групп для \\\\%1
 .
 Language=Spanish
 Group Accounts for \\\\%1
@@ -22457,13 +22457,13 @@ Language=English
 Group name%0
 .
 Language=Polish
-Group name%0
+Nazwa grupy%0
 .
 Language=Romanian
-Group name%0
+Nume de grup%0
 .
 Language=Russian
-Group name%0
+Имя группы%0
 .
 Language=Spanish
 Group name%0
@@ -22486,25 +22486,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=4403
@@ -22515,25 +22515,25 @@ Language=English
 Members
 .
 Language=Polish
-Members
+Członkowie
 .
 Language=Romanian
-Members
+Membri
 .
 Language=Russian
-Members
+Члены
 .
 Language=Spanish
-Members
+Miembros
 .
 Language=Turkish
-Members
+Üyeler
 .
 Language=Chinese
-Members
+成员
 .
 Language=Taiwanese
-Members
+成員
 .
 
 MessageId=4405
@@ -22544,25 +22544,25 @@ Language=English
 Aliases for \\\\%1
 .
 Language=Polish
-Aliases for \\\\%1
+Aliasy dla \\\\%1
 .
 Language=Romanian
-Aliases for \\\\%1
+Alias pentru \\\\%1
 .
 Language=Russian
-Aliases for \\\\%1
+Псевдонимы для \\\\%1
 .
 Language=Spanish
-Aliases for \\\\%1
+Alias de \\\\%1
 .
 Language=Turkish
-Aliases for \\\\%1
+\\\\%s için başka adlar
 .
 Language=Chinese
-Aliases for \\\\%1
+\\\\%s 的别名
 .
 Language=Taiwanese
-Aliases for \\\\%1
+別名 \\\\%s
 .
 
 MessageId=4406
@@ -22573,25 +22573,25 @@ Language=English
 Alias name%0
 .
 Language=Polish
-Alias name%0
+Nazwa aliasu%0
 .
 Language=Romanian
-Alias name%0
+Nume alias%0
 .
 Language=Russian
-Alias name%0
+Имя псевдонима%0
 .
 Language=Spanish
-Alias name%0
+Nombre del alias%0
 .
 Language=Turkish
-Alias name%0
+Başka ad%0
 .
 Language=Chinese
-Alias name%0
+别名名称%0
 .
 Language=Taiwanese
-Alias name%0
+別名名稱%0
 .
 
 MessageId=4407
@@ -22602,25 +22602,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=4408
@@ -22631,25 +22631,25 @@ Language=English
 Members
 .
 Language=Polish
-Members
+Członkowie
 .
 Language=Romanian
-Members
+Membri
 .
 Language=Russian
-Members
+Члены
 .
 Language=Spanish
-Members
+Miembros
 .
 Language=Turkish
-Members
+Üyeler
 .
 Language=Chinese
-Members
+成员
 .
 Language=Taiwanese
-Members
+成員
 .
 
 MessageId=4410