[ros-diffs] [ekohl] 65342: [NET] Replace remaining hardcoded strings by resource strings.

Author: ekohl
Date: Sun Nov  9 13:39:20 2014
New Revision: 65342

URL: http://svn.reactos.org/svn/reactos?rev=65342&view=rev
Log:
[NET]
Replace remaining hardcoded strings by resource strings.

Modified:
    trunk/reactos/base/applications/network/net/cmdAccounts.c
    trunk/reactos/base/applications/network/net/cmdLocalGroup.c
    trunk/reactos/base/applications/network/net/cmdUser.c
    trunk/reactos/base/applications/network/net/lang/en-US.rc
    trunk/reactos/base/applications/network/net/lang/ro-RO.rc
    trunk/reactos/base/applications/network/net/lang/ru-RU.rc
    trunk/reactos/base/applications/network/net/main.c
    trunk/reactos/base/applications/network/net/net.h
    trunk/reactos/base/applications/network/net/resource.h

Modified: trunk/reactos/base/applications/network/net/cmdAccounts.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…
==============================================================================
--- trunk/reactos/base/applications/network/net/cmdAccounts.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/net/cmdAccounts.c	[iso-8859-1] Sun Nov  9
13:39:20 2014
@@ -27,6 +27,7 @@
 #if 0
     BOOL Domain = FALSE;
 #endif
+    INT nPaddedLength = 58;
     NET_API_STATUS Status;
     INT result = 0;
 
@@ -168,52 +169,63 @@
 
         RtlGetNtProductType(&ProductType);
 
