diff --git a/mail/locales/en-US/README.txt b/mail/locales/en-US/README.txt
index b1f4cee4297..4d8e68cc1be 100644
--- a/mail/locales/en-US/README.txt
+++ b/mail/locales/en-US/README.txt
@@ -1,4 +1,3 @@
For information about installing, running and configuring Thunderbird
including a list of known issues and troubleshooting information,
refer to: http://getthunderbird.com/releases/
-
diff --git a/mail/locales/en-US/chrome/messenger-smime/msgSecurityInfo.properties b/mail/locales/en-US/chrome/messenger-smime/msgSecurityInfo.properties
index 04ea0a17e2e..aef72c8c6df 100644
--- a/mail/locales/en-US/chrome/messenger-smime/msgSecurityInfo.properties
+++ b/mail/locales/en-US/chrome/messenger-smime/msgSecurityInfo.properties
@@ -42,7 +42,6 @@ EIPasswordError=You did not enter your Master Password correctly.
EIInvalidCipher=The message was encrypted using an encryption strength that this version of your software does not support.
EIClueless=There are unknown problems with this encrypted message.
-
## Signing Power Information string
SPCanLabel=Message Can Be Signed
SPCanHeader=You have chosen to digitally sign this message before sending it.
@@ -57,7 +56,6 @@ SPNoValidCert=The certificate you have specified for signing messages is not yet
SPExpiredCert=The certificate you have specified for signing messages has expired.
SPRevokedCert=The certificate you have specified for signing messages has been revoked.
-
## Encryption Power Information string
EPCanLabel=Message Can Be Encrypted
EPCanHeader=You have chosen to encrypt this message before sending it.
diff --git a/mail/locales/en-US/chrome/messenger/addressbook/abMainWindow.dtd b/mail/locales/en-US/chrome/messenger/addressbook/abMainWindow.dtd
index 1deb7ec22dd..931585a88bf 100644
--- a/mail/locales/en-US/chrome/messenger/addressbook/abMainWindow.dtd
+++ b/mail/locales/en-US/chrome/messenger/addressbook/abMainWindow.dtd
@@ -238,7 +238,7 @@
-
+
diff --git a/mail/locales/en-US/chrome/messenger/am-server-top.dtd b/mail/locales/en-US/chrome/messenger/am-server-top.dtd
index 6dea1808812..c40dc426274 100644
--- a/mail/locales/en-US/chrome/messenger/am-server-top.dtd
+++ b/mail/locales/en-US/chrome/messenger/am-server-top.dtd
@@ -84,8 +84,8 @@
-
+
diff --git a/mail/locales/en-US/chrome/messenger/comm4xMailImportMsgs.properties b/mail/locales/en-US/chrome/messenger/comm4xMailImportMsgs.properties
index aabb94bdd87..57a8193e1cb 100644
--- a/mail/locales/en-US/chrome/messenger/comm4xMailImportMsgs.properties
+++ b/mail/locales/en-US/chrome/messenger/comm4xMailImportMsgs.properties
@@ -65,5 +65,3 @@
## @name COMM4XMAILIMPORT_MAILBOX_CONVERTERROR
## @loc None
2004=An error occurred while importing messages from %S. Messages were not imported. Make more disk space available and try again.
-
-
diff --git a/mail/locales/en-US/chrome/messenger/eudoraImportMsgs.properties b/mail/locales/en-US/chrome/messenger/eudoraImportMsgs.properties
index 94ecd2b74bb..2b0683133c7 100644
--- a/mail/locales/en-US/chrome/messenger/eudoraImportMsgs.properties
+++ b/mail/locales/en-US/chrome/messenger/eudoraImportMsgs.properties
@@ -56,13 +56,11 @@
# the %S represents a string to be inserted at runtime (the name of the Mailbox),
# and the %d is a number (the number of messages imported). Do not translate %d or %S, but
# instead insert them in your text at the appropriate places.
-
2002=Mailbox %S, imported %d messages
# Error message
## @name EUDORAIMPORT_MAILBOX_BADPARAM
## @loc None
-
2003=Bad parameter passed to import mailbox.
# Error message
@@ -70,7 +68,6 @@
## @loc None
# LOCALIZATION NOTE (2004): In the following sentence, do not translate the "%S". Instead,
# place it in your sentence where you wish to display the name of the mailbox.
-
2004=Error accessing file for mailbox %S.
# Error message
@@ -78,21 +75,18 @@
## @loc None
# LOCALIZATION NOTE (2005): In the following sentence, do not translate the "%S". Instead,
# place it in your sentence where you wish to display the name of the mailbox.
-
2005=Error importing mailbox %S, all messages may not be imported from this mailbox.
# Description
## @name EUDORAIMPORT_ACCOUNTNAME
## @loc None
# LOCALIZATION NOTE (2006): Do not translate "Eudora" below.
-
2006=Eudora Settings
# Description
## @name EUDORAIMPORT_NICKNAMES_NAME
## @loc None
# LOCALIZATION NOTE (2007): Do not translate "Eudora" below.
-
2007=Eudora Nicknames
# Description
@@ -100,13 +94,11 @@
## @loc None
# LOCALIZATION NOTE (2008): In the following sentence, do not translate the "%S". Instead,
# place it in your sentence where you wish to display the name of the address book.
-
2008=Imported address book %S
# Error message
## @name EUDORAIMPORT_ADDRESS_BADPARAM
## @loc None
-
2009=Bad parameter passed to import address book.
# Error message
@@ -114,7 +106,6 @@
## @loc None
# LOCALIZATION NOTE (2010): In the following sentence, do not translate the "%S". Instead,
# place it in your sentence where you wish to display the name of the address book.
-
2010=Error accessing file for address book %S.
# Error message
@@ -122,8 +113,4 @@
## @loc None
# LOCALIZATION NOTE (2011): In the following sentence, do not translate the "%S". Instead,
# place it in your sentence where you wish to display the name of the address book.
-
2011=Error importing address book %S, all addresses may not have been imported.
-
-
-
diff --git a/mail/locales/en-US/chrome/messenger/fieldMapImport.dtd b/mail/locales/en-US/chrome/messenger/fieldMapImport.dtd
index 6cfed5f997a..d0f7375d7be 100644
--- a/mail/locales/en-US/chrome/messenger/fieldMapImport.dtd
+++ b/mail/locales/en-US/chrome/messenger/fieldMapImport.dtd
@@ -51,5 +51,3 @@
-
-
diff --git a/mail/locales/en-US/chrome/messenger/imapMsgs.properties b/mail/locales/en-US/chrome/messenger/imapMsgs.properties
index 0e52ac4f489..c168a5b9956 100644
--- a/mail/locales/en-US/chrome/messenger/imapMsgs.properties
+++ b/mail/locales/en-US/chrome/messenger/imapMsgs.properties
@@ -55,7 +55,6 @@
# LOCALIZATION NOTE (Error 5002): The "%S" below should not be translated.
# Instead, insert "%S" in your translation where you wish to display the name
# of the folder being deleted.
-
5002=Deleting folder %S...
# Status - renaming mailbox
@@ -188,7 +187,6 @@
# LOCALIZATION NOTE (Error 5036): Do not translate the word "%S" or "%lu" below.
# Place the word %S in your translation where the name of the server should appear.
# Place the word %lu where the number of headers should appear.
-
5036=%S Downloading message header %lu of %lu
## @name IMAP_RECEIVING_MESSAGE_FLAGS_OF
@@ -210,7 +208,6 @@
## @loc None
# LOCALIZATION NOTE (Error 5040): Do not translate the word "%S" below.
# Place the word %S in your translation where the name of the folder should appear.
-
5040=Moving messages to %S...
## @name IMAP_MOVING_MESSAGE_TO
@@ -443,7 +440,6 @@ reduce the number of cached connections.
# Place the word %3$S in your translation where the name of the destination folder should appear.
# Place the word %1$S where the currently copying message should appear.
# Place the word %2$S where the total number of messages should appear.
-
5103=Copying Message %1$S of %2$S to %3$S
## @name IMAP_LOGIN_DISABLED
diff --git a/mail/locales/en-US/chrome/messenger/importMsgs.properties b/mail/locales/en-US/chrome/messenger/importMsgs.properties
index 21fad32e0af..dee5c917fa1 100644
--- a/mail/locales/en-US/chrome/messenger/importMsgs.properties
+++ b/mail/locales/en-US/chrome/messenger/importMsgs.properties
@@ -314,7 +314,6 @@ ImportAddressFailed=An error occurred importing addresses from %S.
# LOCALIZATION NOTE : Do not translate the word "%S" below.
ImportAddressSuccess=Addresses successfully imported from %S.
-
#Progress strings
MailProgressTitle=Importing Mail
AddrProgressTitle=Importing Address Books
@@ -349,4 +348,3 @@ ModuleFolderName=%S Mail
# strings profile dialog that comes up when importing mail from 4.x
profileTitle=Communicator 4.x profiles
profileText=Choose the profile that contains the Local Mail you want to import:
-
diff --git a/mail/locales/en-US/chrome/messenger/localMsgs.properties b/mail/locales/en-US/chrome/messenger/localMsgs.properties
index e3702155274..fd024c219d6 100644
--- a/mail/locales/en-US/chrome/messenger/localMsgs.properties
+++ b/mail/locales/en-US/chrome/messenger/localMsgs.properties
@@ -89,11 +89,6 @@
## @loc None
4006=Unable to write the email to the mailbox. Make sure the file system allows you write privileges, and you have enough disk space to copy the mailbox.
-# Status - write error occurred
-## @name POP3_MESSAGE_FOLDER_BUSY
-## @loc None
-4029=This folder is being processed. Please wait until processing is complete to get messages.
-
# Status - connecting to host
## @name POP3_CONNECT_HOST_CONTACTED_SENDING_LOGIN_INFORMATION
## @loc None
@@ -208,6 +203,11 @@
## @loc None
4028=Moving %S of %S messages to %S
+# Status - write error occurred
+## @name POP3_MESSAGE_FOLDER_BUSY
+## @loc None
+4029=This folder is being processed. Please wait until processing is complete to get messages.
+
# secure authentication failed
## @name CANNOT_PROCESS_SECURE_AUTH
## @loc None
diff --git a/mail/locales/en-US/chrome/messenger/mailEditorOverlay.dtd b/mail/locales/en-US/chrome/messenger/mailEditorOverlay.dtd
index bf137517804..4f90a02b0d9 100644
--- a/mail/locales/en-US/chrome/messenger/mailEditorOverlay.dtd
+++ b/mail/locales/en-US/chrome/messenger/mailEditorOverlay.dtd
@@ -1,3 +1,2 @@
-
diff --git a/mail/locales/en-US/chrome/messenger/markByDate.dtd b/mail/locales/en-US/chrome/messenger/markByDate.dtd
index ae216c28425..efebf332f65 100644
--- a/mail/locales/en-US/chrome/messenger/markByDate.dtd
+++ b/mail/locales/en-US/chrome/messenger/markByDate.dtd
@@ -38,5 +38,5 @@
-
+
diff --git a/mail/locales/en-US/chrome/messenger/messenger.dtd b/mail/locales/en-US/chrome/messenger/messenger.dtd
index b470b1640fc..37d652d1b50 100644
--- a/mail/locales/en-US/chrome/messenger/messenger.dtd
+++ b/mail/locales/en-US/chrome/messenger/messenger.dtd
@@ -164,8 +164,8 @@
-
+
@@ -230,7 +230,6 @@
-
@@ -413,8 +412,8 @@
-
+
@@ -597,11 +596,11 @@
-
+
-
+
@@ -622,7 +621,7 @@
-
+
diff --git a/mail/locales/en-US/chrome/messenger/mime.properties b/mail/locales/en-US/chrome/messenger/mime.properties
index 6cd7fa51fe4..1d82443b8bc 100644
--- a/mail/locales/en-US/chrome/messenger/mime.properties
+++ b/mail/locales/en-US/chrome/messenger/mime.properties
@@ -217,7 +217,7 @@
# XSender Internal
## @name MIME_MSG_XSENDER_INTERNAL
## @loc
-# LOCALIZATION NOTE (1031): Only translate the word "Internal in the line below".
+# LOCALIZATION NOTE (1031): Only translate the word "Internal" in the line below.
1031= Internal
# User wrote
diff --git a/mail/locales/en-US/chrome/messenger/msgAccountCentral.dtd b/mail/locales/en-US/chrome/messenger/msgAccountCentral.dtd
index 9aba67fd493..47dcc3fd3cf 100644
--- a/mail/locales/en-US/chrome/messenger/msgAccountCentral.dtd
+++ b/mail/locales/en-US/chrome/messenger/msgAccountCentral.dtd
@@ -16,6 +16,5 @@
-
-
\ No newline at end of file
+
diff --git a/mail/locales/en-US/chrome/messenger/msgHdrViewOverlay.dtd b/mail/locales/en-US/chrome/messenger/msgHdrViewOverlay.dtd
index 208f3d86d33..6c038a6aeda 100644
--- a/mail/locales/en-US/chrome/messenger/msgHdrViewOverlay.dtd
+++ b/mail/locales/en-US/chrome/messenger/msgHdrViewOverlay.dtd
@@ -73,5 +73,3 @@
-
-
diff --git a/mail/locales/en-US/chrome/messenger/oeImportMsgs.properties b/mail/locales/en-US/chrome/messenger/oeImportMsgs.properties
index ef49ff9c626..799db509c33 100644
--- a/mail/locales/en-US/chrome/messenger/oeImportMsgs.properties
+++ b/mail/locales/en-US/chrome/messenger/oeImportMsgs.properties
@@ -57,7 +57,6 @@
## LOCALIZATION NOTE (2002): In this item, don't translate "%S" or "%d"
## The variable %S will contain the name of the Mailbox
## The variable %d will contain the number of messages
-
2002=Mailbox %S, imported %d messages
# Error message
diff --git a/mail/locales/en-US/chrome/messenger/outlookImportMsgs.properties b/mail/locales/en-US/chrome/messenger/outlookImportMsgs.properties
index 207dd91a1b1..f6bac2cc15d 100644
--- a/mail/locales/en-US/chrome/messenger/outlookImportMsgs.properties
+++ b/mail/locales/en-US/chrome/messenger/outlookImportMsgs.properties
@@ -102,8 +102,3 @@
## LOCALIZATION NOTE (2009): In this item, don't translate "%S"
## The variable %S will receive the name of the address book
2009=Error importing address book %S, all addresses may not have been imported.
-
-
-
-
-
diff --git a/mail/locales/en-US/chrome/messenger/preferences/compose.dtd b/mail/locales/en-US/chrome/messenger/preferences/compose.dtd
index c86fd1e25e9..8e629dc89df 100644
--- a/mail/locales/en-US/chrome/messenger/preferences/compose.dtd
+++ b/mail/locales/en-US/chrome/messenger/preferences/compose.dtd
@@ -57,4 +57,4 @@
-
\ No newline at end of file
+
diff --git a/mail/locales/en-US/chrome/messenger/preferences/display.dtd b/mail/locales/en-US/chrome/messenger/preferences/display.dtd
index 998b775f6fc..b5a8d9c5dfe 100644
--- a/mail/locales/en-US/chrome/messenger/preferences/display.dtd
+++ b/mail/locales/en-US/chrome/messenger/preferences/display.dtd
@@ -52,7 +52,6 @@
-
@@ -63,4 +62,4 @@
-
\ No newline at end of file
+
diff --git a/mail/locales/en-US/chrome/messenger/textImportMsgs.properties b/mail/locales/en-US/chrome/messenger/textImportMsgs.properties
index ebcc25ca133..16da268aea9 100644
--- a/mail/locales/en-US/chrome/messenger/textImportMsgs.properties
+++ b/mail/locales/en-US/chrome/messenger/textImportMsgs.properties
@@ -73,6 +73,3 @@
## @name TEXTIMPORT_ADDRESS_CONVERTERROR
## @loc None
2006=Error importing address book %S, all addresses may not have been imported.
-
-
-
diff --git a/mail/locales/en-US/chrome/messenger/threadpane.dtd b/mail/locales/en-US/chrome/messenger/threadpane.dtd
index f2f27c68a0d..67a247189bd 100644
--- a/mail/locales/en-US/chrome/messenger/threadpane.dtd
+++ b/mail/locales/en-US/chrome/messenger/threadpane.dtd
@@ -73,6 +73,3 @@
-
-
-
diff --git a/mail/locales/en-US/chrome/messenger/virtualFolderName.dtd b/mail/locales/en-US/chrome/messenger/virtualFolderName.dtd
index 1c346632771..95b713bdb24 100644
--- a/mail/locales/en-US/chrome/messenger/virtualFolderName.dtd
+++ b/mail/locales/en-US/chrome/messenger/virtualFolderName.dtd
@@ -34,7 +34,7 @@
- the terms of any one of the MPL, the GPL or the LGPL.
-
- ***** END LICENSE BLOCK ***** -->
-
+
diff --git a/mail/locales/en-US/chrome/mozapps/downloads/pref-downloads.dtd b/mail/locales/en-US/chrome/mozapps/downloads/pref-downloads.dtd
index 765dd9b42cb..e69de29bb2d 100755
--- a/mail/locales/en-US/chrome/mozapps/downloads/pref-downloads.dtd
+++ b/mail/locales/en-US/chrome/mozapps/downloads/pref-downloads.dtd
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/mail/locales/en-US/os2/README.txt b/mail/locales/en-US/os2/README.txt
index 4b9574e2962..67a3c6117a3 100755
--- a/mail/locales/en-US/os2/README.txt
+++ b/mail/locales/en-US/os2/README.txt
@@ -116,7 +116,7 @@ OS/2 Installation Instructions
5. To start Thunderbird, navigate to the directory you extracted
Thunderbird to, make sure that the C library DLLs are copied to the
installation directory or installed in the LIBPATH, and then double-click
- the Thunderbird.exe object.
+ the thunderbird.exe object.
Running multiple versions concurrently
diff --git a/security/manager/locales/en-US/chrome/pippki/certManager.dtd b/security/manager/locales/en-US/chrome/pippki/certManager.dtd
index 09d76a875a2..a5b7630c061 100644
--- a/security/manager/locales/en-US/chrome/pippki/certManager.dtd
+++ b/security/manager/locales/en-US/chrome/pippki/certManager.dtd
@@ -120,4 +120,3 @@
-
diff --git a/security/manager/locales/en-US/chrome/pippki/pippki.properties b/security/manager/locales/en-US/chrome/pippki/pippki.properties
index c69ffff83ba..bbe74f228dd 100644
--- a/security/manager/locales/en-US/chrome/pippki/pippki.properties
+++ b/security/manager/locales/en-US/chrome/pippki/pippki.properties
@@ -169,7 +169,7 @@ crlNextUpdateMsg2=The certificate revocation list (CRL) from "%S" needs to be up
NoUpdateFailure=None
lastFetchUrlLabel=URL originally fetched from
advertisedUrlLabel=URL advertised by the CA
-CrlUpdatePrefsSetConfirmation = Automatic update preferences will take effect when you restart the browser.
+CrlUpdatePrefsSetConfirmation=Automatic update preferences will take effect when you restart the browser.
crlAutoUpdateDayCntError=Number of days before next update must be a number greater than zero.
crlAutoUpdtaeFreqCntError=Frequency of update must be a number greater than zero.
disabledStatement=Automatic Update is not enabled for this CRL.
diff --git a/security/manager/locales/en-US/chrome/pippki/pref-ssl.dtd b/security/manager/locales/en-US/chrome/pippki/pref-ssl.dtd
index f23593824c4..1b104f183ac 100644
--- a/security/manager/locales/en-US/chrome/pippki/pref-ssl.dtd
+++ b/security/manager/locales/en-US/chrome/pippki/pref-ssl.dtd
@@ -81,7 +81,6 @@
-
diff --git a/toolkit/locales/en-US/chrome/global-platform/mac/intl.properties b/toolkit/locales/en-US/chrome/global-platform/mac/intl.properties
index e7613667b45..608897d0ce0 100644
--- a/toolkit/locales/en-US/chrome/global-platform/mac/intl.properties
+++ b/toolkit/locales/en-US/chrome/global-platform/mac/intl.properties
@@ -2,4 +2,3 @@
# valid collation options are: or useCodePointOrder
intl.collationOption=
intl.charset.default=ISO-8859-1
-
diff --git a/toolkit/locales/en-US/chrome/global-platform/unix/intl.properties b/toolkit/locales/en-US/chrome/global-platform/unix/intl.properties
index e7613667b45..608897d0ce0 100644
--- a/toolkit/locales/en-US/chrome/global-platform/unix/intl.properties
+++ b/toolkit/locales/en-US/chrome/global-platform/unix/intl.properties
@@ -2,4 +2,3 @@
# valid collation options are: or useCodePointOrder
intl.collationOption=
intl.charset.default=ISO-8859-1
-
diff --git a/toolkit/locales/en-US/chrome/global-platform/win/intl.properties b/toolkit/locales/en-US/chrome/global-platform/win/intl.properties
index e7613667b45..608897d0ce0 100644
--- a/toolkit/locales/en-US/chrome/global-platform/win/intl.properties
+++ b/toolkit/locales/en-US/chrome/global-platform/win/intl.properties
@@ -2,4 +2,3 @@
# valid collation options are: or useCodePointOrder
intl.collationOption=
intl.charset.default=ISO-8859-1
-
diff --git a/toolkit/locales/en-US/chrome/global/config.dtd b/toolkit/locales/en-US/chrome/global/config.dtd
index 4f90dd92f67..4fb5bf931ed 100644
--- a/toolkit/locales/en-US/chrome/global/config.dtd
+++ b/toolkit/locales/en-US/chrome/global/config.dtd
@@ -72,4 +72,3 @@
-
diff --git a/toolkit/locales/en-US/chrome/global/console.properties b/toolkit/locales/en-US/chrome/global/console.properties
index b8f93e303ce..7516e2c7351 100644
--- a/toolkit/locales/en-US/chrome/global/console.properties
+++ b/toolkit/locales/en-US/chrome/global/console.properties
@@ -5,4 +5,3 @@ errFile=Source File: %S
errLine=Line: %S
errLineCol=Line: %S, Column: %S
errCode=Source Code:
-
diff --git a/toolkit/locales/en-US/chrome/global/xpinstall/xpinstall.properties b/toolkit/locales/en-US/chrome/global/xpinstall/xpinstall.properties
index d96a3c398c3..4e50178324a 100644
--- a/toolkit/locales/en-US/chrome/global/xpinstall/xpinstall.properties
+++ b/toolkit/locales/en-US/chrome/global/xpinstall/xpinstall.properties
@@ -127,4 +127,3 @@ error-299=Out of memory
# there are other error codes, either rare or obsolete,
# that are not worth translating at this time.
unknown.error=Unexpected error %S
-
diff --git a/toolkit/locales/en-US/chrome/mozapps/downloads/downloads.properties b/toolkit/locales/en-US/chrome/mozapps/downloads/downloads.properties
index c5a380a6d18..3d60ff1c6f9 100644
--- a/toolkit/locales/en-US/chrome/mozapps/downloads/downloads.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/downloads/downloads.properties
@@ -11,8 +11,8 @@ quitCancelDownloadsAlertMsgMultiple=If you exit now, %S downloads will be cancel
quitCancelDownloadsAlertMsgMac=If you quit now, 1 download will be canceled. Are you sure you want to quit?
quitCancelDownloadsAlertMsgMacMultiple=If you quit now, %S downloads will be canceled. Are you sure you want to quit?
offlineCancelDownloadsAlertTitle=Cancel All Downloads?
-offlineCancelDownloadsAlertMsgMultiple=If you go offline now, %S downloads will be canceled. Are you sure you want to go offline?
offlineCancelDownloadsAlertMsg=If you go offline now, 1 download will be canceled. Are you sure you want to go offline?
+offlineCancelDownloadsAlertMsgMultiple=If you go offline now, %S downloads will be canceled. Are you sure you want to go offline?
cancelDownloadsOKText=Cancel 1 Download
cancelDownloadsOKTextMultiple=Cancel %S Downloads
dontQuitButtonWin=Don't Exit
diff --git a/toolkit/locales/en-US/chrome/mozapps/downloads/unknownContentType.dtd b/toolkit/locales/en-US/chrome/mozapps/downloads/unknownContentType.dtd
index 589cc79a745..28336a272d8 100755
--- a/toolkit/locales/en-US/chrome/mozapps/downloads/unknownContentType.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/downloads/unknownContentType.dtd
@@ -61,5 +61,3 @@
-
-
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
index 9bdb166b743..6123a8bc532 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
@@ -58,4 +58,3 @@
-
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/update.dtd b/toolkit/locales/en-US/chrome/mozapps/extensions/update.dtd
index 9a89b58a2dc..ad4a27cf4ea 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/update.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/extensions/update.dtd
@@ -81,4 +81,3 @@
-
diff --git a/toolkit/locales/en-US/chrome/mozapps/plugins/plugins.dtd b/toolkit/locales/en-US/chrome/mozapps/plugins/plugins.dtd
index 0f20d01adb7..5c34fb38868 100644
--- a/toolkit/locales/en-US/chrome/mozapps/plugins/plugins.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/plugins/plugins.dtd
@@ -19,4 +19,3 @@
-
diff --git a/toolkit/locales/en-US/chrome/mozapps/plugins/plugins.properties b/toolkit/locales/en-US/chrome/mozapps/plugins/plugins.properties
index 6229ae487f0..30e116afd07 100644
--- a/toolkit/locales/en-US/chrome/mozapps/plugins/plugins.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/plugins/plugins.properties
@@ -21,4 +21,3 @@ pluginInstallation.noPluginsInstalled=No plugins were installed.
pluginInstallation.unknownPlugin=Unknown Plugin
missingPlugin.label=Click here to download plugin.
-
diff --git a/toolkit/locales/en-US/chrome/mozapps/preferences/update.dtd b/toolkit/locales/en-US/chrome/mozapps/preferences/update.dtd
index 1cb42a5d278..e69de29bb2d 100644
--- a/toolkit/locales/en-US/chrome/mozapps/preferences/update.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/preferences/update.dtd
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/toolkit/locales/en-US/installer/unix/install.it b/toolkit/locales/en-US/installer/unix/install.it
index 9cdd6403f8f..d77e8b51323 100644
--- a/toolkit/locales/en-US/installer/unix/install.it
+++ b/toolkit/locales/en-US/installer/unix/install.it
@@ -87,4 +87,3 @@ UNKNOWN=Unknown
-626=Insufficient permission
-627=Insufficient disk space
-628=Multiple CRC Failure
-
diff --git a/toolkit/locales/en-US/installer/windows/charset.mk b/toolkit/locales/en-US/installer/windows/charset.mk
index 110e5a71ad2..15a16f67bc9 100644
--- a/toolkit/locales/en-US/installer/windows/charset.mk
+++ b/toolkit/locales/en-US/installer/windows/charset.mk
@@ -19,4 +19,3 @@ WIN_INSTALLER_CHARSET = CP1252
# HEBREW_CHARSET CP1255
# Thai language edition of Windows:
# THAI_CHARSET CP874
-