Show a different banner in chrome://settings for extension-controlled settings.

chrome/app/generated_resources.grd

Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 8ee0cc2b944c0c438318a86b5748856c12851ae1..5f441c122ef2ec17338e8df5d60d95ef92ecb4d4 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -7810,20 +7810,30 @@ 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_PREFS_TERM" desc="ChromeOS term for user settings (plural).">
+          settings
         </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_PREFS_TERM" desc="Mac/Linux term for user settings (plural).">
+          preferences
         </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_PREFS_TERM" desc="Windows term for user settings (plural).">
+          options
         </message>
       </if>
+      

[Joao da Silva, 2011/07/13 17:35:17]

Nit: trailing whites

[Bernhard Bauer, 2011/07/13 22:15:12]

Where?

[Joao da Silva, 2011/07/14 09:04:11]

Line 7827. I patched this into my working tree and git diff highlighted it. On
rietveld you can try selecting the whites with the mouse (compare with line
7811).

[Bernhard Bauer, 2011/07/14 10:15:56]

Ah, got it.

+      <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 <ph name="IDS_OPTIONS_PREFS_TERM">$1<ex>options</ex></ph> have been disabled by your IT administrator.

[Evan Stade, 2011/07/13 17:06:04]

I don't think this is valid for translations. For example some languages might
have different genders for "options" vs. "preferences".

[Glen Murphy, 2011/07/13 17:23:16]

We can also drop the 'IT' - it's meaningless to many people, and is somewhat
redundant with 'administrator'.

[Bernhard Bauer, 2011/07/13 22:15:12]

Done.

+      </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 <ph name="IDS_OPTIONS_PREFS_TERM">$1<ex>options</ex></ph> are being managed by an extension for you.

[Evan Stade, 2011/07/13 17:06:04]

Some options are being controlled by an extension.

[Bernhard Bauer, 2011/07/13 22:15:12]

For proxy settings, the text currently reads "Some options are being managed by
an extension", and I prefer managed as well (since the user is using an
extension to manage the settings). Or should we change that as well?

+      </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 <ph name="IDS_OPTIONS_PREFS_TERM">$1<ex>options</ex></ph> have been disabled by your IT administrator, and some are being managed by an extension for you. Lucky you!

[Evan Stade, 2011/07/13 17:06:04]

Some options have been disabled by your IT administrator and others are being
controlled by an extension.

[Glen Murphy, 2011/07/13 17:23:16]

Evan's without the 'IT'.

[Bernhard Bauer, 2011/07/13 22:15:12]

Done.

+      </message>
 
       <!-- Options search page strings. -->
       <message name="IDS_OPTIONS_SEARCH_PAGE_TITLE" desc="Title of the settings search page.">