summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Song <tengs@chromium.org>2014-10-31 21:05:58 -0700
committerTim Song <tengs@chromium.org>2014-11-01 04:06:55 +0000
commit6f32699a9a94c12de78ea915897b9a32a3f54311 (patch)
treec15437f20aaf85f34ed0f1b67da3fbb583b0b234
parent93871b124ba6d3bc7e605b00f63cae5d2758b839 (diff)
downloadchromium_src-6f32699a9a94c12de78ea915897b9a32a3f54311.zip
chromium_src-6f32699a9a94c12de78ea915897b9a32a3f54311.tar.gz
chromium_src-6f32699a9a94c12de78ea915897b9a32a3f54311.tar.bz2
Update Smart lock strings in chrome://settings.
BUG=425863 TEST=manual NOTRY=true Review URL: https://codereview.chromium.org/683793005 Cr-Commit-Position: refs/heads/master@{#301676} (cherry picked from commit 2727608b406a9c198469e186853da57eacb105d2) TBR=xiyuan@chromium.org Review URL: https://codereview.chromium.org/696933002 Cr-Commit-Position: refs/branch-heads/2171@{#324} Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
-rw-r--r--chrome/app/generated_resources.grd8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 3a6546e..e74905e 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -9935,13 +9935,13 @@ Chrome ran out of memory.
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.
+ Keep your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph> unlocked when your Android phone is unlocked and nearby – no need to type your password. Learn more
</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
+ Set up Smart Lock
</message>
<message name="IDS_OPTIONS_EASY_UNLOCK_DESCRIPTION" desc="The text that describs what Easy Unlock does.">
- Your Android phone can securely unlock your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>.
+ Your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph> will be unlocked when your Android phone is unlocked and nearby.
</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
@@ -14546,7 +14546,7 @@ Do you accept?
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.
+ Use your Android phone to unlock this <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>. No need to type your password again.
</message>
<message name="IDS_EASY_UNLOCK_SETUP_NOTIFICATION_BUTTON_TITLE" desc="The text to show on the button in the notification inviting the user to use the Easy Unlock feature.">
1-minute setup