--- a/browser/locales/en-US/chrome/browser/aboutDialog.dtd
+++ b/browser/locales/en-US/chrome/browser/aboutDialog.dtd
@@ -21,17 +21,17 @@
 <!-- LOCALIZATION NOTE (warningDesc.version): This is a warning about the experimental nature of Nightly and Aurora builds. It is only shown in those versions. -->
 <!ENTITY warningDesc.version        "&brandShortName; is experimental and may be unstable.">
 
 <!-- LOCALIZATION NOTE (community.exp.*) This paragraph is shown in "experimental" builds, i.e. Nightly and Aurora builds, instead of the other "community.*" strings below. -->
 <!ENTITY community.exp.start        "">
 <!-- LOCALIZATION NOTE (community.exp.mozillaLink): This is a link title that links to http://www.mozilla.org/. -->
 <!ENTITY community.exp.mozillaLink  "&vendorShortName;">
 <!ENTITY community.exp.middle       " is a ">
-<!-- LOCALIZATION NOTE (community.exp.creditslink): This is a link title that links to about:credits. -->
+<!-- LOCALIZATION NOTE (community.exp.creditsLink): This is a link title that links to about:credits. -->
 <!ENTITY community.exp.creditsLink  "global community">
 <!ENTITY community.exp.end          " working together to keep the Web open, public and accessible to all.">
 
 <!ENTITY community.start2           "&brandShortName; is designed by ">
 <!-- LOCALIZATION NOTE (community.mozillaLink): This is a link title that links to http://www.mozilla.org/. -->
 <!ENTITY community.mozillaLink      "&vendorShortName;">
 <!ENTITY community.middle2          ", a ">
 <!-- LOCALIZATION NOTE (community.creditsLink): This is a link title that links to about:credits. -->

--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -253,17 +253,17 @@ These should match what Safari and other
 <!ENTITY hideBookmarksSidebar.label         "Hide Bookmarks Sidebar">
 <!ENTITY viewBookmarksToolbar.label         "View Bookmarks Toolbar">
 <!ENTITY hideBookmarksToolbar.label         "Hide Bookmarks Toolbar">
 <!ENTITY searchBookmarks.label              "Search Bookmarks">
 <!ENTITY bookmarkingTools.label             "Bookmarking Tools">
 <!ENTITY addBookmarksMenu.label             "Add Bookmarks Menu to Toolbar">
 <!ENTITY removeBookmarksMenu.label          "Remove Bookmarks Menu from Toolbar">
 
-<!-- LOCALIZATION NOTE (bookmarksSidebarGtkCmd.commandkey): This command
+<!-- LOCALIZATION NOTE (bookmarksGtkCmd.commandkey): This command
   -  key should not contain the letters A-F, since these are reserved
   -  shortcut keys on Linux. -->
 <!ENTITY bookmarksGtkCmd.commandkey "o">
 <!ENTITY bookmarksWinCmd.commandkey "i">
 
 <!ENTITY historyButton.label            "History">
 <!ENTITY historySidebarCmd.commandKey   "h">
 
@@ -370,17 +370,17 @@ These should match what Safari and other
 <!ENTITY appMenuRemoteTabs.showMore.tooltip "Show more tabs from this device">
 <!-- LOCALIZATION NOTE (appMenuRemoteTabs.showAll.label, appMenuRemoteTabs.showAll.tooltip):
      This is shown after the tabs list if we can all the remaining tabs by clicking on the button -->
 <!ENTITY appMenuRemoteTabs.showAll.label "Show All">
 <!ENTITY appMenuRemoteTabs.showAll.tooltip "Show all tabs from this device">
 <!-- LOCALIZATION NOTE (appMenuRemoteTabs.tabsnotsyncing.label): This is shown
      when Sync is configured but syncing tabs is disabled. -->
 <!ENTITY appMenuRemoteTabs.tabsnotsyncing.label "Turn on tab syncing to view a list of tabs from your other devices.">
