Scots Gaelic: 100% transalted Aurora 15
authorDwayne Bailey <dwayne@translate.org.za>
Wed, 06 Jun 2012 13:33:41 -0700
changeset 312 46376adbccf550303d74f7efd2e7be95b81a1355
parent 311 36e6b422aaba7e2753ff949d8d3d9a3e0b0d4b58
child 313 0d55e12e3b8f3d0fc19921b95f71872de87c075f
push id151
push userfrancesco.lodolo@mozillaitalia.org
push dateMon, 11 Nov 2013 16:44:08 +0000
Scots Gaelic: 100% transalted Aurora 15
browser/branding/official/brand.dtd
browser/branding/official/brand.properties
browser/chrome/browser/aboutCertError.dtd
browser/chrome/browser/aboutDialog.dtd
browser/chrome/browser/aboutHome.dtd
browser/chrome/browser/aboutPrivateBrowsing.dtd
browser/chrome/browser/aboutRobots.dtd
browser/chrome/browser/aboutSessionRestore.dtd
browser/chrome/browser/aboutSyncTabs.dtd
browser/chrome/browser/baseMenuOverlay.dtd
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/devtools/debugger.dtd
browser/chrome/browser/devtools/debugger.properties
browser/chrome/browser/devtools/gcli.properties
browser/chrome/browser/devtools/gclicommands.properties
browser/chrome/browser/devtools/inspector.properties
browser/chrome/browser/devtools/layoutview.dtd
browser/chrome/browser/devtools/responsiveUI.properties
browser/chrome/browser/devtools/scratchpad.dtd
browser/chrome/browser/devtools/scratchpad.properties
browser/chrome/browser/devtools/sourceeditor.dtd
browser/chrome/browser/devtools/sourceeditor.properties
browser/chrome/browser/devtools/styleeditor.dtd
browser/chrome/browser/devtools/styleeditor.properties
browser/chrome/browser/devtools/styleinspector.dtd
browser/chrome/browser/devtools/styleinspector.properties
browser/chrome/browser/devtools/tilt.properties
browser/chrome/browser/devtools/webConsole.dtd
browser/chrome/browser/devtools/webconsole.properties
browser/chrome/browser/engineManager.dtd
browser/chrome/browser/engineManager.properties
browser/chrome/browser/feeds/subscribe.dtd
browser/chrome/browser/feeds/subscribe.properties
browser/chrome/browser/migration/migration.dtd
browser/chrome/browser/migration/migration.properties
browser/chrome/browser/newTab.dtd
browser/chrome/browser/newTab.properties
browser/chrome/browser/openLocation.dtd
browser/chrome/browser/openLocation.properties
browser/chrome/browser/pageInfo.dtd
browser/chrome/browser/pageInfo.properties
browser/chrome/browser/places/bookmarkProperties.properties
browser/chrome/browser/places/editBookmarkOverlay.dtd
browser/chrome/browser/places/moveBookmarks.dtd
browser/chrome/browser/places/places.dtd
browser/chrome/browser/places/places.properties
browser/chrome/browser/preferences/aboutPermissions.dtd
browser/chrome/browser/preferences/aboutPermissions.properties
browser/chrome/browser/preferences/advanced-scripts.dtd
browser/chrome/browser/preferences/advanced.dtd
browser/chrome/browser/preferences/applicationManager.dtd
browser/chrome/browser/preferences/applicationManager.properties
browser/chrome/browser/preferences/applications.dtd
browser/chrome/browser/preferences/colors.dtd
browser/chrome/browser/preferences/connection.dtd
browser/chrome/browser/preferences/content.dtd
browser/chrome/browser/preferences/cookies.dtd
browser/chrome/browser/preferences/fonts.dtd
browser/chrome/browser/preferences/languages.dtd
browser/chrome/browser/preferences/main.dtd
browser/chrome/browser/preferences/permissions.dtd
browser/chrome/browser/preferences/preferences.dtd
browser/chrome/browser/preferences/preferences.properties
browser/chrome/browser/preferences/privacy.dtd
browser/chrome/browser/preferences/security.dtd
browser/chrome/browser/preferences/selectBookmark.dtd
browser/chrome/browser/preferences/sync.dtd
browser/chrome/browser/preferences/tabs.dtd
browser/chrome/browser/quitDialog.properties
browser/chrome/browser/safeMode.dtd
browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
browser/chrome/browser/safebrowsing/report-phishing.dtd
browser/chrome/browser/sanitize.dtd
browser/chrome/browser/search.properties
browser/chrome/browser/searchbar.dtd
browser/chrome/browser/setDesktopBackground.dtd
browser/chrome/browser/shellservice.properties
browser/chrome/browser/syncBrand.dtd
browser/chrome/browser/syncGenericChange.properties
browser/chrome/browser/syncKey.dtd
browser/chrome/browser/syncProgress.dtd
browser/chrome/browser/syncQuota.dtd
browser/chrome/browser/syncQuota.properties
browser/chrome/browser/syncSetup.dtd
browser/chrome/browser/syncSetup.properties
browser/chrome/browser/tabbrowser.dtd
browser/chrome/browser/tabbrowser.properties
browser/chrome/browser/tabview.properties
browser/chrome/browser/taskbar.properties
browser/chrome/overrides/appstrings.properties
browser/chrome/overrides/netError.dtd
browser/chrome/overrides/settingsChange.dtd
browser/crashreporter/crashreporter-override.ini
browser/feedback/main.dtd
browser/feedback/main.properties
browser/firefox-l10n.js
browser/installer/custom.properties
browser/installer/mui.properties
browser/installer/override.properties
browser/pdfviewer/chrome.properties
browser/pdfviewer/viewer.properties
browser/profile/chrome/userChrome-example.css
browser/profile/chrome/userContent-example.css
browser/updater/updater.ini
browser/webapp-uninstaller/webapp-uninstaller.properties
browser/webapprt/webapp.properties
dom/chrome/accessibility/AccessFu.properties
dom/chrome/accessibility/mac/accessible.properties
dom/chrome/accessibility/unix/accessible.properties
dom/chrome/accessibility/win/accessible.properties
dom/chrome/appstrings.properties
dom/chrome/charsetTitles.properties
dom/chrome/dom/dom.properties
dom/chrome/global-strres.properties
dom/chrome/global.dtd
dom/chrome/layout/HtmlForm.properties
dom/chrome/layout/MediaDocument.properties
dom/chrome/layout/css.properties
dom/chrome/layout/htmlparser.properties
dom/chrome/layout/layout_errors.properties
dom/chrome/layout/printing.properties
dom/chrome/layout/xbl.properties
dom/chrome/layout/xmlparser.properties
dom/chrome/layout/xul.properties
dom/chrome/netError.dtd
dom/chrome/netErrorApp.dtd
dom/chrome/nsWebBrowserPersist.properties
dom/chrome/plugins.properties
dom/chrome/security/caps.properties
dom/chrome/svg/svg.properties
dom/chrome/xml/prettyprint.dtd
dom/chrome/xslt/xslt.properties
embedding/android/android_strings.dtd
mobile/android/base/android_strings.dtd
mobile/android/base/sync_strings.dtd
mobile/android/chrome/aboutAddons.dtd
mobile/android/chrome/aboutAddons.properties
mobile/android/chrome/aboutApps.dtd
mobile/android/chrome/aboutApps.properties
mobile/android/chrome/aboutCertError.dtd
mobile/android/chrome/aboutDownloads.dtd
mobile/android/chrome/aboutDownloads.properties
mobile/android/chrome/aboutHome.dtd
mobile/android/chrome/browser.properties
mobile/android/chrome/checkbox.dtd
mobile/android/chrome/config.dtd
mobile/android/chrome/config.properties
mobile/android/chrome/feedback.dtd
mobile/android/chrome/localepicker.properties
mobile/android/chrome/notification.dtd
mobile/android/chrome/phishing.dtd
mobile/android/chrome/prompt.dtd
mobile/android/chrome/sync.dtd
mobile/android/chrome/sync.properties
mobile/chrome/region.properties
mobile/overrides/appstrings.properties
mobile/overrides/netError.dtd
mobile/overrides/passwordmgr.properties
mobile/xul/chrome/aboutCertError.dtd
mobile/xul/chrome/aboutHome.dtd
mobile/xul/chrome/browser.dtd
mobile/xul/chrome/browser.properties
mobile/xul/chrome/checkbox.dtd
mobile/xul/chrome/config.dtd
mobile/xul/chrome/feedback.dtd
mobile/xul/chrome/localepicker.properties
mobile/xul/chrome/notification.dtd
mobile/xul/chrome/phishing.dtd
mobile/xul/chrome/preferences.dtd
mobile/xul/chrome/prompt.dtd
mobile/xul/chrome/sync.dtd
mobile/xul/chrome/sync.properties
mobile/xul/chrome/webapps.dtd
mobile/xul/crashreporter/crashreporter-override.ini
mobile/xul/updater/updater.ini
netwerk/necko.properties
security/manager/chrome/pipnss/nsserrors.properties
security/manager/chrome/pipnss/pipnss.properties
security/manager/chrome/pipnss/security.properties
security/manager/chrome/pippki/certManager.dtd
security/manager/chrome/pippki/deviceManager.dtd
security/manager/chrome/pippki/pippki.dtd
security/manager/chrome/pippki/pippki.properties
security/manager/chrome/pippki/validation.dtd
services/sync/errors.properties
services/sync/sync.properties
toolkit/chrome/alerts/notificationNames.properties
toolkit/chrome/autoconfig/autoconfig.properties
toolkit/chrome/cookie/cookieAcceptDialog.dtd
toolkit/chrome/cookie/cookieAcceptDialog.properties
toolkit/chrome/global-platform/mac/intl.properties
toolkit/chrome/global-platform/mac/platformKeys.properties
toolkit/chrome/global-platform/unix/intl.properties
toolkit/chrome/global-platform/unix/platformKeys.properties
toolkit/chrome/global-platform/win/intl.properties
toolkit/chrome/global-platform/win/platformKeys.properties
toolkit/chrome/global-region/region.properties
toolkit/chrome/global/aboutAbout.dtd
toolkit/chrome/global/aboutRights.properties
toolkit/chrome/global/aboutSupport.dtd
toolkit/chrome/global/aboutSupport.properties
toolkit/chrome/global/actions.dtd
toolkit/chrome/global/appPicker.dtd
toolkit/chrome/global/browser.properties
toolkit/chrome/global/charsetOverlay.dtd
toolkit/chrome/global/commonDialog.dtd
toolkit/chrome/global/commonDialogs.properties
toolkit/chrome/global/config.dtd
toolkit/chrome/global/config.properties
toolkit/chrome/global/console.dtd
toolkit/chrome/global/console.properties
toolkit/chrome/global/contentAreaCommands.properties
toolkit/chrome/global/customizeCharset.dtd
toolkit/chrome/global/customizeToolbar.dtd
toolkit/chrome/global/customizeToolbar.properties
toolkit/chrome/global/dateFormat.properties
toolkit/chrome/global/datetimepicker.dtd
toolkit/chrome/global/dialog.properties
toolkit/chrome/global/dialogOverlay.dtd
toolkit/chrome/global/downloadProgress.properties
toolkit/chrome/global/editMenuOverlay.dtd
toolkit/chrome/global/filefield.properties
toolkit/chrome/global/filepicker.dtd
toolkit/chrome/global/filepicker.properties
toolkit/chrome/global/findbar.dtd
toolkit/chrome/global/findbar.properties
toolkit/chrome/global/finddialog.dtd
toolkit/chrome/global/finddialog.properties
toolkit/chrome/global/globalKeys.dtd
toolkit/chrome/global/headsUpDisplay.properties
toolkit/chrome/global/intl.properties
toolkit/chrome/global/keys.properties
toolkit/chrome/global/languageNames.properties
toolkit/chrome/global/mozilla.dtd
toolkit/chrome/global/notification.dtd
toolkit/chrome/global/nsTreeSorting.properties
toolkit/chrome/global/preferences.dtd
toolkit/chrome/global/printPageSetup.dtd
toolkit/chrome/global/printPreview.dtd
toolkit/chrome/global/printPreviewProgress.dtd
toolkit/chrome/global/printProgress.dtd
toolkit/chrome/global/printdialog.dtd
toolkit/chrome/global/printdialog.properties
toolkit/chrome/global/printjoboptions.dtd
toolkit/chrome/global/regionNames.properties
toolkit/chrome/global/resetProfile.dtd
toolkit/chrome/global/textcontext.dtd
toolkit/chrome/global/tree.dtd
toolkit/chrome/global/videocontrols.dtd
toolkit/chrome/global/viewSource.dtd
toolkit/chrome/global/viewSource.properties
toolkit/chrome/global/wizard.dtd
toolkit/chrome/global/wizard.properties
toolkit/chrome/global/xpinstall/xpinstall.properties
toolkit/chrome/mozapps/downloads/downloads.dtd
toolkit/chrome/mozapps/downloads/downloads.properties
toolkit/chrome/mozapps/downloads/settingsChange.dtd
toolkit/chrome/mozapps/downloads/unknownContentType.dtd
toolkit/chrome/mozapps/downloads/unknownContentType.properties
toolkit/chrome/mozapps/extensions/about.dtd
toolkit/chrome/mozapps/extensions/blocklist.dtd
toolkit/chrome/mozapps/extensions/newaddon.dtd
toolkit/chrome/mozapps/extensions/newaddon.properties
toolkit/chrome/mozapps/extensions/selectAddons.dtd
toolkit/chrome/mozapps/extensions/selectAddons.properties
toolkit/chrome/mozapps/extensions/update.dtd
toolkit/chrome/mozapps/extensions/update.properties
toolkit/chrome/mozapps/extensions/xpinstallConfirm.dtd
toolkit/chrome/mozapps/extensions/xpinstallConfirm.properties
toolkit/chrome/mozapps/handling/handling.dtd
toolkit/chrome/mozapps/handling/handling.properties
toolkit/chrome/mozapps/help/help-toc.rdf
toolkit/chrome/mozapps/help/help.dtd
toolkit/chrome/mozapps/help/help.properties
toolkit/chrome/mozapps/help/welcome.xhtml
toolkit/chrome/mozapps/plugins/plugins.dtd
toolkit/chrome/mozapps/preferences/changemp.dtd
toolkit/chrome/mozapps/preferences/ocsp.dtd
toolkit/chrome/mozapps/preferences/preferences.properties
toolkit/chrome/mozapps/preferences/removemp.dtd
toolkit/chrome/mozapps/profile/createProfileWizard.dtd
toolkit/chrome/mozapps/profile/profileSelection.dtd
toolkit/chrome/mozapps/profile/profileSelection.properties
toolkit/chrome/mozapps/update/history.dtd
toolkit/chrome/mozapps/update/updates.properties
toolkit/chrome/passwordmgr/passwordManager.dtd
toolkit/chrome/passwordmgr/passwordmgr.properties
toolkit/chrome/places/places.properties
toolkit/chrome/search/search.properties
toolkit/crashreporter/crashes.dtd
toolkit/crashreporter/crashes.properties
toolkit/crashreporter/crashreporter.ini
--- a/browser/branding/official/brand.dtd
+++ b/browser/branding/official/brand.dtd
@@ -1,4 +1,8 @@
+<!-- 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  brandShortName        "Firefox">
 <!ENTITY  brandFullName         "Mozilla Firefox">
 <!ENTITY  vendorShortName       "Mozilla">
 <!ENTITY  trademarkInfo.part1   "'S e comharran-malairt aig Fonndas Mozilla a tha ann am Firefox agus sna suaichteantasan Firefox.">
--- a/browser/branding/official/brand.properties
+++ b/browser/branding/official/brand.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 brandShortName=Firefox
 brandFullName=Mozilla Firefox
 vendorShortName=Mozilla
 
 homePageSingleStartMain=Firefox Start, duilleag-dhachaidh luath le inneal-rannsachaidh 'na bhroinn
 homePageImport=Thoir a-steach an duilleag-dhachaidh agad o %S
 
 homePageMigrationPageTitle=Taghadh na duilleige-dachaidh
--- a/browser/chrome/browser/aboutCertError.dtd
+++ b/browser/chrome/browser/aboutCertError.dtd
@@ -1,8 +1,12 @@
+<!-- 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 % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
   %brandDTD;
 <!-- These strings are used by Firefox's custom about:certerror page,
 a replacement for the standard security certificate errors produced
 by NSS/PSM via netError.xhtml. -->
 
 
 <!ENTITY certerror.pagetitle  "Ceangal gun earbsa">
--- a/browser/chrome/browser/aboutDialog.dtd
+++ b/browser/chrome/browser/aboutDialog.dtd
@@ -1,8 +1,11 @@
+<!-- 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 aboutDialog.title          "Mu &brandFullName;">
 <!-- 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        "Thathar ag obair air &brandShortName; fhathast agus faodaidh nach bi iad buileach seasmhach.">
 <!-- LOCALIZATION NOTE (warningDesc.telemetryDesc): This is a notification that Nightly/Aurora builds automatically send Telemetry data back to Mozilla. It is only shown in those versions. "It" refers to brandShortName. -->
 <!ENTITY warningDesc.telemetryDesc  "Cuiridh seo dàta mu dhèanadas, bathar-cruaidh, cleachdadh is gnàthachaidhean air ais gu &vendorShortName; gus taic a chumail riutha le leasachadh &brandShortName;.">
 <!-- LOCALIZATION NOTE (community.exp.*) This paragraph is shown in "experimental" builds, i.e. Nightly and Aurora builds, instead of the other "community.*" strings below. -->
 
@@ -63,14 +66,16 @@
 <!-- LOCALIZATION NOTE (update.downloading.start,update.downloading.end): update.downloading.start and 
      update.downloading.end all go into one line, with the amount downloaded inserted in between. As this
      is all in one line, try to make the localized text short (see bug 596813 for screenshots). The — is
      the "em dash" (long dash).
      example: Downloading update — 111 KB of 13 MB -->
 
 <!ENTITY update.downloading.start   "A' luchdadh a-nuas an ùrachaidh — ">
 <!ENTITY update.downloading.end     "">
+
+<!ENTITY update.applying            "A' cur an às an ùrachaidh…">
 <!-- LOCALIZATION NOTE (channel.description.start,channel.description.end): channel.description.start and
      channel.description.end create one sentence, with the current channel label inserted in between.
      example: You are currently on the _Stable_ update channel. -->
 
 <!ENTITY channel.description.start  "Tha thu san t-seanail ùrachaidh ">
 <!ENTITY channel.description.end    " an-dràsta. ">
--- a/browser/chrome/browser/aboutHome.dtd
+++ b/browser/chrome/browser/aboutHome.dtd
@@ -1,8 +1,12 @@
+<!-- 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 % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 %brandDTD;
 <!ENTITY % syncBrandDTD SYSTEM "chrome://browser/locale/syncBrand.dtd">
 %syncBrandDTD;
 <!-- These strings are used in the about:home page -->
 
 
 <!ENTITY abouthome.pageTitle "An duilleag tòiseachaidh aig &brandFullName;">
--- a/browser/chrome/browser/aboutPrivateBrowsing.dtd
+++ b/browser/chrome/browser/aboutPrivateBrowsing.dtd
@@ -1,8 +1,12 @@
+<!-- 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 privatebrowsingpage.title                 "Brabhsadh prìobhaideach">
 <!ENTITY privatebrowsingpage.title.normal          "A bheil thu airson tòiseachadh air brabhsadh prìobhaideach?">
 
 <!ENTITY privatebrowsingpage.issueDesc                 "Cha chum &brandShortName; eachdraidh an t-seisein seo 'na chuimhne.">
 <!ENTITY privatebrowsingpage.issueDesc.normal          "Chan eil &brandShortName; ann am modh brabhsaidh phrìobhaidich an-dràsta.">
 
 <!ENTITY privatebrowsingpage.description               "Cha chum &brandShortName; eachdraidh a' bhrabhsair, eachdraidh nan lorg, eachdraidh luchdaidh, eachdraidh fhoirmean-lìn, briosgaidean no faidhlichean-lìn sealach na chuimhne nuair a bhios tu ann am modh brabhsaidh phrìobhaidich.  Ge-tà, thèid faidhlichean a luchdaicheas tu a-nuas agus comharran-lìn a nì thu a chumail.">
 <!-- LOCALIZATION NOTE (privatebrowsingpage.clearRecentHistoryBefore): include a trailing space as needed -->
--- a/browser/chrome/browser/aboutRobots.dtd
+++ b/browser/chrome/browser/aboutRobots.dtd
@@ -1,16 +1,20 @@
+<!-- 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/. -->
 <!-- These strings are used in the about:robots page, which ties in with the
      robots theme used in the Firefox 3 Beta 2/3 first run pages...
          https://www.mozilla.com/en-US/firefox/3.0b2/firstrun/
          https://www.mozilla.com/en-US/firefox/3.0b3/firstrun/
      They're just meant to be fun and whimsical, with references to some geeky
      but well-known robots in movies and books. Be creative with translations! -->
 <!-- Nonsense line from the movie "The Day The Earth Stood Still". No translation needed. -->
 
+
 <!ENTITY robots.pagetitle  "Gort! Klaatu barada nikto!">
 <!-- Movie: Logan's Run... Box (cybog): "Welcome Humans! I am ready for you." -->
 <!ENTITY robots.errorTitleText "Fàilte oirbh, a mhac an duine!">
 <!-- Movie: The Day The Earth Stood Still. Spoken by Klaatu. -->
 <!ENTITY robots.errorShortDescText "Thàinig sinn a chèilidh oirbh ann an sìth is le deagh ghean!">
 <!-- Various books by Isaac Asimov. http://en.wikipedia.org/wiki/Three_Laws_of_Robotics -->
 <!ENTITY robots.errorLongDesc1 "Cha fhaod robotairean duine a leònadh no leigeil le cron a thachairt do dhuine le bhith &apos;nan tàmh.">
 <!-- Movie: Blade Runner. Batty: "I've seen things you people wouldn't believe..." -->
--- a/browser/chrome/browser/aboutSessionRestore.dtd
+++ b/browser/chrome/browser/aboutSessionRestore.dtd
@@ -1,8 +1,12 @@
+<!-- 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 restorepage.tabtitle       "Aisig an seisean">
 <!-- LOCALIZATION NOTE: The title is intended to be apologetic and disarming, expressing dismay
      and regret that we are unable to restore the session for the user -->
 
 <!ENTITY restorepage.errorTitle     "Uel, tha seo a' cur nàire oirnn.">
 <!ENTITY restorepage.problemDesc    "Tha duilgheadasan aig &brandShortName; le aiseag nan uinneagan is tabaichean agad. Bidh duilleag-lìn a dh'fhosgail thu o chionn ghoirid coireach à seo mar is trice.">
 <!ENTITY restorepage.tryThis        "'S urrainn dhut na leanas fheuchainn:">
 <!ENTITY restorepage.restoreSome    "Taba(ichean) a dhùnadh ma tha thu sa bheachd gu bheil e/iad ag adhbharachadh an duilgheadais">
--- a/browser/chrome/browser/aboutSyncTabs.dtd
+++ b/browser/chrome/browser/aboutSyncTabs.dtd
@@ -1,9 +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 (tabs.otherComputers.label): Keep this in sync with syncTabsMenu.label from browser.dtd -->
+
 <!ENTITY tabs.otherComputers.label               "Tabaichean o choimpiutairean eile">
 
 <!ENTITY tabs.searchText.label                   "Sgrìobh an-seo gus tabaichean a lorg…">
 <!-- LOCALIZATION NOTE (tabs.context.openTab.accesskey, tabs.context.openMultipleTabs.accesskey):
      Only one of these will show at a time (based on selection), so reusing accesskey is ok. -->
 
 <!ENTITY tabs.context.openTab.label                   "Fosgail an taba seo">
 <!ENTITY tabs.context.openTab.accesskey               "o">
--- a/browser/chrome/browser/baseMenuOverlay.dtd
+++ b/browser/chrome/browser/baseMenuOverlay.dtd
@@ -1,8 +1,12 @@
+<!-- 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 minimizeWindow.key       "m">
 <!ENTITY minimizeWindow.label     "Lughdaich">
 <!ENTITY bringAllToFront.label    "Gluais a h-uile gun a' bheulaibh">
 <!ENTITY zoomWindow.label         "Sùm">
 <!ENTITY windowMenu.label         "Uinneag">
 
 <!ENTITY helpMenu.label           "Cobhair"> 
 <!ENTITY helpMenu.accesskey       "h"> 
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -1,12 +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/. -->
 <!-- LOCALIZATION NOTE : FILE This file contains the browser main menu items -->
 <!-- LOCALIZATION NOTE : FILE Do not translate commandkeys --> 
 <!-- LOCALIZATION NOTE (mainWindow.title): DONT_TRANSLATE -->
 
+
 <!ENTITY mainWindow.title "&brandFullName;">
 <!-- LOCALIZATION NOTE (mainWindow.titlemodifier) : DONT_TRANSLATE -->
 <!ENTITY mainWindow.titlemodifier "&brandFullName;">
 <!-- LOCALIZATION NOTE (mainWindow.titlemodifiermenuseparator): DONT_TRANSLATE -->
 <!ENTITY mainWindow.titlemodifiermenuseparator " - ">
 <!-- LOCALIZATION NOTE (mainWindow.titlePrivateBrowsingSuffix): This will be appended to the window's title
                                                                 inside the private browsing mode -->
 <!ENTITY mainWindow.titlePrivateBrowsingSuffix "(Brabhsadh prìobhaideach)">
@@ -72,30 +76,42 @@ can reach it easily. -->
 <!ENTITY addonBarCmd.accesskey "B">
 
 <!ENTITY pageSourceCmd.label "Bun-tùs na duilleige">
 <!ENTITY pageSourceCmd.accesskey "u">
 <!ENTITY pageSourceCmd.commandkey "u">
 <!ENTITY pageInfoCmd.label "Fiosrachadh na duilleige">
 <!ENTITY pageInfoCmd.accesskey "i">
 <!ENTITY pageInfoCmd.commandkey "i">
+<!-- LOCALIZATION NOTE (enterFullScreenCmd.label, exitFullScreenCmd.label):
+These should match what Safari and other Apple applications use on OS X Lion. -->
+<!ENTITY enterFullScreenCmd.label "Dhan làn-sgrìn">
+<!ENTITY enterFullScreenCmd.accesskey "D">
+<!ENTITY exitFullScreenCmd.label "Fàg an làn-sgrìn">
+<!ENTITY exitFullScreenCmd.accesskey "l">
 <!ENTITY fullScreenCmd.label "Làn-sgrìn">
 <!ENTITY fullScreenCmd.accesskey "L">
 <!ENTITY fullScreenCmd.macCommandKey "f">
 <!ENTITY showAllTabsCmd.label "Seall gach taba">
 <!ENTITY showAllTabsCmd.accesskey "a">
 
 <!ENTITY fullScreenMinimize.tooltip "Lughdaich">
 <!ENTITY fullScreenRestore.tooltip "Aisig">
 <!ENTITY fullScreenClose.tooltip "Dùin">
 <!ENTITY fullScreenAutohide.label "Cuir bàraichean-inneil am falach">
 <!ENTITY fullScreenAutohide.accesskey "h">
 <!ENTITY fullScreenExit.label "Fàg modh na làn-sgrìn">
 <!ENTITY fullScreenExit.accesskey "l">
-<!ENTITY domFullScreenWarning.label "Put ESC gus modh na làn-sgrìn fhàgail">
+<!ENTITY fullscreenAllowButton.label "Ceadaich">
+<!ENTITY fullscreenExitButton.label "Diùlt e">
+<!ENTITY fullscreenApproval.value "A bheil thu airson cead a thoirt dhan làn-sgrìn?">
+
+<!ENTITY fullscreenExitHint.value "Fàgaidh tu an làn-sgrìn uair sam bith 's tu a' brùthadh ESC">
+<!ENTITY leaveDOMFullScreen.label "Fàg an làn-sgrìn">
+<!ENTITY leaveDOMFullScreen.accesskey "F">
 
 <!ENTITY closeWindow.label "Dùin an uinneag">
 <!ENTITY closeWindow.accesskey "D">
 
 <!ENTITY bookmarksMenu.label "Comharran-lìn">
 <!ENTITY bookmarksMenu.accesskey "C">
 <!ENTITY bookmarkThisPageCmd.label "Cruthaich comharra-lìn dhan duilleag seo">
 <!ENTITY bookmarkThisPageCmd.commandkey "d">
@@ -192,16 +208,20 @@ can reach it easily. -->
 <!ENTITY webConsoleCmd.commandkey     "k">
 
 <!ENTITY inspectMenu.label            "Sgrùdaich">
 <!ENTITY inspectMenu.accesskey        "S">
 <!ENTITY inspectMenu.commandkey       "I">
 
 <!ENTITY inspectContextMenu.label     "Sgrùd an eileamaid">
 <!ENTITY inspectContextMenu.accesskey "Q">
+
+<!ENTITY responsiveUI.label            "Am modh freagairteach">
+<!ENTITY responsiveUI.accesskey        "m">
+<!ENTITY responsiveUI.commandkey       "M">
 <!-- LOCALIZATION NOTE (scratchpad.label): This menu item label appears
   -  in the Tools menu. See bug 653093.
   -  The Scratchpad is intended to provide a simple text editor for creating
   -  and evaluating bits of JavaScript code for the purposes of function
   -  prototyping, experimentation and convenient scripting.
   -
   -  It's quite possible that you won't have a good analogue for the word
   -  "Scratchpad" in your locale. You should feel free to find a close
@@ -210,24 +230,43 @@ can reach it easily. -->
 
 <!ENTITY scratchpad.label             "Pada nan sgrìoban">
 <!ENTITY scratchpad.accesskey         "r">
 <!ENTITY scratchpad.keycode           "VK_F4">
 <!ENTITY scratchpad.keytext           "F4">
 
 <!ENTITY inspectCloseButton.tooltiptext "Dùin an sgrùdaiche">
 
+<!ENTITY devToolbarCloseButton.tooltiptext "Dùin bàr-inneal an luchd-leasachaidh">
+<!ENTITY devToolbarMenu.label              "Bàr-inneal an luchd-leasachaidh">
+<!ENTITY devToolbarMenu.accesskey          "B">
+<!ENTITY devToolbar.commandkey             "v">
+
+<!ENTITY webConsoleButton.label "A' chonsoil-lìn">
+<!ENTITY inspectorButton.label "Sgrùdaichear">
+<!ENTITY scriptsButton.label "Sgriobtaichean">
+
 <!ENTITY inspectorHTMLCopyInner.label       "Dèan lethbhreac dhen Inner HTML">
 <!ENTITY inspectorHTMLCopyInner.accesskey   "H">
 
 <!ENTITY inspectorHTMLCopyOuter.label       "Dèan lethbhreac dhen Outer HTML">
 <!ENTITY inspectorHTMLCopyOuter.accesskey   "O">
 
 <!ENTITY inspectorHTMLDelete.label          "Sguab às an nòd">
 <!ENTITY inspectorHTMLDelete.accesskey      "S">
+<!-- LOCALIZATION NOTE (inspectOptionButton.*): The menu in the Inspector
+  -  toolbar.  -->
+
+<!ENTITY inspectOptionButton.tooltiptext    "Roghainnean an sgrùdaicheir">
+<!-- LOCALIZATION NOTE: These are for the menu in the Inspector Toolbar -->
+
+<!ENTITY inspectorToggleVeil.label          "Doilleirich an duilleag">
+<!ENTITY inspectorToggleVeil.accesskey      "D">
+<!ENTITY inspectorToggleInfobar.label       "Seall fiosrachadh an nòid">
+<!ENTITY inspectorToggleInfobar.accesskey   "S">
 <!-- LOCALIZATION NOTE (inspect3DViewButton.label): This button shows an
   -  alternate view for the Inspector, creating a 3D visualization of the
   -  webpage. -->
 
 <!ENTITY inspect3DViewButton.label     "Sealladh 3D">
 <!ENTITY inspect3DViewButton.accesskey "D">
 
 <!ENTITY inspectStyleButton.label     "Stoidhle">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 nv_timeout=Thar ama
 openFile=Fosgail faidhle
 
 droponhometitle=Suidhich an duilleag-dhachaigh
 droponhomemsg=A bheil thu ag iarraidh an sgrìobhainn seo mar an duilleag-dhachaigh ùr agad?
 
 # context menu strings
 
@@ -145,18 +149,18 @@ sanitizeSelectedWarning=Thèid gach rud a thagh thu a ghlanadh.
 # directly under the Firefox version in the about dialog (see bug 596813 for
 # screenshots).
 update.checkInsideButton.label=Lorg ùrachaidhean
 update.checkInsideButton.accesskey=c
 update.resumeButton.label=Lean ort le luchdadh a-nuas %S…
 update.resumeButton.accesskey=d
 update.openUpdateUI.applyButton.label=Cuir an t-ùrachadh an sàs…
 update.openUpdateUI.applyButton.accesskey=a
-update.restart.applyButton.label=Cuir an t-ùrachadh an sàs
-update.restart.applyButton.accesskey=a
+update.restart.updateButton.label=Ath-thòisich e gus an t-ùrachadh a chur an sàs
+update.restart.updateButton.accesskey=R
 update.openUpdateUI.upgradeButton.label=Ùraich an-dràsta…
 update.openUpdateUI.upgradeButton.accesskey=Ù
 update.restart.upgradeButton.label=Ùraich an-dràsta
 update.restart.upgradeButton.accesskey=Ù
 
 # RSS Pretty Print
 feedShowFeedNew=Fo-sgrìobh gu "%S"…
 
@@ -297,16 +301,17 @@ privateBrowsingNeverAsk=&Na seall an tea
 ctrlTab.showAll.label=;Seall an #1 thaba;Seall na #1 tabaichean; Seall na #1 taba gu lèir
 
 # LOCALIZATION NOTE (addKeywordTitleAutoFill): %S will be replaced by the page's title
 # Used as the bookmark name when saving a keyword for a search field.
 addKeywordTitleAutoFill=Lorg air %S
 
 # TabView
 tabView2.title=%S - buidhnich na tabaichean agad
