| Index: chrome/app/generated_resources.grd
|
| diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
|
| index b980686f186c0c5eec4d7d99bbf78c4eae205ccd..aaf9a119c8ed9a598944ca6f2b3d4c5dfd5f81ae 100644
|
| --- a/chrome/app/generated_resources.grd
|
| +++ b/chrome/app/generated_resources.grd
|
| @@ -8518,6 +8518,10 @@ Keep your key file in a safe place. You will need it to create new versions of y
|
| </message>
|
| </if>
|
|
|
| + <message name="IDS_OPTIONS_CONTROLLED_SETTING_APPLY_RECOMMENDATION" desc="Link text displayed in the controlled settings bubble for applying the recommendation.">
|
| + Apply recommendation
|
| + </message>
|
| +
|
| <if expr="pp_ifdef('chromeos')">
|
| <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 are being managed by your administrator.
|
| @@ -8531,6 +8535,15 @@ Keep your key file in a safe place. You will need it to create new versions of y
|
| <message name="IDS_OPTIONS_UNMODIFIABLE_PREFS" desc="Banner displayed in case there are options that the user won't be able to change.">
|
| Some settings cannot be modified by the user.
|
| </message>
|
| + <message name="IDS_OPTIONS_CONTROLLED_SETTING_POLICY" desc="Text displayed in the controlled settings bubble in case the setting is forced by policy.">
|
| + This setting is enforced by enterprise policy.
|
| + </message>
|
| + <message name="IDS_OPTIONS_CONTROLLED_SETTING_EXTENSION" desc="Text displayed in the controlled settings bubble in case the setting controlled by an extension.">
|
| + This setting was configured by an extension.
|
| + </message>
|
| + <message name="IDS_OPTIONS_CONTROLLED_SETTING_RECOMMENDED" desc="Text displayed in the controlled settings bubble in case the setting has a policy-supplied default value.">
|
| + Enterprise policy recommends a specific value for this setting.
|
| + </message>
|
| </if>
|
| <if expr="not pp_ifdef('chromeos') and is_posix">
|
| <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.">
|
| @@ -8542,6 +8555,15 @@ Keep your key file in a safe place. You will need it to create new versions of y
|
| <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>
|
| + <message name="IDS_OPTIONS_CONTROLLED_SETTING_POLICY" desc="Text displayed in the controlled settings bubble in case the setting is forced by policy.">
|
| + This preference is enforced by enterprise policy.
|
| + </message>
|
| + <message name="IDS_OPTIONS_CONTROLLED_SETTING_EXTENSION" desc="Text displayed in the controlled settings bubble in case the setting controlled by an extension.">
|
| + This preference was configured by an extension.
|
| + </message>
|
| + <message name="IDS_OPTIONS_CONTROLLED_SETTING_RECOMMENDED" desc="Text displayed in the controlled settings bubble in case the setting has a policy-supplied default value.">
|
| + Enterprise policy recommends a specific value for this preference.
|
| + </message>
|
| </if>
|
| <if expr="is_win">
|
| <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.">
|
| @@ -8553,6 +8575,15 @@ Keep your key file in a safe place. You will need it to create new versions of y
|
| <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>
|
| + <message name="IDS_OPTIONS_CONTROLLED_SETTING_POLICY" desc="Text displayed in the controlled settings bubble in case the setting is forced by policy.">
|
| + This option is enforced by enterprise policy.
|
| + </message>
|
| + <message name="IDS_OPTIONS_CONTROLLED_SETTING_EXTENSION" desc="Text displayed in the controlled settings bubble in case the setting controlled by an extension.">
|
| + This option was configured by an extension.
|
| + </message>
|
| + <message name="IDS_OPTIONS_CONTROLLED_SETTING_RECOMMENDED" desc="Text displayed in the controlled settings bubble in case the setting has a policy-supplied default value.">
|
| + Enterprise policy recommends a specific value for this option.
|
| + </message>
|
| </if>
|
|
|
| <!-- Options search page strings. -->
|
|
|