diff options
Diffstat (limited to 'chrome/app/generated_resources.grd')
| -rw-r--r-- | chrome/app/generated_resources.grd | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index dedc25c..4a3fe4c 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -7666,30 +7666,21 @@ Keep your key file in a safe place. You will need it to create new versions of y Password </message> </if> - <message name="IDS_BOOKMARK_BAR_IMPORT_LINK" desc="text shown for importing "> - Import bookmarks now... - </message> + <message name="IDS_BOOKMARK_BAR_IMPORT_LINK" desc="text shown for importing "> + Import bookmarks now... + </message> + <if expr="os == 'linux2' or os == 'openbsd4' or os=='freebsd6'"> <!-- 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 + 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> + <p>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.</p> + + <p>But you can still configure via the command line. Please see <code>man <ph name="PRODUCT_BINARY_NAME">$2<ex>google-chrome</ex></ph></code> for more information on flags and environment variables.</p> </message> + </if> </messages> |