Bug 1392517 - Add 2nd header to about:preferences#sync and update button string r=mconley

--HG--
extra : rebase_source : f6ea832d11b187b256e2f110a3b619c88efa3edd

browser/components/preferences/in-content-new/sync.xul

@@ -92,6 +92,8 @@
     <hbox>
       <vbox id="fxaContentWrapper" flex="1">
         <groupbox id="fxaGroup">
+          <caption class="search-header" hidden="true"><label>&paneSync1.title;</label></caption>
+
           <deck id="fxaLoginStatus" flex="1">
 
             <!-- logged in and verified and all is good -->

browser/components/preferences/in-content-new/tests/browser_search_within_preferences_2.js

@@ -48,9 +48,9 @@ add_task(async function() {
     }
   }
 
-  // Ensure the "Forget this Email" button exists in the hidden child of the <xul:deck>.
+  // Ensure the "Forget this email" button exists in the hidden child of the <xul:deck>.
   let unlinkFxaAccount = weavePrefsDeck.childNodes[1].querySelector("#unverifiedUnlinkFxaAccount");
-  is(unlinkFxaAccount.label, "Forget this Email", "The Forget this Email button should exist");
+  is(unlinkFxaAccount.label, "Forget this email", "The Forget this email button should exist");
 
   // Performs search.
   searchInput.focus();

browser/locales/en-US/chrome/browser/preferences/sync.dtd

@@ -58,9 +58,9 @@ both, to better adapt this sentence to their language.
 <!ENTITY verifiedManage.accesskey    "o">
 <!ENTITY disconnect3.label           "Disconnect…">
 <!ENTITY disconnect3.accesskey       "D">
-<!ENTITY verify.label                "Verify Email">
+<!ENTITY verify.label                "Verify email">
 <!ENTITY verify.accesskey            "V">
-<!ENTITY forget.label                "Forget this Email">
+<!ENTITY forget.label                "Forget this email">
 <!ENTITY forget.accesskey            "F">
 
 <!ENTITY signedOut.caption            "Take Your Web With You">

browser/themes/shared/incontentprefs/preferences.inc.css

@@ -41,7 +41,8 @@ groupbox + groupbox {
   margin-top: 16px;
 }
 
-groupbox + groupbox > .groupbox-body {
+groupbox + groupbox > .groupbox-body,
+groupbox + vbox groupbox > .groupbox-body {
   margin-top: 4px;
 }
 
@@ -549,7 +550,6 @@ separator.thin:not([orient="vertical"]) {
 }
 
 #fxaGroup {
-  margin-top: 16px;
   margin-bottom: 32px;
 }