Chromium Code Reviews| Index: chrome/app/generated_resources.grd |
| diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd |
| index 4867798abef9e85f88fa33499c9d61e7f51db8b9..fe7ebf6da2fd309c395c90635a5d3af8403d8af7 100644 |
| --- a/chrome/app/generated_resources.grd |
| +++ b/chrome/app/generated_resources.grd |
| @@ -5792,15 +5792,15 @@ Keep your key file in a safe place. You will need it to create new versions of y |
| <message name="IDS_FLAGS_ENABLE_OVERLAY_SCROLLBARS_DESCRIPTION" desc="Description for the flag to turn on overlay scrollbars"> |
| Enable the experimental overlay scrollbars implementation. You must also enable threaded compositing to have the scrollbars animate. |
| </message> |
| - <message name="IDS_FLAGS_ENABLE_AUTOLOGIN_NAME" desc="Title for the flag to auto-login the user"> |
| - Enable auto-login |
| + <message name="IDS_FLAGS_ENABLE_AUTOLOGIN_NAME" desc="Title for the flag to auto-sign in the user"> |
| + Enable auto sign-in |
| </message> |
| <message desc="Message to display when auto-login fails. [CHAR-LIMIT=64]" name="IDS_AUTO_LOGIN_FAILED"> |
| - Automatic sign in failed |
| + Automatic sign-in failed |
| </message> |
| <message name="IDS_FLAGS_ENABLE_AUTOLOGIN_DESCRIPTION" desc="Description for the flag to pre-login the user"> |
| - When enabled, visiting a Google account login page will trigger an infobar allowing easy sign in with the Google account connected to the profile. |
| - Auto-login is always disabled if the profile is not connected to an account, regardless of this flag. |
| + When enabled, visiting a Google account sign-in page will trigger an infobar allowing easy sign-in with the Google account connected to the profile. |
| + Auto sign-in is always disabled if the profile is not connected to an account, regardless of this flag. |
| </message> |
| <message name="IDS_FLAGS_SHOW_AUTOFILL_TYPE_PREDICTIONS_NAME" desc="Title for the flag to show Autofill field type predictions for all forms"> |
| Show Autofill predictions |
| @@ -6415,10 +6415,10 @@ Keep your key file in a safe place. You will need it to create new versions of y |
| StickyKeys allows the user to press and release a modifier key, such as Shift, Ctrl, or Alt, and have it remain active until any other key is pressed. |
| </message> |
| <message name="IDS_FLAGS_ENABLE_SAML_SIGNIN_NAME" desc="Name for the flag to enable SAML signin support."> |
| - Enable SAML signin. |
| + Enable SAML sign-in. |
| </message> |
| - <message name="IDS_FLAGS_ENABLE_SAML_SIGNIN_DESCRIPTION" desc="Description for the flag to enable SAML signin support."> |
| - Enables SAML signin support for ChromeOS login. |
| + <message name="IDS_FLAGS_ENABLE_SAML_SIGNIN_DESCRIPTION" desc="Description for the flag to enable SAML sign-in support."> |
| + Enables SAML sign-in support for ChromeOS sign-in. |
|
michaelpg
2014/01/24 23:53:35
Next project: can we figure out how to spell our o
Daniel Erat
2014/01/25 00:09:23
i formally pass this torch to you.
|
| </message> |
| <message name="IDS_FLAGS_ENABLE_MULTI_PROFILES_NAME" desc="Name for the flag to enable multi-profile support."> |
| Enable multiprofiles mode. |
| @@ -6735,7 +6735,7 @@ Keep your key file in a safe place. You will need it to create new versions of y |
| Disable new first-run UI. |
| </message> |
| <message name="IDS_FLAGS_DISABLE_FIRST_RUN_UI_DESCRIPTION" desc="Description for the flag to disable new first-run UI."> |
| - If disabled, overlay tutorial won't be shown after first login. |
| + If disabled, overlay tutorial won't be shown after first sign-in. |
| </message> |
| <message name="IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_NAME" desc="Name of the flag to enable animated transitions for the first-run tutorial."> |
| Enable animated transitions in the first-run tutorial. |
| @@ -7199,7 +7199,7 @@ Keep your key file in a safe place. You will need it to create new versions of y |
| Chrome's language has changed from "<ph name="FROM_LOCALE">$1<ex>Italian</ex></ph>" to "<ph name="TO_LOCALE">$2<ex>English (United States)</ex></ph>" after syncing your settings. |
| </message> |
| <message name="IDS_LOCALE_CHANGE_REVERT_MESSAGE" desc="Link to revert a change."> |
| - Change back to "<ph name="FROM_LOCALE">$1<ex>Italian</ex></ph>" (requires sign out) |
| + Change back to "<ph name="FROM_LOCALE">$1<ex>Italian</ex></ph>" (requires sign-out) |
| </message> |
| <!-- 3G data Notifications --> |
| @@ -9568,7 +9568,7 @@ The following plug-in is unresponsive: <ph name="PLUGIN_NAME">$1 |
| What does this mean? |
| </message> |
| <message name="IDS_SSL_BLOCKING_PAGE_MORE_TEXT" desc="Body text for the explanation shown if user clicks on the More button."> |
| - <p><ph name="SITE">$1<ex>google.com</ex></ph> normally uses encryption (SSL) to protect your information. When Chrome tried to connect to <ph name="SITE">$1<ex>google.com</ex></ph> this time, <ph name="SITE">$1<ex>google.com</ex></ph> returned unusual and incorrect credentials. Either an attacker is trying to pretend to be <ph name="SITE">$1<ex>google.com</ex></ph>, or a Wi-Fi login screen has interrupted the connection. Your information is still secure because Chrome stopped the connection before any data was exchanged.</p> <p>Network errors and attacks are usually temporary, so this page will probably work later. You can also try switching to another network.</p> |
| + <p><ph name="SITE">$1<ex>google.com</ex></ph> normally uses encryption (SSL) to protect your information. When Chrome tried to connect to <ph name="SITE">$1<ex>google.com</ex></ph> this time, <ph name="SITE">$1<ex>google.com</ex></ph> returned unusual and incorrect credentials. Either an attacker is trying to pretend to be <ph name="SITE">$1<ex>google.com</ex></ph>, or a Wi-Fi sign-in screen has interrupted the connection. Your information is still secure because Chrome stopped the connection before any data was exchanged.</p> <p>Network errors and attacks are usually temporary, so this page will probably work later. You can also try switching to another network.</p> |
| </message> |
| <message name="IDS_SSL_BLOCKING_PAGE_TECH_TITLE" desc="Headline for the technical details shown if the user clicks the More button."> |
| Technical details |
| @@ -10199,7 +10199,7 @@ Would you like to start <ph name="CONTROL_PANEL_APPLET_NAME">$1<ex>Add/Remove Pr |
| Manage saved passwords... |
| </message> |
| <message name="IDS_OPTIONS_PASSWORDS_AUTOLOGIN" desc="The label of the 'autologinEnabled' checkbox"> |
| - Offer to sign into Google sites automatically with this account |
| + Offer to sign in to Google sites automatically with this account |
| </message> |
| <message name="IDS_OPTIONS_AUTOFILL_ENABLE" desc="The label of the 'Ask me to enable Autofill' radio button"> |
| Enable Autofill to fill out web forms in a single click. |
| @@ -10355,13 +10355,13 @@ Would you like to start <ph name="CONTROL_PANEL_APPLET_NAME">$1<ex>Add/Remove Pr |
| <message name="IDS_AUTOFILL_DIALOG_PAYING_WITHOUT_WALLET" desc="This text is shown as the click target for a dormant payment method chooser when using Chrome Autofill data instead of Wallet."> |
| Google Wallet disabled |
| </message> |
| - <message name="IDS_AUTOFILL_DIALOG_SIGN_IN" desc="This link text is shown when the user is not signed into a GAIA account."> |
| + <message name="IDS_AUTOFILL_DIALOG_SIGN_IN" desc="This link text is shown when the user is not signed in to a GAIA account."> |
| Sign in to pay with Google Wallet |
| </message> |
| - <message name="IDS_AUTOFILL_DIALOG_ADD_ACCOUNT" desc="This text is shown to allow the user to sign into a different GAIA account (for multi-login)."> |
| + <message name="IDS_AUTOFILL_DIALOG_ADD_ACCOUNT" desc="This text is shown to allow the user to sign in to a different GAIA account (for multi-login)."> |
| Add account |
| </message> |
| - <message name="IDS_AUTOFILL_DIALOG_CANCEL_SIGN_IN" desc="This link text is shown when the user is signing into a GAIA account as a way to cancel sign in."> |
| + <message name="IDS_AUTOFILL_DIALOG_CANCEL_SIGN_IN" desc="This link text is shown when the user is signing in to a GAIA account as a way to cancel sign-in."> |
| Back |
| </message> |
| <message name="IDS_AUTOFILL_DIALOG_GOOGLE_WALLET" desc="The menu item that allows a user to select Google Wallet as their payment backend."> |
| @@ -10798,7 +10798,7 @@ Would you like to start <ph name="CONTROL_PANEL_APPLET_NAME">$1<ex>Add/Remove Pr |
| Automatic sign-in is available <ph name="EMAIL_ADDRESS">$1</ph> |
| </message> |
| <message name="IDS_AUTOLOGIN_INFOBAR_OK_BUTTON" desc="The string used in the infobar button that the user presses to perform the auto-login. [length: 10em]"> |
| - Login |
| + Sign in |
| </message> |
| </if> |
| <if expr="not is_ios"> |
| @@ -10827,20 +10827,20 @@ Would you like to start <ph name="CONTROL_PANEL_APPLET_NAME">$1<ex>Add/Remove Pr |
| Sign in anyway |
| </message> |
| - <!-- One click sign in bubble and dialog --> |
| - <message name="IDS_ONE_CLICK_BUBBLE_UNDO" desc="The text for the undo button in the one click signin bubble."> |
| + <!-- One click sign-in bubble and dialog --> |
| + <message name="IDS_ONE_CLICK_BUBBLE_UNDO" desc="The text for the undo button in the one click sign-in bubble."> |
| Undo |
| </message> |
| <message name="IDS_ONE_CLICK_SIGNIN_BUBBLE_MESSAGE" desc="The body of the sync promo NTP bubble."> |
| Your bookmarks, history, and other settings will be synced to your Google Account. |
| </message> |
| - <message name="IDS_ONE_CLICK_SIGNIN_DIALOG_OK_BUTTON" desc="The text of the OK button of the one click sign in dialog."> |
| + <message name="IDS_ONE_CLICK_SIGNIN_DIALOG_OK_BUTTON" desc="The text of the OK button of the one click sign-in dialog."> |
| OK, got it! |
| </message> |
| - <message name="IDS_ONE_CLICK_SIGNIN_DIALOG_UNDO_BUTTON" desc="The text of the undo button of the one click sign in dialog."> |
| + <message name="IDS_ONE_CLICK_SIGNIN_DIALOG_UNDO_BUTTON" desc="The text of the undo button of the one click sign-in dialog."> |
| Undo |
| </message> |
| - <message name="IDS_ONE_CLICK_SIGNIN_DIALOG_ADVANCED" desc="The advanced link in the one click sign in dialog. Clicking the link will take the user to advanced settings."> |
| + <message name="IDS_ONE_CLICK_SIGNIN_DIALOG_ADVANCED" desc="The advanced link in the one click sign-in dialog. Clicking the link will take the user to advanced settings."> |
| Advanced |
| </message> |
| <message name="IDS_ONE_CLICK_SIGNIN_CONFIRM_EMAIL_DIALOG_TITLE" desc="The title of the modal dialog window that opens when the user signs in with a different account."> |
| @@ -10848,26 +10848,26 @@ Would you like to start <ph name="CONTROL_PANEL_APPLET_NAME">$1<ex>Add/Remove Pr |
| </message> |
| <!-- Enterprise sign-in profile linking --> |
| - <message name="IDS_ENTERPRISE_SIGNIN_PROFILE_LINK_LEARN_MORE" desc="The link to get more information about profile linking after signing into an enterprise account"> |
| + <message name="IDS_ENTERPRISE_SIGNIN_PROFILE_LINK_LEARN_MORE" desc="The link to get more information about profile linking after signing in to an enterprise account"> |
| Learn more |
| </message> |
| - <message name="IDS_ENTERPRISE_SIGNIN_CREATE_NEW_PROFILE" desc="Text of the button to create a new profile after enterprise account signin"> |
| + <message name="IDS_ENTERPRISE_SIGNIN_CREATE_NEW_PROFILE" desc="Text of the button to create a new profile after enterprise account sign-in"> |
| Create a new user |
| </message> |
| - <message name="IDS_ENTERPRISE_SIGNIN_CANCEL" desc="Text of the button to cancel signin"> |
| + <message name="IDS_ENTERPRISE_SIGNIN_CANCEL" desc="Text of the button to cancel sign-in"> |
| Cancel |
| </message> |
| <!-- Enterprise sign-in profile linking --> |
| <!-- TODO(dconnelly): remove "new-style" once the old dialog is gone. --> |
| - <message name="IDS_ENTERPRISE_SIGNIN_CREATE_NEW_PROFILE_NEW_STYLE" desc="Text of the button to create a new profile after enterprise account signin"> |
| + <message name="IDS_ENTERPRISE_SIGNIN_CREATE_NEW_PROFILE_NEW_STYLE" desc="Text of the button to create a new profile after enterprise account sign-in"> |
| No, create new profile |
| </message> |
| <message name="IDS_ENTERPRISE_SIGNIN_CONTINUE_NEW_STYLE" desc="Text of the button to link the current profile with the signed-in enterprise account"> |
| Yes, link my data |
| </message> |
| - <message name="IDS_ENTERPRISE_SIGNIN_ALERT_NEW_STYLE" desc="The text of the prompt to create a new profile after signing into an enterprise account"> |
| + <message name="IDS_ENTERPRISE_SIGNIN_ALERT_NEW_STYLE" desc="The text of the prompt to create a new profile after signing in to an enterprise account"> |
| This account is managed by <ph name="DOMAIN">$1<ex>example.com</ex></ph> |
| </message> |
| @@ -11359,7 +11359,7 @@ Would you like to start <ph name="CONTROL_PANEL_APPLET_NAME">$1<ex>Add/Remove Pr |
| Access the tabs you have open on your computer, right here. |
| </p> |
| <p> |
| - Just open Chrome on your computer, go to the menu, and select "Sign In to Chrome..." |
| + Just open Chrome on your computer, go to the menu, and select "Sign in to Chrome..." |
| </p> |
| </message> |
| <message name="IDS_SYNC_ENABLE_SYNC" desc="Text that displayed on a link or button that allows the user to enable sync."> |
| @@ -11565,7 +11565,7 @@ Would you like to start <ph name="CONTROL_PANEL_APPLET_NAME">$1<ex>Add/Remove Pr |
| Customize User... |
| </message> |
| </if> |
| - <message name="IDS_PROFILES_LOCAL_PROFILE_STATE" desc="This is displayed underneath the profile name for profiles that are not signed into sync."> |
| + <message name="IDS_PROFILES_LOCAL_PROFILE_STATE" desc="This is displayed underneath the profile name for profiles that are not signed in to sync."> |
| Not signed in |
| </message> |
| <message name="IDS_PROFILES_CREATE_BUTTON_LABEL" desc="The label that appears on the profile create button in the options dialog to allow a user to create a new profile."> |
| @@ -11606,7 +11606,7 @@ Would you like to start <ph name="CONTROL_PANEL_APPLET_NAME">$1<ex>Add/Remove Pr |
| </message> |
| </if> |
| <if expr="pp_ifdef('chromeos')"> |
| - <message name="IDS_MULTI_PROFILES_WARNING" desc="A notification message when user signs into a multiprofile session for the first time."> |
| + <message name="IDS_MULTI_PROFILES_WARNING" desc="A notification message when user signs in to a multiprofile session for the first time."> |
| You have enabled multiprofiles, an unsupported experimental mode in Chrome OS. Features may change or break. |
| </message> |
| </if> |
| @@ -13290,9 +13290,9 @@ Some features may be unavailable. Please check that the profile exists and you |
| </message> |
| </if> |
| - <!-- Sync sign in global error message--> |
| + <!-- Sync sign-in global error message--> |
| <message name="IDS_SIGNIN_ERROR_BUBBLE_VIEW_TITLE" desc="Title in the signin error bubble view."> |
| - Signin Error |
| + Sign-in Error |
| </message> |
| <message name="IDS_SYNC_ERROR_BUBBLE_VIEW_TITLE" desc="Title in the sync error bubble view."> |
| Sync Error |
| @@ -13300,8 +13300,8 @@ Some features may be unavailable. Please check that the profile exists and you |
| <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."> |
| <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> 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."> |
| - <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> could not sync your data because your account sign in details are out of date. |
| + <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."> |
| + <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> 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."> |
| <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> could not sync your data because Sync is not available for your domain. |
| @@ -13400,13 +13400,13 @@ Some features may be unavailable. Please check that the profile exists and you |
| <message name="IDS_SYNC_PROMO_ADVANCED" desc="The link button at the bottom to let the user customize the sync settings."> |
| Advanced... |
| </message> |
| - <message name="IDS_SYNC_PROMO_NOT_SIGNED_IN_STATUS_HEADER" desc="The first line of the of the message shown in NTP when a user is not signed into sync."> |
| + <message name="IDS_SYNC_PROMO_NOT_SIGNED_IN_STATUS_HEADER" desc="The first line of the of the message shown in NTP when a user is not signed in to sync."> |
| Not signed in to <ph name="SHORT_PRODUCT_NAME">$1<ex>Chrome</ex></ph> |
| </message> |
| - <message name="IDS_SYNC_PROMO_NOT_SIGNED_IN_STATUS_SUB_HEADER" desc="The second line of the of the message shown in NTP when a user is not signed into sync."> |
| + <message name="IDS_SYNC_PROMO_NOT_SIGNED_IN_STATUS_SUB_HEADER" desc="The second line of the of the message shown in NTP when a user is not signed in to sync."> |
| (You're missing out—<ph name="IDS_SYNC_PROMO_NOT_SIGNED_IN_STATUS_LINK">$1<ex>sign in</ex></ph>) |
| </message> |
| - <message name="IDS_SYNC_PROMO_NOT_SIGNED_IN_STATUS_LINK" desc="The linkified portion of the sync sign in promo on the NTP. Clicking this text allows the user to sign in to sync."> |
| + <message name="IDS_SYNC_PROMO_NOT_SIGNED_IN_STATUS_LINK" desc="The linkified portion of the sync sign-in promo on the NTP. Clicking this text allows the user to sign in to sync."> |
| sign in |
| </message> |
| <if expr="is_android"> |
| @@ -14378,7 +14378,7 @@ Some features may be unavailable. Please check that the profile exists and you |
| Failed to install policy settings on the device: <ph name="VALIDATION_ERROR">$1<ex>Policy parsing failed</ex></ph>. |
| </message> |
| <message name="IDS_ENTERPRISE_ENROLLMENT_AUTH_FATAL_ERROR" desc="Error message to show when there is an unrecoverable error while authenticating with GAIA."> |
| - Oops! Something went wrong when trying to authenticate you. Please double-check your login credentials and try again. |
| + Oops! Something went wrong when trying to authenticate you. Please double-check your sign-in credentials and try again. |
| </message> |
| <message name="IDS_ENTERPRISE_ENROLLMENT_AUTH_ACCOUNT_ERROR" desc="Error message to show when there is a problem with the user account."> |
| This user account is not eligible for the service. |
| @@ -14387,7 +14387,7 @@ Some features may be unavailable. Please check that the profile exists and you |
| Oops! A network communication problem occurred during authentication. Please check your network connection and try again. |
| </message> |
| <message name="IDS_ENTERPRISE_AUTO_ENROLLMENT_BAD_MODE" desc="Error message to show when auto-enrollment is not supported for the enrollment mode supplied by the DMServer."> |
| - Oops! Something went wrong while auto-enrolling this device. Please try again from the login screen using the Ctrl-Alt-E key combination, or contact your support representative. |
| + Oops! Something went wrong while auto-enrolling this device. Please try again from the sign-in screen using the Ctrl-Alt-E key combination, or contact your support representative. |
| </message> |
| <message name="IDS_ENTERPRISE_ENROLLMENT_FATAL_ENROLLMENT_ERROR" desc="Error message to show when there is an unrecoverable error while performing enrollment."> |
| Oops! Something went really wrong while enrolling this device. Please try again or contact your support representative. |
| @@ -14419,8 +14419,8 @@ Some features may be unavailable. Please check that the profile exists and you |
| <message name="IDS_ENTERPRISE_ENROLLMENT_WORKING" desc="Status message to show while enterprise enrollment is underway."> |
| Enrolling the device. Please wait... |
| </message> |
| - <message name="IDS_ENTERPRISE_ENROLLMENT_RESUMING_LOGIN" desc="Status message to show after enterprise enrollment is complete and the first user login is prepared."> |
| - Preparing for first enterprise login... |
| + <message name="IDS_ENTERPRISE_ENROLLMENT_RESUMING_LOGIN" desc="Status message to show after enterprise enrollment is complete and the first user sign-in is prepared."> |
| + Preparing for first enterprise sign-in... |
| </message> |
| <message name="IDS_ENTERPRISE_ENROLLMENT_EXPLAIN" desc="Explanatory text describing what enterprise enrollment is and guiding the user to sign in with an account from the enterprise domain."> |
| Welcome to your managed Chromebook! |
| @@ -14429,12 +14429,12 @@ Some features may be unavailable. Please check that the profile exists and you |
| Contact your system administrator for more information. |
| - If this device does not belong to your organization, and is your personal device, you can press Ctrl+Alt+E now to cancel enrollment of the device and go back to the sign in screen. |
| + If this device does not belong to your organization, and is your personal device, you can press Ctrl+Alt+E now to cancel enrollment of the device and go back to the sign-in screen. |
| </message> |
| <message name="IDS_ENTERPRISE_ENROLLMENT_EXPLAIN_LINK" desc="Text on the link to the screen that explain what enterprise enrollment is."> |
| Learn more about Enterprise Enrollment |
| </message> |
| - <message name="IDS_ENTERPRISE_ENROLLMENT_EXPLAIN_BUTTON" desc="Text on the button that closes the explanatory dialog and sends to user back to the sign in screen."> |
| + <message name="IDS_ENTERPRISE_ENROLLMENT_EXPLAIN_BUTTON" desc="Text on the button that closes the explanatory dialog and sends to user back to the sign-in screen."> |
| Sign in now |
| </message> |
| <message name="IDS_ENTERPRISE_ENROLLMENT_CANCEL_AUTO_REALLY" desc="Message asking the user to confirm if he really wants to cancel auto enrollment."> |
| @@ -14686,7 +14686,7 @@ Some features may be unavailable. Please check that the profile exists and you |
| <message name="IDS_PROFILES_CREATE_MANAGED_SIGNED_IN_LABEL" desc="Label for the 'Supervised user' checkbox in the create-profile dialog when the current user is signed in. This will be followed by a 'Learn more' link."> |
| This is a supervised user managed by <ph name="CUSTODIAN_EMAIL">$1<ex>user@gmail.com</ex></ph>. |
| </message> |
| - <message name="IDS_PROFILES_CREATE_MANAGED_ACCOUNT_DETAILS_OUT_OF_DATE_LABEL" desc="Label for the 'Supervised user' checkbox in the create-profile dialog when the current user is signed in, but their login information is invalid. This will be followed by a 'Sign in again' link."> |
| + <message name="IDS_PROFILES_CREATE_MANAGED_ACCOUNT_DETAILS_OUT_OF_DATE_LABEL" desc="Label for the 'Supervised user' checkbox in the create-profile dialog when the current user is signed in, but their sign-in information is invalid. This will be followed by a 'Sign in again' link."> |
| This is a supervised user managed by <ph name="CUSTODIAN_EMAIL">$1<ex>user@gmail.com</ex></ph>. |
| Your account sign-in details are out of date. |
| </message> |
| @@ -14777,7 +14777,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@gmail.com</ex |
| <message name="IDS_MANAGED_USER_IMPORT_REMOTE_ERROR" desc="Message shown when a remote error (for example, a network error) occurs during supervised user import."> |
| Oops! The supervised user couldn't be imported. Please check your network connection and try again later. |
| </message> |
| - <message name="IDS_MANAGED_USER_IMPORT_SIGN_IN_ERROR" desc="Message shown when a sign in error occurs during supervised user import."> |
| + <message name="IDS_MANAGED_USER_IMPORT_SIGN_IN_ERROR" desc="Message shown when a sign-in error occurs during supervised user import."> |
| Oops! Looks like there's a problem with your credentials. Please make sure you're signed in properly and try again. |
| </message> |
| <message name="IDS_MANAGED_USER_SELECT_AVATAR_TITLE" desc="Title for the dialog used to select an avatar for a supervised user being imported. The dialog is shown only when the supervised user being imported has no chrome synced avatar."> |
| @@ -14797,10 +14797,10 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@gmail.com</ex |
| Add User |
| </message> |
| <message name="IDS_SCREEN_LOCK_SIGN_OUT"> |
| - Sign Out |
| + Sign out |
| </message> |
| <message name="IDS_LOGIN_BUTTON"> |
| - Sign In |
| + Sign in |
| </message> |
| <message name="IDS_LOGIN_POD_USER_REMOVE_WARNING_BUTTON" desc="Text shown on a button that confirms removal of a user."> |
| Remove This User |
| @@ -14823,7 +14823,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@gmail.com</ex |
| <message name="IDS_USER_MANAGER_SCREEN_TITLE" desc="String to be displayed in the title bar of the user manager page"> |
| User Manager |
| </message> |
| - <message name="IDS_GO_INCOGNITO_BUTTON" desc="Text shown on Chrome OS login screen button that launches guest session. Should be short."> |
| + <message name="IDS_GO_INCOGNITO_BUTTON" desc="Text shown on Chrome OS sign-in screen button that launches guest session. Should be short."> |
| Browse as Guest |
| </message> |
| <message name="IDS_SCREEN_LOCK_ACTIVE_USER"> |
| @@ -14835,7 +14835,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@gmail.com</ex |
| <message name="IDS_LOGIN_POD_EMPTY_PASSWORD_TEXT" desc="Text to display in the password field for user pod when no password has been entered."> |
| Enter password |
| </message> |
| - <message name="IDS_LOGIN_POD_PASSWORD_FIELD_ACCESSIBLE_NAME" desc="Text to be spoken when the focus is set to the password field of a user pod on the login screen."> |
| + <message name="IDS_LOGIN_POD_PASSWORD_FIELD_ACCESSIBLE_NAME" desc="Text to be spoken when the focus is set to the password field of a user pod on the sign-in screen."> |
| Password for <ph name="USER_EMAIL_ADDRESS">$1<ex>john.doe@example.com</ex></ph> |
| </message> |
| <message name="IDS_LOGIN_POD_MENU_BUTTON_ACCESSIBLE_NAME" desc="Text to be spoken when the focus is set to the menu button of the user pod on the login screen."> |
| @@ -14948,11 +14948,11 @@ Do you accept? |
| <message name="IDS_FLAGS_ENABLE_NEW_PROFILE_MANAGEMENT_DESCRIPTION" desc="Description for the flag to enable the new profile management"> |
| Enables the new profile management system, including profile sign-out and the new avatar menu UI. |
| </message> |
| - <message name="IDS_FLAGS_ENABLE_WEB_BASED_SIGNIN_NAME" desc="Title for the flag to enable web-based signin flows."> |
| - Enable pure web-based signin flows |
| + <message name="IDS_FLAGS_ENABLE_WEB_BASED_SIGNIN_NAME" desc="Title for the flag to enable web-based sign-in flows."> |
| + Enable pure web-based sign-in flows |
| </message> |
| - <message name="IDS_FLAGS_ENABLE_WEB_BASED_SIGNIN_DESCRIPTION" desc="Description for the flag to enable web-based signin flows"> |
| - When enabled, will use a pure web-based sign in flow on first run/NTP/wrench menu/settings page. Otherwise use a native flow with embedded webview. |
| + <message name="IDS_FLAGS_ENABLE_WEB_BASED_SIGNIN_DESCRIPTION" desc="Description for the flag to enable web-based sign-in flows"> |
| + When enabled, will use a pure web-based sign-in flow on first run/NTP/wrench menu/settings page. Otherwise use a native flow with embedded webview. |
| </message> |
| <message name="IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_NAME" desc="Title for the flag to enable the google profile information"> |
| Enable Google profile name and icon |
| @@ -15189,10 +15189,10 @@ Do you accept? |
| <message name="IDS_SEARCH_BOX_HINT" desc="Hint text for the search box in app list window."> |
| Search |
| </message> |
| - <message name="IDS_APP_LIST_SIGNIN_BUTTON" desc="App launcher signin button text."> |
| + <message name="IDS_APP_LIST_SIGNIN_BUTTON" desc="App launcher sign-in button text."> |
| Sign in |
| </message> |
| - <message name="IDS_APP_LIST_SIGNIN_LEARN_MORE_TEXT" desc="App launcher signin learn more link text."> |
| + <message name="IDS_APP_LIST_SIGNIN_LEARN_MORE_TEXT" desc="App launcher sign-in learn more link text."> |
| Learn more |
| </message> |
| <message name="IDS_APP_LIST_NEW_WINDOW" desc="The text label of the New Window menu item"> |
| @@ -15221,10 +15221,10 @@ Do you accept? |
| <message name="IDS_SEARCH_BOX_HINT" desc="Hint text for the search box in app list window."> |
| Search |
| </message> |
| - <message name="IDS_APP_LIST_SIGNIN_BUTTON" desc="App launcher signin button text."> |
| - Sign In |
| + <message name="IDS_APP_LIST_SIGNIN_BUTTON" desc="App launcher sign-in button text."> |
| + Sign in |
| </message> |
| - <message name="IDS_APP_LIST_SIGNIN_LEARN_MORE_TEXT" desc="App launcher signin learn more link text."> |
| + <message name="IDS_APP_LIST_SIGNIN_LEARN_MORE_TEXT" desc="App launcher sign-in learn more link text."> |
| Learn More |
| </message> |
| <message name="IDS_APP_LIST_NEW_WINDOW" desc="The text label of the New Window menu item"> |
| @@ -15234,10 +15234,10 @@ Do you accept? |
| New Incognito Window |
| </message> |
| </if> |
| - <message name="IDS_APP_LIST_SIGNIN_LEARN_MORE_LINK" desc="App launcher signin learn more URL."> |
| + <message name="IDS_APP_LIST_SIGNIN_LEARN_MORE_LINK" desc="App launcher sign-in learn more URL."> |
| https://support.google.com/chrome/bin/answer.py?hl=[GRITLANGCODE]&answer=165139&p=settings_sign_in |
| </message> |
| - <message name="IDS_APP_LIST_SIGNIN_SETTINGS_TEXT" desc="App launcher signin settings link text."> |
| + <message name="IDS_APP_LIST_SIGNIN_SETTINGS_TEXT" desc="App launcher sign-in settings link text."> |
| App Launcher Settings |
| </message> |