fixup! Bug 2176: Rebrand Firefox to TorBrowser

Bug 42203: Migrate about dialog strings to Fluent.

browser/base/content/aboutDialog.xhtml

@@ -9,11 +9,6 @@
 <?xml-stylesheet href="chrome://branding/content/aboutDialog.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/content/aboutDialogTor.css" type="text/css"?>
 
-<!-- We need to include the localization DTDs until we migrate to Fluent -->
-<!DOCTYPE window [
-#include browser-doctype.inc
-]>
-
 <window xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         id="aboutDialog"
@@ -37,6 +32,7 @@
     <html:link rel="localization" href="branding/brand.ftl"/>
     <html:link rel="localization" href="browser/aboutDialog.ftl"/>
     <html:link rel="localization" href="browser/base-browser.ftl"/>
+    <html:link rel="localization" href="browser/tor-browser.ftl"/>
   </linkset>
 
   <html:div id="aboutDialogContainer">
@@ -135,35 +131,26 @@
             </description>
           </vbox>
           <!-- Keep communityDesc and contributeDesc to avoid JS errors trying to hide them -->
-          <description class="text-blurb" id="communityDesc" data-l10n-id="community-2" hidden="true"></description>
-          <description class="text-blurb" id="contributeDesc" data-l10n-id="helpus" hidden="true"></description>
-          <description class="text-blurb" id="projectDesc">
-            &project.start;
-            <label is="text-link" href="https://www.torproject.org/">
-              &project.tpoLink;
-            </label>&project.end;
+          <description class="text-blurb" id="communityDesc" hidden="true"></description>
+          <description class="text-blurb" id="contributeDesc" hidden="true"></description>
+          <description class="text-blurb" id="projectDesc" data-l10n-id="about-dialog-tor-project">
+            <label is="text-link" href="https://www.torproject.org/" data-l10n-name="project-link"></label>
           </description>
-          <description class="text-blurb" id="helpDesc">
-            &help.start;
-            <label is="text-link" href="https://donate.torproject.org/">
-              &help.donateLink;
-            </label>
-            &help.or;
-            <label is="text-link" href="https://community.torproject.org/">
-              &help.getInvolvedLink;
-            </label>&help.end;
+          <description class="text-blurb" id="helpDesc" data-l10n-id="about-dialog-help-out">
+            <label is="text-link" href="https://donate.torproject.org/" data-l10n-name="donate-link"></label>
+            <label is="text-link" href="https://community.torproject.org/" data-l10n-name="community-link"></label>
           </description>
         </vbox>
       </vbox>
     </hbox>
     <vbox id="bottomBox">
       <hbox id="newBottom" pack="center" position="1">
-        <label is="text-link" class="bottom-link" href="https://support.torproject.org/">&bottomLinks.questions;</label>
-        <label is="text-link" class="bottom-link" href="https://community.torproject.org/relay/">&bottomLinks.grow;</label>
-        <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:license">&bottomLinks.license;</label>
+        <label is="text-link" class="bottom-link" href="https://support.torproject.org/" data-l10n-id="about-dialog-questions-link"></label>
+        <label is="text-link" class="bottom-link" href="https://community.torproject.org/relay/" data-l10n-id="about-dialog-grow-tor-network-link"></label>
+        <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:license" data-l10n-id="about-dialog-browser-license-link"></label>
       </hbox>
       <description id="trademark" data-l10n-id="trademarkInfo"></description>
-      <description id="trademarkTor">&tor.TrademarkStatement;</description>
+      <description id="trademarkTor" data-l10n-id="about-dialog-trademark-statement"></description>
     </vbox>
   </html:div>