Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(209)

Unified Diff: chrome/app/generated_resources.grd

Side-by-side diff isn't available for this file because of its large size.
Issue 446743003: Hook up new API for easy unlock to update lock screen (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: v Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
Download patch
Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 72ae49594110623dbfa7d1b093a6874271eeaa35..bfa5e5f59b8c9ec7a817c38b0d7a30c7c44524ad 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -13439,11 +13439,6 @@ After you create a new supervised user, you can manage their settings at any tim
<message name="IDS_LOGIN_POD_MENU_REMOVE_ITEM_ACCESSIBLE_NAME" desc="Text to be spoken when 'Remove user' item is selected on the pod menu.">
Remove this user
</message>
- <if expr="chromeos">
- <message name="IDS_LOGIN_EASY_UNLOCK_TOOLTIP" desc="Tooltip text shown on lock screen when Easy Unlock is first setup.">
- This icon appears when you and your phone are nearby and Easy Unlock is available. Just click to enter, no password needed.
- </message>
- </if>
<message name="IDS_LOGIN_POD_SUPERVISED_USER_REMOVE_WARNING" desc="Text shown as a warning when attempting to remove supervised user.">
All files and local data associated with the supervised user will be permanently deleted once this supervised user is removed. Visited websites and settings for this supervised user may still be visible by the manager at <ph name="MANAGEMENT_URL">$1<ex>www.example.com</ex></ph>.
</message>
@@ -14474,6 +14469,33 @@ Do you accept?
<message name="IDS_EASY_UNLOCK_SETUP_ERROR_CONNECTING_TO_PHONE" desc="A generic catch-all error message to display when something goes wrong after the user clicks 'Use this phone' during Easy Unlock setup.">
Couldn't connect your phone and <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>. Please make sure your phone is with you and turned on.
</message>
+ <message name="IDS_EASY_UNLOCK_SCREENLOCK_TOOLTIP_NO_BLUETOOTH" desc="Tooltip for an icon on screen lock user pod shown by Easy Unlock when the Bluetooth is not turned on.">
+ Please turn on Bluetooth.
+ </message>
+ <message name="IDS_EASY_UNLOCK_SCREENLOCK_TOOLTIP_NO_PHONE" desc="Tooltip for an icon on screen lock user pod shown by Easy Unlock when a phone eligible to unlock the Chromebook cannot be found.">
+ Can't find your phone. Make sure it's nearby and its Bluetooth is turned on.
+ </message>
+ <message name="IDS_EASY_UNLOCK_SCREENLOCK_TOOLTIP_PHONE_NOT_AUTHENTICATED" desc="Tooltip for an icon on screen lock user pod shown by Easy Unlock when no phone eligible to unlock the Chromebook can be authenticated.">
+ Unable to unlock. Please enter your password.
+ </message>
+ <message name="IDS_EASY_UNLOCK_SCREENLOCK_TOOLTIP_PHONE_NOT_NEARBY" desc="Tooltip for an icon on screen lock user pod shown by Easy Unlock when a phone eligible to unlock the Chromebook is detected, but is not in proximity of the Chromebook.">
+ Can't find your phone. Please make sure it's nearby.
+ </message>
+ <message name="IDS_EASY_UNLOCK_SCREENLOCK_TOOLTIP_PHONE_LOCKED" desc="Tooltip for an icon on screen lock user pod shown by Easy Unlock when a phone eligible to unlock the Chromebook detected, but it is locked and thus not allowed to unlock the Chromebook.">
+ Your phone is locked. Unlock it to continue.
+ </message>
+ <message name="IDS_EASY_UNLOCK_SCREENLOCK_TOOLTIP_PHONE_UNLOCKABLE" desc="Tooltip for an icon on screen lock user pod shown by Easy Unlock when a phone eligible to unlock the Chromebook detected, but it does not have lock screen enabled, in which case it is not allowed to unlock Chromebooks.">
+ Your phone must have a lock screen enabled before it can unlock this <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>. Otherwise, you will need to type in your password.
+ </message>
+ <message name="IDS_EASY_UNLOCK_SCREENLOCK_TOOLTIP_HARDLOCK_INSTRUCTIONS" desc="Tooltip for an icon on screen lock user pod shown by Easy Unlock when a phone that eligible to unlock the Chromebook is detected and authenticated. The tooltip shows instructions for hard-locking the Chromebook.">
+ If you click this icon, you can manually lock this <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>. Next time, you'll need your password to unlock it.
+ </message>
+ <message name="IDS_EASY_UNLOCK_SCREENLOCK_TOOLTIP_TUTORIAL" desc="Tooltip text shown on lock screen when Easy Unlock is first setup.">
+ The open lock indicates that your phone is unlocked and with you. Click your profile picture to enter without typing your password. If your phone is locked or away, a locked icon will show, and you'll need to type your password.
+ </message>
+ <message name="IDS_EASY_UNLOCK_SCREENLOCK_USER_POD_AUTH_VALUE" desc="Message on screen lock user pod shown in place of password field when Easy Unlock is enabled and a phone that can unlock the Chromebook is detected in proximity.">
+ Click to enter
+ </message>
<!-- Invalid SSL certificate memory strategy strings -->
<message name="IDS_FLAGS_REMEMBER_CERTIFICATE_ERROR_DECISIONS_NAME" desc="Name of the remember certificate error decisions lab">

Powered by Google App Engine
This is Rietveld 408576698