summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authormattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-17 23:28:08 +0000
committermattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-17 23:28:08 +0000
commit425be73ff46ed6961322f7f412a2d403b371fc69 (patch)
tree5b2148b4d77238cefbef409b3390e120144ec0d3 /chrome/app
parent85b893f08d534d5146d94de1863a4e0ac0cbf75c (diff)
downloadchromium_src-425be73ff46ed6961322f7f412a2d403b371fc69.zip
chromium_src-425be73ff46ed6961322f7f412a2d403b371fc69.tar.gz
chromium_src-425be73ff46ed6961322f7f412a2d403b371fc69.tar.bz2
Add proxy config (using gnome-network-preferences)
BUG=11507 TEST=Open options, click change proxy, gnome-network-preferences should launch. If gnome isn't installed, LinuxProxyConfig wiki page should load. Review URL: http://codereview.chromium.org/149785 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21023 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/resources/locale_settings.grd6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/locale_settings.grd
index 857bfde..aeb4c52 100644
--- a/chrome/app/resources/locale_settings.grd
+++ b/chrome/app/resources/locale_settings.grd
@@ -543,6 +543,12 @@
<message name="IDS_CHROMIUM_PROJECT_URL" translateable="false">
http://code.google.com/chromium/?hl=[GRITLANGCODE]
</message>
+
+ <!-- The URL for Linux proxy configuration help when not running under -->
+ <!-- a supported desktop environment. -->
+ <message name="IDS_LINUX_PROXY_CONFIG_URL" translateable="false">
+ http://code.google.com/p/chromium/wiki/LinuxProxyConfig
+ </message>
</messages>
</release>
</grit>