Acholi: update for Aurora 18
authorSan Emmanuel James [Pootle] <sjolweny85@yahoo.co.uk>
Mon, 12 Nov 2012 15:34:20 +0200
changeset 45 23de37884fb3810745cdea793e024b16baae3b64
parent 37 4a223f85b8c83be77ca6005f73ce0384bfdfc4ab
child 69 717f416183763bdb560ae37f86c3aca4c17fedbb
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:39:32 +0000
Acholi: update for Aurora 18
browser/chrome/browser/aboutSyncTabs.dtd
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/devtools/debugger.dtd
browser/chrome/browser/devtools/debugger.properties
browser/chrome/browser/devtools/gclicommands.properties
browser/chrome/browser/devtools/responsiveUI.properties
browser/chrome/browser/devtools/scratchpad.dtd
browser/chrome/browser/devtools/scratchpad.properties
browser/chrome/browser/devtools/webConsole.dtd
browser/chrome/browser/preferences/aboutPermissions.dtd
browser/chrome/browser/preferences/main.dtd
browser/chrome/browser/preferences/sync.dtd
browser/chrome/browser/syncKey.dtd
browser/chrome/browser/syncSetup.dtd
browser/chrome/browser/syncSetup.properties
browser/defines.inc
browser/installer/nsisstrings.properties
browser/pdfviewer/chrome.properties
browser/pdfviewer/viewer.properties
browser/profile/bookmarks.inc
dom/chrome/dom/dom.properties
dom/chrome/security/csp.properties
mobile/android/base/android_strings.dtd
mobile/android/base/sync_strings.dtd
mobile/android/chrome/about.dtd
mobile/android/chrome/aboutApps.dtd
mobile/android/chrome/aboutDownloads.properties
mobile/android/chrome/aboutHome.dtd
mobile/android/chrome/browser.properties
mobile/android/defines.inc
mobile/profile/bookmarks.inc
mobile/xul/chrome/about.dtd
mobile/xul/defines.inc
security/manager/chrome/pipnss/pipnss.properties
services/sync/sync.properties
toolkit/chrome/global/about.dtd
toolkit/chrome/global/aboutRights.dtd
toolkit/chrome/global/aboutSupport.dtd
toolkit/chrome/global/aboutSupport.properties
toolkit/chrome/global/devtools/debugger.properties
toolkit/chrome/global/languageNames.properties
toolkit/chrome/global/webapps.properties
toolkit/chrome/mozapps/extensions/extensions.dtd
toolkit/chrome/mozapps/extensions/extensions.properties
toolkit/chrome/mozapps/plugins/plugins.dtd
toolkit/chrome/mozapps/plugins/plugins.properties
toolkit/chrome/mozapps/update/updates.dtd
toolkit/chrome/mozapps/update/updates.properties
--- a/browser/chrome/browser/aboutSyncTabs.dtd
+++ b/browser/chrome/browser/aboutSyncTabs.dtd
@@ -1,14 +1,14 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<!-- LOCALIZATION NOTE (tabs.otherComputers.label): Keep this in sync with syncTabsMenu.label from browser.dtd -->
+<!-- LOCALIZATION NOTE (tabs.otherDevices.label): Keep this in sync with syncTabsMenu2.label from browser.dtd -->
 
-<!ENTITY tabs.otherComputers.label               "Yab ki kompiuta mapat">
+<!ENTITY tabs.otherDevices.label               "Tabs From Other Devices">
 
 <!ENTITY tabs.searchText.label                   "Co kany me nongo lanyik…">
 <!-- LOCALIZATION NOTE (tabs.context.openTab.accesskey, tabs.context.openMultipleTabs.accesskey):
      Only one of these will show at a time (based on selection), so reusing accesskey is ok. -->
 
 <!ENTITY tabs.context.openTab.label                   "Yab Lanyik Man">
 <!ENTITY tabs.context.openTab.accesskey               "Y">
 <!ENTITY tabs.context.openMultipleTabs.label          "Yab Lanyik ma kiyero">
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -17,26 +17,26 @@
 <!-- Tab context menu -->
 
 <!ENTITY  reloadTab.label                    "Nwo cano ne Tab">
 <!ENTITY  reloadTab.accesskey                "N">
 <!ENTITY  reloadAllTabs.label                "Nwo cano ne Tab Weng">
 <!ENTITY  reloadAllTabs.accesskey            "T">
 <!ENTITY  closeOtherTabs.label               "Ceg Nget dirica mukene">
 <!ENTITY  closeOtherTabs.accesskey           "N">
-<!-- LOCALIZATION NOTE (pinAppTab.label, unpinAppTab.label): "Pin" is being
+<!-- LOCALIZATION NOTE (pinTab.label, unpinTab.label): "Pin" is being
 used as a metaphor for expressing the fact that these tabs are "pinned" to the
 left edge of the tabstrip. Really we just want the string to express the idea
 that this is a lightweight and reversible action that keeps your tab where you
 can reach it easily. -->
 
-<!ENTITY  pinAppTab.label                    "Dii macalo dirica matidi ma kicoyo">
-<!ENTITY  pinAppTab.accesskey                "D">
-<!ENTITY  unpinAppTab.label                  "Pe idii gin makicoyo">
-<!ENTITY  unpinAppTab.accesskey              "c">
+<!ENTITY  pinTab.label                       "Pin Tab">
+<!ENTITY  pinTab.accesskey                   "P">
+<!ENTITY  unpinTab.label                     "Pe idii gin makicoyo">
+<!ENTITY  unpinTab.accesskey                 "c">
 <!ENTITY  moveToGroup.label                  "Cwal ii dul.gin makidiyo">
 <!ENTITY  moveToGroup.accesskey              "C">
 <!ENTITY  moveToNewGroup.label               "Dul Manyen">
 <!ENTITY  moveToNewWindow.label              "Cwal l Dirica Manyen">
 <!ENTITY  moveToNewWindow.accesskey          "D">
 <!ENTITY  bookmarkAllTabs.label              "Yab pot buk Weng Tab…">
 <!ENTITY  bookmarkAllTabs.accesskey          "T">
 <!ENTITY  undoCloseTab.label                 "Jwa lor dirica">
@@ -203,18 +203,18 @@ These should match what Safari and other
 <!ENTITY errorConsoleCmd.label        "Bal ki ka yubone">
 <!ENTITY errorConsoleCmd.accesskey    "k">
 <!ENTITY errorConsoleCmd.commandkey   "j">
 
 <!ENTITY webConsoleCmd.label          "Coc me Web">
 <!ENTITY webConsoleCmd.accesskey      "C">
 <!ENTITY webConsoleCmd.commandkey     "k">
 
-<!ENTITY inspectMenu.label            "Ngiyone matutd">
-<!ENTITY inspectMenu.accesskey        "d">
+<!ENTITY inspectMenu.label            "Ngiyo matut">
+<!ENTITY inspectMenu.accesskey        "N">
 <!ENTITY inspectMenu.commandkey       "I">
 
 <!ENTITY inspectContextMenu.label     "Ngiyo gin moni">
 <!ENTITY inspectContextMenu.accesskey "Q">
 
 <!ENTITY responsiveDesignTool.label   "Neno me Yubu Kakare">
 <!ENTITY responsiveDesignTool.accesskey "N">
 <!ENTITY responsiveDesignTool.commandkey "M">
@@ -230,27 +230,25 @@ These should match what Safari and other
   -  "simple discardable text editor". -->
 
 <!ENTITY scratchpad.label             "Gin laruce">
 <!ENTITY scratchpad.accesskey         "G">
 <!ENTITY scratchpad.keycode           "VK_F4">
 <!ENTITY scratchpad.keytext           "F4">
 
 <!ENTITY inspectCloseButton.tooltiptext "Langic Matut">
+<!ENTITY inspectSidebarCloseButton.tooltiptext "Close sidebar">
 
 <!ENTITY devToolbarCloseButton.tooltiptext "Lor Gin tic pa Luyub">
 <!ENTITY devToolbarMenu.label              "Luyub Bar me gin tic">
 <!ENTITY devToolbarMenu.accesskey          "y">
 <!ENTITY devToolbar.keycode                "VK_F2">
 <!ENTITY devToolbar.keytext                "F2">
 <!ENTITY devToolbarOtherToolsButton.label  "More Tools">
 
-<!ENTITY webConsoleButton.label "Web Console">
-<!ENTITY inspectorButton.label "Lakwed te">
-
 <!ENTITY inspectorHTMLCopyInner.label       "Lok HTML ma iyie">
 <!ENTITY inspectorHTMLCopyInner.accesskey   "H">
 
 <!ENTITY inspectorHTMLCopyOuter.label       "Lok HTML ma woko">
 <!ENTITY inspectorHTMLCopyOuter.accesskey   "H">
 
 <!ENTITY inspectorHTMLDelete.label          "Jwa woko coc">
 <!ENTITY inspectorHTMLDelete.accesskey      "J">
@@ -445,17 +443,17 @@ These should match what Safari and other
 <!ENTITY saveLinkCmd.accesskey        "e">
 <!ENTITY saveImageCmd.label           "Gwok Cal Calo…">
 <!ENTITY saveImageCmd.accesskey       "k">
 <!ENTITY saveVideoCmd.label           "Gwok Video Calo…">
 <!ENTITY saveVideoCmd.accesskey       "V">
 <!ENTITY saveAudioCmd.label           "Gwok Dwon Calo…">
 <!ENTITY saveAudioCmd.accesskey       "o">
 <!ENTITY emailImageCmd.label          "Email Image…">
-<!ENTITY emailImageCmd.accesskey      "a">
+<!ENTITY emailImageCmd.accesskey      "g">
 <!ENTITY emailVideoCmd.label          "Email Video…">
 <!ENTITY emailVideoCmd.accesskey      "a">
 <!ENTITY emailAudioCmd.label          "Email Audio…">
 <!ENTITY emailAudioCmd.accesskey      "a">
 <!ENTITY copyLinkCmd.label            "Lok Kabedo me Kakube">
 <!ENTITY copyLinkCmd.accesskey        "e">
 <!ENTITY copyImageCmd.label           "Lok Kabedo me Cal">
 <!ENTITY copyImageCmd.accesskey       "o">
@@ -529,17 +527,17 @@ you can use these alternative items. Oth
 
 <!ENTITY fullZoomToggleCmd.label        "Kwot Gin Acoya">
 <!ENTITY fullZoomToggleCmd.accesskey    "G">
 <!ENTITY fullZoom.label                 "Kwoti">
 <!ENTITY fullZoom.accesskey             "K">
 
 <!ENTITY newTabButton.tooltip           "Yab dirica matidi manyen">
 <!ENTITY newWindowButton.tooltip        "Yab dirica manyen">
-<!ENTITY sidebarCloseButton.tooltip     "Ceg gintic ma ingete">
+<!ENTITY sidebarCloseButton.tooltip     "Close sidebar">
 
 <!ENTITY cutButton.tooltip              "Ngol">
 <!ENTITY copyButton.tooltip             "Lok">
 <!ENTITY pasteButton.tooltip            "Mwon">
 
 <!ENTITY fullScreenButton.tooltip       "Yar dirica i wang komputa weng">
 
 <!ENTITY zoomOutButton.tooltip          "Jwiki">
@@ -616,19 +614,19 @@ just addresses the organization to follo
 <!ENTITY identity.moreInfoLinkText "Ngec Mapol…">
 
 <!ENTITY downloadMonitor2.tooltip "Dii wek oyab yabo Dirica">
 
 <!ENTITY allTabs.filter.emptyText "Yeny Dirica matino">
 <!-- Name for the tabs toolbar as spoken by screen readers.
      The word "toolbar" is appended automatically and should not be contained below! -->
 <!ENTITY tabsToolbar.label "Yeny Dirica weng">
-<!-- LOCALIZATION NOTE (syncTabsMenu.label): This appears in the history menu -->
+<!-- LOCALIZATION NOTE (syncTabsMenu2.label): This appears in the history menu -->
 
-<!ENTITY syncTabsMenu.label     "Dirica matino ma oa ii Komputa mukene mapat">
+<!ENTITY syncTabsMenu2.label     "Tabs From Other Devices">
 
 <!ENTITY syncBrand.shortName.label    "Sync">
 
 <!ENTITY syncSetup.label              "later ne &syncBrand.shortName.label;…">
 <!ENTITY syncSetup.accesskey          "Y">
 <!ENTITY syncSyncNowItem.label        "Il marom Kombedi">
 <!ENTITY syncSyncNowItem.accesskey    "I">
 <!ENTITY syncToolbarButton.label      "Ilo lapor marom">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -43,18 +43,16 @@ addonDownloadCancelTooltip=Juki
 # LOCALIZATION NOTE (addonsInstalled, addonsInstalledNeedsRestart):
 # Semi-colon list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 first add-on's name, #2 number of add-ons, #3 application name
 addonsInstalled=#1 kityeko royo teko ne maber.;#2 lamed ikome kityeko keto maber.
 addonsInstalledNeedsRestart=#1 kibiketo ne inge yonge cako ne odoco #3 Lammed ne, kibiroyo ka inwoyo cako ne #3. ;#2
 addonInstallRestartButton=Cak odoco kombedi
 addonInstallRestartButton.accesskey=R
-addonInstallManage=Yab Gin madoro Lamed ne
-addonInstallManage.accesskey=o
 
 # LOCALIZATION NOTE (addonError-1, addonError-2, addonError-3, addonError-4):
 # #1 is the add-on name, #2 is the host name, #3 is the application name
 # #4 is the application version
 addonError-1=Lamed Nen onongo pe twero kwanyo pien lakube ma ikome pe otiyo #2.
 addonError-2=Lame-on ki #2 pe onongo twero kete pien perwate ki add-on #3 ma obedo kuro.
 addonError-3=Lamede makwnyo ki #2 pe onongo romo kete pien nen calo obale woko.
 addonError-4=#1 pe onongo twero kete pien #3 pe romo yubo pwilmaite.
@@ -115,17 +113,17 @@ crashedpluginsMessage.reloadButton.label
 crashedpluginsMessage.reloadButton.accesskey=R
 crashedpluginsMessage.submitButton.label=Cwal ngec me to woko
 crashedpluginsMessage.submitButton.accesskey=S
 crashedpluginsMessage.learnMore=Nong ngec madwong…
 carbonFailurePluginsMessage.message=Pot buk man penyo pi tic ki rwako iye gin maromo ngwec ka i kit bit-32
 carbonFailurePluginsMessage.restartButton.label=Nwo cako ii kit bit-32
 carbonFailurePluginsMessage.restartButton.accesskey=R
 activatePluginsMessage.message=Onyo imito keto rwako iyie ikom pot buk man?
-activatePluginsMessage.label=Activate All Plugins
+activateAllPluginsMessage.label=Activate All Plugins
 activatePluginsMessage.accesskey=A
 activatePluginsMessage.always=Pol kare ket rwak iyie pi dyer bar man
 activatePluginsMessage.always.accesskey=c
 activatePluginsMessage.never=Pe i ket rwak iyie pi dyer bar man
 activatePluginsMessage.never.accesskey=N
 activateSinglePlugin=Activate
 PluginClickToPlay=Click here to activate the %S plugin.
 # LOCALIZATION NOTE - "vulnerable" indicates there is a security bug in the
@@ -345,16 +343,26 @@ browser.menu.showCharacterEncoding=Goba
 # the add bookmark star panel.  %S will be replaced by syncBrandShortName.
 # The final space separates this text from the Learn More link.
 syncPromoNotification.bookmarks.description=I twero nongo i alama me pot buk mamegi i nyonyo mamegi weng kwede %S. 
 # LOCALIZATION NOTE (syncPromoNotification.passwords.label): This appears in
 # the remember password panel.  %S will be replaced by syncBrandShortName.
 # The final space separates this text from the Learn More link.
 syncPromoNotification.passwords.description=Itwero nongo mungi me donyo i kom nyonyo mamegi weng ki ii %S. 
 syncPromoNotification.learnMoreLinkText=Nong ngec mapol
+# LOCALIZATION NOTE (syncPromoNotification.addons.label): This appears in
+# the add-on install complete panel when Sync isn't set.
+# %S will be replaced by syncBrandShortName.
+# The final space separates this text from the Learn More link.
+syncPromoNotification.addons.description=You can access your add-ons on all your devices with %S. 
+# LOCALIZATION NOTE (syncPromoNotification.addons-sync-disabled.label):
+# This appears in the add-on install complete panel when Sync is set
+# but addons sync is not. %S will be replaced by syncBrandShortName.
+# The final space separates this text from the Learn More link.
+syncPromoNotification.addons-sync-disabled.description=You can use your %S account to synchronize add-ons across multiple devices. 
 
 # Telemetry prompt
 # LOCALIZATION NOTE (telemetryOptInPrompt): %1$S will be replaced by
 # brandFullName, and %2$S by the value of the toolkit.telemetry.server_owner
 # preference.
 telemetryOptInPrompt = I twero konyo me yiko %1$S kun i cwalo ngec ikom kit ma tic woto kwede, nyonyo, tice, ki keto pa dano i %2$S?
 telemetryLinkLabel = Nong ngec Mapol
 telemetryYesButtonLabel2 = Eyo, Amito konyo