+tabview2.moveToUnnamedGroup.label=%S agus %S a bharrachd
 
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name=Bunaiteach
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description=Seo an coltas bunaiteach.
 
 # safeModeRestart
 safeModeRestartPromptTitle=Ath-thòiseach leis na tuilleadan air an cur à comas
 safeModeRestartPromptMessage=A bheil thu cinnteach gu bheil thu airson a h-uile tuilleadan a chur à comas agus ath-thòiseachadh?
 safeModeRestartButton=Ath-thòisich
@@ -347,8 +352,13 @@ webapps.install = Stàlaich
 webapps.install.accesskey = S
 #LOCALIZATION NOTE (webapps.requestInstall) %1$S is the web app name, %2$S is the site from which the web app is installed
 webapps.requestInstall = A bheil thu airson "%1$S" a stàladh on làrach seo (%2$S)?
 
 # Telemetry opt-out prompt for Aurora and Nightly
 # LOCALIZATION NOTE (telemetryOptOutPrompt): %1$S and %3$S will be replaced by
 # brandFullName, and %2$S by the value of the toolkit.telemetry.server_owner preference.
 telemetryOptOutPrompt = Cuiridh %1$S fiosrachadh mu dhèanadas, bathar-cruaidh, cleachdadh is gnàthachaidhean air ais gu %2$S gus taic a chumail ri leasachadh %3$S.
+
+# LOCALIZATION NOTE (fullscreen.entered): displayed when we enter HTML5 fullscreen mode, %S is the domain name of the focused website (e.g. mozilla.com).
+fullscreen.entered=Tha %S 'na làn-sgrìn a-nis.
+# LOCALIZATION NOTE (fullscreen.rememberDecision): displayed when we enter HTML5 fullscreen mode, %S is the domain name of the focused website (e.g. mozilla.com).
+fullscreen.rememberDecision=Cuimhnich mo cho-dhùnadh mu %S
--- a/browser/chrome/browser/devtools/debugger.dtd
+++ b/browser/chrome/browser/devtools/debugger.dtd
@@ -1,46 +1,70 @@
-<!-- LOCALIZATION NOTE : FILE This file contains the Script Debugger strings -->
+<!-- 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 : FILE This file contains the Debugger strings -->
 <!-- LOCALIZATION NOTE : FILE Do not translate commandkey -->
 <!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
   - keep it in English, or another language commonly spoken among web developers.
   - You want to make that choice consistent across the developer tools.
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
 <!-- LOCALIZATION NOTE (debuggerMenu.label): This is the label for the
   -  application menu item that opens the debugger UI. -->
 
 
-<!ENTITY debuggerMenu.label          "Dì-bhugadair nan sgriobt">
+
+<!ENTITY debuggerMenu.label2          "Dì-bhugadair">
+<!-- LOCALIZATION NOTE (remoteDebuggerMenu.label): This is the label for the
+  -  application menu item that opens the remote debugger UI. -->
+
+<!ENTITY remoteDebuggerMenu.label    "Dì-bhugadair cèin">
+<!-- LOCALIZATION NOTE (chromeDebuggerMenu.label): This is the label for the
+  -  application menu item that opens the browser debugger UI. -->
+
+<!ENTITY chromeDebuggerMenu.label    "Dì-bhugadair brabhsair">
 <!-- LOCALIZATION NOTE (debuggerMenu.commandkey): This is the command key that
   -  launches the debugger UI. Do not translate this one! -->
 
 <!ENTITY debuggerMenu.commandkey     "S">
-<!-- LOCALIZATION NOTE (debuggerUI.closeButton): This is the label for the
-  -  button that closes the debugger UI. -->
+<!-- LOCALIZATION NOTE (debuggerUI.closeButton.tooltip): This is the tooltip for
+  -  the button that closes the debugger UI. -->
+
+<!ENTITY debuggerUI.closeButton.tooltip        "Dùin">
+<!-- LOCALIZATION NOTE (debuggerUI.pauseExceptions): This is the label for the
+  -  checkbox that toggles pausing on exceptions. -->
 
-<!ENTITY debuggerUI.closeButton      "Dùin">
-<!-- LOCALIZATION NOTE (debuggerUI.stepOverButton): This is the label for the
-  -  button that steps over a function call. -->
+<!ENTITY debuggerUI.pauseExceptions          "Cuir 'na stad ma thachras eisgeachd">
+<!-- LOCALIZATION NOTE (debuggerUI.stepOverButton.tooltip): This is the tooltip for
+  -  the button that steps over a function call. -->
 
-<!ENTITY debuggerUI.stepOverButton   "Gabh ceum thairis air">
-<!-- LOCALIZATION NOTE (debuggerUI.stepInButton): This is the label for the
+<!ENTITY debuggerUI.stepOverButton.tooltip   "Gabh ceum thairis air">
+<!-- LOCALIZATION NOTE (debuggerUI.stepInButton): This is the tooltip for the
   -  button that steps into a function call. -->
 
-<!ENTITY debuggerUI.stepInButton     "Gabh ceum a-steach">
-<!-- LOCALIZATION NOTE (debuggerUI.stepOutButton): This is the label for the
+<!ENTITY debuggerUI.stepInButton.tooltip     "Gabh ceum a-steach">
+<!-- LOCALIZATION NOTE (debuggerUI.stepOutButton): This is the tooltip for the
   -  button that steps out of a function call. -->
 
-<!ENTITY debuggerUI.stepOutButton    "Gabh ceum a-mach">
+<!ENTITY debuggerUI.stepOutButton.tooltip    "Gabh ceum a-mach">
 <!-- LOCALIZATION NOTE (debuggerUI.stackTitle): This is the label for the
   -  widget that displays the call stack frames in the debugger. -->
 
 <!ENTITY debuggerUI.stackTitle       "Call stack">
 <!-- LOCALIZATION NOTE (debuggerUI.scriptTitle): This is the label for the
   -  widget that displays the source code for the script that is currently
   -  being inspected in the debugger. -->
 
 <!ENTITY debuggerUI.scriptTitle      "Sgriobt">
 <!-- LOCALIZATION NOTE (debuggerUI.propertiesTitle): This is the label for the
   -  widget that displays the variables in the various available scopes in the
   -  debugger. -->
 
 <!ENTITY debuggerUI.propertiesTitle  "Caochladairean sgòip">
+<!-- LOCALIZATION NOTE (debuggerUI.emptyFilterText): This is the text that
+  -  appears in the filter text box when it is empty. -->
+
+<!ENTITY debuggerUI.emptyFilterText  "Sgriobtaichean criathraidh">
+<!-- LOCALIZATION NOTE (emptyScriptText): The text to display in the menulist when
+  - there are no scripts. -->
+
+<!ENTITY debuggerUI.emptyScriptText  "Gun sgriobt.">
--- a/browser/chrome/browser/devtools/debugger.properties
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -1,54 +1,94 @@
-# LOCALIZATION NOTE These strings are used inside the Script Debugger
-# which is available from the Web Developer sub-menu -> 'Script Debugger'.
+# 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 These strings are used inside the Debugger
+# which is available from the Web Developer sub-menu -> 'Debugger'.
 # The correct localization of this file might be to keep it in
 # English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
+# LOCALIZATION NOTE (confirmTabSwitch): The messages displayed for all the
+# title and buttons on the notification shown when a user attempts to open a
+# debugger in a new tab while a different tab is already being debugged.
+confirmTabSwitch.message=Tha an dì-bhugadair fosgailte ann an taba eile mu thràth. Ma leanas tu ort, caillidh tu am fear eile.
+confirmTabSwitch.buttonSwitch=Thoir leum dhan taba a chaidh a dhì-bhugachadh
+confirmTabSwitch.buttonSwitch.accessKey=S
+confirmTabSwitch.buttonOpen=Fosgail e co-dhiù
+confirmTabSwitch.buttonOpen.accessKey=O
+
+# LOCALIZATION NOTE (remoteDebuggerWindowTitle): The title displayed for the
+# remote debugger window.
+remoteDebuggerWindowTitle=Dì-bhugadair cèin
+
+# LOCALIZATION NOTE (remoteDebuggerPromptTitle): The title displayed on the
+# debugger prompt asking for the remote host and port to connect to.
+remoteDebuggerPromptTitle=Ceangal cèin
+
+# LOCALIZATION NOTE (remoteDebuggerPromptMessage): The message displayed on the
+# debugger prompt asking for the remote host and port to connect to.
+remoteDebuggerPromptMessage=Cuir a-steach ainm òstair is àireamh puirt (host:port)
+
+# LOCALIZATION NOTE (remoteDebuggerPromptCheck): The message displayed on the
+# debugger prompt asking if the prompt should be shown again next time.
+remoteDebuggerPromptCheck=Na faighnich dhìom a-rithist
+
+# LOCALIZATION NOTE (remoteDebuggerReconnectMessage): The message displayed on the
+# debugger prompt asking for the remote host and port to connect to.
+remoteDebuggerReconnectMessage=Cha deach am frithealaiche a lorg. A bheil thu airson feuchainn ris a-rithist? (host:port)
+
+# LOCALIZATION NOTE (remoteDebuggerReconnectMessage): The message displayed on the
+# debugger prompt asking for the remote host and port to connect to.
+remoteDebuggerConnectionFailedMessage=Cha b' urrainn dhuinn frithealaiche a lorg le ainm an òstair 's àireamh a' phuirt a thug thu dhuinn.
+
 # LOCALIZATION NOTE (pauseLabel): The label that is displayed on the pause
 # button when the debugger is in a running state.
-pauseLabel=Cuir 'na stad
+pauseTooltip=Dèan briogadh gus a chur 'na stad
 
 # LOCALIZATION NOTE (resumeLabel): The label that is displayed on the pause
 # button when the debugger is in a paused state.
-resumeLabel=Lean air
-
-# LOCALIZATION NOTE (pausedState): The label that is displayed when the
-# debugger is in a paused state.
-pausedState='Na stad
-
-# LOCALIZATION NOTE (runningState): The label that is displayed when the
-# debugger is in a running state.
-runningState=A' ruith
-
-# LOCALIZATION NOTE (localScope): The label that is displayed in the variables
-# pane as a header on the local scope container.
-localScope=Ionadail
+resumeTooltip=Dèan briogadh gus leantainn air
 
-# LOCALIZATION NOTE (globalScope): The label that is displayed in the variables
-# pane as a header on the globel scope container.
-globalScope=Uile-choitcheann
-
-# LOCALIZATION NOTE (withScope): The label that is displayed in the variables
-# pane as a header on the container for identifiers in a with block.
-withScope=Le bacadh
-
-# LOCALIZATION NOTE (closureScope): The label that is displayed in the variables
-# pane as a header on container for identifiers in a closure scope.
-closureScope=Dùnadh
-
-# LOCALIZATION NOTE (emptyText): The text that is displayed in the stack frames
-# list when there are no frames to display.
-emptyText=Falamh
+# LOCALIZATION NOTE (emptyStackText): The text that is displayed in the stack
+# frames list when there are no frames to display.
+emptyStackText=Chan eil stac ann ri thaisbeanadh.
 
 # LOCALIZATION NOTE (loadingText): The text that is displayed in the script
 # editor when the laoding process has started but there is no file to display
 # yet.
 loadingText=A' luchdadh…
 
 # LOCALIZATION NOTE (loadingError):
 # This is the error message that is displayed on failed attempts to load an
 # external resource file.
 # %1$S=URL, %2$S=status code
 loadingError=Mearachd a' luchdadh %1$S: %2$S
+
+# LOCALIZATION NOTE (remoteIncomingPromptTitle): The title displayed on the
+# dialog that prompts the user to allow the incoming connection.
+remoteIncomingPromptTitle=Ceangal a' tighinn a-steach
+
+# LOCALIZATION NOTE (remoteIncomingPromptMessage): The message displayed on the
+# dialog that prompts the user to allow the incoming connection.
+remoteIncomingPromptMessage=Fhuair sinn iarrtas a dh'iarr cead airson dì-bhugachadh cèin. B' urrainn do chliant cèin làn-smachd fhaighinn air a' bhrabhsair agad. A bheil thu airson seo a cheadachadh?
+
+# LOCALIZATION NOTE (remoteIncomingPromptDisable): The label displayed on the
+# third button in the incoming connection dialog that lets the user disable the
+# remote debugger server.
+remoteIncomingPromptDisable=Cuir à comas
+
+# LOCALIZATION NOTE (emptyVariablesText): The text that is displayed in the
+# variables pane when there are no variables to display.
+emptyVariablesText=Chan eil caochladair ann ri thaisbeanadh.
+
+# LOCALIZATION NOTE (scopeLabel): The text that is displayed in the variables
+# pane as a header for each variable scope (e.g. "Global scope, "With scope",
+# etc.).
+scopeLabel=Sgòp %S
+
+# LOCALIZATION NOTE (globalScopeLabel): The name of the global scope. This text
+# is added to scopeLabel and displayed in the variables pane as a header for
+# the global scope.
+globalScopeLabel=Uile-choitcheann
--- a/browser/chrome/browser/devtools/gcli.properties
+++ b/browser/chrome/browser/devtools/gcli.properties
@@ -1,8 +1,12 @@
+# 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 These strings are used inside the Web Console
 # command line which is available from the Web Developer sub-menu
 # -> 'Web Console'.
 # The correct localization of this file might be to keep it in
 # English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