-<!-- LOCALIZATION NOTE (appMenuRemoteTabs.noclients.label): This is shown
+<!-- LOCALIZATION NOTE (appMenuRemoteTabs.noclients.subtitle): This is shown
      when Sync is configured but this appears to be the only device attached to
      the account. We also show links to download Firefox for android/ios. -->
 <!ENTITY appMenuRemoteTabs.noclients.subtitle "Want to see your tabs from other devices here?">
 <!ENTITY appMenuRemoteTabs.openprefs.label "Sync Preferences">
 <!ENTITY appMenuRemoteTabs.notsignedin.label "Sign in to view a list of tabs from your other devices.">
 <!ENTITY appMenuRemoteTabs.unverified.label "Your account needs to be verified.">
 <!ENTITY appMenuRemoteTabs.signin.label "Sign in to Sync">
 <!ENTITY appMenuRemoteTabs.managedevices.label "Manage Devices…">

--- a/browser/locales/en-US/chrome/browser/browser.properties
+++ b/browser/locales/en-US/chrome/browser/browser.properties
@@ -79,17 +79,17 @@ webextPerms.updateMenuItem=%S requires n
 # LOCALIZATION NOTE (webextPerms.updateText)
 # %S is replaced with the localized name of the updated extension.
 # Note, this string will be used as raw markup. Avoid characters like <, >, &
 webextPerms.updateText=%S has been updated. You must approve new permissions before the updated version will install. Choosing “Cancel” will maintain your current add-on version.
 
 webextPerms.updateAccept.label=Update
 webextPerms.updateAccept.accessKey=U
 
-# LOCALIZATION NOTE (webextPerms.optionalPermsHheader)
+# LOCALIZATION NOTE (webextPerms.optionalPermsHeader)
 # %S is replace with the localized name of the extension requested new
 # permissions.
 # Note, this string will be used as raw markup. Avoid characters like <, >, &
 webextPerms.optionalPermsHeader=%S requests additional permissions.
 webextPerms.optionalPermsListIntro=It wants to:
 webextPerms.optionalPermsAllow.label=Allow
 webextPerms.optionalPermsAllow.accessKey=A
 webextPerms.optionalPermsDeny.label=Deny
@@ -151,17 +151,17 @@ webextPerms.hostDescription.tooManySites
 # %2$S is replaced with the name of the current search engine
 # %3$S is replaced with the name of the new search engine
 webext.defaultSearch.description=%1$S would like to change your default search engine from %2$S to %3$S. Is that OK?
 webext.defaultSearchYes.label=Yes
 webext.defaultSearchYes.accessKey=Y
 webext.defaultSearchNo.label=No
 webext.defaultSearchNo.accessKey=N
 
-# LOCALIZATION NOTE (addonPostInstall.message)
+# LOCALIZATION NOTE (addonPostInstall.message1)
 # %1$S is replaced with the localized named of the extension that was
 # just installed.
 # %2$S is replaced with the localized name of the application.
 addonPostInstall.message1=%1$S has been added to %2$S.
 
 # LOCALIZATION NOTE (addonPostInstall.messageDetail)
 # %1$S is replaced with the icon for the add-ons menu.
 # %2$S is replaced with the icon for the toolbar menu.
@@ -400,17 +400,17 @@ sanitizeButtonClearing=Clearing
 # "Time range to clear" is set to "Everything" in Clear Recent History dialog,
 # provided that the user has not modified the default set of history items to clear.
 sanitizeEverythingWarning2=All history will be cleared.
 # LOCALIZATION NOTE (sanitizeSelectedWarning): Warning that appears when
 # "Time range to clear" is set to "Everything" in Clear Recent History dialog,
 # provided that the user has modified the default set of history items to clear.
 sanitizeSelectedWarning=All selected items will be cleared.
 
-# LOCALIZATION NOTE (downloadAndInstallButton.label): %S is replaced by the
+# LOCALIZATION NOTE (update.downloadAndInstallButton.label): %S is replaced by the
 # version of the update: "Update to 28.0".
 update.downloadAndInstallButton.label=Update to %S
 update.downloadAndInstallButton.accesskey=U
 
 menuOpenAllInTabs.label=Open All in Tabs
 
 # History menu
 menuRestoreAllTabs.label=Restore All Tabs

