[MSGINA]

Display warning messages if a user tries to log on using a non-existing account name, a wrong password or if the account was disabled.

svn path=/trunk/; revision=62468

diff --git a/reactos/dll/win32/msgina/gui.c b/reactos/dll/win32/msgina/gui.c
index 0fc6b0b..2b5911d 100644 (file)
--- a/reactos/dll/win32/msgina/gui.c
+++ b/reactos/dll/win32/msgina/gui.c
@@ -943,19 +943,26 @@ DoLogon(
         goto done;
 
     Status = DoLoginTasks(pgContext, UserName, Domain, Password, &SubStatus);
-    if (!NT_SUCCESS(Status))
+    if (Status == STATUS_LOGON_FAILURE)
     {
-TRACE("DoLoginTasks failed! Status 0x%08lx  SubStatus 0x%08lx\n", Status, SubStatus);
+        ResourceMessageBox(pgContext,
+                           hwndDlg,
+                           MB_OK | MB_ICONEXCLAMATION,
+                           IDS_LOGONTITLE,
+                           IDS_LOGONWRONGUSERORPWD);
+        goto done;
+    }
+    else if (Status == STATUS_ACCOUNT_RESTRICTION)
+    {
+        TRACE("DoLoginTasks failed! Status 0x%08lx  SubStatus 0x%08lx\n", Status, SubStatus);
 
         if (SubStatus == STATUS_ACCOUNT_DISABLED)
         {
-TRACE("Account disabled!\n");
-            pgContext->pWlxFuncs->WlxMessageBox(pgContext->hWlx,
-                                                hwndDlg,
-                                                L"Account disabled!",
-                                                L"Logon error",
-                                                MB_OK | MB_ICONERROR);
-
+            ResourceMessageBox(pgContext,
+                               hwndDlg,
+                               MB_OK | MB_ICONEXCLAMATION,
+                               IDS_LOGONTITLE,
+                               IDS_LOGONUSERDISABLED);
             goto done;
         }
         else if (SubStatus == STATUS_ACCOUNT_LOCKED_OUT)
@@ -979,6 +986,13 @@ TRACE("Other error!\n");
             goto done;
         }
     }
+    else if (!NT_SUCCESS(Status))
+    {
+TRACE("DoLoginTasks failed! Status 0x%08lx\n", Status);
+
+        goto done;
+    }
+
 
     if (!CreateProfile(pgContext, UserName, Domain, Password))
     {

diff --git a/reactos/dll/win32/msgina/lang/bg-BG.rc b/reactos/dll/win32/msgina/lang/bg-BG.rc
index d06701b..c6e4160 100644 (file)
--- a/reactos/dll/win32/msgina/lang/bg-BG.rc
+++ b/reactos/dll/win32/msgina/lang/bg-BG.rc
@@ -140,11 +140,14 @@ BEGIN
     IDS_LOGONMSG "You are logged on as %s."
     IDS_LOGONDATE "Logon date: %s %s"
     IDS_COMPUTERLOCKED "Computer locked"
-    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
-    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer."
     IDS_CHANGEPWDTITLE "Change Password"
     IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes."
     IDS_PASSWORDCHANGED "Your password has been changed."
+    IDS_LOGONTITLE "Logon Message"
+    IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
 END
 
 /* Shutdown Dialog Strings */

diff --git a/reactos/dll/win32/msgina/lang/cs-CZ.rc b/reactos/dll/win32/msgina/lang/cs-CZ.rc
index 00ebf87..fb7c834 100644 (file)
--- a/reactos/dll/win32/msgina/lang/cs-CZ.rc
+++ b/reactos/dll/win32/msgina/lang/cs-CZ.rc
@@ -145,11 +145,14 @@ BEGIN
     IDS_LOGONMSG "Jste přihlášeni jako %s."
     IDS_LOGONDATE "Datum přihlášení: %s %s"
     IDS_COMPUTERLOCKED "Computer locked"
-    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
-    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer."
     IDS_CHANGEPWDTITLE "Change Password"
     IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes."
     IDS_PASSWORDCHANGED "Your password has been changed."
+    IDS_LOGONTITLE "Logon Message"
+    IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
 END
 
 /* Shutdown Dialog Strings */

diff --git a/reactos/dll/win32/msgina/lang/de-DE.rc b/reactos/dll/win32/msgina/lang/de-DE.rc
index 79710d8..612afcf 100644 (file)
--- a/reactos/dll/win32/msgina/lang/de-DE.rc
+++ b/reactos/dll/win32/msgina/lang/de-DE.rc
@@ -140,11 +140,14 @@ BEGIN
     IDS_LOGONMSG "Sie sind angemeldet als %s."
     IDS_LOGONDATE "Anmeldedatum: %s %s"
     IDS_COMPUTERLOCKED "Computer ist gesperrt"
-    IDS_LOCKEDWRONGPASSWORD "Das Passwort ist falsch.  Bitte geben Sie das Passwort erneut ein.  Bei Buchstaben des Passworts wird Groß- und Kleinschreibung unterschieden."
-    IDS_LOCKEDWRONGUSER "Der Computer ist gesperrt.  Nur %s\\%s oder ein Administrator kann den Computer entsperren."
+    IDS_LOCKEDWRONGPASSWORD "Das Passwort ist falsch. Bitte geben Sie das Passwort erneut ein. Bei Buchstaben des Passworts wird Groß- und Kleinschreibung unterschieden."
+    IDS_LOCKEDWRONGUSER "Der Computer ist gesperrt. Nur %s\\%s oder ein Administrator kann den Computer entsperren."
     IDS_CHANGEPWDTITLE "Passwort ändern"
     IDS_NONMATCHINGPASSWORDS "Die eingegebenen Passworte stimmen nicht überein. Geben Sie das neue Passwort in beide Textfelder ein."
     IDS_PASSWORDCHANGED "Ihr Passwort wurde geändert."
+    IDS_LOGONTITLE "Anmeldemeldung"
+    IDS_LOGONWRONGUSERORPWD "Sie konnten nicht angemeldet werden. Prüfen Sie Benutzername und Domäne, und geben Sie das Passwort erneut ein. Bei Passworten wird Groß- und Kleinschreibung unterschieden."
+    IDS_LOGONUSERDISABLED "Ihr Konto wurde deaktiviert. Wenden Sie sich an Ihren Systemadministrator."
 END
 
 /* Shutdown Dialog Strings */

diff --git a/reactos/dll/win32/msgina/lang/en-US.rc b/reactos/dll/win32/msgina/lang/en-US.rc
index e442a6a..b699b34 100644 (file)
--- a/reactos/dll/win32/msgina/lang/en-US.rc
+++ b/reactos/dll/win32/msgina/lang/en-US.rc
@@ -135,16 +135,19 @@ BEGIN
     IDS_PRESSCTRLALTDELETE "Press Control+Alt+Delete to Logon."
     IDS_ASKFORUSER "User name: "
     IDS_ASKFORPASSWORD "Password: "
-    IDS_FORCELOGOFF "This will log out the current user and lose all unsaved data.  Continue?"
+    IDS_FORCELOGOFF "This will log out the current user and lose all unsaved data. Continue?"
     IDS_LOCKMSG "Only %s or an Administrator can unlock this computer."
     IDS_LOGONMSG "You are logged on as %s."
     IDS_LOGONDATE "Logon date: %s %s"
     IDS_COMPUTERLOCKED "Computer locked"
-    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
-    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer."
     IDS_CHANGEPWDTITLE "Change Password"
     IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes."
     IDS_PASSWORDCHANGED "Your password has been changed."
+    IDS_LOGONTITLE "Logon Message"
+    IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
 END
 
 /* Shutdown Dialog Strings */

diff --git a/reactos/dll/win32/msgina/lang/es-ES.rc b/reactos/dll/win32/msgina/lang/es-ES.rc
index fff68d7..83c9cb9 100644 (file)
--- a/reactos/dll/win32/msgina/lang/es-ES.rc
+++ b/reactos/dll/win32/msgina/lang/es-ES.rc
@@ -142,11 +142,14 @@ BEGIN
     IDS_LOGONMSG "You are logged on as %s."
     IDS_LOGONDATE "Logon date: %s %s"
     IDS_COMPUTERLOCKED "Computer locked"
-    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
-    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer."
     IDS_CHANGEPWDTITLE "Change Password"
     IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes."
     IDS_PASSWORDCHANGED "Your password has been changed."
+    IDS_LOGONTITLE "Logon Message"
+    IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
 END
 
 /* Shutdown Dialog Strings */

diff --git a/reactos/dll/win32/msgina/lang/fr-FR.rc b/reactos/dll/win32/msgina/lang/fr-FR.rc
index ebe1785..60b838c 100644 (file)
--- a/reactos/dll/win32/msgina/lang/fr-FR.rc
+++ b/reactos/dll/win32/msgina/lang/fr-FR.rc
@@ -140,11 +140,14 @@ BEGIN
     IDS_LOGONMSG "You are logged on as %s."
     IDS_LOGONDATE "Logon date: %s %s"
     IDS_COMPUTERLOCKED "Computer locked"
-    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
-    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer."
     IDS_CHANGEPWDTITLE "Change Password"
     IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes."
     IDS_PASSWORDCHANGED "Your password has been changed."
+    IDS_LOGONTITLE "Logon Message"
+    IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
 END
 
 /* Shutdown Dialog Strings */

diff --git a/reactos/dll/win32/msgina/lang/he-IL.rc b/reactos/dll/win32/msgina/lang/he-IL.rc
index 0a36480..89be4d6 100644 (file)
--- a/reactos/dll/win32/msgina/lang/he-IL.rc
+++ b/reactos/dll/win32/msgina/lang/he-IL.rc
@@ -140,11 +140,14 @@ BEGIN
     IDS_LOGONMSG "You are logged on as %s."
     IDS_LOGONDATE "תאריך כניסה: %s %s"
     IDS_COMPUTERLOCKED "Computer locked"
-    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
-    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer."
     IDS_CHANGEPWDTITLE "Change Password"
     IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes."
     IDS_PASSWORDCHANGED "Your password has been changed."
+    IDS_LOGONTITLE "Logon Message"
+    IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
 END
 
 /* Shutdown Dialog Strings */

diff --git a/reactos/dll/win32/msgina/lang/id-ID.rc b/reactos/dll/win32/msgina/lang/id-ID.rc
index a8c593b..4e45a68 100644 (file)
--- a/reactos/dll/win32/msgina/lang/id-ID.rc
+++ b/reactos/dll/win32/msgina/lang/id-ID.rc
@@ -137,13 +137,17 @@ BEGIN
     IDS_ASKFORPASSWORD "Kata sandi: "
     IDS_FORCELOGOFF "Ini akan mengeluarkan pengguna saat ini dan kehilangan data yang belum disimpan.  Lanjutkan?"
     IDS_LOCKMSG "Only %s or an Administrator can unlock this computer."
+    IDS_LOGONMSG "You are logged on as %s."
     IDS_LOGONDATE "Logon date: %s %s"
     IDS_COMPUTERLOCKED "Computer locked"
-    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
-    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer."
     IDS_CHANGEPWDTITLE "Change Password"
     IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes."
     IDS_PASSWORDCHANGED "Your password has been changed."
+    IDS_LOGONTITLE "Logon Message"
+    IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
 END
 
 /* Shutdown Dialog Strings */

diff --git a/reactos/dll/win32/msgina/lang/it-IT.rc b/reactos/dll/win32/msgina/lang/it-IT.rc
index 7ab86e7..a1e442e 100644 (file)
--- a/reactos/dll/win32/msgina/lang/it-IT.rc
+++ b/reactos/dll/win32/msgina/lang/it-IT.rc
@@ -148,11 +148,14 @@ BEGIN
     IDS_LOGONMSG "You are logged on as %s."
     IDS_LOGONDATE "Dati di accesso: %s %s"
     IDS_COMPUTERLOCKED "Computer locked"
-    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
-    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer."
     IDS_CHANGEPWDTITLE "Change Password"
     IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes."
     IDS_PASSWORDCHANGED "Your password has been changed."
+    IDS_LOGONTITLE "Logon Message"
+    IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
 END
 
 /* Shutdown Dialog Strings */

diff --git a/reactos/dll/win32/msgina/lang/ja-JP.rc b/reactos/dll/win32/msgina/lang/ja-JP.rc
index a1731d0..b3af12c 100644 (file)
--- a/reactos/dll/win32/msgina/lang/ja-JP.rc
+++ b/reactos/dll/win32/msgina/lang/ja-JP.rc
@@ -140,11 +140,14 @@ BEGIN
     IDS_LOGONMSG "You are logged on as %s."
     IDS_LOGONDATE "Logon date: %s %s"
     IDS_COMPUTERLOCKED "Computer locked"
-    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
-    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer."
     IDS_CHANGEPWDTITLE "Change Password"
     IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes."
     IDS_PASSWORDCHANGED "Your password has been changed."
+    IDS_LOGONTITLE "Logon Message"
+    IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
 END
 
 /* Shutdown Dialog Strings */

diff --git a/reactos/dll/win32/msgina/lang/no-NO.rc b/reactos/dll/win32/msgina/lang/no-NO.rc
index 41b0af8..bce3ee2 100644 (file)
--- a/reactos/dll/win32/msgina/lang/no-NO.rc
+++ b/reactos/dll/win32/msgina/lang/no-NO.rc
@@ -140,11 +140,14 @@ BEGIN
     IDS_LOGONMSG "You are logged on as %s."
     IDS_LOGONDATE "Logon date: %s %s"
     IDS_COMPUTERLOCKED "Computer locked"
-    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
-    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer."
     IDS_CHANGEPWDTITLE "Change Password"
     IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes."
     IDS_PASSWORDCHANGED "Your password has been changed."
+    IDS_LOGONTITLE "Logon Message"
+    IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
 END
 
 /* Shutdown Dialog Strings */

diff --git a/reactos/dll/win32/msgina/lang/pl-PL.rc b/reactos/dll/win32/msgina/lang/pl-PL.rc
index aad32ff..a1d56be 100644 (file)
--- a/reactos/dll/win32/msgina/lang/pl-PL.rc
+++ b/reactos/dll/win32/msgina/lang/pl-PL.rc
@@ -149,11 +149,14 @@ BEGIN
     IDS_LOGONMSG "Jesteś zalogowany jako %s."
     IDS_LOGONDATE "Data logowania: %s %s"
     IDS_COMPUTERLOCKED "Computer locked"
-    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
-    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer."
     IDS_CHANGEPWDTITLE "Change Password"
     IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes."
     IDS_PASSWORDCHANGED "Your password has been changed."
+    IDS_LOGONTITLE "Logon Message"
+    IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
 END
 
 /* Shutdown Dialog Strings */

diff --git a/reactos/dll/win32/msgina/lang/ro-RO.rc b/reactos/dll/win32/msgina/lang/ro-RO.rc
index f63e48c..bafb790 100644 (file)
--- a/reactos/dll/win32/msgina/lang/ro-RO.rc
+++ b/reactos/dll/win32/msgina/lang/ro-RO.rc
@@ -142,11 +142,14 @@ BEGIN
     IDS_LOGONMSG "Sunteți autentificat ca %s."
     IDS_LOGONDATE "Data autentificării: %s %s"
     IDS_COMPUTERLOCKED "Computer locked"
-    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
-    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer."
     IDS_CHANGEPWDTITLE "Change Password"
     IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes."
     IDS_PASSWORDCHANGED "Your password has been changed."
+    IDS_LOGONTITLE "Logon Message"
+    IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
 END
 
 /* Shutdown Dialog Strings */

diff --git a/reactos/dll/win32/msgina/lang/ru-RU.rc b/reactos/dll/win32/msgina/lang/ru-RU.rc
index 0c69e47..398ce06 100644 (file)
--- a/reactos/dll/win32/msgina/lang/ru-RU.rc
+++ b/reactos/dll/win32/msgina/lang/ru-RU.rc
@@ -142,11 +142,14 @@ BEGIN
     IDS_LOGONMSG "You are logged on as %s."
     IDS_LOGONDATE "Дата входа: %s %s"
     IDS_COMPUTERLOCKED "Computer locked"
-    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
-    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer."
     IDS_CHANGEPWDTITLE "Change Password"
     IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes."
     IDS_PASSWORDCHANGED "Your password has been changed."
+    IDS_LOGONTITLE "Logon Message"
+    IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
 END
 
 /* Shutdown Dialog Strings */

diff --git a/reactos/dll/win32/msgina/lang/sk-SK.rc b/reactos/dll/win32/msgina/lang/sk-SK.rc
index ead0f3a..31d4ab2 100644 (file)
--- a/reactos/dll/win32/msgina/lang/sk-SK.rc
+++ b/reactos/dll/win32/msgina/lang/sk-SK.rc
@@ -145,11 +145,14 @@ BEGIN
     IDS_LOGONMSG "You are logged on as %s."
     IDS_LOGONDATE "Logon date: %s %s"
     IDS_COMPUTERLOCKED "Computer locked"
-    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
-    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer."
     IDS_CHANGEPWDTITLE "Change Password"
     IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes."
     IDS_PASSWORDCHANGED "Your password has been changed."
+    IDS_LOGONTITLE "Logon Message"
+    IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
 END
 
 /* Shutdown Dialog Strings */

diff --git a/reactos/dll/win32/msgina/lang/sq-AL.rc b/reactos/dll/win32/msgina/lang/sq-AL.rc
index 8c18c16..cb9a93f 100644 (file)
--- a/reactos/dll/win32/msgina/lang/sq-AL.rc
+++ b/reactos/dll/win32/msgina/lang/sq-AL.rc
@@ -145,6 +145,12 @@ BEGIN
     IDS_COMPUTERLOCKED "Kompjuter mbyllur"
     IDS_LOCKEDWRONGPASSWORD "Fjalëkalimi është gabim.  Ju lutem shkruani fjalëkalimin tuaj përsëri. Gërmat në fjalëkalim duhet të shkruhen duke përdorur rastin e duhur."
     IDS_LOCKEDWRONGUSER "Ky kompjuter është i bllokuar.  Vetëm %s\\%s ose një Administrator mund të zhbllokoj këtë kompjuter."
+    IDS_CHANGEPWDTITLE "Change Password"
+    IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes."
+    IDS_PASSWORDCHANGED "Your password has been changed."
+    IDS_LOGONTITLE "Logon Message"
+    IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
 END
 
 /* Shutdown Dialog Strings */

diff --git a/reactos/dll/win32/msgina/lang/tr-TR.rc b/reactos/dll/win32/msgina/lang/tr-TR.rc
index 9eebba7..7c3a825 100644 (file)
--- a/reactos/dll/win32/msgina/lang/tr-TR.rc
+++ b/reactos/dll/win32/msgina/lang/tr-TR.rc
@@ -147,6 +147,9 @@ BEGIN
     IDS_CHANGEPWDTITLE "Şifre Değştirme"
     IDS_NONMATCHINGPASSWORDS "Yazıdığınız bu şifreler birbiriyle uyuşmuyor. Her iki metin kutusuna da aynı şifreyi yazınız."
     IDS_PASSWORDCHANGED "Şifreniz değiştirildi."
+    IDS_LOGONTITLE "Logon Message"
+    IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
 END
 
 /* Shutdown Dialog Strings */

diff --git a/reactos/dll/win32/msgina/lang/uk-UA.rc b/reactos/dll/win32/msgina/lang/uk-UA.rc
index 34be98f..b125c54 100644 (file)
--- a/reactos/dll/win32/msgina/lang/uk-UA.rc
+++ b/reactos/dll/win32/msgina/lang/uk-UA.rc
@@ -153,6 +153,9 @@ BEGIN
     IDS_CHANGEPWDTITLE "Change Password"
     IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes."
     IDS_PASSWORDCHANGED "Your password has been changed."
+    IDS_LOGONTITLE "Logon Message"
+    IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case."
+    IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
 END
 
 /* Shutdown Dialog Strings */

diff --git a/reactos/dll/win32/msgina/resource.h b/reactos/dll/win32/msgina/resource.h
index b8e51ed..e310dcf 100644 (file)
--- a/reactos/dll/win32/msgina/resource.h
+++ b/reactos/dll/win32/msgina/resource.h
@@ -54,6 +54,9 @@
 #define IDS_CHANGEPWDTITLE       40012
 #define IDS_NONMATCHINGPASSWORDS 40013
 #define IDS_PASSWORDCHANGED      40014
+#define IDS_LOGONTITLE           40015
+#define IDS_LOGONWRONGUSERORPWD  40016
+#define IDS_LOGONUSERDISABLED    40017
 
 #define IDS_SHUTDOWN_SHUTDOWN         50000
 #define IDS_SHUTDOWN_LOGOFF           50001