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

chrome/app/generated_resources.grd

 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
 This file contains definitions of resources that will be translated for each
 locale.  The variables is_win, is_macosx, is_linux, and is_posix are available
 for making strings OS specific.  Other platform defines such as use_titlecase
 are declared in build/common.gypi.
 -->
 
 <grit base_dir="." latest_public_release="0" current_release="1"
@@ skipping 7792 matching lines @@
       <if expr="pp_ifdef('use_titlecase')">
         <message name="IDS_OPTIONS_BROWSING_DATA_GROUP_NAME" desc="In Title Case: The title of the 'Browsing data' group.">
           Browsing Data
         </message>
         <message name="IDS_OPTIONS_IMPORT_DATA_BUTTON" desc="In Title Case: Label for the import data button.">
           Import Data from Another Browser...
         </message>
       </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.">
         Search Results
       </message>
       <message name="IDS_OPTIONS_SEARCH_PAGE_NO_MATCHES" desc="Text description of a search that has no results.">
         No matches were found.
       </message>
       <message name="IDS_OPTIONS_SEARCH_PAGE_HELP_LABEL" desc="Help text for a serach that has no results.">
         Can't find what you're looking for?
@@ skipping 5123 matching lines @@
     </includes>
     <structures fallback_to_english="true">
       <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type="dialog" >
       </structure>
       <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" type="dialog" >
       </structure>
     </structures>
 
   </release>
 </grit>