Chromium Code Reviews| 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 <!-- About Page --> | 4 <!-- About Page --> |
| 5 <if expr="chromeos"> | 5 <if expr="chromeos"> |
| 6 <message name="IDS_SETTINGS_ABOUT_PAGE_CHECK_FOR_UPDATES" desc="The button l abel to check for updates and apply (download and install) if found"> | 6 <message name="IDS_SETTINGS_ABOUT_PAGE_CHECK_FOR_UPDATES" desc="The button l abel to check for updates and apply (download and install) if found"> |
| 7 Check for updates | 7 Check for updates |
| 8 </message> | 8 </message> |
| 9 <message name="IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL_STABLE" desc="The sta ble label in the message about current channel."> | 9 <message name="IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL_STABLE" desc="The sta ble label in the message about current channel."> |
| 10 stable | 10 stable |
| (...skipping 1171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1182 </message> | 1182 </message> |
| 1183 <message name="IDS_SETTINGS_PEOPLE_QUICK_UNLOCK_CHOOSE_UNLOCK_METHOD" desc=" Text below the page title that tells the user to select a method to unlock the d evice. This is *only* for unlocking a device; it cannot be used to sign into a d evice."> | 1183 <message name="IDS_SETTINGS_PEOPLE_QUICK_UNLOCK_CHOOSE_UNLOCK_METHOD" desc=" Text below the page title that tells the user to select a method to unlock the d evice. This is *only* for unlocking a device; it cannot be used to sign into a d evice."> |
| 1184 Choose the method you would like to use to log back in to your account: | 1184 Choose the method you would like to use to log back in to your account: |
| 1185 </message> | 1185 </message> |
| 1186 <message name="IDS_SETTINGS_PEOPLE_QUICK_UNLOCK_UNLOCK_METHOD_PASSWORD" desc ="Only the account password can be used to unlock the device."> | 1186 <message name="IDS_SETTINGS_PEOPLE_QUICK_UNLOCK_UNLOCK_METHOD_PASSWORD" desc ="Only the account password can be used to unlock the device."> |
| 1187 Only password | 1187 Only password |
| 1188 </message> | 1188 </message> |
| 1189 <message name="IDS_SETTINGS_PEOPLE_QUICK_UNLOCK_UNLOCK_METHOD_PIN_AND_PASSWO RD" desc="The account password or a custom PIN can be used to unlock the device. "> | 1189 <message name="IDS_SETTINGS_PEOPLE_QUICK_UNLOCK_UNLOCK_METHOD_PIN_AND_PASSWO RD" desc="The account password or a custom PIN can be used to unlock the device. "> |
| 1190 PIN or password | 1190 PIN or password |
| 1191 </message> | 1191 </message> |
| 1192 <message name="IDS_SETTINGS_PEOPLE_QUICK_UNLOCK_ENTER_PIN_OR_PASSWORD_PLACEH OLDER" desc="Placeholder for input box before PIN is entered."> | |
| 1193 Enter PIN | |
|
jdufault
2016/06/28 21:13:22
Merge these strings with the ones in generated_res
| |
| 1194 </message> | |
| 1195 <message name="IDS_SETTINGS_PEOPLE_QUICK_UNLOCK_PIN_KEYBOARD_CLEAR" desc="Th e text of the button on the pin keyboard used to delete last character of entere d PIN."> | |
| 1196 Clear | |
| 1197 </message> | |
| 1192 <message name="IDS_SETTINGS_PEOPLE_QUICK_UNLOCK_UNLOCK_METHOD_NONE" desc="Af ter the device resumes, there will not be a lock screen and no password of any t ype will be required."> | 1198 <message name="IDS_SETTINGS_PEOPLE_QUICK_UNLOCK_UNLOCK_METHOD_NONE" desc="Af ter the device resumes, there will not be a lock screen and no password of any t ype will be required."> |
| 1193 None | 1199 None |
| 1194 </message> | 1200 </message> |
| 1195 <message name="IDS_SETTINGS_PEOPLE_QUICK_UNLOCK_CONFIGURE_PIN_BUTTON" desc=" Button that is only shown when the user has selected PIN as their unlock method. This button opens up the configuration flow where the user selects the PIN they would like to use."> | 1201 <message name="IDS_SETTINGS_PEOPLE_QUICK_UNLOCK_CONFIGURE_PIN_BUTTON" desc=" Button that is only shown when the user has selected PIN as their unlock method. This button opens up the configuration flow where the user selects the PIN they would like to use."> |
| 1196 Configure PIN | 1202 Configure PIN |
| 1197 </message> | 1203 </message> |
| 1198 <message name="IDS_SETTINGS_PEOPLE_QUICK_UNLOCK_CONFIGURE_PIN_CHOOSE_PIN_TIT LE" desc="Message shown below the title that tells the user to enter the initial PIN."> | 1204 <message name="IDS_SETTINGS_PEOPLE_QUICK_UNLOCK_CONFIGURE_PIN_CHOOSE_PIN_TIT LE" desc="Message shown below the title that tells the user to enter the initial PIN."> |
| 1199 Choose your PIN: | 1205 Choose your PIN: |
| 1200 </message> | 1206 </message> |
| 1201 <message name="IDS_SETTINGS_PEOPLE_QUICK_UNLOCK_CONFIGURE_PIN_CHOOSE_PIN_WEA K_PIN_WARNING" desc="Message shown below the title that warns the user they have entered a PIN that is easy to guess."> | 1207 <message name="IDS_SETTINGS_PEOPLE_QUICK_UNLOCK_CONFIGURE_PIN_CHOOSE_PIN_WEA K_PIN_WARNING" desc="Message shown below the title that warns the user they have entered a PIN that is easy to guess."> |
| (...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1630 System | 1636 System |
| 1631 </message> | 1637 </message> |
| 1632 <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."> | 1638 <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."> |
| 1633 Use hardware acceleration when available | 1639 Use hardware acceleration when available |
| 1634 </message> | 1640 </message> |
| 1635 <message name="IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_BUTTON" desc="Text for the button that changes a user's network proxy settings."> | 1641 <message name="IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_BUTTON" desc="Text for the button that changes a user's network proxy settings."> |
| 1636 Change proxy settings | 1642 Change proxy settings |
| 1637 </message> | 1643 </message> |
| 1638 </if> | 1644 </if> |
| 1639 </grit-part> | 1645 </grit-part> |
| OLD | NEW |