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

Side by Side Diff: chrome/app/settings_strings.grdp

Issue 2876003002: [Merge to M59] md settings: Change action link to button on lock screen. (Closed)
Patch Set: Created 3 years, 7 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:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/resources/settings/people_page/lock_screen.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <!-- Settings-specific strings (included from generated_resources.grd). --> 2 <!-- Settings-specific strings (included from generated_resources.grd). -->
3 <grit-part> 3 <grit-part>
4 <!-- Main Page --> 4 <!-- Main Page -->
5 <if expr="chromeos"> 5 <if expr="chromeos">
6 <message name="IDS_SETTINGS_SECONDARY_USER_BANNER" desc="Banner displayed in settings page when the user is secondary in a multi-profile session."> 6 <message name="IDS_SETTINGS_SECONDARY_USER_BANNER" desc="Banner displayed in settings page when the user is secondary in a multi-profile session.">
7 Some settings belonging to <ph name="PRIMARY_EMAIL">$1<ex>john@google.com< /ex></ph> are being shared with you. These settings only affect your account whe n using multiple sign-in. 7 Some settings belonging to <ph name="PRIMARY_EMAIL">$1<ex>john@google.com< /ex></ph> are being shared with you. These settings only affect your account whe n using multiple sign-in.
8 </message> 8 </message>
9 </if> 9 </if>
10 10
(...skipping 2247 matching lines...) Expand 10 before | Expand all | Expand 10 after
2258 </message> 2258 </message>
2259 <message name="IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_MISMATCHED" desc="Message s hown below the title that tells the user they have entered two different PIN val ues."> 2259 <message name="IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_MISMATCHED" desc="Message s hown below the title that tells the user they have entered two different PIN val ues.">
2260 PINs do not match 2260 PINs do not match
2261 </message> 2261 </message>
2262 <message name="IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONTINUE_BUTTON" desc="A bu tton that accepts the users initial PIN. The user will have to enter the PIN aga in after hitting this button to confirm that they entered it correctly."> 2262 <message name="IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONTINUE_BUTTON" desc="A bu tton that accepts the users initial PIN. The user will have to enter the PIN aga in after hitting this button to confirm that they entered it correctly.">
2263 Continue 2263 Continue
2264 </message> 2264 </message>
2265 <message name="IDS_SETTINGS_PEOPLE_ENABLE_SCREENLOCK" desc="The text on the checkbox to enable screenlocker for current user."> 2265 <message name="IDS_SETTINGS_PEOPLE_ENABLE_SCREENLOCK" desc="The text on the checkbox to enable screenlocker for current user.">
2266 Show lock screen when waking from sleep 2266 Show lock screen when waking from sleep
2267 </message> 2267 </message>
2268 <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_HIGH_SECURITY" desc="Text on the lock screen which indicates an unlock method is high security.">
2269 High security
2270 </message>
2271 <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_MEDIUM_SECURITY" desc="Text o n the lock screen which indicates an unlock method is medium security.">
2272 Medium security
2273 </message>
2268 <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_TITLE" desc="Text on the peop le page which opens up the quick unlock subpage and the title of the quick unloc k subpage."> 2274 <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_TITLE" desc="Text on the peop le page which opens up the quick unlock subpage and the title of the quick unloc k subpage.">
2269 Screen lock 2275 Screen lock
2270 </message> 2276 </message>
2271 <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PASSWORD_ONLY" desc="Only the account password can be used to unlock the device."> 2277 <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PASSWORD_ONLY" desc="Only the account password can be used to unlock the device.">
2272 Password only 2278 Password only
2273 </message> 2279 </message>
2274 <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PIN_OR_PASSWORD" desc="The ac count password or a custom PIN can be used to unlock the device."> 2280 <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PIN_OR_PASSWORD" desc="The ac count password or a custom PIN can be used to unlock the device.">
2275 PIN or password 2281 PIN or password
2276 </message> 2282 </message>
2277 <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NONE" desc="Text on the peopl e page which opens up the quick unlock subpage and the title of the quick unlock subpage."> 2283 <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NONE" desc="Text on the peopl e page which opens up the quick unlock subpage and the title of the quick unlock subpage.">
(...skipping 699 matching lines...) Expand 10 before | Expand all | Expand 10 after
2977 System 2983 System
2978 </message> 2984 </message>
2979 <message name="IDS_SETTINGS_SYSTEM_HARDWARE_ACCELERATION_LABEL" desc="Label for the checkbox that forces Chrome to render via hardware acceleration (GPU) wh en available."> 2985 <message name="IDS_SETTINGS_SYSTEM_HARDWARE_ACCELERATION_LABEL" desc="Label for the checkbox that forces Chrome to render via hardware acceleration (GPU) wh en available.">
2980 Use hardware acceleration when available 2986 Use hardware acceleration when available
2981 </message> 2987 </message>
2982 <message name="IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_LABEL" desc="Label for the control that opens a user's network proxy settings."> 2988 <message name="IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_LABEL" desc="Label for the control that opens a user's network proxy settings.">
2983 Open proxy settings 2989 Open proxy settings
2984 </message> 2990 </message>
2985 </if> 2991 </if>
2986 </grit-part> 2992 </grit-part>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/people_page/lock_screen.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698