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

Side by Side Diff: chrome/app/generated_resources.grd

Issue 3532010: Add a pref checkbox to enable/disable screen lock for ChromeOs. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: firx chromeos trybot 2, set expectations Created 10 years, 2 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/chromeos/cros/cros_mock.h » ('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 2
3 <!-- This file contains definitions of resources that will be translated for 3 <!-- This file contains definitions of resources that will be translated for
4 each locale. --> 4 each locale. -->
5 5
6 <grit base_dir="." latest_public_release="0" current_release="1" 6 <grit base_dir="." latest_public_release="0" current_release="1"
7 source_lang_id="en" enc_check="möl"> 7 source_lang_id="en" enc_check="möl">
8 <outputs> 8 <outputs>
9 <output filename="grit/generated_resources.h" type="rc_header"> 9 <output filename="grit/generated_resources.h" type="rc_header">
10 <emit emit_type='prepend'></emit> 10 <emit emit_type='prepend'></emit>
(...skipping 8646 matching lines...) Expand 10 before | Expand all | Expand 10 after
8657 </message> 8657 </message>
8658 <message name="IDS_OPTIONS_ACCOUNTS_USERNAME_EDIT_HINT" desc="In the Accou nts settings tab, the instruction text on an empty username edit."> 8658 <message name="IDS_OPTIONS_ACCOUNTS_USERNAME_EDIT_HINT" desc="In the Accou nts settings tab, the instruction text on an empty username edit.">
8659 Enter names or addresses. 8659 Enter names or addresses.
8660 </message> 8660 </message>
8661 <message name="IDS_OPTIONS_ACCOUNTS_USERNAME_FORMAT" desc="In the Accounts settings tab, the text format to create user name and owner tag."> 8661 <message name="IDS_OPTIONS_ACCOUNTS_USERNAME_FORMAT" desc="In the Accounts settings tab, the text format to create user name and owner tag.">
8662 <ph name="NAME">$1<ex>John Doe</ex></ph> - Owner 8662 <ph name="NAME">$1<ex>John Doe</ex></ph> - Owner
8663 </message> 8663 </message>
8664 <message name="IDS_OPTIONS_ACCOUNTS_ADD_USERS" desc="In the Accounts setti ngs tab, the label text above the user name edit box."> 8664 <message name="IDS_OPTIONS_ACCOUNTS_ADD_USERS" desc="In the Accounts setti ngs tab, the label text above the user name edit box.">
8665 Add users 8665 Add users
8666 </message> 8666 </message>
8667 <message name="IDS_OPTIONS_PERSONAL_ACCOUNT_GROUP_NAME" desc="In the Perso nal Stuff settings tab, the title text for Account section.">
8668 Account
8669 </message>
8670 <message name="IDS_OPTIONS_ENABLE_SCREENLOCKER_CHECKBOX" desc="In the Pers onal Stuff settings tab, the text on the checkbox to enable screenlocker for cur rent user.">
8671 Require password to wake from sleep
8672 </message>
8667 <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_NETWORK_ID" desc="In settings internet options, the label for the network id."> 8673 <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_NETWORK_ID" desc="In settings internet options, the label for the network id.">
8668 Network id: 8674 Network id:
8669 </message> 8675 </message>
8670 <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_IDENTITY" desc=" In settings internet options, the user identity for authentication."> 8676 <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_IDENTITY" desc=" In settings internet options, the user identity for authentication.">
8671 Identity: 8677 Identity:
8672 </message> 8678 </message>
8673 <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT" desc="In settin gs internet options, the x509 certificate to use."> 8679 <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT" desc="In settin gs internet options, the x509 certificate to use.">
8674 Certificate: 8680 Certificate:
8675 </message> 8681 </message>
8676 <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_BUTTON" desc="In settings internet options, the prompt on the certificate-selection button."> 8682 <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_BUTTON" desc="In settings internet options, the prompt on the certificate-selection button.">
(...skipping 1303 matching lines...) Expand 10 before | Expand all | Expand 10 after
9980 9986
9981 </messages> 9987 </messages>
9982 9988
9983 <structures fallback_to_english="true"> 9989 <structures fallback_to_english="true">
9984 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" > 9990 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" >
9985 </structure> 9991 </structure>
9986 </structures> 9992 </structures>
9987 9993
9988 </release> 9994 </release>
9989 </grit> 9995 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/cros/cros_mock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698