[gd] update from Pootle
authorScots Gaelic team [Pootle] <https://wiki.mozilla.org/L10n:Teams:gd>
Mon, 23 Sep 2013 13:03:25 +0100
changeset 413 b14085fd8d75b6bec56fc53d1936313b642f4acd
parent 412 312514fb443059313188380832e66c7315c649b2
child 414 2494b9a3deec4a5080bd327ca66963160879c20b
push id151
push userfrancesco.lodolo@mozillaitalia.org
push dateMon, 11 Nov 2013 16:44:08 +0000
[gd] update from Pootle
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/devtools/app-manager.dtd
browser/chrome/browser/devtools/app-manager.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/netmonitor.dtd
browser/chrome/browser/devtools/profiler.dtd
browser/chrome/browser/devtools/profiler.properties
browser/chrome/browser/devtools/responsiveUI.properties
browser/chrome/browser/devtools/scratchpad.dtd
browser/chrome/browser/devtools/styleinspector.properties
browser/chrome/browser/devtools/toolbox.dtd
browser/chrome/browser/devtools/toolbox.properties
browser/chrome/browser/devtools/webConsole.dtd
browser/chrome/browser/devtools/webconsole.properties
browser/chrome/browser/feeds/subscribe.properties
browser/chrome/browser/preferences/tabs.dtd
browser/metro/chrome/aboutAddons.dtd
browser/metro/chrome/aboutCertError.dtd
browser/metro/chrome/aboutPanel.dtd
browser/metro/chrome/browser.dtd
browser/metro/chrome/browser.properties
browser/metro/chrome/checkbox.dtd
browser/metro/chrome/config.dtd
browser/metro/chrome/crashprompt.properties
browser/metro/chrome/passwordmgr.properties
browser/metro/chrome/phishing.dtd
browser/metro/chrome/preferences.dtd
browser/metro/chrome/region.properties
browser/metro/chrome/sync.dtd
browser/metro/chrome/sync.properties
browser/pdfviewer/viewer.properties
dom/chrome/accessibility/AccessFu.properties
dom/chrome/appstrings.properties
dom/chrome/dom/dom.properties
dom/chrome/layout/HtmlForm.properties
dom/chrome/layout/MediaDocument.properties
dom/chrome/mathml/mathml.properties
dom/chrome/security/csp.properties
dom/chrome/security/security.properties
security/manager/chrome/pippki/certManager.dtd
security/manager/chrome/pippki/pippki.properties
services/sync/sync.properties
toolkit/chrome/global/aboutNetworking.dtd
webapprt/webapprt/webapp.dtd
webapprt/webapprt/webapp.properties
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -245,16 +245,18 @@ These should match what Safari and other
 <!-- LOCALIZATION NOTE (chromeDebuggerMenu.label): This is the label for the
   -  application menu item that opens the browser debugger UI in the Tools menu. -->
 
 <!ENTITY chromeDebuggerMenu.label       "Dì-bhugadair brabhsair">
 
 <!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 devAppMgrMenu.label               "Manaidsear nan aplacaidean">
+<!ENTITY devAppMgrMenu.accesskey           "a">
 <!ENTITY devToolbar.keycode                "VK_F2">
 <!ENTITY devToolbar.keytext                "F2">
 <!ENTITY devToolboxMenuItem.label          "Toglaich na h-innealan">
 <!ENTITY devToolboxMenuItem.accesskey      "T">
 <!ENTITY devToolboxMenuItem.keycode        "I">
 <!ENTITY devToolboxMenuItem.keytext        "I">
 
 <!ENTITY devToolbarToolsButton.tooltip     "Toglaich innealan an luchd-leasachaidh">
@@ -638,20 +640,21 @@ just addresses the organization to follo
 <!ENTITY social.activated.undo.accesskey "n">
 <!ENTITY social.learnMore.label "Barrachd fiosrachaidh…">
 <!ENTITY social.learnMore.accesskey "B">
 <!ENTITY social.closeNotificationItem.label "Chan ann an-dràsta">
 
 <!ENTITY social.chatBar.commandkey "c">
 <!ENTITY social.chatBar.label "Cuir fòcas air a' chabadaich">
 <!ENTITY social.chatBar.accesskey "C">
-<!-- labels are set dynamically, see browser.properties -->
 
-<!ENTITY social.markpage.accesskey "m">
-<!ENTITY social.marklink.accesskey "M">
+<!ENTITY social.markpageMenu.accesskey "d">
+<!ENTITY social.markpageMenu.label "Sàbhail an duilleag ann an...">
+<!ENTITY social.marklinkMenu.accesskey "l">
+<!ENTITY social.marklinkMenu.label "Sàbhail an ceangal ann an…">
 
 <!ENTITY getUserMedia.selectCamera.label "An camara a thèid a cho-roinneadh:">
 <!ENTITY getUserMedia.selectCamera.accesskey "c">
 <!ENTITY getUserMedia.selectMicrophone.label "Am micreofon a thèid a cho-roinneadh:">
 <!ENTITY getUserMedia.selectMicrophone.accesskey "m">
 
 <!ENTITY webrtcIndicatorButton.label "Inntrigeadh dhan chamara/mhicreofon">
 <!ENTITY webrtcIndicatorButton.tooltip "Seall na làraichean a tha thu a' co-roinneadh a' chamara no a' mhicreofoin agad leotha an-dràsta">
@@ -663,16 +666,21 @@ just addresses the organization to follo
 
 <!ENTITY pluginNotification.showAll.label "Seall na h-uile">
 <!ENTITY pluginNotification.showAll.accesskey "S">
 <!-- LOCALIZATION NOTE (pluginActivateNow.label, pluginActivateAlways.label, pluginBlockNow.label): These should be the same as the matching strings in browser.properties -->
 
 <!ENTITY pluginActivateNow.label "Ceadaich an-dràsta">
 <!ENTITY pluginActivateAlways.label "Ceadaich is cuimhnich">
 <!ENTITY pluginBlockNow.label "Bac am plugan">
+
+<!ENTITY tabCrashed.header "Thuislich an taba">
+<!ENTITY tabCrashed.message "Abair nàire. Dh'fheuch sinn ris an duilleag-lìn seo a shealltainn dhut ach chan eil e a' freagairt.">
+<!ENTITY tabCrashed.checkSendReport "Cuir fios gu &vendorShortName; mun duilgheadas seo ach an urrainn dhaibh a chur ceart.">
+<!ENTITY tabCrashed.tryAgain "Feuch ris a-rithist">
 <!-- LOCALIZATION NOTE: the following strings are unused in Australis, they're
      kept here to avoid warnings from l10n tools like compare-locales on
      l10n-central. They will be definitely removed when Australis is ready
      for mozilla-aurora. -->
 
 
 <!ENTITY navbarCmd.accesskey           "n">
 <!ENTITY addonBarCmd.label             "Bàr nan tuilleadan">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -254,17 +254,16 @@ offlineApps.manageUsageAccessKey=S
 indexedDB.usage=Tha an làrach-lìn seo (%1$S) a' feuchainn ri barrachd air %2$S MB de dhàta a shàbhaladh air a' choimpiutair agad a chum cleachdadh far loidhne.
 
 identity.identified.verifier=Dearbhaichte le: %S
 identity.identified.verified_by_you=Chuir thu ris eisgeachd tèarainteachd airson na làraich seo.
 identity.identified.state_and_country=%S, %S
 
 identity.encrypted2=Chan eil an ceangal ris an làrach-lìn seo tèarainte.
 identity.mixed_display_loaded=Chan eil an ceangal ris an làrach-lìn seo gu tur tèarainte a chionn 's gu bheil eileamaidean neo-chrioptaichte (mar dhealbhan) ann.
-identity.mixed_display_loaded_active_blocked=Chaidh susbaint eadar-ghnìomhach (mar sgriobtaichean) nach eil crioptaichte a chasgadh gus do dhìon.
 identity.mixed_active_loaded2=Tha susbaint eadar-ghnìomhach air an làrach-lìn seo nach eil crioptaichte (mar sgriobtaichean). Chì daoine eile am fiosrachadh agad agus is urrainn dhaibh giùlan a' bhrabhsair agad atharrachadh.
 identity.unencrypted=Chan eil an ceangal agad ris an làrach-lìn seo air a chrioptachadh.
 
 identity.unknown.tooltip=Chan eil an làrach seo a' nochdadh fiosrachadh dearbh-aithne.
 
 identity.ownerUnknown2=(neo aithnichte)
 
 # LOCALIZATION NOTE (identity.chrome): %S is replaced with the brandShortName.
@@ -402,16 +401,17 @@ dataReportingNotification.button.label  = Co-dhùin na thèid a cho-roinneadh
 dataReportingNotification.button.accessKey  = C
 
 # Webapps notification popup
 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)?
 webapps.install.success = Aplacaid air a stàladh
+webapps.install.inprogress = 'Ga stàladh
 
 # 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
 
 service.toolbarbutton.label=Seirbheisean
 service.toolbarbutton.tooltiptext=Seirbheisean
@@ -424,22 +424,20 @@ service.install.learnmore=Barrachd fiosrachaidh…
 
 # LOCALIZATION NOTE (social.turnOff.label): %S is the name of the social provider
 social.turnOff.label=Cuir dheth %S
 social.turnOff.accesskey=d
 # LOCALIZATION NOTE (social.turnOn.label): %S is the name of the social provider
 social.turnOn.label=Cuir air %S
 social.turnOn.accesskey=a
 
-# LOCALIZATION NOTE (social.markpage.label): %S is the name of the social provider
-social.markpage.label=Cuir an duilleag gu %S
-social.unmarkpage.label=Thoir an duilleag air falbh o %S
-# LOCALIZATION NOTE (social.marklink.label): %S is the name of the social provider
-social.marklink.label=Cuir an ceangal gu %S
-social.unmarklink.label=Thoir an ceangal air falbh o %S
+# LOCALIZATION NOTE (social.markpageMenu.label): %S is the name of the social provider
+social.markpageMenu.label=Sàbhail an duilleag ann an %S
+# LOCALIZATION NOTE (social.marklinkMenu.label): %S is the name of the social provider
+social.marklinkMenu.label=Sàbhail an ceangal ann an %S
 
 # LOCALIZATION NOTE (social.error.message): %1$S is brandShortName (e.g. Firefox), %2$S is the name of the social provider
 social.error.message=Chan urrainn dha %1$S ceangal ri %2$S an-dràsta fhèin.
 social.error.tryAgain.label=Feuch ris a-rithist
 social.error.tryAgain.accesskey=F
 social.error.closeSidebar.label=Dùin am bàr-taoibh seo
 social.error.closeSidebar.accesskey=C
 
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/app-manager.dtd
@@ -0,0 +1,85 @@
+<!-- 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 index.title "App Manager">
+<!ENTITY index.projects2 "Apps">
+<!ENTITY index.device2 "Device">
+<!ENTITY index.help "Help">
+
+<!ENTITY device.screenshot "Screenshot">
+<!ENTITY device.screenshotTooltip "Open a screenshot of the current state of the device in a new tab.">
+<!ENTITY device.title "Device Control Center">
+<!ENTITY device.notConnected "Not connected. Please connect your device below.">
+<!ENTITY device.startApp "Start">
+<!ENTITY device.startAppTooltip "Start this app on the device.">
+<!ENTITY device.stopApp "Sguir dheth">
+<!ENTITY device.stopAppTooltip "Stop this app on the device.">
+<!ENTITY device.debugApp "Debug">
+<!ENTITY device.debugAppTooltip "Open the Developer Tools connected to this app on the device.">
+<!ENTITY device.name "Ainm">
+<!ENTITY device.app "App">
+<!ENTITY device.privileged "Privileged">
+<!ENTITY device.certified "Certified">
+<!ENTITY device.allow "Ceadaich">
+<!ENTITY device.allowTooltip "This permission is allowed for apps of this type.">
+<!ENTITY device.prompt "Smèid orm">
+<!ENTITY device.promptTooltip "This permission requires a user prompt for apps of this type.">
+<!ENTITY device.deny "Diùlt e">
+<!ENTITY device.denyTooltip "This permission is denied for apps of this type.">
+<!ENTITY device.installedApps "Installed Apps">
+<!ENTITY device.installedAppsTooltip "View a list of apps installed on the device. Some apps, such as certified apps, may be excluded from this view.">
+<!ENTITY device.permissions "Ceadachasan">
+<!ENTITY device.permissionsTooltip "View a table of the permissions accessible to the different types of apps.">
+<!ENTITY device.permissionsHelpLink "https://developer.mozilla.org/docs/Web/Apps/App_permissions">
+<!ENTITY device.help "Help">
+
+<!ENTITY connection.connectTooltip "Connect to the device.">
+<!ENTITY connection.disconnect "Disconnect">
+<!ENTITY connection.disconnectTooltip "Disconnect from the current device or simulator.">
+<!ENTITY connection.notConnected2 "Not Connected.">
+<!ENTITY connection.connectTo "Connect to:">
+<!ENTITY connection.noDeviceFound "No device found. Plug a device">
+<!ENTITY connection.changeHostAndPort "Change">
+<!ENTITY connection.changeHostAndPortTooltip "Change the host and port used to connect to the device. (Defaults to localhost:6000)">
+<!ENTITY connection.startSimulator "Start Simulator">
+<!ENTITY connection.startSimulatorTooltip "Start an instance of the Simulator and connect to it.">
+<!ENTITY connection.saveConnectionInfo "Sàbhail">
+<!ENTITY connection.saveConnectionInfoTooltip "Save the host and port.">
+<!ENTITY connection.connecting "A' ceangal…">
+<!ENTITY connection.disconnecting "Disconnecting…">
+<!ENTITY connection.cancel "Sguir dheth">
+<!ENTITY connection.cancelConnectTooltip "Cancel the connection in progress.">
+<!ENTITY connection.cancelShowSimulatorTooltip "Exit the Simulator connection mode and return to the initial prompt.">
+<!ENTITY connection.or "or">
+<!ENTITY connection.noSimulatorInstalled "No simulator installed.">
+<!ENTITY connection.installOneSimulator "Install Simulator">
+<!ENTITY connection.installOneSimulatorTooltip "Install a version of the Simulator by downloading the relevant add-on.">
+<!ENTITY connection.installAnotherSimulator "Add">
+<!ENTITY connection.installAnotherSimulatorTooltip "Install an additional version of the Simulator by downloading the relevant add-on.">
+
+<!ENTITY projects.localApps "Local Apps">
+<!ENTITY projects.addApp "Add">
+<!ENTITY projects.addPackaged "Add Packaged App">
+<!ENTITY projects.addPackagedTooltip "Add a new packaged app (a directory) from your computer.">
+<!ENTITY projects.addHosted "Add Hosted App">
+<!ENTITY projects.addHostedTooltip "Add a new hosted app (link to a manifest.webapp file) from a remote website.">
+<!ENTITY projects.title "Local Apps">
+<!ENTITY projects.appDetails "App Details">
+<!ENTITY projects.removeAppFromList "Remove this app from the list of apps you are working on. This will not remove it from a device or a simulator.">
+<!ENTITY projects.updateApp "Update">
+<!ENTITY projects.updateAppTooltip "Execute validation checks and update the app to the connected device">
+<!ENTITY projects.debugApp "Debug">
+<!ENTITY projects.debugAppTooltip "Open Developer Tools connected to this app">
+<!ENTITY projects.hostedManifestPlaceHolder2 "http://example.com/app/manifest.webapp">
+<!ENTITY projects.noProjects "No projects. Add a new packaged app below (local directory) or a hosted app (link to a manifest file).">
+
+<!ENTITY help.title "App Manager">
+<!ENTITY help.close "Dùin">
+<!ENTITY help.intro "This tool will help you build and install web apps on compatible devices (i.e Firefox OS). The <strong>Apps</strong> tab will assist you in the validation and installation process of your app. The <strong>Device</strong> tab will give you information about the connected device. Use the bottom toolbar to connect to a device or start the simulator.">
+<!ENTITY help.usefullLinks "Useful links:">
+<!ENTITY help.appMgrDoc "Documentation: Using the App Manager">
+<!ENTITY help.configuringDevice "How to setup your Firefox OS device">
+<!ENTITY help.troubleShooting "Troubleshooting">
+<!ENTITY help.simulatorAddon "Install Simulator Add-on">
+<!ENTITY help.adbHelperAddon "Install Adb Helper Add-on">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/app-manager.properties
@@ -0,0 +1,35 @@
+# 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 (device.deviceSize): %1$S is the device's width, %2$S is
+# the device's height, %3$S is the device's pixel density.
+# Example: 800x480 (86 DPI).
+device.deviceSize=Device size: %1$Sx%2$S (%3$S DPI)
+# LOCALIZATION NOTE (connection.connectedToDevice, connection.connectTo):
+# %1$S is the host name, %2$S is the port number.
+connection.connectedToDevice=Connected to %1$S
+connection.connectTo=Connect to %1$S:%2$S
+project.filePickerTitle=Select a webapp folder
+project.installing='Ga stàladh…
+project.installed=Installed!
+validator.nonExistingFolder=The project folder doesn't exists
+validator.expectProjectFolder=The project folder ends up being a file
+validator.wrongManifestFileName=Packaged apps require a manifest file that can only be named 'manifest.webapp' at project root folder
+validator.invalidManifestURL=Invalid manifest URL '%S'
+# LOCALIZATION NOTE (validator.invalidManifestJSON, validator.noAccessManifestURL):
+# %1$S is the error message, %2$S is the URI of the manifest.
+validator.invalidManifestJSON=The webapp manifest isn't a valid JSON file: %1$S at: %2$S
+validator.noAccessManifestURL=Unable to read manifest file: %1$S at: %2$S
+# LOCALIZATION NOTE (validator.invalidHostedManifestURL): %1$S is the URI of
+# the manifest, %2$S is the error message.
+validator.invalidHostedManifestURL=Invalid hosted manifest URL '%1$S': %2$S
+validator.invalidProjectType=Unknown project type '%S'
+# LOCALIZATION NOTE (validator.missNameManifestProperty, validator.missIconsManifestProperty):
+# don't translate 'icons' and 'name'.
+validator.missNameManifestProperty=Missing mandatory 'name' in Manifest.
+validator.missIconsManifestProperty=Missing 'icons' in Manifest.
+validator.missIconMarketplace=app submission to the Marketplace needs at least a 128px icon
+validator.invalidAppType=Unknown app type: '%S'.
+validator.invalidHostedPriviledges=Hosted App can't be type '%S'.
+validator.noCertifiedSupport='certified' apps are not fully supported on the App manager.
--- a/browser/chrome/browser/devtools/debugger.dtd
+++ b/browser/chrome/browser/devtools/debugger.dtd
@@ -32,16 +32,21 @@
   -  the button that opens up an options context menu for the debugger UI. -->
 
 <!ENTITY debuggerUI.optsButton.tooltip  "Debugger Options">
 <!-- LOCALIZATION NOTE (debuggerUI.pauseExceptions): This is the label for the
   -  checkbox that toggles pausing on exceptions. -->
 
 <!ENTITY debuggerUI.pauseExceptions     "Cuir 'na stad ma thachras eisgeachd">
 <!ENTITY debuggerUI.pauseExceptions.key "E">
