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

Unified Diff: chrome/app/generated_resources.grd

Issue 7342009: Show a different banner in chrome://settings for extension-controlled settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 9 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/policy/managed_prefs_banner_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index f380057ff47dbf5b5c03f6cb9d40579db5d24e36..14cc27d872375e16be9b012c101c0cc545aad0a6 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -7818,21 +7818,39 @@ ls' lab.">
</if>
<if expr="pp_ifdef('chromeos')">
- <message name="IDS_OPTIONS_MANAGED_PREFS" desc="ChromeOS banner displayed in case there are managed options the user won't be able to change.">
- Some settings have been disabled by your IT administrator.
+ <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.">
+ Some settings have been disabled by your administrator.
+ </message>
+ <message name="IDS_OPTIONS_EXTENSION_MANAGED_PREFS" desc="Banner displayed in case there are extension-managed options the user won't be able to change.">
+ Some settings are being managed by an extension.
+ </message>
+ <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.">
+ Some settings have been disabled by your administrator and others are being managed by an extension.
</message>
</if>
<if expr="not pp_ifdef('chromeos') and is_posix">
- <message name="IDS_OPTIONS_MANAGED_PREFS" desc="Mac/Linux banner displayed in case there are managed options the user won't be able to change.">
- Some preferences have been disabled by your IT administrator.
+ <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.">
+ Some preferences have been disabled by your administrator.
+ </message>
+ <message name="IDS_OPTIONS_EXTENSION_MANAGED_PREFS" desc="Banner displayed in case there are extension-managed options the user won't be able to change.">
+ Some preferences are being managed by an extension.
+ </message>
+ <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.">
+ Some preferences have been disabled by your administrator and others are being managed by an extension.
</message>
</if>
<if expr="is_win">
- <message name="IDS_OPTIONS_MANAGED_PREFS" desc="Windows 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 name="IDS_OPTIONS_POLICY_MANAGED_PREFS" desc="Banner displayed in case there are policy-managed options the user won't be able to change.">
+ Some options have been disabled by your administrator.
+ </message>
+ <message name="IDS_OPTIONS_EXTENSION_MANAGED_PREFS" desc="Banner displayed in case there are extension-managed options the user won't be able to change.">
+ Some options are being managed by an extension.
+ </message>
+ <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.">
+ Some options have been disabled by your administrator and others are being managed by an extension.
</message>
</if>
-
+
<!-- Options search page strings. -->
<message name="IDS_OPTIONS_SEARCH_PAGE_TITLE" desc="Title of the settings search page.">
Search Results
« no previous file with comments | « no previous file | chrome/browser/policy/managed_prefs_banner_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698