Update strings for ash palette and rename options/settings files.

chrome/app/settings_strings.grdp

Index: chrome/app/settings_strings.grdp
diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp
index e56438ef2e9dfd237e9bfe3cc71b41f1c01fc357..d03f462ba3ae7bec646859945398750a67703dcd 100644
--- a/chrome/app/settings_strings.grdp
+++ b/chrome/app/settings_strings.grdp
@@ -1415,19 +1415,19 @@
       Confirm your PIN
     </message>
     <message name="IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_WEAK_PIN" desc="Message shown below the title that warns the user they have entered a PIN that is easy to guess.">
-      This PIN is easy to guess:
+      PIN may be easy to guess

[stevenjb, 2016/08/25 18:27:16]

Unrelated?

[jdufault, 2016/08/25 21:48:02]

The PIN strings also got changed, so I was updating them in this CL as well. I
can pull it out into a separate CL if you prefer. I've reworked the CL message
to account for these string changes.

[stevenjb, 2016/08/25 21:51:34]

A separate CL would be preferred, since (as far as I am aware) these features
are unrelated, thanks.

     </message>
     <message name="IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_TOO_SHORT" desc="Message shown below the title that tells the user that the PIN they entered needs to be at least four digits long.">
-      PIN must be at least 4 digits:
+      PIN must be at least 4 digits
     </message>
     <message name="IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_MISMATCHED" desc="Message shown below the title that tells the user they have entered two different PIN values.">
-      PIN's don't match:
+      PINs do not match
     </message>
     <message name="IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONTINUE_BUTTON" desc="A button that accepts the users initial PIN. The user will have to enter the PIN again after hitting this button to confirm that they entered it correctly.">
       Continue
     </message>
     <message name="IDS_SETTINGS_PEOPLE_ENABLE_SCREENLOCK" desc="The text on the checkbox to enable screenlocker for current user.">
-      Require password to wake from sleep
+      Show lock screen when waking from sleep
     </message>
     <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_TITLE" desc="Text on the people page which opens up the quick unlock subpage and the title of the quick unlock subpage.">
       Screen lock
@@ -1445,13 +1445,13 @@
       Change PIN
     </message>
     <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_SETUP_PIN_BUTTON" desc="Button that is used to setup a new PIN when the user does not have a PIN yet.">
-      Setup PIN
+      Set up PIN
     </message>
     <message name="IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_TITLE" desc="Title of the password prompt dialog popup.">
       Confirm your password
     </message>
     <message name="IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_ENTER_PASSWORD" desc="Text above a password input field that tells the user they need to submit their password to configure these settings.">
-      Enter your password to set up screen lock.
+      Enter your password to configure screen lock.
     </message>
     <message name="IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_PASSWORD_LABEL" desc="An input box label that tells the user to enter their password in that input box.">
       Password
@@ -1845,17 +1845,17 @@
     </message>
 
     <!-- Note -->
-    <message name="IDS_OPTIONS_NOTE_TITLE" desc="Title of the note-taking options (non material-design) page.">
-      Note settings
+    <message name="IDS_OPTIONS_NOTE_TITLE" desc="Title of the stylus settings (non material-design) page.">

[stevenjb, 2016/08/25 18:27:16]

Rename IDS?

[jdufault, 2016/08/25 21:48:02]

Done.

+      Stylus settings
     </message>
-    <message name="IDS_SETTINGS_NOTE_TITLE" desc="Title of the note-taking settings page.">
-      Note
+    <message name="IDS_SETTINGS_NOTE_TITLE" desc="Title of the stylus settings page.">
+      Stylus settings
     </message>
     <message name="IDS_SETTINGS_NOTE_DEFAULT_APP_AUTO_LAUNCH" desc="Label that tells the user that the note-taking app will be auto-launched on eject input events.">
-      Auto-launch the note-app
+      Open stylus tools when the stylus is removed
     </message>
     <message name="IDS_SETTINGS_NOTE_FIND_MORE_APPS" desc="URL label that opens up the Play Store to a curated list of note-taking applications.">
-      Find more note-taking applications
+      Find more stylus applications
     </message>
 
     <!-- Display -->