diff --git a/toolkit/locales/en-US/chrome/cookie/cookieAcceptDialog.dtd b/toolkit/locales/en-US/chrome/cookie/cookieAcceptDialog.dtd
index 4b9b5bb9b2af..565e3e6c8fcc 100644
--- a/toolkit/locales/en-US/chrome/cookie/cookieAcceptDialog.dtd
+++ b/toolkit/locales/en-US/chrome/cookie/cookieAcceptDialog.dtd
@@ -16,4 +16,3 @@
 <!ENTITY     dialog.title                   "Confirm setting cookie">
 <!ENTITY     dialog.remember.label          "Use my choice for all cookies from this site">
 <!ENTITY     dialog.remember.accesskey      "U">
-
diff --git a/toolkit/locales/en-US/chrome/global/charsetOverlay.dtd b/toolkit/locales/en-US/chrome/global/charsetOverlay.dtd
index 71c64a78d739..c58fb739a31b 100644
--- a/toolkit/locales/en-US/chrome/global/charsetOverlay.dtd
+++ b/toolkit/locales/en-US/chrome/global/charsetOverlay.dtd
@@ -1,21 +1,21 @@
 <!-- extracted from charsetOverlay.xul -->
-<!ENTITY charsetMenu.label				"Character Encoding">
-<!ENTITY charsetMenu.accesskey				"C">
-<!ENTITY charsetMenuAutodet.label			"Auto-Detect">
-<!ENTITY charsetMenuAutodet.accesskey			"a">
-<!ENTITY charsetMenuMore.label				"More Encodings">
-<!ENTITY charsetMenuMore.accesskey				"m">
-<!ENTITY charsetMenuMore1.label				"West European">
-<!ENTITY charsetMenuMore1.accesskey				"w">
-<!ENTITY charsetMenuMore2.label				"East European">
-<!ENTITY charsetMenuMore2.accesskey				"E">
-<!ENTITY charsetMenuMore3.label				"East Asian">
-<!ENTITY charsetMenuMore3.accesskey				"A">
-<!ENTITY charsetMenuMore4.label				"SE &amp; SW Asian">
-<!ENTITY charsetMenuMore4.accesskey				"S">
-<!ENTITY charsetMenuMore5.label				"Middle Eastern">
-<!ENTITY charsetMenuMore5.accesskey				"M">
-<!ENTITY charsetMenuUnicode.label				"Unicode">
-<!ENTITY charsetMenuUnicode.accesskey				"U">
-<!ENTITY charsetCustomize.label				"Customize List...">
-<!ENTITY charsetCustomize.accesskey				"c">
+<!ENTITY charsetMenu.label             "Character Encoding">
+<!ENTITY charsetMenu.accesskey         "C">
+<!ENTITY charsetMenuAutodet.label      "Auto-Detect">
+<!ENTITY charsetMenuAutodet.accesskey  "a">
+<!ENTITY charsetMenuMore.label         "More Encodings">
+<!ENTITY charsetMenuMore.accesskey     "m">
+<!ENTITY charsetMenuMore1.label        "West European">
+<!ENTITY charsetMenuMore1.accesskey    "w">
+<!ENTITY charsetMenuMore2.label        "East European">
+<!ENTITY charsetMenuMore2.accesskey    "E">
+<!ENTITY charsetMenuMore3.label        "East Asian">
+<!ENTITY charsetMenuMore3.accesskey    "A">
+<!ENTITY charsetMenuMore4.label        "SE &amp; SW Asian">
+<!ENTITY charsetMenuMore4.accesskey    "S">
+<!ENTITY charsetMenuMore5.label        "Middle Eastern">
+<!ENTITY charsetMenuMore5.accesskey    "M">
+<!ENTITY charsetMenuUnicode.label      "Unicode">
+<!ENTITY charsetMenuUnicode.accesskey  "U">
+<!ENTITY charsetCustomize.label        "Customize List...">
+<!ENTITY charsetCustomize.accesskey    "c">
diff --git a/toolkit/locales/en-US/chrome/global/commonDialog.dtd b/toolkit/locales/en-US/chrome/global/commonDialog.dtd
index e6340e293858..c9b303ca8f55 100644
--- a/toolkit/locales/en-US/chrome/global/commonDialog.dtd
+++ b/toolkit/locales/en-US/chrome/global/commonDialog.dtd
@@ -3,4 +3,4 @@
 <!ENTITY editfield0.label "User Name:"> 
 <!ENTITY editfield1.label "Password:"> 
 <!ENTITY editfield2.label "Confirm Password:"> 
-<!ENTITY checkbox.label   "check"> 
\ No newline at end of file
+<!ENTITY checkbox.label   "check">
diff --git a/toolkit/locales/en-US/chrome/global/customizeCharset.dtd b/toolkit/locales/en-US/chrome/global/customizeCharset.dtd
index 2334a5ff35fd..d62c39fcd2f4 100644
--- a/toolkit/locales/en-US/chrome/global/customizeCharset.dtd
+++ b/toolkit/locales/en-US/chrome/global/customizeCharset.dtd
@@ -37,14 +37,14 @@
    -
    - ***** END LICENSE BLOCK ***** -->
 