+<!-- LOCALIZATION NOTE (debuggerUI.pauseExceptions): This is the label for the
+  -  checkbox that toggles ignoring caught exceptions. -->
+
+<!ENTITY debuggerUI.ignoreCaughtExceptions     "Ignore caught exceptions">
+<!ENTITY debuggerUI.ignoreCaughtExceptions.key "C">
 <!-- LOCALIZATION NOTE (debuggerUI.showPanesOnInit): This is the label for the
   -  checkbox that toggles visibility of panes when opening the debugger. -->
 
 <!ENTITY debuggerUI.showPanesOnInit     "Show panes on startup">
 <!ENTITY debuggerUI.showPanesOnInit.key "S">
 <!-- LOCALIZATION NOTE (debuggerUI.showVarsFilter): This is the label for the
   -  checkbox that toggles visibility of a designated variables filter box. -->
 
--- a/browser/chrome/browser/devtools/debugger.properties
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -52,33 +52,25 @@ stepInTooltip=Step In (%S)
 # LOCALIZATION NOTE (stepOutTooltip): The label that is displayed on the
 # button that steps out of a function call.
 stepOutTooltip=Step Out (%S)
 
 # LOCALIZATION NOTE (emptyGlobalsText): The text to display in the menulist
 # when there are no chrome globals available.
 noGlobalsText=No globals
 
-# LOCALIZATION NOTE (noMatchingGlobalsText): The text to display in the
-# menulist when there are no matching chrome globals after filtering.
-noMatchingGlobalsText=No matching globals
-
 # LOCALIZATION NOTE (noSourcesText): The text to display in the sources menu
 # when there are no scripts.
 noSourcesText=This page has no sources.
 
 # LOCALIZATION NOTE (blackBoxCheckboxTooltip) = The tooltip text to display when
 # the user hovers over the checkbox used to toggle black boxing its associated
 # source.
 blackBoxCheckboxTooltip=Toggle black boxing
 
-# LOCALIZATION NOTE (noMatchingSourcesText): The text to display in the
-# sources menu when there are no matching scripts after filtering.
-noMatchingSourcesText=No matching sources.
-
 # LOCALIZATION NOTE (noMatchingStringsText): The text to display in the
 # global search results when there are no matching strings after filtering.
 noMatchingStringsText=Cha deach maids a lorg
 
 # LOCALIZATION NOTE (emptySearchText): This is the text that appears in the
 # filter text box when it is empty and the scripts container is selected.
 emptySearchText=Search scripts (%S)
 
@@ -128,16 +120,20 @@ breakpointMenuItem.enableAll=Cuir an com
 breakpointMenuItem.disableAll=Cuir à comas gach puing-bhrisidh
 breakpointMenuItem.deleteAll=Thoir gach puing-bhrisidh air falbh
 
 # LOCALIZATION NOTE (loadingText): The text that is displayed in the script
 # editor when the loading process has started but there is no file to display
 # yet.
 loadingText=A' luchdadh…
 
+# LOCALIZATION NOTE (errorLoadingText): The text that is displayed in the debugger
+# viewer when there is an error loading a file
+errorLoadingText=Error loading source:\n
+
 # LOCALIZATION NOTE (emptyStackText): The text that is displayed in the watch
 # expressions list to add a new item.
 addWatchExpressionText=Add watch expression
 
 # 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
 
--- a/browser/chrome/browser/devtools/gcli.properties
+++ b/browser/chrome/browser/devtools/gcli.properties
@@ -44,16 +44,20 @@ cliEvalJavascript=Cuir a-steach an JavaScript fhèin
 # LOCALIZATION NOTE: This message is displayed when the command line has more
 # arguments than the current command can understand.
 cliUnusedArg=Cus argamaidean
 
 # LOCALIZATION NOTE: The title of the dialog which displays the options that
 # are available to the current command.
 cliOptions=Roghainnean a tha ri am faighinn
 
+# LOCALIZATION NOTE: The error message when the user types a command that
+# isn't registered
+cliUnknownCommand=Invalid Command
+
 # LOCALIZATION NOTE: Error message given when a file argument points to a file
 # that does not exist, but should (e.g. for use with File->Open) %1$S is a
 # filename
 fileErrNotExists='%1$S' doesn't exist
 
 # LOCALIZATION NOTE: Error message given when a file argument points to a file
 # that exists, but should not (e.g. for use with File->Save As) %1$S is a
 # filename
@@ -142,21 +146,20 @@ nodeParseNone=Gun mhaids
 # LOCALIZATION NOTE (helpDesc, helpManual, helpSearchDesc, helpSearchManual3):
 # These strings describe the "help" command, used to display a description of
 # a command (e.g. "help pref"), and its parameter 'search'.
 helpDesc=Faigh cuideachadh mu na h-àitheantan a tha ri làimh
 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).
 helpSearchDesc=Faclan luirg
 helpSearchManual3=An sreath luirg a thèid a chleachdadh gus na h-àitheantan a chithear a chur air gleus. Chan eil taic ri Regular Expressions.
 
-# LOCALIZATION NOTE (helpManSynopsis, helpManDescription, helpManParameters):
-# These strings are displayed in the help page for a command in the console.
+# LOCALIZATION NOTE (helpManSynopsis, helpManDescription): These strings are
+# displayed in the help page for a command in the console.
 helpManSynopsis=Gearr-chunntas
 helpManDescription=Tuairisgeul
-helpManParameters=Paramadairean
 
 # LOCALIZATION NOTE: This message is displayed in the help page if the command
 # has no parameters.
 helpManNone=Chan eil gin
 
 # LOCALIZATION NOTE: This message is displayed in response to the 'help'
 # command when used without a filter, just above the list of known commands.
 helpListAll=Àitheantan a tha ri làimh:
--- a/browser/chrome/browser/devtools/gclicommands.properties
+++ b/browser/chrome/browser/devtools/gclicommands.properties
@@ -422,16 +422,20 @@ dbgBlackBoxDesc=Black box sources in the
 # LOCALIZATION NOTE (dbgBlackBoxSourceDesc) A very short string used to describe the
 # 'source' parameter to the 'dbg blackbox' command.
 dbgBlackBoxSourceDesc=A specific source to black box
 
 # LOCALIZATION NOTE (dbgBlackBoxGlobDesc) A very short string used to describe the
 # 'glob' parameter to the 'dbg blackbox' command.
 dbgBlackBoxGlobDesc=Black box all sources that match this glob (for example: "*.min.js")
 
+# LOCALIZATION NOTE (dbgBlackBoxInvertDesc) A very short string used to describe the
+# 'invert' parameter to the 'dbg blackbox' command.
+dbgBlackBoxInvertDesc=Invert matching, so that we black box every source that is not the source provided or does not match the provided glob pattern.
+
 # LOCALIZATION NOTE (dbgBlackBoxEmptyDesc) A very short string used to let the
 # user know that no sources were black boxed.
 dbgBlackBoxEmptyDesc=(No sources black boxed)
 
 # LOCALIZATION NOTE (dbgBlackBoxNonEmptyDesc) A very short string used to let the
 # user know which sources were black boxed.
 dbgBlackBoxNonEmptyDesc=The following sources were black boxed:
 
@@ -460,16 +464,20 @@ dbgUnBlackBoxEmptyDesc=(Did not stop bla
 # user know which sources we stopped black boxing.
 dbgUnBlackBoxNonEmptyDesc=Stopped black boxing the following sources:
 
 # LOCALIZATION NOTE (dbgUnBlackBoxErrorDesc) A very short string used to let the
 # user know there was an error black boxing a source (whose url follows this
 # text).
 dbgUnBlackBoxErrorDesc=Error stopping black boxing:
 
+# LOCALIZATION NOTE (dbgUnBlackBoxInvertDesc) A very short string used to describe the
+# 'invert' parameter to the 'dbg unblackbox' command.
+dbgUnBlackBoxInvertDesc=Invert matching, so that we stop black boxing every source that is not the source provided or does not match the provided glob pattern.
+
 # 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.
@@ -1315,16 +1323,20 @@ profilerNotFound=Profile not found
 # started yet. It also contains a hint to use the 'profile start' command to
 # start the profiler.
 profilerNotStarted3=Profiler has not been started yet. Use 'profile start' to start profiling
 
 # LOCALIZATION NOTE (profilerStarted2) A very short string that indicates that
 # we have started recording.
 profilerStarted2=Recording…
 
+# LOCALIZATION NOTE (profilerStopped) A very short string that indicates that
+# we have stopped recording.
+profilerStopped=Stopped…
+
 # LOCALIZATION NOTE (profilerNotReady) A message that is displayed whenever
 # an operation cannot be completed because the profiler has not been opened yet.
 profilerNotReady=For this command to work you need to open the profiler first
 
 # LOCALIZATION NOTE (listenDesc) A very short string used to describe the
 # function of the 'listen' command.
 listenDesc=Open a remote debug port
 
--- a/browser/chrome/browser/devtools/netmonitor.dtd
+++ b/browser/chrome/browser/devtools/netmonitor.dtd
@@ -171,25 +171,35 @@
 <!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrl): This is the label displayed
   -  on the context menu that copies the selected request's url -->
 
 <!ENTITY netmonitorUI.context.copyUrl      "Copy URL">
 <!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrl.accesskey): This is the access key
   -  for the Copy URL menu item displayed in the context menu for a request -->
 
 <!ENTITY netmonitorUI.context.copyUrl.accesskey  "C">
-<!-- LOCALIZATION NOTE (debuggerUI.summary.resend): This is the label displayed
-  -  on the button in the headers tab that opens a form to resend the currently
+<!-- LOCALIZATION NOTE (debuggerUI.summary.editAndResend): This is the label displayed
+  -  on the button in the headers tab that opens a form to edit and resend the currently
      displayed request -->
 
-<!ENTITY netmonitorUI.summary.resend      "Ath-sheòl">
-<!-- LOCALIZATION NOTE (debuggerUI.summary.resend.accesskey): This is the access key
-  -  for the Resend menu item displayed in the context menu for a request -->
+<!ENTITY netmonitorUI.summary.editAndResend      "Edit and Resend">
+<!-- LOCALIZATION NOTE (debuggerUI.summary.editAndResend.accesskey): This is the access key
+  -  for the "Edit and Resend" menu item displayed in the context menu for a request -->
 
-<!ENTITY netmonitorUI.summary.resend.accesskey  "R">
+<!ENTITY netmonitorUI.summary.editAndResend.accesskey  "R">
+<!-- LOCALIZATION NOTE (netmonitorUI.context.newTab):  This is the label
+  -  for the Open in New Tab menu item displayed in the context menu of the
+  -  network container  -->
+
+<!ENTITY netmonitorUI.context.newTab      "Open in New Tab">
+<!-- LOCALIZATION NOTE (netmonitorUI.context.newTab.accesskey): This is the access key
+  -  for the Open in New Tab menu item displayed in the context menu of the
+  -  network container -->
+
+<!ENTITY netmonitorUI.context.newTab.accesskey  "O">
 <!-- LOCALIZATION NOTE (debuggerUI.custom.newRequest): This is the label displayed
   -  as the title of the new custom request form -->
 
 <!ENTITY netmonitorUI.custom.newRequest   "New Request">
 <!-- LOCALIZATION NOTE (debuggerUI.custom.query): This is the label displayed
   -  above the query string entry in the custom request form -->
 
 <!ENTITY netmonitorUI.custom.query        "Query String:">
