| OLD | NEW |
| 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 2322 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2333 </message> | 2333 </message> |
| 2334 <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."> | 2334 <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."> |
| 2335 PINs do not match | 2335 PINs do not match |
| 2336 </message> | 2336 </message> |
| 2337 <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."> | 2337 <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."> |
| 2338 Continue | 2338 Continue |
| 2339 </message> | 2339 </message> |
| 2340 <message name="IDS_SETTINGS_PEOPLE_ENABLE_SCREENLOCK" desc="The text on the
checkbox to enable screenlocker for current user."> | 2340 <message name="IDS_SETTINGS_PEOPLE_ENABLE_SCREENLOCK" desc="The text on the
checkbox to enable screenlocker for current user."> |
| 2341 Show lock screen when waking from sleep | 2341 Show lock screen when waking from sleep |
| 2342 </message> | 2342 </message> |
| 2343 <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_HIGH_SECURITY" desc="Text on
the lock screen which indicates an unlock method is high security."> | |
| 2344 High security | |
| 2345 </message> | |
| 2346 <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_MEDIUM_SECURITY" desc="Text o
n the lock screen which indicates an unlock method is medium security."> | |
| 2347 Medium security | |
| 2348 </message> | |
| 2349 <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."> | 2343 <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."> |
| 2350 Screen lock | 2344 Screen lock |
| 2351 </message> | 2345 </message> |
| 2352 <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_OPTIONS" desc="Text on the lo
ck screen which is the subheader for the screen locking options."> | 2346 <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_OPTIONS" desc="Text on the lo
ck screen which is the subheader for the screen locking options."> |
| 2353 Screen lock options | 2347 Screen lock options |
| 2354 </message> | 2348 </message> |
| 2355 <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PASSWORD_ONLY" desc="Only the
account password can be used to unlock the device."> | 2349 <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PASSWORD_ONLY" desc="Only the
account password can be used to unlock the device."> |
| 2356 Password only | 2350 Password only |
| 2357 </message> | 2351 </message> |
| 2358 <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."> | 2352 <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."> |
| (...skipping 708 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3067 System | 3061 System |
| 3068 </message> | 3062 </message> |
| 3069 <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."> | 3063 <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."> |
| 3070 Use hardware acceleration when available | 3064 Use hardware acceleration when available |
| 3071 </message> | 3065 </message> |
| 3072 <message name="IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_LABEL" desc="Label for the
control that opens a user's network proxy settings."> | 3066 <message name="IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_LABEL" desc="Label for the
control that opens a user's network proxy settings."> |
| 3073 Open proxy settings | 3067 Open proxy settings |
| 3074 </message> | 3068 </message> |
| 3075 </if> | 3069 </if> |
| 3076 </grit-part> | 3070 </grit-part> |
| OLD | NEW |