Bug 1524264 - move noproxy textbox lower to hint as a global effect r=ewright,flod

Differential Revision: https://phabricator.services.mozilla.com/D18981

--HG--
extra : moz-landing-system : lando

browser/components/preferences/connection.xul

@@ -125,9 +125,6 @@
             </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" />
@@ -142,6 +139,9 @@
     </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" />

browser/components/preferences/in-content/tests/browser_extension_controlled.js

@@ -762,7 +762,7 @@ add_task(async function testExtensionControlledProxyConfig() {
             ...doc.querySelectorAll("#networkProxySOCKSVersion > radio")],
           pacControls: [doc.getElementById("networkProxyAutoconfigURL")],
           otherControls: [
-            manualControlContainer.querySelector("label[control=networkProxyNone]"),
+            doc.querySelector("label[control=networkProxyNone]"),
             doc.getElementById("networkProxyNone"),
             ...controlGroup.querySelectorAll(":scope > radio"),
             ...doc.querySelectorAll("#ConnectionsDialogPane > checkbox")],

browser/locales/en-US/browser/preferences/connection.ftl

@@ -60,7 +60,7 @@ connection-proxy-socks4 =
 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