Clean up sign-in grammar

--------------------------------- "Signin" is not a word. "Sign into" doesn't make any more sense than "sign outof". As a phrasal verb, it stands as a unit. * "Bob signed in to Chromium to sync his settings." * "Bob signed into Chromium, and it hurt. Next time he'll be more careful while signing and walking in the chemistry lab." Don't hurt Bob. As a phrasal noun, "sign-in" should be hyphenated. Follow these simple[1] rules for correct usage: * "signin" is not a word * "sign in to", not "sign into" (you wouldn't "sign outof" Chrome) * as a noun or noun adjunct, "sign-in", not "sign in": "Sign-in happens at the sign-in screen." * as a participle + adverb: * "signed-in" before a noun: "who is the signed-in cat?" * "signed in" after a noun: "why is the cat signed in?" Additionally, do not capitalize "in" or "out" in title case. * "Sign in Again", not "Sign In Again" [1] May not be simple. --------------------------------- Secondly, we should say "sign in" instead of "log in" in most places. --------------------------------- Sources: * go/uxwordlist * https://net.educause.edu/elements/attachments/educause/pdf/ch07_tab01.pdf I'd like to have kuscher check my work. Including aruslan and derat for sign-off because the changes are somewhat extensive. BUG=315617 NOPRESUBMIT=true R=kuscher@chromium.org, bulach@chromium.org, derat@chromium.org Review URL: https://codereview.chromium.org/145273019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248881 0039d316-1c4b-4281-b951-d872f2087c98
280723148 · Feb 5, 2014 · 18815a5 · 18815a5
1 parent 07b1823
commit 18815a5
Show file tree

Hide file tree

Showing 8 changed files with 127 additions and 115 deletions.
diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd
@@ -255,7 +255,7 @@ Press Ctrl+Alt+Z to disable.
         Sign in another account...
       </message>
       <message name="IDS_ASH_STATUS_TRAY_CAPTION_CANNOT_ADD_USER" desc="The caption for the error message when the user has reached the limit of multi profile users.">
-        Can't sign into another account.
+        Can't sign in to another account.
       </message>
       <message name="IDS_ASH_STATUS_TRAY_MESSAGE_CANNOT_ADD_USER" desc="The error message when the user has reached the limit of multi profile users.">
         You can only have up to three accounts in multiple sign-in.

diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
@@ -124,8 +124,8 @@
       <message desc="Sync error string for generic error. [CHAR-LIMIT=80]" name="IDS_SYNC_ERROR_GENERIC">
         Sync error
       </message>
-      <message desc="Sync error string for when the needs to update the sign in details [CHAR-LIMIT=80]" name="IDS_SYNC_ERROR_GA">
-        Please update your sign in details.
+      <message desc="Sync error string for when the needs to update the sign-in details [CHAR-LIMIT=80]" name="IDS_SYNC_ERROR_GA">
+        Please update your sign-in details.
       </message>
       <message desc="Sync error string for network connection. [CHAR-LIMIT=80]" name="IDS_SYNC_ERROR_CONNECTION">
         Could not connect to the sync server.
@@ -137,7 +137,7 @@
         The service is not available; try again later.
       </message>
       <message desc="Title to show on a dialog during sign-in, indicating that the account used has policy management enabled." name="IDS_POLICY_DIALOG_TITLE">
-        Confirm sign in
+        Confirm sign-in
       </message>
       <message desc="Message to show on a dialog during sign-in, indicating that the account used has policy management enabled." name="IDS_POLICY_DIALOG_MESSAGE">
         This account is managed by <ph name="DOMAIN_NAME">%1$s<ex>google.com</ex></ph>.

diff --git a/chrome/app/chromeos_strings.grdp b/chrome/app/chromeos_strings.grdp
@@ -1152,10 +1152,10 @@ Press any key to continue exploring.
   <message name="IDS_UPDATE_SCREEN_TITLE" desc="Title of the OOBE update screen">
     Update
   </message>
-  <message name="IDS_SIGNIN_SCREEN_TITLE" desc="Title of OOBE/Add User sign in screen">
+  <message name="IDS_SIGNIN_SCREEN_TITLE" desc="Title of OOBE/Add User sign-in screen">
     Sign in
   </message>
-  <message name="IDS_SIGNIN_SCREEN_PASSWORD_CHANGED" desc="Title of OOBE/Add User sign in screen when password was changed">
+  <message name="IDS_SIGNIN_SCREEN_PASSWORD_CHANGED" desc="Title of OOBE/Add User sign-in screen when password was changed">
     You have recently changed the password. Please sign in with the new one.
   </message>
   <message name="IDS_NETWORK_SELECTION_TITLE" desc="Welcome title shown on network selection screen">
@@ -1221,7 +1221,7 @@ Press any key to continue exploring.
   <message name="IDS_OOBE_OTHER_LANGUAGES" desc="Option group name dividing vendor-configured languages from other available languages in out-of-box 'Select language' select control.">
     Other languages
   </message>
-  <message name="IDS_LOGIN_TITLE" desc="Title of sign in box">
+  <message name="IDS_LOGIN_TITLE" desc="Title of sign-in box">
     Sign in
   </message>
   <message name="IDS_LOGIN_TITLE_HINT" desc="Hint under title 'Sign in to Chrome OS'">
@@ -1330,8 +1330,8 @@ Press any key to continue exploring.
   <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 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>
   <message name="IDS_LOGIN_OFFLINE_EMPTY_EMAIL" desc="Alert message about empty email on the offline login screen. Note: should by the same as the one used on the Gaia sign-in page.">
     Enter your email address.
@@ -1473,7 +1473,7 @@ Press any key to continue exploring.
     Oops, something went wrong
   </message>
   <message name="IDS_CREATE_LOCALLY_MANAGED_USER_MANAGER_INCONSISTENT_STATE" desc="Supervised user dialog, error page, manager account is in inconsistent state, text">
-    To recover from this error, you will need to sign into your Google Account
+    To recover from this error, you will need to sign in to your Google Account
     from the sign-in screen. You can then sign out of your Google Account and
     try creating a supervised user again.
   </message>
@@ -2417,7 +2417,7 @@ Press any key to continue exploring.
     Please install a user certificate.
   </message>
   <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_LOGIN_FOR_USER_CERT" desc="In the network connect dialog, when creating a VPN or enterprise Wi-Fi connection, error message to display when not logged in and  user certificates are required.">
-    Login required for user certificate.
+    Sign-in required for user certificate.
   </message>
   <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_REQUIRE_HARDWARE_BACKED" desc="In the network connect dialog, when creating a VPN or enterprise Wi-Fi connection, error message to display when a non hardware-backed user certificate is selected.">
     User certificate must be hardware-backed.
@@ -4573,10 +4573,10 @@ Battery full
     Before signing in, please enter as Guest to activate the network <ph name="NETWORK_ID">$1<ex>Public Wifi</ex></ph>
   </message>
   <message name="IDS_LOGIN_ERROR_OWNER_REQUIRED" desc="Couldn't sign in because the machine is in policy safe mode and needs owner login">
-    Login has been resticted to the owner account only. Please reboot and sign in with the owner account. The machine will auto reboot in 30 seconds.
+    Sign-in has been restricted to the owner account only. Please reboot and sign in with the owner account. The machine will auto reboot in 30 seconds.
   </message>
   <message name="IDS_LOGIN_ERROR_OWNER_KEY_LOST" desc="Couldn't sign in because the owner key has been lost, device settings corruption or incorrect local time.">
-    Login failed, please connect to the internet and try again.
+    Sign-in failed, please connect to the internet and try again.
   </message>
   <message name="IDS_LOGIN_ERROR_TPM_FAILURE_TITLE" desc="Title of the screen notifying user about TPM error.">
     Something went wrong with signing in

diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
@@ -829,7 +829,7 @@ For Chromium, processes used to display diagnostics information (such as this "a
         </message>
       </if>
 
-      <!-- Chrome sign in page -->
+      <!-- Chrome sign-in page -->
       <message name="IDS_CHROME_SIGNIN_TITLE" desc="Title on the about:chrome-signin page">
         Chromium
       </message>
@@ -839,25 +839,25 @@ For Chromium, processes used to display diagnostics information (such as this "a
         Now that you're signed in, you can get your tabs, bookmarks and other Chromium stuff across your laptop, phone and tablet. You will also receive more relevant suggestions and features on Google services.
       </message>
 
-      <!-- One click sign in infobar -->
+      <!-- One click sign-in infobar -->
       <if expr="not pp_ifdef('chromeos')">
-        <!-- New one-click signin dialog contents for SAML support -->
-        <message name="IDS_ONE_CLICK_SIGNIN_DIALOG_TITLE_NEW" desc="The title of the modal dialog window that opens when the user chooses to use one click sign in.">
+        <!-- New one-click sign-in dialog contents for SAML support -->
+        <message name="IDS_ONE_CLICK_SIGNIN_DIALOG_TITLE_NEW" desc="The title of the modal dialog window that opens when the user chooses to use one click sign-in.">
           You're signed in to Chromium!
         </message>
-        <message name="IDS_ONE_CLICK_SIGNIN_DIALOG_MESSAGE_NEW" desc="The message of the one click sign in dialog.">
+        <message name="IDS_ONE_CLICK_SIGNIN_DIALOG_MESSAGE_NEW" desc="The message of the one click sign-in dialog.">
           You're signed in as <ph name="USER_EMAIL_ADDRESS">$1<ex>foo@gmail.com</ex></ph>. Now you can access your bookmarks, history, and other settings on all your signed in devices.
         </message>
-        <message name="IDS_ONE_CLICK_SIGNIN_BUBBLE_MESSAGE_FULL" desc="The entire message of the one click sign in bubble.">
+        <message name="IDS_ONE_CLICK_SIGNIN_BUBBLE_MESSAGE_FULL" desc="The entire message of the one click sign-in bubble.">
           You're now signed in to Chromium! Your bookmarks, history, and other settings will be synced to your Google Account.
         </message>
         <message name="IDS_ONE_CLICK_SIGNIN_BUBBLE_MESSAGE_NEW" desc="The body of the sync promo NTP bubble.">
           Now that you're signed in, you can get your tabs, bookmarks and other Chromium stuff across your laptop, phone and tablet. You will also receive more relevant suggestions and features on Google services.
         </message>
-        <message name="IDS_ONE_CLICK_SIGNIN_BUBBLE_SYNC_DISABLED_MESSAGE" desc="The body of the signin bubble, when sync has been disabled.">
+        <message name="IDS_ONE_CLICK_SIGNIN_BUBBLE_SYNC_DISABLED_MESSAGE" desc="The body of the sign-in bubble, when sync has been disabled.">
           You're now signed in to Chromium! Sync is disabled by your administrator.
         </message>
-        <message name="IDS_SYNC_WRONG_EMAIL" desc="Message shown when sync setup failed due to the user entering the wrong email address for sign in.">
+        <message name="IDS_SYNC_WRONG_EMAIL" desc="Message shown when sync setup failed due to the user entering the wrong email address for sign-in.">
           You were signed in to Chromium as <ph name="USER_EMAIL_ADDRESS">$1<ex>foo@gmail.com</ex></ph>. Please use the same account to sign in again.
         </message>
         <message name="IDS_ONE_CLICK_SIGNIN_CONFIRM_EMAIL_DIALOG_MESSAGE" desc="Error message to display when setting up sync for a second time and the user name is different from the previous user name.">
@@ -874,7 +874,7 @@ Signing in anyway will merge Chromium information like bookmarks, history, and o
       <message name="IDS_ENTERPRISE_SIGNIN_EXPLANATION" desc="The warning message displayed to an enterprise user about to link their profile to their Google account. This message is followed by a 'Learn more' link.">
         You are signing in with a managed account and giving its administrator control over your Chromium profile. Your Chromium data, such as your apps, bookmarks, history, passwords, and other settings will become permanently tied to <ph name="USER_NAME">$1<ex>pat@example.com</ex></ph>. You will be able to delete this data via the Google Accounts Dashboard, but you will not be able to associate this data with another account.
       </message>
-      <message name="IDS_ENTERPRISE_SIGNIN_CREATE_NEW_PROFILE_MESSAGE" desc="The text of the prompt to create a new profile after signing into an enterprise account">
+      <message name="IDS_ENTERPRISE_SIGNIN_CREATE_NEW_PROFILE_MESSAGE" desc="The text of the prompt to create a new profile after signing in to an enterprise account">
         If you prefer to keep your existing Chromium data separate, you can create a new Chromium user for <ph name="USER_NAME">$1<ex>pat@example.com</ex></ph>.
       </message>
       <message name="IDS_ENTERPRISE_SIGNIN_CONTINUE" desc="Text of the button to link the current profile with the signed-in enterprise account">
@@ -893,6 +893,20 @@ Signing in anyway will merge Chromium information like bookmarks, history, and o
         You are signing in with a managed account and giving its administrator control over your Chromium profile. Your Chromium data, such as your apps, bookmarks, history, passwords, and other settings will become permanently tied to <ph name="USER_NAME">$1<ex>pat@example.com</ex></ph>. You will be able to delete this data via the Google Accounts Dashboard, but you will not be able to associate this data with another account. You can optionally create a new profile to keep your existing Chromium data separate. <ph name="LEARN_MORE">$2<ex>Learn more</ex></ph>
       </message>
 
+      <!-- Sync sign-in global error message-->
+      <message name="IDS_SYNC_PASSPHRASE_ERROR_BUBBLE_VIEW_MESSAGE" desc="Message in the sync error bubble view when the user needs to update their sync passphrase.">
+        Chromium could not sync your data. Please update your Sync passphrase.
+      </message>
+      <message name="IDS_SYNC_SIGN_IN_ERROR_BUBBLE_VIEW_MESSAGE" desc="Message in the sync error bubble view when the user's sign-in credentials are out of date.">
+        Chromium could not sync your data because your account sign-in details are out of date.
+      </message>
+      <message name="IDS_SYNC_UNAVAILABLE_ERROR_BUBBLE_VIEW_MESSAGE" desc="Message in the sync error bubble view when sync is not available for their domain.">
+        Chromium could not sync your data because Sync is not available for your domain.
+      </message>
+      <message name="IDS_SYNC_OTHER_SIGN_IN_ERROR_BUBBLE_VIEW_MESSAGE" desc="Message in the sync error bubble view when there's an error signing in.">
+        Chromium could not sync your data due to an error signing in.
+      </message>
+
       <message name="IDS_OPTIONS_PASSWORDS_MAC_WARNING" desc="The warning for OS X that passwords are shared across profiles in the keychain.">
         On Mac, passwords are saved to your Keychain and may be accessed or synced by other Chromium users sharing this OS X account.
       </message>
@@ -984,7 +998,7 @@ Signing in anyway will merge Chromium information like bookmarks, history, and o
         Sign in to Chromium
       </message>
       <message name="IDS_APP_LIST_SIGNIN_TEXT" desc="Text for when the launcher needs to sign in.">
-        You need to be signed into Chromium to use apps. This allows Chromium to sync your apps, bookmarks, history, passwords and other settings across devices.
+        You need to be signed in to Chromium to use apps. This allows Chromium to sync your apps, bookmarks, history, passwords and other settings across devices.
       </message>
 
       <!-- App shortcuts -->