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

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: Now with a proper controlledBy property. Created 9 years, 1 month 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
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 8506 matching lines...) Expand 10 before | Expand all | Expand 10 after
8517 </if> 8517 </if>
8518 <if expr="pp_ifdef('use_titlecase')"> 8518 <if expr="pp_ifdef('use_titlecase')">
8519 <message name="IDS_OPTIONS_BROWSING_DATA_GROUP_NAME" desc="In Title Case : The title of the 'Browsing data' group."> 8519 <message name="IDS_OPTIONS_BROWSING_DATA_GROUP_NAME" desc="In Title Case : The title of the 'Browsing data' group.">
8520 Browsing Data 8520 Browsing Data
8521 </message> 8521 </message>
8522 <message name="IDS_OPTIONS_IMPORT_DATA_BUTTON" desc="In Title Case: Labe l for the import data button."> 8522 <message name="IDS_OPTIONS_IMPORT_DATA_BUTTON" desc="In Title Case: Labe l for the import data button.">
8523 Import Data from Another Browser... 8523 Import Data from Another Browser...
8524 </message> 8524 </message>
8525 </if> 8525 </if>
8526 8526
8527 <message name="IDS_OPTIONS_CONTROLLED_SETTING_APPLY_RECOMMENDATION" desc=" Link text displayed in the controlled settings bubble for applying the recommend ation.">
8528 Apply recommendation
8529 </message>
8530
8527 <if expr="pp_ifdef('chromeos')"> 8531 <if expr="pp_ifdef('chromeos')">
8528 <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."> 8532 <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.">
8529 Some settings are being managed by your administrator. 8533 Some settings are managed by your administrator.
8530 </message> 8534 </message>
8531 <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. "> 8535 <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. ">
8532 Some settings are being managed by an extension. 8536 Some settings are managed by an extension.
8533 </message> 8537 </message>
8534 <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."> 8538 <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.">
8535 Some settings have been disabled by your administrator and others are being managed by an extension. 8539 Some settings have been disabled by your administrator and others are managed by an extension.
8536 </message> 8540 </message>
8537 <message name="IDS_OPTIONS_UNMODIFIABLE_PREFS" desc="Banner displayed in case there are options that the user won't be able to change."> 8541 <message name="IDS_OPTIONS_UNMODIFIABLE_PREFS" desc="Banner displayed in case there are options that the user won't be able to change.">
8538 Some settings cannot be modified by the user. 8542 Some settings cannot be modified by the user.
8539 </message> 8543 </message>
8544 <message name="IDS_OPTIONS_CONTROLLED_SETTING_POLICY" desc="Text display ed in the controlled settings bubble in case the setting is forced by policy.">
8545 This setting is enforced by your administrator.
8546 </message>
8547 <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.">
8548 This setting is managed by an extension.
8549 </message>
8550 <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.">
8551 Your administrator recommends a specific value for this setting.
8552 </message>
8540 </if> 8553 </if>
8541 <if expr="not pp_ifdef('chromeos') and is_posix"> 8554 <if expr="not pp_ifdef('chromeos') and is_posix">
8542 <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."> 8555 <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.">
8543 Some preferences have been disabled by your administrator. 8556 Some preferences are managed by your administrator.
8544 </message> 8557 </message>
8545 <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. "> 8558 <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. ">
8546 Some preferences are being managed by an extension. 8559 Some preferences are managed by an extension.
8547 </message> 8560 </message>
8548 <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."> 8561 <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.">
8549 Some preferences have been disabled by your administrator and others a re being managed by an extension. 8562 Some preferences have been disabled by your administrator and others a re managed by an extension.
8563 </message>
8564 <message name="IDS_OPTIONS_CONTROLLED_SETTING_POLICY" desc="Text display ed in the controlled settings bubble in case the setting is forced by policy.">
8565 This preference is enforced by your administrator.
8566 </message>
8567 <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.">
8568 This preference is managed by an extension.
8569 </message>
8570 <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.">
8571 Your administrator recommends a specific value for this preference.
8550 </message> 8572 </message>
8551 </if> 8573 </if>
8552 <if expr="is_win"> 8574 <if expr="is_win">
8553 <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."> 8575 <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.">
8554 Some options have been disabled by your administrator. 8576 Some options are managed by your administrator.
8555 </message> 8577 </message>
8556 <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. "> 8578 <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. ">
8557 Some options are being managed by an extension. 8579 Some options are managed by an extension.
8558 </message> 8580 </message>
8559 <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."> 8581 <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.">
8560 Some options have been disabled by your administrator and others are b eing managed by an extension. 8582 Some options have been disabled by your administrator and others are m anaged by an extension.
8583 </message>
8584 <message name="IDS_OPTIONS_CONTROLLED_SETTING_POLICY" desc="Text display ed in the controlled settings bubble in case the setting is forced by policy.">
8585 This option is enforced by your administrator.
8586 </message>
8587 <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.">
8588 This option is managed by an extension.
8589 </message>
8590 <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.">
8591 Your administrator recommends a specific value for this option.
8561 </message> 8592 </message>
8562 </if> 8593 </if>
8563 8594
8564 <!-- Options search page strings. --> 8595 <!-- Options search page strings. -->
8565 <message name="IDS_OPTIONS_SEARCH_PAGE_TITLE" desc="Title of the settings search page."> 8596 <message name="IDS_OPTIONS_SEARCH_PAGE_TITLE" desc="Title of the settings search page.">
8566 Search Results 8597 Search Results
8567 </message> 8598 </message>
8568 <message name="IDS_OPTIONS_SEARCH_PAGE_NO_MATCHES" desc="Text description of a search that has no results."> 8599 <message name="IDS_OPTIONS_SEARCH_PAGE_NO_MATCHES" desc="Text description of a search that has no results.">
8569 No matches were found. 8600 No matches were found.
8570 </message> 8601 </message>
(...skipping 6053 matching lines...) Expand 10 before | Expand all | Expand 10 after
14624 </messages> 14655 </messages>
14625 <structures fallback_to_english="true"> 14656 <structures fallback_to_english="true">
14626 <!-- Make sure these stay in sync with the structures in generated_resourc es.grd. --> 14657 <!-- Make sure these stay in sync with the structures in generated_resourc es.grd. -->
14627 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" > 14658 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" >
14628 </structure> 14659 </structure>
14629 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" > 14660 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" >
14630 </structure> 14661 </structure>
14631 </structures> 14662 </structures>
14632 </release> 14663 </release>
14633 </grit> 14664 </grit>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698