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

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

Issue 11189060: Add controlled setting indicator for proxy configuration (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Re-add accidentally deleted blank line. Created 8 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/resources/options/browser_options.html » ('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 10114 matching lines...) Expand 10 before | Expand all | Expand 10 after
10125 </message> 10125 </message>
10126 <message name="IDS_OPTIONS_CONTROLLED_SETTING_RECOMMENDED" desc="Text disp layed in the controlled settings bubble when a value is recommended for a settin g through policy and the user has not overridden this recommendation."> 10126 <message name="IDS_OPTIONS_CONTROLLED_SETTING_RECOMMENDED" desc="Text disp layed in the controlled settings bubble when a value is recommended for a settin g through policy and the user has not overridden this recommendation.">
10127 You are following the administrator's recommendation for this setting. 10127 You are following the administrator's recommendation for this setting.
10128 </message> 10128 </message>
10129 <message name="IDS_OPTIONS_CONTROLLED_SETTING_HAS_RECOMMENDATION" desc="Te xt displayed in the controlled settings bubble when a value is recommended for a setting through policy but is currently overridden by a user-supplied value."> 10129 <message name="IDS_OPTIONS_CONTROLLED_SETTING_HAS_RECOMMENDATION" desc="Te xt displayed in the controlled settings bubble when a value is recommended for a setting through policy but is currently overridden by a user-supplied value.">
10130 Your administrator recommends a specific value for this setting. 10130 Your administrator recommends a specific value for this setting.
10131 </message> 10131 </message>
10132 <message name="IDS_OPTIONS_CONTROLLED_SETTING_FOLLOW_RECOMMENDATION" desc= "Link text displayed in the controlled settings bubble to clear the user-supplie d value and start following the recommendation."> 10132 <message name="IDS_OPTIONS_CONTROLLED_SETTING_FOLLOW_RECOMMENDATION" desc= "Link text displayed in the controlled settings bubble to clear the user-supplie d value and start following the recommendation.">
10133 Follow recommendation 10133 Follow recommendation
10134 </message> 10134 </message>
10135 <message name="IDS_OPTIONS_CONTROLLED_SETTINGS_POLICY" desc="Text displaye d in the controlled settings bubble when it is shown for a group of settings who se values are enforced by policy.">
10136 These settings are enforced by your administrator.
10137 </message>
10138 <message name="IDS_OPTIONS_CONTROLLED_SETTINGS_EXTENSION" desc="Text displ ayed in the controlled settings bubble when it is shown for a group of settings whose values are enforced by an extension.">
10139 These settings are enforced by an extension.
10140 </message>
10135 10141
10136 <!-- Options search page strings. --> 10142 <!-- Options search page strings. -->
10137 <message name="IDS_OPTIONS_SEARCH_PAGE_TITLE" desc="Title of the settings search page."> 10143 <message name="IDS_OPTIONS_SEARCH_PAGE_TITLE" desc="Title of the settings search page.">
10138 Search results 10144 Search results
10139 </message> 10145 </message>
10140 <message name="IDS_OPTIONS_SEARCH_PAGE_NO_MATCHES" desc="Text description of a search that has no results."> 10146 <message name="IDS_OPTIONS_SEARCH_PAGE_NO_MATCHES" desc="Text description of a search that has no results.">
10141 No matches were found. 10147 No matches were found.
10142 </message> 10148 </message>
10143 <message name="IDS_OPTIONS_SEARCH_PAGE_HELP_LABEL" desc="Help text for a s erach that has no results."> 10149 <message name="IDS_OPTIONS_SEARCH_PAGE_HELP_LABEL" desc="Help text for a s erach that has no results.">
10144 Can't find what you're looking for? 10150 Can't find what you're looking for?
(...skipping 4524 matching lines...) Expand 10 before | Expand all | Expand 10 after
14669 14675
14670 <structures fallback_to_english="true"> 14676 <structures fallback_to_english="true">
14671 <!-- Make sure these stay in sync with the structures in generated_resourc es.grd. --> 14677 <!-- Make sure these stay in sync with the structures in generated_resourc es.grd. -->
14672 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" > 14678 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" >
14673 </structure> 14679 </structure>
14674 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" > 14680 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" >
14675 </structure> 14681 </structure>
14676 </structures> 14682 </structures>
14677 </release> 14683 </release>
14678 </grit> 14684 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/options/browser_options.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698