@@ -363,19 +371,16 @@ telemetryNoButtonLabel = Pe
 telemetryNoButtonAccessKey = N
 
 # Webapps notification popup
 webapps.install = Keti
 webapps.install.accesskey = I
 #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 = Onyo imito keto "%1$S" ni aa ki dyer bar man (%2$S)?
 webapps.install.success = Gityeko keto dong Purugram
-# LOCALIZATION NOTE (webapps.uninstall.notification): %S will be replaced with the name of the uninstalled web app
-webapps.uninstall.notification = %S has been uninstalled from your computer.
-webapps.uninstall.label = Uninstall App
 
 # Telemetry opt-out prompt for Aurora and Nightly
 # LOCALIZATION NOTE (telemetryOptOutPrompt): %1$S and %3$S will be replaced by
 # brandFullName, and %2$S by the value of the toolkit.telemetry.server_owner preference.
 telemetryOptOutPrompt = %1$S cwal ngec ikom kit matiyo kwede, nyonyo, tice ki ketone mamegi cen bot %2$S pi konyo yiko %3$S.
 
 # LOCALIZATION NOTE (fullscreen.entered): displayed when we enter HTML5 fullscreen mode, %S is the domain name of the focused website (e.g. mozilla.com).
 fullscreen.entered=%S kombedi dong tye ki wang kompiuta lung.
@@ -384,34 +389,57 @@ fullscreen.rememberDecision=Poo wii i mo
 
 # LOCALIZATION NOTE (social.toggle.label): %1$S is the name of the social provider, %2$S is brandShortName (e.g. Firefox)
 social.toggle.label=%1$S for %2$S
 social.toggle.accesskey=f
 
 # LOCALIZATION NOTE (social.activated.description): %1$S is the name of the social provider, %2$S is brandShortName (e.g. Firefox)
 social.activated.description=You've turned on %1$S for %2$S.
 
+# LOCALIZATION NOTE (social.remove.label): %S = brandShortName
+social.remove.label=Remove from %S
+social.remove.accesskey=R
+# LOCALIZATION NOTE (social.remove.confirmationLabel): %1$S is the name of the social provider, %2$S is brandShortName (e.g. Firefox)
+social.remove.confirmationLabel=Are you sure you want to remove %1$S for %2$S?
+# LOCALIZATION NOTE (social.remove.confirmationOK): %S is the name of the social provider
+social.remove.confirmationOK=Remove %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=%1$S is unable to connect with %2$S right now.
 social.error.tryAgain.label=Try Again
 social.error.tryAgain.accesskey=T
 social.error.ok.label=OK
 social.error.ok.accesskey=O
 social.error.closeSidebar.label=Close This Sidebar
 social.error.closeSidebar.accesskey=C
 
 # Identity notifications popups
 identity.termsOfService = Terms of Service
 identity.privacyPolicy = Privacy Policy
+# LOCALIZATION NOTE (identity.chooseIdentity.description): %S is the website origin (e.g. https://www.mozilla.org) shown in popup notifications.
 identity.chooseIdentity.description = Sign in to %S
 identity.chooseIdentity.label = Use an existing email
 identity.newIdentity.label = Use a different email
 identity.newIdentity.accessKey = e
 identity.newIdentity.email.placeholder = Email
-# LOCALIZATION NOTE (identity.newIdentity.description, identity.chooseIdentity.description): %S is the website origin (ie. https://www.mozilla.org) shown in popup notifications.
+# LOCALIZATION NOTE (identity.newIdentity.description): %S is the website origin (e.g. https://www.mozilla.org) shown in popup notifications.
 identity.newIdentity.description = Enter your email address to sign in to %S
 identity.next.label = En mukene
 identity.next.accessKey = n
 # LOCALIZATION NOTE: shown in the popup notification when a user successfully logs into a website
-# LOCALIZATION NOTE (identity.loggedIn.description): %S is the website origin (ie. https://www.mozilla.org)
+# LOCALIZATION NOTE (identity.loggedIn.description): %S is the user's identity (e.g. user@example.com)
 identity.loggedIn.description = Signed in as: %S
 identity.loggedIn.signOut.label = Sign Out
 identity.loggedIn.signOut.accessKey = O
+
+# LOCALIZATION NOTE (getUserMedia.shareCamera.message, getUserMedia.shareMicrophone.message, getUserMedia.shareCameraAndMicrophone.message): %S is the website origin (e.g. www.mozilla.org)
+# LOCALIZATION NOTE (getUserMedia.shareMicrophone.message, getUserMedia.shareSpecificMicrophone.label): %S is the website origin (e.g. www.mozilla.org)
+getUserMedia.shareCamera.message = Would you like to share your camera with %S?
+getUserMedia.shareCamera.label = Share Camera
+getUserMedia.shareCamera.accesskey = S
+getUserMedia.shareSpecificCamera.label = Share Camera: %S
+getUserMedia.shareMicrophone.message = Would you like to share your microphone with %S?
+getUserMedia.shareMicrophone.label = Share Microphone
+getUserMedia.shareMicrophone.accesskey = S
+getUserMedia.shareSpecificMicrophone.label = Share Microphone: %S
+getUserMedia.shareCameraAndMicrophone.message = Would you like to share your camera and microphone with %S?
+getUserMedia.shareCameraAndMicrophone.label = Share Camera and Microphone
+getUserMedia.shareCameraAndMicrophone.accesskey = S
--- a/browser/chrome/browser/devtools/debugger.dtd
+++ b/browser/chrome/browser/devtools/debugger.dtd
@@ -8,63 +8,37 @@
   - You want to make that choice consistent across the developer tools.
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
 <!-- LOCALIZATION NOTE (debuggerMenu.label): This is the label for the
   -  application menu item that opens the debugger UI. -->
 
 
 
-<!ENTITY debuggerMenu.label2          "Gin mabalo">
+<!ENTITY debuggerMenu.label2            "Gin mabalo">
+<!-- LOCALIZATION NOTE (debuggerMenu.accesskey): This is accesskey for the
+  -  Tools meny entry of Debugger that opens the debugger UI. -->
+
+<!ENTITY debuggerMenu.accesskey         "D">
 <!-- LOCALIZATION NOTE (remoteDebuggerMenu.label): This is the label for the
   -  application menu item that opens the remote debugger UI. -->
 
-<!ENTITY remoteDebuggerMenu.label    "Gin Mabalo ma aa ki tenge">
+<!ENTITY remoteDebuggerMenu.label       "Gin Mabalo ma aa ki tenge">
 <!-- LOCALIZATION NOTE (chromeDebuggerMenu.label): This is the label for the
   -  application menu item that opens the browser debugger UI. -->
 
-<!ENTITY chromeDebuggerMenu.label    "Yeny Gin mabalo">
+<!ENTITY chromeDebuggerMenu.label       "Yeny Gin mabalo">
 <!-- LOCALIZATION NOTE (debuggerMenu.commandkey): This is the command key that
   -  launches the debugger UI. Do not translate this one! -->
 
-<!ENTITY debuggerMenu.commandkey     "S">
+<!ENTITY debuggerMenu.commandkey        "S">
 <!-- LOCALIZATION NOTE (debuggerUI.closeButton.tooltip): This is the tooltip for
   -  the button that closes the debugger UI. -->
 
-<!ENTITY debuggerUI.closeButton.tooltip        "Lor">
+<!ENTITY debuggerUI.closeButton.tooltip "Lor">
 <!-- LOCALIZATION NOTE (debuggerUI.pauseExceptions): This is the label for the
   -  checkbox that toggles pausing on exceptions. -->
 
-<!ENTITY debuggerUI.pauseExceptions          "Cung manok ikom en ma iyero">
-<!-- LOCALIZATION NOTE (debuggerUI.stepOverButton.tooltip): This is the tooltip for
-  -  the button that steps over a function call. -->
-
-<!ENTITY debuggerUI.stepOverButton.tooltip   "Nyon ki Iwiye">
-<!-- LOCALIZATION NOTE (debuggerUI.stepInButton): This is the tooltip for the
-  -  button that steps into a function call. -->
-
-<!ENTITY debuggerUI.stepInButton.tooltip     "Nyon I ie">
-<!-- LOCALIZATION NOTE (debuggerUI.stepOutButton): This is the tooltip for the
-  -  button that steps out of a function call. -->
-
-<!ENTITY debuggerUI.stepOutButton.tooltip    "Nyon Woko">
-<!-- LOCALIZATION NOTE (debuggerUI.stackTitle): This is the label for the
-  -  widget that displays the call stack frames in the debugger. -->
+<!ENTITY debuggerUI.pauseExceptions     "Cung manok ikom en ma iyero">
+<!-- LOCALIZATION NOTE (debuggerUI.searchPanelTitle): This is the text that
+  -  appears in the filter panel popup as a description. -->
 
-<!ENTITY debuggerUI.stackTitle       "Lwong gi jogo coc">
-<!-- LOCALIZATION NOTE (debuggerUI.scriptTitle): This is the label for the
-  -  widget that displays the source code for the script that is currently
-  -  being inspected in the debugger. -->
-
-<!ENTITY debuggerUI.scriptTitle      "Coc me kompiuta">
-<!-- LOCALIZATION NOTE (debuggerUI.propertiesTitle): This is the label for the
-  -  widget that displays the variables in the various available scopes in the
-  -  debugger. -->
-
-<!ENTITY debuggerUI.propertiesTitle  "Kabedo me nongo">
-<!-- LOCALIZATION NOTE (debuggerUI.emptyFilterText): This is the text that
-  -  appears in the filter text box when it is empty. -->
-
-<!ENTITY debuggerUI.emptyFilterText  "Yek nyig coc">
-<!-- LOCALIZATION NOTE (emptyScriptText): The text to display in the menulist when
-  - there are no scripts. -->
-
-<!ENTITY debuggerUI.emptyScriptText  "Nyig coc pe">
+<!ENTITY debuggerUI.searchPanelTitle    "Lutic kwede">
--- a/browser/chrome/browser/devtools/debugger.properties
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -38,40 +38,76 @@ remoteDebuggerPromptCheck=Pe dok ipenya
 # LOCALIZATION NOTE (remoteDebuggerReconnectMessage): The message displayed on the
 # debugger prompt asking for the remote host and port to connect to.
 remoteDebuggerReconnectMessage=Pe kinongo lapok tic. Tem doki? (won gang:bur)
 
 # LOCALIZATION NOTE (remoteDebuggerReconnectMessage): The message displayed on the
 # debugger prompt asking for the remote host and port to connect to.
 remoteDebuggerConnectionFailedMessage=Pe onongo romo nongo lapok tic ki won gang ma kipoko yore ki namba me bur.
 
+# LOCALIZATION NOTE (collapsePanes): This is the tooltip for the button
+# that collapses the left and right panes in the debugger UI. -->
+collapsePanes=Jwik gin tic
+
+# LOCALIZATION NOTE (expandPanes): This is the tooltip for the button
+# that expands the left and right panes in the debugger UI. -->
+expandPanes=Nya yi gin tic
+
 # LOCALIZATION NOTE (pauseLabel): The label that is displayed on the pause
 # button when the debugger is in a running state.
-pauseTooltip=Dii wek ocung manok
+pauseButtonTooltip=Dii wek cung manok (%S)
 
 # LOCALIZATION NOTE (resumeLabel): The label that is displayed on the pause
 # button when the debugger is in a paused state.
-resumeTooltip=Dii wek dwogi
+resumeButtonTooltip=Dii wek dwogi (%S)
+
+# LOCALIZATION NOTE (stepOverTooltip): The label that is displayed on the
+# button that steps over a function call.
+stepOverTooltip=Wot Iwiye (%S)
+
+# LOCALIZATION NOTE (stepInTooltip): The label that is displayed on the
+# button that steps into a function call.
+stepInTooltip=Wot Iyie (%S)
+
+# LOCALIZATION NOTE (stepOutTooltip): The label that is displayed on the
+# button that steps out of a function call.
+stepOutTooltip=Kat Woko (%S)
 
 # LOCALIZATION NOTE (emptyStackText): The text that is displayed in the stack
 # frames list when there are no frames to display.
 emptyStackText=Yaro ka maleng pe omoko.
 
 # LOCALIZATION NOTE (emptyBreakpointsText): The text that is displayed in the
 # breakpoints list when there are no breakpoints to display.
 emptyBreakpointsText=Pe kiyaro breakpoints ka maleng.
 
 # LOCALIZATION NOTE (noScriptsText): The text to display in the menulist when
 # there are no scripts.
-noScriptsText=No scripts
+noScriptsText=Nyig coc pe
 
 # LOCALIZATION NOTE (noMatchingScriptsText): The text to display in the
 # menulist when there are no matching scripts after filtering.
 noMatchingScriptsText=Pe tye nyig coc ma rwate
 
+# LOCALIZATION NOTE (emptyFilterText): This is the text that appears in the
+# filter text box when it is empty.
+emptyFilterText=Yer nyig coc (%S)
+
+# LOCALIZATION NOTE (searchPanelGlobal): This is the text that appears in the
+# filter panel popup for the global search operation.
+searchPanelGlobal=Yeny ki i pwail weng (%S)
+
+# LOCALIZATION NOTE (searchPanelToken): This is the text that appears in the
+# filter panel popup for the token search operation.
+searchPanelToken=Nong ki ipwail man (%S)
+
+# LOCALIZATION NOTE (searchPanelLine): This is the text that appears in the
+# filter panel popup for the line search operation.
+searchPanelLine=Pye idok i rek (%S)
+
 # LOCALIZATION NOTE (breakpointMenuItem): The text for all the elements that
 # are displayed in the breakpoints menu item popup.
 breakpointMenuItem.enableSelf=Mii breakpoint oti
 breakpointMenuItem.disableSelf=Jwik woko breakpoint
 breakpointMenuItem.deleteSelf=Kwany woko breakpoint
 breakpointMenuItem.enableOthers=Mii mukene
 breakpointMenuItem.disableOthers=Jwik mukene
 breakpointMenuItem.deleteOthers=Kwany mukene woko
@@ -85,29 +121,16 @@ breakpointMenuItem.deleteAll=Kwany weng 
 loadingText=Tye ka gamo…
 
 # LOCALIZATION NOTE (loadingError):
 # This is the error message that is displayed on failed attempts to load an
 # external resource file.
 # %1$S=URL, %2$S=status code
 loadingError=Bal i gamo %1$S: %2$S
 
-# LOCALIZATION NOTE (remoteIncomingPromptTitle): The title displayed on the
-# dialog that prompts the user to allow the incoming connection.
-remoteIncomingPromptTitle=Kube matye kabino ie
-
-# LOCALIZATION NOTE (remoteIncomingPromptMessage): The message displayed on the
-# dialog that prompts the user to allow the incoming connection.
-remoteIncomingPromptMessage=Kwac ma bino ie pi miyo twero bot kube me bal pi gin ma aa ki ka mabor dong kityeko nongo ne. Gin tic ma aa ki ka mabor romo bedo ki twero weng i kom layeny! Yeyi kube?
-
-# LOCALIZATION NOTE (remoteIncomingPromptDisable): The label displayed on the
-# third button in the incoming connection dialog that lets the user disable the
-# remote debugger server.
-remoteIncomingPromptDisable=Kijuko woko
-
 # LOCALIZATION NOTE (emptyVariablesText): The text that is displayed in the
 # variables pane when there are no variables to display.
 emptyVariablesText=Kit jami mo pe ma kiyaro ka maleng.
 
 # LOCALIZATION NOTE (scopeLabel): The text that is displayed in the variables
 # pane as a header for each variable scope (e.g. "Global scope, "With scope",
 # etc.).
 scopeLabel=%S berne
--- a/browser/chrome/browser/devtools/gclicommands.properties
+++ b/browser/chrome/browser/devtools/gclicommands.properties
@@ -43,28 +43,52 @@ consoleclearDesc=Jwa ka coc
 # LOCALIZATION NOTE (screenshotDesc) A very short description of the
 # 'screenshot' command. See screenshotManual for a fuller description of what
 # it does. This string is designed to be shown in a menu alongside the
 # command name, which is why it should be as short as possible.
 screenshotDesc=Gwok cal me pot buk
 
 # LOCALIZATION NOTE (screenshotManual) A fuller description of the 'screenshot'
 # command, displayed when the user asks for help on what it does.
-screenshotManual=Save a PNG image of the entire visible window (optionally after a delay)
+screenshotManual=Gwok cal me PNG pi dirica weng manonge (me ayera i yonge gal manok)
 
 # LOCALIZATION NOTE (screenshotFilenameDesc) A very short string to describe
 # the 'filename' parameter to the 'screenshot' command, which is displayed in
 # a dialog when the user is using this command.
 screenshotFilenameDesc=Ka ma nying pwail gik iyie
 
 # LOCALIZATION NOTE (screenshotFilenameManual) A fuller description of the
 # 'filename' parameter to the 'screenshot' command, displayed when the user
 # asks for help on what it does.
 screenshotFilenameManual=Nying pwail (myero bed ki nyaa pa '.png' ) ma wan wacoyo cal macek
 