@@ -100,25 +104,26 @@ nodeParseNone=Gun mhaids
 # fuller description of what it does.
 helpDesc=Faigh cuideachadh mu na h-àitheantan a tha ri làimh
 
 # LOCALIZATION NOTE (helpManual): A fuller description of the 'help' command.
 # Displayed when the user asks for help on what it does.
 helpManual=Bheir seo cobhair dhut le àithne shònraichte (ma rinn thu lorg 's ma chaidh deagh mhaids a lorg) no mu na h-àitheantan a tha ri làimh (mur an do rinn thu lorg no mura deach deagh mhaids a lorg).
 
 # LOCALIZATION NOTE (helpSearchDesc): A very short description of the 'search'
-# parameter to the 'help' command. See helpSearchManual for a fuller
+# parameter to the 'help' command. See helpSearchManual2 for a fuller
 # description of what it does. This string is designed to be shown in a dialog
 # with restricted space, which is why it should be as short as possible.
 helpSearchDesc=Faclan luirg
 
-# LOCALIZATION NOTE (helpSearchManual): A fuller description of the 'search'
+# LOCALIZATION NOTE (helpSearchManual2): A fuller description of the 'search'
 # parameter to the 'help' command. Displayed when the user asks for help on
-# what it does.
-helpSearchManual=Ma chuireas tu a-steach faclan luirg, gheibh thu liosta nas fhearr de dh'àitheantan. Faodaidh pàirt sam bith dhen t-sreath a fhreagairt ris agus chan eil taic ann ri Regular Expressions.
+# what it does. Inline HTML (e.g. <strong>) can be used to emphasize the core
+# concept.
+helpSearchManual2=An <strong>sreath luirg</strong> a thèid a chleachdadh gus na h-àitheantan a chithear a chur air gleus. Chan eil taic ri Regular Expressions.
 
 # LOCALIZATION NOTE (helpManSynopsis): A heading shown at the top of a help
 # page for a command in the console It labels a summary of the parameters to
 # the command
 helpManSynopsis=Gearr-chunntas
 
 # LOCALIZATION NOTE (helpManDescription): A heading shown in a help page for a
 # command in the console. This heading precedes the top level description.
@@ -127,17 +132,207 @@ helpManDescription=Tuairisgeul
 # LOCALIZATION NOTE (helpManParameters): A heading shown above the parameters
 # in a help page for a command in the console.
 helpManParameters=Paramadairean
 
 # LOCALIZATION NOTE (helpManNone): Some text shown under the parameters
 # heading in a help page for a command which has no parameters.
 helpManNone=Chan eil gin
 
-# LOCALIZATION NOTE (introHeader): The heading displayed at the top of the
-# output for the help command
-introHeader=Fàilte gu innealan luchd-leasachaidh Firefox
+# LOCALIZATION NOTE (subCommands): Text shown as part of the output of the
+# 'help' command when the command in question has sub-commands, before a list
+# of the matching sub-commands
+subCommands=Fo-àitheantan
+
+# LOCALIZATION NOTE (subCommandsNone): Text shown as part of the output of the
+# 'help' command when the command in question should have sub-commands but in
+# fact has none
+subCommandsNone=Chan eil gin
+
+# LOCALIZATION NOTE (prefDesc): A very short description of the 'pref'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible. See prefManual for a
+# fuller description of what it does.
+prefDesc=Àitheantan a chum smachd nan roghainnean
+
+# LOCALIZATION NOTE (prefManual): A fuller description of the 'pref' command.
+# Displayed when the user asks for help on what it does.
+prefManual=Àitheantan gus na roghainnean aig GCLI 's an àrainneachd mun cuairt air a shealltainn 's atharrachadh
+
+# LOCALIZATION NOTE (prefListDesc): A very short description of the 'pref
+# list' command. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible. See
+# prefListManual for a fuller description of what it does.
+prefListDesc=Seall na roghainnean a tha ri làimh
+
+# LOCALIZATION NOTE (prefListManual): A fuller description of the 'pref list'
+# command. Displayed when the user asks for help on what it does.
+prefListManual=Seall liosta de roghainnean a ghabhas criathradh leis a' pharamadair "search"
+
+# LOCALIZATION NOTE (prefListSearchDesc): A short description of the 'search'
+# parameter to the 'pref list' command. See prefListSearchManual for a fuller
+# description of what it does. This string is designed to be shown in a dialog
+# with restricted space, which is why it should be as short as possible.
+prefListSearchDesc=Criathraich liosta nan roghainnean a chithear
+
+# LOCALIZATION NOTE (prefListSearchManual): A fuller description of the
+# 'search' parameter to the 'pref list' command. Displayed when the user asks
+# for help on what it does.
+prefListSearchManual=Lorg an sreath sin ann an liosta nan roghainnean a tha ri làimh
+
+# LOCALIZATION NOTE (prefShowDesc): A very short description of the 'pref
+# show' command. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible. See
+# prefShowManual for a fuller description of what it does.
+prefShowDesc=Seall luach na roghainn
+
+# LOCALIZATION NOTE (prefShowManual): A fuller description of the 'pref show'
+# command. Displayed when the user asks for help on what it does.
+prefShowManual=Seall luach de roghainn àraidh
+
+# LOCALIZATION NOTE (prefShowSettingDesc): A short description of the
+# 'setting' parameter to the 'pref show' command. See prefShowSettingManual
+# for a fuller description of what it does. This string is designed to be
+# shown in a dialog with restricted space, which is why it should be as short
+# as possible.
+prefShowSettingDesc=An roghainn a thèid a shealltainn
+
+# LOCALIZATION NOTE (prefShowSettingManual): A fuller description of the
+# 'setting' parameter to the 'pref show' command. Displayed when the user asks
+# for help on what it does.
+prefShowSettingManual=Ainm na roghainn a thèid a shealltainn
+
+# LOCALIZATION NOTE (prefSetDesc): A very short description of the 'pref set'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible. See prefSetManual for
+# a fuller description of what it does.
+prefSetDesc=Atharraich roghainn
+
+# LOCALIZATION NOTE (prefSetManual): A fuller description of the 'pref set'
+# command. Displayed when the user asks for help on what it does.
+prefSetManual=Atharraichidh seo roghainn a tha air a mhìneachadh leis an àrainneachd
+
+# LOCALIZATION NOTE (prefSetSettingDesc): A short description of the 'setting'
+# parameter to the 'pref set' command. See prefSetSettingManual for a fuller
+# description of what it does. This string is designed to be shown in a dialog
+# with restricted space, which is why it should be as short as possible.
+prefSetSettingDesc=An roghainn a tha ri atharrachadh
+
+# LOCALIZATION NOTE (prefSetSettingManual): A fuller description of the
+# 'setting' parameter to the 'pref set' command. Displayed when the user asks
+# for help on what it does.
+prefSetSettingManual=Ainm na roghainn a tha ri atharrachadh.
+
+# LOCALIZATION NOTE (prefSetValueDesc): A short description of the 'value'
+# parameter to the 'pref set' command. See prefSetValueManual for a fuller
+# description of what it does. This string is designed to be shown in a dialog
+# with restricted space, which is why it should be as short as possible.
+prefSetValueDesc=Luach ùr na roghainn
+
+# LOCALIZATION NOTE (prefSetValueManual): A fuller description of the 'value'
+# parameter to the 'pref set' command. Displayed when the user asks for help
+# on what it does.
+prefSetValueManual=Luach ùr na roghainn a chaidh a shònrachadh
+
+# LOCALIZATION NOTE (prefSetCheckHeading): Title displayed to the user the
+# first time they try to alter a setting This is displayed directly above
+# prefSetCheckBody and prefSetCheckGo.
+prefSetCheckHeading=Dh'fhaodadh seo am barantas agad a chur gu neoini!
+
+# LOCALIZATION NOTE (prefSetCheckBody): The main text of the warning displayed
+# to the user the first time they try to alter a setting. See also
+# prefSetCheckHeading and prefSetCheckGo.
+prefSetCheckBody=Dh'fhaodadh droch bhuaidh a bhith ann air seasmhachd, tèarainteachd is dèanadas a' phrògraim seo ma dh'atharraicheas tu na roghainnean adhartach seo. Cha bu chòir dhut leantainn air adhart ach ma bhios tu cinnteach gu bheil thu eòlach air buaidh na tha thu a' dèanamh.
+
+# LOCALIZATION NOTE (prefSetCheckGo): The text to enable preference editing.
+# Displayed in a button directly under prefSetCheckHeading and
+# prefSetCheckBody
+prefSetCheckGo=Tha mi a' toirt gealladh gum bi mi faiceallach!
+
+# LOCALIZATION NOTE (prefResetDesc): A very short description of the 'pref
+# reset' command. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible. See
+# prefResetManual for a fuller description of what it does.
+prefResetDesc=Ath-shuidhich roghainn
+
+# LOCALIZATION NOTE (prefResetManual): A fuller description of the 'pref
+# reset' command. Displayed when the user asks for help on what it does.
+prefResetManual=Ath-shuidhich luach de roghainn do bhun-roghainnean an t-siostaim
+
+# LOCALIZATION NOTE (prefResetSettingDesc): A short description of the
+# 'setting' parameter to the 'pref reset' command. See prefResetSettingManual
+# for a fuller description of what it does. This string is designed to be
+# shown in a dialog with restricted space, which is why it should be as short
+# as possible.
+prefResetSettingDesc=An roghainn a tha ri ath-shuidheachadh
+
+# LOCALIZATION NOTE (prefResetSettingManual): A fuller description of the
+# 'setting' parameter to the 'pref reset' command. Displayed when the user
+# asks for help on what it does.
+prefResetSettingManual=Ainm na roghainn a tha ri ath-shuidheachadh do bhun-roghainn an t-siostaim
+
+# LOCALIZATION NOTE (prefOutputFilter): Displayed in the output from the 'pref
+# list' command as a label to an input element that allows the user to filter
+# the results
+prefOutputFilter=Criathrag
+
+# LOCALIZATION NOTE (prefOutputName): Displayed in the output from the 'pref
+# list' command as a heading to a table. The column contains the names of the
+# available preferences
+prefOutputName=Ainm
+
+# LOCALIZATION NOTE (prefOutputValue): Displayed in the output from the 'pref
+# list' command as a heading to a table. The column contains the values of the
+# available preferences
+prefOutputValue=Luach
+
+# LOCALIZATION NOTE (introDesc): A very short description of the 'intro'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible. See introManual for a
+# fuller description of what it does.
+introDesc=Seall an teachdaireachd fàilte
+
+# LOCALIZATION NOTE (introManual): A fuller description of the 'intro'
+# command. Displayed when the user asks for help on what it does.
+introManual=Seall an teachdaireachd a-rithist a chì cleachdaichean ùra gus am briog iad air a' phutan "Tha mi agaibh a-nis!"
+
+# LOCALIZATION NOTE (introTextOpening): The 'intro text' opens when the user
+# first opens the developer toolbar to explain the command line, and is shown
+# each time it is opened until the user clicks the 'Got it!' button. This
+# string is the opening paragraph of the intro text.
+introTextOpening=Chaidh loidhne àithne Firefox a dhealbhadh airson luchd-leasachaidh. Tha e a' cur cuideam air ion-chur luath seach co-chàraidh JavaScript agus taisbeanadh beartach seach às-chur Monospace.
+
+# LOCALIZATION NOTE (introTextCommands): For information about the 'intro
+# text' see introTextOpening. The second paragraph is in 2 sections, the first
+# section points the user to the 'help' command.
+introTextCommands=Airson liosta nan àitheantan, cuir na leanas a-steach
+
+# LOCALIZATION NOTE (introTextKeys): For information about the 'intro text'
+# see introTextOpening. The second section in the second paragraph points the
+# user to the F1/Escape keys which show and hide hints.
+introTextKeys=no brùth na leanas gus gliocasan nan àitheantan a shealltainn/a chur am falach
+
+# LOCALIZATION NOTE (introTextF1Escape): For information about the 'intro
+# text' see introTextOpening. This string is used with introTextKeys, and
+# contains the keys that are pressed to open and close hints.
+introTextF1Escape=F1/Escape
+
+# LOCALIZATION NOTE (introTextGo): For information about the 'intro text' see
+# introTextOpening. The text on the button that dismisses the intro text.
+introTextGo=Tha mi agaibh a-nis!
+
+# LOCALIZATION NOTE (hideIntroDesc): Short description of the 'hideIntro'
+# setting. Displayed when the user asks for help on the settings.
+hideIntroDesc=Seall an teachdaireachd fàilte thùsail
+
+# LOCALIZATION NOTE (eagerHelperDesc): Short description of the 'eagerHelper'
+# setting. Displayed when the user asks for help on the settings.
+eagerHelperDesc=Dè cho dealasach 's a tha na gliocasan-sgrìn?
+
+# LOCALIZATION NOTE (allowSetDesc): Short description of the 'allowSetDesc'
+# setting. Displayed when the user asks for help on the settings.
+allowSetDesc=An do chuir an cleachdaiche an àithne "pref set" an comas?
 
 # LOCALIZATION NOTE (introBody): The text displayed at the top of the output
 # for the help command, just before the list of commands. This text is wrapped
 # inside a link to a localized MDN article
 introBody=Airson barrachd fiosrachaidh, faic MDN.
 
--- a/browser/chrome/browser/devtools/gclicommands.properties
+++ b/browser/chrome/browser/devtools/gclicommands.properties
@@ -1,8 +1,12 @@
+# 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 These strings are used inside Web Console commands.
 # The Web Console command line is available from the Web Developer sub-menu
 # -> 'Web Console'.
 #
 # The correct localization of this file might be to keep it in
 # English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
@@ -31,16 +35,56 @@ consoleDesc=Àitheantan a chum smachd a' chonsoil
 # LOCALIZATION NOTE (consoleManual) A longer description describing the
 # set of commands that control the console.
 consoleManual=Criathraich, falamhaich is dùin a' chonsoil-lìn
 
 # LOCALIZATION NOTE (consoleclearDesc) A very short string used to describe the
 # function of the 'console clear' command.
 consoleclearDesc=Falamhaich a' chonsoil
 
+# LOCALIZATION NOTE (screenshotDesc) A very short description of the
+# 'screenshot' command. See screenshotManual for a fuller description of what
+# it does. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible.
+screenshotDesc=Sàbhail dealbh dhen duilleag
+
+# LOCALIZATION NOTE (screenshotManual) A fuller description of the 'screenshot'
+# command, displayed when the user asks for help on what it does.
+screenshotManual=Sàbhail dealbh PNG dhen duilleag gu lèir a tha ri fhaicinn (an dèidh dàlach, ma thogras tu)
+
+# LOCALIZATION NOTE (screenshotFilenameDesc) A very short string to describe
+# the 'filename' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+screenshotFilenameDesc=Ceann-uidhe an fhaidhle
+
+# LOCALIZATION NOTE (screenshotFilenameManual) A fuller description of the
+# 'filename' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+screenshotFilenameManual=Ainm an fhaidhle (bu chòir leasachan ".png" a bhith aige) a chleachdar gus an glacadh-sgrìn a shàbhaladh.
+
+# LOCALIZATION NOTE (screenshotDelayDesc) A very short string to describe
+# the 'delay' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+screenshotDelayDesc=Dàil (ann an diogan)
+
+# LOCALIZATION NOTE (screenshotDelayManual) A fuller description of the
+# 'delay' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+screenshotDelayManual=An dàil a bhios ann (ann an diogan) mus dèid an glacadh-sgrìn a thogail
+
+# LOCALIZATION NOTE (screenshotFullscreenDesc) A very short string to describe
+# the 'fullscreen' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+screenshotFullPageDesc=An duilleag-lìn gu lèir? (true/false)
+
+# LOCALIZATION NOTE (screenshotFullscreenManual) A fuller description of the
+# 'fullscreen' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+screenshotFullPageManual=True ma tha thu ag iarraidh na pìosan dhen duilleag-lìn cuideachd a tha taobh a-muigh nan crìochan sgrolaidh an-dràsta.
+
 # LOCALIZATION NOTE (inspectDesc) A very short description of the 'inspect'
 # command. See inspectManual for a fuller description of what it does. This
 # string is designed to be shown in a menu alongside the command name, which
 # is why it should be as short as possible.
 inspectDesc=Sgrùdaich nòd
 
 # LOCALIZATION NOTE (inspectManual) A fuller description of the 'inspect'
 # command, displayed when the user asks for help on what it does.
@@ -259,16 +303,21 @@ breakdelRemoved=Chaidh a' phuing-bhrisid
 # command to explain that the breakpoint was not found.
 breakNotFound=Cha deach a' phuing-bhrisidh a lorg
 
 # LOCALIZATION NOTE (consolecloseDesc) A very short description of the
 # 'console close' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
 consolecloseDesc=Dùin a' chonsoil
 
+# LOCALIZATION NOTE (consoleopenDesc) A very short description of the
+# 'console open' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+consoleopenDesc=Fosgail a' chonsoil
+
 # LOCALIZATION NOTE (editDesc) A very short description of the 'edit'
 # command. See editManual for a fuller description of what it does. This
 # string is designed to be shown in a menu alongside the command name, which
 # is why it should be as short as possible.
 editDesc=Cuir air gleus goireas na duilleige
 
 # LOCALIZATION NOTE (editManual) A fuller description of the 'edit' command,
 # displayed when the user asks for help on what it does.
--- a/browser/chrome/browser/devtools/inspector.properties
+++ b/browser/chrome/browser/devtools/inspector.properties
@@ -1,8 +1,12 @@
+# 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 These strings are used inside the Inspector
 # which is available from the Web Developer sub-menu -> 'Inspect'.
 #
 # The correct localization of this file might be to keep it in
 # English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
@@ -15,21 +19,26 @@ confirmNavigationAway.buttonLeave=Fàg an duilleag seo
 confirmNavigationAway.buttonLeaveAccesskey=L
 confirmNavigationAway.buttonStay=Fuirich air an duilleag seo
 confirmNavigationAway.buttonStayAccesskey=S
 
 breadcrumbs.siblings=Bràithrean
 # LOCALIZATION NOTE (htmlPanel): Used in the Inspector tool's openInspectorUI
 # method when registering the HTML panel.
 
-# LOCALIZATION NOTE (inspectButton.tooltiptext):
+# LOCALIZATION NOTE (inspectButtonWithShortcutKey.tooltip):
 # This button appears in the Inspector Toolbar. inspectButton is stateful,
 # if it's pressed users can select an element with the mouse.
 # %S is the keyboard shortcut.
-inspectButton.tooltiptext=Tagh eileamaid leis an luchag (%S)
+inspectButtonWithShortcutKey.tooltip=Tagh eileamaid leis an luchag (%S)
+
+# LOCALIZATION NOTE (inspectButton.tooltip):
+# Same as inspectButtonWithShortcutKey.tooltip but used when an add-on
+# overrides the shortcut key.
+inspectButton.tooltip=Tagh eileamaid leis an luchag
 
 # LOCALIZATION NOTE (markupButton.*):
 # This button is the button located at the beginning of the breadcrumbs
 # in the inspector toolbar. Its tooltip is built dynamically.
 # markupButton.tooltip is used on Mac.
 # On Windows and Linux, we use markupButton.tooltipWithAccesskey, where we append
 # the keyboard shortcut.
 markupButton.tooltip=Panail markup
--- a/browser/chrome/browser/devtools/layoutview.dtd
+++ b/browser/chrome/browser/devtools/layoutview.dtd
@@ -1,21 +1,22 @@
+<!-- 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 : FILE This file contains the Layout View strings.
   - The Layout View is the panel accessible at the bottom of the Inspector
   - sidebar. -->
 <!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
   - keep it in English, or another language commonly spoken among web developers.
   - You want to make that choice consistent across the developer tools.
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
-
-
-<!ENTITY elementSize.label      "Meud na h-eileamaide: ">
 <!-- LOCALIZATION NOTE (*.tooltip): These tooltips are not regular tooltips.
   -  The text appears on the bottom right corner of the layout view when
   -  the corresponding box is hovered. -->
 
 
 
+
 <!ENTITY margins.tooltip        "marghain">
 <!ENTITY borders.tooltip        "Iomallan">
 <!ENTITY padding.tooltip        "padadh">
 <!ENTITY content.tooltip        "susbaint">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/responsiveUI.properties
@@ -0,0 +1,17 @@
+# LOCALIZATION NOTE These strings are used inside the Responsive Mode
+# which is available from the Web Developer sub-menu -> 'Responsive Mode'.
+#
+# The correct localization of this file might be to keep it in
+# English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best
+# documentation on web development on the web.
+
+
+# LOCALIZATION NOTE  (responsiveUI.rotate): label of the rotate button.
+responsiveUI.rotate=cuairtich
+
+# LOCALIZATION NOTE  (responsiveUI.customResolution): label of the first item
+# in the menulist at the beginning of the toolbar. For %S is replace with the
+# current size of the page. For example: "400x600".
+responsiveUI.customResolution=%S (gnàthaichte)
--- a/browser/chrome/browser/devtools/scratchpad.dtd
+++ b/browser/chrome/browser/devtools/scratchpad.dtd
@@ -1,8 +1,11 @@
+<!-- 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 : FILE This file contains the Scratchpad window strings -->
 <!-- LOCALIZATION NOTE : FILE Do not translate commandkeys -->
 <!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
   - keep it in English, or another language commonly spoken among web developers.
   - You want to make that choice consistent across the developer tools.
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
 <!-- LOCALIZATION NOTE (scratchpad.title):
@@ -11,16 +14,17 @@
   -  prototyping, experimentation and convenient scripting.
   -
   -  It's quite possible that you won't have a good analogue for the word
   -  "Scratchpad" in your locale. You should feel free to find a close
   -  approximation to it or choose a word (or words) that means
   -  "simple discardable text editor". -->
 
 
+
 <!ENTITY window.title                 "Pada nan sgrìoban">
 
 <!ENTITY fileMenu.label               "Faidhle">
 <!ENTITY fileMenu.accesskey           "F">
 
 <!ENTITY newWindowCmd.label           "Uinneag ùr">
 <!ENTITY newWindowCmd.accesskey       "U">
 <!ENTITY newWindowCmd.commandkey      "n">
--- a/browser/chrome/browser/devtools/scratchpad.properties
+++ b/browser/chrome/browser/devtools/scratchpad.properties
@@ -1,8 +1,12 @@
+# 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 These strings are used inside the JavaScript scratchpad
 # which is available from the Web Developer sub-menu -> 'Scratchpad'.
 #
 # The correct localization of this file might be to keep it in
 # English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
--- a/browser/chrome/browser/devtools/sourceeditor.dtd
+++ b/browser/chrome/browser/devtools/sourceeditor.dtd
@@ -1,15 +1,19 @@
+<!-- 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 : FILE This file contains the Source Editor component
   - strings. The source editor component is used within the Scratchpad and
   - Style Editor tools. -->
 <!-- LOCALIZATION NOTE : FILE Do not translate commandkeys -->
 <!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
   - keep it in English, or another language commonly spoken among web developers.
   - You want to make that choice consistent across the developer tools.
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
 
 
 
+
 <!ENTITY gotoLineCmd.label         "Thoir leum gu loidhne…">
 <!ENTITY gotoLineCmd.key           "J">
 <!ENTITY gotoLineCmd.accesskey     "T">
--- a/browser/chrome/browser/devtools/sourceeditor.properties
+++ b/browser/chrome/browser/devtools/sourceeditor.properties
@@ -1,8 +1,12 @@
+# 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 These strings are used inside the Source Editor component.
 # This component is used whenever source code is displayed for the purpose of
 # being edited, inside the Firefox developer tools - current examples are the
 # Scratchpad and the Style Editor tools.
 
 # LOCALIZATION NOTE The correct localization of this file might be to keep it
 # in English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
--- a/browser/chrome/browser/devtools/styleeditor.dtd
+++ b/browser/chrome/browser/devtools/styleeditor.dtd
@@ -1,20 +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/. -->
 <!-- LOCALIZATION NOTE : FILE This file contains the Style Editor window strings -->
 <!-- LOCALIZATION NOTE : FILE Do not translate commandkeys -->
 <!-- LOCALIZATION NOTE : The correct localization of this file might be to keep
      it in English, or another language commonly spoken among web developers.
      You want to make that choice consistent across the developer tools.
      A good criteria is the language in which you'd find the best documentation
      on web development on the web. -->
 <!-- LOCALIZATION NOTE (window.title): This is the default title for Style Editor
      main window. NB: the property chromeWindowTitle in styleeditor.properties
      is used to dynamically update the Style Editor window title with the title
      of the web page it is editing. -->
 
+
 <!ENTITY window.title               "An deasaiche stoidhle">
 
 <!ENTITY newButton.label            "Ûr">
 <!ENTITY newButton.tooltip          "Cruthaich siota-stoidhle ùr is cuir ris an sgrìobhainn e">
 <!ENTITY newButton.accesskey        "r">
 <!ENTITY newButton.commandkey       "n">
 
 <!ENTITY importButton.label         "Ion-phortaich…">
--- a/browser/chrome/browser/devtools/styleeditor.properties
+++ b/browser/chrome/browser/devtools/styleeditor.properties
@@ -1,8 +1,12 @@
+# 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 These strings are used inside the Style Editor.
 # LOCALIZATION NOTE The correct localization of this file might be to keep it
 # in English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best documentation
 # on web development on the web.
 
 # LOCALIZATION NOTE  (chromeWindowTitle): This is the title of the Style Editor
--- a/browser/chrome/browser/devtools/styleinspector.dtd
+++ b/browser/chrome/browser/devtools/styleinspector.dtd
@@ -1,17 +1,21 @@
+<!-- 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 : FILE The correct localization of this file might be to
   - keep it in English, or another language commonly spoken among web developers.
   - You want to make that choice consistent across the developer tools.
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
 <!-- LOCALIZATION NOTE (userStylesLabel): This is the label for the checkbox
   -  that specifies whether the styles that are not from the user's stylesheet
   -  should be displayed or not. -->
 
+
 <!ENTITY userStylesLabel    "Stoidhlean a' chleachdaiche a-mhàin">
 <!-- LOCALIZATION NOTE (userStylesSearch): This is the placeholder that goes in
   -  the search box when no search term has been entered. -->
 
 <!ENTITY userStylesSearch      "Lorg">
 <!-- LOCALIZATION NOTE (selectedElementLabel): This is the label for the path of
   -  the highlighted element in the web page. This path is based on the document
   -  tree. -->
--- a/browser/chrome/browser/devtools/styleinspector.properties
+++ b/browser/chrome/browser/devtools/styleinspector.properties
@@ -1,8 +1,12 @@
+# 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 These strings are used inside the Style Inspector.
 #
 # The correct localization of this file might be to keep it in
 # English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
--- a/browser/chrome/browser/devtools/tilt.properties
+++ b/browser/chrome/browser/devtools/tilt.properties
@@ -1,8 +1,12 @@
+# 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 These strings are used inside the Tilt Inspector
 # which is available from the Web Developer sub-menu -> 'Tilt'.
 #
 # The correct localization of this file might be to keep it in
 # English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
--- a/browser/chrome/browser/devtools/webConsole.dtd
+++ b/browser/chrome/browser/devtools/webConsole.dtd
@@ -1,14 +1,18 @@
+<!-- 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 : FILE The correct localization of this file might be to
   - keep it in English, or another language commonly spoken among web developers.
   - You want to make that choice consistent across the developer tools.
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
 
+
 <!ENTITY networkPanel.requestURL                  "URL an iarrtais">
 <!ENTITY networkPanel.requestMethod               "Modh an iarrtais">
 <!ENTITY networkPanel.statusCode                  "Còd na h-inbhe">
 
 <!ENTITY networkPanel.requestHeaders              "Bannan-cinn an iarrtais">
 <!ENTITY networkPanel.requestCookie               "A' bhriosgaid a chaidh a chur">
 <!ENTITY networkPanel.requestBody                 "Bodhaig an iarrtais">
 <!ENTITY networkPanel.requestFormData             "Dàta an fhoirm a chaidh a chur">
--- a/browser/chrome/browser/devtools/webconsole.properties
+++ b/browser/chrome/browser/devtools/webconsole.properties
@@ -1,8 +1,12 @@
+# 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
 # The correct localization of this file might be to keep it in
 # English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
 typeError=Mearachd: 
@@ -182,8 +186,14 @@ timerStarted=%S: tìmear air a thòiseachadh
 timeEnd=%1$S: %2$Sms
 
 # LOCALIZATION NOTE (Autocomplete.blank):
 # This string is used when inputnode string containing anchor doesn't
 # doesn't matches to any property in the content.
 Autocomplete.blank=  <- gun toradh
 
 maxTimersExceeded=Chaidh thu thairis air an tha ceadaichte de thìmearan air an duilleag seo.
+
+# LOCALIZATION NOTE (JSTerm.updateNotInspectable):
+# This string is used when the user inspects an evaluation result in the Web
+# Console and tries the Update button, but the new result no longer returns an
+# object that can be inspected.
+JSTerm.updateNotInspectable=Chan urrainn dhut an toradh a mhion-sgrùdadh tuilleadh as dèidh dhut ath-lèirmheas a dhèanamh air.
--- a/browser/chrome/browser/engineManager.dtd
+++ b/browser/chrome/browser/engineManager.dtd
@@ -1,8 +1,12 @@
+<!-- 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  engineManager.title       "Rianaich liosta nan einnseanan-luirg">
 <!ENTITY  engineManager.style       "min-width: 39em;">
 <!ENTITY  engineManager.intro       "Tha na h-einnseanan-luirg a leanas air an suidheachadh agad:">
 
 <!ENTITY  columnLabel.name          "Ainm">
 <!ENTITY  columnLabel.keyword       "Facal-luirg">
 <!-- Buttons -->
 
--- a/browser/chrome/browser/engineManager.properties
+++ b/browser/chrome/browser/engineManager.properties
@@ -1,5 +1,9 @@
+# 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/.
+
 editTitle=Deasaich am facal-luirg
 editMsg=Cuir facal-luirg ùr a-steach airson "%S":
 duplicateTitle=Facal-luirg dùbailte
 duplicateEngineMsg=Thagh thu facal-luirg a tha 'ga chleachdadh le "%S" mu thràth. An tagh thu fear eile?
 duplicateBookmarkMsg=Tagh thu facal-luirg a tha 'ga chleachdadh ann an comharra-lìn mu thràth. An tagh thu fear eile?
--- a/browser/chrome/browser/feeds/subscribe.dtd
+++ b/browser/chrome/browser/feeds/subscribe.dtd
@@ -1,3 +1,7 @@
+<!-- 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 feedPage.title "A' sealltainn inbhir">
 <!ENTITY feedSubscribeNow "Fo-sgrìobh an-dràsta">
 <!ENTITY feedLiveBookmarks "Comharran-lìn beòtha">
--- a/browser/chrome/browser/feeds/subscribe.properties
+++ b/browser/chrome/browser/feeds/subscribe.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 linkTitleTextFormat=Rach gu %S
 addHandler=A bheil thu airson "%S" (%S) a chur ris mar leughadair inbhir?
 addHandlerAddButton=Cuir leughadair inbhir ris
 addHandlerAddButtonAccesskey=a
 handlerRegistered=Tha "%S" clàraichte mar leughadair inbhir mu thràth
 liveBookmarks=Comharran-lìn beòtha
 subscribeNow=Fo-sgrìobh an-dràsta
 chooseApplicationMenuItem=Tagh prògram…
--- a/browser/chrome/browser/migration/migration.dtd
+++ b/browser/chrome/browser/migration/migration.dtd
@@ -1,8 +1,12 @@
+<!-- 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 migrationWizard.title          "Draoidh an ion-phortaidh">
 
 <!ENTITY importFrom.label               "Ion-phortaich roghainnean, comharran-lìn, eachdraidh, faclan-faire 's dàta eile o:">
 <!ENTITY importFromUnix.label           "Ion-phortaich roghainnean, comharran-lìn, eachdraidh, faclan-faire 's dàta eile o:">
 <!ENTITY importFromBookmarks.label      "Ion-phortaich comharran-lìn o:">
 
 <!ENTITY importFromIE.label             "Microsoft Internet Explorer">
--- a/browser/chrome/browser/migration/migration.properties
+++ b/browser/chrome/browser/migration/migration.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 profileName_format=%S %S
 
 # Browser Specific
 sourceNameIE=Internet Explorer
 sourceNameSafari=Safari
 sourceNameChrome=Google Chrome
 sourceNameFirefox=Mozilla Firefox
 
@@ -33,14 +37,13 @@ 8_firefox=Air a shàbhaladh on eachdraidh
 16_ie=Faclan-faire air an sàbhaladh
 16_safari=Faclan-faire air an sàbhaladh
 16_chrome=Faclan-faire air an sàbhaladh
 16_firefox=Faclan-faire air an sàbhaladh
 
 32_ie=Annsachdan
 32_safari=Comharran-lìn
 32_chrome=Comharran-lìn
-32_firefox=Comharran-lìn
 
 64_ie=Dàta eile
 64_safari=Dàta eile
 64_chrome=Dàta eile
 64_firefox=Lethbhreacan-glèidhidh nan comharran-lìn
--- a/browser/chrome/browser/newTab.dtd
+++ b/browser/chrome/browser/newTab.dtd
@@ -1,2 +1,6 @@
+<!-- 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/. -->
 <!-- These strings are used in the about:newtab page -->
+
 <!ENTITY newtab.pageTitle "Taba ùr">
--- a/browser/chrome/browser/newTab.properties
+++ b/browser/chrome/browser/newTab.properties
@@ -1,5 +1,9 @@
+# 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/.
+
 newtab.pin=Prìnich an làrach seo 'na àite làithreach
 newtab.unpin=Dì-phrìnich an làrach seo
 newtab.block=Thoir air falbh an làrach seo
 newtab.show=Seall duilleag an taba ùir
 newtab.hide=Falaich duilleag an taba ùir
--- a/browser/chrome/browser/openLocation.dtd
+++ b/browser/chrome/browser/openLocation.dtd
@@ -1,10 +1,14 @@
+<!-- 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/. -->
 <!-- extracted from content/openLocation.xul -->
 
+
 <!ENTITY enter.label "Cuir a-steach an seòladh-lìn (URL) no sònraich am faidhle ionadail a bu toigh leat fosgladh:">  
 <!ENTITY chooseFile.label "Tagh faidhle…">
 <!ENTITY newTab.label "Taba ùr">
 <!ENTITY newWindow.label "Uinneag ùr">
 <!ENTITY topTab.label "An taba làithreach">
 <!ENTITY caption.label "Fosgail seòladh-lìn">
 <!ENTITY openWhere.label "Fosgail ann an:">
 <!ENTITY openBtn.label "Fosgail">
--- a/browser/chrome/browser/openLocation.properties
+++ b/browser/chrome/browser/openLocation.properties
@@ -1,1 +1,5 @@
+# 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/.
+
 chooseFileDialogTitle=Tagh faidhle
--- a/browser/chrome/browser/pageInfo.dtd
+++ b/browser/chrome/browser/pageInfo.dtd
@@ -1,45 +1,12 @@
 <!--
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla Communicator client code.
-#
-# The Initial Developer of the Original Code is Daniel Brooks.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Daniel Brooks <db48x@yahoo.com>
-#                 Florian QUEZE <f.qu@queze.net>
-#                 Ehsan Akhgari <ehsan.akhgari@gmail.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the LGPL or the GPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# 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  pageInfoWindow.width  "700">
 <!ENTITY  pageInfoWindow.height "500">
 
 <!ENTITY  copy.key              "C">
 <!ENTITY  copy.label            "Dèan lethbhreac">
 <!ENTITY  copy.accesskey        "c">
@@ -94,16 +61,17 @@
 <!ENTITY  permBlock             "Cuir bacadh air">
 <!ENTITY  permissionsFor        "Ceadachasan airson:">
 <!ENTITY  permImage             "Luchdadh de dhealbhan">
 <!ENTITY  permPopup             "Fosgladh de phriob-uinneagan">
 <!ENTITY  permCookie            "Suidheachadh de bhriosgaidean">
 <!ENTITY  permInstall           "Stàladh de leudachan no coltasan">
 <!ENTITY  permGeo               "Nochdadh an àite">
 <!ENTITY  permPlugins           "Cuir na plugain an gnìomh">
+<!ENTITY  permFullscreen        "Dhan làn-sgrìn">
 
 <!ENTITY  permIndexedDB              "Rianaich an stòras far loidhne">
 <!ENTITY  permClearStorage           "Glan an stòras">
 <!ENTITY  permClearStorage.accesskey "G">
 
 <!ENTITY  securityTab           "Tèarainteachd">
 <!ENTITY  securityTab.accesskey "n">
 <!ENTITY  securityHeader        "Fiosrachadh tèarainteachd na duilleige seo">
--- a/browser/chrome/browser/pageInfo.properties
+++ b/browser/chrome/browser/pageInfo.properties
@@ -1,46 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# International Business Machines Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Daniel Brooks <db48x@yahoo.com>
-#   Mike Kowalski <mikejk@ameritech.net>
-#   Ehsan Akhgari <ehsan.akhgari@gmail.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# 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/.
 
 pageInfo.page.title=Fiosrachadh na duilleige - %S
 pageInfo.frame.title=Fiosrachadh an fhrèama - %S
 
 noPageTitle=Duilleag gun tiotal:
 pageTitle=%S:
 unknown=Neo-aithnichte
 notset=Gun sònrachadh
--- a/browser/chrome/browser/places/bookmarkProperties.properties
+++ b/browser/chrome/browser/places/bookmarkProperties.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 dialogAcceptLabelAddItem=Cuir ris
 dialogAcceptLabelSaveItem=Sàbhail
 dialogAcceptLabelAddLivemark=Fo-sgrìobh
 dialogAcceptLabelAddMulti=Cuir comharran-lìn ris
 dialogAcceptLabelEdit=Sàbhail
 dialogTitleAddBookmark=Comharra-lìn ùr
 dialogTitleAddLivemark=Fo-sgrìobh gu comharra-lìn beò
 dialogTitleAddFolder=Pasgan ùr
--- a/browser/chrome/browser/places/editBookmarkOverlay.dtd
+++ b/browser/chrome/browser/places/editBookmarkOverlay.dtd
@@ -1,8 +1,12 @@
+<!-- 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 editBookmarkOverlay.name.label                      "Ainm:">
 <!ENTITY editBookmarkOverlay.name.accesskey                  "n">
 <!ENTITY editBookmarkOverlay.location.label                  "Seòladh:">
 <!ENTITY editBookmarkOverlay.location.accesskey              "l">
 <!ENTITY editBookmarkOverlay.feedLocation.label              "Seòladh an inbhir:">
 <!ENTITY editBookmarkOverlay.feedLocation.accesskey          "S">
 <!ENTITY editBookmarkOverlay.siteLocation.label              "Seòladh na làraich:">
 <!ENTITY editBookmarkOverlay.siteLocation.accesskey          "S">
--- a/browser/chrome/browser/places/moveBookmarks.dtd
+++ b/browser/chrome/browser/places/moveBookmarks.dtd
@@ -1,5 +1,9 @@
+<!-- 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 window.title              "Tagh pasgan">
 <!ENTITY window.style              "width: 42em; height: 18em;">
 <!ENTITY moveTo.label              "Gluais gu:">
 <!ENTITY newFolderButton.label     "Pasgan ùr">
 <!ENTITY newFolderButton.accesskey "n">
--- a/browser/chrome/browser/places/places.dtd
+++ b/browser/chrome/browser/places/places.dtd
@@ -1,9 +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 (places.library.title): use "Library", "Archive" or "Repository" -->
+
 <!ENTITY places.library.title  "Leabhar-lann">
 <!ENTITY places.library.width  "800">
 <!ENTITY places.library.height "500">
 <!ENTITY organize.label        "Cuir air dòigh">
 <!ENTITY organize.accesskey    "C">
 <!ENTITY organize.tooltip      "Cuir air dòigh na comharran-lìn agad">
 
 <!ENTITY file.close.label               "Dùin">
@@ -18,21 +22,16 @@
 <!ENTITY view.sort.accesskey            "S">
 <!ENTITY view.unsorted.label            "Gun seòrsachadh">
 <!ENTITY view.unsorted.accesskey        "u">
 <!ENTITY view.sortAscending.label       "Òrdugh seòrsachaidh A > Z">
 <!ENTITY view.sortAscending.accesskey   "A">
 <!ENTITY view.sortDescending.label      "Òrdugh seòrsachaidh Z > A">
 <!ENTITY view.sortDescending.accesskey  "Z">
 
-<!ENTITY cmd.findInBookmarks.label      "Lorg sna comharran-lìn…">
-<!ENTITY cmd.findInBookmarks.accesskey  "L">
-<!ENTITY cmd.findCurrent.label          "Lorg sa chruinneachadh làithreach…">
-<!ENTITY cmd.findCurrent.accesskey      "i">
-
 <!ENTITY importBookmarksFromHTML.label     "Ion-phortaich comharran-lìn o HTML…">
 <!ENTITY importBookmarksFromHTML.accesskey "I">
 <!ENTITY exportBookmarksToHTML.label       "Às-phortaich comharran-lìn ann an HTML…">
 <!ENTITY exportBookmarksToHTML.accesskey   "o">
 <!ENTITY importOtherBrowser.label          "Ion-phortaich dàta o bhraibhsair eile…">
 <!ENTITY importOtherBrowser.accesskey      "d">
 
 <!ENTITY cmd.backup.label               "Dèan lethbhreac glèidhidh…">
--- a/browser/chrome/browser/places/places.properties
+++ b/browser/chrome/browser/places/places.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 load-js-data-url-error=Chan urrainn dhut javascript no seòlaidhean dàta a luchdadh o uinneag na h-eachdraidh no on bhàr-taoibh air sgàth adhbharan tèarainteachd.
 noTitle=(gun tiotal)
 
 bookmarksMenuEmptyFolder=(Falamh)
 
 bookmarksBackupTitle=Ainm faidhle airson lethbhreac glèidhidh nan comharra-lìn
 
 bookmarksRestoreAlertTitle=Aisig na comharran-lìn
@@ -39,17 +43,16 @@ view.sortBy.lastModified.label=Seòrsaich a-rèir atharrachaidh mu dheireadh
 view.sortBy.lastModified.accesskey=m
 view.sortBy.tags.label=Seòrsaich a-rèir taga
 view.sortBy.tags.accesskey=t
 
 searchBookmarks=Lorg sna comharran-lìn
 searchHistory=Eachdraidh nan lorg
 searchDownloads=Lorg sna chaidh a luchdadh a-nuas
 searchCurrentDefault=Lorg ann an "%S"
-findInPrefix=Lorg ann an "%S"…
 
 tabs.openWarningTitle=Dearbhadh an fhosglaidh
 tabs.openWarningMultipleBranded=Tha thu gu bhith a' fosgladh %S tabaichean.  Dh'fhaodadh gun cuir seo maille air %S fhad 's a bhios na duilleagan gan luchdadh.  A bheil thu cinnteach gu bheil thu airson leantainn ort?
 tabs.openButtonMultiple=Fosgail na tabaichean
 tabs.openWarningPromptMeBranded=Thoir rabhadh dhomh ma tha mi gu bhith a' fosgladh iomadh taba a dh'fhaodadh maille a chur air %S
 
 SelectImport=Ion-phortaich faidhle nan comharra-lìn
 EnterExport=Às-phortaich faidhle nan comharra-lìn
--- a/browser/chrome/browser/preferences/aboutPermissions.dtd
+++ b/browser/chrome/browser/preferences/aboutPermissions.dtd
@@ -1,8 +1,12 @@
+<!-- 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 permissionsManager.title        "Manaidsear nan ceadan">
 
 <!ENTITY sites.search                    "Làraichean luirg">
 <!ENTITY sites.allSites                  "A h-uile làrach">
 <!-- LOCALIZATION NOTE (permissions.header.start, permissions.header.end): These strings
      surround the host name of the site to make the header for the permissions page.
      example: "Permissions for mozilla.org" -->
 
@@ -30,8 +34,10 @@
 
 <!ENTITY plugins.label                   "Plugain">
 <!-- LOCALIZATION NOTE (indexedDB.label): This is describing indexedDB storage
      using the same language used for the permIndexedDB string in browser/pageInfo.dtd -->
 
 <!ENTITY indexedDB.label                 "Rianaich an stòradh far loidhne">
 
 <!ENTITY popup.label                     "Fosgail priob-uinneagan">
+
+<!ENTITY fullscreen.label                "Làn-sgrìn">
--- a/browser/chrome/browser/preferences/aboutPermissions.properties
+++ b/browser/chrome/browser/preferences/aboutPermissions.properties
@@ -1,5 +1,9 @@
+# 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 (visitCount): #1 is the number of history visits for a site
 visitCount=#1 tadhal;#1 thadhal;#1 tadhail;#1 tadhal
 
 passwordsCount=Tha #1 fhacal-faire air a stòradh airson na làraich-lìn seo.;Tha #1 fhacal-faire air a stòradh airson na làraich-lìn seo.;Tha #1 faclan-faire air a stòradh airson na làraich-lìn seo.;Tha #1 facal-faire air a stòradh airson na làraich-lìn seo.
 cookiesCount=Chaidh #1 bhriosgaid a shuidheachadh airson na làraich-lìn seo.;Chaidh #1 bhriosgaid a shuidheachadh airson na làraich-lìn seo.;Chaidh #1 briosgaidean a shuidheachadh airson na làraich-lìn seo.;Chaidh #1 briosgaid a shuidheachadh airson na làraich-lìn seo.
--- a/browser/chrome/browser/preferences/advanced-scripts.dtd
+++ b/browser/chrome/browser/preferences/advanced-scripts.dtd
@@ -1,44 +1,11 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-#if 0
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is the Firefox Preferences System.
-   -
-   - The Initial Developer of the Original Code is Mike Connor.
-   - Portions created by the Initial Developer are Copyright (C) 2005
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-#endif
-   - ***** END LICENSE BLOCK ***** -->
+<!-- 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 advancedJSDialog.title         "Roghainnean JavaScript adhartach">
 <!ENTITY window.width                   "45em">
 
 <!ENTITY allowScripts.label             "Leig le sgriobtaichean:">
 
 <!ENTITY moveResizePopupWindows.label     "Priob-uinneagan a ghluasad no am meud atharrachadh">
 <!ENTITY moveResizePopupWindows.accesskey "m">
--- a/browser/chrome/browser/preferences/advanced.dtd
+++ b/browser/chrome/browser/preferences/advanced.dtd
@@ -1,10 +1,14 @@
+<!-- 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/. -->
 <!-- Note: each tab panel must contain unique accesskeys -->
 
+
 <!ENTITY generalTab.label                "Coitcheann">
 
 <!ENTITY accessibility.label             "Inntrigeachd">
 
 <!ENTITY useCursorNavigation.label       "Cleachd na putanan-saigheid gus gluasad am broinn nan duilleagan an-còmhnaidh">
 <!ENTITY useCursorNavigation.accesskey   "C">
 <!ENTITY searchStartTyping.label         "Lorg teacs cho luath 's a thòisicheas mi air taidhpeadh">
 <!ENTITY searchStartTyping.accesskey     "L">
@@ -21,18 +25,19 @@
 <!ENTITY allowHWAccel.accesskey          "h">
 <!ENTITY checkSpelling.label             "Ceartachadh litreachaidh beò">
 <!ENTITY checkSpelling.accesskey         "t">
 
 <!ENTITY systemDefaults.label            "Roghainnean bunaiteach an t-siostaim">
 <!--XXX-->
 <!ENTITY alwaysCheckDefault.label        "Bheir &brandShortName; sùil an e e fhèin do roghainn brabhsair gach turas a thòisicheas e">
 <!ENTITY alwaysCheckDefault.accesskey    "B">
-<!ENTITY checkNow.label                  "Thoir sùil an-dràsta">
-<!ENTITY checkNow.accesskey              "n">
+<!ENTITY setDefault.label                "Cleachd &brandShortName; mar am brabhsair bunaiteach">
+<!ENTITY setDefault.accesskey            "u">
+<!ENTITY isDefault.label                 "'S e &brandShortName; am brabhsair bunaiteach agad an-dràsta">
 <!ENTITY submitCrashes.label             "A' cur a-steach aithisgean tuislidh">
 <!ENTITY submitCrashes.accesskey         "s">
 <!ENTITY submitTelemetry.label           "Cuir a-null dàta dèanadais">
 <!ENTITY submitTelemetry.accesskey       "d">
 
 <!ENTITY networkTab.label                "Lìonra">
 
 <!ENTITY connection.label                "Ceangal">
--- a/browser/chrome/browser/preferences/applicationManager.dtd
+++ b/browser/chrome/browser/preferences/applicationManager.dtd
@@ -1,4 +1,8 @@
+<!-- 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 appManager.title     "Mion-fhiosrachadh a' phrògraim">
 <!ENTITY appManager.style     "width: 36em; min-height: 24em;">
 <!ENTITY remove.label         "Thoir air falbh">
 <!ENTITY remove.accesskey     "r">
--- a/browser/chrome/browser/preferences/applicationManager.properties
+++ b/browser/chrome/browser/preferences/applicationManager.properties
@@ -1,8 +1,12 @@
+# 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
 # in descriptionApplications, %S will be replaced by one of the 3 following strings
 descriptionApplications=Gabhaidh na prògraman a leanas an cleachdadh gus %S a làimhseachadh.
 
 handleProtocol=Ceanglaichean %S
 handleWebFeeds=Inbhirean-lìn
 handleFile=Susbaint %S
 
--- a/browser/chrome/browser/preferences/applications.dtd
+++ b/browser/chrome/browser/preferences/applications.dtd
@@ -1,8 +1,12 @@
+<!-- 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  typeColumn.label        "Seòrsa na susbaint">
 <!ENTITY  typeColumn.accesskey    "t">
 
 <!ENTITY  actionColumn2.label     "Gnìomh">
 <!ENTITY  actionColumn2.accesskey "G">
 
 <!ENTITY  focusSearch1.key        "f">
 <!ENTITY  focusSearch2.key        "k">
--- a/browser/chrome/browser/preferences/colors.dtd
+++ b/browser/chrome/browser/preferences/colors.dtd
@@ -1,8 +1,12 @@
+<!-- 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  colorsDialog.title              "Dathan">
 <!ENTITY  window.width                    "46em">
 <!ENTITY  window.macWidth                 "49em">
 
 <!ENTITY  allowPagesToUse.label           "Leig le duilleagan na dathan aca fhèin a thaghadh seach mo thaghadh-sa gu h-àrd">
 <!ENTITY  allowPagesToUse.accesskey       "a">
 
 <!ENTITY  color                           "Teacs is cùlaibh">
--- a/browser/chrome/browser/preferences/connection.dtd
+++ b/browser/chrome/browser/preferences/connection.dtd
@@ -1,8 +1,12 @@
+<!-- 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  connectionsDialog.title       "Roghainnean ceangail">
 <!ENTITY  window.width                  "45em">
 <!ENTITY  window.macWidth               "45em">
 
 <!ENTITY  proxyTitle.label              "Rèitich progsaidhean a chum inntrigeadh dhan lìon">
 <!ENTITY  noProxyTypeRadio.label        "Gun phrogsaidh">
 <!ENTITY  noProxyTypeRadio.accesskey    "G">
--- a/browser/chrome/browser/preferences/content.dtd
+++ b/browser/chrome/browser/preferences/content.dtd
@@ -1,8 +1,12 @@
+<!-- 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  blockPopups.label           "Cuir bacadh air priob-uinneagan">
 <!ENTITY  blockPopups.accesskey       "b">
 <!ENTITY  popupExceptions.label       "Eisgeachdan…">
 <!ENTITY  popupExceptions.accesskey   "E">
 
 <!ENTITY  loadImages.label            "Luchdaichear dealbhan leis fhèin">
 <!ENTITY  loadImages.accesskey        "i">
 <!ENTITY  exceptions.label            "Eisgeachdan…">
--- a/browser/chrome/browser/preferences/cookies.dtd
+++ b/browser/chrome/browser/preferences/cookies.dtd
@@ -1,8 +1,12 @@
+<!-- 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 window.width                       "42em">
 
 <!ENTITY     cookiesonsystem.label          "Tha na briosgaidean a leanas air an stòradh air a' choimpiutair agad:">
 <!ENTITY     cookiename.label               "Ainm na briosgaid">
 <!ENTITY     cookiedomain.label             "Seòladh"> 
 <!ENTITY     button.removecookies.label     "Thoir air falbh briosgaidean">
 <!ENTITY     button.removecookie.label      "Thoir air falbh briosgaid">
 <!ENTITY     button.removecookie.accesskey  "r">
--- a/browser/chrome/browser/preferences/fonts.dtd
+++ b/browser/chrome/browser/preferences/fonts.dtd
@@ -1,8 +1,12 @@
+<!-- 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  fontsDialog.title                       "Cruthan-clò">
 <!ENTITY  window.width                            "45em">
 <!ENTITY  window.macWidth                         "48em">
 <!ENTITY  window.unixWidth                        "49em">
 
 <!ENTITY  language.label                          "Cruthan-clò airson:">
 <!ENTITY  language.accesskey                      "C">
 
--- a/browser/chrome/browser/preferences/languages.dtd
+++ b/browser/chrome/browser/preferences/languages.dtd
@@ -1,8 +1,12 @@
+<!-- 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 window.width                                   "35em">
 
 <!ENTITY languages.customize.Header                     "Cànain">
 <!ENTITY languages.customize.prefLangDescript           "Tha làraichean-lìn ri am faighinn ann an iomadh cànan uaireannan. Tagh na cànain a bu toigh leat fhaicinn air duilleagan-lìn, ann an òrdugh a-rèir do thoil fhèin.">
 <!ENTITY languages.customize.active.label               "Cànain ann an òrdugh a-rèir do thoil fhèin:">
 <!ENTITY languages.customize.moveUp.label               "Gluais suas">
 <!ENTITY languages.customize.moveUp.accesskey           "u">
 <!ENTITY languages.customize.moveDown.label             "Gluais sìos">
--- a/browser/chrome/browser/preferences/main.dtd
+++ b/browser/chrome/browser/preferences/main.dtd
@@ -1,17 +1,19 @@
+<!-- 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 startup.label             "Aig an toiseach">
 
 <!ENTITY startupPage.label         "Nuair a thòisicheas &brandShortName;:">
 <!ENTITY startupPage.accesskey     "t">
 <!ENTITY startupHomePage.label     "Seall an duilleag-dhachaigh agam">
 <!ENTITY startupBlankPage.label    "Seall duilleag bhàn">
 <!ENTITY startupLastSession.label  "Seall na h-uinneagan is tabaichean a bha agam san t-seisean mu dheireadh">
-<!ENTITY restoreOnDemand.label     "Na luchdaich na tabaichean gus an deach an taghadh">
-<!ENTITY restoreOnDemand.accesskey "l">
 
 <!ENTITY homepage.label            "An duilleag-dhachaigh:">
 <!ENTITY homepage.accesskey        "A">
 <!ENTITY useCurrentPage.label      "Cleachd an duilleag làithreach">
 <!ENTITY useCurrentPage.accesskey  "C">
 <!ENTITY useMultiple.label         "Cleachd na duilleagan làithreach">
 <!ENTITY chooseBookmark.label      "Cleachd comharra-lìn…">
 <!ENTITY chooseBookmark.accesskey  "c">
--- a/browser/chrome/browser/preferences/permissions.dtd
+++ b/browser/chrome/browser/preferences/permissions.dtd
@@ -1,8 +1,12 @@
+<!-- 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 window.title                 "Eisgeachdan">
 <!ENTITY window.width                 "42em">
 
 <!ENTITY treehead.sitename.label      "Seòladh">
 <!ENTITY treehead.status.label        "Staid">
 <!ENTITY removepermission.label       "Thoir air falbh làrach">
 <!ENTITY removepermission.accesskey   "r">
 <!ENTITY removeallpermissions.label   "Thoir air falbh a h-uile làrach">
--- a/browser/chrome/browser/preferences/preferences.dtd
+++ b/browser/chrome/browser/preferences/preferences.dtd
@@ -1,8 +1,12 @@
+<!-- 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  prefWindow.titleWin     "Roghainnean">
 <!ENTITY  prefWindow.titleGNOME   "Roghainnean &brandShortName;">
 <!-- When making changes to prefWindow.styleWin test both Windows Classic and
      Luna since widget heights are different based on the OS theme -->
 <!ENTITY  prefWinMinSize.styleWin2      "width: 51em; min-height: 47em;">
 <!ENTITY  prefWinMinSize.styleMac       "width: 65em; min-height: 50em;">
 <!ENTITY  prefWinMinSize.styleGNOME     "width: 65em; min-height: 50em;">
@@ -12,8 +16,10 @@
 <!ENTITY  paneContent.title       "Susbaint">
 <!ENTITY  paneApplications.title  "Prògraman">
 <!ENTITY  panePrivacy.title       "Prìobhaideachd">
 <!ENTITY  paneSecurity.title      "Tèarainteachd">
 <!ENTITY  paneAdvanced.title      "Roghainnean adhartach">
 <!-- LOCALIZATION NOTE (paneSync.title): This should match syncBrand.shortName.label in ../syncBrand.dtd -->
 
 <!ENTITY  paneSync.title          "Co-shioncronachadh">
+<!ENTITY  buttonForward.tooltip   "Rach duilleag air adhart">
+<!ENTITY  buttonBack.tooltip      "Rach duilleag air ais">
--- a/browser/chrome/browser/preferences/preferences.properties
+++ b/browser/chrome/browser/preferences/preferences.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 #### Security
 
 # LOCALIZATION NOTE: phishBefore uses %S to represent the name of the provider
 #                    whose privacy policy must be accepted (for enabling
 #                    check-every-page-as-I-load-it phishing protection).
 phishBeforeText=Ma thaghas tu an roghainn seo, thèid seòladh gach làraich-lìn a choimheadas tu air a chur gu %S. Thoir sùil air teirmichean na seirbheise a leanas agus gabh riutha gus leantainn air adhart.
 
 #### Fonts
@@ -54,16 +58,17 @@ useDefault=Cleachd %S (bunaiteach)
 
 useOtherApp=Cleachd fear eile…
 fpTitleChooseApp=Tagh prògram cobharach
 manageApp=Mion-fhiosrachadh a' phrògraim…
 webFeed=Inbhir-lìn
 videoPodcastFeed=Pod-chraoladh mheadhanan
 audioPodcastFeed=Pod-chraoladh
 alwaysAsk=Faighnich dhìom gach turas
+portableDocumentFormat=Portable Document Format (PDF)
 
 # LOCALIZATION NOTE (usePluginIn):
 # %1$S = plugin name (for example "QuickTime Plugin-in 7.2")
 # %2$S = brandShortName from brand.properties (for example "Minefield")
 usePluginIn=Cleachd %S (ann an %S)
 
 # LOCALIZATION NOTE (previewInApp, addLiveBookmarksInApp): %S = brandShortName
 previewInApp=Ro-sheall ann an %S
--- a/browser/chrome/browser/preferences/privacy.dtd
+++ b/browser/chrome/browser/preferences/privacy.dtd
@@ -1,8 +1,12 @@
+<!-- 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 tracking.label                 "Lorgadh">
 
 <!ENTITY doNotTrack.label               "Innis do làraichean-lìn nach bu toigh leam gun dèan iad lorgadh orm">
 <!ENTITY doNotTrack.accesskey           "d">
 
 <!ENTITY  history.label                 "Eachdraidh">
 
 <!ENTITY  locationBar.label             "Bàr an t-seòlaidh">
--- a/browser/chrome/browser/preferences/security.dtd
+++ b/browser/chrome/browser/preferences/security.dtd
@@ -1,8 +1,12 @@
+<!-- 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  warnAddonInstall.label        "Thoir dhomh rabhadh nuair a dh'fheuchas làraichean ri tuilleadan a stàladh">
 <!ENTITY  warnAddonInstall.accesskey    "T">
 <!-- LOCALIZATION NOTE (blockWebForgeries.label, blockAttackSites.label):
   The methods by which forged (phished) and attack sites will be detected by
   phishing providers will vary from human review to machine-based heuristics to a
   combination of both, so it's important that these strings and
   useDownloadedList.label convey the meaning "reported" (and not something like
   "known").
--- a/browser/chrome/browser/preferences/selectBookmark.dtd
+++ b/browser/chrome/browser/preferences/selectBookmark.dtd
@@ -1,3 +1,7 @@
+<!-- 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 selectBookmark.title "Suidhich an duilleag-dhachaigh">
 <!ENTITY selectBookmark.label "Tagh comharra-lìn mar dhuilleag-dhachaigh dhut fhèin. Ma thaghas tu pasgan, thèid na comharran-lìn sa phasgan sin fhosgladh ann an tabaichean.">
 
--- a/browser/chrome/browser/preferences/sync.dtd
+++ b/browser/chrome/browser/preferences/sync.dtd
@@ -1,9 +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/. -->
 <!-- The page shown when not logged in... -->
+
 <!ENTITY setupButton.label          "Rèitich &syncBrand.fullName.label;">
 <!ENTITY setupButton.accesskey      "R">
 <!ENTITY weaveDesc.label            "'S urrainn dhut inntrigeadh a dhèanamh dhan eachdraidh, na comharran-lìn, na faclan-faire 's tabaichean fosgailte air feadh nan innealan agad le &syncBrand.fullName.label;.">
 <!-- The page shown when logged in... -->
 <!-- Login error feedback -->
 
 
 <!ENTITY updatePass.label             "Ùraich">
--- a/browser/chrome/browser/preferences/tabs.dtd
+++ b/browser/chrome/browser/preferences/tabs.dtd
@@ -1,17 +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/. -->
+
 <!ENTITY newWindowsAsTabs.label       "Fosgail uinneagan ùra ann an taba ùr 'na àite">
 <!ENTITY newWindowsAsTabs.accesskey   "t">
 
 <!ENTITY warnCloseMultipleTabs.label  "Thoir rabhadh dhomh mus dùin mi iomadh taba còmhla">
 <!ENTITY warnCloseMultipleTabs.accesskey  "m">
 
 <!ENTITY warnOpenManyTabs.label       "Ma tha cunnart gun cuir cus thabaichean maille air &brandShortName;, thoir rabhadh dhomh">
 <!ENTITY warnOpenManyTabs.accesskey   "o">
 
 <!ENTITY showTabBar.label             "Seall bàr nan taba an-còmhnaidh">
 <!ENTITY showTabBar.accesskey         "b">
 
+<!ENTITY restoreTabsOnDemand.label        "Na luchdaich na tabaichean gus an deach an taghadh">
+<!ENTITY restoreTabsOnDemand.accesskey    "l">
+
 <!ENTITY switchToNewTabs.label        "Nuair a dh'fhosglas mi ceangal ann an taba ùr, thoir leum ann sa bhad">
 <!ENTITY switchToNewTabs.accesskey    "s">
 
 <!ENTITY showTabsInTaskbar.label          "Seall ro-shealladh nan tabaichean ann am bàr-ghnìomhan Windows">
 <!ENTITY showTabsInTaskbar.accesskey      "S">
--- a/browser/chrome/browser/quitDialog.properties
+++ b/browser/chrome/browser/quitDialog.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 quitDialogTitle=Fàg %S
 restartDialogTitle=Ath-thòisich %S
 
 quitTitle=&Fàg an-seo
 restartTitle=&Ath-thòisich
 cancelTitle=&Sguir dheth
 saveTitle=&Sàbhail is fàg an-seo
 neverAsk=Na faighnich dhìom an ath-thuras
--- a/browser/chrome/browser/safeMode.dtd
+++ b/browser/chrome/browser/safeMode.dtd
@@ -1,64 +1,19 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-#if 0
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org Code.
-   -
-   - The Initial Developer of the Original Code is Mike Connor.
-   - Portions created by the Initial Developer are Copyright (C) 2005
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Mike Connor <mconnor@steelgryphon.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-#endif
-   - ***** END LICENSE BLOCK ***** -->
+<!-- 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 safeModeDialog.title         "Modh tèarainte &brandShortName;">
-<!ENTITY window.width                 "45em">
-
-<!ENTITY autoSafeModeIntro.label      "Dhùin &brandShortName; gu h-obann fhad 's a bha e a' tòiseachadh">
-<!ENTITY autoSafeModeDescription.label "Tha sinn fìor dhuilich gun do thachair sinn. Tha &brandShortName; sa mhodh tèarainte a-nis agus bidh na roghainnean gnàthaichte, ùrlaran is leudachain agad dheth rè seal.">
+<!ENTITY window.maxWidth              "500">
 
-<!ENTITY safeModeDescription.label    "Tha &brandShortName; ag ruith sa mhodh tèarainte a-nis is bidh na roghainnean, ùrlaran is leudachain ghnàthaichte agad à comas rè seal.">
-<!ENTITY safeModeDescription2.label   "'S urrainn dhut na h-atharrachaidhean seo gu lèir, no cuid dhiubh, a chur an sàs gu buan:">
-
-<!ENTITY disableAddons.label          "Dèan gach tuillead neo chomasach">
-<!ENTITY disableAddons.accesskey      "D">
+<!ENTITY startSafeMode.label          "Tòisich sa mhodh tèarainte">
+<!ENTITY resetProfile.label           "Ath-shuidhich &brandShortName;">
 
-<!ENTITY resetToolbars.label          "Aisig gach bàr-inneil is uidheam-smachd">
-<!ENTITY resetToolbars.accesskey      "r">
-
-<!ENTITY deleteBookmarks.label        "Sguab às gach comharra-lìn ach a-mhàin na lethbhric-ghlèidhidh">
-<!ENTITY deleteBookmarks.accesskey    "b">
+<!ENTITY safeModeDescription3.label   "'S e modh sònraichte aig &brandShortName; a tha sa mhodh tèarainte agus is urrainn dhut a chleachdadh gus duilgheadasan a rèiteachadh.">
+<!ENTITY safeModeDescription4.label   "Cuiridh sinn na tuilleadain 's na roghainnean gnàthaichte agad à comas rè seal.">
 
-<!ENTITY resetUserPrefs.label         "Aisig gach roghainn a' chleachdaiche gu roghainnean bunaiteach &brandShortName;">
-<!ENTITY resetUserPrefs.accesskey     "A">
+<!ENTITY resetProfileInstead.label    "'S urrainn dhut &brandShortName; aiseag cuideachd mas fhearr leat tòiseachadh as ùr.">
+<!-- LOCALIZATION NOTE (autoSafeModeDescription2.label safeModeInstead.label resetProfileFooter.label): Shown on the safe mode dialog after multiple startup crashes. See also chrome/global/resetProfile.dtd -->
 
-<!ENTITY restoreSearch.label          "Aisig na h-einnseanan-luirg bunaiteach">
-<!ENTITY restoreSearch.accesskey      "s">
-
-<!ENTITY changeAndRestartButton.label "Cuir na h-atharrachaidhean an gnìomh is ath-thòisich">
-<!ENTITY continueButton.label         "Lean air adhart sa mhodh tèarainte">
+<!ENTITY autoSafeModeDescription2.label "Dhùin &brandShortName; gun fhiosta nuair a bha e a' tòiseachadh. Faodaidh gun do dh'adhbharaich tuilleadan no rud eile seo. 'S mathaid gun gabh an duilgheadas seo a chàradh ma dh'aisigeas tu &brandShortName; dhan t-suidheachadh tùsail aige no ma thòisicheas tu e sa mhodh tèarainte gus fuasgladh a lorg.">
+<!ENTITY resetProfileFooter.label       "Thèid gach rud eile aiseag dha na roghainnean tùsail.">
+<!ENTITY safeModeInstead.label          "Mur eil thu airson seo a dhèanamh, 's urrainn dhut leantainn air adhart sa mhodh tèarainte gus fuasgladh a lorg thu fhèin 's na tuilleadain is roghainnean gnàthaichte agad à comas fhathast.">
--- a/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
+++ b/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
@@ -1,8 +1,12 @@
+<!-- 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 safeb.palm.warning.title "Coltas fallsaidheachd-lìn">
 
 <!ENTITY safeb.palm.message.p1 "Chaidh aithris gur e fallsaidheachd-lìn a tha san duilleag seo gus fiosrachadh pearsanta no ionmhasail fhaighinn o chleachdaichean tro mhealladh. Dh'fhaodadh goid do dhearbh-aithne no foill eile èirigh dhut ma bheir thu seachad fiosrachadh pearsanta sam bith air an duilleag seo. &#160;">
 <!ENTITY safeb.palm.message.p1.linkText "Barrachd &#187;">
 <!ENTITY safeb.palm.p1.linkStatusText "Barrachd &#133;">
 
 <!ENTITY safeb.palm.message.p2.start "Thèid an seòrsa seo de dh'fhallsaidheachd-lìn a chleachdadh ann an cam-ghnothach air a bheil &quot;fiasgach&quot; far a bheil duilleagan-lìn is puist-dhealain a' gabhail orra gu bheil iad nan tùsan earbsach. Gheibh thu barrachd fiosrachaidh ">
 <!ENTITY safeb.palm.message.p2.linkText "mar a dhìonas &brandShortName; thu">
--- a/browser/chrome/browser/safebrowsing/report-phishing.dtd
+++ b/browser/chrome/browser/safebrowsing/report-phishing.dtd
@@ -1,2 +1,6 @@
+<!-- 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 reportPhishSiteMenu.title2         "Dèan aithris air fallsaidheachd-lìn…">
 <!ENTITY reportPhishSiteMenu.accesskey      "F">
--- a/browser/chrome/browser/sanitize.dtd
+++ b/browser/chrome/browser/sanitize.dtd
@@ -1,8 +1,12 @@
+<!-- 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 sanitizePrefs2.title          "Roghainnean a chum glanadh na h-eachdraidh">
 <!ENTITY sanitizeDialog2.title         "Glan an eachdraidh faisg ort">
 
 <!ENTITY sanitizeItems.label          "Glan na rudan a leanas an-dràsta:">
 <!ENTITY clearDataSettings2.label     "Nuair a dh'fhàgas mi &brandShortName;, glanaidh e seo leis fhèin:">
 <!-- XXX rearrange entities to match physical layout when l10n isn't an issue -->
 <!-- LOCALIZATION NOTE (clearTimeDuration.*): "Time range to clear" dropdown.
      See UI mockup at bug 480169 -->
--- a/browser/chrome/browser/search.properties
+++ b/browser/chrome/browser/search.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 searchtip=Lorg le %S
 
 # LOCALIZATION NOTE (cmd_pasteAndSearch): "Search" is a verb, this is the
 # search bar equivalent to the url bar's "Paste & Go"
 cmd_pasteAndSearch=Cuir ann ┐ lorg
 
 cmd_clearHistory=Glan eachdraidh nan lorg
 cmd_clearHistory_accesskey=c
--- a/browser/chrome/browser/searchbar.dtd
+++ b/browser/chrome/browser/searchbar.dtd
@@ -1,2 +1,6 @@
+<!-- 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 cmd_engineManager.label        "Rianaich na h-innealan-luirg…">
 <!ENTITY searchEndCap.label             "Lorg">
--- a/browser/chrome/browser/setDesktopBackground.dtd
+++ b/browser/chrome/browser/setDesktopBackground.dtd
@@ -1,8 +1,12 @@
+<!-- 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 position.label             "Seòladh:">
 <!ENTITY tile.label                 "Leacaich">
 <!ENTITY center.label               "Cuir sa mheadhan">
 <!ENTITY stretch.label              "Sìn">
 <!ENTITY fill.label                 "Lìon">
 <!ENTITY fit.label                  "Co-fhreagair">
 <!ENTITY preview.label              "Ro-sheall">
 <!ENTITY color.label                "Dath:">
--- a/browser/chrome/browser/shellservice.properties
+++ b/browser/chrome/browser/shellservice.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 optionsLabel=&Roghainnean %S
 safeModeLabel=&Modh tèarainte %S
 setDefaultBrowserTitle=Am brabhsair bunaiteach
 setDefaultBrowserMessage=Chan eil %S 'na bhrabhsair bunaiteach agad an-dràsta. A bheil thu airson a shuidheachadh mar am brabhsair bunaiteach?
 setDefaultBrowserDontAsk=Ceasnaich seo gach turas a thòisicheas %S.
 alreadyDefaultBrowser=Tha %S 'na bhrabhsair bunaiteach agad mu thràth.
 desktopBackgroundLeafNameWin=Deasg Firefox.bmp
 DesktopBackgroundDownloading=A' sàbhaladh dealbh…
--- a/browser/chrome/browser/syncBrand.dtd
+++ b/browser/chrome/browser/syncBrand.dtd
@@ -1,2 +1,6 @@
+<!-- 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 syncBrand.shortName.label  "Co-shioncronachadh">
 <!ENTITY syncBrand.fullName.label   "Co-shioncronachadh Firefox">
--- a/browser/chrome/browser/syncGenericChange.properties
+++ b/browser/chrome/browser/syncGenericChange.properties
@@ -1,8 +1,12 @@
+# 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 (change.password.title): This (and associated change.password/passphrase) are used when the user elects to change their password.
 change.password.title = Atharraich am facal-faire agad
 change.password.acceptButton = Atharraich am facal-faire
 change.password.status.active = Ag atharrachadh an fhacail-fhaire agad…
 change.password.status.success = Chaidh am facal-faire agad atharrachadh.
 change.password.status.error = Thachair mearachd rè atharrachadh an fhacail-fhaire agad.
 
 change.password3.introText = Feumaidh 8 caractairean a bhith san fhacal-fhaire agad air a' char as lugha.  Chan fhaod e a bhith co-ionnann ris an ainm-chleachdaiche no an iuchair aisig agad.
--- a/browser/chrome/browser/syncKey.dtd
+++ b/browser/chrome/browser/syncKey.dtd
@@ -1,8 +1,12 @@
+<!-- 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 syncKey.page.title               "An iuchair &syncBrand.fullName.label; agad">
 <!ENTITY syncKey.page.description         "Thèid an iuchair seo a chleachdadh gus an dubh-cheileadh a thoirt far an dàta sa chunntas &syncBrand.fullName.label; agad. Bidh agad ris an iuchair seo a chur a-steach gach turas a rèiticheas tu &syncBrand.fullName.label; air coimpiutair ùr no air inneal ùr.">
 <!ENTITY syncKey.keepItSecret.heading     "Cum dìomhair e">
 <!ENTITY syncKey.keepItSecret.description "Tha an cunntas &syncBrand.fullName.label; agad fo dhubh-cheileadh a chum dìon do phrìobhaideachd. Bheireadh cuideigin eile bliadhnaichean as aonais na h-iuchrach seo mus rachadh aca am fiosrachadh prìobhaideach agad a dhì-cheileadh. 'S tusa an aon duine aig a bheil an iuchair seo. 'S ciall dha sin nach urrainn ach dhut fhèin inntrigeadh a dhèanamh dhan dàta &syncBrand.fullName.label; agad.">
 <!ENTITY syncKey.keepItSafe.heading       "Cum sàbhailte e">
 <!ENTITY syncKey.keepItSafe1.description  "Na caill an iuchair seo.">
 <!ENTITY syncKey.keepItSafe2.description  " Cha chum sinne lethbhreac na h-iuchrach agad (cha sgeul-rùin e 's fios aig dithis air, nach eil sin fìos?) 's mar sin ">
 <!ENTITY syncKey.keepItSafe3.description  "chan urrainn dhuinne aiseag dhut ma chailleas tu e">
--- a/browser/chrome/browser/syncProgress.dtd
+++ b/browser/chrome/browser/syncProgress.dtd
@@ -1,8 +1,12 @@
+<!-- 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 % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
     %brandDTD;
 <!-- These strings are used in the sync progress upload page -->
 
 <!ENTITY syncProgress.pageTitle    "A' chiad sioncronachadh agad">
 <!ENTITY syncProgress.textBlurb    "Tha an dàta agad 'ga dhubh-cheileadh is 'ga luchdadh suas sa chùlaibh a-nis. 'S urrainn dhut an taba seo a dhùnadh agus leantainn air adhart leis na bha thu ris ann am &brandShortName;.">
 <!ENTITY syncProgress.closeButton  "Dùin">
 <!ENTITY syncProgress.logoAltText  "Suaicheantas &brandShortName;">
--- a/browser/chrome/browser/syncQuota.dtd
+++ b/browser/chrome/browser/syncQuota.dtd
@@ -1,4 +1,8 @@
+<!-- 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 quota.dialogTitle.label    "Cuota an fhrithealaiche">
 <!ENTITY quota.retrievingInfo.label "A' faighinn fiosrachadh mun chuota…">
 <!ENTITY quota.typeColumn.label     "Seòrsa">
 <!ENTITY quota.sizeColumn.label     "Meud">
--- a/browser/chrome/browser/syncQuota.properties
+++ b/browser/chrome/browser/syncQuota.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 collection.addons.label    = Tuilleadain
 collection.bookmarks.label = Comharran-lìn
 collection.history.label   = Eachdraidh
 collection.passwords.label = Faclan-faire
 collection.prefs.label     = Roghainnean
 collection.tabs.label      = Tabaichean
 
 # LOCALIZATION NOTE (quota.usageNoQuota.label): %1$S and %2$S are numeric value
--- a/browser/chrome/browser/syncSetup.dtd
+++ b/browser/chrome/browser/syncSetup.dtd
@@ -1,8 +1,12 @@
+<!-- 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 accountSetupTitle.label    "Suidheachadh &syncBrand.fullName.label;">
 <!-- First page of the wizard -->
 
 
 <!ENTITY setup.pickSetupType.description2 "Fàilte ort! Mur eil thu air &syncBrand.fullName.label; a chleachdadh roimhe, bidh agad ri cunntas ùr a chruthachadh.">
 <!ENTITY button.createNewAccount.label "Cruthaich cunntas ùr">
 <!ENTITY button.haveAccount.label      "Tha cunntas agam">
 
@@ -32,17 +36,17 @@
 <!-- LOCALIZATION NOTE: tosAgree1, tosLink, tosAgree2, ppLink, tosAgree3 are
      joined with implicit white space, so spaces in the strings aren't necessary -->
 <!ENTITY setup.tosAgree1.label      "Tha mi ag aontachadh ri">
 <!ENTITY setup.tosAgree1.accesskey  "a">
 <!ENTITY setup.tosLink.label        "Teirmichean na Seirbheise">
 <!ENTITY setup.tosAgree2.label      "agus">
 <!ENTITY setup.ppLink.label         "ris a' Phoileasaidh Phrìobhaideachd">
 <!ENTITY setup.tosAgree3.label      "">
-<!ENTITY setup.tosAgree2.accesskey  "a">
+<!ENTITY setup.tosAgree2.accesskey  "">
 <!-- My Recovery Key dialog -->
 
 <!ENTITY setup.newRecoveryKeyPage.title.label "Tha &brandShortName; am bun do phrìobhaideachd">
 <!ENTITY setup.newRecoveryKeyPage.description.label "Gus do phrìobhaideachd iomlan a dhèanamh cinnteach, thèid an dàta gu lèir agad a dhubh-cheileadh mus dèid a luchdadh suas. Cha dèid an iuchair aisig airson dì-cheileadh an dàta agad a luchdadh suas.">
 <!ENTITY recoveryKeyEntry.label        "D' iuchair aisig">
 <!ENTITY recoveryKeyEntry.accesskey    "g">
 <!ENTITY syncGenerateNewKey.label  "Gin iuchair ùr">
 <!ENTITY recoveryKeyBackup.description "Tha feum air an iuchair aisig agad airson inntrigeadh do &syncBrand.fullName.label; air innealan eile. Cruthaich lethbhreac-glèidhidh dheth. Chan urrainn dhuinne an iuchair aisig agad a thoirt dhut a-rithist.">
--- a/browser/chrome/browser/syncSetup.properties
+++ b/browser/chrome/browser/syncSetup.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 button.syncOptions.label       = Roghainnean a' cho-shioncronachaidh
 button.syncOptionsDone.label   = Dèanta
 button.syncOptionsCancel.label = Sguir dheth
 
 invalidEmail.label          = Seòladh puist-dhealain mì-dhligheach
 serverInvalid.label         = Cuir a-steach URL frithealaiche dligheach
 usernameNotAvailable.label  = 'Ga chleachdadh mu thràth
 
--- a/browser/chrome/browser/tabbrowser.dtd
+++ b/browser/chrome/browser/tabbrowser.dtd
@@ -1,2 +1,6 @@
+<!-- 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  closeTab.label         "Dùin an taba">
 <!ENTITY  newTabButton.tooltip        "Fosgail taba ùr">
--- a/browser/chrome/browser/tabbrowser.properties
+++ b/browser/chrome/browser/tabbrowser.properties
@@ -1,8 +1,12 @@
+# 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: the following strings can be used in the tab title or
 # location bar to represent various states as a web page loads:
 # tabs.connecting = Firefox is sending a HTTP connection request
 # tabs.encryptingConnection = Firefox is sending a HTTPS connection request
 # tabs.searching = Firefox is searching for something (Awesomebar or Web search)
 # tabs.loading = Firefox is loading the web page
 # tabs.waiting = Firefox is waiting for a web resource to load
 # tabs.downloading = Firefox is downloading a file for a helper application (PDF)
--- a/browser/chrome/browser/tabview.properties
+++ b/browser/chrome/browser/tabview.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 tabview.button.searchTabs=Buidhnean de thabaichean luirg
 tabview.button.exitTabGroups=Buidhnean de thabaichean fàgail
 tabview.groupItem.defaultName=Cuir ainm air a' bhuidheann thabaichean seo
 tabview.groupItem.closeGroup=Dùin am buidheann
 tabview.groupItem.undoCloseGroup=Neo-dhèan dùnadh a' bhuidhinn
 tabview.groupItem.discardClosedGroup=Tilg air falbh am buidheann dùinte
 tabview.search.otherWindowTabs=Tabaichean o uinneagan eile
 tabview.notification.sessionStore=Thèid na tabaichean is buidhnean aiseag gu fèin-obrachail nuair a dh'fhosglas tu %S an ath-thuras.
--- a/browser/chrome/browser/taskbar.properties
+++ b/browser/chrome/browser/taskbar.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 taskbar.tasks.newTab.label=Fosgail taba ùr
 taskbar.tasks.newTab.description=Fosgail taba brabhsair ùr.
 taskbar.tasks.newWindow.label=Fosgail uinneag ùr
 taskbar.tasks.newWindow.description=Fosgail uinneag brabhsair ùr.
 taskbar.tasks.enterPrivacyMode.label=Tòisich air brabhsadh prìobhaideach
 taskbar.tasks.enterPrivacyMode.description=Tòisich air brabhsadh prìobhaideach. Thèid an seisean làithreach a shàbhaladh.
 taskbar.tasks.exitPrivacyMode.label=Sguir dhen bhrabhsadh phrìobhaideach
 taskbar.tasks.exitPrivacyMode.description=Sguir dhen bhrabhsadh phrìobhaideach is aisig an seisean roimhe.
--- a/browser/chrome/overrides/appstrings.properties
+++ b/browser/chrome/overrides/appstrings.properties
@@ -1,43 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# 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/.
 
 malformedURI=Chan e URL dligheach a tha ann is cha ghabh a luchdadh.
 fileNotFound=Chan urrainn do Firefox am faidhle a lorg aig %S.
 dnsNotFound=Chan urrainn do Firefox am frithealaiche a lorg aig %S.
 protocolNotFound=Chan eil fios aig Firefox mar a dh'fhosglas e an seòladh seo a chionn 's nach eil am pròtocal (%S) co-cheangailte ri prògram sam bith.
 connectionFailure=Chan urrainn do Firefox ceangal ris an fhrithealaiche aig %S.
 netInterrupt=Bhris rudeigin a-steach air a' cheangal ri %S fhad 's a bha an duilleag 'ga luchdadh.
 netTimeout=Tha am frithealaiche aig %S ro fhada a' freagairt.
--- a/browser/chrome/overrides/netError.dtd
+++ b/browser/chrome/overrides/netError.dtd
@@ -1,8 +1,12 @@
+<!-- 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 % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 %brandDTD;
 
 <!ENTITY loadError.label "Duilgheadas le luchdadh na duilleige">
 <!ENTITY retry.label "Feuch ris a-rithist">
 <!-- Specific error messages -->
 
 
--- a/browser/chrome/overrides/settingsChange.dtd
+++ b/browser/chrome/overrides/settingsChange.dtd
@@ -1,42 +1,8 @@
 <!-- -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla.org Code.
-#
-# The Initial Developer of the Original Code is
-# Doron Rosenberg.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Ben Goodger <ben@bengoodger.com>
-#   Myk Melez <myk@mozilla.org>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# 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  settingsChangePreferences.label  "'S urrainn dhut na roghainnean atharrachadh ann an roghainnean &brandShortName; fo thaba nam prògraman.">
 <!ENTITY  settingsChangeOptions.label      "'S urrainn dhut na roghainnean atharrachadh ann an roghainnean &brandShortName; fo thaba nam prògraman.">
--- a/browser/crashreporter/crashreporter-override.ini
+++ b/browser/crashreporter/crashreporter-override.ini
@@ -1,5 +1,8 @@
+; 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/.
 ; This file is in the UTF-8 encoding
 [Strings]
 ; LOCALIZATION NOTE (CrashReporterProductErrorText2): The %s is replaced with a string containing detailed information.
 CrashReporterProductErrorText2=Dh'èirich duilgheadas is thuislich Firefox. Feuchaidh sinn ris na tabaichean is na h-uinneagan agad aiseag dhut nuair a thòisicheas e a-rithist. \n\nGu mì-fhortanach, chan urrainn do thuairisgeulaiche nan tuislidhean aithisg tuislidh a chur air falbh. \n\nMion-fhiosrachadh: %s
 CrashReporterDescriptionText2=Dh'èirich duilgheadas is thuislich Firefox. Feuchaidh sinn ris na tabaichean is na h-uinneagan agad aiseag dhut nuair a thòisicheas e a-rithist. \n\n'S urrainn dhut aithisg tuislidh a chur thugainn gus ar cuideachdh le rèiteachadh na mearachd.
--- a/browser/feedback/main.dtd
+++ b/browser/feedback/main.dtd
@@ -1,8 +1,12 @@
+<!-- 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 testpilot.brand.label                      "Am pìleat deuchainne">
 <!ENTITY testpilot.settings.label                   "Roghainnean">
 <!ENTITY testpilot.settings.dataSubmission.label    "Cur a-null dàta">
 <!ENTITY testpilot.settings.notifications.label     "Brathan">
 <!ENTITY testpilot.settings.notifyWhen.label        "Cuir brath thugam nuair a…">
 <!ENTITY testpilot.settings.readyToSubmit.label     "bhios sgrùdadh deiseil ri chur">
 <!ENTITY testpilot.settings.newStudy.label          "bhios sgrùdadh ùr ann">
 <!ENTITY testpilot.settings.hasNewResults.label     "toraidhean ùra aig sgrùdadh">
--- a/browser/feedback/main.properties
+++ b/browser/feedback/main.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 # description for add-on manager
 extensions.testpilot@labs.mozilla.com.description = 'S urrainn dhut ar cuideachadh ann an leasachadh Firefox tro na sgrùdaidhean luchd-cleachdaidh.
 
 # common
 testpilot.fullBrandName = Am pìleat deuchainne aig deuchainn-lannan Mhozilla
 testpilot.moreInfo = Barrachd fiosrachaidh
 testpilot.submit = Cuir a-null
 testpilot.takeSurvey = Gabh an t-suirbhidh
--- a/browser/firefox-l10n.js
+++ b/browser/firefox-l10n.js
@@ -1,39 +1,7 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Firefox browser.
-#
-# The Initial Developer of the Original Code is
-# Benjamin Smedberg <bsmedberg@covad.net>
-# Portions created by the Initial Developer are Copyright (C) 2004
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# 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/.
 
 #filter substitution
 
 pref("general.useragent.locale", "@AB_CD@");
--- a/browser/installer/custom.properties
+++ b/browser/installer/custom.properties
@@ -1,43 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Mozilla Installer code.
-#
-# The Initial Developer of the Original Code is Mozilla Foundation
-# Portions created by the Initial Developer are Copyright (C) 2006
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#  Robert Strong <robert.bugzilla@gmail.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# 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:
 
 # This file must be saved as UTF8
 
 # Accesskeys are defined by prefixing the letter that is to be used for the
 # accesskey with an ampersand (e.g. &).
 
--- a/browser/installer/mui.properties
+++ b/browser/installer/mui.properties
@@ -1,43 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Mozilla Installer code.
-#
-# The Initial Developer of the Original Code is Mozilla Foundation
-# Portions created by the Initial Developer are Copyright (C) 2006
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#  Robert Strong <robert.bugzilla@gmail.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# 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/.
 
 # To make the l10n tinderboxen see changes to this file you can change a value
 # name by adding - to the end of the name followed by chars (e.g. Branding-2).
 
 # LOCALIZATION NOTE:
 
 # This file must be saved as UTF8
 
--- a/browser/installer/override.properties
+++ b/browser/installer/override.properties
@@ -1,43 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Mozilla Installer code.
-#
-# The Initial Developer of the Original Code is Mozilla Foundation
-# Portions created by the Initial Developer are Copyright (C) 2006
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#  Robert Strong <robert.bugzilla@gmail.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# 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:
 
 # This file must be saved as UTF8
 
 # Accesskeys are defined by prefixing the letter that is to be used for the
 # accesskey with an ampersand (e.g. &).
 
new file mode 100644
--- /dev/null
+++ b/browser/pdfviewer/chrome.properties
@@ -0,0 +1,3 @@
+# Chrome notification bar messages and buttons
+unsupported_feature=Faodaidh nach eil an sgrìobhainn PDF seo 'ga shealltainn mar bu chòis.
+open_with_different_viewer=Fosgail le sealladair eile
new file mode 100644
--- /dev/null
+++ b/browser/pdfviewer/viewer.properties
@@ -0,0 +1,91 @@
+# Main toolbar buttons (tooltips and alt text for images)
+previous.title=An duilleag roimhe
+previous_label=Air ais
+next.title=An ath-dhuilleag
+next_label=Air adhart
+
+# LOCALIZATION NOTE (page_label, page_of):
+# These strings are concatenated to form the "Page: X of Y" string.
+# Do not translate "{{pageCount}}", it will be substituted with a number
+# representing the total number of pages.
+page_label=Duilleag:
+page_of=à {{pageCount}}
+
+zoom_out.title=Sùm a-mach
+zoom_out_label=Sùm a-mach
+zoom_in.title=Sùm a-steach
+zoom_in_label=Sùm a-steach
+zoom.title=Sùm
+print.title=Clò-bhuail
+print_label=Clò-bhuail
+open_file.title=Fosgail faidhle
+open_file_label=Fosgail
+download.title=Luchdaich a-nuas
+download_label=Luchdaich a-nuas
+bookmark.title=An sealladh làithreach (dèan lethbhreac no fosgail e ann an uinneag ùr)
+bookmark_label=An sealladh làithreach
+
+# Tooltips and alt text for side panel toolbar buttons
+# (the _label strings are alt text for the buttons, the .title strings are
+# tooltips)
+toggle_slider.title=Toglaich an sleamhnachan
+toggle_slider_label=Toglaich an sleamhnachan
+outline.title=Seall an sgrìobhainn far loidhne
+outline_label=Oir-loidhne na sgrìobhainne
+thumbs.title=Seall na dealbhagan
+thumbs_label=Dealbhagan
+search_panel.title=Lorg san sgrìobhainn
+search_panel_label=Lorg
+
+# Document outline messages
+no_outline=Chan eil oir-loidhne ri làimh
+
+# Thumbnails panel item (tooltip and alt text for images)
+# LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
+# number.
+thumb_page_title=Duilleag a {{page}}
+# LOCALIZATION NOTE (thumb_page_canvas): "{{page}}" will be replaced by the page
+# number.
+thumb_page_canvas=Dealbhag duilleag a {{page}}
+
+# Search panel button title and messages
+search=Lorg
+search_terms_not_found=(Cha deach a lorg)
+
+# Error panel labels
+error_more_info=Barrachd fiosrachaidh
+error_less_info=Nas lugha de dh'fhiosrachadh
+error_close=Dùin
+# LOCALIZATION NOTE (error_build): "{{build}}" will be replaced by the PDF.JS
+# build ID.
+error_build=PDF.JS Build: {{build}}
+# LOCALIZATION NOTE (error_message): "{{message}}" will be replaced by an
+# english string describing the error.
+error_message=Teachdaireachd: {{message}}
+# LOCALIZATION NOTE (error_stack): "{{stack}}" will be replaced with a stack
+# trace.
+error_stack=Stac: {{stack}}
+# LOCALIZATION NOTE (error_file): "{{file}}" will be replaced with a filename
+error_file=Faidhle: {{file}}
+# LOCALIZATION NOTE (error_line): "{{line}}" will be replaced with a line number
+error_line=Loidhne: {{line}}
+rendering_error=Thachair mearachd rè reandaradh na duilleige.
+
+# Predefined zoom values
+page_scale_width=Leud na duilleige
+page_scale_fit=Freagair ri meud na duilleige
+page_scale_auto=Sùm fèin-obrachail
+page_scale_actual=Am fìor-mheud
+
+# Loading indicator messages
+# LOCALIZATION NOTE (error_line): "{{[percent}}" will be replaced with a percentage
+loading='Ga luchdadh… {{percent}}%
+loading_error_indicator=Mearachd
+loading_error=Thachair mearachd rè luchdadh a' PDF.
+
+# LOCALIZATION NOTE (text_annotation_type): This is used as a tooltip.
+# "{{[type}}" will be replaced with an annotation type from a list defined in
+# the PDF spec (32000-1:2008 Table 169 – Annotation types).
+# Some common types are e.g.: "Check", "Text", "Comment", "Note"
+text_annotation_type=[Nòtachadh {{type}}]
+request_password=Tha am PDF fo dhìon facail-fhaire:
--- a/browser/profile/chrome/userChrome-example.css
+++ b/browser/profile/chrome/userChrome-example.css
@@ -1,8 +1,12 @@
+/* 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/. */
+
 /*
  * Edit this file and copy it as userChrome.css into your
  * profile-directory/chrome/
  */
 
 /*
  * This file can be used to customize the look of Mozilla's user interface
  * You should consider using !important on rules which you want to
--- a/browser/profile/chrome/userContent-example.css
+++ b/browser/profile/chrome/userContent-example.css
@@ -1,8 +1,12 @@
+/* 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/. */
+
 /*
  * Edit this file and copy it as userContent.css into your
  * profile-directory/chrome/
  */
 
 /*
  * This file can be used to apply a style to all web pages you view
  * Rules without !important are overruled by author rules if the
--- a/browser/updater/updater.ini
+++ b/browser/updater/updater.ini
@@ -1,6 +1,9 @@
+; 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/.
 ; This file is in the UTF-8 encoding
 ; All strings must be less than 600 chars.
 [Strings]
 TitleText=Ùrachadh %MOZ_APP_DISPLAYNAME%
 InfoText=Tha %MOZ_APP_DISPLAYNAME% a' stàladh nan ùrachaidhean 's tòisichidh e sa bhad…
 MozillaMaintenanceDescription=Tha an t-seirbheis aig Mozilla air a bheil Fear an Taighe a' dèanamh cinnteach gu bheil an tionndadh as ùire 's as tèarainte de Mozilla Firefox air a' choimpiutair agad. Tha e cudromach a thaobh tèarainteachd air loidhne gum bi Firefox cho ùr 's a ghabhas agus mholadh Mozilla dhut gu mòr an t-seirbheis seo a chleachdadh.
new file mode 100644
--- /dev/null
+++ b/browser/webapp-uninstaller/webapp-uninstaller.properties
@@ -0,0 +1,10 @@
+# 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: This file must be saved as UTF8
+# LOCALIZATION NOTE: $AppName will be replaced with the (already localized)
+#                    name of the webapp being uninstalled.
+
+^UninstallCaption=Dì-stàladh $AppName
+UN_CONFIRM_UNINSTALL=Thèid $AppName a dhì-stàladh on choimpiutair agad.
--- a/browser/webapprt/webapp.properties
+++ b/browser/webapprt/webapp.properties
@@ -10,8 +10,16 @@
 
 # LOCALIZATION NOTE (quitApplicationCmdMac.label): %S will be replaced with
 # the name of the webapp.
 quitApplicationCmdMac.label=Fàg %S
 
 # LOCALIZATION NOTE (hideApplicationCmdMac.label): %S will be replaced with
 # the name of the webapp.
 hideApplicationCmdMac.label=Falaich %S
+
+# LOCALIZATION NOTE (geolocation.title): %S will be replaced with the name of
+# the webapp.
+geolocation.title=%S - Nochdadh an àite
+geolocation.description=A bheil thu airson d' àite a nochdadh?
+geolocation.sharelocation=Nochd m' àite
+geolocation.dontshare=Na nochd d' àite
+geolocation.remember=Cuimhnich mo roghainn
--- a/dom/chrome/accessibility/AccessFu.properties
+++ b/dom/chrome/accessibility/AccessFu.properties
@@ -60,32 +60,50 @@ comboboxlist   =       liosta bogsa comb
 comboboxoption =       roghainn bogsa combo
 imagemap       =       mapa deilbh
 listboxoption  =       roghainn bogsa liosta
 listbox        =       bogsa liosta
 flatequation   =       co-aontar rèidh
 gridcell       =       cealla a' ghriod
 note           =       nòta
 figure         =       cumadh
+definitionlist =       liosta nan tuairisgeul
+term           =       teirm
+definition     =       mìneachadh
 
-# More sophisiticated object descriptions
+# More sophisticated roles which are not actual numeric roles
+textarea       =       raon an teacsa
+
+# More sophisticated object descriptions
 headingLevel   =       leibheil a' bhanna-chinn %S
 # LOCALIZATION NOTE: %1$S is the item's role name (e.g. "List item" or "Page tab"), %2$S is the position of the item n the set. %3$S is the total number of such items in the set. An expanded example would read "List item 2 of 5".
 objItemOf      =       %1$S %2$S à %3$S
-objChecked     =       %S le cromag ann
-objNotChecked  =       %S gun chromag ann
-objExpanded    =       %S leudaichte
-objCollapsed   =       %S air a cho-theannadh
 
 # Invoked actions
 jumpAction     =      air a leum
 pressAction    =      air a bhrùthadh
-checkAction    =      le cromag ann
+checkAction    =      le cromag
 uncheckAction  =      gun chromag ann
 selectAction   =      air a thaghadh
 openAction     =      air fhosgladh
 closeAction    =      air a dhùnadh
 switchAction   =      air suaipeadh
 clickAction    =      air a bhriogadh
 collapseAction =      air a cho-theannadh
 expandAction   =      air a leudachadh
 activateAction =      air a chur an gnìomh
 cycleAction    =      air a chuairteachadh
+
+# Tab states
+tabLoading     =      'ga luchdadh
+tabLoaded      =      air a luchdadh
+tabNew         =      taba ùr
+tabLoadStopped =      sguireadh dhen luchdadh
+tabReload      =      'ga ath-luchdadh
+
+# Object states
+stateChecked     =    le cromag
+stateNotChecked  =    gun chromag
+stateExpanded    =    air a leudachadh
+stateCollapsed   =    air a cho-theannadh
+stateUnavailable =    chan eil e ri fhaighinn
+stateRequired    =    riatanach
+stateTraversed   =    chaidh tadhal air
--- a/dom/chrome/accessibility/mac/accessible.properties
+++ b/dom/chrome/accessibility/mac/accessible.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 jump    =       Thoir leum
 press   =       Put
 check   =       Thoir sùil
 uncheck =       Dì-chomharraich
 select  =       Tagh
 open    =       Fosgail
 close   =       Dùin
 switch  =       Dèan suaip
--- a/dom/chrome/accessibility/unix/accessible.properties
+++ b/dom/chrome/accessibility/unix/accessible.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 jump    =       Thoir leum
 press   =       Put
 check   =       Thoir sùil
 uncheck =       Dì-chomharraich
 select  =       Tagh
 open    =       Fosgail
 close   =       Dùin
 switch  =       Dèan suaip
--- a/dom/chrome/accessibility/win/accessible.properties
+++ b/dom/chrome/accessibility/win/accessible.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 jump    =       Thoir leum
 press   =       Put
 check   =       Thoir sùil
 uncheck =       Dì-chomharraich
 select  =       Tagh
 open    =       Fosgail
 close   =       Dùin
 switch  =       Dèan suaip
--- a/dom/chrome/appstrings.properties
+++ b/dom/chrome/appstrings.properties
@@ -1,43 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# 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/.
 
 malformedURI=Chan e URL dligheach a tha ann is cha ghabh a luchdadh.
 fileNotFound=Cha deach am faidhle %S a lorg. Dèan cinnteach gu bheil thu 'ga lorg san àite cheart is feuch ris a-rithist.
 dnsNotFound=Cha deach %S a lorg. Dèan cinnteach gu bheil an t-ainm ceart agad is feuch ris a-rithist.
 protocolNotFound=Chan e pròtacal clàraichte a tha ann an %S.
 connectionFailure=Chaidh an ceangal a dhiùltadh nuair a dh'iarradh inntrigeadh gu %S.
 netInterrupt=Bhris an ceangal ri %S gu h-obann. Dh'fhaodadh gun deach cuid dhen dàta a thoirt seachad.
 netTimeout=Chaidh an gnìomh thar tìde nuair a dh'iarraidh inntrigeadh gu %S.
--- a/dom/chrome/charsetTitles.properties
+++ b/dom/chrome/charsetTitles.properties
@@ -1,43 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1999 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# 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/.
 
 ## Rule of this file:
 ## 1. key should always be in lower case ascii so we can do case insensitive
 ##    comparison in the code faster.
 
 ## Format of this file:
 ## charset_name.title = a_title  -  specifies the human readable title for 
 ## this charset
--- a/dom/chrome/dom/dom.properties
+++ b/dom/chrome/dom/dom.properties
@@ -1,63 +1,27 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mitch <mstoltz@netscape.com> (original author)
-#   Ehsan Akhgari <ehsan.akhgari@gmail.com>
-#   Ms2ger <ms2ger@gmail.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# 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/.
 
 KillScriptTitle=Rabhadh: sgriobt gun fhreagairt
 KillScriptMessage=Tha sgriobt air an duilleag seo a dh'fhaodadh a bhith trang no gun fhreagairt. 'S urrainn dhut crìoch a chur air an sgriobt an-dràsta no leantainn ort feuch an coilean e leis fhèin.
 KillScriptWithDebugMessage=Dh'fhaodadh gu bheil sgriobt air an duilleag seo a tha trang no gun fhreagairt. 'S urrainn dhut crìoch a chur air an sgriobt an-dràsta, fhosgladh anns an dì-bhugadair no leigeil leis dol air adhart.
 KillScriptLocation=Sgriobt: %S
 StopScriptButton=Cuir crìoch air an sgriobt
 DebugScriptButton=Dì-bhugaich an sgriobt
 WaitForScriptButton=Air adhart
 DontAskAgain=&Na faighnich dhìom a-rithist
 JSURLLoadBlockedWarning=Chuir manaidsear na tèarainteachd casg air iarrtas URL\njavascript: le aon òstair ann an uinneag anns a bheil\nrudeigin le òstair eile ri fhaicinn.
 WindowCloseBlockedWarning=Chan eil cead aig sgriobtaichean uinneagan a dhùnach nach deach am fosgladh le sgriobt.
 OnBeforeUnloadTitle=A bheil thu cinnteach?
 OnBeforeUnloadMessage=Tha an duilleag seo ag iarraidh ort gun dearbhaich thu gu bheil thu airson fhàgail - faodaidh nach dèid dàta a chuir thu a-steach ann a shàbhaladh.
 OnBeforeUnloadStayButton=Fuirich air an duilleag seo
 OnBeforeUnloadLeaveButton=Fàg an duilleag seo
 DocumentAllUsed=Chaidh am feart neo-bhun-tomhasach "document.all" a chleachdadh. Cleachd an tionndadh bun-tomhasach W3C "document.getElementById()" 'na àite.
-GlobalScopeElementReference=Chaidh iomradh a dhèanamh air eileamaid le ID/NAME san sgòp uile-choitcheann. Cleachd document.getElementById() a tha a-rèir bun-tomhas W3C 'na àite.
 UseOfCaptureEventsWarning=Cha mholamaid cleachdadh captureEvents() tuilleadh. Cleachd am modh DOM 2 addEventListener() gus an còd agad ùrachadh. Cuir sùil air an duilleag seo airson barrachd fiosrachaidh http://developer.mozilla.org/en/docs/DOM:element.addEventListener
 UseOfReleaseEventsWarning=Cha mholamaid cleachdadh releaseEvents() tuilleadh. Cleachd am modh DOM 2 removeEventListener() gus an còd agad ùrachadh. Cuir sùil air an duilleag seo airson barrachd fiosrachaidh http://developer.mozilla.org/en/docs/DOM:element.removeEventListener
 UseOfRouteEventWarning=Chan mholamaid cleachdadh routeEvent() tuilleadh. Cleachd am modh DOM 2 dispatchEvent() gus an còd agad ùrachadh. Cuir sùil air an duilleag seo airson barrachd fiosrachaidh http://developer.mozilla.org/en/docs/DOM:element.dispatchEvent
 UseOfPreventBubbleWarning=Tachartas=%S, cha mholamaid cleachdadh preventBubble(). Cleachd stopPropagation() a tha a-rèir bun-tomhas W3C 'na àite.
 UseOfPreventCaptureWarning=Tachartas=%S, cha mholamaid cleachdadh preventCapture(). Cleachd stopPropagation() a tha a-rèir bun-tomhas W3C 'na àite.
 UseOfDOM3LoadMethodWarning=Cha mholamaid cleachdadh Document.load() tuilleadh. Cleachd an t-oibseact XMLHttpRequest gus an còd agad ùrachadh. Cuir sùil air an duilleag seo airson barrachd fiosrachaidh https://developer.mozilla.org/en/XMLHttpRequest
 UnexpectedCanvasVariantStyle=canvas: chaidh iarrtas a leigeil seachad airson strokeStyle no fillStyle a thionndaidh na luach nach eil na shreang, CanvasGradient no CanvasPattern.
 EmptyGetElementByIdParam=Chaidh sreang bhàn a chur gu getElementById().
@@ -111,16 +75,17 @@ EnablePrivilegeWarning=Chan eil cleachdadh enablePrivilege 'ga mholadh tuilleadh.  Cleachd còd a ruitheas leis an System Principal (m.e. leudachan) 'na àite.
 PositionWarning=Chan eil cleachdadh buadh XMLHttpRequest Progress Events Position 'ga mholadh tuilleadh.
 TotalSizeWarning=Chan eil cleachdadh buadh totalSize aig XMLHttpRequest Progress Events 'ga mholadh tuilleadh.
 nsIJSONDecodeDeprecatedWarning=Chan eil cleachdadh nsIJSON.decode 'ga mholadh tuilleadh.  Cleachd JSON.parse 'na àite.
 nsIJSONEncodeDeprecatedWarning=Chan eil cleachdadh nsIJSON.encode 'ga mholadh tuilleadh.  Cleachd JSON.stringify 'na àite.
 nsIDOMWindowInternalWarning=Chan eil cleachdadh nsIDOMWindowInternal 'ga mholadh tuilleadh. Cleachd nsIDOMWindow 'na àite.
 InputEncodingWarning=Chan eil cleachdadh inputEncoding 'ga mholadh tuilleadh.
 # LOCALIZATION NOTE: Do not translate "MozBeforePaint" and "mozRequestAnimationFrame"
 MozBeforePaintWarning=Chan eil taic ann ri tachartasan MozBeforePaint tuilleadh.  Feumar mozRequestAnimationFrame a shìneadh a-null gu argamaid callback non-null.
+FullScreenDeniedBlocked=Chaidh iarrtas na làn-sgrìn a dhiùltadh a chionn 's gun do bhac an cleachdaiche làn-sgrìnichean air an àrainn seo.
 FullScreenDeniedDisabled=Chaidh iarrtas airson làn-sgrìn a dhiùltadh a chionn 's gun deach an API làn-sgrìn a chur à comas leis a' chleachdaiche.
 FullScreenDeniedFocusedPlugin=Chaidh iarrtas airson làn-sgrìn a dhiùltadh a chionn 's gu bheil plugan uinneagaichte am fòcas.
 FullScreenDeniedHidden=Chaidh iarrtas airson làn-sgrìn a dhiùltadh a chionn 's nach eil an sgrìobhainn ri fhaicinn tuilleadh.
 FullScreenDeniedIframeDisallowed=Chaidh iarrtas airson làn-sgrìn a dhiùltadh a chionn 's gu bheil iframes aig aon sgrìobhainn air a' char as lugha agus chan eil buadh "mozallowfullscreen" aige.
 FullScreenDeniedNotInputDriven=Chaidh iarrtas airson làn-sgrìn a dhiùltadh a chionn 's nach deach Element.mozRequestFullScreen() a ghairm o bhroinn short running user-generated event handler.
 FullScreenDeniedNotInDocument=Chaidh iarrtas airson làn-sgrìn a dhiùltadh a chionn 's nach eil an eileamaid a dh'iarr e san sgrìobhainn tuilleadh.
 FullScreenDeniedMovedDocument=Chaidh iarrtas airson làn-sgrìn a dhiùltadh a chionn 's gun do ghluais an eileamaid a dh'iarr e.
 FullScreenDeniedLostWindow=Chaidh iarrtas airson làn-sgrìn a dhiùltadh a chionn 's nach eil uinneag againn tuilleadh.
@@ -138,19 +103,26 @@ TimeoutSyncXHRWarning=Chan eil taic ann 
 JSONCharsetWarning=Dh'fheuch thu ri còdachadh nach eil 'na UTF-8 a chur a cèill airson JSON a fhuaradh an cois XMLHttpRequest. Chan eil taic ann ach ri UTF-8 gus JSON a dhì-chòdachadh.
 MediaLoadExhaustedCandidates=Dh'fhàillig luchdadh goireasan uile an tagraiche. Chaidh luchdadh a' mheadhain a chur 'na stad.
 MediaLoadSourceMissingSrc=<source>chan eil buadh "src" aig an eileamaid. Dh'fhàillig luchdadh a' ghoireis mheadhain.
 # LOCALIZATION NOTE: %1$S is the Http error code the server returned (e.g. 404, 500, etc), %2$S is the URL of the media resource which failed to load.
 MediaLoadHttpError=Dh'fhàillig an luchdadh HTTP leis an staid %1$S. Dh'fhàillig luchdadh a' ghoireis mheadhain %2$S.
 # LOCALIZATION NOTE: %S is the URL of the media resource which failed to load.
 MediaLoadInvalidURI=URI mì-dhligheach. Dh'fhàillig luchdadh a' ghoireis mheadhain %S.
 # LOCALIZATION NOTE: %1$S is the media resource's format/codec type (basically equivalent to the file type, e.g. MP4,AVI,WMV,MOV etc), %2$S is the URL of the media resource which failed to load.
-MediaLoadUnsupportedType=Chan eil taic ann dhan "type" de "%1$S" a chaidh a shònrachadh. Dh'fhàillig luchdadh a' ghoireis mheadhain %2$S.
+MediaLoadUnsupportedTypeAttribute=Chan eil taic ann dhan "type" de "%1$S" a chaidh a shònrachadh. Dh'fhàillig luchdadh a' ghoireis mheadhain %2$S.
+# LOCALIZATION NOTE: %1$S is the "media" attribute value of the <source> element. It is a media query. %2$S is the URL of the media resource which failed to load.
+MediaLoadSourceMediaNotMatched=Chan eil a' bhuadh "media" de "%1$S" a' freagairt ris an àrainneachd. Dh'fhàillig luchdadh a' ghoireis mheadhain %2$S.
 # LOCALIZATION NOTE: %1$S is the MIME type HTTP header being sent by the web server, %2$S is the URL of the media resource which failed to load.
 MediaLoadUnsupportedMimeType=Chan eil taic ann dhan "Content-Type" HTTP de "%1$S". Dh'fhàillig luchdadh a' ghoireis mheadhain %2$S.
 # LOCALIZATION NOTE: %S is the URL of the media resource which failed to load because of error in decoding.
 MediaLoadDecodeError=Dh'fhàillig dì-chòdachadh %S a' ghoireis mheadhain.
 # LOCALIZATION NOTE: Do not translate "MozBlobBuilder" and "Blob"
 MozBlobBuilderWarning=Chan eil cleachdadh MozBlobBuilder 'ga mholadh tuilleadh. Cleachd Blob Constructor 'na àite.
 # LOCALIZATION NOTE: Do not translate "DOMException", "code" and "name"
 DOMExceptionCodeWarning=Chan eil cleachdadh na buaidh còd DOMException 'ga mholadh tuilleadh. Cleachd ainm 'na àite.
-# LOCALIZATION NOTE: Do not translate "java" or "Packages".
-JavaPackagesWarning=Chan eil cleachdadh nan oibseactan DOM 'java' agus 'Packages' 'ga mholadh tuilleadh gus inntrigeadh a dhèanamh gu Java. Cha bhi taic ann dhaibh tuilleadh a dh'aithghearr.
+# LOCALIZATION NOTE: Do not translate "__exposedProps__"
+NoExposedPropsWarning=Chan eil nochdadh de dh'oibseactan Chrome JS as aonais __exposedProps__ tèarainte 's cha mholar e tuilleadh. Faic https://developer.mozilla.org/en/XPConnect_wrappers airson barrachd fiosrachaidh.
+# LOCALIZATION NOTE: Do not translate "Mutation Event" and "MutationObserver"
+MutationEventWarning=Chan eil cleachdadh Mutation Events 'ga mholadh tuilleadh. Cleachd MutationObserver 'na àite.
+# LOCALIZATION NOTE: Do not translate "Blob", "mozSlice", or "slice"
+MozSliceWarning=Chan eil cleachdadh mozSlice air an oibseact Blob 'ga mholadh tuilleadh. Cleachd Slice 'na àite.
+OnuploadprogressWarning=Use of XMLHttpRequest's onuploadprogress attribute is deprecated.
--- a/dom/chrome/global-strres.properties
+++ b/dom/chrome/global-strres.properties
@@ -1,37 +1,5 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# The Mozilla Foundation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2003
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# 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/.
 
 16389=Thachair mearachd neo-aithnichte (%1$S)
--- a/dom/chrome/global.dtd
+++ b/dom/chrome/global.dtd
@@ -1,1 +1,5 @@
+<!-- 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 locale.dir "ltr">
--- a/dom/chrome/layout/HtmlForm.properties
+++ b/dom/chrome/layout/HtmlForm.properties
@@ -1,43 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# 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/.
 
 Reset=Ath-shuidhich
 Submit=Cuir iarrtas
 Browse=Brabhsaich…
 FileUpload=Luchdaich suas faidhle
 MediaUpload=Luchdaich suas meadhan
 # LOCALIZATION NOTE (IsIndexPromptWithSpace): The last character of the string 
 # should be a space (U+0020) in most locales. The prompt is followed by an 
--- a/dom/chrome/layout/MediaDocument.properties
+++ b/dom/chrome/layout/MediaDocument.properties
@@ -1,46 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Blake Ross <blakeross@telocity.com> (Original Author)
-#   Morten Nilsen <morten@nilsen.com>
-#   Christian Biesinger <cbiesinger@web.de>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# 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 (ImageTitleWithDimensionsAndFile): first %S is filename, second %S is type, third %S is width and fourth %S is height
 #LOCALIZATION NOTE (ImageTitleWithoutDimensions): first %S is filename, second %S is type
 #LOCALIZATION NOTE (ImageTitleWithDimensions): first %S is type, second %S is width and third %S is height
 #LOCALIZATION NOTE (ImageTitleWithNeitherDimensionsNorFile): first %S is type
 #LOCALIZATION NOTE (MediaTitleWithFile): first %S is filename, second %S is type
 #LOCALIZATION NOTE (MediaTitleWithNoInfo): first %S is type
 ImageTitleWithDimensionsAndFile=%S (Dealbh %S, %Sx%S pixel)
--- a/dom/chrome/layout/css.properties
+++ b/dom/chrome/layout/css.properties
@@ -1,43 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is css.properties.
-#
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation.  Portions created by the Initial Developer are Copyright
-# (C) 2002 Netscape Communications Corporation.  All Rights Reserved.
-#
-# Contributor(s):
-#   L. David Baron <dbaron@dbaron.org> (original author)
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# 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/.
 
 MimeNotCss=Cha deach duilleag nan stoidhle %1$S a luchdadh a chionn 's nach eil a chuir seòrsa MIME, "%2$S", agus "text/css" co-ionnan.
 MimeNotCssWarn=Chaidh duilleag nan stoidhle %1$S a luchdadh mar thè CSS ged nach eil a chuid seòrsa MIME, "%2$S", agus "text/css" co-ionnan.
 
 PEUnexpEOF2=Deireadh faidhle ris nach robh dùil fhad 's a bhathar a' lorg %1$S.
 PEParseRuleWSOnly=Chaidh sreang anns nach robh ach àite bàn a thoirt seachad airson parsadh mar riaghailt.
 PEDeclDropped=Chaidh am foirgheall a leagail mu làr.
 PEDeclSkipped=Air leum a thoirt dhan ath-fhoirgheall.
--- a/dom/chrome/layout/htmlparser.properties
+++ b/dom/chrome/layout/htmlparser.properties
@@ -1,44 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is HTML parser error reporting code.
-#
-# The Initial Developer of the Original Code is
-# Mozilla Foundation.
-# Portions created by the Initial Developer are Copyright (C) 2011
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Henri Sivonen <hsivonen@iki.fi>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# 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/.
 
 # Encoding warnings and errors
 EncNoDeclarationFrame=Cha deach còdachadh charactaran aig sgrìobhainn fhrèamte a mhìneachadh. Faodaidh gum bi dreach eile air an sgrìobhainn ma choimheadas tu air ais aonais na sgrìobhainne mun cuairt air mar fhrèam.
 EncNoDeclarationPlain=Cha deach còdachadh charactaran na sgrìobhainne Plain Text a mhìneachadh. Nochdaidh an teacsa 'na bhrochan ann an cuid a bhrabhsairean ma tha caractaran san sgrìobhainn a tha taobh a-muigh rainse US-ASCII range. Feumaidh tu còdachadh caractaran an fhaidhle a mhìneachadh sa phròtacal tar-chuir no feumaidh am faidhle comharradh Byte Order mar shoidhneadh còdachaidh.
 EncNoDeclaration=Cha deach còdachadh charactaran na sgrìobhainne HTML a mhìneachadh. Nochdaidh an teacsa 'na bhrochan ann an cuid a bhrabhsairean ma tha caractaran san sgrìobhainn a tha taobh a-muigh rainse US-ASCII range. Feumaidh tu còdachadh caractaran an fhaidhle a mhìneachadh san sgrìobhainn no sa phròtacal tar-chuir.
 EncLateMetaFrame=Cha deach foirgheall còdachadh charactaran aig an sgrìobhainn HTML fhrèamta a lorg nuair a chaidh na 1024 byte aig toiseach an fhaidhle a leughadh. Thèid an duilleag ath-luchdadh gu fèin-obrachail ma choimheadas tu air as aonais na sgrìobhainn mun cuairt air mar fhrèam. Feumaidh tu foirgheall a' chòdachaidh a ghluasad ach am bi e sa chiad 1024 byte san fhaidhle.
 EncLateMeta=Cha deach foirgheall còdachadh charactaran aig an sgrìobhainn HTML a lorg nuair a chaidh na 1024 byte aig toiseach an fhaidhle a leughadh. Thèid an duilleag ath-luchdadh gu fèin-obrachail ma choimheadas tu air ann am brabhsair eile. Feumaidh tu foirgheall a' chòdachaidh a ghluasad ach am bi e sa chiad 1024 byte san fhaidhle.
 EncLateMetaReload=Chaidh an duilleag ath-luchdadh a chionn 's nach deach foirgheall còdachadh charactaran aig an sgrìobhainn HTML a lorg nuair a chaidh na ciad 1024 byte dhen fhaidhle a leughadh. Feumaidh tu foirgheall a' chòdachaidh a ghluasad ach am bi e sa chiad 1024 byte san fhaidhle.
--- a/dom/chrome/layout/layout_errors.properties
+++ b/dom/chrome/layout/layout_errors.properties
@@ -1,42 +1,9 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2002
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Boris Zbarsky <bzbarsky@mit.edu>  (original author)
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# 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/.
 
 ImageMapRectBoundsError=Chan eil am buadh "coords" an taga <area shape="rect"> dhen fhòrmat "clì,barr,deis,bun".
 ImageMapCircleWrongNumberOfCoords=Chan eil buadh "coords" an taga <area shape="circle"> dhen fhòrmat "meadhan-x,meadhan-y,gd".
 ImageMapCircleNegativeRadius=Tha rèideas àicheil aig buadh "coords" an taga <area shape="circle">.
 ImageMapPolyWrongNumberOfCoords=Chan eil buadh "coords" an taga <area shape="poly"> dhen fhòrmat "x1,y1,x2,y2 …".
 ImageMapPolyOddNumberOfCoords=Tha "y" deireannach buadh "coords" an taga <area shape="poly"> a dhìth ('s e "x1,y1,x2,y2 …" am fòrmat ceart).
--- a/dom/chrome/layout/printing.properties
+++ b/dom/chrome/layout/printing.properties
@@ -1,44 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Roland Mainz <roland.mainz@informatik.med.uni-giessen.de>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# 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 formating
 ## @page_number The current page number
 #LOCALIZATION NOTE (pageofpages): 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
 
--- a/dom/chrome/layout/xbl.properties
+++ b/dom/chrome/layout/xbl.properties
@@ -1,42 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is xbl.properties.
-#
-# The Initial Developer of the Original Code is Boris Zbarsky
-# <bzbarsky@mit.edu>.  Portions created by the Initial Developer are Copyright
-# (C) 2003.  All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# 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/.
 
 UnexpectedElement=Eileamaid <%1$S> ris nach robh dùil.
 # LOCALIZATION NOTE: do not localize key="%S" modifiers="%S"
 GTK2Conflict=Chan eil an gnìomh putain seo ri fhaighinn air GTK2: key="%S" modifiers="%S"
 WinConflict=Chan eil an gnìomh putain seo ri fhaighinn air cuid dhe na meur-chlàir: key="%S" modifiers="%S"
 TooDeepBindingRecursion=Tha an ceangal XBL "%S" 'ga chleachdadh mu thràth le cus eileamaidean sinnsir; chan dèid a chleachdadh gus ath-chùrsadh gun chrìoch a sheachnadh.
 CircularExtendsBinding=Bhiodh an ceangal XBL "%S" 'ga leudachadh fhèin nan cuirear "%S" ris
 # LOCALIZATION NOTE: do not localize <handler command="…">
--- a/dom/chrome/layout/xmlparser.properties
+++ b/dom/chrome/layout/xmlparser.properties
@@ -1,43 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# 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/.
 
 # Map Expat error codes to error strings
 1 = gun chuimhne gu leòr
 2 = mearachd co-chàraidh
 3 = cha deach eileamaid sam bith a lorg
 4 = air a dhroch chumadh
 5 = tòcan gun dùnadh
 6 = caractair neo-iomlan
--- a/dom/chrome/layout/xul.properties
+++ b/dom/chrome/layout/xul.properties
@@ -1,40 +1,8 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is xul.properties.
-#
-# The Initial Developer of the Original Code is Boris Zbarsky
-# <bzbarsky@mit.edu>.  Portions created by the Initial Developer are Copyright
-# (C) 2004.  All Rights Reserved.
-#
-# Contributor(s):
-#   L. David Baron <dbaron@dbaron.org>, Mozilla Corporation
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# 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/.
 
 MissingOverlay=Dh'fhàillig luchdadh an tar-chòmhdachaidh o %1$S.
 PINotInProlog=Chan eil èifeachd aig an òrdugh làimhseachaidh <?%1$S?> taobh a-muigh an ro-fhacail tuilleadh (faic buga 360119).
 NeededToWrapXUL=Bha mac ion-loidhne %2$S sa bhogsa XUL airson na h-eileamaid %1$S agus sparr sin air a chuid mhac a bhith paisgte ann am bloc.
 NeededToWrapXULInlineBox=Bha mac ion-loidhne %2$S sa bhogsa XUL airson na h-eileamaid %1$S agus sparr sin air a chuid mhac a bhith paisgte ann am bloc. Gabhaidh seo a chàradh gu tric ma chuireas tu "display: -moz-inline-box; display: inline-block" an àite  "display: -moz-inline-box; display: inline-block".
--- a/dom/chrome/netError.dtd
+++ b/dom/chrome/netError.dtd
@@ -1,8 +1,12 @@
+<!-- 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 loadError.label "Mearachd le luchdadh na duilleige">
 <!ENTITY retry.label "Feuch ris a-rithist">
 <!-- Specific error messages -->
 
 
 <!ENTITY connectionFailure.title "Dh'fhàillig an ceangal">
 <!ENTITY connectionFailure.longDesc "<p>Ged a tha coltas gur e làrach cheart a tha ann, cha deach aig a' bhrabhsair ceangal a dhèanamh.</p><ul><li>Saoil a bheil an làrach sìos an-dràsta fhèin? Feuch ris a-rithist an ceann tàmaill.</li><li>Mur urrainn dhut làraichean eile fhaicinn, cuir sùil air ceangal a' choimpiutair agad ris an lìonra.</li><li>A bheil an coimpiutair agad ga dhìon le cachaileith-theine no progsaidh? Faodaidh roghainnean cearra cur a-steach air seòladh an lìn.</li></ul>">
 
--- a/dom/chrome/netErrorApp.dtd
+++ b/dom/chrome/netErrorApp.dtd
@@ -1,7 +1,11 @@
+<!-- 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/. -->
 <!-- Error messages that are likely to be overridden by applications go in this
      file, all messages that likely don't need to tie into app-specific UI
      should go into netError.dtd -->
 
+
 <!ENTITY securityOverride.linkText "No 's urrainn dhut eisgeachd a chur ris…">
 <!ENTITY securityOverride.warningContent "<p>Cha bu chòir dhut eisgeachd a chur ris mur eil làn earbsa agad sa cheangal-lìn a tha thu a' cleachdadh no mura faic thu rabhadh airson an fhrithealaiche seo mar is trice.</p> 
 <p>Ma tha thu airson eisgeachd a chur ris airson na làraich seo co-dhiù, nì thu seo ann an roghainnean adhartach an dubh-cheilidh.</p>">
--- a/dom/chrome/nsWebBrowserPersist.properties
+++ b/dom/chrome/nsWebBrowserPersist.properties
@@ -1,44 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla Progress Dialog.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corp.
-# Portions created by the Initial Developer are Copyright (C) 2002
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Bill Law  <law@netscape.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# 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/.
 
 readError=Cha do ghabh %S a shàbhaladh a chionn 's nach do ghabh bun-tùs an fhaidhle a leughadh.\n\nFeuch ris a-rithist an ceann tàmaill no leig fios gu rianaire an fhrithealaiche.
 writeError=Cha do ghabh %S a shàbhaladh a chionn 's gun do thachair mearachd neo-aithnichte.\n\nFeuch ri a shàbhaladh am badeigin eile.
 launchError=Cha do ghabh %S fhosgladh a chionn 's gun do thachair mearachd neo-aithnichte.\n\nFeuch ri a shàbhaladh air an diosg an toiseach 's fhoasgladh an uairsin.
 diskFull=Chan eil àite gu leòr air an diosg gus %S a shàbhaladh.\n\nThoir air falbh faidhlichean air nach eil feum tuilleadh agus feuch ris a-rithist no feuch ri a shàbhaladh am badeigin eile.
 readOnly=Cha do ghabh %S a shàbhaladh a chionn 's gu bheil an diosg, am pasgan no an fhaidhle 'ga dhìon o sgrìobhadh.\n\nThoir cead-sgrìobhadh dhan diosg agus feuch ris a-rithist no feuch ri a shàbhaladh am badeigin eile.
 accessError=Cha do ghabh %S a shàbhaladh a chionn 's nach urrainn dhut susbaint a' phasgain sin atharrachadh.\n\nAtharraich roghainnean a' phasgain is feuch ris a-rithist no feuch ri a shàbhaladh am badeigin eile.
 helperAppNotFound=Cha do ghabh %S fhosgladh a chionn 's nach eil am prògram taice co-cheangailte ris ann. Atharraich an dàimh anns na roghainnean agad.
--- a/dom/chrome/plugins.properties
+++ b/dom/chrome/plugins.properties
@@ -1,8 +1,12 @@
+# 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):
 #    Those strings are inserted into an HTML page, so you all HTML characters
 #    have to be escaped in a way that they show up correctly in HTML!
 
 title_label=Mu na plugain
 enabledplugins_label=Plugain an comas
 nopluginsareenabled_label=Cha deach plugan a lorg a tha an comas
 findmore_label=Faigh barrachd fiosrachaidh mu phlugain brabhsair aig
--- a/dom/chrome/security/caps.properties
+++ b/dom/chrome/security/caps.properties
@@ -1,45 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mitch Stoltz <mstoltz@netscape.com>
-#   Christopher A. Aillon <christopher@aillon.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# 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/.
 Yes = Ceadaich
 No = Diùlt e
 Titleline = Tèarainteachd-lìn
 CheckMessage = Cuimhnich an co-dhùnadh seo
 EnableCapabilityQuery = Tha sgriobt o "%S" ag iarraidh comasan a bharrachd a NACH EIL TÈARAINTE agus dh'fhaodar an cleachdadh gus cron a chur air an inneal no an dàta agad:\n\n%S\n\nNa ceadaich na comasan seo ach ma bhios earbsa agad san tùs seo 's e saor o bhìorasan is prògraman droch rùnach.
 EnableCapabilityDenied = Chaidh pribhleidean %S a dhiùltadh do sgriobt o "%S".
 CheckLoadURIError = Mearachd tèarainteach: Chan eil e ceadaichte do shusbaint aig %S a luchdadh no a cheangal ri %S.
 CheckSameOriginError = Mearachd tèarainteachd: Chan eil e ceadaichte do shusbaint aig %S dàta a luchdadh o %S.
--- a/dom/chrome/svg/svg.properties
+++ b/dom/chrome/svg/svg.properties
@@ -1,38 +1,5 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Mozilla SVG project.
-#
-# The Initial Developer of the Original Code is
-# Robert Longson.
-# Portions created by the Initial Developer are Copyright (C) 2006
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#    Robert Longson <longsonr@gmail.com> (original author)
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# 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/.
 
 AttributeParseWarning=Luach %2$S gun dùil ris is a' parsadh buadh %1$S.
--- a/dom/chrome/xml/prettyprint.dtd
+++ b/dom/chrome/xml/prettyprint.dtd
@@ -1,37 +1,5 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org.
-   -
-   - The Initial Developer of the Original Code is
-   - Vincent Béron.
-   - Portions created by the Initial Developer are Copyright (C) 2003
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s): Vincent Béron <vberon@hermes.usherb.ca>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
+<!-- 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 xml.nostylesheet "Tha coltas nach eil fiosrachadh stoidhle leis an fhaidhle XML seo. Chithear craobh nan sgrìobhainnean gu h-ìosal.">
--- a/dom/chrome/xslt/xslt.properties
+++ b/dom/chrome/xslt/xslt.properties
@@ -1,44 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is TransforMiiX XSLT processor code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2003
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Peter Van der Beken <peterv@propagandism.org>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# 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/.
 
 1  = Dh'fhàillig parsadh bileag-stoidhle XSLT.
 2  = Dh'fhàillig parsadh an spreisein XPath.
 3  = 
 4  = Dh'fhàillig cruth-atharrachadh XSLT.
 5  = Foincsean XSLT/XPath mì-dhligheach.
 6  = Ath-chùrsadh san duilleag-stoidhle XSLT ('s dòcha).
 7  = Luach buaidh mì-dhligheach ann an XSLT 1.0.
--- a/embedding/android/android_strings.dtd
+++ b/embedding/android/android_strings.dtd
@@ -1,8 +1,12 @@
+<!-- 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  splash_firstrun "A\' suidheachadh &brandShortName;\u2026">
 
 <!ENTITY  no_space_to_start_error "Chan eil àite gu leòr ann airson leigeil le &brandShortName; tòiseachadh.">
 <!ENTITY  error_loading_file "Thachair mearachd fhad \'s a dh\'fheuchar na faidhlichean a luchdadh a dh\'fheumas &brandShortName;">
 
 <!ENTITY  crash_reporter_title "Aithrisiche nan tuislidhean aig &brandShortName;">
 <!ENTITY  crash_message "Thuislich &brandShortName;. Bu chòir dhut na tabaichean agad fhaicinn air duilleag-thòiseachaidh &brandShortName; nuair a thòisicheas tu e a-rithist.">
--- a/mobile/android/base/android_strings.dtd
+++ b/mobile/android/base/android_strings.dtd
@@ -1,8 +1,12 @@
+<!-- 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  splash_settingup "A\' suidheachadh am &brandShortName; agad">
 <!ENTITY  splash_bookmarks_history "Tha sinn ag ùrachadh nan comharran-lìn agad agus faodaidh gum feum sinn mionaid no dhà.">
 
 <!ENTITY  no_space_to_start_error "Chan eil àite gu leòr ann airson leigeil le &brandShortName; tòiseachadh.">
 <!ENTITY  error_loading_file "Thachair mearachd fhad \'s a dh\'fheuchar na faidhlichean a luchdadh a dh\'fheumas &brandShortName;">
 
 <!ENTITY  awesomebar_all_pages_title "Sàr-làraichean">
@@ -39,32 +43,36 @@
 <!ENTITY history_today_section "An-diugh">
 <!ENTITY history_yesterday_section "An-dè">
 <!ENTITY history_week_section "7 làithean air ais">
 <!ENTITY history_older_section "Nas sine na 7 làithean">
 
 <!ENTITY reload "Ath-luchdaich">
 <!ENTITY forward "Air adhart">
 
+<!ENTITY close_tab "Dùin an taba">
 <!ENTITY new_tab "Taba ùr">
+<!-- Localization note (num_tabs) : Number of tabs is always more than one. 
+     We can't use android plural forms, sadly. See bug #753859. -->
+<!ENTITY num_tabs "&#037;d taba(ichean)">
 <!ENTITY new_tab_opened "Chaidh taba ùr fhosgladh">
 
 <!ENTITY settings "Roghainnean">
 <!ENTITY settings_title "Roghainnean">
 <!ENTITY pref_category_general "Coitcheann">
 <!ENTITY pref_category_privacy "Prìobhaideachd ┐ Tèarainteachd">
 <!ENTITY pref_category_content "Susbaint">
 <!ENTITY pref_about_firefox "Mu &brandShortName;">
 <!ENTITY pref_do_not_track "Innis do làraichean gun a bhith \'gam lorgadh">
 <!ENTITY pref_telemetry "Cuir dàta mun dèanadas">
 <!ENTITY pref_remember_signons "Cum faclan-faire an cuimhne">
 <!ENTITY pref_cookies "Cuir briosgaidean an comas">
 <!ENTITY pref_char_encoding "Còdachadh charactairean">
 <!ENTITY pref_char_encoding_on "Seall an clàr-taice">
-<!ENTITY pref_char_encoding_off "Na seall an clàr-taice">
+<!ENTITY pref_char_encoding_off "Don\'t show menu">
 <!ENTITY pref_clear_history "Glan an eachdraidh">
 <!ENTITY pref_clear_history_confirm "Thèid an eachdraidh brabhsaidh a sguabadh às">
 <!ENTITY pref_clear_private_data "Falamhaich an dàta prìobhaideach">
 <!ENTITY pref_clear_private_data_confirm "Thèid na roghainnean brabhsaidh a sguabadh às, a\' gabhail a-steach na faclan-faire \'s briosgaidean.">
 <!ENTITY pref_plugins "Plugain">
 <!ENTITY pref_plugins_enabled "Air a chur an comas">
 <!ENTITY pref_plugins_tap_to_play "Gnog gus a chluich">
 <!ENTITY pref_plugins_disabled "Air a chur à comas">
@@ -81,33 +89,51 @@
 
 <!ENTITY addons "Tuilleadain">
 <!ENTITY downloads "Luchdaidhean a-nuas">
 <!ENTITY char_encoding "Còdachadh charactairean">
 
 <!ENTITY share "Co-roinn">
 <!ENTITY share_title "Co-roinn slighe">
 <!ENTITY save_as_pdf "Sàbhail mar PDF">
+<!ENTITY find_in_page "Lorg san duilleag">
+<!-- Localization note (find_text, find_prev, find_next, find_close) : These strings are used
+     as alternate text for accessibility. They are not visible in the UI. -->
+
+<!ENTITY find_text "Lorg san duilleag">
+<!ENTITY find_prev "Air ais">
+<!ENTITY find_next "Air adhart">
+<!ENTITY find_close "Dùin">
 
 <!ENTITY contextmenu_open_new_tab "Fosgail ann an taba ùr">
+<!ENTITY contextmenu_remove_history "Thoir air falbh">
 <!ENTITY contextmenu_remove_bookmark "Thoir air falbh">
 <!ENTITY contextmenu_add_to_launcher "Cuir ris an sgrìn mhòr">
 <!ENTITY contextmenu_share "Co-roinn">
 <!ENTITY contextmenu_edit_bookmark "Deasaich">
+<!-- Localization note (history_removed) : Shown in a toast notificaion
+	 after a page is removed from browser history. -->
+
+<!ENTITY history_removed "Duilleag air a thoirt air falbh">
 
 <!ENTITY bookmark_edit_title "Deasaich an comharra-lìn">
 <!ENTITY bookmark_edit_name "Ainm">
 <!ENTITY bookmark_edit_location "Àite">
 <!ENTITY bookmark_edit_keyword "Facal-luirg">
 
 <!ENTITY site_settings_title        "Glan roghainnean na làraich">
 <!ENTITY site_settings_cancel       "Sguir dheth">
 <!ENTITY site_settings_clear        "Falamhaich">
 <!ENTITY site_settings_no_settings  "Chan eil roghainnean ann a ghabhas an glanadh.">
 
+<!ENTITY add_to_reading_list "Cuir ris an liosta leughaidh">
+<!ENTITY reading_list_added "Chaidh an duilleag a chur ris an liosta leughaidh agad">
+<!ENTITY reading_list_removed "Chaidh an duilleag a thoirt air falbh on liosta leughaidh agad">
+<!ENTITY reader_mode "Am modh leughaidh">
+
 <!ENTITY masterpassword_create_title "Cruthaich prìomh fhacal-faire">
 <!ENTITY masterpassword_remove_title "Thoir air falbh am prìomh fhacal-faire">
 <!ENTITY masterpassword_password "Facal-faire">
 <!ENTITY masterpassword_confirm "Dearbhaich am facal-faire">
 
 <!ENTITY button_ok "Ceart ma-tha">
 <!ENTITY button_cancel "Sguir dheth">
 
@@ -120,8 +146,23 @@
 <!ENTITY abouthome_no_top_sites "Chan eil sàr-làrach agad fhathast. Gnog air a\' bhàr-tiotail gus tòiseachadh air brabhsadh.">
 <!ENTITY abouthome_about_sync "Suidhich sioncronachadh Firefox gus cothrom fhaighinn air na comharran-lìn, an eachdraidh \'s na tabaichean agad o innealan eile agad">
 <!ENTITY abouthome_sync_bold_name "Co-shioncronachadh Firefox">
 
 <!ENTITY filepicker_title "Tagh faidhle">
 <!ENTITY filepicker_audio_title "Tagh fuaim no clàraich tè">
 <!ENTITY filepicker_image_title "Tagh dealbh no tog fear">
 <!ENTITY filepicker_video_title "Tagh video no clàraich fear">
+<!-- Site identity popup -->
+
+<!ENTITY identity_connected_to "Tha thu co-cheangailte ri">
+<!-- Localization note (identity_run_by) : This string appears between a
+domain name (above) and an organization name (below). E.g.
+
+example.com
+which is run by
+Example Enterprises, Inc.
+
+The layout of the identity dialog prevents combining this into a single string with
+substitution variables.  If it is difficult to translate the sense of the string
+with that structure, consider a translation which ignores the preceding domain and
+just addresses the organization to follow, e.g. "This site is run by " -->
+<!ENTITY identity_run_by "a tha \'ga ruith le">
--- a/mobile/android/base/sync_strings.dtd
+++ b/mobile/android/base/sync_strings.dtd
@@ -1,10 +1,14 @@
+<!-- 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/. -->
 <!-- Don't localize these. They're here until they have
      a better place to live. -->
+
 <!ENTITY syncBrand.fullName.label "Sioncronachadh Firefox">
 <!ENTITY syncBrand.shortName.label "Sioncronachadh">
 <!-- Main titles. -->
 
 <!ENTITY sync.app.name.label "&syncBrand.fullName.label;">
 <!ENTITY sync.title.connect.label "Dèan ceangal ri &syncBrand.shortName.label;">
 <!ENTITY sync.title.adddevice.label "Cuir cunntas &syncBrand.fullName.label; ris">
 <!ENTITY sync.title.pair.label "Paidhrich inneal">
@@ -35,22 +39,23 @@
 <!ENTITY sync.title.fail.label "Cha ghabh &syncBrand.shortName.label; a shuidheachadh">
 <!ENTITY sync.subtitle.fail.label "Cha b\' urrainn do &syncBrand.fullName.label; ceangal a dhèanamh ris an fhrithealaiche. A bheil thu airson feuchainn ris a-rithist?">
 <!ENTITY sync.button.tryagain.label "Feuch ris a-rithist">
 <!ENTITY sync.button.manual.label "Suidheachadh a làimh">
 <!ENTITY sync.subtitle.nointernet.label "Chan eil ceangal ris an lìon ann.">
 <!-- Setup Success -->
   
 <!ENTITY sync.title.success.label "Tha an suidheachadh deiseil">
-<!ENTITY sync.subtitle.success.label "Tha an dàta agad \'ga luchdadh a-nuas sa chùlaibh. \'S urrainn dhut a dhol dha na roghainnean agad gus an cunntas agad a stiùireadh.">
+<!ENTITY sync.subtitle.success.label1 "Tha an dàta \'ga luchdadh a-nuas sa chùlaibh a-nis. \'S urrainn dhut a dhol dha na Roghainnean gus an cunntas agad a stiùireadh no tòiseachadh air brabhsadh le &brandShortName;.">
 <!ENTITY sync.settings.label "Roghainnean">
-<!ENTITY sync.subtitle.manage.label "Chaidh an cunntas &syncBrand.fullName.label; a shuidheachadh mu thràth. \'S urrainn dhut a dhol dha na roghainnean agad gus an cunntas agad a stiùireadh.">
+<!ENTITY sync.subtitle.manage.label1 "Tha an cunntas &syncBrand.fullName.label; air a shuidheachadh mu thràth. \'S urrainn dhut a dhol dha na Roghainnean gus an cunntas agad a stiùireadh no &brandShortName; a chur gu dol.">
 <!-- Pair Device -->
 
 <!ENTITY sync.pair.tryagain.label "Saoil am feuch thu ris a-rithist?">
+<!ENTITY sync.pair.connectlocation.label "Gus an t-uidheam agad a chur thuige, tagh “Suidhich &syncBrand.shortName.label;” air an uidheam agus “Tha cunntas agam” an uairsin.">
 <!-- Firefox SyncAdapter Settings Screen -->
 
 <!ENTITY sync.settings.options.label "Roghainnean">
 <!ENTITY sync.summary.pair.label "Ceangail inneal eile ris a’ chunntas &syncBrand.shortName.label; agad">
 <!-- Common text -->
 
 <!ENTITY sync.button.cancel.label "Sguir dheth">
 <!ENTITY sync.button.connect.label "Ceangail">
@@ -62,14 +67,15 @@
   
 <!ENTITY bookmarks.folder.menu.label "Clàr-taice nan comharra-lìn">
 <!ENTITY bookmarks.folder.places.label ''>
 <!ENTITY bookmarks.folder.tags.label "Tagaichean">
 <!ENTITY bookmarks.folder.toolbar.label "Bàr nan comharra-lìn">
 <!ENTITY bookmarks.folder.unfiled.label "Comharran-lìn gun seòrsachadh">
 <!ENTITY bookmarks.folder.desktop.label "Comharraidhean-lìn air an deasg">
 <!ENTITY bookmarks.folder.mobile.label "Comharran-lìn fòn-làimhe">
+<!ENTITY bookmarks.folder.readinglist.label "An liosta leughaidh">
 <!-- Notification strings -->
 
 <!ENTITY sync.notification.oneaccount.label "Chan eil taic ann ach do dh\'aon chunntas &syncBrand.fullName.label;.">
 <!-- Incorrect settings and changing credentials. -->
 
 <!ENTITY sync.new.recoverykey.status.incorrect "Tha an iuchair aisig cearr. Feuch ris a-rithist.">
--- a/mobile/android/chrome/aboutAddons.dtd
+++ b/mobile/android/chrome/aboutAddons.dtd
@@ -1,8 +1,12 @@
+<!-- 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 aboutAddons.title                      "Manaidsear nan tuilleadan">
 <!ENTITY aboutAddons.header2                    "Na tuilleadain agad">
 <!ENTITY aboutAddons.options                    "Roghainnean">
 
 <!ENTITY addonAction.enable                     "Cuir an comas">
 <!ENTITY addonAction.disable                    "Cuir à comas">
 <!ENTITY addonAction.uninstall                  "Dì-stàlaich">
 <!ENTITY addonAction.cancel                     "Sguir dheth">
--- a/mobile/android/chrome/aboutAddons.properties
+++ b/mobile/android/chrome/aboutAddons.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 addonAction.enable=Cuir an comas
 addonAction.disable=Cuir à comas
 addonAction.uninstall=Dì-stàlaich
 addonAction.cancel=Sguir dheth
 addonAction.options=Roghainnean
 
 addonsSearchEngine.description=Lorg amalaichte
 
--- a/mobile/android/chrome/aboutApps.dtd
+++ b/mobile/android/chrome/aboutApps.dtd
@@ -1,8 +1,12 @@
+<!-- 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 aboutApps.title "Na h-aplacaidean agad">
 <!-- LOCALIZATION NOTE (aboutApps.noApps.pre): include a trailing space as needed -->
 <!-- LOCALIZATION NOTE (aboutApps.noApps.middle): avoid leading/trailing spaces, this text is a link -->
 <!-- LOCALIZATION NOTE (aboutApps.noApps.post): include a starting space as needed -->
 
 <!ENTITY aboutApps.noApps.pre "Chan eil aplacaid sam bith air stàladh agad. Faigh feadhainn o ">
 <!ENTITY aboutApps.noApps.middle "bhùth nan aplacaidean">
 <!ENTITY aboutApps.noApps.post ".">
--- a/mobile/android/chrome/aboutApps.properties
+++ b/mobile/android/chrome/aboutApps.properties
@@ -1,2 +1,6 @@
+# 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/.
+
 appsContext.uninstall=Dì-stàlaich
 appsContext.shortcut=Cuir ris an sgrìn mhòr
--- a/mobile/android/chrome/aboutCertError.dtd
+++ b/mobile/android/chrome/aboutCertError.dtd
@@ -1,8 +1,12 @@
+<!-- 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 % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
   %brandDTD;
 <!-- These strings are used by Firefox's custom about:certerror page,
 a replacement for the standard security certificate errors produced
 by NSS/PSM via netError.xhtml. -->
 
 
 <!ENTITY certerror.pagetitle  "Ceangal gun earbsa">
--- a/mobile/android/chrome/aboutDownloads.dtd
+++ b/mobile/android/chrome/aboutDownloads.dtd
@@ -1,3 +1,7 @@
+<!-- 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 aboutDownloads.title                      "Luchdaidhean a-nuas">
 <!ENTITY aboutDownloads.header                     "Na luchdaich thu a-nuas">
 <!ENTITY aboutDownloads.empty                      "Cha deach dad a luchdadh a-nuas">
--- a/mobile/android/chrome/aboutDownloads.properties
+++ b/mobile/android/chrome/aboutDownloads.properties
@@ -1,2 +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/.
+
 downloadAction.open=Fosgail
 downloadAction.remove=Sguab às
+downloadAction.pause=Cuir 'na stad
+downloadAction.resume=Lean air
+downloadAction.cancel=Sguir dheth
+downloadAction.retry=Feuch ris a-rithist
+downloadState.downloading=A' luchdadh a-nuas…
+downloadState.canceled=Air a sgur dheth
+downloadState.failed=Dh'fhàillig e
+downloadState.paused='Na stad
+downloadState.starting=A' tòiseachadh…
+downloadState.unknownSize=Chan eil fhios dè cho mòr 's a tha e
--- a/mobile/android/chrome/aboutHome.dtd
+++ b/mobile/android/chrome/aboutHome.dtd
@@ -1,1 +1,5 @@
+<!-- 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 homepage.default                          "Toisich &brandShortName;">
--- a/mobile/android/chrome/browser.properties
+++ b/mobile/android/chrome/browser.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 addonsConfirmInstall.title=A' stàladh tuilleadan
 addonsConfirmInstall.install=Stàlaich
 
 # Alerts
 alertAddons=Tuilleadain
 alertAddonsDownloading=A' luchdadh a-nuas an tuilleadain
 alertAddonsInstalling=A' stàladh tuilleadan
 alertAddonsInstalled=Deiseil leis an stàladh. Tha feum air ath-thòiseachadh.
@@ -70,37 +74,41 @@ xpinstallDisabledMessage2=Chan eil stàladh bathair-bhuig an comas an-dràsta. Briog air "Cuir an comas" agus feuch ris a-rithist.
 xpinstallDisabledButton=Cuir an comas
 
 # Site Identity
 identity.identified.verifier=Dearbhaichte le: %S
 identity.identified.verified_by_you=Chuir thu eisgeachd tèarainteachd ris airson na làraich seo
 identity.identified.state_and_country=%S, %S
 identity.identified.title_with_country=%S (%S)
 identity.encrypted2=Air a dhubh-cheileadh
-identity.unencrypted2=Gun dubh-cheileadh
-identity.unknown.tooltip=Chan eil an làrach seo a' nochdadh fiosrachadh dearbh-aithne.
 identity.ownerUnknown2=(neo aithnichte)
 
 # Geolocation UI
 geolocation.allow=Co-roinn
 geolocation.dontAllow=Na co-roinn
 geolocation.alwaysAllow=Nochd an-còmhnaidh
 geolocation.neverAllow=Na nochd idir
 geolocation.wantsTo=Tha %S ag iarraidh fios mun àite far a bheil thu.
 # LOCALIZATION NOTE (geolocation.shareLocation): Label that will be used in
 # site settings dialog.
 geolocation.shareLocation=Nochd d' àite
+# LOCALIZATION NOTE (geolocation.dontAskAgain): This label appears next to a
+# checkbox to indicate whether or not the user wants to make a permanent decision.
+geolocation.dontAskAgain=Na faighnich dhìom a-rithist airson na làraich seo
 
 # Desktop notification UI
 desktopNotification.allow=Ceadaich
 desktopNotification.dontAllow=Na ceadaich
 desktopNotification.wantsTo=Tha %S airson brathan a chleachdadh.
 # LOCALIZATION NOTE (desktopNotification.useNotifications): Label that will be
 # used in site settings dialog.
 desktopNotification.useNotifications=Cleachd brathan
+# LOCALIZATION NOTE (desktopNotification.dontAskAgain): This label appears next to a
+# checkbox to indicate whether or not the user wants to make a permanent decision.
+desktopNotification.dontAskAgain=Na faighnich dhìom a-rithist airson na làraich seo
 
 # New Tab Popup
 # LOCALIZATION NOTE (newtabpopup): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 number of tabs
 newtabpopup.opened=Chaidh taba ùr fhosgladh; Chaidh #1 thaba ùr fhosgladh; Chaidh #1 tabaichean ùra fhosgladh
 
 # Error Console
@@ -222,16 +230,17 @@ timer.start=%S: tìmear air a thòiseachadh
 
 # LOCALIZATION NOTE (timer.end):
 # This string is used to display the result of the console.timeEnd() call.
 # %1$S=name of timer, %2$S=number of milliseconds
 timer.end=%1$S: %2$Sms
 
 # Webapps
 webapps.installTitle=Stàlaich an aplacaid
+webapps.alertSuccess=Chaidh a stàladh
 
 # Click to play plugins
 clickToPlayPlugins.message1=Tha susbaint plugain ann an%S. Am bu mhath leat a chluich?
 clickToPlayPlugins.yes=Bu mhath
 clickToPlayPlugins.no=Cha bu mhath
 # LOCALIZATION NOTE (clickToPlayPlugins.dontAskAgain): This label appears next to a
 # checkbox to indicate whether or not the user wants to make a permanent decision.
 clickToPlayPlugins.dontAskAgain=Na faighnich dhìom a-rithist airson na làraich seo
@@ -241,8 +250,17 @@ clickToPlayPlugins.playPlugins=Cluich na
 
 # Site settings dialog
 # LOCALIZATION NOTE (siteSettings.labelToValue): This string will be used to
 # dislay a list of current permissions settings for a site.
 # Example: "Store Offline Data: Allow"
 siteSettings.labelToValue=%S: %S
 
 masterPassword.incorrect=Facal-faire cearr
+
+# Debugger
+# LOCALIZATION NOTE (remoteIncomingPromptTitle): The title displayed on the
+# dialog that prompts the user to allow the incoming connection.
+remoteIncomingPromptTitle=Ceangal a' tighinn a-steach
+# LOCALIZATION NOTE (remoteIncomingPromptMessage): The message displayed on the
+# dialog that prompts the user to allow the incoming connection.
+remoteIncomingPromptMessage=Fhuair sinn iarrtas a dh'iarr cead airson dì-bhugachadh cèin. B' urrainn do chliant cèin làn-smachd fhaighinn air a' bhrabhsair agad. A bheil thu airson seo a cheadachadh?
+remoteIncomingPromptDisable=Cuir à comas
--- a/mobile/android/chrome/checkbox.dtd
+++ b/mobile/android/chrome/checkbox.dtd
@@ -1,2 +1,6 @@
+<!-- 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 checkbox.yes.label    "Bu toigh l'">
 <!ENTITY checkbox.no.label     "Cha bu toigh l'">
--- a/mobile/android/chrome/config.dtd
+++ b/mobile/android/chrome/config.dtd
@@ -1,3 +1,7 @@
+<!-- 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 search.placeholder2    "Roghainnean luirg">
 <!ENTITY clear.altText          "Falamhaich">
 <!ENTITY newpref.label2         "Cuir roghainn ùr ris">
--- a/mobile/android/chrome/config.properties
+++ b/mobile/android/chrome/config.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 addPref.title=Cuir ris
 addPref.selectType=Tagh an seòrsa:
 addPref.type.string=Sreang
 addPref.type.integer=Àireamh shlàn
 addPref.type.boolean=Booleach
 addPref.enterName=Cuir a-steach ainm:
 
 togglePref.label=Toglaich
--- a/mobile/android/chrome/feedback.dtd
+++ b/mobile/android/chrome/feedback.dtd
@@ -1,8 +1,12 @@
+<!-- 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 feedbackHeader2.label          "Innealan gus beachdan a thoirt">
 
 <!ENTITY feedback.communicate.title     "Bruidhinn rinn!">
 <!ENTITY feedback.feedback.title        "Dè do bheachd?">
 <!ENTITY feedback.feedback.good         "Math">
 <!ENTITY feedback.feedback.bad          "Dona">
 
 <!ENTITY feedback.tools.title           "Innealan">
--- a/mobile/android/chrome/localepicker.properties
+++ b/mobile/android/chrome/localepicker.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 title=Tagh cànan
 continueIn=Lean ort ann an %S
 
 # LOCALIZATION NOTE (name): The localized name of this locale.
 # Do not just translate the word 'English'
 name=Gàidhlig
 choose=Tagh cànan eile
 chooseLanguage=Tagh cànan
--- a/mobile/android/chrome/notification.dtd
+++ b/mobile/android/chrome/notification.dtd
@@ -1,8 +1,12 @@
+<!-- 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 (geolocation.learnMore): Use the
      unicode ellipsis char, \u2026,
      or use "..." unless \u2026 doesn't suit traditions in your
      locale.
 -->
 
+
 <!ENTITY geolocation.learnMore         "Tuilleadh eòlais…">
--- a/mobile/android/chrome/phishing.dtd
+++ b/mobile/android/chrome/phishing.dtd
@@ -1,8 +1,12 @@
+<!-- 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 safeb.palm.warning.title "Coltas fallsaidheachd-lìn">
 
 <!ENTITY safeb.palm.message.p1 "Chaidh aithris gur e fallsaidheachd-lìn a tha san duilleag seo gus fiosrachadh pearsanta no ionmhasail fhaighinn o chleachdaichean tro mhealladh. Dh'fhaodadh goid do dhearbh-aithne no foill eile èirigh dhut ma bheir thu seachad fiosrachadh pearsanta sam bith air an duilleag seo. &#160;">
 <!ENTITY safeb.palm.message.p1.linkText "Barrachd &#187;">
 <!ENTITY safeb.palm.p1.linkStatusText "Barrachd &#133;">
 
 <!ENTITY safeb.palm.message.p2.start "Thèid an seòrsa seo de dh'fhallsaidheachd-lìn a chleachdadh ann an cam-ghnothach air a bheil &quot;fiasgach&quot; far a bheil duilleagan-lìn is puist-dhealain a' gabhail orra gu bheil iad nan tùsan earbsach. Gheibh thu barrachd fiosrachaidh ">
 <!ENTITY safeb.palm.message.p2.linkText "mar a dhìonas &brandShortName; thu">
--- a/mobile/android/chrome/prompt.dtd
+++ b/mobile/android/chrome/prompt.dtd
@@ -1,2 +1,6 @@
+<!-- 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 ok.label      "Ceart ma-tha">
 <!ENTITY cancel.label  "Sguir dheth">
--- a/mobile/android/chrome/sync.dtd
+++ b/mobile/android/chrome/sync.dtd
@@ -1,8 +1,12 @@
+<!-- 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 sync.title                 "Co-shioncronachadh">
 <!ENTITY sync.notconnected          "Chan eil ceangal ann">
 <!ENTITY sync.connect               "Ceangail">
 <!ENTITY sync.connected             "Ceangailte ris">
 <!ENTITY sync.details               "Mion-fhiosrachadh">
 <!ENTITY sync.deviceName            "An t-inneal seo">
 <!ENTITY sync.disconnect            "Dì-cheangail">
 <!ENTITY sync.syncNow               "Co-shioncronaich an-dràsta">
--- a/mobile/android/chrome/sync.properties
+++ b/mobile/android/chrome/sync.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 # Mobile Sync
 
 # %S is the date and time at which the last sync successfully completed
 lastSync2.label=An sioncronachadh mu dheireadh: %S
 lastSyncInProgress2.label=An sioncronachadh mu dheireadh: 'ga dhèanamh…
 
 # %S is the username logged in
 account.label=Cunntas: %S
--- a/mobile/chrome/region.properties
+++ b/mobile/chrome/region.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 # Default search engine
 browser.search.defaultenginename=Google
 
 # Search engine order (order displayed in the search bar dropdown)s
 browser.search.order.1=Google
 
 # This is the default set of web based feed handlers shown in the reader
 # selection UI
--- a/mobile/overrides/appstrings.properties
+++ b/mobile/overrides/appstrings.properties
@@ -1,43 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# 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/.
 
 malformedURI=Chan e URL dligheach a tha ann is cha ghabh a luchdadh.
 fileNotFound=Chan urrainn do Firefox am faidhle a lorg aig %S.
 dnsNotFound=Chan urrainn do Firefox am frithealaiche a lorg aig %S.
 protocolNotFound=Chan eil fios aig Firefox mar a dh'fhosglas e an seòladh seo a chionn 's nach eil am pròtocal (%S) co-cheangailte ri prògram sam bith.
 connectionFailure=Chan urrainn do Firefox ceangal ris an fhrithealaiche aig %S.
 netInterrupt=Bhris rudeigin a-steach air a' cheangal ri %S fhad 's a bha an duilleag 'ga luchdadh.
 netTimeout=Tha am frithealaiche aig %S ro fhada a' freagairt.
--- a/mobile/overrides/netError.dtd
+++ b/mobile/overrides/netError.dtd
@@ -1,8 +1,12 @@
+<!-- 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 % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 %brandDTD;
 
 <!ENTITY loadError.label "Duilgheadas le luchdadh na duilleige">
 <!ENTITY retry.label "Feuch ris a-rithist">
 <!-- Specific error messages -->
 
 
--- a/mobile/overrides/passwordmgr.properties
+++ b/mobile/overrides/passwordmgr.properties
@@ -1,45 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla Password Manager.
-#
-# The Initial Developer of the Original Code is
-# Brian Ryner.
-# Portions created by the Initial Developer are Copyright (C) 2003
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#  Brian Ryner <bryner@brianryner.com>
-#  Ehsan Akhgari <ehsan.akhgari@gmail.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# 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/.
 
 rememberValue = Cleachd manaidsear nam faclan-faire gus an luach seo a chumail ann an cuimhne.
 rememberPassword = Cleachd manaidsear nam faclan-faire gus am facal-faire seo a chumail ann an cuimhne.
 savePasswordTitle = Dearbhaich
 # 1st string is product name, 2nd is the username for the login, 3rd is the
 #   login's hostname. Note that long usernames may be truncated.
 saveLoginText = A bheil thu ag iarraidh gun cum %1$S am facal-faire airson "%2$S" air %3$S an cuimhne?
 # 1st string is product name, 2nd is the login's hostname
--- a/mobile/xul/chrome/aboutCertError.dtd
+++ b/mobile/xul/chrome/aboutCertError.dtd
@@ -1,8 +1,12 @@
+<!-- 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 % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
   %brandDTD;
 <!-- These strings are used by Firefox's custom about:certerror page,
 a replacement for the standard security certificate errors produced
 by NSS/PSM via netError.xhtml. -->
 
 
 <!ENTITY certerror.pagetitle  "Ceangal gun earbsa">
--- a/mobile/xul/chrome/aboutHome.dtd
+++ b/mobile/xul/chrome/aboutHome.dtd
@@ -1,8 +1,12 @@
+<!-- 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 aboutHome.header                       "<span id='header-suffix'>A' tòiseachadh le</span><span>&brandShortName; </span>">
 <!ENTITY aboutHome.recentTabs                   "Na tabaichean a bha agad turas mu dheireadh">
 <!ENTITY aboutHome.remoteTabs                   "Tabaichean o na coimpiutairean eile agad">
 <!ENTITY aboutHome.recommendedAddons2           "Tuilleadain airson &brandShortName; agad">
 <!ENTITY aboutHome.giveFeedback                 "Dè do bheachd?">
 <!ENTITY aboutHome.getHelp                      "Faigh cobhair">
 <!ENTITY aboutHome.footerWidth                  "20em">
 <!ENTITY aboutHome.openAllTabs                  "Fosgail gach aon dhiubh ann an taba">
--- a/mobile/xul/chrome/browser.dtd
+++ b/mobile/xul/chrome/browser.dtd
@@ -1,8 +1,12 @@
+<!-- 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 urlbar.emptytext      "Dèan lorg no cuir a-steach seòladh">
 
 <!ENTITY back.label            "Air ais">
 <!ENTITY forward.label         "Air adhart">
 <!ENTITY reload.label          "Ath-luchdaich">
 <!ENTITY stop.label            "Sguir dheth">
 <!ENTITY go.label              "Rach ann">
 <!ENTITY star.label            "Rionnag">
--- a/mobile/xul/chrome/browser.properties
+++ b/mobile/xul/chrome/browser.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 # Add-on Manager
 addonsLocalNone.label=Chan eil tuilleadan sam bith air a stàladh
 addonsSearchStart.label=A' lorg tuilleadain…
 addonsSearchStart.button=Sguir dheth
 addonsSearchNone.search=Cha deach maids a lorg
 addonsSearchNone.recommended=Chan eil tuilleadan molta ann
 addonsSearchNone.button=Feuch ris a-rithist
 addonsSearchFail.label=Cha b' urrainn do %S na tuilleadain fhaighinn
--- a/mobile/xul/chrome/checkbox.dtd
+++ b/mobile/xul/chrome/checkbox.dtd
@@ -1,2 +1,6 @@
+<!-- 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 checkbox.yes.label    "Bu toigh l'">
 <!ENTITY checkbox.no.label     "Cha bu toigh l'">
--- a/mobile/xul/chrome/config.dtd
+++ b/mobile/xul/chrome/config.dtd
@@ -1,8 +1,12 @@
+<!-- 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 empty.label            "Lorg">
 <!ENTITY newpref.label          "Cuir roghainn ùr ris">
 <!ENTITY addpref.name           "Ainm">
 <!ENTITY addpref.value          "Luach">
 
 <!ENTITY cancel.label           "Sguir dheth">
 <!ENTITY reset.label            "Ath-shuidhich">
 <!ENTITY done.label             "Dèanta">
--- a/mobile/xul/chrome/feedback.dtd
+++ b/mobile/xul/chrome/feedback.dtd
@@ -1,8 +1,12 @@
+<!-- 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 feedbackHeader2.label          "Innealan gus beachdan a thoirt">
 
 <!ENTITY feedback.communicate.title     "Bruidhinn rinn!">
 <!ENTITY feedback.feedback.title        "Dè do bheachd?">
 <!ENTITY feedback.feedback.good         "Math">
 <!ENTITY feedback.feedback.bad          "Dona">
 
 <!ENTITY feedback.tools.title           "Innealan">
--- a/mobile/xul/chrome/localepicker.properties
+++ b/mobile/xul/chrome/localepicker.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 title=Tagh cànan
 continueIn=Lean ort ann an %S
 
 # LOCALIZATION NOTE (name): The localized name of this locale.
 # Do not just translate the word 'English'
 name=Gàidhlig
 choose=Tagh cànan eile
 chooseLanguage=Tagh cànan
--- a/mobile/xul/chrome/notification.dtd
+++ b/mobile/xul/chrome/notification.dtd
@@ -1,8 +1,12 @@
+<!-- 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 (geolocation.learnMore): Use the
      unicode ellipsis char, \u2026,
      or use "..." unless \u2026 doesn't suit traditions in your
      locale.
 -->
 
+
 <!ENTITY geolocation.learnMore         "Tuilleadh eòlais…">
--- a/mobile/xul/chrome/phishing.dtd
+++ b/mobile/xul/chrome/phishing.dtd
@@ -1,8 +1,12 @@
+<!-- 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 safeb.palm.warning.title "Coltas fallsaidheachd-lìn">
 
 <!ENTITY safeb.palm.message.p1 "Chaidh aithris gur e fallsaidheachd-lìn a tha san duilleag seo gus fiosrachadh pearsanta no ionmhasail fhaighinn o chleachdaichean tro mhealladh. Dh'fhaodadh goid do dhearbh-aithne no foill eile èirigh dhut ma bheir thu seachad fiosrachadh pearsanta sam bith air an duilleag seo. &#160;">
 <!ENTITY safeb.palm.message.p1.linkText "Barrachd &#187;">
 <!ENTITY safeb.palm.p1.linkStatusText "Barrachd &#133;">
 
 <!ENTITY safeb.palm.message.p2.start "Thèid an seòrsa seo de dh'fhallsaidheachd-lìn a chleachdadh ann an cam-ghnothach air a bheil &quot;fiasgach&quot; far a bheil duilleagan-lìn is puist-dhealain a' gabhail orra gu bheil iad nan tùsan earbsach. Gheibh thu barrachd fiosrachaidh ">
 <!ENTITY safeb.palm.message.p2.linkText "mar a dhìonas &brandShortName; thu">
--- a/mobile/xul/chrome/preferences.dtd
+++ b/mobile/xul/chrome/preferences.dtd
@@ -1,8 +1,12 @@
+<!-- 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 prefsHeader.label                         "Roghainnean">
 <!ENTITY about.title                               "Mu &brandShortName;">
 <!ENTITY about.button                              "Rach dhan duilleag">
 <!ENTITY content.title                             "Susbaint">
 <!ENTITY reflowZoom.title                          "Ath-fhòrmataich an teacsa an cois sùmaidh">
 <!ENTITY showImages.title                          "Seall dealbhan">
 <!ENTITY enableJavaScript.title                    "Cuir JavaScript an comas">
 <!ENTITY privacy.title                             "Prìobhaideachd ┐ Tèarainteachd">
--- a/mobile/xul/chrome/prompt.dtd
+++ b/mobile/xul/chrome/prompt.dtd
@@ -1,2 +1,6 @@
+<!-- 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 ok.label      "Ceart ma-tha">
 <!ENTITY cancel.label  "Sguir dheth">
--- a/mobile/xul/chrome/sync.dtd
+++ b/mobile/xul/chrome/sync.dtd
@@ -1,8 +1,12 @@
+<!-- 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 sync.title                 "Co-shioncronachadh">
 <!ENTITY sync.notconnected          "Chan eil ceangal ann">
 <!ENTITY sync.connect               "Ceangail">
 <!ENTITY sync.connected             "Ceangailte ris">
 <!ENTITY sync.details               "Mion-fhiosrachadh">
 <!ENTITY sync.deviceName            "An t-inneal seo">
 <!ENTITY sync.disconnect            "Dì-cheangail">
 <!ENTITY sync.syncNow               "Co-shioncronaich an-dràsta">
--- a/mobile/xul/chrome/sync.properties
+++ b/mobile/xul/chrome/sync.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 # Mobile Sync
 
 # %S is the date and time at which the last sync successfully completed
 lastSync2.label=An sioncronachadh mu dheireadh: %S
 lastSyncInProgress2.label=An sioncronachadh mu dheireadh: 'ga dhèanamh…
 
 # %S is the username logged in
 account.label=Cunntas: %S
--- a/mobile/xul/chrome/webapps.dtd
+++ b/mobile/xul/chrome/webapps.dtd
@@ -1,7 +1,11 @@
+<!-- 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 webapps.title.placeholder "Cuir tiotal a-steach">
 <!ENTITY webapps.permissions "Ceadaich inntrigeadh dha:">
 <!ENTITY webapps.perm.geolocation "Brabhsadh a mhothaicheas dha d' àite">
 <!ENTITY webapps.perm.offline "Stòradh dàta far loidhne">
 <!ENTITY webapps.perm.notifications "Brathan air an deasg">
 <!ENTITY webapps.perm.requestedHint "(air iarraidh)">
 <!ENTITY webapps.add-homescreen "Cuir ris an sgrìn mhòr">
--- a/mobile/xul/crashreporter/crashreporter-override.ini
+++ b/mobile/xul/crashreporter/crashreporter-override.ini
@@ -1,8 +1,11 @@
+; 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/.
 ; This file is in the UTF-8 encoding
 [Strings]
 ; LOCALIZATION NOTE (CrashReporterProductErrorText2): %s is replaced with another string containing detailed information.
 CrashReporterProductErrorText2=Thuislich Firefox. Gu mì-fhortanach, chan urrainn do dh'aithrisiche nan tuislidhean aithisg tuislidh a chur a-null.\n\nMion-fhiosrachadh: %s
 CrashReporterDescriptionText2=Thuislich Firefox. Chì thu na tabaichean agad air duilleag tòiseachaidh Firefox nuair a thòisicheas tu e a-rithist.\n\nNach cuidich thu sinn a' càradh an duilgheadais?
 ; LOCALIZATION NOTE (CheckSendReport): The %s is replaced with the vendor name.
 CheckSendReport=Cuir aithisg tuislidh gu %s
 CheckIncludeURL=Cuir seòladh na duilleige ris cuideachd
--- a/mobile/xul/updater/updater.ini
+++ b/mobile/xul/updater/updater.ini
@@ -1,4 +1,7 @@
+; 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/.
 ; This file is in the UTF-8 encoding
 [Strings]
 TitleText=Ùrachadh %MOZ_APP_DISPLAYNAME%
 InfoText=Tha %MOZ_APP_DISPLAYNAME% a' stàladh nan ùrachaidhean 's tòisichidh e sa bhad…
--- a/netwerk/necko.properties
+++ b/netwerk/necko.properties
@@ -1,43 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# 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 
 
 3=A' lorg %1$S…
--- a/security/manager/chrome/pipnss/nsserrors.properties
+++ b/security/manager/chrome/pipnss/nsserrors.properties
@@ -1,19 +1,26 @@
+# 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/.
+
 SSL_ERROR_EXPORT_ONLY_SERVER=Cha ghabh conaltradh tèarainte a dhèanamh.  Chan eil an seise a' cur taic ri sàr-dhubh-cheileadh.
 SSL_ERROR_US_ONLY_SERVER=Cha ghabh conaltradh tèarainte a dhèanamh.  Feumaidh an seise sàr-dhubh-cheileadh nach eil taic ann ris.
 SSL_ERROR_NO_CYPHER_OVERLAP=Cha ghabh conaltradh tèarainte a dhèanamh: chan eil algairim(ean) an cumantas ann.
 SSL_ERROR_NO_CERTIFICATE=Cha ghabh an ceadachas no an iuchair air a bheil feum airson dearbhadh a lorg.
 SSL_ERROR_BAD_CERTIFICATE=Cha ghabh conaltradh tèarainte a dhèanamh ris an t-seise: chaidh teisteanas an t-seise a dhiùltadh.
+SSL_ERROR_UNUSED_5=Còd mearachd SSL nach eil aithnichte.
 SSL_ERROR_BAD_CLIENT=Fhuair am frithealaiche droch dhàta on chliant.
 SSL_ERROR_BAD_SERVER=Fhuair am frithealaiche droch dhàta on fhrithealaiche.
 SSL_ERROR_UNSUPPORTED_CERTIFICATE_TYPE=Chan eil taic ann ris an t-seòrsa seo de theisteanas.
 SSL_ERROR_UNSUPPORTED_VERSION=Tha an seise a' cleachdadh tionndadh dhen phròtacal tèarainteachd nach eil taic ris.
+SSL_ERROR_UNUSED_10=Còd mearachd SSL nach eil aithnichte.
 SSL_ERROR_WRONG_CERTIFICATE=Dh'fhàillig dearbhadh a' chliant: chan eil an iuchair phrìobhaideach ann an stòr-dàta nan iuchraichean a' freagairt ris an iuchair phoblach ann an stòr-dàta nan teisteanasan.
 SSL_ERROR_BAD_CERT_DOMAIN=Cha ghabh conaltradh tèarainte a dhèanamh ris an t-seise: chan eil ainm na h-àrainne a' freagairt ri teisteanas an fhrithealaiche.
+SSL_ERROR_POST_WARNING=Còd mearachd SSL nach eil aithnichte.
 SSL_ERROR_SSL2_DISABLED=Tha an seise a' cur taic ri SSL tionndadh 2 a-mhàin, rud a tha air a chur à comas gu h-ionadail.
 SSL_ERROR_BAD_MAC_READ=Fhuair SSL clàr le còd dearbhadh teachdaireachd mì-cheart ann.
 SSL_ERROR_BAD_MAC_ALERT=Tha an seise SSL a' dèanamh aithris air còd dearbhadh teachdaireachd mì-cheart.
 SSL_ERROR_BAD_CERT_ALERT=Chan urrainn dhan t-seise SSL an teisteanas agad a dhearbhadh.
 SSL_ERROR_REVOKED_CERT_ALERT=Dhiùlt an seise SSL an teisteanas agad is e ag ràdh gun deach a chùl-ghairm.
 SSL_ERROR_EXPIRED_CERT_ALERT=Dhiùlt an seise SSL an teisteanas agad is e ag ràdh gun do dh'fhalbh an ùine air.
 SSL_ERROR_SSL_DISABLED=Cha ghabh ceangal a dhèanamh: tha SSL air a chur à comas.
 SSL_ERROR_FORTEZZA_PQG=Cha ghabh ceangal a dhèanamh: tha an seise SSL ann an àrainn FORTEZZA eile.
@@ -99,23 +106,27 @@ SSL_ERROR_INTERNAL_ERROR_ALERT=Tha an se
 SSL_ERROR_USER_CANCELED_ALERT=Sguir an cleachdaiche seise dhen chrathadh-làimhe.
 SSL_ERROR_NO_RENEGOTIATION_ALERT=Chan eil an seise a' toirt cead do dh'ath-cho-rèiteachadh nam paramadairean tèarainteachd SSL.
 SSL_ERROR_SERVER_CACHE_NOT_CONFIGURED=Cha deach tasgadan an fhrithealaichean SSL a rèiteachadh agus a chur à comas airson na socaide seo.
 SSL_ERROR_UNSUPPORTED_EXTENSION_ALERT=Chan eil an seise SSL a' cur taic ris an leudachan TLS Hello a chaidh iarraidh.
 SSL_ERROR_CERTIFICATE_UNOBTAINABLE_ALERT=Cha b' urrainn dhan t-seise SSL an teisteanas agad fhaighinn on URL a thug thu dha.
 SSL_ERROR_UNRECOGNIZED_NAME_ALERT=Chan eil teisteanas aig an t-seise SSL airson an ainm DNS a chaidh iarraidh.
 SSL_ERROR_BAD_CERT_STATUS_RESPONSE_ALERT=Cha b' urrainn dhan t-seise SSL freagairt OCSP fhaighinn airson an teisteanais aige.
 SSL_ERROR_BAD_CERT_HASH_VALUE_ALERT=Dh'aithris an seise SSL gun robh droch luach-hais aig an teisteanas.
-SSL_ERROR_RX_UNEXPECTED_NEW_SESSION_TICKET=Fhuair SSL teachdaireachd crathaidh-làimhe mu thiocaid seisein ùr ris nach robh dùil.                             
-SSL_ERROR_RX_MALFORMED_NEW_SESSION_TICKET=Fhuair SSL teachdaireachd crathaidh-làimhe mu thiocaid seisein ùr a bha air a dhroch chumadh.                                
-SSL_ERROR_DECOMPRESSION_FAILURE=Fhuair SSL clàr air a dhùmhlachadh nach b' urrainn dha dhì-dhùmhlachadh.                                        
-SSL_ERROR_RENEGOTIATION_NOT_ALLOWED=Chan eil ath-rèiteachadh ceadaichte air an t-socaid SSL seo.                                                    
+SSL_ERROR_RX_UNEXPECTED_NEW_SESSION_TICKET=Fhuair SSL teachdaireachd crathadh-làimhe New Session ris nach robh dùil.
+SSL_ERROR_RX_MALFORMED_NEW_SESSION_TICKET=Fhuair SSL teachdaireachd crathadh-làimhe New Session mhì-chumte.
+SSL_ERROR_DECOMPRESSION_FAILURE=Fhuair SSL reacord dùmhlaichte nach urrainn dhuinn dì-dhùmhlachadh.
+SSL_ERROR_RENEGOTIATION_NOT_ALLOWED=Chan eil co-rèiteachadh ceadaichte san t-socaid SSL seo.
 SSL_ERROR_UNSAFE_NEGOTIATION=Dh'fheuch an seise ri crathadh-làimhe seann nòsach a dhèanamh (a dh'fhaodadh a bhith so-leònte).
 SSL_ERROR_RX_UNEXPECTED_UNCOMPRESSED_RECORD=Fhuair SSL clàr neo-dhùmhlaichte ris nach robh dùil.
 SSL_ERROR_WEAK_SERVER_EPHEMERAL_DH_KEY=Fhuair SSL iuchair Diffie-Hellman lag is gearr-shaoghalach ann an teachdaireachd crathadh-làimhe Server Key Exchange.
+SSL_ERROR_NEXT_PROTOCOL_DATA_INVALID=Fhuair SSL dàta leudachadh NPN mì-dhligheach.
+SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_SSL2=Chan eil taic ri feart SSL airson ceanglaichean SSL 2.0.
+SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_SERVERS=Chan eil taic ri feart SSL airson fhrithealaichean.
+SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_CLIENTS=Chan eil taic ri feart SSL airson chliantan.
 SEC_ERROR_IO=Thachair mearachd I/O rè an ùghdarrachaidh thèarainteachd.
 SEC_ERROR_LIBRARY_FAILURE=fàillinn na leabhar-lainn thèarainteachd.
 SEC_ERROR_BAD_DATA=leabhar-lann tèarainteachd: fhuaradh droch dhàta.
 SEC_ERROR_OUTPUT_LEN=leabhar-lann tèarainteachd: mearachd le faid an às-chuir.
 SEC_ERROR_INPUT_LEN=thachair mearachd le faid an in-chuir ris an leabhar-lann tèarainteachd.
 SEC_ERROR_INVALID_ARGS=leabhar-lann tèarainteachd: argamaidean mì-dhligheach.
 SEC_ERROR_INVALID_ALGORITHM=leabhar-lann tèarainteachd: algairim mhì-dhligheach.
 SEC_ERROR_INVALID_AVA=leabhar-lann tèarainteachd: AVA mì-dhligheach.
@@ -272,14 +283,19 @@ SEC_ERROR_OCSP_BAD_SIGNATURE=Tha ainm mì-dhligheach ris an fhreagairt OCSP.
 SEC_ERROR_OUT_OF_SEARCH_LIMITS=Tha rannsachadh dearbhachadh an teisteanais taobh a-muigh raon an rannsachaidh
 SEC_ERROR_INVALID_POLICY_MAPPING=Tha anypolicy ann am mapadh a' phoileasaidh
 SEC_ERROR_POLICY_VALIDATION_FAILED=Tha slabhraidh nan teisteanas a' fàilligeadh an dearbhachaidh phoileasaidh
 SEC_ERROR_UNKNOWN_AIA_LOCATION_TYPE=Tha àite de sheòrsa neo-aithnichte ann an leudachan AIA an teisteanais
 SEC_ERROR_BAD_HTTP_RESPONSE=Thill am frithealaiche droch fhreagairt HTTP
 SEC_ERROR_BAD_LDAP_RESPONSE=Thill am frithealaiche droch fhreagairt LDAP
 SEC_ERROR_FAILED_TO_ENCODE_DATA=Dh'fhàillig còdachadh an dàta le còdaichear ASN1
 SEC_ERROR_BAD_INFO_ACCESS_LOCATION=Droch àite inntrigeadh fiosrachaidh ann an leudachan an teisteanais
-SEC_ERROR_LIBPKIX_INTERNAL=Thachair in-mhearachd Libpkix rè dearbhachadh an teisteanais.
+SEC_ERROR_LIBPKIX_INTERNAL=Thachair mearachd inntearnail Libpkix rè dearbhachadh an teisteanais.
 SEC_ERROR_PKCS11_GENERAL_ERROR=Thill mòideal PKCS #11 CKR_GENERAL_ERROR agus tha seo a' cur 'nar sùilean gun do thachair mearachd nach gabh aiseag.
 SEC_ERROR_PKCS11_FUNCTION_FAILED=Thill mòideal PKCS #11 CKR_FUNCTION_FAILED agus tha sin a' cur 'nar sùilean nach b' urrainn dha an gnìomh a chaidh iarraidh a dhèanamh.  Faodaidh gun obraich e ma dh'fheuchas tu ris a-rithist.
 SEC_ERROR_PKCS11_DEVICE_ERROR=Thill mòideal PKCS #11 CKR_DEVICE_ERROR agus tha sin a' cur 'nar sùilean gun do dh'èirich duilgheadas ris an tòcan no ris an t-sliotan.
 SEC_ERROR_BAD_INFO_ACCESS_METHOD=Tha dòigh inntrigidh neo-aithnichte do dh'fhiosrachadh ann an leudachan an teisteanais.
 SEC_ERROR_CRL_IMPORT_FAILED=Thachair mearachd nuair a bhathar airson CRL ion-phortadh.
+SEC_ERROR_EXPIRED_PASSWORD=Dh'fhalbh an ùine air an fhacal-fhaire.
+SEC_ERROR_LOCKED_PASSWORD=Tha am facal-faire glaiste.
+SEC_ERROR_UNKNOWN_PKCS11_ERROR=Mearachd PKCS #11 neo-aithnichte.
+SEC_ERROR_BAD_CRL_DP_URL=URL mì-dhligheach no gun taic ann an ainm puing sgaoileadh CRL.
+SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED=Chaidh an teisteanas a shoidhneadh le algairim soidhnidh a tha à comas a chionn 's nach eil e tèarainte.
--- a/security/manager/chrome/pipnss/pipnss.properties
+++ b/security/manager/chrome/pipnss/pipnss.properties
@@ -1,48 +1,12 @@
 #
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Javier Delgadillo <javi@netscape.com>
-#   Brian Ryner <bryner@brianryner.com>
-#   Terry Hayes <thayes@netscape.com>
-#   John Gardiner Myers <jgmyers@speakeasy.net>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# 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/.
 
 SignedBy=Air a teisteanachaidh le %S
 CertPassPrompt=Cuir a-steach am prìomh fhacal-faire airson %S.
 # the following strings have special requirements:
 # they must fit in a 32 or 64 byte buffer after being translated
 # to UTF8.  Note to translator. It's not easy for you to figure
 # whether the escaped unicode string you produce will fit in 
 # the space allocated.
--- a/security/manager/chrome/pipnss/security.properties
+++ b/security/manager/chrome/pipnss/security.properties
@@ -1,45 +1,12 @@
 #
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Sean Cotter <cotter@netscape.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# 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/.
 
 Title=Rabhadh tèarainteachd
 MixedContentMessage=Dh'iarr thu duilleag dhubh-cheilte air a bheil dàta nach deach a dhubh-cheileadh. B' urrainn do threas pàrtaidh am fiosrachadh a chì thu no a chuireas tu a-steach air an duilleag seo a leughadh furasta gu leòr.
 LeaveSecureMessage=Tha thu an impis duilleag dhubh-cheilte fhàgail. B' urrainn do threas pàrtaidh am fiosrachadh a chuireas tu ann no a gheibh thu a leughadh furasta gu leòr.
 EnterSecureMessage=Dh'iarr thu duilleag dhubh-cheilte. Chuir an làrach-lìn e fhèin an aithne mar bu chòir agus cha b' urrainn do threas pàrtaidh am fiosrachadh a chì thu no a chuireas tu a-steach air an duilleag seo a leughadh gu furasta.
 WeakSecureMessage=Dh'iarr thu duilleag a' tha a' cleachdadh dubh-cheileadh de dh'ìre ìseal. Chuir an làrach-lìn e fhèin an aithne mar bu chòir ach b' urrainn do threas pàrtaidh am fiosrachadh a chì thu no a chuireas tu a-steach air an duilleag seo a leughadh. 
 PostToInsecureFromSecureMessage=Ged a tha an duilleag seo air a dhubh-cheileadh, thèid am fiosrachadh a chuir thu a-steach a chur a-null air ceangal gun dubh-cheileadh agus b' urrainn do threas pàrtaidh a leughadh furasta gu leòr.##A bheil thu cinnteach gu bheil thu ag iarraidh am fiosrachadh seo a chur a-null?##
 PostToInsecureFromInsecureMessage=Thèid am fiosrachadh a chuir thu a-steach a chur a-null air ceangal gun dubh-cheileadh agus b' urrainn do threas pàrtaidh a leughadh furasta gu leòr.##A bheil thu cinnteach gu bheil thu ag iarraidh am fiosrachadh seo a chur a-null?##
--- a/security/manager/chrome/pippki/certManager.dtd
+++ b/security/manager/chrome/pippki/certManager.dtd
@@ -1,44 +1,11 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Ian McGreer <mcgreer@netscape.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
+<!-- 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 certmgr.title                       "Manaidsear nan teisteanasan">
 
 <!ENTITY certmgr.tab.mine                     "Na teisteanasan agad">
 <!ENTITY certmgr.tab.others2                  "Daoine">
 <!ENTITY certmgr.tab.websites3                "Frithealaichean">
 <!ENTITY certmgr.tab.ca                       "Ùghdarrasan">
 <!ENTITY certmgr.tab.orphan2                  "Feadhainn eile">
--- a/security/manager/chrome/pippki/deviceManager.dtd
+++ b/security/manager/chrome/pippki/deviceManager.dtd
@@ -1,44 +1,11 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Ian McGreer <mcgreer@netscape.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
+<!-- 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 devmgr.title                           "Manaidsear nan innealan">
 
 <!ENTITY devmgr.devlist.label                   "Mòidealan is innealan tèarainteachd">
 <!ENTITY devmgr.details.title                   "Mion-fhiosrachadh">
 <!ENTITY devmgr.details.title2                  "Luach">
 <!ENTITY devmgr.status.label                    "Staid">
 <!ENTITY devmgr.version.label                   "Tionndadh">
--- a/security/manager/chrome/pippki/pippki.dtd
+++ b/security/manager/chrome/pippki/pippki.dtd
@@ -1,44 +1,11 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Terry Hayes <thayes@netscape.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
+<!-- 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/. -->
 <!-- Values for changepassword.xul -->
 
 <!ENTITY setPassword.title  "Atharraich am prìomh fhacal-faire">
 <!ENTITY setPassword.tokenName.label "Inneal tèarainteachd">
 <!ENTITY setPassword.oldPassword.label "Am facal-faire làithreach:">
 <!ENTITY setPassword.newPassword.label "Am facal-faire ùr:">
 <!ENTITY setPassword.reenterPassword.label "Am faca-faire ùr (a-rithist):">
 <!ENTITY setPassword.meter.label "Tomhas càileachd an fhacail-fhaire">
--- a/security/manager/chrome/pippki/pippki.properties
+++ b/security/manager/chrome/pippki/pippki.properties
@@ -1,44 +1,12 @@
 #
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# 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/.
 
 SignedBy=Air a teisteanachaidh le %S
 CertPassPrompt=Cuir a-steach facal-faire na tèarainteachd phearsanta airson inneal tèarainteachd nan iuchraichean prìobhaideach PSM.
 
 #These are for dialogs
 #Download Cert dialog
 newCAMessage1=A bheil thu airson earbsa a chur ann an "%S" a chum na leanas?
 unnamedCA=Ùghdarras teisteanachaidh (gun ainm)
--- a/security/manager/chrome/pippki/validation.dtd
+++ b/security/manager/chrome/pippki/validation.dtd
@@ -1,44 +1,11 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   David P. Drinan (ddrinan@netscape.com)
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
+<!-- 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  validation.crlmanager.label             "Stiùirich na LTC">
 <!ENTITY  validation.crlmanager.description       "Tha liostaichean nan teisteanasan a chaidh a chùl-ghairm (LTC) seo 'gan stòradh ann an stòr-dàta nan teisteanasan agad:">
 <!ENTITY  validation.crlname.label                "Ainm">
 <!ENTITY  validation.crllastupdate.label          "An t-ùrachadh mu dheireadh">
 <!ENTITY  validation.crlnextupdate.label          "An t-ath-ùrachadh">
 <!ENTITY  validation.crlautoupdateenabled.label   "Ùrachadh leis fhèin">
 <!ENTITY  validation.crlautoupdatestatus.label    "Inbhe an ùrachaidh leis fhèin">
--- a/services/sync/errors.properties
+++ b/services/sync/errors.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 error.login.reason.network      = Dh'fhàillig an ceangal ris an fhrithealaiche
 error.login.reason.recoverykey  = Iuchair aisig chearr
 error.login.reason.account      = Tha ainm a' chunntais no am facal-faire cearr
 error.login.reason.no_username  = Tha ainm cunntais a dhìth
 error.login.reason.no_password2 = Tha facal-faire a dhìth
 error.login.reason.no_recoverykey= Chan eil iuchair aisig ann a ghabhas a chleachdadh
 error.login.reason.server       = Tha am frithealaiche air a rèiteachadh gu cearr
 
--- a/services/sync/sync.properties
+++ b/services/sync/sync.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 # %1: the user name (Ed), %2: the app name (Firefox), %3: the operating system (Android)
 client.name2 = %2$S aig %1$S air %3$S
 
 # %S is the date and time at which the last sync successfully completed
 lastSync2.label = An sioncronachadh mu dheireadh: %S
 
 mobile.label = Comharran-lìn fòn-làimhe
 
--- a/toolkit/chrome/alerts/notificationNames.properties
+++ b/toolkit/chrome/alerts/notificationNames.properties
@@ -1,1 +1,5 @@
+# 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/.
+
 general=Brath coitcheann
--- a/toolkit/chrome/autoconfig/autoconfig.properties
+++ b/toolkit/chrome/autoconfig/autoconfig.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 readConfigTitle = Mearachd rèiteachaidh
 readConfigMsg = Dh'fhàillig leughadh an fhaidhle rèiteachaidh. Leig fios gu rianaire an t-siostaim agad.
 
 autoConfigTitle = Caismeachd AutoConfig
 autoConfigMsg = Dh'fhàillig Netscape.cfg/AutoConfig. Leig fios gu rianaire an t-siostaim agad. \n Mearachd: Dh'fhàillig %S:
 
 emailPromptTitle = Seòladh puist-dhealain
 emailPromptMsg = Cuir a-steach seòladh a' phuist-dhealain agad
--- a/toolkit/chrome/cookie/cookieAcceptDialog.dtd
+++ b/toolkit/chrome/cookie/cookieAcceptDialog.dtd
@@ -1,8 +1,12 @@
+<!-- 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     props.name.label               "Ainm:">
 <!ENTITY     props.value.label              "Susbaint:">
 <!ENTITY     props.domain.label             "Òstair:">
 <!ENTITY     props.path.label               "Slighe:">
 <!ENTITY     props.secure.label             "Seòl airson:">
 <!ENTITY     props.expires.label            "Falbhaidh an ùine air:">
 
 <!ENTITY     button.allow.label             "Ceadaich">
--- a/toolkit/chrome/cookie/cookieAcceptDialog.properties
+++ b/toolkit/chrome/cookie/cookieAcceptDialog.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 hostColon=Òstair:
 domainColon=Àrainn:
 forSecureOnly=Ceanglaichean air an dubh-cheileadh a-mhàin
 forAnyConnection=Gach seòrsa de cheangal
 expireAtEndOfSession=Aig deireadh an t-seisein
 
 showDetails=Seall am mion-fhiosrachadh
 hideDetails=Cuir mion-fhiosrachadh am falach
--- a/toolkit/chrome/global-platform/mac/intl.properties
+++ b/toolkit/chrome/global-platform/mac/intl.properties
@@ -1,5 +1,9 @@
+# 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/.
+
 # moved from navigator/locale/navigator.properties
 intl.charset.default=ISO-8859-1
 # LOCALIZATION NOTE (intl.ellipsis): Use the unicode ellipsis char, \u2026,
 # or use "..." if \u2026 doesn't suit traditions in your locale.
 intl.ellipsis=…
--- a/toolkit/chrome/global-platform/mac/platformKeys.properties
+++ b/toolkit/chrome/global-platform/mac/platformKeys.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 #mac
 #this file defines the on screen display names for the various modifier keys
 #these are used in XP menus to show keyboard shortcuts
 
 #the shift key - open up arrow symbol (ctrl-e)
 VK_SHIFT=⇧
 
 #the command key - clover leaf symbol (ctrl-q)
--- a/toolkit/chrome/global-platform/unix/intl.properties
+++ b/toolkit/chrome/global-platform/unix/intl.properties
@@ -1,5 +1,9 @@
+# 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/.
+
 # moved from navigator/locale/navigator.properties
 intl.charset.default=ISO-8859-1
 # LOCALIZATION NOTE (intl.ellipsis): Use the unicode ellipsis char, \u2026,
 # or use "..." if \u2026 doesn't suit traditions in your locale.
 intl.ellipsis=…
--- a/toolkit/chrome/global-platform/unix/platformKeys.properties
+++ b/toolkit/chrome/global-platform/unix/platformKeys.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 #default
 #this file defines the on screen display names for the various modifier keys
 #these are used in XP menus to show keyboard shortcuts
 
 #the shift key
 VK_SHIFT=Shift
 
 #the command key
--- a/toolkit/chrome/global-platform/win/intl.properties
+++ b/toolkit/chrome/global-platform/win/intl.properties
@@ -1,5 +1,9 @@
+# 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/.
+
 # moved from navigator/locale/navigator.properties
 intl.charset.default=ISO-8859-1
 # LOCALIZATION NOTE (intl.ellipsis): Use the unicode ellipsis char, \u2026,
 # or use "..." if \u2026 doesn't suit traditions in your locale.
 intl.ellipsis=…
--- a/toolkit/chrome/global-platform/win/platformKeys.properties
+++ b/toolkit/chrome/global-platform/win/platformKeys.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 #default
 #this file defines the on screen display names for the various modifier keys
 #these are used in XP menus to show keyboard shortcuts
 
 #the shift key
 VK_SHIFT=Shift
 
 #the command key
--- a/toolkit/chrome/global-region/region.properties
+++ b/toolkit/chrome/global-region/region.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 #
 #   Localizable URLs
 #
 pluginStartupMessage=A' tòiseachadh am plugan airson an t-seòrsa seo
 
 # plug-ins URLs
 more_plugins_label=Sgioba Ionadaileadh Mozilla na Gàidhlig
 more_plugins_url=https://pfs.mozilla.org/plugins/
--- a/toolkit/chrome/global/aboutAbout.dtd
+++ b/toolkit/chrome/global/aboutAbout.dtd
@@ -1,3 +1,7 @@
+<!-- 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 aboutAbout.title  "Mu dhèidhinn mu dhèidhinn">
 <!ENTITY aboutAbout.note   "Seo liosta nan duilleagan &quot;mu dhèidhinn&quot; dhut.<br/> 
 Faodaidh gu bheil coltas toinnte air cuid dhiubh. Tha cuid dhiubh a chum breithneachadh teicnigeach a-mhàin.<br/> Agus tha cuid dhiubh a dhìth a chionns gu bheil feum aca air sreangan iarrtas.">
--- a/toolkit/chrome/global/aboutRights.properties
+++ b/toolkit/chrome/global/aboutRights.properties
@@ -1,3 +1,7 @@
+# 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/.
+
 buttonLabel = Bi eòlach air do chòraichean…
 buttonAccessKey = K
 notifyRightsText = 'S e bathar-bog saor 's le còd saor leis a' Mozilla Foundation neo-phrothaideach a tha ann an %S.
--- a/toolkit/chrome/global/aboutSupport.dtd
+++ b/toolkit/chrome/global/aboutSupport.dtd
@@ -1,8 +1,12 @@
+<!-- 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 aboutSupport.pageTitle "Taic le duilgheadasan">
 <!-- LOCALIZATION NOTE (aboutSupport.pageSubtitle): don't change the 'supportLink' id. -->
 
 <!ENTITY aboutSupport.pageSubtitle "  Tha fiosrachadh teicnigeach air an duilleag seo a dh'fhaodadh a bhith 
 feumail dhut ann am fuasgladh dhuilgheadasan. Ma tha ceist neo-theicnigeach 
 agad mu &brandShortName;, cuir sùil air an <a id='supportLink'>làrach-taice</a> againn.">
 
 <!ENTITY aboutSupport.extensionsTitle "Leudachain">
--- a/toolkit/chrome/global/aboutSupport.properties
+++ b/toolkit/chrome/global/aboutSupport.properties
@@ -1,8 +1,12 @@
+# 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 In the following strings, "Direct2D", "DirectWrite" and "ClearType" 
 # are proper nouns and should not be translated. Feel free to leave english strings if 
 # there are no good translations, these are only used in about:support
 
 # LOCALIZATION NOTE: This can be localized with a more generic term, like
 # "Graphics-accelerated Windows". It describes a number of windows, e.g.:
 # "GPU Accelerated Windows: 2/2 (Direct3D 9)"
 # "GPU Accelerated Windows: 0/2"
--- a/toolkit/chrome/global/actions.dtd
+++ b/toolkit/chrome/global/actions.dtd
@@ -1,1 +1,5 @@
+<!-- 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 action.switchToTab.label "Atharraich gu taba">
--- a/toolkit/chrome/global/appPicker.dtd
+++ b/toolkit/chrome/global/appPicker.dtd
@@ -1,3 +1,7 @@
+<!-- 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 NoAppFound.label      "Cha deach prògram a lorg airson a leithid seo de dh'fhaidhle.">
 <!ENTITY BrowseButton.label    "Brabhsaich…">
 <!ENTITY SendMsg.label         "Cuir an rud seo gu:">
--- a/toolkit/chrome/global/browser.properties
+++ b/toolkit/chrome/global/browser.properties
@@ -1,4 +1,8 @@
+# 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/.
+
 browsewithcaret.checkMsg=Na seall am bogsa conaltraidh seo dhomh a-rithist.
 browsewithcaret.checkWindowTitle=Brabhsadh le cùrsair
 browsewithcaret.checkLabel=Cuiridh tu brabhsadh le cùrsair air is dheth le F7. Cuiridh am feart seo cùrsair gluasadach ann an duilleag-lìn agus 's urrainn dhut teacs a thaghadh leis a' mheur-chlàr leis. A bheil thu airson brabhsadh le cùrsair a chur air a-nis?
 browsewithcaret.checkButtonLabel=Tha
--- a/toolkit/chrome/global/charsetOverlay.dtd
+++ b/toolkit/chrome/global/charsetOverlay.dtd
@@ -1,9 +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/. -->
 <!-- extracted from charsetOverlay.xul -->
+
 <!ENTITY charsetMenu.label             "Còdachadh charactairean">
 <!ENTITY charsetMenu.accesskey         "C">
 <!ENTITY charsetMenuAutodet.label      "Mothachadh leis fhèin">
 <!ENTITY charsetMenuAutodet.accesskey  "a">
 <!ENTITY charsetMenuMore.label         "Barrachd còdachaidhean">
 <!ENTITY charsetMenuMore.accesskey     "B">
 <!ENTITY charsetMenuMore1.label        "Taobh an Iar na Roinn Eòrpa">
 <!ENTITY charsetMenuMore1.accesskey    "T">
--- a/toolkit/chrome/global/commonDialog.dtd
+++ b/toolkit/chrome/global/commonDialog.dtd
@@ -1,8 +1,12 @@
+<!-- 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 header.label     "Ainm goirid"> 
 <!ENTITY message.label    "Ball-sampaill de theacs an-seo.">
 <!ENTITY editfield0.label "Ainm a' chleachdaiche:"> 
 <!ENTITY editfield1.label "Facal-faire:"> 
 <!ENTITY checkbox.label   "cuir cromag">
 <!ENTITY copyCmd.label    "Dèan lethbhreac">
 <!ENTITY copyCmd.accesskey "c">
 <!ENTITY selectAllCmd.label "Tagh a h-uile">
--- a/toolkit/chrome/global/commonDialogs.properties
+++ b/toolkit/chrome/global/commonDialogs.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 Alert=Caismeachd
 Confirm=Dearbhaich
 ConfirmCheck=Dearbhaich
 Prompt=Smèid orm
 PromptUsernameAndPassword2=Feum air dearbhadh
 PromptPassword2=Feum air facal-faire
 Select=Tagh
 OK=Ceart ma-tha
--- a/toolkit/chrome/global/config.dtd
+++ b/toolkit/chrome/global/config.dtd
@@ -1,43 +1,11 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org configuration viewer.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 2002
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
+<!-- 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 window.title "about:config">
 <!-- about:config warning page -->
 <!-- LOCALIZATION NOTE: aboutWarningTitle.label should be attention grabbing and playful -->
 
 <!ENTITY aboutWarningTitle.label "Dh'fhaodadh seo am barantas agad a chur gu neoini!">
 <!ENTITY aboutWarningText.label "Dh'fhaodadh droch bhuaidh a bhith ann air seasmhachd, tèarainteachd is dèanadas a' phrògraim seo ma dh'atharraicheas tu na roghainnean adhartach seo. Cha bu chòir dhut leantainn air adhart ach ma bhios tu cinnteach gu bheil thu eòlach air buaidh na tha thu a' dèanamh.">
 <!ENTITY aboutWarningButton.label "Tha mi a' toirt gealladh gum bi mi faiceallach!">
--- a/toolkit/chrome/global/config.properties
+++ b/toolkit/chrome/global/config.properties
@@ -1,44 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org configuration viewer.
-#
-# The Initial Developer of the Original Code is
-# Neil Rashbrook.
-# Portions created by the Initial Developer are Copyright (C) 2003
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Neil Rashbrook <neil@parkwaycc.co.uk>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# 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/.
 
 # Lock column values
 default=bunaiteach
 user=air a shuidheachadh leis a' chleachdaiche
 locked=glaiste
 
 # Type column values
 string=sreang
--- a/toolkit/chrome/global/console.dtd
+++ b/toolkit/chrome/global/console.dtd
@@ -1,44 +1,11 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator client code, released
-   - March 31, 1998.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation
-   - Portions created by the Initial Developer are Copyright (C) 1998-1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
+<!-- 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 errorConsole.title "Consol nam mearachd">
 
 <!ENTITY errFile.label   "Bun-tùs an fhaidhle:">
 <!ENTITY errLine.label   "Loidhne:">
 <!ENTITY errColumn.label "Colbh:">
 
 <!ENTITY all.label          "A h-uile">
--- a/toolkit/chrome/global/console.properties
+++ b/toolkit/chrome/global/console.properties
@@ -1,7 +1,11 @@
+# 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/.
+
 typeError=Mearachd:
 typeWarning=Rabhadh:
 errFile=Bun-tùs an fhaidhle: %S
 errLine=Loidhne: %S
 errLineCol=Loidhne: %S, colbh: %S
 errCode=Bun-tùs a' chòd:
 errTime=Stampa-ama: %S
--- a/toolkit/chrome/global/contentAreaCommands.properties
+++ b/toolkit/chrome/global/contentAreaCommands.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 # context menu strings
 
 SaveImageTitle=Sàbhail an dealbh
 SaveVideoTitle=Sàbhail am video
 SaveAudioTitle=Sàbhail an fhuaim
 SaveLinkTitle=Sàbhail mar
 DefaultSaveFileName=clàr-amais
 WebPageCompleteFilter=Duilleag-lìn, gu h-iomlan
--- a/toolkit/chrome/global/customizeCharset.dtd
+++ b/toolkit/chrome/global/customizeCharset.dtd
@@ -1,46 +1,12 @@
 <!-- -*- Mode: HTML -*- -->
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org charset encoding.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 2003
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -  Stephen Lamm <slamm@netscape.com>
-   -  Pierre Chanial <p_ch@verizon.net>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
+<!-- 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 title.label        "Gnàthaich còdachadh charactairean">
 <!ENTITY current.label      "Còdachaidhean charactairean beòtha:">
 <!ENTITY remove.label       "Thoir air falbh">
 <!ENTITY remove.accessKey   "r">
 <!ENTITY additional.label   "Còdachaidhean charactairean ri am faighinn:">
 <!ENTITY add.label          "Cuir ris">
 <!ENTITY add.accessKey      "C">
--- a/toolkit/chrome/global/customizeToolbar.dtd
+++ b/toolkit/chrome/global/customizeToolbar.dtd
@@ -1,8 +1,12 @@
+<!-- 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 dialog.title             "Gnàthaich am bàr-inneil">
 <!ENTITY dialog.dimensions        "width: 95ch; height: 42em;">
 <!ENTITY instructions.description "'S urrainn dhut rudan a chur ris no a thoirt air falbh le bhith 'gan slaodadh air a' bhàr-inneil no air falbh uaithe.">
 <!ENTITY show.label               "Seall:">
 <!ENTITY iconsAndText.label       "Ìomhaigheagan is teacs">
 <!ENTITY icons.label              "Ìomhaigheagan">
 <!ENTITY text.label               "Teacsa">
 <!ENTITY useSmallIcons.label      "Cleachd ìomhaigheagan beaga">
--- a/toolkit/chrome/global/customizeToolbar.properties
+++ b/toolkit/chrome/global/customizeToolbar.properties
@@ -1,7 +1,11 @@
+# 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/.
+
 enterToolbarTitle=Bàr-inneil ùr
 enterToolbarName=Cuir a-steach ainm airson a' bhàir-inneil seo:
 enterToolbarDup=Tha bàr-inneil ann mu thràth air a bheil "%S". Cuir a-steach ainm eile.
 enterToolbarBlank=Feumaidh tu ainm a chur a-steach gus bàr-inneil ùr a chruthachadh.
 separatorTitle=Sgaradair
 springTitle=Beàrn sùbailte
 spacerTitle=Beàrn
--- a/toolkit/chrome/global/dateFormat.properties
+++ b/toolkit/chrome/global/dateFormat.properties
@@ -1,45 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is OEone Calendar Code, released October 31st, 2001.
-#
-# The Initial Developer of the Original Code is
-# OEone Corporation.
-# Portions created by OEone Corporation are Copyright (C) 2001
-# OEone Corporation. All Rights Reserved.
-#
-# Contributor(s):
-#   Garth Smedley <garths@oeone.com>
-#   Martin Schroeder <mschroeder@mozilla.x-home.org>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# 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/.
 
 month.1.Mmm=Faoi
 month.2.Mmm=Gearr
 month.3.Mmm=Màrt
 month.4.Mmm=Gib
 month.5.Mmm=Cèit
 month.6.Mmm=Ògmh
 month.7.Mmm=Iuch
--- a/toolkit/chrome/global/datetimepicker.dtd
+++ b/toolkit/chrome/global/datetimepicker.dtd
@@ -1,3 +1,7 @@
+<!-- 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/. -->
 <!-- first day of week to display in datepicker, a value from 0 to 6,
      0 = Sunday, 1 = Monday, etc. -->
+
 <!ENTITY firstdayofweek.default "0">
--- a/toolkit/chrome/global/dialog.properties
+++ b/toolkit/chrome/global/dialog.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 button-accept=Ceart ma-tha
 button-cancel=Sguir dheth
 button-help=Cobhair
 button-disclosure=Barrachd fiosrachaidh
 accesskey-accept=
 accesskey-cancel=
 accesskey-help=H
 accesskey-disclosure=I
--- a/toolkit/chrome/global/dialogOverlay.dtd
+++ b/toolkit/chrome/global/dialogOverlay.dtd
@@ -1,44 +1,12 @@
 <!-- -*- Mode: HTML -*-
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org toolkit.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2002
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# 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/.
 #
 # WARNING!!! This file is obsoleted by the dialog.xml widget
 #
 -->
 <!-- OK Cancel Buttons -->
 
 <!ENTITY okButton.label      "Ceart ma-tha">
 <!ENTITY cancelButton.label  "Sguir dheth">
--- a/toolkit/chrome/global/downloadProgress.properties
+++ b/toolkit/chrome/global/downloadProgress.properties
@@ -1,8 +1,12 @@
+# 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 (BadPluginTitle): 
 #
 #    This dialog is displayed when plugin throws unhandled exception
 #
 BadPluginTitle=Gnìomh neo-dhligheach sa phlugan
 # LOCALIZATION NOTE (BadPluginMessage): 
 #
 #    This is the message for the BadPlugin dialog.
--- a/toolkit/chrome/global/editMenuOverlay.dtd
+++ b/toolkit/chrome/global/editMenuOverlay.dtd
@@ -1,8 +1,12 @@
+<!-- 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 editMenu.label            "Deasaich">
 <!ENTITY editMenu.accesskey        "e">
 <!ENTITY undoCmd.label             "Neo-dhèan">
 <!ENTITY undoCmd.key               "Z">
 <!ENTITY undoCmd.accesskey         "N">
 <!ENTITY redoCmd.label             "Ath-dhèan">
 <!ENTITY redoCmd.key               "Y">
 <!ENTITY redoCmd.accesskey         "A">
--- a/toolkit/chrome/global/filefield.properties
+++ b/toolkit/chrome/global/filefield.properties
@@ -1,3 +1,7 @@
+# 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/.
+
 #### Change Action
 
 downloadHelperNoneSelected=Cha deach gin a thaghadh
--- a/toolkit/chrome/global/filepicker.dtd
+++ b/toolkit/chrome/global/filepicker.dtd
@@ -1,8 +1,12 @@
+<!-- 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 lookInMenuList.label   "Lorg an-seo:">
 <!ENTITY lookInMenuList.accesskey   "L">
 <!ENTITY textInput.label        "Ainm an fhaidhle:">
 <!ENTITY textInput.accesskey        "n">
 <!ENTITY filterMenuList.label   "Seòrsa an fhaidhle:">
 <!ENTITY filterMenuList.accesskey   "S">
 <!ENTITY name.label             "Ainm">
 <!ENTITY size.label             "Meud">
--- a/toolkit/chrome/global/filepicker.properties
+++ b/toolkit/chrome/global/filepicker.properties
@@ -1,8 +1,12 @@
+# 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: The extensions to which these descriptions refer
 #                    now live in toolkit/content/filepicker.properties
 allTitle=A h-uile faidhle
 htmlTitle=Faidhlichean HTML
 textTitle=Faidhlichean teacs
 imageTitle=Faidhlichean deilbh
 xmlTitle=Faidhlichean XML
 xulTitle=Faidhlichean XUL
--- a/toolkit/chrome/global/findbar.dtd
+++ b/toolkit/chrome/global/findbar.dtd
@@ -1,12 +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/. -->
 <!-- LOCALIZATION NOTE : FILE This file contains the entities needed to -->
 <!-- LOCALIZATION NOTE : FILE use the Find Bar. --> 
 <!-- entities split out from browser.dtd -->
 
+
 <!ENTITY next.label "Air adhart">
 <!ENTITY next.accesskey "A">
 <!ENTITY next.tooltip "Lorg ath-làthair na h-abairt seo">
 <!ENTITY previous.label "Air ais">
 <!ENTITY previous.accesskey "A">
 <!ENTITY previous.tooltip "Lorg làthair roimhe na h-abairt seo">
 <!ENTITY findCloseButton.tooltip "Dùin am bàr luirg">
 <!ENTITY highlight.label "Soillsich a h-uile">
--- a/toolkit/chrome/global/findbar.properties
+++ b/toolkit/chrome/global/findbar.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 # strings used by the Find bar, split from browser.properties
 NotFound=Cha deach an abairt a lorg
 WrappedToTop=Ràinig sinn bun na duilleige, a' leantainn air adhart o bharr na duilleige
 WrappedToBottom=Ràinig sinn barr na duilleige, a' leantainn air adhart o bhun na duilleige
 NormalFindLabel=Lorg:
 FastFindLabel=Lorg luath:
 FastFindLinksLabel=Lorg luath (ceanglaichean a-mhàin):
 CaseSensitive=(aire do litrichean mòra/beaga)
--- a/toolkit/chrome/global/finddialog.dtd
+++ b/toolkit/chrome/global/finddialog.dtd
@@ -1,10 +1,14 @@
+<!-- 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/. -->
 <!-- extracted from finddialog.xul -->
 
+
 <!ENTITY findDialog.title "Lorg air an duilleag seo">
 <!ENTITY findField.label "Lorg an rud seo:">
 <!ENTITY findField.accesskey "n">
 <!ENTITY caseSensitiveCheckbox.label "Aire do litrichean mòra is beaga">
 <!ENTITY caseSensitiveCheckbox.accesskey "c">
 <!ENTITY wrapCheckbox.label "Paisg">
 <!ENTITY wrapCheckbox.accesskey "P">
 <!ENTITY findButton.label "An ath-fhear">
--- a/toolkit/chrome/global/finddialog.properties
+++ b/toolkit/chrome/global/finddialog.properties
@@ -1,2 +1,6 @@
+# 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/.
+
 notFoundWarning=Cha deach an teacs a chuir thu a-steach ann.
 notFoundTitle=Lorg
--- a/toolkit/chrome/global/globalKeys.dtd
+++ b/toolkit/chrome/global/globalKeys.dtd
@@ -1,2 +1,6 @@
+<!-- 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 openHelp.commandkey     "VK_F1">
 <!ENTITY openHelpMac.commandkey  "?">
--- a/toolkit/chrome/global/headsUpDisplay.properties
+++ b/toolkit/chrome/global/headsUpDisplay.properties
@@ -1,8 +1,12 @@
+# 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 (stacktrace.anonymousFunction):
 # This string is used to display JavaScript functions that have no given name -
 # they are said to be anonymous. See stacktrace.outputMessage.
 stacktrace.anonymousFunction=<gun urra>
 
 # LOCALIZATION NOTE (stacktrace.outputMessage):
 # This string is used in the Web Console output to identify a web developer call
--- a/toolkit/chrome/global/intl.properties
+++ b/toolkit/chrome/global/intl.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 # all.js
 #
 # Localization Note: Cases of charset names must be preserved. If you're 
 # adding charsets to your localized version, please refer to 
 # intl/uconv/src/charsetalias.properties file for the list of canonical 
 # charset names and use canonical names exactly as listed there.
 # Also note that "UTF-8" should always be included in intl.charsetmenu.browser.static
 general.useragent.locale=gd
--- a/toolkit/chrome/global/keys.properties
+++ b/toolkit/chrome/global/keys.properties
@@ -1,8 +1,12 @@
+# 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 : FILE This file contains the application's labels for keys on the keyboard.
 #                     If you decide to translate this file, you should translate it based on
 #                     the prevelant kind of keyboard for your target user.
 # LOCALIZATION NOTE : There are two types of keys, those w/ text on their labels
 #                     and those w/ glyphs.
 # LOCALIZATION NOTE : VK_<…> represents a key on the keyboard.
 #
 # For more information please see bugzilla bug 90888.
--- a/toolkit/chrome/global/languageNames.properties
+++ b/toolkit/chrome/global/languageNames.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 aa = Afar
 ab = Abchasais
 ae = Avestanais
 af = Afrikaans
 ak = Akan
 am = Amtharais
 an = Aragonais
 ar = Arabais
--- a/toolkit/chrome/global/mozilla.dtd
+++ b/toolkit/chrome/global/mozilla.dtd
@@ -1,8 +1,12 @@
+<!-- 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 mozilla.title "Leabhar Mozilla, 11:9">
 
 <!ENTITY mozilla.quote 'Bha Mamon &apos;na chadal. Agus sgaoil <em>a&apos; bhèist air ath-bhreith</em> air feadh an t-saoghail &apos;s 
 dh&apos;fhàs an àireamh &apos;na lègion. Agus ghairm iad na h-amannan is <em>dh&apos;ìobair</em> iad barr 
 san teine, le <em>seòltachd nan sionnach</em>. Agus thog iad saoghal ùr &apos;nan dealbh fhèin mar 
 a gheall <em><a href="http://www.mozilla.org/about/mozilla-manifesto.html"> 
 na focail naomha</a></em>, agus <em><a href="http://wiki.mozilla.org/About:mozilla">labhair 
 </a></em> iad ris an cuid cloinne mun a&apos; bhèist. Dhùisg Mamon, agus feuch! 
--- a/toolkit/chrome/global/notification.dtd
+++ b/toolkit/chrome/global/notification.dtd
@@ -1,3 +1,7 @@
+<!-- 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 closeNotification.tooltip "Dùin an teachdaireachd seo">
 
 <!ENTITY closeNotificationItem.label "Chan ann an-dràsta">
--- a/toolkit/chrome/global/nsTreeSorting.properties
+++ b/toolkit/chrome/global/nsTreeSorting.properties
@@ -1,1 +1,5 @@
+# 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/.
+
 SortMenuItems=Air a sheòrsachadh a-rèir %COLNAME%
--- a/toolkit/chrome/global/preferences.dtd
+++ b/toolkit/chrome/global/preferences.dtd
@@ -1,5 +1,9 @@
+<!-- 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  windowClose.key                         "w">
 <!ENTITY  preferencesDefaultTitleMac.title        "Roghainnean">
 <!ENTITY  preferencesDefaultTitleWin.title        "Roghainnean">
 <!ENTITY  preferencesCloseButton.label            "Dùin">
 <!ENTITY  preferencesCloseButton.accesskey        "D">
--- a/toolkit/chrome/global/printPageSetup.dtd
+++ b/toolkit/chrome/global/printPageSetup.dtd
@@ -1,10 +1,14 @@
+<!-- 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/. -->
 <!-- extracted from printjoboptions.xul -->
 
+
 <!ENTITY printSetup.title    "Roghainnean na duilleige">
 
 <!ENTITY basic.tab           "Fòrmat ┐ rogainnean">
 
 <!ENTITY formatGroup.label   "Fòrmat">
 
 <!ENTITY orientation.label   "Taobhachadh na duilleige:">
 <!ENTITY portrait.label      "Portraid">
--- a/toolkit/chrome/global/printPreview.dtd
+++ b/toolkit/chrome/global/printPreview.dtd
@@ -1,44 +1,11 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is the print preview toolbar.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 2002
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -  Samir Gehani <sgehani@netscape.com> (Original Author)
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
+<!-- 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 print.label          "Clò-bhuail…">
 <!ENTITY print.accesskey      "C">
 <!ENTITY pageSetup.label      "Roghainnean na duilleige…">
 <!ENTITY pageSetup.accesskey  "u">
 <!ENTITY page.label           "Duilleag:">
 <!ENTITY page.accesskey       "a">
 <!ENTITY of.label             "a-mach à">
--- a/toolkit/chrome/global/printPreviewProgress.dtd
+++ b/toolkit/chrome/global/printPreviewProgress.dtd
@@ -1,5 +1,9 @@
+<!-- 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 printPreviewProgress.dtd Main UI for Print Preview Progress Dialog -->
+
 <!ENTITY printWindow.title "Ro-shealladh clò-bhualaidh"> 
 <!ENTITY title   "Tiotal:"> 
 <!ENTITY preparing "Ag ullachadh…">
 <!ENTITY progress "Adhartas:">
--- a/toolkit/chrome/global/printProgress.dtd
+++ b/toolkit/chrome/global/printProgress.dtd
@@ -1,9 +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 printProgress.dtd Main UI for Print Progress Dialog -->
+
 <!ENTITY printWindow.title "Clò-bhualadh"> 
 <!ENTITY title    "Tiotal:"> 
 <!ENTITY progress "Adhartas:">
 <!ENTITY preparing "Ag ullachadh…">
 <!ENTITY printComplete "Tha an clò-bhualadh deiseil.">
 
 <!ENTITY dialogCancel.label "Sguir dheth"> 
 <!ENTITY dialogClose.label "Dùin">
--- a/toolkit/chrome/global/printdialog.dtd
+++ b/toolkit/chrome/global/printdialog.dtd
@@ -1,10 +1,14 @@
+<!-- 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/. -->
 <!-- extracted from printdialog.xul -->
 
+
 <!ENTITY printButton.label "Clò-bhuail">
 
 <!ENTITY printDialog.title "Clò-bhuail">
 
 <!ENTITY fpDialog.title "Sàbhail am faidhle">
 
 <!ENTITY fileCheck.label "Clò-bhuail gu faidhle">
 <!ENTITY fileCheck.accesskey "f">
--- a/toolkit/chrome/global/printdialog.properties
+++ b/toolkit/chrome/global/printdialog.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 # These strings are used in the native GTK, Mac and Windows print dialogs.
 
 # GTK titles:
 printTitleGTK=Clò-bhuail
 optionsTabLabelGTK=Roghainnean
 printFramesTitleGTK=Clò-bhuail frèamaichean
 
 # Mac titles:
--- a/toolkit/chrome/global/printjoboptions.dtd
+++ b/toolkit/chrome/global/printjoboptions.dtd
@@ -1,10 +1,14 @@
+<!-- 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/. -->
 <!-- extracted from printjoboptions.xul -->
 
+
 <!ENTITY printJobOptions.title "Roghainnean a' chlò-bhualadair">
 
 <!ENTITY paperInput.label "Meud a' phàipeir:">
 <!ENTITY paperInput.accesskey "p">
 
 <!ENTITY plexInput.label "Modh plex:">
 <!ENTITY plexInput.accesskey "M">
 
--- a/toolkit/chrome/global/regionNames.properties
+++ b/toolkit/chrome/global/regionNames.properties
@@ -1,8 +1,12 @@
+# 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/.
+
 ad=	Andorra
 ae=	Na h-Iomaratan Arabach Aonaichte
 af=	Afghanastàn
 ag=	Aintìoga is Barbuda
 ai=	Anguilla
 al=	Albàinia
 am=	Airmeinia
 an=	Eileanan Aintilia nan Tìrean Ìsle
--- a/toolkit/chrome/global/resetProfile.dtd
+++ b/toolkit/chrome/global/resetProfile.dtd
@@ -1,13 +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/.  -->
 
 <!ENTITY resetProfile.dialog.title        "Ath-shuidhich &brandShortName;">
 <!ENTITY resetProfile.dialog.description  "A bheil thu cinnteach gu bheil thu airson &brandShortName; aiseag mar a bha e aig an fhìor-thoiseach?">
-<!ENTITY resetProfile.dialog.items.label  "Thèid na leanas a ghlèidheadh:">
+<!ENTITY resetProfile.dialog.items2.label "Feuchaidh &brandShortName; ris na leanas a ghlèidheadh:">
 <!ENTITY resetProfile.dialog.footer.label "Tòisichidh &brandShortName; as ùr agus thèid gach rud eile a thoirt air falbh.">
 <!ENTITY resetProfile.dialog.button.label "Ath-shuidhich &brandShortName;">
 
 <!ENTITY resetProfile.title               "Aisig &brandShortName; mar a bha e aig an fhìor-thoiseach">
 <!ENTITY resetProfile.description         "Ma tha duilgheadasan mòra agad nach urrainn dhut càradh, tòisich as ùr dìreach leis an fhiosrachadh riatanach.">
 <!ENTITY resetProfile.button.label        "Ath-shuidhich &brandShortName;">
+
+<!ENTITY resetProfile.cleaning.description "Fuirich ort fhad 's a sgioblaicheas &brandShortName; an seann-dàta agad...">
--- a/toolkit/chrome/global/textcontext.dtd
+++ b/toolkit/chrome/global/textcontext.dtd
@@ -1,8 +1,12 @@
+<!-- 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 cutCmd.label "Gearr às">
 <!ENTITY cutCmd.accesskey "G">
 <!ENTITY copyCmd.label "Dèan lethbhreac">
 <!ENTITY copyCmd.accesskey "c">
 <!ENTITY pasteCmd.label "Cuir ann">
 <!ENTITY pasteCmd.accesskey "C">
 <!ENTITY undoCmd.label "Neo-dhèan">
 <!ENTITY undoCmd.accesskey "N">
--- a/toolkit/chrome/global/tree.dtd
+++ b/toolkit/chrome/global/tree.dtd
@@