Bug 1524264 - move noproxy textbox lower to hint as a global effect r=ewright,flod
☠☠ backed out by cacd6882c461 ☠ ☠
authorJunior Hsu <juhsu@mozilla.com>
Wed, 13 Feb 2019 01:45:28 +0000
changeset 458835 e957d571c91c
parent 458834 17fb1009195f
child 458836 86b52991b24a
push id35548
push useropoprus@mozilla.com
push dateWed, 13 Feb 2019 09:48:26 +0000
treeherdermozilla-central@93e37c529818 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersewright, flod
bugs1524264
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1524264 - move noproxy textbox lower to hint as a global effect r=ewright,flod Differential Revision: https://phabricator.services.mozilla.com/D18981
browser/components/preferences/connection.xul
browser/locales/en-US/browser/preferences/connection.ftl
--- a/browser/components/preferences/connection.xul
+++ b/browser/components/preferences/connection.xul
@@ -120,33 +120,33 @@
             <box pack="start">
             <radiogroup id="networkProxySOCKSVersion" orient="horizontal"
                         preference="network.proxy.socks_version">
               <radio id="networkProxySOCKSVersion4" value="4" data-l10n-id="connection-proxy-socks4" />
               <radio id="networkProxySOCKSVersion5" value="5" data-l10n-id="connection-proxy-socks5" />
             </radiogroup>
             </box>
           </row>
-          <label data-l10n-id="connection-proxy-noproxy" control="networkProxyNone"/>
-          <textbox id="networkProxyNone" preference="network.proxy.no_proxies_on" multiline="true" rows="2"/>
-          <label control="networkProxyNone" data-l10n-id="connection-proxy-noproxy-desc" />
         </rows>
       </grid>
       <radio value="2" data-l10n-id="connection-proxy-autotype" />
       <hbox class="indent" flex="1" align="center">
         <textbox id="networkProxyAutoconfigURL" flex="1" preference="network.proxy.autoconfig_url"
                  oninput="gConnectionsDialog.updateReloadButton();"/>
         <button id="autoReload" icon="refresh"
                 data-l10n-id="connection-proxy-reload"
                 oncommand="gConnectionsDialog.reloadPAC();"
                 preference="pref.advanced.proxies.disable_button.reload"/>
       </hbox>
     </radiogroup>
   </groupbox>
   <separator class="thin"/>
+  <label data-l10n-id="connection-proxy-noproxy" control="networkProxyNone"/>
+  <textbox id="networkProxyNone" preference="network.proxy.no_proxies_on" multiline="true" rows="2"/>
+  <label control="networkProxyNone" data-l10n-id="connection-proxy-noproxy-desc" />
   <checkbox id="autologinProxy"
             data-l10n-id="connection-proxy-autologin"
             preference="signon.autologin.proxy" />
   <checkbox id="networkProxySOCKSRemoteDNS"
             preference="network.proxy.socks_remote_dns"
             data-l10n-id="connection-proxy-socks-remote-dns" />
   <checkbox id="networkDnsOverHttps"
             data-l10n-id="connection-dns-over-https"
--- a/browser/locales/en-US/browser/preferences/connection.ftl
+++ b/browser/locales/en-US/browser/preferences/connection.ftl
@@ -55,17 +55,17 @@ connection-proxy-socks-port = Port
     .accesskey = t
 
 connection-proxy-socks4 =
     .label = SOCKS v4
     .accesskey = K
 connection-proxy-socks5 =
     .label = SOCKS v5
     .accesskey = v
-connection-proxy-noproxy = No Proxy for
+connection-proxy-noproxy = No proxy for
     .accesskey = N
 
 connection-proxy-noproxy-desc = Example: .mozilla.org, .net.nz, 192.168.1.0/24
 
 connection-proxy-autotype =
     .label = Automatic proxy configuration URL
     .accesskey = A