--- a/browser/browser/preferences/preferences.ftl
+++ b/browser/browser/preferences/preferences.ftl
@@ -16,16 +16,20 @@ pref-page =
 # 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.
 search-input =
     .style = width: 17em
+policies-notice = { PLATFORM() ->
+        [windows] Chuir am buidheann agad casg air atharrachadh cuid a roghainnean.
+       *[other] Chuir am buidheann agad casg air atharrachadh cuid a roghainnean.
+    }
 pane-general-title = Coitcheann
 category-general =
     .tooltiptext = { pane-general-title }
 pane-search-title = Lorg
 category-search =
     .tooltiptext = { pane-search-title }
 pane-privacy-title = Prìobhaideachd ⁊ tèarainteachd
 category-privacy =

--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -237,16 +237,17 @@ These should match what Safari and other
 <!ENTITY urlbar.microphoneBlocked.tooltip        "Bhac thu am micreofon agad air an làrach-lìn seo.">
 <!ENTITY urlbar.screenBlocked.tooltip            "Bhac thu an làrach-lìn seo o bhith a’ co-roinneadh na sgrìn agad.">
 <!ENTITY urlbar.geolocationBlocked.tooltip       "Bhac thu fiosrachadh mun ionad agad air an làrach-lìn seo.">
 <!ENTITY urlbar.webNotificationsBlocked.tooltip  "Bhac thu brathan air an làrach-lìn seo.">
 <!ENTITY urlbar.persistentStorageBlocked.tooltip "Bhac thu stòras dàta buan mu choinneamh na làraich-lìn seo.">
 <!ENTITY urlbar.popupBlocked.tooltip             "Bhac thu priob-uinneagan air an làrach-lìn seo.">
 <!ENTITY urlbar.canvasBlocked.tooltip            "Bhac thu às-tharraing dàta canabhais air an làrach-lìn seo.">
 
+<!ENTITY urlbar.flashPluginBlocked.tooltip       "Bhac thu an làrach-lìn seo o bhith a’ cleachdadh plugan Adobe Flash.">
 <!ENTITY urlbar.midiBlocked.tooltip              "Bhac thu inntrigeadh MIDI air an làrach-lìn seo.">
 
 <!ENTITY urlbar.openHistoryPopup.tooltip                "Seall an eachdraidh">
 
 <!ENTITY searchItem.title             "Lorg">
 
 <!-- Toolbar items -->
 <!ENTITY homeButton.label             "Dhachaigh">

--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -202,16 +202,17 @@ addonConfirmInstallSomeUnsigned.message=An aire: Bu mhath leis an làrach seo co-dhiù #2 tuilleadan a stàladh ann am #1 ach cha deach a dhearbhadh. Leanadh tu air adhart leis air do chunnart fhèin.;An aire: Bu mhath leis an làrach seo co-dhiù #2 thuilleadan a stàladh ann am #1 ach cha deach a dhearbhadh. Leanadh tu air adhart leis air do chunnart fhèin.;An aire: Bu mhath leis an làrach seo co-dhiù #2 tuilleadain a stàladh ann am #1 ach cha deach a dhearbhadh. Leanadh tu air adhart leis air do chunnart fhèin.;An aire: Bu mhath leis an làrach seo co-dhiù #2 tuilleadan a stàladh ann am #1 ach cha deach a dhearbhadh. Leanadh tu air adhart leis air do chunnart fhèin.
 
 # LOCALIZATION NOTE (addonInstalled):
 # %S is the name of the add-on
 addonInstalled=Chaidh %S a stàladh.
 # LOCALIZATION NOTE (addonsGenericInstalled):
 # Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 number of add-ons
+addonsGenericInstalled=Chaidh #1 tuilleadan a stàladh.;Chaidh #1 thuilleadan a stàladh.;Chaidh #1 tuilleadain a stàladh.;Chaidh #1 tuilleadan a stàladh.
 # LOCALIZATION NOTE (addonInstalledNeedsRestart):
 # %1$S is the name of the add-on, %2$S is the application's name
 addonInstalledNeedsRestart=Thèid %1$S a stàladh às dèidh dhut %2$S ath-thòiseachadh.
 # LOCALIZATION NOTE (addonsGenericInstalledNeedsRestart):
 # Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 number of add-ons. #2 application's name
 addonsGenericInstalledNeedsRestart=Thèid an tuilleadan #1 a stàladh as dèidh dhut #2 ath-thòiseachadh.;Thèid #1 thuilleadan a stàladh as dèidh dhut #2 ath-thòiseachadh.;Thèid #1 tuilleadain a stàladh as dèidh dhut #2 ath-thòiseachadh.;Thèid #1 tuilleadan a stàladh as dèidh dhut #2 ath-thòiseachadh.

