--- a/browser/chrome/browser/baseMenuOverlay.dtd
+++ b/browser/chrome/browser/baseMenuOverlay.dtd
@@ -15,19 +15,16 @@
 <!ENTITY productHelp.label        "&brandShortName;-hulp">
 <!ENTITY productHelp.accesskey    "h">
 <!ENTITY helpForIEUsers.label     "Vir Internet Explorer-gebruikers">
 <!ENTITY helpForIEUsers.accesskey "I">
 <!ENTITY helpMac.commandkey       "?">
 <!ENTITY helpSafeMode.label       "Restart with Add-ons Disabled…">
 <!ENTITY helpSafeMode.accesskey   "R">
 
-<!ENTITY helpReleaseNotes.label         "Vrystellingaantekeninge">
-<!ENTITY helpReleaseNotes.accesskey     "a">
-
 <!ENTITY helpTroubleshootingInfo.label      "Inligting vir probleemoplossing">
 <!ENTITY helpTroubleshootingInfo.accesskey  "p">
 
 <!ENTITY helpFeedbackPage.label      "Dien terugvoer in…">
 <!ENTITY helpFeedbackPage.accesskey  "D">
 
 <!ENTITY preferencesCmdMac.label        "Voorkeure…">
 <!ENTITY preferencesCmdMac.commandkey   ",">

--- a/browser/chrome/browser/preferences/advanced.dtd
+++ b/browser/chrome/browser/preferences/advanced.dtd
@@ -16,16 +16,18 @@
 <!ENTITY useAutoScroll.label             "Gebruik autorol">
 <!ENTITY useAutoScroll.accesskey         "a">
 <!ENTITY useSmoothScrolling.label        "Gebruik gladde rol">
 <!ENTITY useSmoothScrolling.accesskey    "a">
 <!ENTITY allowHWAccel.label              "Use hardware acceleration when available">
 <!ENTITY allowHWAccel.accesskey          "h">
 <!ENTITY checkSpelling.label             "Kontroleer my spelling terwyl ek tik">
 <!ENTITY checkSpelling.accesskey         "i">
+<!ENTITY doNotTrack.label                "Tell web sites I do not want to be tracked">
+<!ENTITY doNotTrack.accesskey            "d">
 
 <!ENTITY systemDefaults.label            "Stelselverstek">
 <!--XXX-->
 <!ENTITY alwaysCheckDefault.label        "Kontroleer altyd aan die begin om te sien of &brandShortName; die verstekblaaier is">
 <!ENTITY alwaysCheckDefault.accesskey    "a">
 <!ENTITY checkNow.label                  "Kontroleer nou">
 <!ENTITY checkNow.accesskey              "n">
 <!ENTITY submitCrashes.label             "Dien omvalverslae in">

--- a/browser/chrome/browser/syncGenericChange.properties
+++ b/browser/chrome/browser/syncGenericChange.properties
@@ -25,11 +25,11 @@ new.synckey.label = Your Sync Key
 new.password.title            = Werk wagwoord by
 new.password.introText        = Jou wagwoord is deur die bediener verwerp, dus werk jou wagwoord by.
 new.password.label            = Tik u nuwe wagwoord in
 new.password.confirm          = Bevestig jou nuwe wagwoord
 new.password.acceptButton     = Werk wagwoord by
 new.password.status.incorrect = Wagwoord verkeerd, probeer gerus weer.
 
 new.synckey.title          = Update Sync Key
-new.synckey.introText        = Your Sync Key has changed, please enter your new Sync Key
+new.synckey2.introText       = Your Sync Key was changed using another device, please enter your updated Sync Key.
 new.synckey.acceptButton     = Update Sync Key
 new.synckey.status.incorrect = Sync-sleutel verkeerd, probeer gerus weer.

--- a/browser/chrome/browser/syncSetup.dtd
+++ b/browser/chrome/browser/syncSetup.dtd
@@ -66,17 +66,17 @@
 <!ENTITY addDevice.dialog.syncKey.label     "To activate your device you will need to enter your Sync Key. Please print or save this key and take it with you.">
 <!ENTITY addDevice.dialog.connected.label   "Device Connected">
 <!-- Existing Account Page 2: Manual Login -->
 
 <!ENTITY setup.signInPage.title.label "Sign In">
 <!ENTITY existingSyncKey.description "You can get a copy of your Sync Key by going to &syncBrand.shortName.label; Options on your other device, and selecting  &#x0022;My Sync Key&#x0022; under &#x0022;Manage Account&#x0022;.">
 <!ENTITY verifying.label              "Verifieer tans..">
 <!ENTITY resetPassword.label          "Stel wagwoord terug">
-<!ENTITY lostSyncKey.label            "I have lost my Sync Key">
+<!ENTITY resetSyncKey.label           "I have lost my other device.">
 <!-- Sync Options -->
 
 <!ENTITY setup.optionsPage.title      "Sync-opsies">
 <!ENTITY syncComputerName.label       "Rekenaarnaam:">
 <!ENTITY syncComputerName.accesskey   "R">
 
 <!ENTITY syncMy.label               "Sync My">
 <!ENTITY engine.bookmarks.label     "Boekmerke">

--- a/toolkit/chrome/global/headsUpDisplay.properties
+++ b/toolkit/chrome/global/headsUpDisplay.properties
@@ -82,37 +82,16 @@ copyCmd.label=Kopieer
 copyCmd.accesskey=C
 selectAllCmd.label=Kies almal
 selectAllCmd.accesskey=A
 # LOCALIZATION NOTE (timestampFormat): %1$02S = hours (24-hour clock),
 # %2$02S = minutes, %3$02S = seconds, %4$03S = milliseconds.
 timestampFormat=%02S:%02S:%02S.%03S
 
 helperFuncUnsupportedTypeError=Kan nie hierdie tipe objek  nie.
-# LOCALIZATION NOTE (networkUrlWithStatus):
-#
-# When the HTTP request is started only the URL of the request is printed to the
-# WebConsole. As the response status of the HTTP request arrives, the URL string
-# is replaced by this string (the response status can look like `HTTP/1.1 200 OK`).
-# The bracket is not closed to mark that this request is not done by now. As the
-# request is finished (the HTTP connection is closed) this string is replaced
-# by `networkUrlWithStatusAndDuration` which has a closing the braket.
-#
-# %1$S = URL of network request
-# %2$S = response status code from the server (e.g. `HTTP/1.1 200 OK`)
-networkUrlWithStatus=%1$S [%2$S
-# LOCALIZATION NOTE (networkUrlWithStatusAndDuration):
-#
-# When the HTTP request is finished (the HTTP connection is closed) this string
-# replaces the former `networkUrlWithStatus` string in the WebConsole.
-#
-# %1$S = URL of network request
-# %2$S = response status code from the server (e.g. `HTTP/1.1 200 OK`)
-# %3$S = duration for the complete network request in milliseconds
-networkUrlWithStatusAndDuration=%1$S [%2$S %3$Sms]
 NetworkPanel.label=Inspekteer netwerkversoek
 # LOCALIZATION NOTE (NetworkPanel.deltaDurationMS):
 #
 # This string is used to show the duration between two network events (e.g
 # request and respones header or response header and response body).
 NetworkPanel.durationMS=%Sms
 # LOCALIZATION NOTE (NetworkPanel.imageSizeDeltaDurationMS):
 # This string is used to show the duration between the response header and the