diff options
| author | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-18 21:18:49 +0000 |
|---|---|---|
| committer | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-18 21:18:49 +0000 |
| commit | d86ef4f466b0d17b83dceb46edd2bb7e0189ceb6 (patch) | |
| tree | 40ddb9aeffecfba441f42eb4f63fe1f9a7434ab0 /chrome/app/chromium_strings.grd | |
| parent | d49447a0f33877f72c63ad299cbec886284be5b1 (diff) | |
| download | chromium_src-d86ef4f466b0d17b83dceb46edd2bb7e0189ceb6.zip chromium_src-d86ef4f466b0d17b83dceb46edd2bb7e0189ceb6.tar.gz chromium_src-d86ef4f466b0d17b83dceb46edd2bb7e0189ceb6.tar.bz2 | |
Android / iOS: adds empty string for proxy config.
The code for localizing IDS_ERRORPAGES_SUGGESTION_PROXY_CONFIG requires
IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM.
BUG=170692
Review URL: https://chromiumcodereview.appspot.com/11966004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177755 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chromium_strings.grd')
| -rw-r--r-- | chrome/app/chromium_strings.grd | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd index a1bb0d3..26e75bf 100644 --- a/chrome/app/chromium_strings.grd +++ b/chrome/app/chromium_strings.grd @@ -865,7 +865,7 @@ For Chromium, processes used to display diagnostics information (such as this "a If this does not resolve the issue, we recommend selecting this option again for improved performance. </message> - <if expr="is_macosx"> + <if expr="is_macosx and not pp_ifdef('ios')"> <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Mac OSX instructions for disabling use of a proxy server."> Go to <ph name="BEGIN_BOLD"><strong></ph> @@ -896,7 +896,11 @@ For Chromium, processes used to display diagnostics information (such as this "a is set to "Direct". </message> </if> - <if expr="not pp_ifdef('chromeos') and is_posix and not is_macosx"> + <if expr="pp_ifdef('android') or pp_ifdef('ios')"> + <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Instructions for disabling use of a proxy server (leave empty for Android and iOS)."> + </message> + </if> + <if expr="not pp_ifdef('chromeos') and is_posix and not is_macosx and not pp_ifdef('android') and not pp_ifdef('ios')"> <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Linux instructions for disabling use of a proxy server."> Go to <ph name="BEGIN_BOLD"><strong></ph> |