Change some of the GCPW UX writing

Bug: 1001031
Change-Id: Ia8c41cc878a3957686bb897af5c68c96280fe456
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1786832Reviewed-by: Tien Mai <tienmai@chromium.org>
Commit-Queue: Yusuf Sengul <yusufsn@google.com>
Cr-Commit-Position: refs/heads/master@{#693761}

chrome/credential_provider/gaiacp/gaia_credential_base.cc

@@ -1987,7 +1987,7 @@ HRESULT CGaiaCredentialBase::ValidateOrCreateUser(const base::Value& result,
         allow_consumer_accounts == 0) {
       LOGFN(ERROR) << "Consumer accounts are not allowed mdm_aca="
                    << allow_consumer_accounts;
-      *error_text = AllocErrorString(IDS_INVALID_EMAIL_DOMAIN_BASE);
+      *error_text = AllocErrorString(IDS_DISALLOWED_CONSUMER_EMAIL_BASE);
       return E_FAIL;
     }
   }

chrome/credential_provider/gaiacp/gaia_credential_base_unittests.cc

@@ -1235,8 +1235,8 @@ TEST_P(GcpGaiaCredentialBaseConsumerEmailTest, ConsumerEmailSignin) {
     ASSERT_EQ(S_OK, FinishLogonProcess(true, true, 0));
   } else {
     // Error message concerning invalid domain is sent.
-    ASSERT_EQ(S_OK,
-              FinishLogonProcess(false, false, IDS_INVALID_EMAIL_DOMAIN_BASE));
+    ASSERT_EQ(S_OK, FinishLogonProcess(false, false,
+                                       IDS_DISALLOWED_CONSUMER_EMAIL_BASE));
   }
 
   if (user_created) {

chrome/credential_provider/gaiacp/gaia_resources.grd

@@ -59,7 +59,7 @@
   <release seq="1">
     <messages fallback_to_english="true">
       <message name="IDS_PROJNAME" desc="">
-        Google Credential Provider
+        Google Credential Provider for Windows
       </message>
       <message name="IDS_INVALID_UI_RESPONSE" desc="">
         Signing in to your work account failed. Make sure the computer has an internet connection, then try again.
@@ -68,7 +68,7 @@
         A user could not be created.
       </message>
       <message name="IDS_INVALID_PASSWORD" desc="">
-        Sorry, your Windows password couldn't be verified. Please try again.
+        You entered an incorrect Windows password. Please try again.
       </message>
       <message name="IDS_INTERNAL_ERROR" desc="">
         An internal error occurred.
@@ -79,8 +79,11 @@
       <message name="IDS_INVALID_EMAIL_DOMAIN" desc="">
         Signing in with a work account on this domain is not allowed. Try a different account.
       </message>
+      <message name="IDS_DISALLOWED_CONSUMER_EMAIL" desc="">
+        Signing in with a personal account on this device is not allowed. Please login with a work account.
+      </message>
       <message name="IDS_GAIA_ACCOUNT_FULLNAME" desc="">
-        Google Credential Provider Helper
+        Google Credential Provider for Windows helper
       </message>
       <message name="IDS_GAIA_ACCOUNT_COMMENT" desc="">
         Used to run Google Credential Provider sign in page.
@@ -89,7 +92,7 @@
         Sign in using your work account.
       </message>
       <message name="IDS_REAUTH_FID_DESCRIPTION" desc="">
-        Your session has expired. Sign in using your work account.
+        Your session has expired. Sign in using your Google work account.
       </message>
       <message name="IDS_REAUTH_AD_NO_USER_FID_DESCRIPTION" desc="">
         Sign in using your gsuite work account.
@@ -101,13 +104,13 @@
         Sign in using your work account
       </message>
       <message name="IDS_USER_ACCOUNT_COMMENT" desc="">
-        User created from a work account
+        User account created by Google Credential Provider for Windows
       </message>
       <message name="IDS_NO_NETWORK" desc="">
         Make sure you have a network connection and try again.
       </message>
       <message name="IDS_FAILED_CREATE_LOGON_STUB" desc="">
-        Unable to load Google sign in screen. Please contact your administrator.
+        Unable to load Google sign in screen due to an issue in your Chrome installation. Contact your administrator.
       </message>
       <message name="IDS_PASSWORD_UPDATE_NEEDED" desc="">
         Your account password has changed. Please enter your current Windows password in order to sync your Windows account with your work account.
@@ -116,13 +119,13 @@
         A user on this computer was already added using this account. Please sign in with a different account.
       </message>
       <message name="IDS_ACCOUNT_LOCKED" desc="">
-        Your account has been locked. Please contact a system administrator.
+        Your account has been locked out. Please contact your system administrator.
       </message>
       <message name="IDS_MDM_ENROLLMENT_FAILED" desc="">
         Unable to enroll this computer for enterprise management.  Please sign in with a different work account.
       </message>
       <message name="IDS_INVALID_UNLOCK_WORKSTATION_USER" desc="">
-        Only the user that locked this computer is currently allowed sign in.
+        Only the user that locked this computer is allowed to sign in.
       </message>
       <message name="IDS_ADD_USER_DISALLOWED" desc="">
         Failed to add a new user. This computer only allows one user to be created using a work account.
@@ -140,7 +143,7 @@
         Unable to continue without entering the current Windows password. Please contact a system administrator.
       </message>
       <message name="IDS_WINDOWS_PASSWORD_FIELD_LABEL" desc="">
-        Windows Password
+        Password
       </message>
       <message name="IDS_EMPTY_ACCESS_TOKEN" desc="">
         Only Gsuite Enterprise users are allowed to login.