--- a/browser/chrome/browser/devtools/profiler.dtd
+++ b/browser/chrome/browser/devtools/profiler.dtd
@@ -2,26 +2,18 @@
    - 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 Profiler strings -->
 <!-- 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 (profilerNew.label): This is the label for the
-  -  button that creates a new profile. -->
+<!-- LOCALIZATION NOTE (profiler.importProfile): This string is displayed
+  -  on a button that opens a dialog to import a saved profile data file. -->
 
 
 
-<!ENTITY profilerNew.label "Ùr">
-<!-- LOCALIZATION NOTE (profilerStart.label): This is the label for the
-  -  button that starts the profiler. -->
+<!ENTITY importProfile.label "Import…">
+<!-- LOCALIZATION NOTE (profiler.startProfiler): This string is displayed
+  -  on a button that starts a new profile  -->
 
-<!ENTITY profilerStart.label "Start">
-<!-- LOCALIZATION NOTE (profilerStop.label): This is the label for the
-  -  button that stops the profiler. -->
-
-<!ENTITY profilerStop.label "Sguir dheth">
-<!-- LOCALIZATION NOTE (profiler.importProfile): This string is displayed
-  -  on a button that opens a dialog to import a saved profile data file. -->
-
-<!ENTITY importProfile.label "Import…">
+<!ENTITY startProfiler.tooltip "Start profiling">
--- a/browser/chrome/browser/devtools/profiler.properties
+++ b/browser/chrome/browser/devtools/profiler.properties
@@ -50,44 +50,29 @@ profiler.runningTime=Running Time
 # As opposed to the total time which is how much time was spent in that
 # function and in functions it called.
 profiler.self=Self
 
 # LOCALIZATION NOTE (profiler.symbolName)
 # This string is displayed as a table header in the profiler UI.
 profiler.symbolName=Symbol Name
 
-# LOCALIZATION NOTE (profiler.startProfiling)
-# This string is displayed around the button that starts the profiler.
-# String argument will be replaced with a Start button.
-profiler.startProfiling=Click here %S to start profiling
-
-# LOCALIZATION NOTE (profiler.stopProfiling)
-# This string is displayed around the button that stops the profiler.
-# String argument will be replaced with a Stop button.
-profiler.stopProfiling = Click here %S to stop profiling
-
 # LOCALIZATION NOTE (profiler.start)
 # This string is displayed on the button that starts the profiler.
 profiler.start=Start
 
 # LOCALIZATION NOTE (profiler.stop)
 # This string is displayed on the button that stops the profiler.
 profiler.stop=Sguir dheth
 
 # LOCALIZATION NOTE (profiler.loading)
 # This string is displayed above the progress bar when the profiler
 # is busy loading and parsing the report.
 profiler.loading=Loading profile…
 
-# LOCALIZATION NOTE (profiler.alreadyRunning)
-# This string is displayed in the profiler whenever there is already
-# another running profile. Users can run only one profile at a time.
-profiler.alreadyRunning=Profiler is already running. If you want to run this profile stop Profile %S first.
-
 # LOCALIZATION NOTE (profiler.stateIdle)
 # This string is used to show that the profile in question is in IDLE
 # state meaning that it hasn't been started yet.
 profiler.stateIdle=Idle
 
 # LOCALIZATION NOTE (profiler.stateRunning)
 # This string is used to show that the profile in question is in RUNNING
 # state meaning that it has been started and currently gathering profile data.
@@ -99,16 +84,26 @@ profiler.stateRunning=A' ruith
 profiler.stateCompleted=Deiseil
 
 # LOCALIZATION NOTE (profiler.sidebarNotice)
 # This string is displayed in the profiler sidebar when there are no
 # existing profiles to show (usually happens when the user opens the
 # profiler for the first time).
 profiler.sidebarNotice=There are no profiles yet.
 
+# LOCALIZATION NOTE (profiler.startProfilerString)
+# This string is displayed on the profiler button when no active
+# profiling sessions are running
+profiler.startProfilerString=Start profiling
+
+# LOCALIZATION NOTE (profiler.stopProfilerString)
+# This string is displayed on the profiler button when an active
+# profiling session is running
+profiler.stopProfilerString=Stop profiling
+
 # LOCALIZATION NOTE (profiler.save)
 # This string is displayed as a label for a button that opens a Save File
 # dialog where user can save generated profiler to a file.
 profiler.save=Sàbhail
 
 # LOCALIZATION NOTE (profiler.saveFileAs)
 # This string as a title for a Save File dialog.
 profiler.saveFileAs=Save Profile As
--- a/browser/chrome/browser/devtools/responsiveUI.properties
+++ b/browser/chrome/browser/devtools/responsiveUI.properties
@@ -7,18 +7,29 @@
 #
 # 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.rotate2): tooltip of the rotate button.
+responsiveUI.rotate2=Rotate
+
+# LOCALIZATION NOTE  (responsiveUI.screenshot): tooltip of the screenshot button.
+responsiveUI.screenshot=Screenshot
+
+# LOCALIZATION NOTE (responsiveUI.screenshotGeneratedFilename): The auto generated filename.
+# The first argument (%1$S) is the date string in yyyy-mm-dd format and the second
+# argument (%2$S) is the time string in HH.MM.SS format.
+responsiveUI.screenshotGeneratedFilename=Screen Shot %1$S at %2$S
+
+# LOCALIZATION NOTE  (responsiveUI.touch): tooltip of the touch button.
+responsiveUI.touch=Simulate touch events (page reload might be needed)
 
 # LOCALIZATION NOTE  (responsiveUI.addPreset): label of the add preset button.
 responsiveUI.addPreset=Add Preset
 
 # LOCALIZATION NOTE  (responsiveUI.removePreset): label of the remove preset button.
 responsiveUI.removePreset=Remove Preset
 
 # LOCALIZATION NOTE  (responsiveUI.customResolution): label of the first item
@@ -36,8 +47,20 @@ responsiveUI.namedResolution=%S (%S)
 responsiveUI.customNamePromptTitle=Sealladh an dealbhaidh fhreagairteach
 
 # LOCALIZATION NOTE (responsiveUI.close): tooltip text of the close button.
 responsiveUI.close=Leave Responsive Design View
 
 # LOCALIZATION NOTE  (responsiveUI.customNamePromptMsg): prompt message when asking
 # the user to specify a name for a new custom preset.
 responsiveUI.customNamePromptMsg=Give a name to the %Sx%S preset
+
+# LOCALIZATION NOTE (responsiveUI.resizer): tooltip showed when
+# overring the resizers.
+responsiveUI.resizerTooltip=Use the Control key for more precision. Use Shift key for rounded sizes.
+
+# LOCALIZATION NOTE (responsiveUI.needReload): notification that appears
+# when touch events are enabled
+responsiveUI.needReload=If touch event listeners have been added earlier, the page needs to be reloaded.
+responsiveUI.notificationReload=Reload
+responsiveUI.notificationReload_accesskey=R
+responsiveUI.dontShowReloadNotification=Never show again
+responsiveUI.dontShowReloadNotification_accesskey=N
--- a/browser/chrome/browser/devtools/scratchpad.dtd
+++ b/browser/chrome/browser/devtools/scratchpad.dtd
@@ -59,16 +59,19 @@
 
 <!ENTITY inspect.label                "Sgrùdaich">
 <!ENTITY inspect.accesskey            "i">
 <!ENTITY inspect.key                  "h">
 
 <!ENTITY display.label                "Seall">
 <!ENTITY display.accesskey            "S">
 <!ENTITY display.key                  "l">
+
+<!ENTITY pprint.label                 "Pretty Print">
+<!ENTITY pprint.key                   "p">
 <!-- LOCALIZATION NOTE (environmentMenu.label, accesskey): This menu item was
   -  renamed from "Context" to avoid confusion with the right-click context
   -  menu in the text area. It refers to the JavaScript Environment (or context)
   -  the user is evaluating against. I.e., Content (current tab) or Chrome
   -  (browser).
   -->
 
 <!ENTITY environmentMenu.label        "An àrainneachd">
--- a/browser/chrome/browser/devtools/styleinspector.properties
+++ b/browser/chrome/browser/devtools/styleinspector.properties
@@ -30,16 +30,24 @@ rule.sourceInline=am broinn na loidhne
 rule.sourceElement=eileamaid
 
 # LOCALIZATION NOTE (rule.inheritedFrom): Shown for CSS rules
 # that were inherited from a parent node. Will be passed a node
 # identifier of the parent node.
 # e.g "Inherited from body#bodyID"
 rule.inheritedFrom=Oighreachd o %S
 
+# LOCALIZATION NOTE (rule.pseudoElement): Shown for CSS rules
+# pseudo element header
+rule.pseudoElement=Pseudo-elements
+
+# LOCALIZATION NOTE (rule.pseudoElement): Shown for CSS rules
+# pseudo element header
+rule.selectedElement=This Element
+
 # LOCALIZATION NOTE (helpLinkTitle): For each style property
 # the user can hover it and get a help link button which allows one to
 # quickly jump to the documentation from the Mozilla Developer Network site.
 # This is the link title shown in the hover tooltip.
 helpLinkTitle=Leugh an treòrachadh airson na buaidh seo
 
 # LOCALIZATION NOTE (rule.warning.title): When an invalid property value is
 # entered into the rule view a warning icon is displayed. This text is used for
--- a/browser/chrome/browser/devtools/toolbox.dtd
+++ b/browser/chrome/browser/devtools/toolbox.dtd
@@ -6,16 +6,22 @@
 
 
 <!ENTITY closeCmd.key  "W">
 
 <!ENTITY toolboxCloseButton.tooltip    "Close Developer Tools">
 <!ENTITY toolboxOptionsButton.key      "O">
 <!ENTITY toolboxNextTool.key           "]">
 <!ENTITY toolboxPreviousTool.key       "[">
+
+<!ENTITY toolboxZoomIn.key             "+">
+<!-- + is above this key on many keyboards -->
+<!ENTITY toolboxZoomIn.key2            "="> 
+<!ENTITY toolboxZoomOut.key            "-">
+<!ENTITY toolboxZoomReset.key          "0">
 <!-- LOCALIZATION NOTE (options.context.advancedSettings): This is the label for
   -  the heading of the advanced settings group in the options panel. -->
 
 <!ENTITY options.context.advancedSettings "Advanced settings">
 <!-- LOCALIZATION NOTE (options.context.requiresRestart2): This is the requires
   -  restart label at right of settings that require a browser restart to be
   -  effective. -->
 
--- a/browser/chrome/browser/devtools/toolbox.properties
+++ b/browser/chrome/browser/devtools/toolbox.properties
@@ -31,16 +31,26 @@ toolboxToggleButton.tooltip=%1$S, %2$S\n
 # The url of the page being tooled: %2$S.
 toolbox.titleTemplate=%1$S - %2$S
 
 # LOCALIZATION NOTE (toolbox.defaultTitle): This is used as the tool
 # name when no tool is selected.
 toolbox.defaultTitle=Bàr-inneal an luchd-leasachaidh
 
 # LOCALIZATION NOTE (optionsButton.tooltip): This is used as the tooltip
-# for the optiosn panel tab.
+# for the options panel tab.
 optionsButton.tooltip=Toolbox Options
 
 # LOCALIZATION NOTE (options.toolNotSupported): This is the template
 # used to add a * marker to the label for the Options Panel tool checkbox for the
 # tool which is not supported for the current toolbox target.
 # The name of the tool: %1$S.
 options.toolNotSupportedMarker=%1$S *
+
+# LOCALIZATION NOTE (scratchpad.keycode)
+# Used for opening scratchpad from the detached toolbox window
+# Needs to match scratchpad.keycode from browser.dtd
+scratchpad.keycode=VK_F4
+
+# LOCALIZATION NOTE (browserConsoleCmd.commandkey)
+# Used for toggling the browser console from the detached toolbox window
+# Needs to match browserConsoleCmd.commandkey from browser.dtd
+browserConsoleCmd.commandkey=j
--- a/browser/chrome/browser/devtools/webConsole.dtd
+++ b/browser/chrome/browser/devtools/webConsole.dtd
@@ -55,34 +55,33 @@
 <!ENTITY btnPageCSS.label   "CSS">
 <!ENTITY btnPageCSS.tooltip "Logaich mearachdan parsaidh CSS">
 <!ENTITY btnPageCSS.accesskey "C">
 <!ENTITY btnPageJS.label    "JS">
 <!ENTITY btnPageJS.tooltip  "Logaich eisgeachdan JavaScript">
 <!ENTITY btnPageJS.accesskey  "J">
 <!ENTITY btnPageSecurity.label "Security">
 <!ENTITY btnPageSecurity.tooltip "Log security errors and warnings">
-<!ENTITY btnPageSecurity.accesskey "S">
+<!ENTITY btnPageSecurity.accesskey "u">
 <!-- LOCALIZATION NOTE (btnPageLogging): This is used as the text of the
   -  the toolbar. It shows or hides messages that the web developer inserted on
   -  the page for debugging purposes, using calls such console.log() and
   -  console.error(). -->
 
 <!ENTITY btnPageLogging.label   "Logging">
 <!ENTITY btnPageLogging.tooltip "Log messages sent to the window.console object">
-<!ENTITY btnPageLogging.accesskey "L">
+<!ENTITY btnPageLogging.accesskey2 "R">
 <!ENTITY btnConsoleErrors       "Mearachdan">
 <!ENTITY btnConsoleInfo         "Fiosrachadh">
 <!ENTITY btnConsoleWarnings     "Rabhaidhean">
 <!ENTITY btnConsoleLog          "Loga">
 
 <!ENTITY filterOutput.placeholder "Filter output">
 <!ENTITY btnClear.label        "Clear">
 <!ENTITY btnClear.tooltip      "Clear the Web Console output">
-<!ENTITY btnClear.accesskey    "r">
 
 <!ENTITY fullZoomEnlargeCmd.commandkey  "+">
 <!-- + is above this key on many keyboards -->
 <!ENTITY fullZoomEnlargeCmd.commandkey2 "="> 
 <!ENTITY fullZoomEnlargeCmd.commandkey3 "">
 
 <!ENTITY fullZoomReduceCmd.commandkey   "-">
 <!ENTITY fullZoomReduceCmd.commandkey2  "">
@@ -91,8 +90,9 @@
 <!ENTITY fullZoomResetCmd.commandkey2   "">
 
 <!ENTITY copyURLCmd.label     "Dèan lethbhreac de sheòladh a' cheangail">
 <!ENTITY copyURLCmd.accesskey "a">
 
 <!ENTITY closeCmd.key         "W">
 <!ENTITY findCmd.key          "F">
 <!ENTITY clearOutputCmd.key   "K">
