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

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

Issue 2088913002: Add strings needed for the PIN unlock section in md-settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Created 4 years, 6 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/ui/webui/settings/md_settings_localized_strings_provider.cc » ('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 <!-- 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 1129 matching lines...) Expand 10 before | Expand all | Expand 10 after
1140 Manage other people 1140 Manage other people
1141 </message> 1141 </message>
1142 <message name="IDS_SETTINGS_PEOPLE_MANAGE_SUPERVISED_USERS" desc="Label for th e button that opens the supervised users dashboard."> 1142 <message name="IDS_SETTINGS_PEOPLE_MANAGE_SUPERVISED_USERS" desc="Label for th e button that opens the supervised users dashboard.">
1143 Manage supervised users 1143 Manage supervised users
1144 </message> 1144 </message>
1145 1145
1146 <if expr="chromeos"> 1146 <if expr="chromeos">
1147 <message name="IDS_SETTINGS_PEOPLE_ENABLE_SCREENLOCK" desc="The text on the checkbox to enable screenlocker for current user."> 1147 <message name="IDS_SETTINGS_PEOPLE_ENABLE_SCREENLOCK" desc="The text on the checkbox to enable screenlocker for current user.">
1148 Require password to wake from sleep 1148 Require password to wake from sleep
1149 </message> 1149 </message>
1150 <message name="IDS_SETTINGS_QUICK_UNLOCK_TITLE" desc="Text on the people pag e which opens up the quick unlock subpage.">
1151 Configure quick unlock
1152 </message>
1153 <message name="IDS_SETTINGS_QUICK_UNLOCK_PAGE_TITLE" desc="The title of the quick unlock subpage.">
tommycli 2016/06/21 20:26:06 These two messages look identical, and should just
jdufault 2016/06/22 22:59:18 Done.
1154 Configure quick unlock
1155 </message>
1156 <message name="IDS_SETTINGS_QUICK_UNLOCK_CONFIRM_LOGIN" desc="Text above a p assword input field that tells the user they need to submit their password to co nfigure these settings.">
tommycli 2016/06/21 20:26:06 In fact all of these should probably be IDS_SETTIN
jdufault 2016/06/22 22:59:18 Done.
1157 Confirm your login to continue
1158 </message>
1159 <message name="IDS_SETTINGS_QUICK_UNLOCK_PASSWORD_LABEL" desc="An input box label that tells the user to enter their password in that input box.">
1160 Password
1161 </message>
1162 <message name="IDS_SETTINGS_QUICK_UNLOCK_INVALID_PASSWORD" desc="Text on a p assword field that tells the user the password is incorrect.">
1163 Not valid
1164 </message>
1165 <message name="IDS_SETTINGS_QUICK_UNLOCK_CHOOSE_UNLOCK_METHOD" desc="Text be low the page title that tells the user to select a method to unlock the device. This is *only* for unlocking a device; it cannot be used to sign into a device." >
1166 Choose the method you would like to use to log back in to your account:
1167 </message>
1168 <message name="IDS_SETTINGS_QUICK_UNLOCK_UNLOCK_METHOD_PASSWORD" desc="Only the account password can be used to unlock the device.">
1169 Only password
1170 </message>
1171 <message name="IDS_SETTINGS_QUICK_UNLOCK_UNLOCK_METHOD_PIN_AND_PASSWORD" des c="The account password or a custom PIN can be used to unlock the device.">
1172 PIN or password
1173 </message>
1174 <message name="IDS_SETTINGS_QUICK_UNLOCK_UNLOCK_METHOD_NONE" desc="After the device resumes, there will not be a lock screen and no password of any type wil l be required.">
1175 None
tommycli 2016/06/21 20:26:06 This is fine for this CL, but "None" seems to be a
jdufault 2016/06/22 22:59:18 Leaving this for now, we can adjust strings later
1176 </message>
1177 <message name="IDS_SETTINGS_QUICK_UNLOCK_PIN_DISCLAIMER" desc="Informs the u ser of the security tradeoffs between PIN and password.">
1178 Disclaimer about how PIN is less secure than password.
tommycli 2016/06/21 20:26:06 If the text isn't actually ready, I'd rather not p
jdufault 2016/06/22 22:59:18 That sounds reasonable.
1179 </message>
1180 <message name="IDS_SETTINGS_QUICK_UNLOCK_CONFIGURE_PIN_BUTTON" desc="Button that is only shown when the user has selected PIN as their unlock method. This b utton opens up the configuration flow where the user selects the PIN they would like to use.">
tommycli 2016/06/21 20:26:07 These descriptions of the messages are awesome. Ma
1181 Configure PIN
1182 </message>
1183 <message name="IDS_SETTINGS_QUICK_UNLOCK_CONFIGURE_PIN_CHOOSE_PIN_TITLE" des c="Message shown below the title that tells the user to enter the initial PIN.">
1184 Choose your PIN:
1185 </message>
1186 <message name="IDS_SETTINGS_QUICK_UNLOCK_CONFIGURE_PIN_CHOOSE_PIN_WEAK_PIN_W ARNING" desc="Message shown below the title that warns the user they have entere d a PIN that is easy to guess.">
1187 This PIN is easy to guess.
1188 </message>
1189 <message name="IDS_SETTINGS_QUICK_UNLOCK_CONFIGURE_PIN_CONTINUE_BUTTON" desc ="A button that accepts the users initial PIN. The user will have to enter the P IN again after hitting this button to confirm that they entered it correctly.">
1190 Continue
1191 </message>
1192 <message name="IDS_SETTINGS_QUICK_UNLOCK_CONFIGURE_PIN_CONFIRM_PIN_TITLE" de sc="Message shown below the title that tells the user to confirm their initial P IN entry.">
1193 Confirm your PIN:
1194 </message>
1195 <message name="IDS_SETTINGS_QUICK_UNLOCK_CONFIGURE_PIN_MISMATCHED_PINS" desc ="Message shown below the title that tells the user they have entered two differ ent PIN values.">
1196 PIN's don't match:
tommycli 2016/06/21 20:26:06 Should be a period at the end right? Also does th
jdufault 2016/06/22 22:59:18 The problem messages seem to all end in ':'.
1197 </message>
1198 <message name="IDS_SETTINGS_QUICK_UNLOCK_CONFIGURE_PIN_BACK_BUTTON" desc="Bu tton that goes from the confirm PIN screen to the initial PIN setup screen.">
1199 Back
1200 </message>
1201 <message name="IDS_SETTINGS_QUICK_UNLOCK_CONFIGURE_PIN_SAVE_BUTTON" desc="Bu tton that saves the new PIN the user has entered.">
1202 Save
tommycli 2016/06/21 20:26:06 "Save" is already in the "common strings" section
jdufault 2016/06/22 22:59:18 Done.
1203 </message>
1150 <message name="IDS_SETTINGS_CHANGE_PICTURE_DIALOG_TITLE" desc="Title of the subpage shown when user wants to change his/her picture."> 1204 <message name="IDS_SETTINGS_CHANGE_PICTURE_DIALOG_TITLE" desc="Title of the subpage shown when user wants to change his/her picture.">
1151 Change picture 1205 Change picture
1152 </message> 1206 </message>
1153 <message name="IDS_SETTINGS_CHANGE_PICTURE_DIALOG_TEXT" desc="Text with desc ription of what to do on Change picture subpage."> 1207 <message name="IDS_SETTINGS_CHANGE_PICTURE_DIALOG_TEXT" desc="Text with desc ription of what to do on Change picture subpage.">
1154 Choose a picture to display for your account on the sign-in screen. 1208 Choose a picture to display for your account on the sign-in screen.
1155 </message> 1209 </message>
1156 <message name="IDS_SETTINGS_CHANGE_PICTURE_CHOOSE_FILE" desc="Text on a butt on that shows file dialog to choose a picture from file."> 1210 <message name="IDS_SETTINGS_CHANGE_PICTURE_CHOOSE_FILE" desc="Text on a butt on that shows file dialog to choose a picture from file.">
1157 Choose a file 1211 Choose a file
1158 </message> 1212 </message>
1159 <message name="IDS_SETTINGS_CHANGE_PICTURE_TAKE_PHOTO" desc="The text on the button to take photo of the current user."> 1213 <message name="IDS_SETTINGS_CHANGE_PICTURE_TAKE_PHOTO" desc="The text on the button to take photo of the current user.">
(...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after
1561 System 1615 System
1562 </message> 1616 </message>
1563 <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."> 1617 <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.">
1564 Use hardware acceleration when available 1618 Use hardware acceleration when available
1565 </message> 1619 </message>
1566 <message name="IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_BUTTON" desc="Text for the button that changes a user's network proxy settings."> 1620 <message name="IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_BUTTON" desc="Text for the button that changes a user's network proxy settings.">
1567 Change proxy settings 1621 Change proxy settings
1568 </message> 1622 </message>
1569 </if> 1623 </if>
1570 </grit-part> 1624 </grit-part>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698