diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-01 02:06:18 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-01 02:06:18 +0000 |
| commit | 442d293cc0b415c6f20231ea2a577b316162c5be (patch) | |
| tree | 00a3c05ce411d9126e434d0535973137f0653d5d /chrome/app | |
| parent | 2f2afba1c5f04e5f83d7c62873bef8a0d166f291 (diff) | |
| download | chromium_src-442d293cc0b415c6f20231ea2a577b316162c5be.zip chromium_src-442d293cc0b415c6f20231ea2a577b316162c5be.tar.gz chromium_src-442d293cc0b415c6f20231ea2a577b316162c5be.tar.bz2 | |
Linux: On unsupported DE, show local help page about configuring proxies.
BUG=30657
TEST=unset GNOME_DESKTOP_SESSION_ID; run chrome and try to launch proxy config.
Review URL: http://codereview.chromium.org/1541007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43307 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/generated_resources.grd | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 9889e90..f717b28 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -7431,6 +7431,28 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_BOOKMARK_BAR_IMPORT_LINK" desc="text shown for importing "> Import bookmarks now... </message> + + <!-- Linux proxy configuration fallback help --> + <message name="IDS_ABOUT_LINUX_PROXY_CONFIG_TITLE" desc="Title of HTML page shown on systems where system proxy configuration is unsupported."> + Linux Proxy Configuration Help + </message> + <message name="IDS_ABOUT_LINUX_PROXY_CONFIG_BODY" desc="HTML body of page shown on systems where system proxy configuration is unsupported."> + When running <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> under a supported Desktop Environment, the system proxy settings will be used. However, either your system is not supported or there was a problem launching your system configuration. You may use the following environment variables to configure your proxy: + <ph name="BEGIN_LIST"><ul></ph> + <ph name="BEGIN_LIST_ITEM"><li></ph><ph name="BEGIN_CODE"><code></ph>auto_proxy<ph name="END_CODE"></code></ph><ph name="END_LIST_ITEM"></li></ph> + <ph name="BEGIN_LIST"><ul></ph> + <ph name="BEGIN_LIST_ITEM"><li></ph>Defined and empty → autodetect<ph name="END_LIST_ITEM"></li></ph> + <ph name="BEGIN_LIST_ITEM"><li></ph>Non-empty → specifies autoconfig URL<ph name="END_LIST_ITEM"></li></ph> + <ph name="END_LIST"></ul></ph> + <ph name="BEGIN_LIST_ITEM"><li></ph><ph name="BEGIN_CODE"><code></ph>all_proxy<ph name="END_CODE"></code></ph>: proxy server to use for all types<ph name="END_LIST_ITEM"></li></ph> + <ph name="BEGIN_LIST_ITEM"><li></ph><ph name="BEGIN_CODE"><code></ph>http_proxy<ph name="END_CODE"></code></ph>: HTTP proxy server<ph name="END_LIST_ITEM"></li></ph> + <ph name="BEGIN_LIST_ITEM"><li></ph><ph name="BEGIN_CODE"><code></ph>https_proxy<ph name="END_CODE"></code></ph>: HTTPS proxy server<ph name="END_LIST_ITEM"></li></ph> + <ph name="BEGIN_LIST_ITEM"><li></ph><ph name="BEGIN_CODE"><code></ph>ftp_proxy<ph name="END_CODE"></code></ph>: FTP proxy server<ph name="END_LIST_ITEM"></li></ph> + <ph name="BEGIN_LIST_ITEM"><li></ph><ph name="BEGIN_CODE"><code></ph>SOCKS_SERVER<ph name="END_CODE"></code></ph>: SOCKS proxy server (defaults to SOCKS v4, also specify SOCKS_VERSION=5 to use SOCKS v5)<ph name="END_LIST_ITEM"></li></ph> + <ph name="BEGIN_LIST_ITEM"><li></ph><ph name="BEGIN_CODE"><code></ph>no_proxy<ph name="END_CODE"></code></ph>: comma separated list of hosts or patterns to bypass proxying<ph name="END_LIST_ITEM"></li></ph> + <ph name="END_LIST"></ul></ph> + </message> + </messages> <structures first_id="50000" fallback_to_english="true"> |