+<!ENTITY clearOutputCtrl.key  "L">
--- a/browser/chrome/browser/devtools/webconsole.properties
+++ b/browser/chrome/browser/devtools/webconsole.properties
@@ -70,16 +70,20 @@ ConsoleAPIDisabled=Chaidh API logadh a' chonsoil (console.log, console.info, console.warn, console.error) a chur à comas le sgriobt air an duilleag seo.
 # the URL the correct direction. Parameters: %S is the web page URL.
 webConsoleWindowTitleAndURL=An consol-lìn - %S
 
 # LOCALIZATION NOTE (webConsoleMixedContentWarning): the message displayed
 # after a URL in the Web Console that has been flagged for Mixed Content (i.e.
 # http content in an https page).
 webConsoleMixedContentWarning=Susbaint mheasgaichte
 
+# LOCALIZATION NOTE (webConsoleMoreInfoLabel): the more info tag displayed
+# after security related web console messages.
+webConsoleMoreInfoLabel=Barrachd fiosrachaidh
+
 # LOCALIZATION NOTE (scratchpad.linkText): the text used in the right hand
 # side of the Web Console command line when JavaScript is being entered, to
 # indicate how to jump into scratchpad mode.
 scratchpad.linkText=Shift+RETURN - Fosgail sa phada-sgrìoban
 
 # LOCALIZATION NOTE (gcliterm.instanceLabel): the console displays objects
 # using their type (from the constructor function) in this descriptive string.
 # Parameters: %S is the object type.
@@ -178,8 +182,17 @@ connectionTimeout=Connection timeout. Ch
 
 # LOCALIZATION NOTE (propertiesFilterPlaceholder): this is the text that
 # appears in the filter text box for the properties view container.
 propertiesFilterPlaceholder=Filter properties
 
 # LOCALIZATION NOTE (emptyPropertiesList): the text that is displayed in the
 # properties pane when there are no properties to display.
 emptyPropertiesList=No properties to display
+
+# LOCALIZATION NOTE (messageRepeats.tooltip2): the tooltip text that is displayed
+# when you hover the red bubble that shows how many times a message is repeated
+# in the web console output.
+# This is a semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 number of message repeats
+# example: 3 repeats
+messageRepeats.tooltip2=#1 repeat;#1 repeats;#1 repeat;#1 repeats
--- a/browser/chrome/browser/feeds/subscribe.properties
+++ b/browser/chrome/browser/feeds/subscribe.properties
@@ -44,10 +44,8 @@ feedSubscriptionVideoPodcast1=Seo "pod-chraoladh video" de shusbaint a dh'atharraicheas gu tric air an làrach seo.
 feedSubscriptionFeed2='S urrainn dhut fo-sgrìobhadh gun inbhir seo gus ùrachaidhean fhaighinn nuair a dh'atharraicheas an t-susbaint seo.
 feedSubscriptionAudioPodcast2='S urrainn dhut fo-sgrìobhadh gun phod-chraoladh seo gus ùrachaidhean fhaighinn nuair a dh'atharraicheas an t-susbaint.
 feedSubscriptionVideoPodcast2='S urrainn dhut fo-sgrìobhadh gun phod-chraoladh video seo gus ùrachaidhean fhaighinn nuair a dh'atharraicheas an t-susbaint.
 
 # Protocol Handling
 # "Add %appName (%appDomain) as an application for %protocolType links?"
 addProtocolHandler=A bheil thu airson %S (%S) a chur ris mar aplacaid a chum ceanglaichean %S?
 addProtocolHandlerAddButton=Cuir aplacaid ris
-# "%appName has already been added as an application for %protocolType links."
-protocolHandlerRegistered=Chaidh %S a chur ris mar aplacaid a chum ceanglaichean %S mu thràth.
--- a/browser/chrome/browser/preferences/tabs.dtd
+++ b/browser/chrome/browser/preferences/tabs.dtd
@@ -14,8 +14,9 @@
 <!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">