-<!ENTITY title.label      "Customize Character Encoding">
-<!ENTITY current.label    "Active Character Encodings:">
-<!ENTITY remove.label     "Remove">
-<!ENTITY remove.accessKey "R">
-<!ENTITY additional.label "Available Character Encodings:">
-<!ENTITY add.label        "Add">
-<!ENTITY add.accessKey    "A">
-<!ENTITY moveUp.label     "Move Up">
-<!ENTITY moveUp.accessKey "U">
-<!ENTITY moveDown.label   "Move Down">
+<!ENTITY title.label        "Customize Character Encoding">
+<!ENTITY current.label      "Active Character Encodings:">
+<!ENTITY remove.label       "Remove">
+<!ENTITY remove.accessKey   "R">
+<!ENTITY additional.label   "Available Character Encodings:">
+<!ENTITY add.label          "Add">
+<!ENTITY add.accessKey      "A">
+<!ENTITY moveUp.label       "Move Up">
+<!ENTITY moveUp.accessKey   "U">
+<!ENTITY moveDown.label     "Move Down">
 <!ENTITY moveDown.accessKey "D">
diff --git a/toolkit/locales/en-US/chrome/global/customizeToolbar.dtd b/toolkit/locales/en-US/chrome/global/customizeToolbar.dtd
index ddfd9495e24e..01e2ae7ef1b8 100644
--- a/toolkit/locales/en-US/chrome/global/customizeToolbar.dtd
+++ b/toolkit/locales/en-US/chrome/global/customizeToolbar.dtd
@@ -1,5 +1,5 @@
-<!ENTITY dialog.title "Customize Toolbar">
-<!ENTITY dialog.style "width: 635px; height: 400px;">
+<!ENTITY dialog.title             "Customize Toolbar">
+<!ENTITY dialog.style             "width: 635px; height: 400px;">
 <!ENTITY instructions.description "You can add or remove items by dragging to or from the toolbars.">
 <!ENTITY show.label               "Show:">
 <!ENTITY iconsAndText.label       "Icons and Text">
diff --git a/toolkit/locales/en-US/chrome/global/dialogOverlay.dtd b/toolkit/locales/en-US/chrome/global/dialogOverlay.dtd
index ed0d21c952bd..edec74acac46 100644
--- a/toolkit/locales/en-US/chrome/global/dialogOverlay.dtd
+++ b/toolkit/locales/en-US/chrome/global/dialogOverlay.dtd
@@ -40,7 +40,6 @@
 -->
 
 <!-- OK Cancel Buttons -->
-<!ENTITY okButton.label			"OK"> 
-<!ENTITY cancelButton.label		"Cancel"> 
-<!ENTITY helpButton.label		"Help">
-
+<!ENTITY okButton.label      "OK">
+<!ENTITY cancelButton.label  "Cancel">
+<!ENTITY helpButton.label    "Help">
diff --git a/toolkit/locales/en-US/chrome/global/nsHelperAppDlg.dtd b/toolkit/locales/en-US/chrome/global/nsHelperAppDlg.dtd
index b58167e294b0..9920853104d3 100644
--- a/toolkit/locales/en-US/chrome/global/nsHelperAppDlg.dtd
+++ b/toolkit/locales/en-US/chrome/global/nsHelperAppDlg.dtd
@@ -30,7 +30,6 @@
 <!ENTITY useSystemDefault.noDesc.label "Open it with the default application">
 <!ENTITY useSystemDefault.accesskey    "O">
 
-<!-- LOCALIZATION NOTE:  do not localize "#1" -->
 <!ENTITY openUsing.label       "Open it with">
 <!ENTITY openUsing.accesskey   "w">
 
diff --git a/toolkit/locales/en-US/chrome/global/nsProgressDialog.properties b/toolkit/locales/en-US/chrome/global/nsProgressDialog.properties
index ff4ad9082ae1..06cca0da154e 100644
--- a/toolkit/locales/en-US/chrome/global/nsProgressDialog.properties
+++ b/toolkit/locales/en-US/chrome/global/nsProgressDialog.properties
@@ -39,4 +39,3 @@ savingAlertTitle=Saving %S
 openingAlertTitle=Opening %S
 securityAlertMsg=Warning! Executable files may contain viruses or other malicious code that could harm your computer. Use caution when opening this file. Are you sure you want to launch %S?
 dontAskAgain=Don't ask me again.
-
diff --git a/toolkit/locales/en-US/chrome/global/printProgress.dtd b/toolkit/locales/en-US/chrome/global/printProgress.dtd
index 130fd541affc..e1c259e561f6 100644
--- a/toolkit/locales/en-US/chrome/global/printProgress.dtd
+++ b/toolkit/locales/en-US/chrome/global/printProgress.dtd
@@ -15,4 +15,3 @@
 
     #1 will be replaced by the percentage of the file that has been saved -->
 <!ENTITY percentPrint "#1&#037;">
