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

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

Issue 8480037: Controlled settings indicator and bubble for chrome://preferences. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address James' feedback. Created 9 years 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/app/theme/controlled_setting_extension.png » ('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 <!-- 3 <!--
4 This file contains definitions of resources that will be translated for each 4 This file contains definitions of resources that will be translated for each
5 locale. The variables is_win, is_macosx, is_linux, and is_posix are available 5 locale. The variables is_win, is_macosx, is_linux, and is_posix are available
6 for making strings OS specific. Other platform defines such as use_titlecase 6 for making strings OS specific. Other platform defines such as use_titlecase
7 are declared in build/common.gypi. 7 are declared in build/common.gypi.
8 --> 8 -->
9 9
10 <grit base_dir="." latest_public_release="0" current_release="1" 10 <grit base_dir="." latest_public_release="0" current_release="1"
(...skipping 8548 matching lines...) Expand 10 before | Expand all | Expand 10 after
8559 </if> 8559 </if>
8560 <if expr="pp_ifdef('use_titlecase')"> 8560 <if expr="pp_ifdef('use_titlecase')">
8561 <message name="IDS_OPTIONS_BROWSING_DATA_GROUP_NAME" desc="In Title Case : The title of the 'Browsing data' group."> 8561 <message name="IDS_OPTIONS_BROWSING_DATA_GROUP_NAME" desc="In Title Case : The title of the 'Browsing data' group.">
8562 Browsing Data 8562 Browsing Data
8563 </message> 8563 </message>
8564 <message name="IDS_OPTIONS_IMPORT_DATA_BUTTON" desc="In Title Case: Labe l for the import data button."> 8564 <message name="IDS_OPTIONS_IMPORT_DATA_BUTTON" desc="In Title Case: Labe l for the import data button.">
8565 Import Data from Another Browser... 8565 Import Data from Another Browser...
8566 </message> 8566 </message>
8567 </if> 8567 </if>
8568 8568
8569 <message name="IDS_OPTIONS_CONTROLLED_SETTING_APPLY_RECOMMENDATION" desc=" Link text displayed in the controlled settings bubble for applying the recommend ation.">
8570 Apply recommendation
8571 </message>
8572
8569 <if expr="pp_ifdef('chromeos')"> 8573 <if expr="pp_ifdef('chromeos')">
8570 <message name="IDS_OPTIONS_POLICY_MANAGED_PREFS" desc="Banner displayed in case there are policy-managed options the user won't be able to change."> 8574 <message name="IDS_OPTIONS_POLICY_MANAGED_PREFS" desc="Banner displayed in case there are policy-managed options the user won't be able to change.">
8571 Some settings are being managed by your administrator. 8575 Some settings are managed by your administrator.
8572 </message> 8576 </message>
8573 <message name="IDS_OPTIONS_EXTENSION_MANAGED_PREFS" desc="Banner display ed in case there are extension-managed options the user won't be able to change. "> 8577 <message name="IDS_OPTIONS_EXTENSION_MANAGED_PREFS" desc="Banner display ed in case there are extension-managed options the user won't be able to change. ">
8574 Some settings are being managed by an extension. 8578 Some settings are managed by an extension.
8575 </message> 8579 </message>
8576 <message name="IDS_OPTIONS_POLICY_EXTENSION_MANAGED_PREFS" desc="Banner displayed in case there are policy- and extension-managed options the user won't be able to change."> 8580 <message name="IDS_OPTIONS_POLICY_EXTENSION_MANAGED_PREFS" desc="Banner displayed in case there are policy- and extension-managed options the user won't be able to change.">
8577 Some settings have been disabled by your administrator and others are being managed by an extension. 8581 Some settings have been disabled by your administrator and others are managed by an extension.
8578 </message> 8582 </message>
8579 <message name="IDS_OPTIONS_UNMODIFIABLE_PREFS" desc="Banner displayed in case there are options that the user won't be able to change."> 8583 <message name="IDS_OPTIONS_UNMODIFIABLE_PREFS" desc="Banner displayed in case there are options that the user won't be able to change.">
8580 Some settings cannot be modified by the user. 8584 Some settings cannot be modified by the user.
8581 </message> 8585 </message>
8586 <message name="IDS_OPTIONS_CONTROLLED_SETTING_POLICY" desc="Text display ed in the controlled settings bubble in case the setting is forced by policy.">
8587 This setting is enforced by your administrator.
8588 </message>
8589 <message name="IDS_OPTIONS_CONTROLLED_SETTING_EXTENSION" desc="Text disp layed in the controlled settings bubble in case the setting controlled by an ext ension.">
8590 This setting is managed by an extension.
8591 </message>
8592 <message name="IDS_OPTIONS_CONTROLLED_SETTING_RECOMMENDED" desc="Text di splayed in the controlled settings bubble in case the setting has a policy-suppl ied default value.">
8593 Your administrator recommends a specific value for this setting.
8594 </message>
8582 </if> 8595 </if>
8583 <if expr="not pp_ifdef('chromeos') and is_posix"> 8596 <if expr="not pp_ifdef('chromeos') and is_posix">
8584 <message name="IDS_OPTIONS_POLICY_MANAGED_PREFS" desc="Banner displayed in case there are policy-managed options the user won't be able to change."> 8597 <message name="IDS_OPTIONS_POLICY_MANAGED_PREFS" desc="Banner displayed in case there are policy-managed options the user won't be able to change.">
8585 Some preferences have been disabled by your administrator. 8598 Some preferences are managed by your administrator.
8586 </message> 8599 </message>
8587 <message name="IDS_OPTIONS_EXTENSION_MANAGED_PREFS" desc="Banner display ed in case there are extension-managed options the user won't be able to change. "> 8600 <message name="IDS_OPTIONS_EXTENSION_MANAGED_PREFS" desc="Banner display ed in case there are extension-managed options the user won't be able to change. ">
8588 Some preferences are being managed by an extension. 8601 Some preferences are managed by an extension.
8589 </message> 8602 </message>
8590 <message name="IDS_OPTIONS_POLICY_EXTENSION_MANAGED_PREFS" desc="Banner displayed in case there are policy- and extension-managed options the user won't be able to change."> 8603 <message name="IDS_OPTIONS_POLICY_EXTENSION_MANAGED_PREFS" desc="Banner displayed in case there are policy- and extension-managed options the user won't be able to change.">
8591 Some preferences have been disabled by your administrator and others a re being managed by an extension. 8604 Some preferences have been disabled by your administrator and others a re managed by an extension.
8605 </message>
8606 <message name="IDS_OPTIONS_CONTROLLED_SETTING_POLICY" desc="Text display ed in the controlled settings bubble in case the setting is forced by policy.">
8607 This preference is enforced by your administrator.
8608 </message>
8609 <message name="IDS_OPTIONS_CONTROLLED_SETTING_EXTENSION" desc="Text disp layed in the controlled settings bubble in case the setting controlled by an ext ension.">
8610 This preference is managed by an extension.
8611 </message>
8612 <message name="IDS_OPTIONS_CONTROLLED_SETTING_RECOMMENDED" desc="Text di splayed in the controlled settings bubble in case the setting has a policy-suppl ied default value.">
8613 Your administrator recommends a specific value for this preference.
8592 </message> 8614 </message>
8593 </if> 8615 </if>
8594 <if expr="is_win"> 8616 <if expr="is_win">
8595 <message name="IDS_OPTIONS_POLICY_MANAGED_PREFS" desc="Banner displayed in case there are policy-managed options the user won't be able to change."> 8617 <message name="IDS_OPTIONS_POLICY_MANAGED_PREFS" desc="Banner displayed in case there are policy-managed options the user won't be able to change.">
8596 Some options have been disabled by your administrator. 8618 Some options are managed by your administrator.
8597 </message> 8619 </message>
8598 <message name="IDS_OPTIONS_EXTENSION_MANAGED_PREFS" desc="Banner display ed in case there are extension-managed options the user won't be able to change. "> 8620 <message name="IDS_OPTIONS_EXTENSION_MANAGED_PREFS" desc="Banner display ed in case there are extension-managed options the user won't be able to change. ">
8599 Some options are being managed by an extension. 8621 Some options are managed by an extension.
8600 </message> 8622 </message>
8601 <message name="IDS_OPTIONS_POLICY_EXTENSION_MANAGED_PREFS" desc="Banner displayed in case there are policy- and extension-managed options the user won't be able to change."> 8623 <message name="IDS_OPTIONS_POLICY_EXTENSION_MANAGED_PREFS" desc="Banner displayed in case there are policy- and extension-managed options the user won't be able to change.">
8602 Some options have been disabled by your administrator and others are b eing managed by an extension. 8624 Some options have been disabled by your administrator and others are m anaged by an extension.
8625 </message>
8626 <message name="IDS_OPTIONS_CONTROLLED_SETTING_POLICY" desc="Text display ed in the controlled settings bubble in case the setting is forced by policy.">
8627 This option is enforced by your administrator.
8628 </message>
8629 <message name="IDS_OPTIONS_CONTROLLED_SETTING_EXTENSION" desc="Text disp layed in the controlled settings bubble in case the setting controlled by an ext ension.">
8630 This option is managed by an extension.
8631 </message>
8632 <message name="IDS_OPTIONS_CONTROLLED_SETTING_RECOMMENDED" desc="Text di splayed in the controlled settings bubble in case the setting has a policy-suppl ied default value.">
8633 Your administrator recommends a specific value for this option.
8603 </message> 8634 </message>
8604 </if> 8635 </if>
8605 8636
8606 <!-- Options search page strings. --> 8637 <!-- Options search page strings. -->
8607 <message name="IDS_OPTIONS_SEARCH_PAGE_TITLE" desc="Title of the settings search page."> 8638 <message name="IDS_OPTIONS_SEARCH_PAGE_TITLE" desc="Title of the settings search page.">
8608 Search Results 8639 Search Results
8609 </message> 8640 </message>
8610 <message name="IDS_OPTIONS_SEARCH_PAGE_NO_MATCHES" desc="Text description of a search that has no results."> 8641 <message name="IDS_OPTIONS_SEARCH_PAGE_NO_MATCHES" desc="Text description of a search that has no results.">
8611 No matches were found. 8642 No matches were found.
8612 </message> 8643 </message>
(...skipping 6083 matching lines...) Expand 10 before | Expand all | Expand 10 after
14696 </messages> 14727 </messages>
14697 <structures fallback_to_english="true"> 14728 <structures fallback_to_english="true">
14698 <!-- Make sure these stay in sync with the structures in generated_resourc es.grd. --> 14729 <!-- Make sure these stay in sync with the structures in generated_resourc es.grd. -->
14699 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" > 14730 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" >
14700 </structure> 14731 </structure>
14701 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" > 14732 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" >
14702 </structure> 14733 </structure>
14703 </structures> 14734 </structures>
14704 </release> 14735 </release>
14705 </grit> 14736 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/app/theme/controlled_setting_extension.png » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698