-        PrintToConsole(L"Force logoff after:                                      
");
+        PrintPaddedResourceString(IDS_ACCOUNTS_FORCE_LOGOFF, nPaddedLength);
         if (Info0->usrmod0_force_logoff == TIMEQ_FOREVER)
-            PrintToConsole(L"Never\n");
-        else
-            PrintToConsole(L"%lu seconds\n", Info0->usrmod0_force_logoff);
-
-        PrintToConsole(L"Minimum password age (in days):                          
%lu\n", Info0->usrmod0_min_passwd_age / 86400);
-        PrintToConsole(L"Maximum password age (in days):                          
%lu\n", Info0->usrmod0_max_passwd_age / 86400);
-        PrintToConsole(L"Minimum password length:                                 
%lu\n", Info0->usrmod0_min_passwd_len);
-
-        PrintToConsole(L"Password history length:                                 
");
+            PrintToConsole(L"Never");
+        else
+            PrintResourceString(IDS_ACCOUNTS_LOGOFF_SECONDS,
Info0->usrmod0_force_logoff);
+        PrintToConsole(L"\n");
+
+        PrintPaddedResourceString(IDS_ACCOUNTS_MIN_PW_AGE, nPaddedLength);
+        PrintToConsole(L"%lu\n", Info0->usrmod0_min_passwd_age / 86400);
+
+        PrintPaddedResourceString(IDS_ACCOUNTS_MAX_PW_AGE, nPaddedLength);
+        PrintToConsole(L"%lu\n", Info0->usrmod0_max_passwd_age / 86400);
+
+        PrintPaddedResourceString(IDS_ACCOUNTS_MIN_PW_LENGTH, nPaddedLength);
+        PrintToConsole(L"%lu\n", Info0->usrmod0_min_passwd_len);
+
+        PrintPaddedResourceString(IDS_ACCOUNTS_PW_HIST_LENGTH, nPaddedLength);
         if (Info0->usrmod0_password_hist_len == 0)
-            PrintToConsole(L"None\n");
-        else
-            PrintToConsole(L"%lu\n", Info0->usrmod0_password_hist_len);
-
-        PrintToConsole(L"Lockout threshold:                                       
");
+            PrintResourceString(IDS_GENERIC_NONE);
+        else
+            PrintToConsole(L"%lu", Info0->usrmod0_password_hist_len);
+        PrintToConsole(L"\n");
+
+        PrintPaddedResourceString(IDS_ACCOUNTS_LOCKOUT_THRESHOLD, nPaddedLength);
         if (Info3->usrmod3_lockout_threshold == 0)
-            PrintToConsole(L"Never\n");
-        else
-            PrintToConsole(L"%lu\n", Info3->usrmod3_lockout_threshold);
-
-        PrintToConsole(L"Lockout duration (in minutes):                           
%lu\n", Info3->usrmod3_lockout_duration / 60);
-        PrintToConsole(L"Lockout observation window (in minutes):                 
%lu\n", Info3->usrmod3_lockout_observation_window / 60);
-
-        PrintToConsole(L"Computer role:                                           
");
-
+            PrintResourceString(IDS_GENERIC_NEVER);
+        else
+            PrintToConsole(L"%lu", Info3->usrmod3_lockout_threshold);
+        PrintToConsole(L"\n");
+
+        PrintPaddedResourceString(IDS_ACCOUNTS_LOCKOUT_DURATION, nPaddedLength);
+        PrintToConsole(L"%lu\n", Info3->usrmod3_lockout_duration / 60);
+
+        PrintPaddedResourceString(IDS_ACCOUNTS_LOCKOUT_WINDOW, nPaddedLength);
+        PrintToConsole(L"%lu\n", Info3->usrmod3_lockout_observation_window /
60);
+
+        PrintPaddedResourceString(IDS_ACCOUNTS_COMPUTER_ROLE, nPaddedLength);
         if (Info1->usrmod1_role == UAS_ROLE_PRIMARY)
         {
             if (ProductType == NtProductLanManNt)
             {
-                PrintToConsole(L"Primary server\n");
+                PrintResourceString(IDS_ACCOUNTS_PRIMARY_SERVER);
             }
             else if (ProductType == NtProductServer)
             {
-                PrintToConsole(L"Standalone server\n");
+                PrintResourceString(IDS_ACCOUNTS_STANDALONE_SERVER);
             }
             else
             {
-                PrintToConsole(L"Workstation\n");
-            }
-        }
-        else
-        {
-            PrintToConsole(L"Backup server\n");
-        }
+                PrintResourceString(IDS_ACCOUNTS_WORKSTATION);
+            }
+        }
+        else
+        {
+            PrintResourceString(IDS_ACCOUNTS_BACKUP_SERVER);
+        }
+        PrintToConsole(L"\n");
     }
 
 done:

Modified: trunk/reactos/base/applications/network/net/cmdLocalGroup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…
==============================================================================
--- trunk/reactos/base/applications/network/net/cmdLocalGroup.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/net/cmdLocalGroup.c	[iso-8859-1] Sun Nov  9
13:39:20 2014
@@ -38,7 +38,9 @@
     if (Status != NERR_Success)
         return Status;
 
-    PrintToConsole(L"\nAliases for \\\\%s\n\n", pServer->sv100_name);
+    PrintToConsole(L"\n");
+    PrintResourceString(IDS_LOCALGROUP_ALIASES, pServer->sv100_name);
+    PrintToConsole(L"\n\n");
     PrintToConsole(L"------------------------------------------\n");
 
     NetApiBufferFree(pServer);
@@ -83,6 +85,7 @@
     DWORD_PTR ResumeHandle = 0;
     DWORD i;
     DWORD len;
+    INT nPaddedLength = 18;
     NET_API_STATUS Status;
 
     Status = NetLocalGroupGetInfo(NULL,
@@ -127,11 +130,17 @@
              pNames[i] = pMembers[i].lgrmi3_domainandname;
     }
 
-    PrintToConsole(L"Alias name        %s\n", pGroupInfo->lgrpi1_name);
-    PrintToConsole(L"Comment           %s\n", pGroupInfo->lgrpi1_comment);
+    PrintPaddedResourceString(IDS_LOCALGROUP_ALIAS_NAME, nPaddedLength);
+    PrintToConsole(L"%s\n", pGroupInfo->lgrpi1_name);
+
+    PrintPaddedResourceString(IDS_LOCALGROUP_COMMENT, nPaddedLength);
+    PrintToConsole(L"%s\n", pGroupInfo->lgrpi1_comment);
+
     PrintToConsole(L"\n");
-    PrintToConsole(L"Members\n");
-    PrintToConsole(L"\n");
+
+    PrintResourceString(IDS_LOCALGROUP_MEMBERS);
+    PrintToConsole(L"\n\n");
+
     PrintToConsole(L"------------------------------------------\n");
 
     for (i = 0; i < dwRead; i++)

Modified: trunk/reactos/base/applications/network/net/cmdUser.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…
==============================================================================
--- trunk/reactos/base/applications/network/net/cmdUser.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/net/cmdUser.c	[iso-8859-1] Sun Nov  9 13:39:20
2014
@@ -37,11 +37,12 @@
     if (Status != NERR_Success)
         return Status;
 
-    PrintToConsole(L"\nUser accounts for \\\\%s\n\n", pServer->sv100_name);
+    PrintToConsole(L"\n");
+    PrintResourceString(IDS_USER_ACCOUNTS, pServer->sv100_name);
+    PrintToConsole(L"\n\n");
+    PrintToConsole(L"------------------------------------------\n");
 
     NetApiBufferFree(pServer);
-
-    PrintToConsole(L"------------------------------------------\n");
 
     Status = NetUserEnum(NULL,
                          0,
@@ -103,7 +104,7 @@
                    TimeBuffer,
                    80);
 
-    PrintToConsole(L"%s %s\n", DateBuffer, TimeBuffer);
+    PrintToConsole(L"%s %s", DateBuffer, TimeBuffer);
 }
 
 
@@ -136,6 +137,7 @@
     DWORD dwGroupRead, dwGroupTotal;
     DWORD dwLastSet;
     DWORD i;
+    INT nPaddedLength = 29;
     NET_API_STATUS Status;
 
     /* Modify the user */
@@ -173,81 +175,89 @@
     if (Status != NERR_Success)
         goto done;
 
-    PrintPaddedResourceString(IDS_USER_NAME);
+    PrintPaddedResourceString(IDS_USER_NAME, nPaddedLength);
     PrintToConsole(L"%s\n", pUserInfo->usri4_name);
 
-    PrintPaddedResourceString(IDS_USER_FULL_NAME);
+    PrintPaddedResourceString(IDS_USER_FULL_NAME, nPaddedLength);
     PrintToConsole(L"%s\n", pUserInfo->usri4_full_name);
 
-    PrintPaddedResourceString(IDS_USER_COMMENT);
+    PrintPaddedResourceString(IDS_USER_COMMENT, nPaddedLength);
     PrintToConsole(L"%s\n", pUserInfo->usri4_comment);
 
-    PrintPaddedResourceString(IDS_USER_USER_COMMENT);
+    PrintPaddedResourceString(IDS_USER_USER_COMMENT, nPaddedLength);
     PrintToConsole(L"%s\n", pUserInfo->usri4_usr_comment);
 
-    PrintPaddedResourceString(IDS_USER_COUNTRY_CODE);
+    PrintPaddedResourceString(IDS_USER_COUNTRY_CODE, nPaddedLength);
     PrintToConsole(L"%03ld ()\n", pUserInfo->usri4_country_code);
 
-    PrintPaddedResourceString(IDS_USER_ACCOUNT_ACTIVE);
-    PrintToConsole(L"%s\n", (pUserInfo->usri4_flags &
UF_ACCOUNTDISABLE)? L"No" : ((pUserInfo->usri4_flags & UF_LOCKOUT) ?
L"Locked" : L"Yes"));
-
-    PrintPaddedResourceString(IDS_USER_ACCOUNT_EXPIRES);
+    PrintPaddedResourceString(IDS_USER_ACCOUNT_ACTIVE, nPaddedLength);
+    if (pUserInfo->usri4_flags & UF_ACCOUNTDISABLE)
+        PrintResourceString(IDS_GENERIC_NO);
+    else if (pUserInfo->usri4_flags & UF_LOCKOUT)
+        PrintResourceString(IDS_GENERIC_LOCKED);
+    else
+        PrintResourceString(IDS_GENERIC_YES);
+    PrintToConsole(L"\n");
+
+    PrintPaddedResourceString(IDS_USER_ACCOUNT_EXPIRES, nPaddedLength);
     if (pUserInfo->usri4_acct_expires == TIMEQ_FOREVER)
-        PrintToConsole(L"Never\n");
+        PrintResourceString(IDS_GENERIC_NEVER);
     else
         PrintDateTime(pUserInfo->usri4_acct_expires);
-
-    PrintToConsole(L"\n");
-
-    PrintPaddedResourceString(IDS_USER_PW_LAST_SET);
+    PrintToConsole(L"\n\n");
+
+    PrintPaddedResourceString(IDS_USER_PW_LAST_SET, nPaddedLength);
     dwLastSet = GetTimeInSeconds() - pUserInfo->usri4_password_age;
     PrintDateTime(dwLastSet);
 
-    PrintPaddedResourceString(IDS_USER_PW_EXPIRES);
+    PrintPaddedResourceString(IDS_USER_PW_EXPIRES, nPaddedLength);
     if ((pUserInfo->usri4_flags & UF_DONT_EXPIRE_PASSWD) ||
pUserModals->usrmod0_max_passwd_age == TIMEQ_FOREVER)
-        PrintToConsole(L"Never\n");
+        PrintResourceString(IDS_GENERIC_NEVER);
     else
         PrintDateTime(dwLastSet + pUserModals->usrmod0_max_passwd_age);
-
-    PrintPaddedResourceString(IDS_USER_PW_CHANGEABLE);
+    PrintToConsole(L"\n");
+
+    PrintPaddedResourceString(IDS_USER_PW_CHANGEABLE, nPaddedLength);
     PrintDateTime(dwLastSet + pUserModals->usrmod0_min_passwd_age);
 
-    PrintPaddedResourceString(IDS_USER_PW_REQUIRED);
-    PrintToConsole(L"%s\n", (pUserInfo->usri4_flags & UF_PASSWD_NOTREQD)
? L"No" : L"Yes");
-
-    PrintPaddedResourceString(IDS_USER_CHANGE_PW);
-    PrintToConsole(L"%s\n", (pUserInfo->usri4_flags &
UF_PASSWD_CANT_CHANGE) ? L"No" : L"Yes");
-
+    PrintPaddedResourceString(IDS_USER_PW_REQUIRED, nPaddedLength);
+    PrintResourceString((pUserInfo->usri4_flags & UF_PASSWD_NOTREQD) ?
IDS_GENERIC_NO : IDS_GENERIC_YES);
     PrintToConsole(L"\n");
 
-    PrintPaddedResourceString(IDS_USER_WORKSTATIONS);
-    PrintToConsole(L"%s\n", (pUserInfo->usri4_workstations == NULL ||
wcslen(pUserInfo->usri4_workstations) == 0) ? L"All" :
pUserInfo->usri4_workstations);
-
-    PrintPaddedResourceString(IDS_USER_LOGON_SCRIPT);
+    PrintPaddedResourceString(IDS_USER_CHANGE_PW, nPaddedLength);
+    PrintResourceString((pUserInfo->usri4_flags & UF_PASSWD_CANT_CHANGE) ?
IDS_GENERIC_NO : IDS_GENERIC_YES);
+    PrintToConsole(L"\n\n");
+
+    PrintPaddedResourceString(IDS_USER_WORKSTATIONS, nPaddedLength);
+    if (pUserInfo->usri4_workstations == NULL ||
wcslen(pUserInfo->usri4_workstations) == 0)
+        PrintResourceString(IDS_GENERIC_ALL);
+    else
+        PrintToConsole(L"%s", pUserInfo->usri4_workstations);
+    PrintToConsole(L"\n");
+
+    PrintPaddedResourceString(IDS_USER_LOGON_SCRIPT, nPaddedLength);
     PrintToConsole(L"%s\n", pUserInfo->usri4_script_path);
 
-    PrintPaddedResourceString(IDS_USER_PROFILE);
+    PrintPaddedResourceString(IDS_USER_PROFILE, nPaddedLength);
     PrintToConsole(L"%s\n", pUserInfo->usri4_profile);
 
-    PrintPaddedResourceString(IDS_USER_HOME_DIR);
+    PrintPaddedResourceString(IDS_USER_HOME_DIR, nPaddedLength);
     PrintToConsole(L"%s\n", pUserInfo->usri4_home_dir);
 
-    PrintPaddedResourceString(IDS_USER_LAST_LOGON);
+    PrintPaddedResourceString(IDS_USER_LAST_LOGON, nPaddedLength);
     if (pUserInfo->usri4_last_logon == 0)
-        PrintToConsole(L"Never\n");
+        PrintResourceString(IDS_GENERIC_NEVER);
     else
         PrintDateTime(pUserInfo->usri4_last_logon);
+    PrintToConsole(L"\n\n");
+
+    PrintPaddedResourceString(IDS_USER_LOGON_HOURS, nPaddedLength);
+    if (pUserInfo->usri4_logon_hours == NULL)
+        PrintResourceString(IDS_GENERIC_ALL);
+    PrintToConsole(L"\n\n");
 
     PrintToConsole(L"\n");
-
-    PrintPaddedResourceString(IDS_USER_LOGON_HOURS);
-    if (pUserInfo->usri4_logon_hours == NULL)
-        PrintToConsole(L"All\n");
-
-    PrintToConsole(L"\n");
-
-    PrintToConsole(L"\n");
-    PrintPaddedResourceString(IDS_USER_LOCAL_GROUPS);
+    PrintPaddedResourceString(IDS_USER_LOCAL_GROUPS, nPaddedLength);
     if (dwLocalGroupTotal != 0 && pLocalGroupInfo != NULL)
     {
         for (i = 0; i < dwLocalGroupTotal; i++)
@@ -262,7 +272,7 @@
         PrintToConsole(L"\n");
     }
 
-    PrintPaddedResourceString(IDS_USER_GLOBAL_GROUPS);
+    PrintPaddedResourceString(IDS_USER_GLOBAL_GROUPS, nPaddedLength);
     if (dwGroupTotal != 0 && pGroupInfo != NULL)
     {
         for (i = 0; i < dwGroupTotal; i++)
@@ -310,11 +320,11 @@
     {
         PrintResourceString(IDS_USER_ENTER_PASSWORD1);
         ReadFromConsole(szPassword1, PWLEN + 1, FALSE);
-        printf("\n");
+        PrintToConsole(L"\n");
 
         PrintResourceString(IDS_USER_ENTER_PASSWORD2);
         ReadFromConsole(szPassword2, PWLEN + 1, FALSE);
-        printf("\n");
+        PrintToConsole(L"\n");
 
         if (wcslen(szPassword1) == wcslen(szPassword2) &&
             wcscmp(szPassword1, szPassword2) == 0)
@@ -332,7 +342,9 @@
         }
         else
         {
+            PrintToConsole(L"\n");
             PrintResourceString(IDS_USER_NO_PASSWORD_MATCH);
+            PrintToConsole(L"\n");
             *lpPassword = NULL;
         }
     }

Modified: trunk/reactos/base/applications/network/net/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…
==============================================================================
--- trunk/reactos/base/applications/network/net/lang/en-US.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/net/lang/en-US.rc	[iso-8859-1] Sun Nov  9
13:39:20 2014
@@ -65,6 +65,27 @@
       HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\
       SHARE | START | STATISTICS | STOP | TIME | USE | NET 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)"
+    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"
+    IDS_ACCOUNTS_WORKSTATION "Workstation"
+
+    IDS_LOCALGROUP_ALIASES "Aliases for \\\\%s"
+    IDS_LOCALGROUP_ALIAS_NAME "Alias name"
+    IDS_LOCALGROUP_COMMENT "Comment"
+    IDS_LOCALGROUP_MEMBERS "Members"
+
+    IDS_USER_ACCOUNTS "User accounts for \\\\%s"
    IDS_USER_NAME "User name"
    IDS_USER_FULL_NAME "Full name"
    IDS_USER_COMMENT "Comment"
@@ -88,7 +109,14 @@
 
    IDS_USER_ENTER_PASSWORD1 "Enter a new password for the user: "
    IDS_USER_ENTER_PASSWORD2 "Enter the password again: "
-   IDS_USER_NO_PASSWORD_MATCH "\nThe passwords do not match!\n"
+   IDS_USER_NO_PASSWORD_MATCH "The passwords do not match!"
+
+    IDS_GENERIC_YES "Yes"
+    IDS_GENERIC_NO "No"
+    IDS_GENERIC_NEVER "Never"
+    IDS_GENERIC_NONE "None"
+    IDS_GENERIC_ALL "All"
+    IDS_GENERIC_LOCKED "Locked"
 
    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"

Modified: trunk/reactos/base/applications/network/net/lang/ro-RO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…
==============================================================================
--- trunk/reactos/base/applications/network/net/lang/ro-RO.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/net/lang/ro-RO.rc	[iso-8859-1] Sun Nov  9
13:39:20 2014
@@ -71,6 +71,27 @@
       HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\
       SHARE | START | STATISTICS | STOP | TIME | USE | NET 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)"
+    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"
+    IDS_ACCOUNTS_WORKSTATION "Workstation"
+
+    IDS_LOCALGROUP_ALIASES "Aliases for \\\\%s"
+    IDS_LOCALGROUP_ALIAS_NAME "Alias name"
+    IDS_LOCALGROUP_COMMENT "Comment"
+    IDS_LOCALGROUP_MEMBERS "Members"
+
+    IDS_USER_ACCOUNTS "User accounts for \\\\%s"
    IDS_USER_NAME "User name"
    IDS_USER_FULL_NAME "Full name"
    IDS_USER_COMMENT "Comment"
@@ -94,7 +115,14 @@
 
    IDS_USER_ENTER_PASSWORD1 "Enter a new password for the user: "
    IDS_USER_ENTER_PASSWORD2 "Enter the password again: "
-   IDS_USER_NO_PASSWORD_MATCH "\nThe passwords do not match!\n"
+   IDS_USER_NO_PASSWORD_MATCH "The passwords do not match!"
+
+    IDS_GENERIC_YES "Yes"
+    IDS_GENERIC_NO "No"
+    IDS_GENERIC_NEVER "Never"
+    IDS_GENERIC_NONE "None"
+    IDS_GENERIC_ALL "All"
+    IDS_GENERIC_LOCKED "Locked"
 
    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"

Modified: trunk/reactos/base/applications/network/net/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…
==============================================================================
--- trunk/reactos/base/applications/network/net/lang/ru-RU.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/net/lang/ru-RU.rc	[iso-8859-1] Sun Nov  9
13:39:20 2014
@@ -67,6 +67,27 @@
       HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\
       SHARE | START | STATISTICS | STOP | TIME | USE | NET 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)"
+    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"
+    IDS_ACCOUNTS_WORKSTATION "Workstation"
+
+    IDS_LOCALGROUP_ALIASES "Aliases for \\\\%s"
+    IDS_LOCALGROUP_ALIAS_NAME "Alias name"
+    IDS_LOCALGROUP_COMMENT "Comment"
+    IDS_LOCALGROUP_MEMBERS "Members"
+
+    IDS_USER_ACCOUNTS "User accounts for \\\\%s"
    IDS_USER_NAME "User name"
    IDS_USER_FULL_NAME "Full name"
    IDS_USER_COMMENT "Comment"
@@ -90,7 +111,14 @@
 
    IDS_USER_ENTER_PASSWORD1 "Enter a new password for the user: "
    IDS_USER_ENTER_PASSWORD2 "Enter the password again: "
-   IDS_USER_NO_PASSWORD_MATCH "\nThe passwords do not match!\n"
+   IDS_USER_NO_PASSWORD_MATCH "The passwords do not match!"
+
+    IDS_GENERIC_YES "Yes"
+    IDS_GENERIC_NO "No"
+    IDS_GENERIC_NEVER "Never"
+    IDS_GENERIC_NONE "None"
+    IDS_GENERIC_ALL "All"
+    IDS_GENERIC_LOCKED "Locked"
 
    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"

Modified: trunk/reactos/base/applications/network/net/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…
==============================================================================
--- trunk/reactos/base/applications/network/net/main.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/net/main.c	[iso-8859-1] Sun Nov  9 13:39:20
2014
@@ -66,10 +66,11 @@
 
 VOID
 PrintPaddedResourceString(
-    INT resID)
+    INT resID,
+    INT nPaddedLength)
 {
     WCHAR szMsgBuffer[MAX_BUFFER_SIZE];
-    INT nLength, nPaddedLength = 29, i;
+    INT nLength, i;
 
     nLength = LoadStringW(GetModuleHandle(NULL), resID, szMsgBuffer, MAX_BUFFER_SIZE);
     if (nLength < nPaddedLength)

Modified: trunk/reactos/base/applications/network/net/net.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…
==============================================================================
--- trunk/reactos/base/applications/network/net/net.h	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/net/net.h	[iso-8859-1] Sun Nov  9 13:39:20
2014
@@ -32,7 +32,8 @@
 
 VOID
 PrintPaddedResourceString(
-    INT resID);
+    INT resID,
+    INT nPaddedLength);
 
 VOID
 PrintToConsole(

Modified: trunk/reactos/base/applications/network/net/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…
==============================================================================
--- trunk/reactos/base/applications/network/net/resource.h	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/net/resource.h	[iso-8859-1] Sun Nov  9
13:39:20 2014
@@ -45,6 +45,27 @@
 #define IDS_HELP_SYNTAX       142
 #define IDS_NET_SYNTAX        143
 
+#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
+#define IDS_ACCOUNTS_WORKSTATION       213
+
+#define IDS_LOCALGROUP_ALIASES         300
+#define IDS_LOCALGROUP_ALIAS_NAME      301
+#define IDS_LOCALGROUP_COMMENT         302
+#define IDS_LOCALGROUP_MEMBERS         303
+
+#define IDS_USER_ACCOUNTS              449
 #define IDS_USER_NAME                  450
 #define IDS_USER_FULL_NAME             451
 #define IDS_USER_COMMENT               452
@@ -70,5 +91,12 @@
 #define IDS_USER_ENTER_PASSWORD2       491
 #define IDS_USER_NO_PASSWORD_MATCH     492
 
-#define IDS_ERROR_OPTION_NOT_SUPPORTED 500
-#define IDS_ERROR_INVALID_OPTION_VALUE 501
+#define IDS_GENERIC_YES                500
+#define IDS_GENERIC_NO                 501
+#define IDS_GENERIC_NEVER              502
+#define IDS_GENERIC_NONE               503
+#define IDS_GENERIC_ALL                504
+#define IDS_GENERIC_LOCKED             505
+
+#define IDS_ERROR_OPTION_NOT_SUPPORTED 600
+#define IDS_ERROR_INVALID_OPTION_VALUE 601