Commit 1c37429c authored by Kyle Horimoto's avatar Kyle Horimoto Committed by Commit Bot

[CrOS Settings] Update "enforced by your administrator" string.

Fixed: 1042316
Change-Id: Id013c917732d00c65b4f2533a697ffbd1c4ccb67
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2006422Reviewed-by: default avatarJames Cook <jamescook@chromium.org>
Commit-Queue: Kyle Horimoto <khorimoto@chromium.org>
Auto-Submit: Kyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#732955}
parent c427ca03
...@@ -471,7 +471,7 @@ This file contains the strings for ash. ...@@ -471,7 +471,7 @@ This file contains the strings for ash.
</message> </message>
<message name="IDS_ASH_ACCESSIBILITY_FEATURE_MANAGED" <message name="IDS_ASH_ACCESSIBILITY_FEATURE_MANAGED"
desc="The label used to indicate that, the accessibility feature is being managed by a policy."> desc="The label used to indicate that, the accessibility feature is being managed by a policy.">
<ph name="FEATURE_NAME">$1<ex>Full-screen magnifier</ex></ph> This setting is enforced by your administrator. <ph name="FEATURE_NAME">$1<ex>Full-screen magnifier</ex></ph> This setting is managed by your administrator.
</message> </message>
<message name="IDS_ASH_STATUS_TRAY_IME_SHORT" desc="The short label used for IME button in system tray bubble."> <message name="IDS_ASH_STATUS_TRAY_IME_SHORT" desc="The short label used for IME button in system tray bubble.">
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<translation id="1195412055398077112">overscan</translation> <translation id="1195412055398077112">overscan</translation>
<translation id="119944043368869598">Clear all</translation> <translation id="119944043368869598">Clear all</translation>
<translation id="1247372569136754018">Microphone (internal)</translation> <translation id="1247372569136754018">Microphone (internal)</translation>
<translation id="1249456112629248620"><ph name="FEATURE_NAME" /> This setting is enforced by your administrator.</translation> <translation id="1249456112629248620"><ph name="FEATURE_NAME" /> This setting is managed by your administrator.</translation>
<translation id="1252999807265626933">Charging from <ph name="POWER_SOURCE" /></translation> <translation id="1252999807265626933">Charging from <ph name="POWER_SOURCE" /></translation>
<translation id="1255033239764210633">What's the weather?</translation> <translation id="1255033239764210633">What's the weather?</translation>
<translation id="1267032506238418139">Shortcut change</translation> <translation id="1267032506238418139">Shortcut change</translation>
......
...@@ -6677,8 +6677,8 @@ the Bookmarks menu."> ...@@ -6677,8 +6677,8 @@ the Bookmarks menu.">
</message> </message>
</if> </if>
<message name="IDS_CONTROLLED_SETTING_POLICY" desc="Text displayed in the controlled settings bubble when a setting's value is enforced by policy."> <message name="IDS_CONTROLLED_SETTING_POLICY" desc="Text displayed in the controlled settings bubble when a setting's value is managed by policy.">
This setting is enforced by your administrator. This setting is managed by your administrator.
</message> </message>
<message name="IDS_CONTROLLED_SETTING_EXTENSION" desc="Text displayed in the controlled settings bubble when a setting's value is enforced by an extension."> <message name="IDS_CONTROLLED_SETTING_EXTENSION" desc="Text displayed in the controlled settings bubble when a setting's value is enforced by an extension.">
This setting is enforced by the "<ph name="NAME">$1<ex>Google Cast</ex></ph>" extension. This setting is enforced by the "<ph name="NAME">$1<ex>Google Cast</ex></ph>" extension.
......
...@@ -2034,7 +2034,7 @@ You can manage this account’s settings by installing the Family Link app on yo ...@@ -2034,7 +2034,7 @@ You can manage this account’s settings by installing the Family Link app on yo
<translation id="3819800052061700452">&amp;Full screen</translation> <translation id="3819800052061700452">&amp;Full screen</translation>
<translation id="3820172043799983114">Invalid PIN.</translation> <translation id="3820172043799983114">Invalid PIN.</translation>
<translation id="3820749202859700794">SECG elliptic curve secp521r1 (aka NIST P-521)</translation> <translation id="3820749202859700794">SECG elliptic curve secp521r1 (aka NIST P-521)</translation>
<translation id="3822559385185038546">This proxy is enforced by your administrator</translation> <translation id="3822559385185038546">This proxy is managed by your administrator</translation>
<translation id="3826440694796503677">Your administrator has disabled the addition of more Google accounts</translation> <translation id="3826440694796503677">Your administrator has disabled the addition of more Google accounts</translation>
<translation id="3827306204503227641">Continue allowing unsandboxed plug-ins</translation> <translation id="3827306204503227641">Continue allowing unsandboxed plug-ins</translation>
<translation id="3827774300009121996">&amp;Full Screen</translation> <translation id="3827774300009121996">&amp;Full Screen</translation>
......
...@@ -117,7 +117,7 @@ function initializeDateTime(prefs, hasPolicy, opt_autoDetectPolicyValue) { ...@@ -117,7 +117,7 @@ function initializeDateTime(prefs, hasPolicy, opt_autoDetectPolicyValue) {
const data = { const data = {
timeZoneID: timeZone[0], timeZoneID: timeZone[0],
timeZoneName: timeZone[1], timeZoneName: timeZone[1],
controlledSettingPolicy: 'This setting is enforced by your administrator', controlledSettingPolicy: 'This setting is managed by your administrator',
setTimeZoneAutomaticallyDisabled: 'Automatic time zone detection disabled.', setTimeZoneAutomaticallyDisabled: 'Automatic time zone detection disabled.',
setTimeZoneAutomaticallyIpOnlyDefault: setTimeZoneAutomaticallyIpOnlyDefault:
'Automatic time zone detection IP-only.', 'Automatic time zone detection IP-only.',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment