--- a/browser/browser/preferences/preferences.ftl
+++ b/browser/browser/preferences/preferences.ftl
@@ -9,22 +9,18 @@ do-not-track-option-default =
 do-not-track-option-always =
     .label = Alltaf
 pref-page =
     .title =
         { PLATFORM() ->
             [windows] Valkostir
            *[other] Valkostir
         }
-# This is used to determine the width of the search field in about:preferences,
-# in order to make the entire placeholder string visible
-#
-# Notice: The value of the `.style` attribute is a CSS string, and the `width`
-# is the name of the CSS property. It is intended only to adjust the element's width.
-# Do not translate.
+# This string is currently used only in Firefox 60 and will be removed when not
+# needed for x-channel. See bug 1445686 for details.
 search-input =
     .style = width: 15.4em
 # This is used to determine the width of the search field in about:preferences,
 # in order to make the entire placeholder string visible
 #
 # Please keep the placeholder string short to avoid truncation.
 #
 # Notice: The value of the `.style` attribute is a CSS string, and the `width`
@@ -32,16 +28,21 @@ search-input =
 # Do not translate.
 search-input-box =
     .style = width: 15.4em
     .placeholder =
         { PLATFORM() ->
             [windows] Leita í stillingum
            *[other] Leita í stillingum
         }
+policies-notice =
+    { PLATFORM() ->
+        [windows] Fyrirtækið þitt hefur lokað á að breyta sumum stillingum.
+       *[other] Fyrirtækið þitt hefur lokað á að breyta sumum stillingum.
+    }
 pane-general-title = Almennt
 category-general =
     .tooltiptext = { pane-general-title }
 pane-search-title = Leita
 category-search =
     .tooltiptext = { pane-search-title }
 pane-privacy-title = Friðhelgi og öruggi
 category-privacy =

--- a/browser/chrome/browser/aboutPrivateBrowsing.dtd
+++ b/browser/chrome/browser/aboutPrivateBrowsing.dtd
@@ -1,12 +1,17 @@
 <!-- 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 (aboutPrivateBrowsing.title):
+     Please ensure this exactly matches tabs.emptyPrivateTabTitle in tabbrowser.properties -->
+<!ENTITY aboutPrivateBrowsing.title                      "Huliðsgluggi">
+<!ENTITY aboutPrivateBrowsing.notPrivate.title           "Opna huliðsglugga?">
+
 <!ENTITY aboutPrivateBrowsing.notPrivate                 "Þú ert ekki í huliðsglugga.">
 <!ENTITY privatebrowsingpage.openPrivateWindow.label     "Opna huliðsglugga">
 <!ENTITY privatebrowsingpage.openPrivateWindow.accesskey "p">
 
 <!ENTITY privateBrowsing.title                           "Huliðsstilling">
 <!ENTITY privateBrowsing.title.tracking                  "Huliðsgluggi er með vörn gegn gagnasöfnun">
 <!ENTITY aboutPrivateBrowsing.info.notsaved.before       "Þegar þú vafrar með huliðsglugga, mun Firefox ">
 <!ENTITY aboutPrivateBrowsing.info.notsaved.emphasize    "ekki vista">

--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -433,16 +433,17 @@ These should match what Safari and other
 
 <!-- LOCALIZATION NOTE (moreMenu.label) This label is used in the new Photon
     app (hamburger) menu. When clicked, it opens a subview that contains
     secondary commands. -->
 <!ENTITY moreMenu.label "Meira">
 
 <!ENTITY openCmd.commandkey           "l">
 <!ENTITY urlbar.placeholder2          "Leita eða sláðu inn veffang">
+<!ENTITY urlbar.placeholder3          "Sláðu inn leitarskilyrði og heimilisföng hérna">
 <!ENTITY urlbar.accesskey             "ð">
 <!-- LOCALIZATION NOTE (urlbar.extension.label): Used to indicate that a selected autocomplete entry is provided by an extension. -->
 <!ENTITY urlbar.extension.label       "Skráarending:">
 <!ENTITY urlbar.switchToTab.label     "Fara á flipa:">
 
 <!-- LOCALIZATION NOTE (urlbar.searchSuggestionsNotification.hintPrefix): Shown just before the suggestions opt-out hint. -->
 <!ENTITY urlbar.searchSuggestionsNotification.hintPrefix "Ábending:">
 <!-- LOCALIZATION NOTE (urlbar.searchSuggestionsNotification.hint): &#x1F50E; is the magnifier icon emoji, please don't change it. -->
@@ -977,22 +978,24 @@ you can use these alternative items. Oth
 <!ENTITY updateRestart.header.message2 "Endurræstu til að uppfæra &brandShorterName;.">
 <!ENTITY updateRestart.acceptButton.label "Enduræstu og endurheimtu">
 <!ENTITY updateRestart.acceptButton.accesskey "r">
 <!ENTITY updateRestart.cancelButton.label "Ekki núna">
 <!ENTITY updateRestart.cancelButton.accesskey "n">
 <!ENTITY updateRestart.panelUI.label2 "Endurræstu til að uppfæra &brandShorterName;">
 
 <!ENTITY newTabControlled.message "Einhver viðbót hefur breytt síðunni sem er alltaf opnuð fyrir nýja flipa. Ef þú vilt ekki þessa breytingu geturðu endurheimt eldri stillingar.">
+
 <!ENTITY newTabControlled.header.message "Nýi flipinn breyttist.">
 <!ENTITY newTabControlled.keepButton.label "Halda breytingum">
 <!ENTITY newTabControlled.keepButton.accesskey "g">
 <!ENTITY newTabControlled.restoreButton.label "Endurheimta stillingar">
 <!ENTITY newTabControlled.restoreButton.accesskey "r">
 
+
 <!ENTITY pageActionButton.tooltip "Síðu aðgerðir">
 <!ENTITY pageAction.addToUrlbar.label "Bæta við í staðfestingarslá">
 <!ENTITY pageAction.removeFromUrlbar.label "Fjarlægja úr staðsetningarslá">
 <!ENTITY pageAction.allowInUrlbar.label "Sýna í staðsetningarslá">
 <!ENTITY pageAction.disallowInUrlbar.label "Ekki sýna í staðsetningarslá">
 <!ENTITY pageAction.manageExtension.label "Sýsla með viðbót…">
 
 <!ENTITY pageAction.sendTabToDevice.label "Senda flipa á tæki">

--- a/browser/chrome/browser/migration/migration.properties
+++ b/browser/chrome/browser/migration/migration.properties
@@ -5,16 +5,18 @@
 profileName_format=%S %S
 
 # Browser Specific
 sourceNameIE=Internet Explorer
 sourceNameEdge=Microsoft Edge
 sourceNameSafari=Safari
 sourceNameCanary=Google Chrome Canary
 sourceNameChrome=Google Chrome
+sourceNameChromeBeta=Google Chrome Beta
+sourceNameChromeDev=
 sourceNameChromium=Chromium
 sourceNameFirefox=Mozilla Firefox
 sourceName360se=360 Öruggur vafri
 
 importedBookmarksFolder=Frá %S
 
 importedSafariReadingList=Leslisti (Frá Safari)
 importedEdgeReadingList=Leslisti (Frá Edge)

--- a/toolkit/chrome/global/extensions.properties
+++ b/toolkit/chrome/global/extensions.properties
@@ -24,8 +24,11 @@ uninstall.confirmation.title = Fjarlægja %S
 
 #LOCALIZATION NOTE (uninstall.confirmation.message) %S is the name of the extension which is about to be uninstalled.
 uninstall.confirmation.message = Viðbótin “%S” er að biðja um að verða fjarlægð. Hvað viltu gera?
 
 uninstall.confirmation.button-0.label = Fjarlægja
 uninstall.confirmation.button-1.label = Nota áfram
 
 saveaspdf.saveasdialog.title = Vista sem
+
+#LOCALIZATION NOTE (newTabControlled.message2) %S is the icon and name of the extension which updated the New Tab page.
+newTabControlled.learnMore = Fræðast meira

--- a/toolkit/chrome/places/places.properties
+++ b/toolkit/chrome/places/places.properties
@@ -3,16 +3,20 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 BookmarksMenuFolderTitle=Bókamerkjavalmynd
 BookmarksToolbarFolderTitle=Bókamerkjaslá
 OtherBookmarksFolderTitle=Önnur bókamerki
 TagsFolderTitle=Flokkar
 MobileBookmarksFolderTitle=Farsíma bókamerki
 
+OrganizerQueryHistory=Ferill
+OrganizerQueryDownloads=Niðurhöl
+OrganizerQueryAllBookmarks=Öll bókamerki
+
 # LOCALIZATION NOTE (dateName):
 # These are used to generate history containers when history is grouped by date
 finduri-AgeInDays-is-0=Í dag
 finduri-AgeInDays-is-1=Í gær
 finduri-AgeInDays-is=fyrir %S dögum síðan
 finduri-AgeInDays-last-is=Síðustu %S daga
 finduri-AgeInDays-isgreater=Eldri en %S dagar
 finduri-AgeInMonths-is-0=Þennan mánuð