--- a/browser/locales/en-US/chrome/browser/downloads/downloads.dtd
+++ b/browser/locales/en-US/chrome/browser/downloads/downloads.dtd
@@ -72,23 +72,23 @@
      This command is shown in the context menu when downloads are blocked.
      -->
 <!ENTITY cmd.unblock2.label               "Allow Download">
 <!ENTITY cmd.unblock2.accesskey           "o">
 <!-- LOCALIZATION NOTE (cmd.removeFile.label):
      This is the tooltip of the action button shown when malware is blocked.
      -->
 <!ENTITY cmd.removeFile.label             "Remove File">
-<!-- LOCALIZATION NOTE (cmd.chooseUnblock.tooltip):
+<!-- LOCALIZATION NOTE (cmd.chooseUnblock.label):
      This is the tooltip of the action button shown when potentially unwanted
      downloads are blocked. This opens a dialog where the user can choose
      whether to unblock or remove the download. Removing is the default option.
      -->
 <!ENTITY cmd.chooseUnblock.label          "Remove File or Allow Download">
-<!-- LOCALIZATION NOTE (cmd.chooseOpen.tooltip):
+<!-- LOCALIZATION NOTE (cmd.chooseOpen.label):
      This is the tooltip of the action button shown when uncommon downloads are
      blocked.This opens a dialog where the user can choose whether to open the
      file or remove the download. Opening is the default option.
      -->
 <!ENTITY cmd.chooseOpen.label             "Open or Remove File">
 
 <!-- LOCALIZATION NOTE (showMoreInformation.label):
      Displayed when hovering a blocked download, indicates that it's possible to

--- a/browser/locales/en-US/chrome/browser/places/places.properties
+++ b/browser/locales/en-US/chrome/browser/places/places.properties
@@ -86,17 +86,17 @@ searchengineResultLabel=Search
 
 # LOCALIZATION NOTE (lockPrompt.text)
 # %S will be replaced with the application name.
 lockPrompt.title=Browser Startup Error
 lockPrompt.text=The bookmarks and history system will not be functional because one of %S’s files is in use by another application. Some security software can cause this problem.
 lockPromptInfoButton.label=Learn More
 lockPromptInfoButton.accessKey=L
 
-# LOCALIZATION NOTE (deletePagesLabel): Semi-colon list of plural forms.
+# LOCALIZATION NOTE (cmd.deletePages.label): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 cmd.deletePages.label=Delete Page;Delete Pages
 cmd.deletePages.accesskey=D
 
-# LOCALIZATION NOTE (bookmarkPagesLabel): Semi-colon list of plural forms.
+# LOCALIZATION NOTE (cmd.bookmarkPages.label): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 cmd.bookmarkPages.label=Bookmark Page;Bookmark Pages
 cmd.bookmarkPages.accesskey=B

--- a/dom/locales/en-US/chrome/layout/printing.properties
+++ b/dom/locales/en-US/chrome/layout/printing.properties
@@ -1,15 +1,15 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Page number formatting
 ## @page_number The current page number
-#LOCALIZATION NOTE (pageofpages): Do not translate %ld in the following line.
+#LOCALIZATION NOTE (pagenumber): Do not translate %ld in the following line.
 # Place the word %ld where the page number and number of pages should be
 # The first %ld will receive the the page number
 pagenumber=%1$d
 
 # Page number formatting
 ## @page_number The current page number
 ## @page_total The total number of pages
 #LOCALIZATION NOTE (pageofpages): Do not translate %ld in the following line.

--- a/dom/locales/en-US/chrome/plugins.properties
+++ b/dom/locales/en-US/chrome/plugins.properties
@@ -1,13 +1,13 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# LOCALIZATION NOTE (plugins.properties):
+# LOCALIZATION NOTE:
 #    Those strings are inserted into an HTML page, so all HTML characters
 #    have to be escaped in a way that they show up correctly in HTML!
 
 title_label=About Plugins
 installedplugins_label=Installed plugins
 nopluginsareinstalled_label=No installed plugins found
 findpluginupdates_label=Find updates for installed plugins at
 file_label=File:

--- a/netwerk/locales/en-US/necko.properties
+++ b/netwerk/locales/en-US/necko.properties
@@ -1,24 +1,24 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #ResolvingHost=Looking up
-#ConnectedTo=Connected to 
-#ConnectingTo=Connecting to 
-#SendingRequestTo=Sending request to 
-#TransferringDataFrom=Transferring data from 
+#ConnectedTo=Connected to
+#ConnectingTo=Connecting to
+#SendingRequestTo=Sending request to
+#TransferringDataFrom=Transferring data from
 
 3=Looking up %1$S…
 4=Connected to %1$S…
 5=Sending request to %1$S…
 6=Transferring data from %1$S…
 7=Connecting to %1$S…
-8=Read %1$S 
+8=Read %1$S
 9=Wrote %1$S
 10=Waiting for %1$S…
 11=Looked up %1$S…
 12=Performing a TLS handshake to %1$S…
 13=The TLS handshake finished for %1$S…
 
 27=Beginning FTP transaction…
 28=Finished FTP transaction
@@ -28,25 +28,25 @@ RepostFormData=This web page is being re
 
 # Directory listing strings
 DirTitle=Index of %1$S
 DirGoUp=Up to higher level directory
 ShowHidden=Show hidden objects
 DirColName=Name
 DirColSize=Size
 DirColMTime=Last Modified
-DirFileLabel=File: 
+DirFileLabel=File:
 
 PhishingAuth=You are about to visit “%1$S”. This site may be attempting to trick you into thinking you are visiting a different site. Use extreme caution.
 PhishingAuthAccept=I understand and will be very careful
 SuperfluousAuth=You are about to log in to the site “%1$S” with the username “%2$S”, but the website does not require authentication. This may be an attempt to trick you.\n\nIs “%1$S” the site you want to visit?
 AutomaticAuth=You are about to log in to the site “%1$S” with the username “%2$S”.
 
 TrackingUriBlocked=The resource at “%1$S” was blocked because tracking protection is enabled.
 UnsafeUriBlocked=The resource at “%1$S” was blocked by Safe Browsing.
 
 # LOCALIZATION NOTE (APIDeprecationWarning):
 # %1$S is the deprecated API; %2$S is the API function that should be used.
 APIDeprecationWarning=Warning: ‘%1$S’ deprecated, please use ‘%2$S’
 
-# LOCALIZATION NOTE (nsICookieManagerDeprecated): don't localize originAttributes.
+# LOCALIZATION NOTE (nsICookieManagerAPIDeprecated): don't localize originAttributes.
 # %1$S is the deprecated API; %2$S is the interface suffix that the given deprecated API belongs to.
 nsICookieManagerAPIDeprecated=“%1$S” is changed. Update your code and pass the correct originAttributes. Read more on MDN: https://developer.mozilla.org/docs/Mozilla/Tech/XPCOM/Reference/Interface/nsICookieManager%2$S

--- a/toolkit/locales/en-US/chrome/global/aboutReader.properties
+++ b/toolkit/locales/en-US/chrome/global/aboutReader.properties
@@ -14,17 +14,17 @@ aboutReader.colorScheme.sepia=Sepia
 aboutReader.colorScheme.auto=Auto
 
 # LOCALIZATION NOTE (aboutReader.estimatedReadTimeValue1): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the number of minutes it is estimated to take to read the article
 # example: `3 minutes`
 aboutReader.estimatedReadTimeValue1=#1 minute;#1 minutes
 
-#LOCALIZATION NOTE (aboutReader.estimatedReadingTimeRange1): Semi-colon list of plural forms.
+#LOCALIZATION NOTE (aboutReader.estimatedReadTimeRange1): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # When there is some uncertainty in how long the article will take to read show a range of
 # minutes it is expected to take.
 # #1 is the number of minutes it is estimated to take to read the article for a fast reader
 # #2 is the number of minutes it is estimated to take to read the article for a slow reader
 # #2 is the variable used to determine the plural form to use.
 # example: `5-8 minutes`
 aboutReader.estimatedReadTimeRange1=#1-#2 minute;#1-#2 minutes