+# LOCALIZATION NOTE (screenshotClipboardDesc) A very short string to describe
+# the 'clipboard' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+screenshotClipboardDesc=Lok cal me wang jami idwok ibao me coc? (ada/goba)
+
+# LOCALIZATION NOTE (screenshotClipboardManual) A fuller description of the
+# 'clipboard' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+screenshotClipboardManual=Ada ka ce imito loko cal me wang jami akaka gwoko ne ipwail.
+
+# LOCALIZATION NOTE (screenshotChromeDesc) A very short string to describe
+# the 'chrome' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+screenshotChromeDesc=Mako Firefox chrome window? (ada/goba)
+
+# LOCALIZATION NOTE (screenshotChromeManual) A fuller description of the
+# 'chrome' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+screenshotChromeManual=Ada ka ce imito mako cal me wang jami me Firefox window nikato jami me yi window me pot buk me web.
+
+# LOCALIZATION NOTE (screenshotGroupOptions) A label for the optional options of
+# the screenshot command.
+screenshotGroupOptions=Gin ayera
+
 # LOCALIZATION NOTE (screenshotDelayDesc) A very short string to describe
 # the 'delay' parameter to the 'screenshot' command, which is displayed in
 # a dialog when the user is using this command.
 screenshotDelayDesc=Gal (ceken)
 
 # LOCALIZATION NOTE (screenshotDelayManual) A fuller description of the
 # 'delay' parameter to the 'screenshot' command, displayed when the user
 # asks for help on what it does.
