chrome/app/chromeos_strings.grdp - Issue 11272026: Remove the managed banner from the Chrome settings UI

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/app/chromeos_strings.grdp

Issue 11272026: Remove the managed banner from the Chrome settings UI (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 2 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

Index: chrome/app/chromeos_strings.grdp

diff --git a/chrome/app/chromeos_strings.grdp b/chrome/app/chromeos_strings.grdp

index 581e8568d798b4c5ebd81b0edf273b45496c64ab..6e46dea375e4881e780023b2ca16ec8e3ada3538 100644

--- a/chrome/app/chromeos_strings.grdp

+++ b/chrome/app/chromeos_strings.grdp

@@ -1165,7 +1165,16 @@ Press any key to continue exploring.

Change proxy settings...

</message>

- <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_ENABLE_SHARED_PROXIES_HINT" desc="In settings Internet options, when proxy can't be changed, the hint for user to do so by enabling the setting for IDS_OPTIONS_SETTINGS_USE_SHARED_PROXIES.">

+ <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PROXY_POLICY" desc="In settings Internet options, banner displayed when the proxy settings are enforced by a policy.">

+ The proxy is enforced by your administrator.

+ </message>

+ <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PROXY_EXTENSION" desc="In settings Internet options, banner displayed when the proxy settings are enforced by an extension.">

+ The proxy is enforced by an extension.

+ </message>

+ <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PROXY_OTHER_PRECEDE" desc="In settings Internet options, banner displayed when the proxy settings cannot be changed as they are enforced by a higher-precedence source.">

+ The proxy cannot be modified by the user.

+ </message>

+ <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PROXY_ENABLE_SHARED_HINT" desc="In settings Internet options, banner displayed when the proxy settings cannot be changed as the user needs to enable the setting for IDS_OPTIONS_SETTINGS_USE_SHARED_PROXIES first.">

To change proxy, enable "<ph name="USE_SHARED_PROXIES">$1<ex>Allow proxies for shared networks</ex></ph>" setting.

</message>

« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('j') | chrome/browser/chromeos/proxy_cros_settings_parser.cc » ('J')