cros: Update SAML flow.

chrome/app/chromeos_strings.grdp

 <?xml version="1.0" encoding="utf-8"?>
 <!-- ChromeOS-specific strings (included from generated_resources.grd).
      Everything in this file is wrapped in <if expr="pp_ifdef('chromeos')">. -->
 <grit-part>
   <message name="IDS_EMPTY_STRING" desc="Empty string, exist only to make code generic. No translation required.">
   </message>
   <!-- Idle logout dialog for retail mode -->
   <message name="IDS_IDLE_LOGOUT_TITLE" desc="Dialog title for the idle logout dialog. Used in retail mode only.">
     Are you still there?
   </message>
@@ skipping 1289 matching lines @@
     Migrate all Chrome OS data to the new password
 (requires previous password)
   </message>
   <message name="IDS_LOGIN_PREVIOUS_PASSWORD" desc="Password field text on the password changed dialog">
     Previous password
   </message>
   <message name="IDS_LOGIN_SAML_NOTICE" desc="Text message displayed above SAML portal to learly indicate that the user is being redirected to another sign-in provider.">
     The sign-in service below is hosted by <ph name="SAML_DOMAIN">$1<ex>saml.com</ex></ph>. Sign in to continue.
   </message>
   <message name="IDS_LOGIN_CONFIRM_PASSWORD_TITLE" desc="Title for the confirm password dialog.">
-    Please confirm your password.
+    Complete sign-in
   </message>
-  <message name="IDS_LOGIN_CONFIRM_PASSWORD_HINT" desc="Hint for the password field on the confirm password dialog.">
-    Type your password here to confirm.
+  <message name="IDS_LOGIN_CONFIRM_PASSWORD_LABEL" desc="Label for the password field on the confirm password dialog.">
+    Please re-enter your password
   </message>
   <message name="IDS_LOGIN_CONFIRM_PASSWORD_CONFIRM_BUTTON" desc="Label for the confirm button on the confirm password dialog.">
     Confirm
   </message>
-  <message name="IDS_LOGIN_NO_PASSWORD_WARNING_TITLE" desc="Title for the no password warning dialog">
-    No password detected.
+  <message name="IDS_LOGIN_CONFIRM_PASSWORD_TEXT" desc="Text to explain to user why password needs to be typed again in the confirm password UI.">
+    Re-entering your password will allow you to sign in when you are offline.
   </message>
-  <message name="IDS_LOGIN_NO_PASSWORD_WARNING" desc="Body text of the no password warning dialog">
-    Password is not detected for your SAML identity provider. Please contact your administrator for more information.
+  <message name="IDS_LOGIN_CONFIRM_PASSWORD_ERROR_TEXT" desc="Error text to show when the user typed password could not be verified.">

[bartfab (slow), 2014/02/04 20:10:47]

Nit: s/user typed/user-typed/ (or "password typed by the user")

[xiyuan, 2014/02/04 21:23:10]

Done. Changed to "password typed by the user".

+    Sorry, your password could not be verified. Please try again.
   </message>
-  <message name="IDS_LOGIN_NO_PASSWORD_WARNING_DISMISS_BUTTON" desc="Label for the dismiss button on the no password warning dialog.">
-    Ok
+  <message name="IDS_LOGIN_FATAL_ERROR_MESSAGE" desc="Message to show when the authentication could not be completed.">
+    Something went wrong with signing in.<ph name="LINE_BREAK">&lt;br&gt;</ph>Please contact your administrator or try again.
   </message>
   <message name="IDS_LOGIN_OFFLINE_EMAIL" desc="Email field text on the offline login screen. Note: should by the same as the one used on the Gaia sign-in page.">
     Email
   </message>
   <message name="IDS_LOGIN_OFFLINE_PASSWORD" desc="Password field text on the offline login screen. Note: should by the same as the one used on the Gaia sign-in page.">
     Password
   </message>
   <message name="IDS_LOGIN_OFFLINE_SIGNIN" desc="Sign in text on the offline login screen. Note: should by the same as the one used on the Gaia sign-in page.">
     Sign In
   </message>
@@ skipping 3446 matching lines @@
   </message>
   <message name="IDS_FIRST_RUN_HELP_STEP_KEEP_EXPLORING_BUTTON" desc="Text on the button located in the first-run tutorial bubble pointing to help button is system tray. After click on the button tutorial finishes and help app opens.">
     Keep exploring
   </message>
   <message name="IDS_FIRST_RUN_HELP_STEP_FINISH_BUTTON" desc="Text on the button located in the first-run tutorial bubble pointing to help button is system tray. After click on the button tutorial finishes.">
     Finish
   </message>
   <message name="IDS_FIRST_RUN_NEXT_BUTTON" desc="Text on the first-run tutorial button leading to next step of tutorial.">
     Next
   </message>
-  
+
   <!-- Charger replacement dialog -->
   <message name="IDS_CHARGER_REPLACEMENT_CHECK_CHARGER_TITLE" desc="Title on the check charger page">
     Check your charger
   </message>
   <message name="IDS_CHARGER_REPLACEMENT_CHECK_CHARGER_DAMAGE" desc="Text on check charger page describing the charger may be damaged">
     We've received a small number of user reports that some original HP Chromebook 11 chargers have been damaged due to overheating. To be safe, we're replacing all original chargers for free.
   </message>
   <message name="IDS_CHARGER_REPLACEMENT_CHECK_ORIGNAL_CHARGER" desc="Text on check charger page asking users to check if they are using the original spring charger.">
     We'd like you to check if you're using one of the original chargers.
   </message>
@@ skipping 13 matching lines @@
     Canada
   </message>
   <message name="IDS_CHARGER_REPLACEMENT_UK" desc="The text in the select country drop down as uk">
     United Kingdom
   </message>
   <message name="IDS_CHARGER_REPLACEMENT_AU" desc="The text in the select country drop down as australia">
     Australia
   </message>
   <message name="IDS_CHARGER_REPLACEMENT_IRE" desc="The text in the select country drop down as ireland">
     Ireland
-  </message>  
+  </message>
   <message name="IDS_CHARGER_REPLACEMENT_NEXT_STEP" desc="Text on the button leading user to the next step">
     Next
   </message>
   <message name="IDS_CHARGER_REPLACEMENT_CONFIRM_SAFE_CHARGER_TITLE" desc="Title on the confirm safe charger page">
     Your charger is up to update
   </message>
   <message name="IDS_CHARGER_REPLACEMENT_CONFIRM_SAFE_CHARGER_TO_GO" desc="Text on confirm user has a safe charger to go with">
     You're good to go.
   </message>
   <message name="IDS_CHARGER_REPLACEMENT_SAFE_CHARGER_CONFIRM_CHECKBOX_TEXT" desc="Text for confirming safe charger checkbox">
@@ skipping 11 matching lines @@
   <message name="IDS_CHARGER_REPLACEMENT_CHARGER_UPDATE_TITLE" desc="Title of charger update page.">
     Important update on your HP Chromebook 11
   </message>
   <message name="IDS_CHARGER_REPLACEMENT_CHARGER_UPDATE_P1" desc="The first paragraph on the charger update page">
     With guidance and approval from the CPSC and other regulatory agencies, Google and HP are recalling the original charger for the HP Chromebook 11.
   </message>
   <message name="IDS_CHARGER_REPLACEMENT_CHARGER_STOP_USING_RECALLED_CHARGER" desc="Text to ask users to stop using recalled charger">
     Please stop using the recalled charger.
   </message>
   <message name="IDS_CHARGER_REPLACEMENT_CHARGER_UPDATE_P2" desc="The 2nd paragraph on the charger update page">
-    If you purchased an HP Chromebook 11 before December 1, 2013, we'll mail you a free replacement charger. You will also receive a prepaid shipping package to return the original charger so that we can dispose of it properly. 
+    If you purchased an HP Chromebook 11 before December 1, 2013, we'll mail you a free replacement charger. You will also receive a prepaid shipping package to return the original charger so that we can dispose of it properly.
   </message>
   <message name="IDS_CHARGER_REPLACEMENT_CHARGER_UPDATE_FAQ" desc="Text about charger update FAQs">
     In the meantime, you may refer to the <ph name="BEGIN_LINK">&lt;a class="link" href="#"&gt;</ph>FAQs<ph name="END_LINK">&lt;/a&gt;</ph> and continue to use your HP Chromebook 11 with any other certified micro-USB charger, for example one provided with a tablet or smartphone. We apologize again for the inconvenience. Your safety is a top priority.
   </message>
   <message name="IDS_CHARGER_REPLACEMENT_CHARGER_ORDER_NEW_CHARGER" desc="Text of the radio button for ordering new charger">
     Please send me a new charger
   </message>
   <message name="IDS_CHARGER_REPLACEMENT_CHARGER_NOT_ORDER_NEW_CHARGER" desc="Text of the radio button for not ordering new charger">
     I do not want to replace my recalled charger
   </message>
