From 818c3441cb6745576569f8558a93161489751219 Mon Sep 17 00:00:00 2001
From: "disttsc%bart.nl" <disttsc%bart.nl>
Date: Wed, 17 May 2006 02:26:10 +0000
Subject: [PATCH] Add example for "no proxy for" field, modify accesskeys
 slight. Author=jce2@po.cwru.edu, bug=49858, r=jag, a=brendan

---
 suite/common/pref/pref-proxies.xul                    |  7 +++++++
 .../locales/en-US/chrome/common/pref/pref-proxies.dtd | 11 ++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/suite/common/pref/pref-proxies.xul b/suite/common/pref/pref-proxies.xul
index c06e89de6a57..11a1f0dfdd1a 100644
--- a/suite/common/pref/pref-proxies.xul
+++ b/suite/common/pref/pref-proxies.xul
@@ -19,6 +19,9 @@
    Rights Reserved.
    
    Contributor(s): 
+
+     Jason Eager <jce2@po.cwru.edu>
+       -Added a syntax example for the "no proxy" field.
   -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
@@ -103,6 +106,10 @@
             <textfield id="networkProxyNone" pref="true" preftype="string" prefstring="network.proxy.no_proxies_on"
                        prefattribute="value"/>
           </row>
+          <row>
+            <spring/>
+            <text class="label" value="&noproxyExplain.label;" for="networkProxyNone"/>
+          </row>
         </rows>
       </grid>
       <radio group="networkProxyType" data="2" value="&autoTypeRadio.label;" accesskey="&autoTypeRadio.accesskey;" oncommand="DoEnabling();"/>
diff --git a/suite/locales/en-US/chrome/common/pref/pref-proxies.dtd b/suite/locales/en-US/chrome/common/pref/pref-proxies.dtd
index 516e6dcfc77f..3d4a6141d965 100644
--- a/suite/locales/en-US/chrome/common/pref/pref-proxies.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-proxies.dtd
@@ -14,7 +14,7 @@
 <!ENTITY  configAutoconfigText.label    "Configuration location (URL):">
 <!ENTITY  configAutoconfigText.accesskey "u">
 <!ENTITY  reload.label                  "Reload">
-<!ENTITY  reload.accesskey              "r">
+<!ENTITY  reload.accesskey              "l">
 <!ENTITY  ftp.label                     "FTP Proxy:">
 <!ENTITY  ftp.accesskey                 "f">
 <!ENTITY  http.label                    "HTTP Proxy:">
@@ -24,9 +24,10 @@
 <!ENTITY  socks.label                   "SOCKS Host:">
 <!ENTITY  socks.accesskey               "c">
 <!ENTITY  port.label                    "Port:">
-<!ENTITY  FTPport.accesskey             "o">
-<!ENTITY  HTTPport.accesskey            "p">
-<!ENTITY  SSLport.accesskey             "t">
-<!ENTITY  SOCKSport.accesskey           "g">
+<!ENTITY  FTPport.accesskey             "p">
+<!ENTITY  HTTPport.accesskey            "o">
+<!ENTITY  SSLport.accesskey             "r">
+<!ENTITY  SOCKSport.accesskey           "t">
 <!ENTITY  noproxy.label                 "No Proxy for:">
 <!ENTITY  noproxy.accesskey             "n">
+<!ENTITY  noproxyExplain.label          "Example: .yourcompany.com, .yourcompany.co.nz">