--- a/browser/chrome/browser/migration/migration.dtd
+++ b/browser/chrome/browser/migration/migration.dtd
@@ -16,16 +16,20 @@
 <!ENTITY importFromNothing.label        "Na ion-phortaich rud sam bith">
 <!ENTITY importFromNothing.accesskey    "d">
 <!ENTITY importFromSafari.label         "Safari">
 <!ENTITY importFromSafari.accesskey     "S">
 <!ENTITY importFromCanary.label         "Chrome Canary">
 <!ENTITY importFromCanary.accesskey     "n">
 <!ENTITY importFromChrome.label         "Chrome">
 <!ENTITY importFromChrome.accesskey     "C">
+<!ENTITY importFromChromeBeta.label     "Chrome Beta">
+<!ENTITY importFromChromeBeta.accesskey "B">
+<!ENTITY importFromChromeDev.label      "Chrome Dev">
+<!ENTITY importFromChromeDev.accesskey  "D">
 <!ENTITY importFromChromium.label       "Chromium">
 <!ENTITY importFromChromium.accesskey   "u">
 <!ENTITY importFromFirefox.label        "Firefox">
 <!ENTITY importFromFirefox.accesskey    "x">
 <!ENTITY importFrom360se.label          "Brabhsair a tha gu tur sàbhailte">
 <!ENTITY importFrom360se.accesskey      "s">
 
 <!ENTITY noMigrationSources.label       "Cha deach prògram a lorg sa bheil comharran-lìn, eachdraidh no faclan-faire.">

--- 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=Google Chrome Dev
 sourceNameChromium=Chromium
 sourceNameFirefox=Mozilla Firefox
 sourceName360se=Brabhsair a tha gu tur sàbhailte
 
 importedBookmarksFolder=O %S
 
 importedSafariReadingList=Liosta leughaidh (o Safari)
 importedEdgeReadingList=Liosta leughaidh (o Edge)

--- a/browser/chrome/browser/preferences/advanced.dtd
+++ b/browser/chrome/browser/preferences/advanced.dtd
@@ -57,21 +57,23 @@ available. -->
 <!ENTITY connectionSettings.accesskey    "e">
 
 <!ENTITY httpCache.label                 "Susbaint-lìn san tasglann">
 
 <!--  Site Data section manages sites using Storage API and is under Network -->
 <!ENTITY siteData.label                  "Dàta na làraich">
 <!ENTITY clearSiteData.label             "Falamhaich an dàta air fad">
 <!ENTITY clearSiteData.accesskey         "l">
+<!ENTITY siteDataSettings.label          "Roghainnean…">
+<!ENTITY siteDataSettings.accesskey      "i">
 <!ENTITY siteData1.label                 "Briosgaidean is dàta làraichean">
 <!ENTITY clearSiteData1.label            "Falamhaich an dàta...">
 <!ENTITY clearSiteData1.accesskey        "l">
-<!ENTITY siteDataSettings.label          "Roghainnean…">
-<!ENTITY siteDataSettings.accesskey      "i">
+<!ENTITY siteDataSettings1.label         "Stiùirich an dàta...">
+<!ENTITY siteDataSettings1.accesskey     "M">
 <!ENTITY siteDataLearnMoreLink.label     "Barrachd fiosrachaidh">
 
 <!-- LOCALIZATION NOTE:
   The entities limitCacheSizeBefore.label and limitCacheSizeAfter.label appear on a single
   line in preferences as follows:
 
   &limitCacheSizeBefore.label [textbox for cache size in MB] &limitCacheSizeAfter.label;
 -->

--- a/browser/chrome/browser/preferences/preferences.properties
+++ b/browser/chrome/browser/preferences/preferences.properties
@@ -204,16 +204,17 @@ totalSiteDataSize2=Tha na tha de bhriosgaidean, dàta làraichean is an tasgadan a’ cleachdadh %1$S %2$S de dh’àite air an diosg an-dràsta.
 siteUsage=%1$S %2$S
 siteUsagePersistent=%1$S %2$S (buan)
 loadingSiteDataSize1=Ag àireamhachadh meud dàta na làraich is an tasgadain...
 
 acceptRemove=Thoir air falbh
 # LOCALIZATION NOTE (siteDataSettings2.description): %S = brandShortName
 siteDataSettings2.description=Tha na làraichean-lìn a leanas a’ stòradh dàta làraich air a’ choimpiutair agad. Glèidhidh %S an dàta aig làraichean-lìn aig a bheil cead dàta buain gus an sguab thu às e agus sguabaidh e às an dàta aig làraichean-lìn aig a bheil stòras neo-bhuan ma bhios feum air àite.
 # LOCALIZATION NOTE (siteDataSettings3.description): %S = brandShortName
+siteDataSettings3.description=Tha na làraichean-lìn a leanas a’ stòradh bhriosgaidean is dàta làraich air a’ choimpiutair agad. Cumaidh %S dàta o làraichean-lìn le stòras buan gus an sguab thu às e agus sguabaidh e às an dàta o làraichean-lìn aig nach eil cead stòrais bhuain ma bhios feum air àite.
 # LOCALIZATION NOTE (removeAllSiteData, removeAllSiteDataShown):
 # removeAllSiteData and removeAllSiteDataShown are both used on the same one button,
 # never displayed together and can share the same accesskey.
 # When only partial sites are shown as a result of keyword search,
 # removeAllShown is displayed as button label.
 # removeAll is displayed when no keyword search and all sites are shown.
 removeAllSiteData.label=Thoir air falbh a h-uile
 removeAllSiteData.accesskey=e