@@ skipping 15 matching lines @@
   <message name="IDS_CHARGER_REPLACEMENT_FINISH_NOT_ORDER_CHARGER_P2" desc="Text of the 2nd paragraph for finishing not order charger page">
     You may refer to the <ph name="BEGIN_LINK">&lt;a class="link" href="#"&gt;</ph>FAQs<ph name="END_LINK">&lt;/a&gt;</ph> and continue to use your HP Chromebook 11 with any other certified micro-USB charger, for example one provided with a tablet or smartphone. We apologize again for the inconvenience. Your safety is a top priority.
   </message>
   <message name="IDS_CHARGER_REPLACEMENT_FINISH_NOT_ORDER_CHARGER_MORE_INFO" desc="Text on for finishing not order charger page for user to look for more info befpre the more info link">
     You can find more info at
   </message>
   <message name="IDS_CHARGER_REPLACEMENT_OFFLINE_ORDER_TITLE" desc="Title of the offline charger order page">
     HP Chromebook 11 power charger request form
   </message>
   <message name="IDS_CHARGER_REPLACEMENT_OFFLINE_ORDER_P1" desc="1st paragraph of text on the offline charger order form">
-    With guidance and approval from the CPSC and other regulatory agencies, Google and HP are recalling the original charger for the HP Chromebook 11. 
+    With guidance and approval from the CPSC and other regulatory agencies, Google and HP are recalling the original charger for the HP Chromebook 11.
   </message>
   <message name="IDS_CHARGER_REPLACEMENT_OFFLINE_ORDER_P2" desc="2nd paragraph of text on the offline charger order form">
-    If you purchased an HP Chromebook 11 before December 1, 2013, we'll mail you a free replacement charger. You will also receive a prepaid shipping package to return the original charger so that we can dispose of it properly. 
+    If you purchased an HP Chromebook 11 before December 1, 2013, we'll mail you a free replacement charger. You will also receive a prepaid shipping package to return the original charger so that we can dispose of it properly.
   </message>
   <message name="IDS_CHARGER_REPLACEMENT_OFFLINE_ORDER_CONFIRM" desc="Text for the check box that confirms user has ordered the charger offline">
     I have called the number and requested a replacement charger.
   </message>
   <message name="IDS_CHARGER_REPLACEMENT_TEXT_PRIVACY_POLICY" desc="Text refer to privacy policy">
     Refer to the  <ph name="BEGIN_LINK">&lt;a class="link" id="privacy-link" href="#"&gt;</ph>Privacy Policy<ph name="END_LINK">&lt;/a&gt;</ph> for more details on how we handle this information.
   </message>
   <message name="IDS_CHARGER_REPLACEMENT_OFFLINE_ORDER_PHONE_NUMBER" desc="Text for offline charger order phone numbers">
     Please call (866) 628-1371 (US), (866) 628-1372 (Canada), or 0800 026 0613 (UK) to request your free replacement charger.
   </message>
   <message name="IDS_CHARGER_REPLACEMENT_CHARGER_STILL_BAD" desc="Title of the page warning user if they keep plug in bad charger.">
     Your order is being processed
   </message>
   <message name="IDS_CHARGER_REPLACEMENT_CHARGER_ORDERED" desc="Text for telling user we see they already ordered a new charger.">
     We see that you've ordered a replacement charger.
   </message>
   <message name="IDS_CHARGER_REPLACEMENT_CHARGER_MORE_INFO" desc="Text for fining more info for charger">
-    You can find more info at 
+    You can find more info at
   </message>
   <message name="IDS_CHARGER_REPLACEMENT_DIALOG_TITLE" desc="Title of the charger replacement UI dialg">
     Check charger
   </message>
 
 </grit-part>