This repository has been archived by the owner on Apr 3, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 211
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Change Easy Unlock references in strings to Smart Lock.
This is a first pass only changing values of string resources, so we can smoothly merge it to M38. Note: strings that are not in M38 are not changed. BUG=421466 TEST=manual, no merge conflicts for 2125 Review URL: https://codereview.chromium.org/649723002 Cr-Commit-Position: refs/heads/master@{#299163} (cherry picked from commit 42148e9) [email protected] Review URL: https://codereview.chromium.org/660313002 Cr-Commit-Position: refs/branch-heads/2171@{#170} Cr-Branched-From: 267aeeb-refs/heads/master@{#297060}
- Loading branch information
Tim Song
committed
Oct 17, 2014
1 parent
884f6a9
commit e971456
Showing
1 changed file
with
14 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9932,10 +9932,10 @@ Chrome ran out of memory. | |
| Ask where to save each file before downloading | ||
| </message> | ||
| <message name="IDS_OPTIONS_EASY_UNLOCK_SECTION_TITLE" desc="The title of the Easy Unlock section on the settings page."> | ||
| Easy unlock (Beta) | ||
| Smart Lock (Beta) | ||
| </message> | ||
| <message name="IDS_OPTIONS_EASY_UNLOCK_SETUP_INTRO" desc="The text to show in Easy Unlock section to introduce the feature."> | ||
| Use your Android phone to securely unlock your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>. No need to type your password again. | ||
| Use your Android phone to securely unlock your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>. No need to type your password. | ||
| </message> | ||
| <message name="IDS_OPTIONS_EASY_UNLOCK_SETUP_BUTTON" desc="The label of the button to set up Easy Unlock section on the settings page."> | ||
| Set up | ||
|
|
@@ -9944,25 +9944,25 @@ Chrome ran out of memory. | |
| Your Android phone can securely unlock your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>. | ||
| </message> | ||
| <message name="IDS_OPTIONS_EASY_UNLOCK_TURN_OFF_BUTTON" desc="The label of the button to disable Easy unlock on the settings page and the turn off Easy unlock dialog."> | ||
| Turn off Easy unlock | ||
| Turn off | ||
| </message> | ||
| <message name="IDS_OPTIONS_EASY_UNLOCK_TURN_OFF_TITLE" desc="The title of the Easy unlock turn off dialog."> | ||
| Turn off Easy unlock | ||
| Turn off Smart Lock | ||
| </message> | ||
| <message name="IDS_OPTIONS_EASY_UNLOCK_TURN_OFF_DESCRIPTION" desc="The description text of the Easy unlock turn off dialog."> | ||
| If you turn off Easy unlock, you won’t be able to unlock your Chrome devices when your phone is with you. You will have to type in your password. | ||
| If you turn off Smart Lock, you won’t be able to unlock your Chrome devices when your phone is with you. You will have to type in your password. | ||
| </message> | ||
| <message name="IDS_OPTIONS_EASY_UNLOCK_TURN_OFF_OFFLINE_TITLE" desc="The title text on the Easy unlock turn off dialog when Easy unlock could not be turned off because the device is offline."> | ||
| Please connect to a network | ||
| </message> | ||
| <message name="IDS_OPTIONS_EASY_UNLOCK_TURN_OFF_OFFLINE_MESSAGE" desc="The text on the Easy unlock turn off dialog when Easy unlock could not be turned off because the device is offline."> | ||
| You must be online to turn off Easy unlock because this setting is synced to your phone and other devices. Please connect to a network first. | ||
| You must be online to turn off Smart Lock because this setting is synced to your phone and other devices. Please connect to a network first. | ||
| </message> | ||
| <message name="IDS_OPTIONS_EASY_UNLOCK_TURN_OFF_ERROR_TITLE" desc="The title text on the Easy unlock turn off dialog when Easy unlock could not be turned off because there is a server error."> | ||
| Easy unlock is unavailable | ||
| Smart Lock is unavailable | ||
| </message> | ||
| <message name="IDS_OPTIONS_EASY_UNLOCK_TURN_OFF_ERROR_MESSAGE" desc="The text on the Easy unlock turn off dialog when Easy unlock could not be turned off because there is a server error."> | ||
| Unable to connect to Easy unlock right now. Please try again later. | ||
| Unable to connect to Smart Lock right now. Please try again later. | ||
| </message> | ||
| <message name="IDS_OPTIONS_EASY_UNLOCK_TURN_OFF_RETRY_BUTTON" desc="The label text of the retry button on the Easy unlock turn off dialog when Easy unlock could not be turned off because there is a server error."> | ||
| Retry | ||
|
|
@@ -14548,7 +14548,7 @@ Do you accept? | |
| <!-- Easy Unlock strings --> | ||
| <!-- Strings for the Easy Unlock promo notification --> | ||
| <message name="IDS_EASY_UNLOCK_SETUP_NOTIFICATION_TITLE" desc="Title for the notification inviting the user to use the Easy Unlock feature."> | ||
| Easily unlock your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph> | ||
| Chrome Smart Lock | ||
| </message> | ||
| <message name="IDS_EASY_UNLOCK_SETUP_NOTIFICATION_MESSAGE" desc="The body text for the notification inviting the user to use the Easy Unlock feature."> | ||
| Use your Android phone to securely unlock this <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>. No need to type your password again. | ||
|
|
@@ -14565,10 +14565,10 @@ Do you accept? | |
| </message> | ||
| <!-- Strings for notification shown when the Chromebook is added to Easy Unlock --> | ||
| <message name="IDS_EASY_UNLOCK_CHROMEBOOK_ADDED_NOTIFICATION_TITLE" desc="Title for notification shown when this Chromebook is added to Easy Unlock as an additional Easy Unlock device."> | ||
| Easy unlock is now enabled | ||
| Smart Lock is now enabled | ||
| </message> | ||
| <message name="IDS_EASY_UNLOCK_CHROMEBOOK_ADDED_NOTIFICATION_MESSAGE" desc="Message for the notification shown when this Chromebook is added to Easy Unlock as an additional Easy Unlock device."> | ||
| You can start using your Android phone to unlock this <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>, too - no additional setup necessary. | ||
| Your phone can unlock this <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>, too. | ||
| </message> | ||
| <!-- Strings for the Easy Unlock setup dialog --> | ||
| <!-- Step 1: Intro --> | ||
|
|
@@ -14577,7 +14577,7 @@ Do you accept? | |
| </message> | ||
| <message name="IDS_EASY_UNLOCK_SETUP_INTRO_HEADER_TEXT" desc="The text to show as the header body text of the Easy Unlock dialog during the first, introductory step. Note that the <a> element surrounds a link; these HTML elements should be preserved in the translation."> | ||
| Keep your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph> unlocked when your phone is unlocked and nearby. | ||
| Note that Bluetooth will be turned on for all of <ph name="USER_DISPLAY_EMAIL">$2<ex>[email protected]</ex></ph>'s compatible devices, and some hardware information will be sent to Google. <a>Learn more</a> | ||
| Note that Bluetooth will be turned on for all <ph name="USER_DISPLAY_EMAIL">$2<ex>[email protected]</ex></ph>'s compatible devices, and some hardware information will be sent to Google. <a>Learn more</a> | ||
| </message> | ||
| <message name="IDS_EASY_UNLOCK_SETUP_INTRO_FIND_PHONE_BUTTON_LABEL" desc="The text to show as the 'Find phone' button label in the Easy Unlock dialog. This button is visible during the first, introductory step."> | ||
| Find your phone | ||
|
|
@@ -14596,7 +14596,7 @@ Do you accept? | |
| Use this phone to unlock your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>? | ||
| </message> | ||
| <message name="IDS_EASY_UNLOCK_SETUP_FOUND_PHONE_HEADER_TEXT" desc="The text to show as the header body text of the Easy Unlock dialog during the second step, after a suitable phone has been found. Note that the <a> element surrounds a link; these HTML elements should be preserved in the translation."> | ||
| Google sent a notification to this phone. Note that with Bluetooth, your phone may keep your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph> unlocked from over 100 feet away. In cases where this could be a problem, you can <a>temporarily turn off this feature</a>. | ||
| Google sent a notification to this phone. Note that with Bluetooth, your phone may keep your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph> unlocked from over 100 feet away. In cases where this could be a problem, you can <a>temporarily disable this feature</a>. | ||
| </message> | ||
| <message name="IDS_EASY_UNLOCK_SETUP_FOUND_PHONE_USE_THIS_PHONE_BUTTON_LABEL" desc="The text to show as the 'Use this phone' button label in the Easy Unlock dialog. This button is visible during the second step, after a suitable phone is found."> | ||
| Use this phone | ||
|
|
@@ -14615,7 +14615,7 @@ Do you accept? | |
| Try it out | ||
| </message> | ||
| <message name="IDS_EASY_UNLOCK_SETUP_COMPLETE_SETTINGS_LINK_TEXT" desc="The text to show as the link text to access Easy Unlock settings. This button is visible during the final step, once the Easy Unlock setup succeeds."> | ||
| Easy unlock settings | ||
| Smart Lock settings | ||
| </message> | ||
| <!-- Error strings for the Easy Unlock setup dialog --> | ||
| <message name="IDS_EASY_UNLOCK_LEARN_MORE_LINK_TITLE" desc="Text to use for links that point to more information about Easy Unlock in the easy unlock setup dialog."> | ||
|
|
||