--- a/toolkit/locales/en-US/chrome/mozapps/downloads/downloads.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/downloads/downloads.properties
@@ -90,17 +90,17 @@ timeLeftSingle3=%1$S left
 # LOCALIZATION NOTE (timeLeftDouble3): %1$S time left; %2$S time left sub units
 # example: 11h 2m left; 1d 22h left
 timeLeftDouble3=%1$S %2$S left
 timeFewSeconds2=A few seconds left
 timeUnknown2=Unknown time left
 
 # LOCALIZATION NOTE (doneSize): #1 size number; #2 size unit
 doneSize=#1 #2
-# LOCALIZATION NOTE (doneScheme): #1 URI scheme like data: jar: about:
+# LOCALIZATION NOTE (doneScheme2): #1 URI scheme like data: jar: about:
 doneScheme2=%1$S resource
 # LOCALIZATION NOTE (doneFileScheme): Special case of doneScheme for file:
 # This is used as an eTLD replacement for local files, so make it lower case
 doneFileScheme=local file
 
 # LOCALIZATION NOTE (yesterday): Displayed time for files finished yesterday
 yesterday=Yesterday
 

--- a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
@@ -1,16 +1,16 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <!ENTITY addons.windowTitle                   "Add-ons Manager">
 
 <!ENTITY search.placeholder2                  "Search on addons.mozilla.org">
 <!ENTITY search.buttonlabel                   "Search">
-<!-- LOCALIZATION NOTE (search.commandKey):
+<!-- LOCALIZATION NOTE (search.commandkey):
      The search command key should match findOnCmd.commandkey from browser.dtd -->
 <!ENTITY search.commandkey                    "f">
 
 <!ENTITY loading.label                        "Loading…">
 <!ENTITY listEmpty.installed.label            "You don’t have any add-ons of this type installed">
 <!ENTITY listEmpty.availableUpdates.label     "No updates found">
 <!ENTITY listEmpty.recentUpdates.label        "You haven’t recently updated any add-ons">
 <!ENTITY listEmpty.findUpdates.label          "Check For Updates">

--- a/toolkit/locales/en-US/chrome/mozapps/extensions/update.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/extensions/update.properties
@@ -1,13 +1,13 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# LOCALIZATION NOTE (addonUpdateHeader)
+# LOCALIZATION NOTE (addonUpdateTitle)
 # %S will be replace with the localized name of the application
 addonUpdateTitle=%S Update
 
 # LOCALIZATION NOTE (addonUpdateMessage)
 # %S will be replace with the localized name of the application
 addonUpdateMessage=%S is updating your extensions…
 
 addonUpdateCancelMessage=Still updating. Want to wait?

--- a/toolkit/locales/en-US/chrome/places/places.properties
+++ b/toolkit/locales/en-US/chrome/places/places.properties
@@ -3,27 +3,27 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 BookmarksMenuFolderTitle=Bookmarks Menu
 BookmarksToolbarFolderTitle=Bookmarks Toolbar
 OtherBookmarksFolderTitle=Other Bookmarks
 TagsFolderTitle=Tags
 MobileBookmarksFolderTitle=Mobile Bookmarks
 
-# LOCALIZATION NOTE (dateName):
+# LOCALIZATION NOTE:
 # These are used to generate history containers when history is grouped by date
 finduri-AgeInDays-is-0=Today
 finduri-AgeInDays-is-1=Yesterday
 finduri-AgeInDays-is=%S days ago
 finduri-AgeInDays-last-is=Last %S days
 finduri-AgeInDays-isgreater=Older than %S days
 finduri-AgeInMonths-is-0=This month
 finduri-AgeInMonths-isgreater=Older than %S months
 
-# LOCALIZATION NOTE (localFiles):
+# LOCALIZATION NOTE (localhost):
 # This is used to generate local files container when history is grouped by site
 localhost=(local files)
 
 # LOCALIZATION NOTE
 # The string is used for showing file size of each backup in the "fileRestorePopup" popup
 # %1$S is the file size
 # %2$S is the file size unit
 backupFileSizeText=%1$S %2$S