summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authormnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-08 09:55:47 +0000
committermnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-08 09:55:47 +0000
commit1703157a0410dbd23b8968aa8e6ce9e4adc45def (patch)
treeef2744a079dd79302e9e334c47bf227341243c94 /chrome/app
parentc7f143e3f200aa626af2e29fec1f801081b2e31a (diff)
downloadchromium_src-1703157a0410dbd23b8968aa8e6ce9e4adc45def.zip
chromium_src-1703157a0410dbd23b8968aa8e6ce9e4adc45def.tar.gz
chromium_src-1703157a0410dbd23b8968aa8e6ce9e4adc45def.tar.bz2
Managed preferences warning banner for the Linux preferences dialog.
BUG=43423 TEST=Unit test in managed_prefs_banner_base_unittest.cc, manual UI tests Review URL: http://codereview.chromium.org/2425006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49151 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index c39ae8dc..93ad187 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -5873,6 +5873,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_OPTIONS_IMPORT_DATA_BUTTON" desc="Label for the import data button.">
Import data from another browser...
</message>
+ <message name="IDS_OPTIONS_MANAGED_PREFS" desc="Banner displayed in case there are managed options the user won't be able to change">
+ Some options have been disabled by your IT administrator.
+ </message>
<!-- Misc advanced option description strings. -->
<message name="IDS_NETWORK_DNS_PREFETCH_ENABLED_DESCRIPTION" desc="In the advanced options tab, the text next to the checkbox that enables DNS prefetching. DNS prefetching involves scanning pages and user text entries, guessing what domain the user may next navigate to, and obtaining the domain's DNS information for that URL in advance. ">