From e9714567043062f1804e8fd11602f1245a8a0d9a Mon Sep 17 00:00:00 2001 From: Tim Song Date: Fri, 17 Oct 2014 10:35:37 -0700 Subject: [PATCH] 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 42148e93caec39f8d1dbfebf002130989be1f5dd) TBR=xiyuan@chromium.org Review URL: https://codereview.chromium.org/660313002 Cr-Commit-Position: refs/branch-heads/2171@{#170} Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060} --- chrome/app/generated_resources.grd | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 495f8e480cb56..bec46d7fba644 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -9932,10 +9932,10 @@ Chrome ran out of memory. Ask where to save each file before downloading - Easy unlock (Beta) + Smart Lock (Beta) - Use your Android phone to securely unlock your $1Chromebook. No need to type your password again. + Use your Android phone to securely unlock your $1Chromebook. No need to type your password. Set up @@ -9944,25 +9944,25 @@ Chrome ran out of memory. Your Android phone can securely unlock your $1Chromebook. - Turn off Easy unlock + Turn off - Turn off Easy unlock + Turn off Smart Lock - 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. Please connect to a network - 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. - Easy unlock is unavailable + Smart Lock is unavailable - Unable to connect to Easy unlock right now. Please try again later. + Unable to connect to Smart Lock right now. Please try again later. Retry @@ -14548,7 +14548,7 @@ Do you accept? - Easily unlock your $1Chromebook + Chrome Smart Lock Use your Android phone to securely unlock this $1Chromebook. No need to type your password again. @@ -14565,10 +14565,10 @@ Do you accept? - Easy unlock is now enabled + Smart Lock is now enabled - You can start using your Android phone to unlock this $1Chromebook, too - no additional setup necessary. + Your phone can unlock this $1Chromebook, too. @@ -14577,7 +14577,7 @@ Do you accept? Keep your $1Chromebook unlocked when your phone is unlocked and nearby. - Note that Bluetooth will be turned on for all of $2user@gmail.com'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 $2user@gmail.com's compatible devices, and some hardware information will be sent to Google. <a>Learn more</a> Find your phone @@ -14596,7 +14596,7 @@ Do you accept? Use this phone to unlock your $1Chromebook? - Google sent a notification to this phone. Note that with Bluetooth, your phone may keep your $1Chromebook 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 $1Chromebook unlocked from over 100 feet away. In cases where this could be a problem, you can <a>temporarily disable this feature</a>. Use this phone @@ -14615,7 +14615,7 @@ Do you accept? Try it out - Easy unlock settings + Smart Lock settings