@@ -75,16 +99,43 @@ screenshotDelayManual=Cawa me kuro (i ce
 # a dialog when the user is using this command.
 screenshotFullPageDesc=Pot buk me Web weng? (ada/lok goba)
 
 # LOCALIZATION NOTE (screenshotFullscreenManual) A fuller description of the
 # 'fullscreen' parameter to the 'screenshot' command, displayed when the user
 # asks for help on what it does.
 screenshotFullPageManual=Ada do cite ka cal amaka macek myero dang bed ki dul kom pot buk ma tye woko ii ka loro manonge.
 
+# LOCALIZATION NOTE (screenshotSelectorChromeConflict) Exception thwon when user
+# tries to use 'selector' option along with 'chrome' option of the screenshot
+# command. Refer: https://bugzilla.mozilla.org/show_bug.cgi?id=659268#c7
+screenshotSelectorChromeConflict=Layer gin ayera pe kicwako te kun gin ayera me chrome obedo lok ada
+
+# LOCALIZATION NOTE (screenshotGeneratedFilename) The auto generated filename
+# when no file name is provided. 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. Please don't add the extension here.
+screenshotGeneratedFilename=Cal manyutu wange %1$S at %2$S
+
+# LOCALIZATION NOTE (screenshotErrorSavingToFile) Text displayed to user upon
+# encountering error while saving the screenshot to the file specified.
+screenshotErrorSavingToFile=Bal i gwoko i
+
+# LOCALIZATION NOTE (screenshotSavedToFile) Text displayed to user when the
+# screenshot is successfully saved to the file specified.
+screenshotSavedToFile=Kigwoko i
+
+# LOCALIZATION NOTE (screenshotErrorCopying) Text displayed to user upon
+# encountering error while copying the screenshot to clipboard.
+screenshotErrorCopying=Bal otime kun tye kaloko dwoko i kacoc.
+
+# LOCALIZATION NOTE (screenshotCopied) Text displayed to user when the
+# screenshot is successfully copied to the clipboard.
+screenshotCopied=Otyeko loko dwoko i kacoc.
+
 # LOCALIZATION NOTE (restartFirefoxDesc) A very short description of the
 # 'restart' 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.
 restartFirefoxDesc=Nwo cako Firefox
 
 # LOCALIZATION NOTE (restartFirefoxNocacheDesc) A very short string to
 # describe the 'nocache' parameter to the 'restart' command, which is
 # displayed in a dialog when the user is using this command.
@@ -111,17 +162,17 @@ inspectManual=Kwed yore ki kit me jami m
 # LOCALIZATION NOTE (inspectNodeDesc) A very short string to describe the
 # 'node' parameter to the 'inspect' command, which is displayed in a dialog
 # when the user is using this command.
 inspectNodeDesc=Layer CSS
 
 # LOCALIZATION NOTE (inspectNodeManual) A fuller description of the 'node'
 # parameter to the 'inspect' command, displayed when the user asks for help
 # on what it does.
-inspectNodeManual=A CSS selector for use with document.querySelector which identifies a single element
+inspectNodeManual=Layer CSS me tic kwede Document.querySelector ma nyutu gin acel
 
 # LOCALIZATION NOTE (tiltDesc) A very short description of the 'tilt'
 # command. See tiltManual for a fuller description of what it does. This
 # string is designed to be shown in a menu alongside the command name, which
 # is why it should be as short as possible.
 tiltDesc=Nyut cal me pot buk me web i 3D
 
 # LOCALIZATION NOTE (tiltManual) A fuller description of the 'tilt'
@@ -324,16 +375,24 @@ breakNotFound=Pe kinongo kacung manok
 # LOCALIZATION NOTE (dbgDesc) A very short string used to describe the
 # function of the dbg command.
 dbgDesc=Loo lakel bal
 
 # LOCALIZATION NOTE (dbgManual) A longer description describing the
 # set of commands that control the debugger.
 dbgManual=Mii cik wek obal onyo dwogo wici madite, nyon ie, woko ki iwi rek me nyig coc
 
+# LOCALIZATION NOTE (dbgOpen) A very short string used to describe the function
+# of the dbg open command.
+dbgOpen=Yab gin ma kwedo bal
+
+# LOCALIZATION NOTE (dbgClose) A very short string used to describe the function
+# of the dbg close command.
+dbgClose=Lor gin ma kwedo bal
+
 # LOCALIZATION NOTE (dbgInterrupt) A very short string used to describe the
 # function of the dbg interrupt command.
 dbgInterrupt=Cungo wici madite
 
 # LOCALIZATION NOTE (dbgContinue) A very short string used to describe the
 # function of the dbg continue command.
 dbgContinue=Dwogo wici madite, ci mede poko yore kun lubo breakpoint, ni oo wa i breakpoint onyo jwiko coc.
 
@@ -345,21 +404,21 @@ dbgStepDesc=Loo nyono
 # set of commands that control stepping.
 dbgStepManual=Cik me nyono yadi ii, woko ki i wi rek me nyig coc
 
 # LOCALIZATION NOTE (dbgStepOverDesc) A very short string used to describe the
 # function of the dbg step over command.
 dbgStepOverDesc=Wek telok matye ci dong i jwik ki telok malubo kore. Ka ce telok matye ni obedo lwongo me tic ci myero lakwed bal weko tic lung, ci jwiko ki i telok malubo kore iyonge lwongo me tic
 
 # LOCALIZATION NOTE (dbgStepInDesc) A very short string used to describe the
-# function of the dbg step over command.
+# function of the dbg step in command.
 dbgStepInDesc=Wek telok matye ci jwik ki i telok malubo kore. Ka telok matye obedo lwongo me tic, lakwed bal nyono iyi tic meno, twero jwiko ki telok malubo kore
 
 # LOCALIZATION NOTE (dbgStepOutDesc) A very short string used to describe the
-# function of the dbg step over command.
+# function of the dbg step out command.
 dbgStepOutDesc=Nyon woko ki tic matye ki malu rwom acel ka ce kiyubu tic. Ka ikom madite, kiweko woko coc dwoko ii agiki, onyo i en malubo kor breakpoint. Kityeko weko woko telok ma gikalo, ento pe onyono ie
 
 # 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=Lor ka coc woko
 
 # LOCALIZATION NOTE (consoleopenDesc) A very short description of the
@@ -604,17 +663,17 @@ pagemodRemoveElementIfEmptyOnlyDesc=Kwan
 # LOCALIZATION NOTE (pagemodRemoveElementResultMatchedAndRemovedElements)
 # A string displayed as the result of the 'pagemod remove element' command.
 pagemodRemoveElementResultMatchedAndRemovedElements=Layer orwato jami: %1$S. Kikwanyo jami woko: %2$S.
 
 # LOCALIZATION NOTE (pagemodRemoveAttributeDesc) A very short description of the
 # 'pagemod remove attribute' 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.
-pagemodRemoveAttributeDesc=Kwany woko gin marwate
+pagemodRemoveAttributeDesc=Remove matching attributes
 
 # LOCALIZATION NOTE (pagemodRemoveAttributeSearchAttributesDesc) A very short
 # string to describe the 'searchAttributes' parameter to the 'pagemod remove
 # attribute' command, which is displayed in a dialog when the user is using this
 # command.
 pagemodRemoveAttributeSearchAttributesDesc=Regexp poko yor gin mo wek okwany woko
 
 # LOCALIZATION NOTE (pagemodRemoveAttributeSearchElementsDesc) A very short
@@ -706,17 +765,17 @@ cookieSetKeyDesc=Lagony pa layeny me int
 
 # LOCALIZATION NOTE (cookieSetValueDesc) A very short string to describe the
 # 'value' parameter to the 'cookie set' command, which is displayed in a dialog
 # when the user is using this command.
 cookieSetValueDesc=Wel pa layeny me intanet me atera
 
 # LOCALIZATION NOTE (cookieSetOptionsDesc) The title of a set of options to
 # the 'cookie set' command, displayed as a heading to the list of option.
-cookieSetOptionsDesc=Me ayera
+cookieSetOptionsDesc=Options
 
 # LOCALIZATION NOTE (cookieSetPathDesc) A very short string to describe the
 # 'path' parameter to the 'cookie set' command, which is displayed in a dialog
 # when the user is using this command.
 cookieSetPathDesc=Yoo beo pa layeny intanet me atera
 
 # LOCALIZATION NOTE (cookieSetDomainDesc) A very short string to describe the
 # 'domain' parameter to the 'cookie set' command, which is displayed in a dialog
@@ -753,21 +812,20 @@ jsbIndentSizeManual=Namba me wangokwede 
 # alongside the command name, which is why it should be as short as possible.
 jsbIndentCharDesc=Gitiyo ki wangoi loko kite irek acel acel
 
 # LOCALIZATION NOTE (jsbIndentCharManual) A fuller description of the
 # 'jsb <indentChar>' parameter, displayed when the user asks for help on what it
 # does.
 jsbIndentCharManual=The chars used to indent each line. The possible choices are space or tab.
 
-# LOCALIZATION NOTE (jsbPreserveNewlinesDesc) A very short description of the
-# 'jsb <jsbPreserveNewlines>' parameter. This string is designed to be shown
-# in a menu alongside the command name, which is why it should be as short as
-# possible.
-jsbPreserveNewlinesDesc=Gwok codo rek matye?
+# the 'jsb <doNotPreserveNewlines>' parameter. This string is designed to be
+# shown in a menu alongside the command name, which is why it should be as short
+# as possible.
+jsbDoNotPreserveNewlinesDesc=Pe igwok rek ma opoke
 
 # LOCALIZATION NOTE (jsbPreserveNewlinesManual) A fuller description of the
 # 'jsb <jsbPreserveNewlines>' parameter, displayed when the user asks for help
 # on what it does.
 jsbPreserveNewlinesManual=Myero kigwok rek ma ocot matye
 
 # LOCALIZATION NOTE (jsbPreserveMaxNewlinesDesc) A very short description of the
 # 'jsb <preserveMaxNewlines>' parameter. This string is designed to be shown
@@ -786,53 +844,52 @@ jsbPreserveMaxNewlinesManual=Namba me re
 # possible.
 jsbJslintHappyDesc=Ket tek jslint-stricter mode?
 
 # LOCALIZATION NOTE (jsbJslintHappyManual) A fuller description of the
 # 'jsb <jslintHappy>' parameter, displayed when the user asks for help
 # on what it does.
 jsbJslintHappyManual=Ka dong gitero ii ada, kiketo tek i kit me jslint-stricter
 
-# LOCALIZATION NOTE (jsbBraceStyleDesc) A very short description of the
+# LOCALIZATION NOTE (jsbBraceStyleDesc2) A very short description of the
 # 'jsb <braceStyle>' parameter. This string is designed to be shown
 # in a menu alongside the command name, which is why it should be as short as
 # possible.
-jsbBraceStyleDesc=Kibalo woko, nyaa ie, gik-nyaa ie, nyaa-geng
+jsbBraceStyleDesc2=Kibalo woko, nyaa ie, gik-nyaa ie, nyaa-geng
 
-# LOCALIZATION NOTE (jsbBraceStyleManual) A fuller description of the
+# LOCALIZATION NOTE (jsbBraceStyleManual2) A fuller description of the
 # 'jsb <braceStyle>' parameter, displayed when the user asks for help
 # on what it does.
-jsbBraceStyleManual=Kit coyo coc me jingo. Onyo poto, nyaa, gik nyaa onyo ryeko me nyayo
+jsbBraceStyleManual2=Kit coyo coc me jingo. Onyo poto, nyaa, gik nyaa onyo ryeko me nyayo
 
-# LOCALIZATION NOTE (jsbSpaceBeforeConditionalDesc) A very short description of
-# the 'jsb <spaceBeforeConditional>' parameter. This string is designed to be
-# shown in a menu alongside the command name, which is why it should be as short
-# as possible.
-jsbSpaceBeforeConditionalDesc=Lag kine mapwod pe ka te lok?
-
-# LOCALIZATION NOTE (jsbSpaceBeforeConditionalManual) A fuller description of
-# the 'jsb <spaceBeforeConditional>' parameter, displayed when the user asks for
-# help on what it does.
-jsbSpaceBeforeConditionalManual=Itamo ni myero gimed kine mapwod pe te lok me acuki otime?
+# LOCALIZATION NOTE (jsbNoSpaceBeforeConditionalDesc) A very short description
+# of the 'jsb <noSpaceBeforeConditional>' parameter. This string is designed to
+# be shown in a menu alongside the command name, which is why it should be as
+# short as possible.
+jsbNoSpaceBeforeConditionalDesc=Kabedo pe mapwod te lok me didic peke
 
 # LOCALIZATION NOTE (jsbUnescapeStringsDesc) A very short description of the
 # 'jsb <unescapeStrings>' parameter. This string is designed to be shown
 # in a menu alongside the command name, which is why it should be as short as
 # possible.
 jsbUnescapeStringsDesc=Pe ilwi \\xNN kit gi?
 
 # LOCALIZATION NOTE (jsbUnescapeStringsManual) A fuller description of the
 # 'jsb <unescapeStrings>' parameter, displayed when the user asks for help
 # on what it does.
 jsbUnescapeStringsManual=Itamo ni kit gi ma twero agoya iyi tol ma kicwalo iyi \\xNN myero dong pe lwi?
 
 # LOCALIZATION NOTE (jsbInvalidURL) Displayed when an invalid URL is passed to
 # the jsb command.
 jsbInvalidURL=Please enter a valid URL
 
+# LOCALIZATION NOTE (jsbOptionsDesc) The title of a set of options to
+# the 'jsb' command, displayed as a heading to the list of options.
+jsbOptionsDesc=Options
+
 # LOCALIZATION NOTE (calllogDesc) A very short description of the
 # 'calllog' 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.
 calllogDesc=Cwal wek ter  jogo tic me goyo cim
 
 # LOCALIZATION NOTE (calllogStartDesc) A very short description of the
 # 'calllog start' 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.
@@ -853,70 +910,70 @@ calllogStopNoLogging=Ngolo goyo cim bene
 
 # LOCALIZATION NOTE (calllogStopReply) A string displayed as the result of
 # the 'calllog stop' command when there are logging actions to stop.
 calllogStopReply=Stopped call logging. Active contexts: %1$S.
 
 # LOCALIZATION NOTE (calllogStartChromeDesc) A very short description of the
 # 'calllog chromestart' 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.
-calllogChromeStartDesc=Start logging function calls for chrome code to the console
+calllogChromeStartDesc=Cak ngolo tic me goyo cim pi nyig coc me chrome i kacoc
 
 # LOCALIZATION NOTE (calllogChromeSourceTypeDesc) A very short description of the
 # 'calllog chromestart <sourceType>' parameter. This string is designed to be
 # shown in a menu alongside the command name, which is why it should be as short as possible.
-calllogChromeSourceTypeDesc=Global object, JSM URI, or JS to get a global object from
+calllogChromeSourceTypeDesc=Jami me Wilobo, JSM URI, onyo me nongo jami me wilobo ni aa ki
 
 # LOCALIZATION NOTE (calllogChromeSourceTypeDesc) A very short description of the
 # 'calllog chromestart' 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.
-calllogChromeSourceTypeManual=The global object, URI of a JSM, or JS to execute in the chrome window from which to obtain a global object
+calllogChromeSourceTypeManual=Jami me wilobo, URI JSM, onyo JS miyo cik i chrome window ni aa ki en me nongo cal me wilobo alutu
 
 # LOCALIZATION NOTE (calllogChromeStartReply) A string displayed as the result
 # of the 'calllog chromestart' command.
 calllogChromeStartReply=Call logging started.
 
 # LOCALIZATION NOTE (calllogChromeStopDesc) A very short description of the
 # 'calllog chromestop' 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.
 calllogChromeStopDesc=Stop function call logging
 
 # LOCALIZATION NOTE (calllogChromeStopNoLogging) A string displayed as the
 # result of the 'calllog chromestop' command when there is nothing to stop.
-calllogChromeStopNoLogging=No call logging for chrome code is currently active
+calllogChromeStopNoLogging=Ngolo goyo cim bene peke pi nyig coc me chrome kombedi tye katic
 
 # LOCALIZATION NOTE (calllogStopReply) A string displayed as the result of
 # the 'calllog chromestop' command when there are logging actions to stop.
 calllogChromeStopReply=Stopped call logging. Active contexts: %1$S.
 
 # LOCALIZATION NOTE (callLogChromeAnonFunction) A string displayed as the result
 # of the 'calllog chromestart' command when an anonymouse function is to be
 # logged.
 callLogChromeAnonFunction=<anonymous>
 
 # LOCALIZATION NOTE (callLogChromeMethodCall) A string displayed as the result
 # of the 'calllog chromestart' command to proceed a method name when it is to be
 # logged.
-callLogChromeMethodCall=Method call
+callLogChromeMethodCall=Dong kilwongo yore
 
 # LOCALIZATION NOTE (callLogChromeInvalidJSM) A string displayed as the result
 # of the 'calllog chromestart' command with an invalid JSM or JSM path.
-callLogChromeInvalidJSM=Invalid JSM!
+callLogChromeInvalidJSM=JSM Mape tiyo!
 
 # LOCALIZATION NOTE (callLogChromeVarNotFoundContent) A string displayed as the
 # result of the 'calllog chromestart' command with a source type of
 # content-variable and an invalid variable name.
-callLogChromeVarNotFoundContent=Variable not found in content window.
+callLogChromeVarNotFoundContent=Dite pe ononge i window me jami me yie.
 
 # LOCALIZATION NOTE (callLogChromeVarNotFoundChrome) A string displayed as the
 # result of the 'calllog chromestart' command with a source type of
 # chrome-variable and an invalid variable name.
-callLogChromeVarNotFoundChrome=Variable not found in chrome window.
+callLogChromeVarNotFoundChrome=Dite pe ononge iyi chrome window.
 
 # LOCALIZATION NOTE (callLogChromeEvalException) A string displayed as the
-# result of the 'calllog chromestart' command with a source type of javascript
+# result of the 'calllog chromestart' command with a source type of JavaScript
 # and invalid JavaScript code.
-callLogChromeEvalException=Evaluated javascript threw the following exception
+callLogChromeEvalException=JavaScript ma ki kwedo te otiko bayo jami magi
 
 # LOCALIZATION NOTE (callLogChromeEvalNeedsObject) A string displayed as the
 # result of passing a non-JavaScript object creating source via the
 # 'calllog chromestart javascript' command.
-callLogChromeEvalNeedsObject=The JavaScript source must evaluate to an object whose method calls are to be logged e.g. "({a1: function() {this.a2()},a2: function() {}});"
+callLogChromeEvalNeedsObject=Ka ma JavaScript myero kwed odoco ni oo wa ical ma yore me goyo cime otyeko ngol woko lapore. "({a1: function() {this.a2()},a2: function() {}});"
--- a/browser/chrome/browser/devtools/responsiveUI.properties
+++ b/browser/chrome/browser/devtools/responsiveUI.properties
@@ -1,17 +1,40 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 # LOCALIZATION NOTE These strings are used inside the Responsive Mode
 # which is available from the Web Developer sub-menu -> 'Responsive Mode'.
 #
 # The correct localization of this file might be to keep it in
 # English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
 
 # LOCALIZATION NOTE  (responsiveUI.rotate): label of the rotate button.
 responsiveUI.rotate=Wir
 
+# LOCALIZATION NOTE  (responsiveUI.addPreset): label of the add preset button.
+responsiveUI.addPreset=Med en ma otere pire kene
+
+# LOCALIZATION NOTE  (responsiveUI.removePreset): label of the remove preset button.
+responsiveUI.removePreset=Kwany en ma kitero woko
+
 # LOCALIZATION NOTE  (responsiveUI.customResolution): label of the first item
 # in the menulist at the beginning of the toolbar. For %S is replace with the
 # current size of the page. For example: "400x600".
 responsiveUI.customResolution=%S (Mamegi)
+
+# LOCALIZATION NOTE  (responsiveUI.namedResolution): label of custom items with a name
+# in the menulist of the toolbar.
+# For example: "320x480 (phone)".
+responsiveUI.namedResolution=%S (%S)
+
+# LOCALIZATION NOTE  (responsiveUI.customNamePromptTitle): prompt title when asking
+# the user to specify a name for a new custom preset.
+responsiveUI.customNamePromptTitle=Responsive Design View
+
+# LOCALIZATION NOTE  (responsiveUI.customNamePromptMsg): prompt message when asking
+# the user to specify a name for a new custom preset.
+responsiveUI.customNamePromptMsg=Cak nying i %Sx%S ma kitero
--- a/browser/chrome/browser/devtools/scratchpad.dtd
+++ b/browser/chrome/browser/devtools/scratchpad.dtd
@@ -31,16 +31,19 @@
 
 <!ENTITY openFileCmd.label            "Yab Pwail…">
 <!ENTITY openFileCmd.accesskey        "Y">
 <!ENTITY openFileCmd.commandkey       "o">
 
 <!ENTITY openRecentMenu.label         "Yab Ma okati kombedi">
 <!ENTITY openRecentMenu.accesskey     "M">
 
+<!ENTITY revertCmd.label              "Wir...">
+<!ENTITY revertCmd.accesskey          "r">
+
 <!ENTITY saveFileCmd.label            "Gwok">
 <!ENTITY saveFileCmd.accesskey        "G">
 <!ENTITY saveFileCmd.commandkey       "s">
 
 <!ENTITY saveFileAsCmd.label          "Gwok Macalo…">
 <!ENTITY saveFileAsCmd.accesskey      "M">
 
 <!ENTITY closeCmd.label               "Lor">
@@ -97,16 +100,20 @@
 <!-- LOCALIZATION NOTE (resetContext2.label): This command allows the developer
   -  to reset/clear the global object of the environment where the code executes.
   -->
 
 
 <!ENTITY resetContext2.label          "Ter odoco Alama">
 <!ENTITY resetContext2.accesskey      "r">
 
+<!ENTITY reloadAndRun.label           "Ket odoco Ki Mi ti">
+<!ENTITY reloadAndRun.accesskey       "E">
+<!ENTITY reloadAndRun.key             "r">
+
 <!ENTITY executeMenu.label            "Tii">
 <!ENTITY executeMenu.accesskey        "i">
 <!-- LOCALIZATION NOTE (errorConsoleCmd.commandkey): This command key launches
   -  the browser Error Console, the key should be identical to the property of
   -  the same name in browser.dtd.
   -->
 
 <!ENTITY errorConsoleCmd.commandkey   "j">
--- a/browser/chrome/browser/devtools/scratchpad.properties
+++ b/browser/chrome/browser/devtools/scratchpad.properties
@@ -21,16 +21,20 @@ propertyPanel.updateButton.accesskey=U
 # the user attempts to save to an already existing file.
 export.fileOverwriteConfirmation=Pwail bene dong tye. Le woko?
 
 # LOCALIZATION NOTE  (browserWindow.unavailable): This error message is shown
 # when Scratchpad does not find any recently active window of navigator:browser
 # type.
 browserWindow.unavailable=Buk me coc pi tutunu pe romo nongo dirija mo me layeny wek ket nyig coc iyi.
 
+# LOCALIZATION NOTE  (scratchpadContext.invalid): This error message is shown
+# when user tries to run an operation in Scratchpad in an unsupported context.
+scratchpadContext.invalid=Gin coc pe twero tiyo tic man i kit ma onongo tye kombedi.
+
 # LOCALIZATION NOTE  (openFile.title): This is the file picker title, when you
 # open a file from Scratchpad.
 openFile.title=Yab Pwail
 
 # LOCALIZATION NOTE  (openFile.failed): This is the message displayed when file
 # open fails.
 openFile.failed=Okwero kwano pwail woko.
 
@@ -49,16 +53,24 @@ saveFile.failed=Tic me gwoko pwail okwer
 # LOCALIZATION NOTE  (confirmClose): This is message in the prompt dialog when
 # you try to close a scratchpad with unsaved changes.
 confirmClose=I mito gwoko aloka loka ma i timo i ka coc ma eni ni?
 
 # LOCALIZATION NOTE  (confirmClose.title): This is title of the prompt dialog when
 # you try to close a scratchpad with unsaved changes.
 confirmClose.title=Aloka loka ma pe kigwoko
 
+# LOCALIZATION NOTE  (confirmRevert): This is message in the prompt dialog when
+# you try to revert unsaved content of scratchpad.
+confirmRevert=Do you want to revert the changes you made to this scratchpad?
+
+# LOCALIZATION NOTE  (confirmRevert.title): This is title of the prompt dialog when
+# you try to revert unsaved content of scratchpad.
+confirmRevert.title=Wir Alokaloka
+
 # LOCALIZATION NOTE  (scratchpadIntro): This is a multi-line comment explaining
 # how to use the Scratchpad. Note that this should be a valid JavaScript
 # comment inside /* and */.
 scratchpadIntro1=/*\n * This is a JavaScript Scratchpad.\n *\n * Enter some JavaScript, then Right Click or choose from the Execute Menu:\n * 1. Run to evaluate the selected text (%1$S),\n * 2. Inspect to bring up an Object Inspector on the result (%2$S), or,\n * 3. Display to insert the result in a comment after the selection. (%3$S)\n */\n\n
 
 # LOCALIZATION NOTE  (notification.browserContext): This is the message displayed
 # over the top of the editor when the user has switched to browser context.
 browserContext.notification=Ka coc ma eni ni ngweco woko ki coc pa Layeny.
--- a/browser/chrome/browser/devtools/webConsole.dtd
+++ b/browser/chrome/browser/devtools/webConsole.dtd
@@ -26,16 +26,21 @@
 <!ENTITY networkPanel.responseNoBody              "Kom Dwoko lok peke">
 <!ENTITY networkPanel.responseImage               "Cal ma Kigamo">
 <!ENTITY networkPanel.responseImageCached         "Cal ma Kigwoko">
 <!-- LOCALIZATION NOTE (saveBodies.label): You can see this string in the Web
    - Console context menu. -->
 
 <!ENTITY saveBodies.label     "Log Request and Response Bodies">
 <!ENTITY saveBodies.accesskey "L">
+<!-- LOCALIZATION NOTE (openURL.label): You can see this string in the Web
+   - Console context menu. -->
+
+<!ENTITY openURL.label     "Open URL in New Tab">
+<!ENTITY openURL.accesskey "T">
 <!-- LOCALIZATION NOTE (btnPageNet.label): This string is used for the menu
   -  button that allows users to toggle the network logging output.
   -  This string and the following strings toggle various kinds of output
   -  filters. -->
 
 <!ENTITY btnPageNet.label   "Malubo kore">
 <!ENTITY btnPageNet.tooltip "Dony i kakube me wiyamo">
 <!ENTITY btnPageCSS.label   "CSS">
@@ -67,25 +72,28 @@
 <!ENTITY positionMenu.above    "Malu">
 <!-- LOCALIZATION NOTE (positionMenu.below): When this option is selected the
   -  Web Console interface is displayed below the web page. -->
 
 <!ENTITY positionMenu.below    "Ite">
 <!-- LOCALIZATION NOTE (positionMenu.window): When this option is selected the
   -  Web Console interface is displayed in a floating panel. -->
 
-<!ENTITY positionMenu.window   "Window">
+<!ENTITY positionMenu.window   "Dirija">
 
 <!ENTITY filterBox.placeholder "Filter">
 <!ENTITY btnClear.label        "Clear">
-<!ENTITY btnClear.tooltip      "Clear the Web Console output">
+<!ENTITY btnClear.tooltip      "Ruc oko Kacoc me Web ma kato woko">
 <!ENTITY btnClose.tooltip      "Close the Web Console">
 
 <!ENTITY fullZoomEnlargeCmd.commandkey  "+">
 <!-- + is above this key on many keyboards -->
 <!ENTITY fullZoomEnlargeCmd.commandkey2 "="> 
 <!ENTITY fullZoomEnlargeCmd.commandkey3 "">
 
 <!ENTITY fullZoomReduceCmd.commandkey   "-">
 <!ENTITY fullZoomReduceCmd.commandkey2  "">
 
 <!ENTITY fullZoomResetCmd.commandkey    "0">
 <!ENTITY fullZoomResetCmd.commandkey2   "">
+
+<!ENTITY copyURLCmd.label     "Lok Kabedo me Kakube">
+<!ENTITY copyURLCmd.accesskey "e">
--- a/browser/chrome/browser/preferences/aboutPermissions.dtd
+++ b/browser/chrome/browser/preferences/aboutPermissions.dtd
@@ -15,16 +15,17 @@
 
 <!ENTITY header.defaults                 "Twero me Gang pi di bar Weng">
 
 <!ENTITY permissions.forgetSite          "Wek wii owil woko ikom di bar man">
 
 <!ENTITY permission.alwaysAsk            "Peny kare ducu">
 <!ENTITY permission.allow                "Yee">
 <!ENTITY permission.allowForSession      "Yee pi kare">
+<!ENTITY permission.allowFirstPartyOnly  "Allow First Party Only">
 <!ENTITY permission.block                "Geng">
 
 <!ENTITY password.label                  "Kan mung">
 <!ENTITY password.manage                 "Loo Mung…">
 
 <!ENTITY cookie.label                    "Ter Kakube">
 <!ENTITY cookie.remove                   "Kwany Kakube woko">
 <!ENTITY cookie.manage                   "Loo Kakube…">
--- a/browser/chrome/browser/preferences/main.dtd
+++ b/browser/chrome/browser/preferences/main.dtd
@@ -15,28 +15,22 @@
 <!ENTITY useCurrentPage.label      "Tii ki pot karatc ma kombedi">
 <!ENTITY useCurrentPage.accesskey  "p">
 <!ENTITY useMultiple.label         "Tii ki pot buk ma kombedi">
 <!ENTITY chooseBookmark.label      "Tii ki Lagwokk…">
 <!ENTITY chooseBookmark.accesskey  "L">
 <!ENTITY restoreDefault.label      "Dwok wa ikit macon">
 <!ENTITY restoreDefault.accesskey  "D">
 
-<!ENTITY downloads.label     "Kwanyo">
+<!ENTITY downloads.label     "Kigolo woko">
 
 <!ENTITY showWhenDownloading.label     "Nyut pot buk me kwanyo ka itye kakwanyo buk">
 <!ENTITY showWhenDownloading.accesskey "b">
 <!ENTITY closeWhenDone.label "Ceg ka lakwany weng gutum">
 <!ENTITY closeWhenDone.accesskey "k">
 <!ENTITY saveTo.label "Gwok buk iyi">
 <!ENTITY saveTo.accesskey "w">
 <!ENTITY chooseFolderWin.label        "Yeny…">
 <!ENTITY chooseFolderWin.accesskey    "e">
 <!ENTITY chooseFolderMac.label        "Yer…">
 <!ENTITY chooseFolderMac.accesskey    "r">
 <!ENTITY alwaysAsk.label "Jwii penya ka gwoko buk">
 <!ENTITY alwaysAsk.accesskey "J">
-
-<!ENTITY addonsMgr.label               "Lamed">
-<!ENTITY manageAddonsDescWin.label     "Lok kite pa lamed meri">
-<!ENTITY manageAddonsDescUnix2.label   "Lok kite pa lamed meri">
-<!ENTITY manageAddons.label            "Yik lamed…">
-<!ENTITY manageAddons.accesskey        "Y">
--- a/browser/chrome/browser/preferences/sync.dtd
+++ b/browser/chrome/browser/preferences/sync.dtd
@@ -33,15 +33,15 @@
 <!ENTITY engine.passwords.label     "I cwil me donyo">
 <!ENTITY engine.passwords.accesskey "I">
 <!ENTITY engine.prefs.label         "En ma imito">
 <!ENTITY engine.prefs.accesskey     "m">
 <!ENTITY engine.addons.label        "Lamed-ikome">
 <!ENTITY engine.addons.accesskey    "L">
 <!-- Device Settings -->
 
-<!ENTITY syncComputerName.label       "Nying kompiuta:">
-<!ENTITY syncComputerName.accesskey   "N">
+<!ENTITY syncDeviceName.label       "Nying Jamitic:">
+<!ENTITY syncDeviceName.accesskey   "t">
 <!ENTITY unlinkDevice.label           "Pe i Kub Jami man">
 <!-- Footer stuff -->
 
 <!ENTITY prefs.tosLink.label        "Yore me Tic">
 <!ENTITY prefs.ppLink.label         "Cik me Tic">
--- a/browser/chrome/browser/syncKey.dtd
+++ b/browser/chrome/browser/syncKey.dtd
@@ -1,18 +1,18 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY syncKey.page.title               "Lagony &syncBrand.fullName.label;mamegi">
-<!ENTITY syncKey.page.description         "Lagony man gutiyo kwede me yungo tic mamegi &syncBrand.fullName.label; akaunti.I bi mito keto lagony i kare mo keken ma icano &syncBrand.fullName.label; i kompiuta manyen onyo nyonyo.">
+<!ENTITY syncKey.page.description2        "This key is used to decode the data in your &syncBrand.fullName.label; account. You will need to enter the key each time you configure &syncBrand.fullName.label; on a new device.">
 <!ENTITY syncKey.keepItSecret.heading     "Gwoko bed imung">
 <!ENTITY syncKey.keepItSecret.description "Akaunti mamaegi me &syncBrand.fullName.label; kiyaro woko pi gwoko jami pari. Labongo lagony mman, romo tero mwaki pi ngat mo keken me cwalo ngec mamegi. Yin aye itye ki llagony man. Man te loke ni yin keken  ame itwero donyo i tici me &syncBrand.fullName.label;.">
 <!ENTITY syncKey.keepItSafe.heading       "Gwok maber">
 <!ENTITY syncKey.keepItSafe1.description  "Pe irweny lagony man.">
 <!ENTITY syncKey.keepItSafe2.description  " Wan pe wagwoko lagony mamegi mukene ( meno nongo pe obedo gwoko ne calo imung!) dong ">
 <!ENTITY syncKey.keepItSafe3.description  "Kit ma watwero konyi kwede peke me dwogo ne">
-<!ENTITY syncKey.keepItSafe4.description  " ka orweny. I bi mito tic ki lagony man cawa mo keken ma i kube ki kompiuta mamegi manyen onyo bot &syncBrand.fullName.label;.">
+<!ENTITY syncKey.keepItSafe4a.description " if it's lost. You'll need to use this key any time you connect a new device to &syncBrand.fullName.label;.">
 <!ENTITY syncKey.findOutMore1.label       "Nong mukene mapol ikom &syncBrand.fullName.label; ki imung mamegi ki ">
 <!ENTITY syncKey.findOutMore2.label       ".">
 <!ENTITY syncKey.footer1.label            "&syncBrand.fullName.label; Cik me tic nonge kombedi ki ">
 <!ENTITY syncKey.footer2.label            ". Cik me jami pa dano nonge ki ">
 <!ENTITY syncKey.footer3.label            ".">
--- a/browser/chrome/browser/syncSetup.dtd
+++ b/browser/chrome/browser/syncSetup.dtd
@@ -7,17 +7,17 @@
 
 
 <!ENTITY setup.pickSetupType.description2 "Ajoli, ka pwod pe i tiyo ki &syncBrand.fullName.label; mapwod, myero iket akaunti manyen.">
 <!ENTITY button.createNewAccount.label "Ket Akaunt Manyen">
 <!ENTITY button.haveAccount.label      "Atye ki Akaunt">
 
 <!ENTITY setup.choicePage.title.label     "I tiyo ki &syncBrand.fullName.label; mapwod?">
 <!ENTITY setup.choicePage.new.label       "Pwod pe atiyo kwede &syncBrand.shortName.label;">
-<!ENTITY setup.choicePage.existing.label  "An dong atye katic ki &syncBrand.shortName.label; i kompiuta mapat">
+<!ENTITY setup.choicePage.existing2.label "I'm already using &syncBrand.shortName.label; on another device">
 <!-- New Account AND Existing Account -->
 
 <!ENTITY server.label               "Lapok tic">
 <!ENTITY serverType.default.label      "Acaki: Mozilla &syncBrand.fullName.label; server">
 <!ENTITY serverType.custom2.label   "Tii ki cik pa lapok…">
 <!ENTITY signIn.account2.label      "Akaunt">
 <!ENTITY signIn.account2.accesskey  "A">
 <!ENTITY signIn.password.label      "Mung">
@@ -73,41 +73,41 @@
 <!ENTITY setup.signInPage.title.label "Dony iyie">
 <!ENTITY existingRecoveryKey.description "I romo nongo mukene pi lagony me Sync kun iwoto i &syncBrand.shortName.label; Me ayera ikom nyonyo mamegi mukene, ki yero  &#x0022;My Recovery Key&#x0022; under &#x0022;Manage Account&#x0022; Loo.">
 <!ENTITY verifying.label              "Moko…">
 <!ENTITY resetPassword.label          "Ter mungi nitit">
 <!ENTITY resetSyncKey.label           "Arwenyo nyonyo na mukene.">
 <!-- Sync Options -->
 
 <!ENTITY setup.optionsPage.title      "Me ayera pi Sync">
-<!ENTITY syncComputerName.label       "Nying kompiuta:">
-<!ENTITY syncComputerName.accesskey   "N">
+<!ENTITY syncDeviceName.label       "Nying Jamitic:">
+<!ENTITY syncDeviceName.accesskey   "t">
 
 <!ENTITY syncMy.label               "Sync mamega">
 <!ENTITY engine.bookmarks.label     "Alama">
 <!ENTITY engine.bookmarks.accesskey "m">
 <!ENTITY engine.tabs.label          "Dirija matidi">
 <!ENTITY engine.tabs.accesskey      "D">
 <!ENTITY engine.history.label       "Mukato">
 <!ENTITY engine.history.accesskey   "t">
 <!ENTITY engine.passwords.label     "Mungii">
 <!ENTITY engine.passwords.accesskey "M">
 <!ENTITY engine.prefs.label         "En ma imaro">
 <!ENTITY engine.prefs.accesskey     "n">
 <!ENTITY engine.addons.label        "Med-ikome">
 <!ENTITY engine.addons.accesskey    "M">
 
-<!ENTITY choice2.merge.main.label      "Nya nino dwe me kompiuta man kwede tic mamega me &syncBrand.shortName.label;">
+<!ENTITY choice2a.merge.main.label       "Merge this device's data with my &syncBrand.shortName.label; data">
 <!ENTITY choice2.merge.recommended.label "Kimoko woko:">
-<!ENTITY choice2.client.main.label     "Le tic weng ikom kompiuta man kwede tic mamega me &syncBrand.shortName.label;">
-<!ENTITY choice2.server.main.label     "Le nyonyo weng kwede tic me kompiuta man">
+<!ENTITY choice2a.client.main.label      "Replace all data on this device with my &syncBrand.shortName.label; data">
+<!ENTITY choice2a.server.main.label      "Replace all other devices with this device's data">
 <!-- Confirm Merge Options -->
 
 <!ENTITY setup.optionsConfirmPage.title "Moki">
-<!ENTITY confirm.merge.label    "&syncBrand.fullName.label; bi nyayo tic me layeny me kompiuta weng i akaunti me Sync.">
-<!ENTITY confirm.client2.label         "Ciko: Tic magi me &brandShortName; ikom kompiuta bi kwanye woko:">
-<!ENTITY confirm.client.moreinfo.label "&brandShortName; bi loko tic mamegi dwoko i kompiuta man &syncBrand.fullName.label;.">
+<!ENTITY confirm.merge2.label    "&syncBrand.fullName.label; will now merge all this device's browser data into your Sync account.">
+<!ENTITY confirm.client3.label         "Warning: The following &brandShortName; data on this device  will be deleted:">
+<!ENTITY confirm.client2.moreinfo.label "&brandShortName; will then copy your &syncBrand.fullName.label; data to this device.">
 <!ENTITY confirm.server2.label         "Cik: nyonyo man bi leyo wang tic mamegi ma i kumpiuta ni:">
 <!-- New & Existing Account: Setup Complete -->
 
 <!ENTITY setup.successPage.title "Terone Otyeko tum">
 <!ENTITY changeOptions.label "Iromo loko en ma imito man kun iyero Sync me ayera piny.">
 <!ENTITY continueUsing.label "Itwero mede kombedi tic ki &brandShortName;.">
--- a/browser/chrome/browser/syncSetup.properties
+++ b/browser/chrome/browser/syncSetup.properties
@@ -27,21 +27,24 @@ bookmarksCount.label        = #1 alama p
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the number of days (was %S for a short while, use #1 instead, even if both work)
 historyDaysCount.label      = #1 nino mukato;#1 nine mukato
 # LOCALIZATION NOTE (passwordsCount.label):
 # Semi-colon list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the number of passwords (was %S for a short while, use #1 instead, even if both work)
 passwordsCount.label        = #1 mung;#1 mung
+# LOCALIZATION NOTE (addonsCount.label):
+# #1 is the number of add-ons, see the link above for forms
+addonsCount.label        = #1 addon;#1 addons
 
 save.recoverykey.title = Gwok Lagony me Dwogo
 save.recoverykey.defaultfilename = Lagony dwogo pa Fire.html
 
 newAccount.action.label = Firefox Sync kombedi kitero woko me wek ket tici me layeny weng.
 newAccount.change.label = Iromo yero nitap ngo ma imito sync kun iyero Sync ma kiyaro piny kany.
-resetClient.change.label = Firefox Sync bi nyayo weng layeny tic pi kompiuta man iyi akaunt mamegi me Sync.
-wipeClient.change.label = Firefox Sync bi leyo layeny tic weng i kompiuta man kwede tic iyi akaunti me Sync mamegi.
-wipeRemote.change.label = Firefox Sync bi leyo tic me layeny akaunti me Sync kwede tic ikom kompiuta man.
+resetClient.change2.label = Firefox Sync will now merge all this device's browser data into your Sync account.
+wipeClient.change2.label = Firefox Sync will now replace all of the browser data on this device with the data in your Sync account.
+wipeRemote.change2.label = Firefox Sync will now replace all of the browser data in your Sync account with the data on this device.
 existingAccount.change.label = I twero loko en ma imito kun iyero Sync me ayera piny kany.
 
 # Several other strings are used (via Weave.Status.login), but they come from
 #  /services/sync
--- a/browser/defines.inc
+++ b/browser/defines.inc
@@ -1,8 +1,8 @@
-#filter emptyLines
+# This Source Code Form is subject to the terms of the Mozilla Public# License, v. 2.0. If a copy of the MPL was not distributed with this# file, You can obtain one at http://mozilla.org/MPL/2.0/.#filter emptyLines
 #define MOZ_LANGPACK_CREATOR mozilla.org
 
 # If non-English locales wish to credit multiple contributors, uncomment this
 # variable definition and use the format specified.
 #define MOZ_LANGPACK_CONTRIBUTORS <em:contributor>San James</em:contributor> <em:contributor>War Child Holland-Uganda</em:contributor><em:contributor>Acuma George Patrick</em:contributor> <em:contributor>Keneth Ogwal</em:contributor><em:contributor>Dan Jasper Okello</em:contributor> <em:contributor>Opio June Brian</em:contributor><em:contributor>Kaloba Haron</em:contributor><em:contributor>Komakech S. B. Ford</em:contributor><em:contributor>Akena David Akeni</em:contributor><em:contributor>Acire Samuel</em:contributor><em:contributor>Ojara David Prince</em:contributor>
 
 #unfilter emptyLines
\ No newline at end of file
new file mode 100644
--- /dev/null
+++ b/browser/installer/nsisstrings.properties
@@ -0,0 +1,65 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE:
+
+# This file must be saved as UTF8
+
+# Accesskeys are defined by prefixing the letter that is to be used for the
+# accesskey with an ampersand (e.g. &).
+
+# Do not replace $BrandShortName, $BrandFullName, or $BrandFullNameDA with a
+# custom string and always use the same one as used by the en-US files.
+# $BrandFullNameDA allows the string to contain an ampersand (e.g. DA stands
+# for double ampersand) and prevents the letter following the ampersand from
+# being used as an accesskey.
+
+# You can use \n to create a newline in the string but only when the string
+# from en-US contains a \n.
+
+WIN_CAPTION=$BrandShortName Setup
+
+INTRO_BLURB=Pwoc keken me yero $BrandFullName, layab ma oyeri i wi jami weng mapat. Dii wek iket.
+INSTALL_BLURB1=Icok dong bedo ki yom cwiny pi dwiro ma okati cokcoki, bedo mayom ki ber bedo dong pi meno in pol kare in aye igwoko kakare.
+INSTALL_BLURB2=Pien meno dul matiyo labongo magoba en aye omiyo $BrandShortName yabo ci Web dang bedo maber piri.
+INSTALL_BLURB3=In dang itye ka donyo bot lutedero me wilobo alutu pi jo matiyo kwede, jo matute me tiyo ki jo madongo kun gitute me miyo layab bedo maber i wilobo lung.
+
+WARN_MIN_SUPPORTED_OS_MSG=Tim kica, $BrandShortName pe romo keto. Cik man me $BrandShortName mito ${MinSupportedVer}onyo en manyen maloyo.
+WARN_WRITE_ACCESS=I pe ki twero me coc bot lanyut me keto.\nDii eyo me yero lanyut mapat.
+WARN_DISK_SPACE=I pe ki kabedo i disk me keto i kabedo man.\n\nDii eyo me yero kabedo mapat.
+WARN_ROOT_INSTALL=Pe twero keto i te disk.\n\nDii Kakare pi yero kabedo mapat.
+WARN_MANUALLY_CLOSE_APP_LAUNCH=$BrandShortName tye dong ka ngwec.\n\nTim ber i lo $BrandShortName kore me cako cik ma iketo ne kombedi.
+
+ERROR_DOWNLOAD=Kijwiko woko kwanyo jami mamegi.\n\nTim ber idi Mapeca Kakare wek imede anyim.
+
+INSTALL_BUTTON=&Keti
+UPGRADE_BUTTON=&Med Rom
+BACK_BUTTON=&Cen
+CANCEL_BUTTON=Juk
+OPTIONS_BUTTON=&Gin ayera
+
+MAKE_DEFAULT=&Make $BrandShortName my default browser
+CREATE_SHORTCUTS=Create Shortcuts for $BrandShortName:
+ADD_SC_TASKBAR=Ikom Bar me tic& mamega
+ADD_SC_QUICKLAUNCHBAR=On my &Quick Launch bar
+ADD_CheckboxShortcutInStartMenu=In my &Start Menu Programs Folder
+ADD_CheckboxShortcutOnDesktop=I kom &Cal me wang me kompiuta na
+SPACE_REQUIRED=Space Required:
+SPACE_AVAILABLE=Space Available:
+ONE_MOMENT=Kare moro, $BrandShortName bi cako cut cut kun keto gin man tyeko...
+INSTALL_MAINT_SERVICE=&Ket tic me ngec pa yonge $BrandShortName
+BROWSE_BUTTON=Y&eny…
+DEST_FOLDER=Ka ma Boc gik iye
+
+DOWNLOADING_IN_PROGRESS=Downloading…
+DOWNLOADING_DONE=Downloaded
+INSTALLING_TO_BE_DONE=Installing
+INSTALLING_IN_PROGRESS=Tye ka keto…
+
+SELECT_FOLDER_TEXT=Select the folder to install $BrandShortName in.
+
+BYTE=B
+KILO=K
+MEGA=M
+GIGA=G
--- a/browser/pdfviewer/chrome.properties
+++ b/browser/pdfviewer/chrome.properties
@@ -1,4 +1,8 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 # Chrome notification bar messages and buttons
 unsupported_feature=Pe ki biyaro kakare coc acoya man me PDF.
 open_with_different_viewer=Yab Ki Gin maneno mapat pat
 open_with_different_viewer.accessKey=o
--- a/browser/pdfviewer/viewer.properties
+++ b/browser/pdfviewer/viewer.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 # Main toolbar buttons (tooltips and alt text for images)
 previous.title=Pot buk Mukato
 previous_label=Mukato angec
 next.title=Pot buk Malubo Kore
 next_label=En mukene
 
 # LOCALIZATION NOTE (page_label, page_of):
 # These strings are concatenated to form the "Page: X of Y" string.
@@ -13,16 +17,18 @@ page_of=pi {{pageCount}}
 
 zoom_out.title=Dwogo Woko
 zoom_out_label=Dwogo Woko
 zoom_in.title=Dwogo iyie
 zoom_in_label=Dwogo iyie
 zoom.title=Kwoti
 print.title=Goo
 print_label=Goo
+presentation_mode.title=Switch to Presentation Mode
+presentation_mode_label=Presentation Mode
 open_file.title=Yab Pwail
 open_file_label=Yabi
 download.title=Gam
 download_label=Gam
 bookmark.title=Neno matye (loki onyo yabi i dirica manyen)
 bookmark_label=Neno Matye
 
 # Tooltips and alt text for side panel toolbar buttons
@@ -43,16 +49,20 @@ no_outline=Lok mogo bene Pe nonge
 # 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=Pot buk {{page}}
 # LOCALIZATION NOTE (thumb_page_canvas): "{{page}}" will be replaced by the page
 # number.
 thumb_page_canvas=Capa cing e Pot buk {{page}}
 
+# Context menu
+page_rotate_cw.label=Rotate Clockwise
+page_rotate_ccw.label=Rotate Counter-Clockwise
+
 # Search panel button title and messages
 search=Nong
 search_terms_not_found=(Pe ononge)
 
 # Error panel labels
 error_more_info=Ngec Mukene
 error_less_info=Less Information
 error_close=Lor
--- a/browser/profile/bookmarks.inc
+++ b/browser/profile/bookmarks.inc
@@ -1,9 +1,9 @@
-#filter emptyLines
+# This Source Code Form is subject to the terms of the Mozilla Public# License, v. 2.0. If a copy of the MPL was not distributed with this# file, You can obtain one at http://mozilla.org/MPL/2.0/.#filter emptyLines
 # LOCALIZATION NOTE: The 'en-US' strings in the URLs will be replaced with
 # your locale code, and link to your translated pages as soon as they're 
 # live.
 
 #define bookmarks_title Alama
 
 
 #define bookmarks_heading Alama Buk
--- a/dom/chrome/dom/dom.properties
+++ b/dom/chrome/dom/dom.properties
@@ -100,16 +100,17 @@ FullScreenDeniedLostWindow=Kikwero woko 
 FullScreenDeniedSubDocFullScreen=Kikwero woko Kwac me wang kompiuta weng pien coc acoya maditu me coc acoya ma kwayo wang kompiuta weng bene dong tye.
 FullScreenDeniedNotDescendant=Kikwero woko Kwac me wang kompiuta weng pien kwayo jami pe obedo kwaro pa jami me wang jami weng me kompiuta matye.
 FullScreenDeniedNotFocusedTab=Kikwero woko Kwac me wang kompiuta weng pien kwayo jami pe tye i tab me neno matye.
 RemovedFullScreenElement=Okato woko ki wang kompiuta weng pien kikwanyo woko coc acoya ki jami me wang kompiuta weng.
 FocusedWindowedPluginWhileFullScreen=Okato woko ki wang kompiuta weng pien onongo tye neno me anyim pi rwako dirija iyie.
 HTMLMultipartXHRWarning=HTML nyutu ie XMLHttpRequest pe kicwako pi lagam ma onote.
 HTMLSyncXHRWarning=HTML nyutu ie XMLHttpRequest pe kicwako i kit ma time.
 InvalidRedirectChannelWarning=Pe onongo twero nwoyo nyutu bot %S pien yo beo pe cako nsIWritablePropertyBag2.
+ReportOnlyCSPIgnored=Report-only CSP policy will be ignored because there are other non-report-only CSP policies applied.
 ResponseTypeSyncXHRWarning=Tic me XMLHttpRequest's kit me lagam pe kicwako i kit gin ma time i coc me ka coc ma i dirija.
 WithCredentialsSyncXHRWarning=Tic me XMLHttpRequest's withCredentials pe kicwako lagam kombedi i kit gin ma time i coc me ka coc ma i dirija.
 TimeoutSyncXHRWarning=Tic me XMLHttpRequest's kit me lagam pe kicwako i kit gin ma time i coc me ka coc ma i dirija.
 JSONCharsetWarning=Kitemo yaro ka maleng en ma pe obedo--UTF-8 encoding pi JSON kidwogo kun tiyo ki XMLHttpRequest. Kicwako ka te UTF-8 keken pi nyutu JSON.
 MediaLoadExhaustedCandidates=Jami pa lutim peny weng me pango pe olare. Kicung manok pango ka beo.
 MediaLoadSourceMissingSrc=<source> jami pe ki "src" yele me tiyo. Pango ka beo pe olare.
 # LOCALIZATION NOTE: %1$S is the Http error code the server returned (e.g. 404, 500, etc), %2$S is the URL of the media resource which failed to load.
 MediaLoadHttpError=Pango HTTP pe olare ki kit %1$S. pang me ka %2$S pe olare.
@@ -118,18 +119,18 @@ MediaLoadInvalidURI=URl ma pe tiyo. Pang
 # LOCALIZATION NOTE: %1$S is the media resource's format/codec type (basically equivalent to the file type, e.g. MP4,AVI,WMV,MOV etc), %2$S is the URL of the media resource which failed to load.
 MediaLoadUnsupportedTypeAttribute=Specified "type" attribute of "%1$S" is not supported. Load of media resource %2$S failed.
 # LOCALIZATION NOTE: %1$S is the "media" attribute value of the <source> element. It is a media query. %2$S is the URL of the media resource which failed to load.
 MediaLoadSourceMediaNotMatched=Kipoko yore ''kube'' yele me tiyo pi "%1$S" pe rwate ki ka ma orumu wa. ka ma kube oaa ie maromo %2$S okwero woko.
 # LOCALIZATION NOTE: %1$S is the MIME type HTTP header being sent by the web server, %2$S is the URL of the media resource which failed to load.
 MediaLoadUnsupportedMimeType=Jami ma iyi'' HTTP-Kit'' me "%1$S" pe kicwako te. Pango ka beo me %2$S pe olare.
 # LOCALIZATION NOTE: %S is the URL of the media resource which failed to load because of error in decoding.
 MediaLoadDecodeError=Ka beo me %S pe onongo twero cwalo.
-# LOCALIZATION NOTE: Do not translate "MozBlobBuilder" and "Blob"
-MozBlobBuilderWarning=Tic me MozBlobBuilder kityeko miyo twero. Ti ki lagedo me Blob.
 # LOCALIZATION NOTE: Do not translate "DOMException", "code" and "name"
 DOMExceptionCodeWarning=Tic pa yele me tiyo, nodeName yele me tiyo kiketo woko. Tii ki nying akaka.
 # LOCALIZATION NOTE: Do not translate "__exposedProps__"
 NoExposedPropsWarning=Yaro ngec pi cal me chrome JS ii jami manonge ie labongo_Props ma kiyaro ka maler_ pe ogwoke maber ci kikwanyo woko. Nen https://developer.mozilla.org/en/XPConnect_wrappers pi ngec mukene mapol.
 # LOCALIZATION NOTE: Do not translate "Mutation Event" and "MutationObserver"
 MutationEventWarning=Kityeko coyo woko tic me Juku Yuba manok. Tii ki MutationObserver akaaka.
 # LOCALIZATION NOTE: Do not translate "Blob", "mozSlice", or "slice"
 MozSliceWarning=Tic me mozSlice ikom cal me Blob otyeko woko.  Tii ki en ma kibyeko ie.
+# LOCALIZATION NOTE: Do not translate "Components"
+ComponentsWarning=The Components object is deprecated. It will soon be removed.
--- a/dom/chrome/security/csp.properties
+++ b/dom/chrome/security/csp.properties
@@ -36,20 +36,22 @@ notSameScheme = pe twero cwalo ngec me U
 notSamePort = pe twero cwalo ngec me URI ki bur mapatpat ni yaa ki yubu coc acoya %1$S
 # 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 = Pot buk ikom %1$S pe twero cwalo ngec i %2$S
 allowOrDefaultSrcRequired = 'weko' onyo gang-src' mito nyutu ento peke  Loko dwoko bot "gang-src 'pe obedo'"
 # LOCALIZATION NOTE (failedToParseUnrecognizedSource):
 # %1$S is the CSP Source that could not be parsed
-failedToParseUnrecognizedSource = Okwero ngiyo odoco ka ma pe ongeo %1$S
+failedToParseUnrecognizedSource = Failed to parse unrecognized source %1$S
 # LOCALIZATION NOTE (reportPostRedirect):
 # %1$S is the specified report URI before redirect
 reportPostRedirect = Cwalo nywaro ngec i %1$S pe olare, acalo kit macalo nyutu otime kwede
+# LOCALIZATION NOTE (allowDirectiveDeprecated):
+allowDirectiveDeprecated = allow directive is deprecated, use the equivalent default-source directive instead
 
 # CSP Errors:
 policyURINotAlone = Cik-nyutu uri twero nen ka pire kene
 noParentRequest = Cik-uri pe twero yweko labongo kwac pa lunyodo ki CSP.
 # LOCALIZATION NOTE (policyURIParseError):
 # %1$S is the URI that could not be parsed
 policyURIParseError = Pe onwongo twero yubu URI iyi cik me URI: %1$S
 # LOCALIZATION NOTE (nonMatchingHost):
@@ -99,8 +101,11 @@ notIntersectPort = Pe onwongo twero kubo
 notIntersectScheme = Pe onwongo twero kubo kin %1$S kli %2$S kun lube ki peko me cal.
 # LOCALIZATION NOTE (intersectingSourceWithUndefinedHost):
 # %1$S is the source
 intersectingSourceWithUndefinedHost = intersecting source with undefined host: %1$S
 # LOCALIZATION NOTE (intersectingSourcesWithUndefinedHosts):
 # %1$S is the first source
 # %2$S is the second source
 intersectingSourcesWithUndefinedHosts = intersecting two sources with undefined hosts: %1$S and %2$S
+# LOCALIZATION NOTE (duplicateDirective):
+# %1$S is the name of the duplicate directive
+duplicateDirective = Duplicate %1$S directives detected.  All but the first instance will be ignored.
--- a/mobile/android/base/android_strings.dtd
+++ b/mobile/android/base/android_strings.dtd
@@ -7,17 +7,16 @@
 <!ENTITY  splash_bookmarks_history "Wan watye ka mino ngec mamegi me alama me buk ki lok mukato, maromo tero dakika keken onyo dong.">
 
 <!ENTITY  no_space_to_start_error "Kabedo tye manok pi &brandShortName; pi cako.">
 <!ENTITY  error_loading_file "Bal otime ikare me temo pango fail mamite pi tic i &brandShortName;">
 
 <!ENTITY  awesomebar_all_pages_title "Kakube maloyo">
 <!ENTITY  awesomebar_bookmarks_title "Alama me buk">
 <!ENTITY  awesomebar_history_title "Lok Mukato">
-<!ENTITY  awesomebar_search_engine "Yeny pi \&quot;&#037;s\&quot;">
 
 <!ENTITY  crash_reporter_title "&brandShortName; Lami ngec me Bal ma time atura">
 <!ENTITY  crash_message "&brandShortName; opoto woko. Myero ki mi lanyik megi ikom &brandShortName; Cak pot buk ka ce i nwoyo cako.">
 <!ENTITY  crash_help_message "Tim ber i kony wa cobo peko ma eni ni!">
 <!ENTITY  crash_send_report_message "Cwal ngec me poto atura pa Mozilla">
 <!ENTITY  crash_include_url "Med ie kanonge me pot buk">
 <!ENTITY  crash_close_label "Lor">
 <!ENTITY  crash_restart_label "Cak &brandShortName;">
@@ -82,35 +81,36 @@
 <!ENTITY pref_plugins_tap_to_play "Gwet wek tuki">
 <!ENTITY pref_plugins_disabled "Kijuko woko">
 <!ENTITY pref_text_size "Dit pa nyig Coc">
 <!ENTITY pref_font_size_tiny "Tino">
 <!ENTITY pref_font_size_small "Tidi">
 <!ENTITY pref_font_size_medium "Dyere dyere">
 <!ENTITY pref_font_size_large "Lac">
 <!ENTITY pref_font_size_xlarge "Madit loyo">
-<!ENTITY pref_font_size_set "Set">
+<!ENTITY pref_font_size_set "Ter">
 <!-- Localization note (pref_font_size_adjust_char): A button with a small version of this character
 (or combination of characters) is used to decrease the preview font size; a larger version of the
 same character/combination is used to increase the preview font size. It should be a concise
 representation of the language it is used in that will help show the text in the preview will change
 size. -->
 <!ENTITY pref_font_size_adjust_char "A">
 <!-- Localization note (pref_font_size_preview_text): This paragraph is used as an example to
     demonstrate the font size setting.  It is meant to be whimsical and fun. -->
 
-<!ENTITY pref_font_size_preview_text "The quick orange fox jumps over your expectations with more speed, more flexibility and more security. As a non-profit, we\'re free to innovate on your behalf without any pressure to compromise. That means a better experience for you and a brighter future for the Web.">
+<!ENTITY pref_font_size_preview_text "Orange fox pye me oyoto iwi byeka mamegi kwede dwiro mapol, bedo yot ki gwoko ber bedo mabup. Macalo labongo magoba, Wan\watye agonya pi cako ikakari labongo kit bura mo keken pi jalo. Man te loke ni diro mamwonya piri ci anyim maleng pi Web.">
 
 <!ENTITY pref_use_master_password "Tii ki i cwil me donyo ma dit">
+<!ENTITY pref_show_product_announcements "Nyut kwena me jami ma kato">
 <!ENTITY pref_sync "Sync">
 <!ENTITY pref_search_suggestions "Nyut byek me yeny maplo">
 <!ENTITY pref_import_android "Kel ki woko ki Android">
 <!ENTITY pref_private_data_history "Tye ka yabo &amp; Gol Mukato">
 <!ENTITY pref_private_data_formdata "Fom &amp; yeny mukato">
-<!ENTITY pref_private_data_cookies2 "Cookies &amp; active logins">
+<!ENTITY pref_private_data_cookies2 "Layab intanet &amp; donyo iyie me oyoto">
 <!ENTITY pref_private_data_passwords "Saved passwords">
 <!ENTITY pref_private_data_cache "Kagwoko">
 <!ENTITY pref_private_data_offlineApps "Coc kakube me web ma pe iwi yamo">
 <!ENTITY pref_private_data_siteSettings "Gin ma imito i di bar">
 
 <!ENTITY quit "Wek woko">
 
 <!ENTITY addons "Lamed-ikome">
@@ -119,25 +119,27 @@ size. -->
 <!ENTITY char_encoding "Kit ma Kicoyo Kwede">
 
 <!ENTITY share "Nywak">
 <!ENTITY share_title "Nywak kun beo">
 <!ENTITY share_image_failed "Pe twero nywako pot buk man">
 <!ENTITY save_as_pdf "Gwok Calo PDF">
 <!ENTITY find_in_page "Find in Page">
 <!ENTITY desktop_mode "Kwa Di bar me cal ma i kompiuta">
+<!ENTITY tools "Gitic">
 <!-- Localization note (find_text, find_prev, find_next, find_close) : These strings are used
      as alternate text for accessibility. They are not visible in the UI. -->
 
 <!ENTITY find_text "Find in Page">
 <!ENTITY find_prev "Previous">
 <!ENTITY find_next "En mukene">
 <!ENTITY find_close "Close">
 
 <!ENTITY contextmenu_open_new_tab "Yab ki iyi Tab Manyen">
+<!ENTITY contextmenu_open_in_reader "Yab ki I gin kwano">
 <!ENTITY contextmenu_remove_history "Remove">
 <!ENTITY contextmenu_remove_bookmark "Remove">
 <!ENTITY contextmenu_add_to_launcher "Med I gang Kio ma neno">
 <!ENTITY contextmenu_share "Nywak">
 <!ENTITY contextmenu_pasteandgo "Dac &amp; Ceti">
 <!ENTITY contextmenu_paste "Dani">
 <!ENTITY contextmenu_copyurl "Lok Address">
 <!ENTITY contextmenu_edit_bookmark "Yubi">
@@ -146,55 +148,59 @@ size. -->
 
 <!ENTITY history_removed "Kikwanyo woko pot buk">
 
 <!ENTITY bookmark_edit_title "Yub Alama buk">
 <!ENTITY bookmark_edit_name "Nying">
 <!ENTITY bookmark_edit_location "Kabedo">
 <!ENTITY bookmark_edit_keyword "Lok mapire tek">
 
-<!ENTITY site_settings_title2       "Site Settings…">
+<!ENTITY site_settings_title2       "Tero Kabedo...">
 <!ENTITY site_settings_cancel       "Jwik">
-<!ENTITY site_settings_clear        "Jwa">
+<!ENTITY site_settings_clear        "Clear">
 <!ENTITY site_settings_no_settings  "Ter mo peke me ajwa.">
 
 <!ENTITY reading_list "Nying jami me kwan">
 <!ENTITY reading_list_added "Kimedo woko pot buk ii Nying jami me Akwan mamegi">
 <!ENTITY reading_list_removed "Kikwanyo woko pot nuk ki Nying jami me akwani ni">
 <!ENTITY reading_list_failed "Medo pot buk pe olare ki Nying Jami me kwani">
-<!ENTITY reader_mode "Reader Mode">
+<!ENTITY reader "Reader">
 
 <!ENTITY masterpassword_create_title "Ket I cwil me donyo Madit">
 <!ENTITY masterpassword_remove_title "Kwany woko i cwil me donyo pa Ladit">
 <!ENTITY masterpassword_password "I cwil me donyo">
 <!ENTITY masterpassword_confirm "Mok i cwil me donyo">
 
 <!ENTITY button_ok "Kakare">
 <!ENTITY button_cancel "Jwik">
+<!ENTITY button_yes "Eyo">
+<!ENTITY button_no "Pe/Ku">
 <!ENTITY button_clear_data "Ywe tic">
+<!ENTITY button_set "Ter">
+<!ENTITY button_clear "Clear">
 
 <!ENTITY abouthome_addons_title "Med iwiye pi &brandShortName; megi">
 <!ENTITY abouthome_addons_browse "Yeny &brandShortName; weng pi med iwiye">
 <!ENTITY abouthome_last_tabs_title "Lanyik megi ki kare mukato angec">
 <!ENTITY abouthome_last_tabs_open "Yab Tab weng ki i kare mukato">
 <!ENTITY abouthome_top_sites_title "Kakube maloyo">
 <!ENTITY abouthome_top_sites_browse "Yeny kakube megi lung maloyo">
 <!-- Localization note (abouthome_about_sync3, abouthome_about_apps2): The
      chevron (ex: "»"; unicode= U+00BB) is used as an arrow to show that
      clicking this text in the promotions box will perform some action. Note
      that a non-breaking space (unicode= U+00A0) should be used between this
      character and the remainder of the string to prevent word wrap. -->
 <!ENTITY abouthome_about_sync3 "Set up Firefox Sync to access bookmarks, history and tabs from your other devices&#x00A0;»">
-<!ENTITY abouthome_about_apps2 "Get apps from the Mozilla Marketplace and discover the best the Web has to offer&#x00A0;»">
+<!ENTITY abouthome_about_apps3 "Get apps from the Firefox Marketplace and discover the best the Web has to offer&#x00A0;»">
 <!-- Localization note (abouthome_sync_bold_name, abouthome_apps_bold_name):
      These strings are accentuated as bold text in the "abouthome_about_..."
      strings above. These strings should be a subset of the strings above and
      generally be the name of the product the string describes. -->
 <!ENTITY abouthome_sync_bold_name "Firefox Sync">
-<!ENTITY abouthome_apps_bold_name "Mozilla Marketplace">
+<!ENTITY abouthome_apps_bold_name2 "Firefox Marketplace">
 
 <!ENTITY filepicker_title "Yer Pwail">
 <!ENTITY filepicker_audio_title "Yer onyo ket tekod me dwon">
 <!ENTITY filepicker_image_title "Yer onyo ter cal">
 <!ENTITY filepicker_video_title "Yer onyo ket video">
 <!-- Site identity popup -->
 
 <!ENTITY identity_connected_to "Ityeko dong kube woko I">
@@ -217,26 +223,29 @@ just addresses the organization to follo
 <!ENTITY bookmarkhistory_button_import "Kel ki woko">
 <!ENTITY bookmarkhistory_import_both "Kelo ki woko alama buke ki lok mukato angec
 ki Android">
 <!ENTITY bookmarkhistory_import_bookmarks "Kel ki woko alama buke
  ki Android">
 <!ENTITY bookmarkhistory_import_history "Kelo kiwoko lok mukato 
 ki Android">
 <!ENTITY bookmarkhistory_import_wait "Tim ber i kur...">
+<!-- Localization note (suggestions_prompt): The placeholder (&#037;s) should
+     be kept in the string; this will be replaced with the name of the search
+     engine. -->
+
+<!ENTITY suggestions_prompt "Would you like to turn on &#037;s search suggestions?">
 
 <!ENTITY webapp_generic_name "Purugram">
-<!-- Updater notifications -->
 
-<!ENTITY updater_start_title "&brandShortName;">
-<!ENTITY updater_start_ticker "&brandShortName; update available&#8230;">
-<!ENTITY updater_start_select "Select to download update.">
+<!ENTITY searchable_description "Alama buk ki lok mukato angec">
+<!-- Updater notifications --> 
 
-<!ENTITY updater_downloading_title "Golo &brandShortName;">
-<!ENTITY updater_downloading_ticker "Downloading &brandShortName; update&#8230;">
-<!ENTITY updater_downloading_ticker_failed "Failed to download &brandShortName; update&#8230;">
-<!ENTITY updater_downloading_select "Select to apply update when complete.">
-<!ENTITY updater_downloading_retry "Select to retry update download.">
-<!ENTITY updater_downloading_willapply "Waiting for download to complete.">
-
-<!ENTITY updater_apply_title "&brandShortName;">
-<!ENTITY updater_apply_ticker "&brandShortName; update available&#8230;">
-<!ENTITY updater_apply_select "Select to apply downloaded update.">
+<!ENTITY updater_start_title2 "Update available for &brandShortName;">
+<!ENTITY updater_start_select2 "Touch to download">
+ 
+<!ENTITY updater_downloading_title2 "Golo &brandShortName;">
+<!ENTITY updater_downloading_title_failed2 "Download failed">
+<!ENTITY updater_downloading_select2 "Gud wek ket ngec ka dong gikwanyo oko">
+<!ENTITY updater_downloading_retry2 "Gudi wek tem doki">
+ 
+<!ENTITY updater_apply_title2 "Update available for &brandShortName;">
+<!ENTITY updater_apply_select2 "Gudi wek imi ngec">
--- a/mobile/android/base/sync_strings.dtd
+++ b/mobile/android/base/sync_strings.dtd
@@ -10,18 +10,18 @@
 
 <!ENTITY sync.app.name.label "&syncBrand.fullName.label; Yubo">
 <!ENTITY sync.title.connect.label "Kub i &syncBrand.shortName.label;">
 <!ENTITY sync.title.adddevice.label "Med Akaunti me &syncBrand.fullName.label;">
 <!ENTITY sync.title.pair.label "Ket Jami tic aryo ayo">
 <!-- J-PAKE Key Screen -->
 
 <!ENTITY sync.subtitle.connect.label "Me miyo Jami tic megi manyen, “Yer &syncBrand.shortName.label;” ikum jami tic.">
-<!ENTITY sync.subtitle.header.label "Ket nyig coc ma eni ni i kom kompiuta mamegi">
-<!ENTITY sync.subtitle.connectlocation.label "Yer “&sync.title.pair.label;” iyi &syncBrand.shortName.label; dul me cal me ayera pi Firefox ma i kompiuta mamegi.">
+<!ENTITY sync.subtitle.header2.label "Ket nyig coc man ikom jami me tic mukene">
+<!ENTITY sync.subtitle.connectlocation2.label 'Select “&sync.title.pair.label;” in the &syncBrand.shortName.label; section of your other device\&apos;s Firefox options.'>
 <!ENTITY sync.subtitle.pair.label "Me miyo tic, yer “Ket jami tic aryo aryo” ikom jami tic megi mapat.">
 <!ENTITY sync.pin.default.label "...\n...\n...\n">
 <!ENTITY sync.pin.oneline.label "...">
 <!ENTITY sync.link.show.label "Nyuta yore mene.">
 <!ENTITY sync.link.advancedsetup.label "Ter me rwom ma lamal…">
 <!ENTITY sync.link.nodevice.label "Ape ki jami tic bota…">
 <!-- J-PAKE Waiting Screen -->
 
--- a/mobile/android/chrome/about.dtd
+++ b/mobile/android/chrome/about.dtd
@@ -1,8 +1,11 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <!ENTITY aboutPage.title                        "Makwako &brandShortName;">
 <!ENTITY aboutPage.warningVersion               "&brandShortName; kitwero temo ento nyo pe cung matek.">
 <!ENTITY aboutPage.telemetryStart               " en cwalo pire kene ngec ikom kit ma tiyo kwede, nyonyo, tice ki keto jami pa dano cen bot ">
 <!ENTITY aboutPage.telemetryMozillaLink         "&vendorShortName;">
 <!ENTITY aboutPage.telemetryEnd                 " pi konyo miyo &brandShortName; bedo maber.">
 <!ENTITY aboutPage.checkForUpdates.link         "Rot pi Ngec»">
 <!ENTITY aboutPage.checkForUpdates.checking     "Tye ka yenyo pi ngec…">
 <!ENTITY aboutPage.checkForUpdates.none         "Ngec pe nonge">
--- a/mobile/android/chrome/aboutApps.dtd
+++ b/mobile/android/chrome/aboutApps.dtd
@@ -4,10 +4,10 @@
 
 <!ENTITY aboutApps.title2                          "Purugram">
 <!ENTITY aboutApps.header                          "Tic Mamegi">
 <!-- LOCALIZATION NOTE (aboutApps.noApps.pre): include a trailing space as needed -->
 <!-- LOCALIZATION NOTE (aboutApps.noApps.middle): avoid leading/trailing spaces, this text is a link -->
 <!-- LOCALIZATION NOTE (aboutApps.noApps.post): include a starting space as needed -->
 
 <!ENTITY aboutApps.noApps.pre "Tic me web dong pe kiketo woko. Nong mukene ki ">
-<!ENTITY aboutApps.noApps.middle2 "Mozilla Marketplace">
+<!ENTITY aboutApps.noApps.middle3 "Firefox Marketplace">
 <!ENTITY aboutApps.noApps.post ".">
--- a/mobile/android/chrome/aboutDownloads.properties
+++ b/mobile/android/chrome/aboutDownloads.properties
@@ -1,14 +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/.
 
 downloadAction.open=Yab
 downloadAction.remove=Kwany woko
+downloadAction.deleteAll=Delete All
+
+# LOCALIZATION NOTE (downloadMessage.deleteAll):
+# Semi-colon list of plural forms. See:
+# http://developer.mozilla.org/en/docs/Localization_and_Plurals
+downloadMessage.deleteAll=Delete this download?;Delete #1 downloads?
+
 downloadAction.pause=Cung manok
 downloadAction.resume=Dwogo
 downloadAction.cancel=Jwik
 downloadAction.retry=Retry
 downloadState.downloading=Downloading…
 downloadState.canceled=Kijuko woko
 downloadState.failed=Pe olare
 downloadState.paused=Ocung manok
deleted file mode 100644
--- a/mobile/android/chrome/aboutHome.dtd
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY homepage.default                          "&brandShortName; Cak">
--- a/mobile/android/chrome/browser.properties
+++ b/mobile/android/chrome/browser.properties
@@ -50,16 +50,19 @@ notificationRestart.button=Cak nitit
 
 # Popup Blocker
 popupWarning=%S Otyeko gengo di bar man ki yabo Dirija mapye iwiye.
 popupWarningMultiple=%S Otyeko gengo di bar man ki yabo %S Dirija mapye iwiye.
 popupButtonAllowOnce=Nyuti
 popupButtonAlwaysAllow2=Nyut jwijwi
 popupButtonNeverWarn2=Pe i nyut matwal
 
+# SafeBrowsing
+safeBrowsingDoorhanger=This site has been identified as containing malware or a phishing attempt. Be careful.
+
 # LOCALIZATION NOTE (blockPopups.label): Label that will be used in
 # site settings dialog.
 blockPopups.label=Geng gin mapye
 
 # Telemetry
 # %1$S = server owner (Mozilla); %2$S = product name (Firefox)
 telemetry.optin.message2=Cwal ngec bot %1$S wek wa yub %2$S?
 telemetry.optin.learnMore=Nong ngec mapol
@@ -141,17 +144,17 @@ openWebappsManage.wantsTo=%S mito lono t
 # LOCALIZATION NOTE (password.rememberPassword): Label that will be used in
 # site settings dialog.
 password.rememberPassword=Poyo I cwil me dony
 # LOCALIZATION NOTE (password.remember): This should match
 # promptRememberButtonText in passwordmgr.properties
 password.remember=Poyo
 # LOCALIZATION NOTE (password.never): This should match
 # promptNeverForSiteButtonText in passwordmgr.properties
-password.never=Pe
+password.never=Never
 
 # Bookmark List
 bookmarkList.desktop=Alama buk me Cal ma i kompiuta
 
 # Closing Tabs
 tabs.closeWarningTitle=Mok Cego
 
 # LOCALIZATION NOTE (tabs.closeWarning): Semi-colon list of plural forms.
@@ -213,29 +216,41 @@ contextmenu.copyLink=Lok Kakube
 contextmenu.shareLink=Nywak Kakube
 contextmenu.bookmarkLink=Ket alama me Kakube
 contextmenu.copyEmailAddress=Lok Kanonge me Email
 contextmenu.shareEmailAddress=Share Email Address
 contextmenu.copyPhoneNumber=Lok Namba me Cim
 contextmenu.sharePhoneNumber=Share Phone Number
 contextmenu.changeInputMethod=Yer Yore me Tic
 contextmenu.fullScreen=Wang Komputa Weng
+contextmenu.copyImageLocation=Lok Kabedo me Cal
 contextmenu.shareImage=Share Image
 contextmenu.saveImage=Gwok Cal
 contextmenu.addSearchEngine=Med Keno me Yeny
 
 contextmenu.copy=Lok
 contextmenu.copyAll=Lok Weng
 contextmenu.selectWord=Select Word
 contextmenu.selectAll=Yer Weng
 contextmenu.paste=Daci
 
 # Select UI
 selectHelper.closeMultipleSelectDialog=Otum
 
+#Input widgets UI
+inputWidgetHelper.date=Pick a date
+inputWidgetHelper.datetime=Pick a date and a time
+inputWidgetHelper.datetime-local=Pick a date and a time
+inputWidgetHelper.time=Pick a time
+inputWidgetHelper.week=Pick a week
+inputWidgetHelper.month=Pick a month
+inputWidgetHelper.cancel=Cancel
+inputWidgetHelper.set=Ter
+inputWidgetHelper.clear=Clear
+
 # Web Console API
 stacktrace.anonymousFunction=<anonymous>
 stacktrace.outputMessage=Yeny ma ocung ki %S, tiyo %S, rek %S.
 timer.start=%S: cawa ocake woko
 
 # LOCALIZATION NOTE (timer.end):
 # This string is used to display the result of the console.timeEnd() call.
 # %1$S=name of timer, %2$S=number of milliseconds
@@ -280,8 +295,10 @@ remoteIncomingPromptMessage=Kwac mogo ma
 remoteIncomingPromptDisable=Kijuko woko
 
 # Helper apps
 helperapps.open=Open
 helperapps.ignore=Ignore
 helperapps.dontAskAgain=Don't ask again for this site
 helperapps.openWithApp2=Open With %S App
 helperapps.openWithList2=Open With an App
+helperapps.always=Always
+helperapps.never=Never
--- a/mobile/android/defines.inc
+++ b/mobile/android/defines.inc
@@ -1,8 +1,8 @@
-#filter emptyLines
+# This Source Code Form is subject to the terms of the Mozilla Public# License, v. 2.0. If a copy of the MPL was not distributed with this# file, You can obtain one at http://mozilla.org/MPL/2.0/.#filter emptyLines
 #define MOZ_LANGPACK_CREATOR mozilla.org
 
 # If non-English locales wish to credit multiple contributors, uncomment this
 # variable definition and use the format specified.
 #define MOZ_LANGPACK_CONTRIBUTORS <em:contributor>San James</em:contributor> <em:contributor>War Child Holland-Uganda</em:contributor><em:contributor>Acuma George Patrick</em:contributor> <em:contributor>Keneth Ogwal</em:contributor><em:contributor>Dan Jasper Okello</em:contributor> <em:contributor>Opio June Brian</em:contributor><em:contributor>Kaloba Haron</em:contributor><em:contributor>Komakech S. B. Ford</em:contributor><em:contributor>Akena David Akeni</em:contributor><em:contributor>Acire Samuel</em:contributor><em:contributor>Ojara David Prince</em:contributor>
 
 #unfilter emptyLines
\ No newline at end of file
--- a/mobile/profile/bookmarks.inc
+++ b/mobile/profile/bookmarks.inc
@@ -1,9 +1,9 @@
-#filter emptyLines
+# This Source Code Form is subject to the terms of the Mozilla Public# License, v. 2.0. If a copy of the MPL was not distributed with this# file, You can obtain one at http://mozilla.org/MPL/2.0/.#filter emptyLines
 # LOCALIZATION NOTE: The 'en-US' strings in the URLs will be replaced with
 # your locale code, and link to your translated pages as soon as they're 
 # live.
 
 # LOCALIZATION NOTE: Some of these URLs are currently 404s, but should be coming
 
 # online shortly.
 
--- a/mobile/xul/chrome/about.dtd
+++ b/mobile/xul/chrome/about.dtd
@@ -1,8 +1,11 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <!ENTITY aboutPage.title                        "Makwako &brandShortName;">
 <!ENTITY aboutPage.warningVersion               "&brandShortName; kitwero temo ento nyo pe cung matek.">
 <!ENTITY aboutPage.telemetryStart               " Cwalo pire kene ngec ikom kite me tic; nyonyo, ki keto pa dano cen i ">
 <!ENTITY aboutPage.telemetryMozillaLink         "&vendorShortName;">
 <!ENTITY aboutPage.telemetryEnd                 " pi konyo miyo &brandShortName; obed maber.">
 <!ENTITY aboutPage.faq.label                    "FAQ">
 <!ENTITY aboutPage.support.label                "Cwak te">
 <!ENTITY aboutPage.privacyPolicy.label          "Cik pa Dano">
--- a/mobile/xul/defines.inc
+++ b/mobile/xul/defines.inc
@@ -1,8 +1,8 @@
-#filter emptyLines
+# This Source Code Form is subject to the terms of the Mozilla Public# License, v. 2.0. If a copy of the MPL was not distributed with this# file, You can obtain one at http://mozilla.org/MPL/2.0/.#filter emptyLines
 #define MOZ_LANGPACK_CREATOR mozilla.org
 
 # If non-English locales wish to credit multiple contributors, uncomment this
 # variable definition and use the format specified.
 #define MOZ_LANGPACK_CONTRIBUTORS <em:contributor>San James</em:contributor> <em:contributor>War Child Holland-Uganda</em:contributor><em:contributor>Acuma George Patrick</em:contributor> <em:contributor>Keneth Ogwal</em:contributor><em:contributor>Dan Jasper Okello</em:contributor> <em:contributor>Opio June Brian</em:contributor><em:contributor>Kaloba Haron</em:contributor><em:contributor>Komakech S. B. Ford</em:contributor><em:contributor>Akena David Akeni</em:contributor><em:contributor>Acire Samuel</em:contributor><em:contributor>Ojara David Prince</em:contributor>
 
 #unfilter emptyLines
\ No newline at end of file
--- a/security/manager/chrome/pipnss/pipnss.properties
+++ b/security/manager/chrome/pipnss/pipnss.properties
@@ -314,16 +314,17 @@ certErrorTrust_CaInvalid=Pe kigeno warag
 certErrorTrust_Issuer=Waraga pe gene pien lami waraga pe gene.
 certErrorTrust_SignatureAlgorithmDisabled=The certificate is not trusted because it was signed using a signature algorithm that was disabled because that algorithm is not secure.
 certErrorTrust_ExpiredIssuer=Waraga pe gene pien kara pa lami waraga okato woko.
 certErrorTrust_Untrusted=Waraga pe bino ki ka ma gene.
 
 certErrorMismatch=Waraga pe tiyo pi nying %S.
 # LOCALIZATION NOTE (certErrorMismatchSingle2): Do not translate <a id="cert_domain_link" title="%1$S">%1$S</a>
 certErrorMismatchSingle2=Waraga tiyo ka pi <a id="cert_domain_link" title="%1$S">%1$S</a>
+certErrorMismatchSinglePlain=Waraga pe tiyo pi %S
 certErrorMismatchMultiple=Waraga tiyo ka pi nying magi:
 certErrorMismatchNoNames=Waraga pe tiyo pi nying bal pa lapok tic.
 
 # LOCALIZATION NOTE (certErrorExpiredNow): Do not translate %1$S (date+time of expired certificate) or %2$S (current date+time)
 certErrorExpiredNow=Kare me waraga okato woko i %1$S.kare matye obedo %2$S.
 # LOCALIZATION NOTE (certErrorNotYetValidNow): Do not translate %1$S (date+time certificate will become valid) or %2$S (current date+time)
 certErrorNotYetValidNow=Waraga pe twero tic naka wang %1$S. kare matye obedo %2$S.
 
--- a/services/sync/sync.properties
+++ b/services/sync/sync.properties
@@ -6,17 +6,17 @@
 client.name2 = %1$S's %2$S on %3$S
 
 # %S is the date and time at which the last sync successfully completed
 lastSync2.label = Agiki sync: %S
 
 mobile.label = Alama me pot but ma kiwoto kwede
 
 remote.pending.label = Dirija matidi mape ki waya tye kakete…
-remote.missing.label = Sync kompiuta ni mukene odoco me nongo dirija matidi
+remote.missing2.label = Sync your other devices again to access their tabs
 remote.opened.label = Dirija matino weny ma peke ki waya dong oyabe
 remote.notification.label = Dirija me cal wang kompiuta me acel bibedo tye ka gi kiketo
 
 error.login.title = Bal ikare me donyo iyie
 error.login.description = keto obedo ki bal ikare me kube: %1$S.  Tim ber item doki.
 error.login.prefs.label = en ma imito…
 error.login.prefs.accesskey = p
 # should decide if we're going to show this
--- a/toolkit/chrome/global/about.dtd
+++ b/toolkit/chrome/global/about.dtd
@@ -1,8 +1,11 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <!ENTITY about.version                "Cik">
 <!-- LOCALIZATION NOTE (about.credits.beforeLink): note that there is no space between this phrase and the linked about.credits.linkTitle phrase, so if your locale needs a space between words, add it at the end of this entity. -->
 
 <!ENTITY about.credits.beforeLink     "Nen nying me ">
 <!ENTITY about.credits.linkTitle      "lukel">
 <!-- LOCALIZATION NOTE (about.credits.afterLink): note that there is no space between the linked about.credits.linkTitle phrase and this phrase, so if your locale needs a space between words, add it at the start of this entity. -->
 <!ENTITY about.credits.afterLink      " bot Purujek me Mozilla.">
 <!-- LOCALIZATION NOTE (about.license.beforeTheLink): note that there is no space between this phrase and the linked about.license.linkTitle phrase, so if your locale needs a space between words, add it at the end of this entity. -->
--- a/toolkit/chrome/global/aboutRights.dtd
+++ b/toolkit/chrome/global/aboutRights.dtd
@@ -1,8 +1,11 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <!-- rights.locale-direction instead of the usual local.dir entity, so RTL can skip translating page. -->
 <!ENTITY rights.locale-direction "ltr">
 <!ENTITY rights.pagetitle       "Makwako: twero">
 <!ENTITY rights.intro-header    "Makwako Twero ni">
 <!ENTITY rights.intro "&brandFullName; tye me nono ki purugram mape giculo pire, lwak jo maromo alib ki i twok lobo guyubu. Tye gin manok mamyero inge:">
 <!-- Note on pointa / pointb / pointc form:
      These points each have an embedded link in the HTML, so each point is
      split into chunks for text before the link, the link text, and the text
--- a/toolkit/chrome/global/aboutSupport.dtd
+++ b/toolkit/chrome/global/aboutSupport.dtd
@@ -53,9 +53,10 @@ variant of aboutSupport.showDir.label. -
 <!ENTITY aboutSupport.a11yActivated "Activated">
 <!ENTITY aboutSupport.a11yForceDisabled "Geng Donyo iye">
 
 <!ENTITY aboutSupport.libraryVersionsTitle "Cik pa kagwoko jami">
 
 <!ENTITY aboutSupport.installationHistoryTitle "Stori mo Kato">
 <!ENTITY aboutSupport.updateHistoryTitle "Ngec manyen pi en Mukato">
 
-<!ENTITY aboutSupport.copyToClipboard.label "Lok weng ite bod me cal">
+<!ENTITY aboutSupport.copyTextToClipboard.label "Copy text to clipboard">
+<!ENTITY aboutSupport.copyRawDataToClipboard.label "Copy raw data to clipboard">
--- a/toolkit/chrome/global/aboutSupport.properties
+++ b/toolkit/chrome/global/aboutSupport.properties
@@ -7,16 +7,24 @@
 # there are no good translations, these are only used in about:support
 
 # LOCALIZATION NOTE: This can be localized with a more generic term, like
 # "Graphics-accelerated Windows". It describes a number of windows, e.g.:
 # "GPU Accelerated Windows: 2/2 (Direct3D 9)"
 # "GPU Accelerated Windows: 0/2"
 acceleratedWindows = CPU Okelo Dirija
 
+# LOCALIZATION NOTE (rawDataCopied) Text displayed in a mobile "Toast" to user when the
+# raw data is successfully copied to the clipboard via button press.
+rawDataCopied=Raw data copied to clipboard
+
+# LOCALIZATION NOTE (textCopied) Text displayed in a mobile "Toast" to user when the
+# text is successfully copied to the clipboard via button press.
+textCopied=Kiloko coc i bao me coc
+
 # LOCALIZATION NOTE The verb "blocked" here refers to a graphics feature such as "Direct2D" or "OpenGL layers".
 blockedDriver = Gigengo woko deribwa pi cik me cal mamegi.
 
 # LOCALIZATION NOTE The %S here is a placeholder, leave unchanged, it will get replaced by the driver version string.
 tryNewerDriver = Gigengo woko cik pi dwono cal mamegi. Tem mino mino ngec mamegi manyen pi cik me deribwa %S onyo manyen ne.
 
 # LOCALIZATION NOTE The verb "blocked" here refers to a graphics feature such as "Direct2D" or "OpenGL layers".
 blockedGfxCard = Gigengo woko kad me cal mamegi pi kop pa deribwa mape kicobo.
new file mode 100644
--- /dev/null
+++ b/toolkit/chrome/global/devtools/debugger.properties
@@ -0,0 +1,24 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE These strings are used inside the Debugger
+# which is available from the Web Developer sub-menu -> 'Debugger'.
+# The correct localization of this file might be to keep it in
+# English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best
+# documentation on web development on the web.
+
+# LOCALIZATION NOTE (remoteIncomingPromptTitle): The title displayed on the
+# dialog that prompts the user to allow the incoming connection.
+remoteIncomingPromptTitle=Kube matye kabino ie
+
+# LOCALIZATION NOTE (remoteIncomingPromptMessage): The message displayed on the
+# dialog that prompts the user to allow the incoming connection.
+remoteIncomingPromptMessage=Kwac ma bino ie pi miyo twero bot kube me bal pi gin ma aa ki ka mabor dong kityeko nongo ne. Gin tic ma aa ki ka mabor romo bedo ki twero weng i kom layeny! Yeyi kube?
+
+# LOCALIZATION NOTE (remoteIncomingPromptDisable): The label displayed on the
+# third button in the incoming connection dialog that lets the user disable the
+# remote debugger server.
+remoteIncomingPromptDisable=Kijuko woko
--- a/toolkit/chrome/global/languageNames.properties
+++ b/toolkit/chrome/global/languageNames.properties
@@ -26,21 +26,23 @@ bo = Tibetan
 br = Breton
 bs = Bosnian
 ca = Catalan
 ce = Chechen
 ch = Chamorro
 co = Corsican
 cr = Cree
 cs = Czech
+csb = Kashubian
 cu = Church Slavic
 cv = Chuvash
 cy = Welsh
 da = Danish
 de = German
+dsb = Lower Sorbian
 dv = Divehi
 dz = Dzongkha
 ee = Ewe
 el = Greek
 en = English
 eo = Esperanto
 es = Spanish
 et = Estonian
@@ -49,24 +51,26 @@ fa = Persian
 ff = Fulah
 fi = Finnish
 fj = Fijian
 fo = Faroese
 fr = French
 fur = Friulian
 fy = Frisian
 ga = Irish
-gd = Scots Gaelic
+gd = Scottish Gaelic
 gl = Galician
 gn = Guarani
 gu = Gujarati
 gv = Manx
 ha = Hausa
+haw = Hawaiian
 he = Hebrew
 hi = Hindi
+hil = Hiligaynon
 ho = Hiri Motu
 hr = Croatian
 hsb = Upper Sorbian
 ht = Haitian
 hu = Hungarian
 hy = Armenian
 hz = Herero
 ia = Interlingua
new file mode 100644
--- /dev/null
+++ b/toolkit/chrome/global/webapps.properties
@@ -0,0 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE (webapps.uninstall.notification): %S will be replaced with the name of the uninstalled web app
+uninstall.notification = %S has been uninstalled from your computer.
+uninstall.label = Uninstall App
--- a/toolkit/chrome/mozapps/extensions/extensions.dtd
+++ b/toolkit/chrome/mozapps/extensions/extensions.dtd
@@ -1,8 +1,11 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <!ENTITY addons.windowTitle                   "Lalo-lamed ikome">
 
 <!ENTITY search.placeholder                   "Yeny lamed ikome weng">
 <!-- LOCALIZATION NOTE (search.commandKey):
      The search command key should match findOnCmd.commandkey from browser.dtd -->
 <!ENTITY search.commandkey                    "f">
 
 <!ENTITY loading.label                        "tye ka gamo…">
--- a/toolkit/chrome/mozapps/extensions/extensions.properties
+++ b/toolkit/chrome/mozapps/extensions/extensions.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 #LOCALIZATION NOTE (aboutWindowTitle) %S is the addon name
 aboutWindowTitle=Makwako %S
 aboutWindowCloseButton=Lor
 #LOCALIZATION NOTE (aboutWindowVersionString) %S is the addon version
 aboutWindowVersionString=kite %S
 #LOCALIZATION NOTE (aboutAddon) %S is the addon name
 aboutAddon=Makwako %S
 
@@ -21,16 +25,22 @@ notification.incompatible=%1$S pe rwate 
 notification.blocked=%1$S kityeko kwanyo woko pi kelo kop ikom gwok onyo bedo mot.
 notification.blocked.link=Ngec Mukene
 #LOCALIZATION NOTE (notification.softblocked) %1$S is the add-on name
 notification.softblocked=%1$S ngene pi kelo kop ikom gwok onyo bedo mot.
 notification.softblocked.link=Ngec Mukene
 #LOCALIZATION NOTE (notification.outdated) %1$S is the add-on name
 notification.outdated=En manyen ma pire tek tye pi %1$S.
 notification.outdated.link=En manyen Kombedi
+#LOCALIZATION NOTE (notification.vulnerableUpdatable) %1$S is the add-on name
+notification.vulnerableUpdatable=%1$S is known to be vulnerable and should be updated.
+notification.vulnerableUpdatable.link=Update Now
+#LOCALIZATION NOTE (notification.vulnerableNoUpdate) %1$S is the add-on name
+notification.vulnerableNoUpdate=%1$S is known to be vulnerable. Use with caution.
+notification.vulnerableNoUpdate.link=More Information
 #LOCALIZATION NOTE (notification.enable) %1$S is the add-on name, %2$S is brand name
 notification.enable=%1$S bino cake iyonge in cako nitit %2$S.
 #LOCALIZATION NOTE (notification.disable) %1$S is the add-on name, %2$S is brand name
 notification.disable=%1$S bino kwanye iyonge in cako nitit %2$S.
 #LOCALIZATION NOTE (notification.install) %1$S is the add-on name, %2$S is brand name
 notification.install=%1$S bino kete iyonge in cako nitit %2$S.
 #LOCALIZATION NOTE (notification.uninstall) %1$S is the add-on name, %2$S is brand name
 notification.uninstall=%1$S pe bino kete iyonge in cako nitit %2$S.
@@ -64,16 +74,22 @@ details.notification.incompatible=%1$S p
 details.notification.blocked=%1$S kityeko kwanyo pi kelo kop ikom gwok onyo bedo mot.
 details.notification.blocked.link=Ngec Mukene
 #LOCALIZATION NOTE (details.notification.softblocked) %1$S is the add-on name
 details.notification.softblocked=%1$S ngene pi kelo kop ikom gwok onyo bedo mot.
 details.notification.softblocked.link=Ngec Mukene
 #LOCALIZATION NOTE (details.notification.outdated) %1$S is the add-on name
 details.notification.outdated=En mayen mapire tek tye pi %1$S.
 details.notification.outdated.link=En manyen Kombedi
+#LOCALIZATION NOTE (details.notification.vulnerableUpdatable) %1$S is the add-on name
+details.notification.vulnerableUpdatable=%1$S is known to be vulnerable and should be updated.
+details.notification.vulnerableUpdatable.link=Update Now
+#LOCALIZATION NOTE (details.notification.vulnerableNoUpdate) %1$S is the add-on name
+details.notification.vulnerableNoUpdate=%1$S is known to be vulnerable. Use with caution.
+details.notification.vulnerableNoUpdate.link=More Information
 #LOCALIZATION NOTE (details.notification.enable) %1$S is the add-on name, %2$S is brand name
 details.notification.enable=%1$S bino cake iyonge in cako nitit %2$S.
 #LOCALIZATION NOTE (details.notification.disable) %1$S is the add-on name, %2$S is brand name
 details.notification.disable=%1$S bino kwanye iyonge in cako nitit %2$S.
 #LOCALIZATION NOTE (details.notification.install) %1$S is the add-on name, %2$S is brand name
 details.notification.install=%1$S bino kete iyonge in cako nitit %2$S.
 #LOCALIZATION NOTE (details.notification.uninstall) %1$S is the add-on name, %2$S is brand name
 details.notification.uninstall=%1$S pe bino kete iyonge in cako nitit %2$S.
--- a/toolkit/chrome/mozapps/plugins/plugins.dtd
+++ b/toolkit/chrome/mozapps/plugins/plugins.dtd
@@ -1,8 +1,11 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <!ENTITY pluginWizard.title                                  "Gin arwaka Gin makelo Tic">
 <!ENTITY pluginWizard.firstPage.title                        "Wajoli i &pluginWizard.title;">
 
 <!ENTITY pluginWizard.checkingForPlugins.description.label   "&brandShortName; tye ka roto pi gi arwaka matye…">
 
 <!ENTITY pluginWizard.availablePluginsPage.title             "Gin arwaka Makigamo Matye">
 <!ENTITY pluginWizard.availablePluginsPage.description.label "Gi arwaka eni ni tye:">
 <!ENTITY pluginWizard.availablePluginsPage.continueMsg.label "Dii Mukene me keto gin arawka magi.">
--- a/toolkit/chrome/mozapps/plugins/plugins.properties
+++ b/toolkit/chrome/mozapps/plugins/plugins.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 pluginLicenseAgreement.label=Pi keto %S, myero imok pora pi gin magi:
 
 pluginInstallation.download.start=TYe kagamo %S…
 pluginInstallation.download.finish=Otyeko gamo woko %S.
 
 pluginInstallation.install.start=Tye ka Keto %S…
 pluginInstallation.install.finish=KI keto maber atika %S.
 pluginInstallation.install.error=Okwero kete woko %S (%S).
--- a/toolkit/chrome/mozapps/update/updates.dtd
+++ b/toolkit/chrome/mozapps/update/updates.dtd
@@ -1,8 +1,11 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <!ENTITY  updateWizard.title              "Ngec me purugram me kompiuta">
 
 <!ENTITY  checking.title                  "Tye ka roto ngec">
 <!ENTITY  updateCheck.label               "Neno pi cik manyen me &brandShortName;…">
 
 <!ENTITY  pluginupdatesfound.title        "Onongo Ngec manyen me rwako iyie">
 <!ENTITY  pluginupdatesfound.label        "Cik manyen maloyo pi acel onyo mukene pi rwako mamegi iyie kinongo gi.">
 <!ENTITY  pluginupdateslink.label         "Nen kite me yilo rwom me rwako iyie.">
--- a/toolkit/chrome/mozapps/update/updates.properties
+++ b/toolkit/chrome/mozapps/update/updates.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 # LOCALIZATION NOTE: The 1st %S is the update name and the 2nd %S is the build
 # identifier from the local updates.xml for displaying update history
 # example: MyApplication (20081022033543)
 updateFullName=%S (%S)
 
 # LOCALIZATION NOTE: The 1st %S is brandShortName and 2nd %S is update version
 # where update version from the update xml
 # example: MyApplication 10.0.5