-
diff --git a/toolkit/locales/en-US/chrome/global/printdialog.dtd b/toolkit/locales/en-US/chrome/global/printdialog.dtd
index 391290e2b2b4..96f9c5840ff1 100644
--- a/toolkit/locales/en-US/chrome/global/printdialog.dtd
+++ b/toolkit/locales/en-US/chrome/global/printdialog.dtd
@@ -26,4 +26,3 @@
 <!ENTITY aslaidoutRadio.label "As laid out on the screen">
 <!ENTITY selectedframeRadio.label  "The selected frame">
 <!ENTITY eachframesepRadio.label  "Each frame separately">
-
diff --git a/toolkit/locales/en-US/chrome/mozapps/downloads/downloadProperties.dtd b/toolkit/locales/en-US/chrome/mozapps/downloads/downloadProperties.dtd
index 16acc443d666..a512a16ecbfd 100644
--- a/toolkit/locales/en-US/chrome/mozapps/downloads/downloadProperties.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/downloads/downloadProperties.dtd
@@ -4,4 +4,4 @@
 <!ENTITY downloadedFrom.label   "From:">
 <!ENTITY path.label             "To:">
 <!ENTITY acceptButton.label     "Close">
-<!ENTITY cmd.close.commandKey   "w">
\ No newline at end of file
+<!ENTITY cmd.close.commandKey   "w">
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/about.dtd b/toolkit/locales/en-US/chrome/mozapps/extensions/about.dtd
index 3f97dc6f13db..8adc303d5f7c 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/about.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/extensions/about.dtd
@@ -3,5 +3,3 @@
 <!ENTITY  translators.label           "Translators:">
 <!ENTITY  contributors.label          "Contributors:">
 <!ENTITY  homepage.label              "Visit Home Page">
-
-
diff --git a/toolkit/locales/en-US/chrome/mozapps/help/help-toc.rdf b/toolkit/locales/en-US/chrome/mozapps/help/help-toc.rdf
index 03c1c5312ffc..c7f9df96a564 100644
--- a/toolkit/locales/en-US/chrome/mozapps/help/help-toc.rdf
+++ b/toolkit/locales/en-US/chrome/mozapps/help/help-toc.rdf
@@ -14,8 +14,10 @@
   <rdf:Description about="#use-help">
     <nc:subheadings>
       <rdf:Seq>
-        <rdf:li> <rdf:Description ID="use-help-finding-the-topic-you-want" nc:name="Finding the Topic You Want" nc:link="chrome://help/locale/welcome.xhtml#finding_the_topic_you_want"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="use-help-search" nc:name="Search Tips" nc:link="chrome://help/locale/welcome.xhtml#search_tips"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="use-help-finding-the-topic-you-want" nc:name="Finding the Topic You Want"
+                  nc:link="chrome://help/locale/welcome.xhtml#finding_the_topic_you_want"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="use-help-search" nc:name="Search Tips"
+                  nc:link="chrome://help/locale/welcome.xhtml#search_tips"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
diff --git a/toolkit/locales/en-US/chrome/mozapps/help/help.dtd b/toolkit/locales/en-US/chrome/mozapps/help/help.dtd
index 82f1449b045e..7f81fa233959 100644
--- a/toolkit/locales/en-US/chrome/mozapps/help/help.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/help/help.dtd
@@ -22,14 +22,14 @@
 <!ENTITY printButton.tooltip            "Print this page">
 <!ENTITY closeWindow.commandkey         "W">
 
-<!ENTITY searchtab.label    	  	"Search">
+<!ENTITY searchtab.label                "Search">
 <!ENTITY searchtab.accesskey            "S">
 <!ENTITY searchClose.tooltip            "Close search results">
-<!ENTITY toctab.label       	  	"Contents">
+<!ENTITY toctab.label                   "Contents">
 <!ENTITY toctab.accesskey               "C">
 
-<!ENTITY textZoomReduceCmd.commandkey	"-">
-<!ENTITY textZoomEnlargeCmd.commandkey	"+">
+<!ENTITY textZoomReduceCmd.commandkey   "-">
+<!ENTITY textZoomEnlargeCmd.commandkey  "+">
 <!ENTITY textZoomEnlargeCmd.commandkey2 "="> <!-- + is above this key on many keyboards -->
 <!ENTITY textZoomResetCmd.commandkey    "0">
 
diff --git a/toolkit/locales/en-US/chrome/mozapps/preferences/preferences.properties b/toolkit/locales/en-US/chrome/mozapps/preferences/preferences.properties
index 8a75dac705b6..990fc9f34c95 100644
--- a/toolkit/locales/en-US/chrome/mozapps/preferences/preferences.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/preferences/preferences.properties
@@ -15,4 +15,3 @@ pw_change2empty_in_fips_mode=You are currently in FIPS mode. FIPS requires a non
 pw_change_success_title=Password Change Succeeded
 pw_change_failed_title=Password Change Failed
 pw_remove_button=Remove
-