@@ -228,19 +229,21 @@ spaceAlert.over5GB.prefButtonWin.label=F
 spaceAlert.over5GB.prefButtonWin.accesskey=o
 # LOCALIZATION NOTE (spaceAlert.over5GB.message): %S = brandShortName
 spaceAlert.over5GB.message=Tha an t-àite a’ fàs gann air %S. Dh’fhaoidte nach dèid an t-susbaint aig làraichean-lìn a shealltainn mar bu chòir. ’S urrainn dhut dàta làraichean a chaidh a stòradh a sguabadh às ann an “Roghainnean” » “Adhartach” » “Dàta nan làraichean”.
 # LOCALIZATION NOTE (spaceAlert.over5GB.messageWin):
 # - On Windows Preferences is called Options
 # - %S = brandShortName
 spaceAlert.over5GB.messageWin=Tha an t-àite a’ fàs gann air %S. Dh’fhaoidte nach dèid an t-susbaint aig làraichean-lìn a shealltainn mar bu chòir. ’S urrainn dhut dàta làraichean a chaidh a stòradh a sguabadh às ann an “Roghainnean” » “Adhartach” » “Dàta nan làraichean”.
 # LOCALIZATION NOTE (spaceAlert.over5GB.message1): %S = brandShortName
+spaceAlert.over5GB.message1=Tha an t-àite a’ fàs gann air %S. Dh’fhaoidte nach dèid an t-susbaint aig làraichean-lìn a shealltainn mar bu chòir. ’S urrainn dhut dàta làraichean a chaidh a stòradh a sguabadh às ann an “Roghainnean” » “Prìobhaideachd ⁊ tèarainteachd” » “Briosgaidean is dàta làraichean”.
 # LOCALIZATION NOTE (spaceAlert.over5GB.messageWin1):
 # - On Windows Preferences is called Options
 # - %S = brandShortName
+spaceAlert.over5GB.messageWin1=Tha an t-àite a’ fàs gann air %S. Dh’fhaoidte nach dèid an t-susbaint aig làraichean-lìn a shealltainn mar bu chòir. ’S urrainn dhut dàta làraichean a chaidh a stòradh a sguabadh às ann an “Roghainnean” » “Prìobhaideachd ⁊ tèarainteachd” » “Briosgaidean is dàta làraichean”.
 spaceAlert.under5GB.okButton.label=Ceart, tha mi agaibh
 spaceAlert.under5GB.okButton.accesskey=b
 # LOCALIZATION NOTE (spaceAlert.under5GB.message): %S = brandShortName
 spaceAlert.under5GB.message=Tha an t-àite a’ fàs gann air %S. Dh’fhaoidte nach dèid an t-susbaint aig làraichean-lìn a shealltainn mar bu chòir. Tadhail air “Barrachd fiosrachaidh” airson feabhas a thoirt air an dòigh air an dèid an diosg agad a chleachdadh airson brabhsadh nas fhearr.
 
 # LOCALIZATION NOTE (featureEnableRequiresRestart, featureDisableRequiresRestart, restartTitle): %S = brandShortName
 featureEnableRequiresRestart=Feumaidh %S ath-thòiseachadh mus bi am feart seo an comas.
 featureDisableRequiresRestart=Feumaidh %S ath-thòiseachadh mus bi am feart seo à comas.
@@ -292,21 +295,23 @@ searchResults.needHelpSupportLink=Taic %
 
 # LOCALIZATION NOTE %S is the default value of the `dom.ipc.processCount` pref.
 defaultContentProcessCount=%S (bun-roghainn)
 
 # LOCALIZATION NOTE (extensionControlled.homepage_override):
 # This string is shown to notify the user that their home page is being controlled by an extension.
 extensionControlled.homepage_override = Tha smachd aig leudachan, %S, air an duilleag-dhachaidh agad.
 
+extensionControlled.homepage_override2 = Tha smachd aig leudachan, %S, air an duilleag-dhachaidh agad.
 
 # LOCALIZATION NOTE (extensionControlled.newTabURL):
 # This string is shown to notify the user that their new tab page is being controlled by an extension.
 extensionControlled.newTabURL = Tha smachd aig leudachan, %S, air duilleag an taba ùir agad.
 
+extensionControlled.newTabURL2 = Tha smachd aig leudachan, %S, air duilleag an taba ùir agad.
 
 # LOCALIZATION NOTE (extensionControlled.defaultSearch):
 # This string is shown to notify the user that the default search engine is being controlled
 # by an extension. %S is the icon and name of the extension.
 extensionControlled.defaultSearch = Shuidhich leudachan, %S, an t-einnsean-luirg bunaiteach agad.
 
 # LOCALIZATION NOTE (extensionControlled.privacy.containers):
 # This string is shown to notify the user that Container Tabs are being enabled by an extension