+<!ENTITY tabsGroup.label          "Tabaichean">
new file mode 100644
--- /dev/null
+++ b/browser/metro/chrome/aboutAddons.dtd
@@ -0,0 +1,17 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
+   %brandDTD;
+
+<!ENTITY aboutAddons.title              "Chan eil tuilleadain &brandShortName; buileach coileanta fhathast">
+<!ENTITY aboutAddons.messageTitle       "Ìoc!">
+<!ENTITY aboutAddons.message            "Tha sinn duilich, tha &brandShortName; a' dèanamh a dhìcheall airson 's gum bi taic ris na tuilleadain seo cho luath 's a ghabhas.">
+<!-- LOCALIZATION NOTE (aboutAddons.goBackToStartStart, aboutAddons.goBacktoStartLink, aboutAddons.goBacktoStartEnd):
+     These three entities form a single sentence. aboutAddons.goBackToStartStart is the start of the sentence,
+     aboutAddons.goBacktoStartLink is a clickable link the middle and aboutAddons.goBacktoStartEnd is the end of the sentence.
+     -->
+<!ENTITY aboutAddons.goBackToStartStart "Till gun">
+<!ENTITY aboutAddons.goBacktoStartLink  "duilleag tòiseachaidh aig &brandFullName;">
+
new file mode 100644
--- /dev/null
+++ b/browser/metro/chrome/aboutCertError.dtd
@@ -0,0 +1,37 @@
+<!-- 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">
+<!ENTITY certerror.longpagetitle "Chan eil earbsa sa cheangal seo">
+<!-- Localization note (certerror.introPara1) - The string "#1" will
+be replaced at runtime with the name of the server to which the user
+was trying to connect. -->
+
+<!ENTITY certerror.introPara1 "Dh'iarr thu air &brandShortName; ceangal tèarainte a dhèanamh ri 
+<b>#1</b> ach chan urrainn dhuinn dearbhadh gu bheil an ceangal seo tèarainte.">
+
+<!ENTITY certerror.whatShouldIDo.heading "Dè nì mi?">
+<!ENTITY certerror.whatShouldIDo.content "Ma cheanglaicheas tu ris an làrach seo gun duilgheadas sam bith 
+mar is trice, dh'fhaodadh gun do thachair a' mhearachd seo 's làrach eile 
+a' gabhail air gur esan an làrach seo agus cha bu chòir dhut leantainn air adhart.">
+<!ENTITY certerror.getMeOutOfHere.label "A-mach às an àite seo leam!">
+
+<!ENTITY certerror.expert.heading "Tuigidh mi an cunnart">
+<!ENTITY certerror.expert.content "Ma thuigeas tu na tha a' tachairt, 's urrainn dhut innse do 
+&brandShortName; earbsa a chur ann an dearbh-aithne 
+na làraich seo. <b>Fiù ma tha earbsa agad san làrach seo, dh'fhaodadh 
+gu bheil seo a' ciallachadh gu bheil cuideigin a' cur a-steach air a' cheangal agad.</b>">
+<!ENTITY certerror.expert.contentPara2 "Na cuir eisgeachd ris ach ma tha fhios agad gu bheil 
+carson nach eil an làrach seo a' cleachdadh dearbh-aithne earbsach.">
+<!ENTITY certerror.addTemporaryException.label "Tadhail air an làrach">
+<!ENTITY certerror.addPermanentException.label "Cuir eisgeachd bhuan ris">
+
+<!ENTITY certerror.technical.heading "Mion-fhiosrachadh teicnigeach">
new file mode 100644
--- /dev/null
+++ b/browser/metro/chrome/aboutPanel.dtd
@@ -0,0 +1,52 @@
+<!-- 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 aboutHeader.title          "Mu dhèidhinn">
+<!ENTITY aboutHeader.product.label  "&brandShortName;">
+<!ENTITY aboutHeader.company.label  "Le &vendorShortName;">
+<!ENTITY aboutHeader.policy.label   "Leugh am poileasaidh prìobhaideachd aig &brandShortName; air loidhne">
+<!-- LOCALIZATION NOTE (update.checkingForUpdates): try to make the localized text short (see bug 596813 for screenshots). -->
+<!ENTITY update.checkingForUpdates  "A' lorg ùrachaidhean…">
+<!-- LOCALIZATION NOTE (update.checkingAddonCompat): try to make the localized text short (see bug 596813 for screenshots). -->
+<!ENTITY update.checkingAddonCompat "A' sgrùdadh co-chòrdalachd an tuilleadain…">
+<!-- LOCALIZATION NOTE (update.noUpdatesFound): try to make the localized text short (see bug 596813 for screenshots). -->
+<!ENTITY update.noUpdatesFound      "Tha &brandShortName; cho ùr 's a ghabhas">
+<!-- LOCALIZATION NOTE (update.adminDisabled): try to make the localized text short (see bug 596813 for screenshots). -->
+<!ENTITY update.adminDisabled       "Chuir rianaire an t-siostaim agad casg air ùrachaidhean">
+<!-- LOCALIZATION NOTE (update.otherInstanceHandlingUpdates): try to make the localized text short -->
+<!ENTITY update.otherInstanceHandlingUpdates      "Tha &brandShortName; 'ga ùrachadh ann an ionstans eile">
+<!-- LOCALIZATION NOTE (update.failed.start,update.failed.linkText,update.failed.end):
+     update.failed.start, update.failed.linkText, and update.failed.end all go into
+     one line with linkText being wrapped in an anchor that links to a site to download
+     the latest version of Firefox (e.g. http://www.firefox.com). As this is all in
+     one line, try to make the localized text short (see bug 596813 for screenshots). -->
+
+<!ENTITY update.failed.start        "Dh'fhàillig an t-ùrachadh. ">
+<!ENTITY update.failed.linkText     "Luchdaich a-nuas an tionndadh as ùire">
+<!ENTITY update.failed.end          "">
+<!-- LOCALIZATION NOTE (update.manual.start,update.manual.end): update.manual.start and update.manual.end
+     all go into one line and have an anchor in between with text that is the same as the link to a site
+     to download the latest version of Firefox (e.g. http://www.firefox.com). As this is all in one line,
+     try to make the localized text short (see bug 596813 for screenshots). -->
+
+<!ENTITY update.manual.start        "Ùrachaidhean a tha ri am faighinn aig ">
+<!ENTITY update.manual.end          "">
+<!-- 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 ùrachaidh an sàs…">
+<!-- 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. ">
+
new file mode 100644
--- /dev/null
+++ b/browser/metro/chrome/browser.dtd
@@ -0,0 +1,109 @@
+<!-- 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/. -->
+<!-- NAVBAR AND AUTOCOMPLETE -->
+
+
+<!ENTITY urlbar.emptytext      "Dèan lorg no cuir a-steach seòladh">
+
+<!ENTITY back.label            "Air ais">
+<!ENTITY forward.label         "Air adhart">
+<!ENTITY newtab.label          "Taba ùr">
+<!ENTITY closetab.label        "Dùin an taba">
+
+<!ENTITY autocompleteResultsHeader.label  "Na toraidhean">
+
+<!ENTITY appbarErrorConsole.label   "Fosgail consoil nam mearachd">
+<!ENTITY appbarJSShell.label        "Fosgail JavaScript shell">
+<!ENTITY appbarFindInPage2.label    "Lorg air an duilleag">
+<!ENTITY appbarViewOnDesktop2.label "Seall air an deasga">
+
+<!ENTITY topSitesHeader.label        "Gràinnean-mullaich nan làrach">
+<!ENTITY bookmarksHeader.label       "Comharran-lìn">
+<!ENTITY recentHistoryHeader.label   "Eachdraidh o chionn goirid">
+<!ENTITY remoteTabsHeader.label      "Tabaichean o uidheaman eile">
+<!-- LOCALIZATION NOTE (narrowTopSitesHeader.label,
+                        narrowBookmarksHeader.label,
+                        narrowHistoryHeader.label,
+                        narrowRemoteTabsHeader.label )
+     are shortened versions of topSitesHeader.label, bookmarksHeader.label, recentHistoryHeader.label
+     and remoteTabsHeader.label. Need to be two words or shorter to fit in narrow vertical space.
+      -->
+
+<!ENTITY narrowTopSitesHeader.label      "Gràinnean-mullaich nan làrach">
+<!ENTITY narrowBookmarksHeader.label     "Comharran-lìn">
+<!ENTITY narrowRecentHistoryHeader.label "Eachdraidh o chionn goirid">
+<!ENTITY narrowRemoteTabsHeader.label    "Tabaichean cèin">
+
+<!ENTITY downloadsHeader.label     "Na luchdaich thu a-nuas">
+<!ENTITY downloadShowPage.label    "Rach gun duilleag">
+<!ENTITY downloadShow2.label       "Lorg">
+<!ENTITY downloadOpen2.label       "Fosgail">
+<!ENTITY downloadCancel.label      "Sguir dheth">
+<!ENTITY downloadPause.label       "Cuir 'na stad">
+<!ENTITY downloadResume.label      "Lean air">
+<!ENTITY downloadRetry.label       "Feuch ris a-rithist">
+<!ENTITY downloadRemove.label      "Thoir air falbh">
+<!ENTITY downloadDelete.label      "Sguab às">
+<!ENTITY downloadFailed.label      "Dh'fhàillig e">
+
+<!ENTITY allBookmarks.label        "Seall a h-uile comharra-lìn">
+
+<!ENTITY consoleHeader.label       "Consoil nam mearachd">
+<!ENTITY consoleAll.label          "All">
+<!ENTITY consoleErrors.label       "Mearachdan">
+<!ENTITY consoleWarnings.label     "Rabhaidhean">
+<!ENTITY consoleMessages.label     "Teachdaireachdan">
+<!ENTITY consoleCodeEval.label     "Còd:">
+<!ENTITY consoleClear.label        "Falamhaich">
+<!ENTITY consoleEvaluate.label     "…">
+<!ENTITY consoleErrFile.label      "Bun-tùs an fhaidhle:">
+<!ENTITY consoleErrLine.label      "Loidhne:">
+<!ENTITY consoleErrColumn.label    "Colbh:">
+<!--  TEXT CONTEXT MENU -->
+
+<!ENTITY contextTextCut.label              "Gearr às">
+<!ENTITY contextTextCopy.label             "Dèan lethbhreac">
+<!ENTITY contextTextPaste.label            "Cuir ann">
+<!-- unique item that is only added to the url bar context menu -->
+<!ENTITY contextTextPasteAndGo.label       "Cuir ann ⁊ rach ann">
+<!ENTITY contextTextSelect.label           "Tagh">
+<!ENTITY contextTextSelectAll.label        "Tagh na h-uile">
+<!-- LINK CONTEXT MENU -->
+
+<!ENTITY contextOpenLinkTab.label          "Fosgail an ceangal ann an taba ùr">
+<!ENTITY contextCopyLinkHref.label         "Dèan lethbhreac dhen cheangal">
+<!ENTITY contextBookmarkLinkHref.label     "Dèan comharra-lìn dhen cheangal">
+<!-- IMAGE CONTEXT MENU -->
+<!-- LOCALIZATION NOTE (contextSaveImageLib.label): saves an image to the users "pictures library"
+     (Explorer -> left hand side navigation pane -> Libraries -> Pictures) -->
+
+<!ENTITY contextSaveImageLib.label         "Sàbhail ann an leabhar-lann nan dealbhan">
+<!ENTITY contextCopyImage.label            "Dèan lethbhreac dhen dealbh">
+<!ENTITY contextCopyImageLocation.label    "Dèan lethbhreac de sheòladh an deilbh">
+<!ENTITY contextOpenImageTab.label         "Fosgail an dealbh ann an taba ùr">
+<!-- VIDEO CONTEXT MENU -->
+
+<!ENTITY contextSaveVideoLib.label         "Sàbhail ann an leabhar-lann nam video">
+<!ENTITY contextCopyVideoLocation.label    "Dèan lethbhreac de sheòladh a' video">
+<!ENTITY contextOpenVideoTab.label         "Fosgail a' video ann an taba ùr">
+<!-- KEYBOARD SHORTCUTS -->
+
+<!ENTITY reload.key "r">
+<!ENTITY focusURL.key "l">
+<!ENTITY urlbar.accesskey "d">
+<!ENTITY openFile.key "o">
+<!ENTITY savePage.key "s">
+<!ENTITY find.key "f">
+<!ENTITY findNext.key "g">
+<!ENTITY quit.key "q">
+<!ENTITY addBookmark.key "d">
+<!ENTITY newTab.key "t">
+<!ENTITY newTab2.key "n">
+<!ENTITY closeTab.key "w">
+<!-- DEVELOPER SHORTCUTS (control+shift+key) -->
+
+<!ENTITY jsConsole.key "j">
+<!ENTITY optionsFlyout.key "o">
+<!ENTITY syncFlyout.key "s">
+<!ENTITY aboutFlyout.key "a">
new file mode 100644
--- /dev/null
+++ b/browser/metro/chrome/browser.properties
@@ -0,0 +1,144 @@
+# 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 Capitalized phrases like "Top Sites", "Bookmarks",
+# and "Recent History" are typically used as proper noun phrases to refer to
+# the specific visual set (usually displayed as a grid) of top sites,
+# bookmarks, etc. displayed on screen, rather than those concepts in general.
+# Buttons (like with contextAppbar2.pin.topSites) refer to actions against
+# the specific on-screen sets with similarly-named headings.
+
+# LOCALIZATION NOTE (browser.search.contextTextSearchLabel2): search context
+# menu item text will be: |Search (browser.search.defaultenginename) for "string"|
+# browser.search.defaultenginename is defined in region.properties
+browser.search.contextTextSearchLabel2=Lorg le %1$S airson "%2$S"
+
+# Contextual Appbar - Button Labels
+
+contextAppbar2.pin.topSites=Prìnich ri gràinnean-mullaich nan làraichean
+contextAppbar2.pin.bookmarks=Prìnich ris na comharran-lìn
+contextAppbar2.pin.recentHistory=Prìnich ris an eachdraidh o chionn goirid
+contextAppbar2.pin.downloads=Prìnich ris na luchdaidhean a-nuas
+
+contextAppbar2.unpin.topSites=Dì-phrìnich o gràinnean-mullaich nan làraichean
+contextAppbar2.unpin.bookmarks=Dì-phrìnich o na comharran-lìn
+contextAppbar2.unpin.recentHistory=Dì-phrìnich on eachdraidh o chionn goirid
+contextAppbar2.unpin.downloads=Dì-phrìnich o na luchdaidhean a-nuas
+
+# LOCALIZATION NOTE (contextAppbar2.delete): Deletes selected pages.
+contextAppbar2.delete=Sguab às
+
+# LOCALIZATION NOTE (contextAppbar2.restore): Undoes a previous deletion.
+# Button with this label only appears immediately after a deletion.
+contextAppbar2.restore=Neo-dhèan an sguabadh às
+
+# LOCALIZATION NOTE (contextAppbar2.clear): Unselects pages without modification.
+contextAppbar2.clear=Falamhaich an taghadh
+
+# Settings Charms
+aboutCharm1=Mu dhèidhinn
+optionsCharm=Roghainnean
+helpOnlineCharm=Cobhair (air loidhne)
+
+# General
+# LOCALIZATION NOTE (browserForSaveLocation): Title for the "Save..." file picker dialog
+browserForSaveLocation=Sàbhail an t-ionad
+# LOCALIZATION NOTE (browserForSaveLocation): Title for the "Open..." file picker dialog
+browserForOpenLocation=Fosgail ionad
+
+# Download Manager
+downloadsUnknownSize=Chan eil fhios dè cho mòr 's a tha e
+downloadRun=Ruith
+downloadSave=Sàbhail
+downloadCancel=Sguir dheth
+downloadTryAgain=Feuch ris a-rithist
+downloadRunNow=Ruith e an-dràsta
+# LOCALIZATION NOTE (downloadShowInFiles): 'Files' refers to the Windows 8 file explorer
+downloadShowInFiles=Seall sna faidhlichean
+
+# Alerts
+alertLinkBookmarked=Chaidh an comharra-lìn a chur ris
+alertDownloads=Luchdaidhean a-nuas
+alertDownloadsStart=A' luchdadh a-nuas: %S
+alertDownloadsDone=Tha %S deiseil leis an luchdadh a-nuas
+# LOCALIZATION NOTE (alertDownloadsStart2): Used in a notification bar for download progress
+# #1 is the file name, #2 is the amount downloaded so far / total amount to download, and #3 is seconds remaining.
+alertDownloadsStart2=A' luchdadh a-nuas #1, #2, #3
+alertDownloadsDone2=Chaidh %S a luchdadh a-nuas
+alertTapToSave=Thoir gnogag gus am faidhle seo a shàbhaladh.
+alertDownloadsSize=Tha an luchdadh ro mhòr
+alertDownloadsNoSpace=Chan eil stòras gu leòr ann
+# LOCALIZATION NOTE (alertDownloadSave): #1 is the file name, #2 is the file size, #3 is the file host
+alertDownloadSave=A bheil thu airson #1 (#2) a ruith no a shàbhaladh o #3?
+# LOCALIZATION NOTE (alertDownloadMultiple): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of files, #2 is (amount downloaded so far / total amount to download) and #3 is seconds remaining
+alertDownloadMultiple=A' luchdadh a-nuas #1 fhaidhle, #2, #3;A' luchdadh a-nuas #1 fhaidhle, #2, #3;A' luchdadh a-nuas #1 faidhlichean, #2, #3;A' luchdadh a-nuas #1 faidhlichean, #2, #3
+# LOCALIZATION NOTE (alertMultipleDownloadsComplete): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of downloads completed
+alertMultipleDownloadsComplete=Chaidh #1 rud a luchdadh a-nuas;Chaidh #1 rud a luchdadh a-nuas;Chaidh #1 rudan a luchdadh a-nuas;Chaidh #1 rud a luchdadh a-nuas
+alertDownloadFailed=Tha sinn duilich ach cha b' urrainn dhuinn %S a luchdadh a-nuas.
+
+# Popup Blocker
+# LOCALIZATION NOTE (popupWarning.message): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is brandShortName and #2 is the number of pop-ups blocked.
+popupWarning.message=Cha do leig #1 leis an làrach seo priob-uinneag fhosgladh.;Cha do leig #1 leis an làrach seo #2 phriob-uinneag fhosgladh.;Cha do leig #1 leis an làrach seo #2 priob-uinneagan fhosgladh.;Cha do leig #1 leis an làrach seo #2 priob-uinneag fhosgladh.
+popupButtonAllowOnce2=Ceadaich seo aon turas
+popupButtonAlwaysAllow3=Ceadaich seo an-còmhnaidh
+popupButtonNeverWarn3=Na ceadaich seo idir
+
+# ContentPermissionsPrompt
+contentPermissions.alwaysForSite=Ceadaich seo dhan làrach seo an-còmhnaidh
+contentPermissions.neverForSite=Na ceadaich seo dhan làrach seo idir
+
+# Geolocation UI
+# LOCALIZATION NOTE (geolocation2.allow): If you're having trouble with the
+# word Share, please use Allow and Block in your language.
+geolocation2.allow=Nochd d' àite
+
+# LOCALIZATION NOTE (geolocation2.wantsTo offlineApps.wantsTo indexedDBQuota.wantsTo):
+# %S is the domain name of the web site.
+geolocation2.wantsTo=A bheil thu airson d' ionad a nochdadh ri %S?
+
+geolocation.learnMore=Barrachd fiosrachaidh…
+
+# Error Console
+typeError=Mearachd:
+typeWarning=Rabhadh:
+
+# Offline web applications
+offlineApps.allow=Ceadaich
+offlineApps.wantsTo=Tha %S ag iarraidh dàta a stòradh air a' choimpiutair agad a chum cleachdadh far loidhne.
+
+# IndexedDB Quota increases
+indexedDBQuota.allow=Ceadaich
+indexedDBQuota.wantsTo=Tha %S ag iarraidh mòran dàta a stòradh air a' choimpiutair agad a chum cleachdadh far loidhne.
+
+tabs.emptyTabTitle=Taba ùr
+
+# Open Search
+# LOCALIZATION NOTE (opensearch.search.header): %S is the word or phrase
+# typed by the user in the urlbar to search
+opensearch.search.header=Lorg "%S" air:
+
+# Check for Updates in the About Panel - button labels and accesskeys
+# LOCALIZATION NOTE - all of the following update buttons labels will only be
+# displayed one at a time. So, if a button is displayed nothing else will
+# be displayed alongside of the button. The button when displayed is located
+# 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.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=U
+update.restart.upgradeButton.label=Ùraich an-dràsta
+update.restart.upgradeButton.accesskey=U
new file mode 100644
--- /dev/null
+++ b/browser/metro/chrome/checkbox.dtd
@@ -0,0 +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.on.label    "Air">
+<!ENTITY checkbox.off.label     "Dheth">
new file mode 100644
--- /dev/null
+++ b/browser/metro/chrome/config.dtd
@@ -0,0 +1,16 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY 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             "Deiseil">
+
+<!ENTITY integer.label          "Àireamh shlàn">
+<!ENTITY string.label           "Sreang">
+<!ENTITY boolean.label          "Booleanach">
new file mode 100644
--- /dev/null
+++ b/browser/metro/chrome/crashprompt.properties
@@ -0,0 +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 (crashprompt.messagebody2): %1$S - short brand name, %2$S - vendor name
+crashprompt.messagebody2=Tha sinn duilich gun do thuislich %1$S ort. Ma chuireas tu aithisg tuislidh thugainn, cuidichidh sinn %2$S a' leasachadh %1$S airson 's gum bi e nas seasmhaiche agus nas tèarainte san àm ri teachd. 'S urrainn dhut na roghainnean seo atharrachadh uair sam bith sna "Roghainnean".
+crashprompt.dialog.title=A bheil thu ag iarraidh aithisgean tuislidh a chur gu Mozilla?
+crashprompt.dialog.privacyLink=Aithris na prìobhaideachd aig gleus nan aithisgean tuislidh
+crashprompt.dialog.acceptbutton=Cuir na h-aithisgean
+crashprompt.dialog.refusebutton=Na cuir iad
+crashprompt.dialog.title2=Aithris na prìobhaideachd aig gleus nan aithrisean tuislidh
+crashprompt.dialog.statement1=Tha gleus am broinn Firefox a chuireas aithisg tuislidh gu Mozilla nuair a thuislicheas Firefox. Cleachdaidh Mozilla am fiosrachadh seo mar fhiosrachadh air lochdan ann am Firefox agus airson 's gun urrainn dha an cur ceart. Ged a thòisicheas an gleus seo leis fhèin nuair a thuislicheas Firefox, cha chuir e fiosrachadh sam bith gu Mozilla gus an doir thu d' aonta-sa ris. A ghnàth, tha an aithisg seo ag innse dè an còd ann am Firefox a bha a' dol nuair a thuislich e, a' gabhail a-steach an stack trace agus dè seòrsa coimpiutair a tha agad. Thèid fiosrachadh a bharrachd a chruinneachadh leis a' ghleus. Thèid diofar gleusan aithrisidh agus fiosrachadh eadar-dhealaichte a chruinneachadh a-rèir dè an tionndadh de Firefox a tha agad.
+crashprompt.dialog.statement2=Sna tionndaidhean ùra de Firefox, 's e "Aithrisiche nan tuislidhean aig Firefox" an gleus a nì seo. Dh'fhaoidte gun urrainn dhut fiosrachadh pearsanta a ghabhail a-staigh (a' gabhail a-steach an seòladh puist-d agad), fiosrachadh a dh'fhaodadh a bhith pearsanta (mar an seòladh IP agad agus URL na làraich air an robh thu nuair a thuislich Firefox) agus beachd. Cuiridh an t-aithrisiche liosta dhe na tuilleadain a bha thu a' cleachdadh nuair a thuislich e gu Mozilla, (i) cuin a thachair an tuisleadh mu dheireadh, (ii) dè an rud mu dheireadh a chaidh a stàladh agus (iii) fiosrachadh air tòiseachadh a' phrògraim. Cha nochd Mozilla ach fiosrachadh nach eil pearsanta idir (m.e. fiosrachadh coitcheann mun choimpiutair agad, an stack trace agus beachdan a thug thu seachad) sna h-aithisgean poblach aige air http://crash-stats.mozilla.com/ 
new file mode 100644
--- /dev/null
+++ b/browser/metro/chrome/passwordmgr.properties
@@ -0,0 +1,23 @@
+# 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/.
+
+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
+saveLoginTextNoUsername = A bheil thu ag iarraidh gun cum %1$S am facal-faire seo air %2$S an cuimhne?
+notifyBarNotForThisSiteButtonText = Chan ann air an làrach seo
+notifyBarNotForThisSiteButtonAccessKey =
+notifyBarRememberPasswordButtonText = Cuimhnich am facal-faire
+notifyBarRememberPasswordButtonAccessKey =
+passwordChangeTitle = Dearbhaich atharrachadh an fhacail-fhaire
+passwordChangeText = A bheil thu ag iarraidh am facal-faire a tha air a stòradh airson %S atharrachadh?
+passwordChangeTextNoUser = A bheil thu ag iarraidh am facal-faire a tha air a stòradh airson a' chunntais seo atharrachadh?
+notifyBarChangeButtonText = Atharraich
+notifyBarChangeButtonAccessKey =
+notifyBarDontChangeButtonText2 = Na atharraich
+notifyBarDontChangeButtonAccessKey =
+userSelectText = Dearbhaich cò an cleachdaiche a tha thu ag atharrachadh an fhacail-fhaire air a shon
new file mode 100644
--- /dev/null
+++ b/browser/metro/chrome/phishing.dtd
@@ -0,0 +1,17 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY safeb.palm.accept.label "A-mach às an àite seo leam!">
+<!ENTITY safeb.palm.decline.label "Leig seachad an rabhadh seo">
+<!ENTITY safeb.palm.notforgery.label2 "Chan e fallsaidheachd-lìn a tha seo…">
+<!ENTITY safeb.palm.reportPage.label "Carson a chaidh bacadh a chur air an duilleag seo?">
+
+<!ENTITY safeb.blocked.malwarePage.title "Chaidh aithris gur e duilleag ionnsaighe a tha seo!">
+<!-- Localization note (safeb.blocked.malware.shortDesc) - Please don't translate the contents of the <span id="malware_sitename"/> tag.  It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
+<!ENTITY safeb.blocked.malwarePage.shortDesc "Chaidh aithris gur e duilleag ionnsaighe a tha ann an <span id='malware_sitename'/> agus chaidh bacadh a chur air a-rèir do roghainnean tèarainteachd.">
+<!ENTITY safeb.blocked.malwarePage.longDesc "<p>Feuchaidh duilleagan ionnsaighe ri prògraman a stàladh a ghoideas fiosrachadh prìobhaideach ort, a chleachdas an coimpiutair agad gus ionnsaigh a thoirt air feadhainn eile no gus cron a chur air an inneal agad.</p><p>Tha cuid dhe na duilleagan ionnsaighe a' sgaoileadh bathar-bog cronail a dh'aona-ghnothach ach tha torr dhiubh gan cur gu mì-fheum gun fhios is gun chead nan sealbhadairean aca.</p>">
+
+<!ENTITY safeb.blocked.phishingPage.title2 "Amharas gur e fallsaicheachd-lìn a tha seo!">
+<!ENTITY safeb.blocked.phishingPage.shortDesc2 "Ma chuireas tu a-steach dàta pearsanta sam bith air an duilleag seo, faodaidh gun goidear do dhearbh-aithne ort no gum feuch cuideigin do mhealladh.">
+<!ENTITY safeb.blocked.phishingPage.longDesc2 "<p>Tha a leithid seo de dh'fhallsaidheachd-lìn 'ga chleachdadh ann am foill air a bheil fiasgach, le duilleagan-lìn no puist-dhealain a' toirt creidsinn gu bheil iad 'nan tùsan earbsach air a bheil thu eòlach.</p>">
new file mode 100644
--- /dev/null
+++ b/browser/metro/chrome/preferences.dtd
@@ -0,0 +1,42 @@
+<!-- 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/. -->
+<!-- ## Sync Flyout Panel ## -->
+<!-- see sync.dtd -->
+<!-- ## Options Flyout Panel ## -->
+
+
+<!ENTITY optionsHeader.title                                     "Roghainnean">
+<!ENTITY optionsHeader.startup.title                             "Aig an toiseach">
+<!ENTITY optionsHeader.homepage.title                            "Nuair a thòisicheas &brandShortName;, seall">
+<!ENTITY optionsHeader.homepage.startPage.button                 "an duilleag-thòiseachaidh">
+<!ENTITY optionsHeader.homepage.sessionRestore.button            "na tabaichean on turas mu dheireadh">
+<!ENTITY optionsHeader.char.title                                "Còdachadh charactaran">
+<!ENTITY optionsHeader.char.autodetect.label                     "Mothachadh leis fhèin">
+<!ENTITY optionsHeader.char.options.label                        "Seall na roghainnean còdachaidh air bàr nan aplacaidean">
+
+<!ENTITY clearPrivateData.title                                  "Falamhaich an dàta prìobhaideach">
+<!ENTITY clearPrivateData.label                                  "Falamhaich an eachdraidh brabhsaidh, na faclan-faire, briosgaidean agus dàta nam foirmean air an uidheam seo">
+<!ENTITY clearPrivateData.button                                 "Falamhaich">
+<!ENTITY clearPrivateData.done                                   "Deiseil!">
+<!ENTITY clearPrivateData.history                                "An eachdraidh brabhsaidh">
+<!ENTITY clearPrivateData.otherdata                              "Dàta eile (faclan-faire, an tasgadan, briosgaidean is msaa)">
+<!ENTITY clearPrivateData.downloadHist                           "Eachdraidh dhe na chaidh a luchdadh a-nuas">
+<!ENTITY clearPrivateData.cookies                                "Briosgaidean">
+<!ENTITY clearPrivateData.cache                                  "An tasgadan">
+<!ENTITY clearPrivateData.sitePref                               "Roghainnean na làraich">
+<!ENTITY clearPrivateData.formSearchHist                         "Eachdraidh nam foirmean ⁊ nan lorg">
+<!ENTITY clearPrivateData.passwords                              "Faclan-faire a chaidh a shàbhaladh">
+<!ENTITY clearPrivateData.offline                                "Dàta làraichean-lin far loidhne">
+<!ENTITY clearPrivateData.logins                                 "Logadh a-steach beò sam bith">
+
+<!ENTITY optionsHeader.privacy.passwords.label                   "Cuimhnich na faclan-faire">
+<!ENTITY doNotTrack.title                                        "Na tracaich">
+<!ENTITY doNotTrack.desc                                         "Innis do làraichean:">
+<!ENTITY doNotTrack.options.trackingNotOkay                      "Nach eil mi ag iarraidh gun tracaich iad mi">
+<!ENTITY doNotTrack.options.noPreference                         "Na innis dad mu na roghainnean tracaidh agam">
+<!ENTITY doNotTrack.options.trackingOkay                         "Gun bheil mi airson 's gun dèan iad tracadh orm">
+<!ENTITY optionsHeader.reporting.title                           "Aithrisiche nan tuislidhean">
+<!ENTITY optionsHeader.reporting.crashes.label                   "Cuiridh &brandShortName; aithisgean tuislidh dha Mozilla ach an urrainn dhuinn am brabhsair agad a dhèanamh nas seasmhaiche agus nas tèarainte">
+<!ENTITY optionsHeader.telemetry.title                            "Telemeatraidh">
+<!ENTITY optionsHeader.telemetry.label                            "Cuir fiosrachadh air do chleachdadh de &brandShortName; gu Mozilla airson 's gun urrainn dhuinn am brabhsair agad a dhèanamh nas fhearr">
new file mode 100644
--- /dev/null
+++ b/browser/metro/chrome/region.properties
@@ -0,0 +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: REVIEW_REQUIRED
+# For all locales: please do not commit any changes to this file without a
+# review from the l10n-drivers team. In order to get one, please file a bug,
+# add the "productization" keyword and CC l10n@mozilla.com.
+# en-US: if you're changing this file, please CC l10n@mozilla.com in the
+# associated bug to help us determine if these changes are relevant for other
+# locales and how to localize them.
+
+# Default search engine
+browser.search.defaultenginename=Bing
+
+# Search engine order (order displayed in the search bar dropdown)
+browser.search.order.1=Bing
+browser.search.order.2=Google
+browser.search.order.3=Yahoo
new file mode 100644
--- /dev/null
+++ b/browser/metro/chrome/sync.dtd
@@ -0,0 +1,58 @@
+<!-- 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/. -->
+<!-- Flyout -->
+
+<!ENTITY sync.flyout.title                     "&syncBrand.shortName.label;">
+<!-- Flyout when not connected -->
+
+<!ENTITY sync.flyout.presetup.description1     "Faigh cothrom air na comharran-lìn, na faclan-faire is tabaichean fosgailte agad air feadh nan uidheaman agad">
+<!ENTITY sync.flyout.presetup.setup.label      "Suidhich &syncBrand.shortName.label;">
+<!-- Flyout when setting up sync -->
+
+<!ENTITY sync.flyout.setup.title               "Suidhich &syncBrand.shortName.label;">
+<!ENTITY sync.flyout.setup.description1        "Ma tha cunntas &syncBrand.shortName.label; agad, tagh &quot;Paidhrich uidheam&quot; air an dàrna uidheam agad agus cuir a-steach an còd seo.">
+<!ENTITY sync.flyout.setup.description2        "Mur eil cunntas &syncBrand.shortName.label; agad, 's urrainn dhut fear a chruthachadh sa bhrabhsair &brandShortName; agad air an deasg.">
+<!ENTITY sync.flyout.setup.manual.label_2      "Chan eil mi faisg air a' choimpiutair agam…">
+<!ENTITY sync.flyout.setup.description3        "An aire:">
+<!ENTITY sync.flyout.setup.description4_2      "Seo far a bheil &quot;Paidhrich uidheam&quot;:">
+<!ENTITY sync.flyout.setup.description5_2      "[Air an deasga] Fosgail na &quot;Roghainnean&quot; agus tagh &quot;&syncBrand.shortName.label;&quot;">
+<!ENTITY sync.flyout.setup.description6_2      "[Air Android] Barrachd &gt; Roghainnean &gt; &syncBrand.shortName.label;">
+<!-- Flyout when setting up manually -->
+
+<!ENTITY sync.flyout.manualsetup.description1_2  "Cuir a-steach fiosrachadh a' chunntais &syncBrand.shortName.label; agad agus an iuchair aisig a gin an coimpiutair agad">
+<!ENTITY sync.flyout.manualsetup.account.placeholder "Ainm a' chunntais">
+<!ENTITY sync.flyout.manualsetup.password.placeholder "Facal-faire">
+<!ENTITY sync.flyout.manualsetup.recoveryKey.placeholder "An iuchair aisig">
+<!ENTITY sync.flyout.manualsetup.connect.label           "Ceangail">
+<!-- Flyout when user has just connected -->
+
+<!ENTITY sync.flyout.setupsuccess.description1      "Tha thu air &brandShortName; a cheangal ris a' chunntas &syncBrand.shortName.label;">
+<!ENTITY sync.flyout.setupsuccess.description2      "Tha sinn a' luchdadh a-nuas an dàta &syncBrand.shortName.label; a-nis sa chùlaibh. Gheibh thu na tabaichean sioncronaichte agad air duilleag tòiseachaidh &brandShortName;">
+<!-- Flyout when setup failed -->
+
+<!ENTITY sync.flyout.setupfailure.description       "Cha b' urrainn dha &brandShortName; ceangal ris a' chunntas &syncBrand.shortName.label; agad.">
+<!ENTITY sync.flyout.setupfailure.cancelButton      "Sguir dheth">
+<!ENTITY sync.flyout.setupfailure.tryAgainButton    "Feuch ris a-rithist">
+<!-- Flyout when connected and functioning normally -->
+
+<!ENTITY sync.flyout.connected.account                    "Cunntas:">
+<!ENTITY sync.flyout.connected.device                     "An t-uidheam agad:">
+<!ENTITY sync.flyout.connected.disconnect                 "Dì-cheangail">
+<!ENTITY sync.flyout.connected.disconnectWarningHeader    "A bheil thu airson an ceangal eadar an t-uidheam agad agus &syncBrand.shortName.label; a bhriseadh?">
+<!ENTITY sync.flyout.connected.disconnectWarning          "Fanaidh an dàta pearsanta air fad agad air an uidheam seo agus sa chunntas &syncBrand.shortName.label; agad slàn.">
+<!ENTITY sync.flyout.connected.cancel                     "Sguir dheth">
+<!ENTITY sync.flyout.connected.pair                       "Paidhrich uidheam">
+<!-- Flyout when pairing a device -->
+
+<!ENTITY sync.flyout.pairNewDevice.description            "Air an uidheam ùr a tha thu airson paidhreachadh ris, tagh &quot;Suidhich &syncBrand.shortName.label;&quot; agus cuir a-steach an còd a ghineas an t-uidheam dhut">
+<!ENTITY sync.flyout.pairNewDevice.pair                   "Paidhrich">
+<!ENTITY sync.flyout.pairNewDevice.note1                  "An aire:">
+<!ENTITY sync.flyout.pairNewDevice.note2_2                "Gus greim fhaighinn air a' chòd,">
+<!ENTITY sync.flyout.pairNewDevice.note3_2                "[Air an deasga] Fosgail &quot;Roghainnean&quot;agus dèan seo: &syncBrand.shortName.label; -&gt; Suidhich &syncBrand.shortName.label; -&gt; Tha cunntas agam">
+<!ENTITY sync.flyout.pairNewDevice.note4                  "[Air Android] Barrachd &gt; Roghainnean &gt; &syncBrand.shortName.label;">
+<!ENTITY sync.flyout.pairNewDevice.failure                "Saoil am feuch thu ris a-rithist?">
+<!-- Flyout when a device has been successfully paired -->
+
+<!ENTITY sync.flyout.pairSuccess.description1             "Chaidh an t-uidheam ùr a chur ris.">
+<!ENTITY sync.flyout.pairSuccess.description2             "Tha sinn a' luchdadh a-nuas an dàta &syncBrand.shortName.label; a-nis sa chùlaibh. Gheibh thu na tabaichean cèin agad air duilleag tòiseachaidh &brandShortName;.">
new file mode 100644
--- /dev/null
+++ b/browser/metro/chrome/sync.properties
@@ -0,0 +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/.
+
+# LOCALIZATION NOTE: Used in the default os description when a new account
+# is being set up. Should be unique to Metro, so that it does not conflict
+# with Desktop. See /services/sync/modules/engines/clients.js locaName.
+sync.defaultAccountApplication=%S Metro
+
+# %S is the date and time at which the last sync successfully completed
+sync.flyout.connected.lastSynced=An sioncronachadh mu dheireadh: %S
+# %S is the username logged in
+sync.flyout.connected.account=Cunntas: %S
+# %S is the name that the user has chosen for this device
+sync.flyout.connected.device=An t-uidheam agad: %S
--- a/browser/pdfviewer/viewer.properties
+++ b/browser/pdfviewer/viewer.properties
@@ -25,27 +25,43 @@ next_label=Air adhart
 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
 presentation_mode.title=Gearr leum dhan mhodh taisbeanaidh
 presentation_mode_label=Am modh taisbeanaidh
 open_file.title=Fosgail faidhle
-open_file_label=Fosgail
+open_file_label=Fosgail faidhle
+print.title=Clò-bhuail
+print_label=Clò-bhuail
 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
 
+# Secondary toolbar and context menu
+tools.title=Innealan
+tools_label=Innealan
+first_page.title=Rach gun chiad duilleag
+first_page.label=Rach gun chiad duilleag
+first_page_label=Rach gun chiad duilleag
+last_page.title=Rach gun duilleag mu dheireadh
+last_page.label=Rach gun duilleag mu dheireadh
+last_page_label=Rach gun duilleag mu dheireadh
+page_rotate_cw.title=Cuairtich gu deiseil
+page_rotate_cw.label=Cuairtich gu deiseil
+page_rotate_cw_label=Cuairtich gu deiseil
+page_rotate_ccw.title=Cuairtich gu tuathail
+page_rotate_ccw.label=Cuairtich gu tuathail
+page_rotate_ccw_label=Cuairtich gu tuathail
+
 # Tooltips and alt text for side panel toolbar buttons
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Toglaich am bàr-taoibh
 toggle_sidebar_label=Toglaich am bàr-taoibh
 outline.title=Seall an sgrìobhainn far loidhne
 outline_label=Oir-loidhne na sgrìobhainne
 thumbs.title=Seall na dealbhagan
@@ -56,22 +72,16 @@ findbar_label=Lorg
 # 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}}
 
-# Context menu
-first_page.label=Rach gun chiad duilleag
-last_page.label=Rach gun duilleag mu dheireadh
-page_rotate_cw.label=Cuairtich deiseil
-page_rotate_ccw.label=Cuairtich deiseil
-
 # Find panel button title and messages
 find_label=Lorg:
 find_previous.title=Lorg làthair roimhe na h-abairt seo
 find_previous_label=Air ais
 find_next.title=Lorg ath-làthair na h-abairt seo
 find_next_label=Air adhart
 find_highlight=Soillsich a h-uile
 find_match_case_label=Aire do litrichean mòra is beaga
--- a/dom/chrome/accessibility/AccessFu.properties
+++ b/dom/chrome/accessibility/AccessFu.properties
@@ -19,32 +19,32 @@ rowheader      =       bann-cinn an ràigh
 column         =       colbh
 row            =       ràgh
 cell           =       cealla
 link           =       ceangal
 list           =       liosta
 listitem       =       ball na liosta
 outline        =       oir-loidhne
 outlineitem    =       nì oir-loidhne
-pagetab        =       taba duilleige
+pagetab        =       taba
 propertypage   =       duilleag nan roghainnean
 graphic        =       grafaig
 pushbutton     =       putan
 checkbutton    =       putan cromaige
 radiobutton    =       putan rèidio
 combobox       =       bogsa combo
 progressbar    =       bàr adhartais
 slider         =       sleamhnachan
 spinbutton     =       putan toinnidh
 diagram        =       diagram
 animation      =       beòthachadh
 equation       =       co-aontar
 buttonmenu     =       clàr-taice putain
 whitespace     =       àite bàn
-pagetablist    =       liosta nan taba duilleige
+pagetablist    =       liosta thabaichean
 canvas         =       canbhas
 checkmenuitem  =       nì a' chlàir-thaice chromaige
 label          =       leubail
 passwordtext   =       teacsa an fhacail-fhaire
 radiomenuitem  =       nì a' chlàir-thaice rèidio
 textcontainer  =       soitheach teacsa
 togglebutton   =       putan toglachaidh
 treetable      =       clàr craoibhe
@@ -77,16 +77,22 @@ headingLevel   =       leibheil a' bhann
 
 # more sophisticated list announcement
 listStart      =       A' chiad nì
 listEnd        =       An nì mu dheireadh
 # LOCALIZATION NOTE (listItemsCount): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 listItemsCount =       #1 nì;#1 nì;#1 nithean;#1 nì
 
+# LOCALIZATION NOTE: %1$S is the item's role name (e.g. "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 "tab 2 of 5".
+objItemOf      =       %1$S %2$S à %3$S
+
 # Landmark announcements
 banner         =       bratach
 complementary  =       co-shlànach
 contentinfo    =       fiosrachadh mun t-susbaint
 main           =       prìomh-chlàr-taice
 navigation     =       seòladaireachd
 search         =       lorg
 
@@ -118,32 +124,37 @@ 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
 
+# Live regions
+# 'hidden' will be spoken when something disappears in a live region.
+hidden         =      falaichte
+
 # 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
 stateHasPopup    =    aig a bheil priob-uinneag
+stateSelected    =    air a thaghadh
 
 # App modes
 editingMode    =      deasachadh
 navigationMode =      seòladh
 
 # Quick navigation modes
 quicknav_Simple      = Bunaiteach
 quicknav_Anchor      = Acraichean
--- a/dom/chrome/appstrings.properties
+++ b/dom/chrome/appstrings.properties
@@ -28,8 +28,10 @@ externalProtocolPrompt=Tha feum air aplacaid eile gus na ceanglaichean %1$S: a làimhseachadh.\n\n\nCeangal a dh'iarradh:\n\n%2$S\n\nAplacaid: %3$S\n\n\nMura robh dùil agad ris an iarrtas seo, dh'fhaodadh gu bheilear a' feuchainn ri fàth a ghabhail air laigse sa phrògram sin. Sguir dhen iarrtas seo mur eil thu cinnteach nach eil e droch rùnach.\n
 externalProtocolUnknown=<Neo-aithnichte>
 externalProtocolChkMsg=Cum an cuimhne mo roghainn airson gach ceangal dhen t-seòrsa seo.
 externalProtocolLaunchBtn=Cuir an aplacaid gu dhol
 malwareBlocked=Chaidh aithris gur e làrach ionnsaighe a tha san làrach %S is chaidh bacadh a chur air a-rèir do roghainnean tèarainteachd.
 phishingBlocked=Chaidh aithris gur e fallsaidheachd-lìn a tha san duilleag aig %S gus fiosrachadh pearsanta no ionmhasail fhaighinn o chleachdaichean tro mhealladh.
 cspFrameAncestorBlocked=Tha poileasaidh tèarainteachd susbainte aig an duilleag seo a tha a' cur casg air leabachadh air an dòigh seo.
 corruptedContentError=Cha ghabh an duilleag a dh'iarr thu a shealltainn a chionn 's gun deach mearachd a lorg ann an tar-chur an dàta.
 remoteXUL=Tha an duilleag seo a' cleachdadh teicneolas nach eil taic ann ris tuilleadh a ghnàth.
+#LOCALIZATION NOTE (tabcrashed): The following string is shown in the tab title if a page with a blank title has crashed. Current UX says that the tab title should remain blank
+tabcrashed=
--- a/dom/chrome/dom/dom.properties
+++ b/dom/chrome/dom/dom.properties
@@ -130,8 +130,10 @@ MozAudioDataWarning=Cha mholar cleachdadh an Audio Data API aig Mozilla tuilleadh.  Cleachd an Web Audio API 'na àite.
 # LOCALIZATION NOTE: Do not translate "LenientThis" and "this"
 LenientThisWarning=A' leigeil seachad "get" no "set" na roghainn aig a bheil [LenientThis] a chionn 's gu bheil an t-oibseact "This" cearr.
 # LOCALIZATION NOTE: Do not translate "nsIDOMWindowUtils", "getWindowWithOuterId", or "nsIWindowMediator"
 GetWindowWithOuterIdWarning=Cha mholar cleachdadh nsIDOMWindowUtils.getOuterWindowWithId() tuilleadh.  Cleachd dòigh nsIWindowMediator air an bheil an t-aon ainm 'na àite.
 # LOCALIZATION NOTE: Do not translate "getPreventDefault" or "defaultPrevented".
 GetPreventDefaultWarning=Use of getPreventDefault() is deprecated.  Use defaultPrevented instead.
 # LOCALIZATION NOTE: Do not translate "getUserData", "setUserData", "WeakMap", or "element.dataset".
 GetSetUserDataWarning=Use of getUserData() or setUserData() is deprecated.  Use WeakMap or element.dataset instead.
+# LOCALIZATION NOTE: Do not translate "mozGetAsFile" or "toBlob"
+MozGetAsFileWarning=The non-standard mozGetAsFile method is deprecated and will soon be removed.  Use the standard toBlob method instead.
--- a/dom/chrome/layout/HtmlForm.properties
+++ b/dom/chrome/layout/HtmlForm.properties
@@ -23,8 +23,16 @@ NoFileSelected=Cha deach faidhle a thagh
 # LOCALIZATION NOTE (NoFilesSelected): this string is shown on a
 # <input type='file' multiple> when there is no file selected yet.
 NoFilesSelected=Cha deach faidhle sam bith a thaghadh.
 # LOCALIZATION NOTE (XFilesSelected): this string is shown on a
 # <input type='file' multiple> when there are more than one selected file.
 # %S will be a number greater or equal to 2.
 XFilesSelected=Chaidh %S faidhlichean a thaghadh.
 ColorPicker=Tagh dath
+# LOCALIZATION NOTE (AndNMoreFiles): Semi-colon list of plural forms. 
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals 
+# This string is shown at the end of the tooltip text for <input type='file'
+# multiple> when there are more than 21 files selected (when we will only list
+# the first 20, plus an "and X more" line). #1 represents the number of files
+# minus 20 and will always be a number equal to or greater than 2. So the
+# singular case will never be used.
+AndNMoreFiles=agus #1 a bharrachd;agus #1 a bharrachd;agus #1 a bharrachd;agus #1 a bharrachd
--- a/dom/chrome/layout/MediaDocument.properties
+++ b/dom/chrome/layout/MediaDocument.properties
@@ -1,21 +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 (ImageTitleWithDimensionsAndFile): first %S is filename, second %S is type, third %S is width and fourth %S is height
+#LOCALIZATION NOTE (ImageTitleWithDimensions2AndFile): 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 (ImageTitleWithDimensions2): 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, %S x %S pixel)
+ImageTitleWithDimensions2AndFile=%S (Dealbh %S, %S x %S pixel)
 ImageTitleWithoutDimensions=%S (Dealbh %S)
-ImageTitleWithDimensions=(Dealbh %S, %Sx%S pixel)
+ImageTitleWithDimensions2=(Dealbh %S, %Sx%S pixel)
 ImageTitleWithNeitherDimensionsNorFile=(Dealbh %S)
 MediaTitleWithFile=%S (Oibseact %S)
 MediaTitleWithNoInfo=(Oibseact %S)
 
 InvalidImage=Cha ghabh an dealbh “%S” a shealltainn a chionn 's gu bheil mearachdan ann.
 ScaledImage=Air a sgèileadh (%S%%)
 
 TitleWithStatus=%S - %S
--- a/dom/chrome/mathml/mathml.properties
+++ b/dom/chrome/mathml/mathml.properties
@@ -1,12 +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/.
 
+InvalidChild=Invalid markup: <%1$S> is not allowed as a child of <%2$S>.
 ChildCountIncorrect=Markup mì-dhligheach: Àireamh chearr a chlann airson an taga <%1$S/>.
 DuplicateMprescripts=Markup mì-dhligheach: Barrachd air aon <mprescripts/> ann an <mmultiscripts/>.
 # LOCALIZATION NOTE:  The first child of <mmultiscript/> is the base, that is the element to which scripts are attached.
 NoBase=Markup mì-dhligheach: Bha dùil ri dìreach aon eileamaid Base ann an <mmultiscripts/>.  Cha deach gin a lorg.
 SubSupMismatch=Markup mì-dhligheach: Paidhir fho-sgrìobhte/os-sgrìobhte nach eil iomlan ann an <mmultiscripts/>.
 
 # LOCALIZATION NOTE:  When localizing the single quotes ('), follow the conventions in css.properties for your target locale.
 AttributeParsingError=Mearachd a' parsadh an luach "%1$S" airson buadh "%2$S" aig <%3$S/>.  Chaidh a bhuadh a leigeil seachad.
--- a/dom/chrome/security/csp.properties
+++ b/dom/chrome/security/csp.properties
@@ -1,59 +1,66 @@
 # 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/.
 
 # CSP Warnings:
-# LOCALIZATION NOTE (directiveViolated):
-# %1$S is the directive that has been violated.
-directiveViolated = Chaidh an steòrnadh %1$S a bhriseadh
-# LOCALIZATION NOTE (directiveViolatedWithURI):
+# LOCALIZATION NOTE (CSPViolation):
+# %1$S is the reason why the resource has not been loaded.
+CSPViolation = Tha roghainnean na duilleige a' bacadh luchdadh de ghoireas: %1$S
+# LOCALIZATION NOTE (CSPViolationWithURI):
 # %1$S is the directive that has been violated.
 # %2$S is the URI of the resource which violated the directive.
-directiveViolatedWithURI = Chaidh an steòrnadh %1$S a bhriseadh le %2$S
+CSPViolationWithURI = Tha roghainnean na duilleige a' bacadh luchdadh de ghoireas aig %2$S ("%1$S").
 # LOCALIZATION NOTE (triedToSendReport):
 # %1$S is the URI we attempted to send a report to.
 triedToSendReport = Chaidh oidhirp a dhèanamh aithisg a chur gu URI mì-dhligheach: "%1$S"
 # LOCALIZATION NOTE (errorWas):
 # %1$S is the error resulting from attempting to send the report
 errorWas = B' e "%1$S" a' mhearachd
 # LOCALIZATION NOTE (couldNotParseReportURI):
 # %1$S is the report URI that could not be parsed
 couldNotParseReportURI = Cha b' urrainn dhuinn URI na h-aithisge a pharsadh: %1$S
 # LOCALIZATION NOTE (couldNotProcessUnknownDirective):
 # %1$S is the unknown directive
 couldNotProcessUnknownDirective = Cha b' urrainn dhuinn an steòrnadh neo-aithnichte "%1$S" a phròiseasadh
-# LOCALIZATION NOTE (doNotUnderstandOption):
+# LOCALIZATION NOTE (ignoringUnknownOption):
 # %1$S is the option that could not be understood
-doNotUnderstandOption = Chan ghabh an roghainn "%1$S" a thuigsinn.  'Ga leigeil seachad.
-# LOCALIZATION NOTE (notETLDPlus1):
+ignoringUnknownOption = A' leigeil seachad roghainn nach aithne dhuinn, %1$S
+# LOCALIZATION NOTE (reportURInotETLDPlus1):
 # %1$S is the ETLD of the report URI that could not be used
-notETLDPlus1 = Cha ghabh URI na h-aithisge on Non-matching eTLD+1 a chleachdadh: %1$S
-# LOCALIZATION NOTE (notSameScheme):
+reportURInotETLDPlus1 = Feumaidh URI na h-aithisge (%1$S) a bhith on aon eTLD+1.
+# LOCALIZATION NOTE (reportURInotSameSchemeAsSelf, reportURInotSamePortAsSelf):
 # %1$S is the report URI that could not be used
-notSameScheme = Cha ghabh URI na h-aithisge le sgeama eadar-dhealaichte on sgrìobhainn thùsail a chleachdadh: %1$S
-# LOCALIZATION NOTE (notSamePort):
-# %1$S is the report URI that could not be used
-notSamePort = Cha ghabh URI na h-aithisge le port eadar-dhealaichte on sgrìobhainn thùsail a chleachdadh: %1$S
+reportURInotSameSchemeAsSelf = Feumaidh URI na h-aithisge (%1$S) a bhith co-ionnann ri sgeama na sgrìobhainn on dàinig e.
+reportURInotSamePortAsSelf = Feumaidh URI na h-aithisge (%1$S) a bhith co-ionnann ri port na sgrìobhainn on dàinig e.
 # LOCALIZATION NOTE (pageCannotSendReportsTo):
 # %1$S is the URI of the page with the policy
 # %2$S is the report URI that could not be used
 pageCannotSendReportsTo = Chan urrainn dhan duilleag air %1$S aithisgean a chur gu %2$S
 allowOrDefaultSrcRequired = Tha feum air steòrnadh "allow" no "default-src" ach chan eil e an làthair.  A' tilleadh gu "default-src 'none'"
 # LOCALIZATION NOTE (failedToParseUnrecognizedSource):
 # %1$S is the CSP Source that could not be parsed
 failedToParseUnrecognizedSource = Dh'fhàillig parsadh an tùis neo-aithnichte %1$S
 # LOCALIZATION NOTE (reportPostRedirect):
 # %1$S is the specified report URI before redirect
 reportPostRedirect = Dh'fhàillig postadh aithisg a' bhrisidh %1$S air sgàth ath-threòrachaidh
 # LOCALIZATION NOTE (allowDirectiveIsDeprecated):
 # Don't translate "allow" and "default-src" as they are keywords and part of
 # the CSP protocol syntax.
 allowDirectiveIsDeprecated = Cha mholar cleachdadh an allow directive tuilleadh, cleachd a sheise de default-src directive 'na àite
+# LOCALIZATION NOTE (inlineScriptBlocked):
+# inline script refers to JavaScript code that is embedded into the HTML document.
+inlineScriptBlocked = Chaidh bacadh a chur air oidhirp na sgriobtaichean am broinn na loidhne a chur an gnìomh
+# LOCALIZATION NOTE (inlineStyleBlocked):
+# inline style refers to CSS code that is embedded into the HTML document.
+inlineStyleBlocked = Chaidh bacadh a chur air oidhirp na siotaichean-stoidhle am broinn na loidhne a chur an gnìomh
+# LOCALIZATION NOTE (scriptFromStringBlocked):
+# eval is a name and should not be localized.
+scriptFromStringBlocked = Chaidh bacadh a chur air gairm air JavaScript o shreang (leth bhith a' gairm air foincsean mar eval)
 
 # CSP Errors:
 policyURINotAlone = Chan fhaod an steòrnadh policy-uri nochdadh ach 'na aonar
 noParentRequest = Cha ghabh am policy-uri fhaighinn as aonais iarrtas pàraint agus CSP.
 # LOCALIZATION NOTE (policyURIParseError):
 # %1$S is the URI that could not be parsed
 policyURIParseError = Cha b' urrainn dhuinn an URI sa URI phoileasaidh a pharsadh: %1$S
 # LOCALIZATION NOTE (nonMatchingHost):
--- a/dom/chrome/security/security.properties
+++ b/dom/chrome/security/security.properties
@@ -6,8 +6,13 @@ BlockMixedActiveContent = Chuir sinn cas
 # CSP
 ReportOnlyCSPIgnored=Thèid am poileasaidh CPS Report-only a leigeil seachad a chionn 's gun deach poileasaidhean CSP non-report-only a chleachdadh.
 # LOCALIZATION NOTE: Do not translate "X-Content-Security-Policy", "X-Content-Security-Policy-Report-Only",  "Content-Security-Policy" or "Content-Security-Policy-Report-Only"
 OldCSPHeaderDeprecated=Cha mholar bannan-cinn X-Content-Security-Policy agus X-Content-Security-Report-Only tuilleadh san àm ri teachd. Na cleachd ach bannan-cinn Content-Security-Policy agus Content-Security-Report-Only le CSP spec compliant syntax 'nan àite.
 # LOCALIZATION NOTE: Do not translate "X-Content-Security-Policy/Report-Only" or "Content-Security-Policy/Report-Only"
 BothCSPHeadersPresent=Shònraich an làrach an dà chuid bann-cinn X-Content-Security-Policy/Report-Only agus bann-cinn Content-Security-Policy/Report-Only. Thèid na bannan-cinn X-Content-Security-Policy/Report-Only a leigeil seachad.
 # LOCALIZATION NOTE: Do not translate "Strict-Transport-Security" or "HSTS"
 InvalidSTSHeaders=Shònraich an làrach seo bann-cinn Strict-Transport-Security nach eil dligheach.
+InsecurePasswordsPresentOnPage=Tha raointean fhaclan-faire air duilleag (http://) nach eil tèarainte. Seo cunnart tèarainteachd agus faodaidh gun goidear faclan-faire air an luchd-chleachdaidh.
+InsecureFormActionPasswordsPresent=Tha raointean fhaclan-faire air ann am foirm le gnìomh foirm (http://) nach eil tèarainte. Seo cunnart tèarainteachd agus faodaidh gun goidear faclan-faire air an luchd-chleachdaidh.
+InsecurePasswordsPresentOnIframe=Tha raointean fhaclan-faire ann an iframe (http://) nach eil tèarainte. Seo cunnart tèarainteachd agus faodaidh gun goidear faclan-faire air an luchd-chleachdaidh.
+LoadingMixedActiveContent=A' luchdadh susbaint ghnìomhach mheasgaichte (neo-thèarainte) air duilleag thèarainte "%1$S"
+LoadingMixedDisplayContent=A' luchdadh susbaint taisbeanaidh mheasgaichte (neo-thèarainte) air duilleag thèarainte "%1$S"
--- a/security/manager/chrome/pippki/certManager.dtd
+++ b/security/manager/chrome/pippki/certManager.dtd
@@ -34,26 +34,22 @@
 <!ENTITY certmgr.certdetail.o                 "Buidheann (Organisation, O)">
 <!ENTITY certmgr.certdetail.ou                "Aonad na buidhne (Organisational Unit, OU)">
 <!ENTITY certmgr.certdetail.serialnumber      "Àireamh shreathach">
 <!ENTITY certmgr.certdetail.sha1fingerprint   "Lorg-meur SHA1">
 <!ENTITY certmgr.certdetail.md5fingerprint    "Lorg-meur MD5">
 
 <!ENTITY certmgr.editcert.title               "Deasaich roghainnean nan teisteanasan tèarainteachd">
 <!ENTITY certmgr.editcacert.title             "Deasaich roghainnean earbsa de theisteanasan nan ùghdarrasan teisteanachaidh">
-<!ENTITY certmgr.editsslcert.title            "Deasaich roghainnean earbsa ann an teisteanasan de làraichean-lìn">
 <!ENTITY certmgr.editcert.edittrust           "Deasaich na roghainnean earbsa:">
 <!ENTITY certmgr.editcert.trustssl            "'S urrainn dhan teisteanas seo làraichean-lìn aithneachadh.">
 <!ENTITY certmgr.editcert.trustemail          "'S urrainn dhan teisteanas seo cleachdaichean puist-dhealain aithneachadh.">
 <!ENTITY certmgr.editcert.trustobjsign        "'S urrainn dhan teisteanas luchd-saothrachaidh bathar-bog aithneachadh.">
-<!ENTITY certmgr.editsslcert.edittrust        "Deasaich roghainnean earbsa nan teisteanasan:">
-<!ENTITY certmgr.editsslcert.dotrust          "Cuir earbsa ann an dearbhachd an teisteanais seo.">
-<!ENTITY certmgr.editsslcert.donttrust        "Na cuir earbsa ann an dearbhachd an teisteanais seo.">
 <!ENTITY certmgr.editemailcert.title          "Deasaich roghainnean earbsa nan teisteanasan puist-dhealain">
-<!ENTITY certmgr.editemailcert.edittrust      "Deasaich roghainnean earbsa nan teisteanasan:">
+<!ENTITY certmgr.editemailcert.edittrust      "Deasaich roghainnean earbsa an teisteanais:">
 <!ENTITY certmgr.editemailcert.dotrust        "Cuir earbsa ann an dearbhachd an teisteanais seo.">
 <!ENTITY certmgr.editemailcert.donttrust      "Na cuir earbsa ann an dearbhachd an teisteanais seo.">
 
 <!ENTITY certmgr.deletecert.title             "Sguab às teisteanas">
 <!ENTITY certmgr.deletecert.beforename        "Dh'iarr thu an teisteanas seo a sguabadh às:">
 <!ENTITY certmgr.deletecert.aftername         "A' bheil thu cinnteach gu bheil thu airson an teisteanas seo a sguabadh às?">
 <!ENTITY certmgr.deleteusercert.title         "Sguab às an teisteanas agad">
 <!ENTITY certmgr.deleteusercert.beforename    "Dh'iarr thu an teisteanas a leanas a sguabadh às:">
--- a/security/manager/chrome/pippki/pippki.properties
+++ b/security/manager/chrome/pippki/pippki.properties
@@ -8,17 +8,16 @@ CertPassPrompt=Cuir a-steach facal-faire na tèarainteachd phearsanta airson uidheam 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)
 
 #For editing cert trust
 editTrustWindowTitle=Deasaich earbsa san teisteanas
 editTrustCA=Tha an teisteanas "%S" a' riochdachadh ùghdarras teisteanachaidh.
-editTrustSSL=Chaidh an teisteanas "%S" fhoillseachadh le:
 editTrustEmail=Chaidh an teisteanas "%S" fhoillseachadh le:
 issuerNotTrusted=A chionn 's nach eil earbsa agad san ùghdarras teisteanachaidh a dh'fhoillsich an teisteanas seo, chan eil earbsa agad ann an dearbhadh an teisteanais seo ach ma chomharraicheas tu a chaochladh an-seo.
 issuerTrusted=A chionn 's gu bheil earbsa agad san ùghdarras teisteanachaidh a dh'fhoillsich an teisteanas seo, tha earbsa agad ann an dearbhadh an teisteanais seo ach ma chomharraicheas tu a chaochladh an-seo.
 issuerNotKnown=A chionn 's nach aithne dhut an t-ùghdarras teisteanachaidh a dh'fhoillsich an teisteanas seo, chan eil earbsa agad ann an dearbhadh an teisteanais seo ach ma chomharraicheas tu a chaochladh an-seo.
 issuerCertNotFound=Cha deach teisteanas a lorg airson an ùghdarrais theisteanachaidh seo
 
 #For Deleting Certificates
 deleteSslCertConfirm3=A bheil thu cinnteach gu bheil thu airson na h-eisgeachdan frithealaiche seo a sguabadh às?
--- a/services/sync/sync.properties
+++ b/services/sync/sync.properties
@@ -35,8 +35,16 @@ error.sync.needUpdate.accesskey = Ù
 error.sync.tryAgainButton.label = Co-shioncronaich an-dràsta
 error.sync.tryAgainButton.accesskey = s
 warning.sync.quota.label = A' tighinn faisg air cuota an fhrithealaiche
 warning.sync.quota.description = Tha thu a' tighinn faisg air cuota an fhrithealaiche. Thoir sùil eile air an dàta a tha ri cho-shioncronachadh.
 error.sync.quota.label = Chaidh thu thairis air cuota an fhrithealaiche
 error.sync.quota.description = Dh'fhàillig an co-shioncronachadh a chionn 's gun deach e thairis air cuota an fhrithealaichte. Thoir sùil eile air an dàta a tha ri cho-shioncronachadh.
 error.sync.viewQuotaButton.label = Seall an cuota
 error.sync.viewQuotaButton.accesskey = S
+warning.sync.eol.label = Tha an t-seirbheis a' dùnadh
+# %1: the app name (Firefox)
+warning.sync.eol.description = Tha an t-seirbheis Firefox Sync agad a' dol a dhùnadh a dh'aithghearr. Dèan àrdachadh gu %1$S airson cumail a' dol leis an t-sioncronachadh.
+error.sync.eol.label = Chan eil an t-seirbheis ri fhaighinn
+# %1: the app name (Firefox)
+error.sync.eol.description = Chan eil an t-seirbheis Firefox Sync agad ri fhaighinn tuilleadh. Dèan àrdachadh gu %1$S airson cumail a' dol leis an t-sioncronachadh.
+sync.eol.learnMore.label = Barrachd fiosrachaidh
+sync.eol.learnMore.accesskey = L
new file mode 100644
--- /dev/null
+++ b/toolkit/chrome/global/aboutNetworking.dtd
@@ -0,0 +1,31 @@
+<!-- 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 aboutNetworking.title                 "Mu dhèidhinn lìonraidhean">
+<!ENTITY aboutNetworking.warning               "Tha seo air leth deuchainneil, na cleachd seo gun inbheach ri do thaobh.">
+<!ENTITY aboutNetworking.showNextTime          "Seall an rabhadh seo an ath-thuras">
+<!ENTITY aboutNetworking.ok                    "Ceart ma-tha">
+<!ENTITY aboutNetworking.http                  "Http">
+<!ENTITY aboutNetworking.sockets               "Socaidean">
+<!ENTITY aboutNetworking.dns                   "DNS">
+<!ENTITY aboutNetworking.websockets            "WebSockets">
+<!ENTITY aboutNetworking.refresh               "Ath-nuadhaich">
+<!ENTITY aboutNetworking.autoRefresh           "Ath-nuadhaich a h-uile 3 diogan">
+<!ENTITY aboutNetworking.hostname              "Ainm an òstair">
+<!ENTITY aboutNetworking.port                  "Port">
+<!ENTITY aboutNetworking.spdy                  "SPDY">
+<!ENTITY aboutNetworking.ssl                   "SSL">
+<!ENTITY aboutNetworking.active                "Gnìomhach">
+<!ENTITY aboutNetworking.idle                  "Idle">
+<!ENTITY aboutNetworking.host                  "Òstair">
+<!ENTITY aboutNetworking.tcp                   "TCP">
+<!ENTITY aboutNetworking.sent                  "Air a chur">
+<!ENTITY aboutNetworking.received              "Air fhaighinn">
+<!ENTITY aboutNetworking.family                "Teaghlach">
+<!ENTITY aboutNetworking.addresses             "Seòlaidhean">
+<!ENTITY aboutNetworking.expires               "Falbhaidh an ùine air (ann an diogan)">
+<!ENTITY aboutNetworking.messagesSent          "Teachdaireachdan a chaidh a chur">
+<!ENTITY aboutNetworking.messagesReceived      "Teachdaireachdan a fhuaradh">
+<!ENTITY aboutNetworking.bytesSent             "Bytes a chaidh a chur">
+<!ENTITY aboutNetworking.bytesReceived         "Bytes a fhuaradh">
--- a/webapprt/webapprt/webapp.dtd
+++ b/webapprt/webapprt/webapp.dtd
@@ -13,21 +13,23 @@
 
 <!ENTITY quitApplicationCmdWin.label        "Fàg an-seo">
 <!ENTITY quitApplicationCmdWin.accesskey    "F">
 <!ENTITY quitApplicationCmd.label           "Fàg an-seo">
 <!ENTITY quitApplicationCmd.accesskey       "F">
 <!-- On Mac, we create the Quit and Hide command labels dynamically,
    - using properties in window.properties, in order to include the name
    - of the webapp in the labels without creating a DTD file for it. -->
-<!ENTITY quitApplicationCmdMac.key          "Q">
 <!ENTITY hideThisAppCmdMac.key              "H">
 <!ENTITY hideOtherAppsCmdMac.label          "Cuir càch am falach">
 <!ENTITY hideOtherAppsCmdMac.key            "H">
 <!ENTITY showAllAppsCmdMac.label            "Seall na h-uile">
+<!-- LOCALIZATION NOTE(quitApplicationCmdUnix.key): This keyboard shortcut is used by both Linux and OSX -->
+
+<!ENTITY quitApplicationCmdUnix.key          "Q">
 
 <!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">
--- a/webapprt/webapprt/webapp.properties
+++ b/webapprt/webapprt/webapp.properties
@@ -15,20 +15,28 @@ 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.allow=Nochd m' àite
+geolocation.deny=Na nochd d' àite
 geolocation.remember=Cuimhnich mo roghainn
 
+# LOCALIZATION NOTE (desktop-notification.title): %S will be replaced with the
+# name of the webapp.
+desktop-notification.title=%S - Seall na brathan
+desktop-notification.description=A bheil thu airson brathan a cheadachadh?
+desktop-notification.allow=Seall
+desktop-notification.deny=Na seall
+desktop-notification.remember=Cuimhnich mo roghainn
+
 # LOCALIZATION NOTE (webapps.install.title): %S will be replaced with the name
 # of the webapp being installed.
 webapps.install.title=Stàlaich %S
 # LOCALIZATION NOTE (webapps.install.description): %S will be replaced with the
 # name of the webapp being installed.
 webapps.install.description=A bheil thu airson %S a stàladh?
 webapps.install.install=Stàlaich an aplacaid
 webapps.install.dontinstall=Na stàlaich