[ach] Update from Pootle
authorAcholi team <https://wiki.mozilla.org/L10n:Teams:ach>
Wed, 29 May 2013 15:04:35 +0200
changeset 87 bc08403586afaf7935cce23e56b08edaa7f57881
parent 80 ecdcf2d25e923368910b9da12f6233047b6b2915
child 88 63a0ec3d90f17be53c3c806c391848ade247063d
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:39:32 +0000
[ach] Update from Pootle
browser/chrome/browser/aboutHome.dtd
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/devtools/VariablesView.dtd
browser/chrome/browser/devtools/appcacheutils.properties
browser/chrome/browser/devtools/debugger.dtd
browser/chrome/browser/devtools/debugger.properties
browser/chrome/browser/devtools/gcli.properties
browser/chrome/browser/devtools/gclicommands.properties
browser/chrome/browser/devtools/netmonitor.dtd
browser/chrome/browser/devtools/netmonitor.properties
browser/chrome/browser/devtools/profiler.properties
browser/chrome/browser/devtools/scratchpad.properties
browser/chrome/browser/devtools/styleeditor.dtd
browser/chrome/browser/devtools/styleeditor.properties
browser/chrome/browser/devtools/toolbox.dtd
browser/chrome/browser/devtools/toolbox.properties
browser/chrome/browser/devtools/webConsole.dtd
browser/chrome/browser/devtools/webconsole.properties
browser/chrome/browser/migration/migration.properties
browser/chrome/browser/pageInfo.dtd
browser/chrome/browser/places/places.properties
browser/chrome/browser/preferences/aboutPermissions.properties
browser/chrome/browser/preferences/advanced-scripts.dtd
browser/chrome/browser/preferences/advanced.dtd
browser/chrome/browser/preferences/content.dtd
browser/chrome/browser/preferences/preferences.properties
browser/chrome/browser/preferences/tabs.dtd
browser/chrome/browser/quitDialog.properties
browser/chrome/browser/syncSetup.properties
browser/feedback/main.dtd
browser/feedback/main.properties
browser/installer/nsisstrings.properties
browser/pdfviewer/viewer.properties
browser/profile/chrome/userContent-example.css
browser/webapp-uninstaller/webapp-uninstaller.properties
browser/webapprt/webapp.dtd
browser/webapprt/webapp.properties
dom/chrome/dom/dom.properties
dom/chrome/plugins.properties
dom/chrome/security/security.properties
toolkit/chrome/global/aboutRights.dtd
toolkit/chrome/global/aboutRights.properties
toolkit/chrome/mozapps/downloads/unknownContentType.dtd
toolkit/chrome/mozapps/extensions/extensions.dtd
toolkit/chrome/mozapps/extensions/extensions.properties
webapprt/webapp-uninstaller/webapp-uninstaller.properties
webapprt/webapprt/webapp.dtd
webapprt/webapprt/webapp.properties
--- a/browser/chrome/browser/aboutHome.dtd
+++ b/browser/chrome/browser/aboutHome.dtd
@@ -16,16 +16,18 @@
      text in <a/> will be linked to the Firefox features page on mozilla.com
 -->
 
 <!ENTITY abouthome.defaultSnippet1.v1 "Pwoc madwong piyero Firefox! Me nongo ber ki layeny mamegi, nong ngec mapol ikom <a>en ma okati macokcoki </a>.">
 <!-- LOCALIZATION NOTE (abouthome.defaultSnippet2.v1):
      text in <a/> will be linked to the featured add-ons on addons.mozilla.org
 -->
 <!ENTITY abouthome.defaultSnippet2.v1 "Yot me yiko adaa Firefox mamegi kit ma i mito kwede. <a>yer ki i tutu mia add-ons</a>.">
+<!-- LOCALIZATION NOTE (abouthome.rightsSnippet): text in <a/> will be linked to about:rights -->
+<!ENTITY abouthome.rightsSnippet "&brandFullName; is free and open source software from the non-profit Mozilla Foundation. <a>Know your rights…</a>">
 
 <!ENTITY abouthome.bookmarksButton.label "Alama buk">
 <!ENTITY abouthome.historyButton.label   "Lok macon">
 <!ENTITY abouthome.settingsButton.label  "Tero">
 <!ENTITY abouthome.addonsButton.label    "Med ikome">
 <!ENTITY abouthome.appsButton.label      "Ka cuk">
 <!ENTITY abouthome.downloadsButton.label "Kwanyo">
 <!ENTITY abouthome.syncButton.label      "&syncBrand.shortName.label;">
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -110,17 +110,28 @@ These should match what Safari and other
 
 <!ENTITY closeWindow.label "Lor Dirica">
 <!ENTITY closeWindow.accesskey "c">
 
 <!ENTITY bookmarksMenu.label "Bookmarks">
 <!ENTITY bookmarksMenu.accesskey "B">
 <!ENTITY bookmarkThisPageCmd.label "Ket Alama i Pot Buk Man">
 <!ENTITY bookmarkThisPageCmd.commandkey "d">
-<!ENTITY sharePageCmd.commandkey "l">
+<!ENTITY markPageCmd.commandkey "l">
+<!ENTITY sharePageCmd.label "Share This Page">
+<!ENTITY sharePageCmd.commandkey "S">
+<!ENTITY sharePageCmd.accesskey "s">
+<!ENTITY shareLinkCmd.label "Share This Link">
+<!ENTITY shareLinkCmd.accesskey "s">
+<!ENTITY shareImageCmd.label "Share This Image">
+<!ENTITY shareImageCmd.accesskey "s">
+<!ENTITY shareSelectCmd.label "Share Selection">
+<!ENTITY shareSelectCmd.accesskey "s">
+<!ENTITY shareVideoCmd.label "Share This Video">
+<!ENTITY shareVideoCmd.accesskey "s">
 <!ENTITY subscribeToPageMenupopup.label "Cone i pot buk man">
 <!ENTITY subscribeToPageMenuitem.label "Cone i pot buk man…">
 <!ENTITY addCurPagesCmd.label "Ket Alama i dirica magi Weng…">
 <!ENTITY showAllBookmarks2.label "Nyut alama me Pot Buk Weng">
 <!ENTITY unsortedBookmarksCmd.label "Alam me potbuk magi ma pe kiyero">
 <!ENTITY bookmarksToolbarChevron.tooltip "Nyut alama me potbuk mukene">
 
 <!ENTITY backCmd.label                "Cen">
@@ -202,16 +213,18 @@ These should match what Safari and other
 <!ENTITY devtoolsConnect.accesskey    "e">
 
 <!ENTITY errorConsoleCmd.label        "Bal ki ka yubone">
 <!ENTITY errorConsoleCmd.accesskey    "k">
 <!ENTITY errorConsoleCmd.commandkey   "j">
 
 <!ENTITY remoteWebConsoleCmd.label    "Remote Web Console">
 
+<!ENTITY browserConsoleCmd.label      "Browser Console">
+
 <!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">
 <!-- LOCALIZATION NOTE (scratchpad.label): This menu item label appears
   -  in the Tools menu. See bug 653093.
@@ -532,17 +545,18 @@ you can use these alternative items. Oth
 
 <!ENTITY quitApplicationCmdWin.label       "Lorop"> 
 <!ENTITY quitApplicationCmdWin.accesskey   "r">
 <!ENTITY goBackCmd.commandKey "[">
 <!ENTITY goForwardCmd.commandKey "]">
 <!ENTITY quitApplicationCmd.label       "Weki"> 
 <!ENTITY quitApplicationCmd.accesskey   "W">
 <!ENTITY quitApplicationCmdMac.label    "Weki &brandShortName;">
-<!ENTITY quitApplicationCmdMac.key      "Q">
+<!-- LOCALIZATION NOTE(quitApplicationCmdUnix.key): This keyboard shortcut is used by both Linux and OSX builds. -->
+<!ENTITY quitApplicationCmdUnix.key     "Q">
 
 <!ENTITY closeCmd.label                 "Lor woko">  
 <!ENTITY closeCmd.key                   "W">  
 <!ENTITY closeCmd.accesskey             "L">
 
 <!ENTITY pageStyleMenu.label "Kit pot Buk">
 <!ENTITY pageStyleMenu.accesskey "t">
 <!ENTITY pageStyleNoStyle.label "Kite Pe">
@@ -626,22 +640,30 @@ just addresses the organization to follo
 <!ENTITY social.toggleSidebar.label "Show sidebar">
 <!ENTITY social.toggleSidebar.accesskey "s">
 
 <!ENTITY social.addons.label "Manage Services…">
 
 <!ENTITY social.toggleNotifications.label "Show desktop notifications">
 <!ENTITY social.toggleNotifications.accesskey "n">
 
-<!ENTITY social.activated.undobutton.label "Undo">
-<!ENTITY social.activated.undobutton.accesskey "U">
+<!ENTITY social.activated.description "Services from <label/> have been enabled. You can change your settings for services in the <label class='text-link'>Add-on Manager</label>.">
+<!ENTITY social.activated.undo.label "Oops, undo this!">
+<!ENTITY social.activated.undo.accesskey "U">
+<!ENTITY social.learnMore.label "Learn more…">
+<!ENTITY social.learnMore.accesskey "l">
+<!ENTITY social.closeNotificationItem.label "Not Now">
 
 <!ENTITY social.chatBar.commandkey "c">
 <!ENTITY social.chatBar.label "Focus chats">
 <!ENTITY social.chatBar.accesskey "c">
+<!-- labels are set dynamically, see browser.properties -->
+
+<!ENTITY social.markpage.accesskey "m">
+<!ENTITY social.marklink.accesskey "M">
 
 <!ENTITY getUserMedia.selectCamera.label "Camera to share:">
 <!ENTITY getUserMedia.selectCamera.accesskey "C">
 <!ENTITY getUserMedia.selectMicrophone.label "Microphone to share:">
 <!ENTITY getUserMedia.selectMicrophone.accesskey "M">
 
 <!ENTITY webrtcIndicatorButton.label "Camera / Microphone Access">
 <!ENTITY webrtcIndicatorButton.tooltip "Display sites you are currently sharing your camera or microphone with">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -26,27 +26,27 @@ xpinstallPromptAllowButton=Weki
 # See http://www.mozilla.org/access/keyboard/accesskey for details
 xpinstallPromptAllowButton.accesskey=A
 xpinstallDisabledMessageLocked=Kijuko keto yubi ii komputa,ma lalo jami me tic man aye otimo.
 xpinstallDisabledMessage=Kityeko juko woko keto yub mo ii komputa. Dii Yee ci item doki.
 xpinstallDisabledButton=Yee oti
 xpinstallDisabledButton.accesskey=n
 
 # LOCALIZATION NOTE (addonDownloading, addonDownloadCancelled, addonDownloadRestart):
-# Semi-colon list of plural forms. See:
+# Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # Also see https://bugzilla.mozilla.org/show_bug.cgi?id=570012 for mockups
 addonDownloading=Med-kwanyo;Med-ikome tye kamede ki kwanyo ne
 addonDownloadCancelled=Kijuko lamed ma kwanyo woko.;Lamedikome-me kwanyo kijuko woko.
 addonDownloadRestart=Cak Kwanyo;Cak odoco kwanyo gi
 addonDownloadRestart.accessKey=R
 addonDownloadCancelTooltip=Juki
 
 # LOCALIZATION NOTE (addonsInstalled, addonsInstalledNeedsRestart):
-# Semi-colon list of plural forms. See:
+# Semicolon-separated 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
 
 # LOCALIZATION NOTE (addonError-1, addonError-2, addonError-3, addonError-4):
@@ -80,32 +80,35 @@ lwthemePostInstallNotification.manageBut
 
 # LOCALIZATION NOTE (lwthemeNeedsRestart.message):
 # %S will be replaced with the new theme name.
 lwthemeNeedsRestart.message=%S Bikete i yonge cako ne odoco
 lwthemeNeedsRestart.button=Cak 0doco kombedi
 lwthemeNeedsRestart.accesskey=R
 
 # LOCALIZATION NOTE (popupWarning.message): Semicolon-separated list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is brandShortName and #2 is the number of pop-ups blocked.
 popupWarning.message=#1 prevented this site from opening a pop-up window.;#1 prevented this site from opening #2 pop-up windows.
 popupWarningButton=Me ayera
 popupWarningButton.accesskey=O
 popupWarningButtonUnix=Ma iyero
 popupWarningButtonUnix.accesskey=P
 popupAllow=Yee Wek gin ma ginyete pye iwiye pi %S
 popupBlock=Geng gin ma ginyete gipye iwiye pi %S
 popupWarningDontShowFromMessage=Pe inyut kwena man ka gin ma ginyete gipye iwiye ni kigengo gi woko
 popupWarningDontShowFromLocationbar=Pe inyut bar me ngec ka pye iwiye kigengo woko
 popupShowPopupPrefix=Nyut '%S'
 
 # missing plugin installer
-missingpluginsMessage.title=Medo rwakog gin mukene ma mite me yaro yo weng ikom pot buk man.
-missingpluginsMessage.button.label=Ket gin ma orem me aroya i iyi kama Orem…
-missingpluginsMessage.button.accesskey=I
+installPlugin.message = Would you like to install the plugin needed to display the media on this page?
+installPlugin.button.label=Install %S
+installPlugin.button.accesskey=I
+installPlugin.ignoreButton.label=Don't ask again
+installPlugin.ignoreButton.accesskey=N
 outdatedpluginsMessage.title=Jami mogo ma kirwako ipot buk man nino ticgi dong okato woko.
 outdatedpluginsMessage.updateButton.label=Rwak gin tic ma tiyo,kun imiyo ngec manyen kit ma kilwongo kwede.
 outdatedpluginsMessage.updateButton.accesskey=U
 blockedpluginsMessage.title=Gin mogo ma kirwako gi ipot buk man,kijuko gi me tic, wek ogwok gini.
 blockedpluginsMessage.infoButton.label=Lok kore ki kore…
 blockedpluginsMessage.infoButton.accesskey=D
 blockedpluginsMessage.searchButton.label=Mii Ngec manyen ikom ginarwaka i iyi…
 blockedpluginsMessage.searchButton.accesskey=U
@@ -134,16 +137,21 @@ vulnerablePluginsMessage=Some plugins ha
 pluginInfo.unknownPlugin=Pe ngene
 
 # Sanitize
 # LOCALIZATION NOTE (sanitizeDialog2.everything.title): When "Time range to
 # clear" is set to "Everything", the Clear Recent History dialog's title is
 # changed to this.  See UI mockup and comment 11 at bug 480169 -->
 sanitizeDialog2.everything.title=Jwa Gin Mukato Weng
 sanitizeButtonOK=Jwa Kombedi
+# LOCALIZATION NOTE (sanitizeButtonClearing): The label for the default
+# button between the user clicking it and the window closing.  Indicates the
+# items are being cleared.
+sanitizeButtonClearing=Clearing
+
 # LOCALIZATION NOTE (sanitizeEverythingWarning2): Warning that appears when
 # "Time range to clear" is set to "Everything" in Clear Recent History dialog,
 # provided that the user has not modified the default set of history items to clear.
 sanitizeEverythingWarning2=Gin mukato weng bi jwane woko.
 # LOCALIZATION NOTE (sanitizeSelectedWarning): Warning that appears when
 # "Time range to clear" is set to "Everything" in Clear Recent History dialog,
 # provided that the user has modified the default set of history items to clear.
 sanitizeSelectedWarning=Jami weng makiyero bi jwane woko.
@@ -172,17 +180,17 @@ feedShowFeedNew=Cone bot '%S'…
 
 menuOpenAllInTabs.label=Yabgi i Dirica Matino
 
 # History menu
 menuRestoreAllTabs.label=Dwok Dirica Matino
 # LOCALIZATION NOTE (menuRestoreAllWindows, menuUndoCloseWindowLabel, menuUndoCloseWindowSingleTabLabel):
 # see bug 394759
 menuRestoreAllWindows.label=Dwok Dirica Weng
-# LOCALIZATION NOTE (menuUndoCloseWindowLabel): Semi-colon list of plural forms.
+# LOCALIZATION NOTE (menuUndoCloseWindowLabel): Semicolon-separated list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 Window Title, #2 Number of tabs
 menuUndoCloseWindowLabel=#1 (ki #2 matidi mukene);#1 (ki #2 matino mukene)
 menuUndoCloseWindowSingleTabLabel=#1
 
 # Unified Back-/Forward Popup
 tabHistory.current=Dong i pot buk man
 tabHistory.goBack=Dok cen i pot buk man
@@ -231,19 +239,19 @@ identity.unknown.tooltip=Kakube man pe p
 identity.ownerUnknown2=(pe ngene)
 
 # Edit Bookmark UI
 editBookmarkPanel.pageBookmarkedTitle=Pot Buk ma Kiketo iye Alama
 editBookmarkPanel.pageBookmarkedDescription=%S ipolkare bipoyo wi ikom Pot buk man.
 editBookmarkPanel.bookmarkedRemovedTitle=Alama me pot buk Kidiro
 editBookmarkPanel.editBookmarkTitle=Yub Alama Buk Man
 
-# LOCALIZATION NOTE (editBookmark.removeBookmarks.label)
-# Semi-colon list of plural forms. Replacement for #1 is
-# the number of bookmarks to be removed.
+# LOCALIZATION NOTE (editBookmark.removeBookmarks.label): Semicolon-separated list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# Replacement for #1 is the number of bookmarks to be removed.
 # If this causes problems with localization you can also do "Remove Bookmarks (#1)"
 # instead of "Remove #1 Bookmarks".
 editBookmark.removeBookmarks.label=Kwany Alama Buk;Kwany Alama Buk #1
 
 # Post Update Notifications
 pu.notifyButton.label=Kore kikore…
 pu.notifyButton.accesskey=D
 # LOCALIZATION NOTE %S will be replaced by the short name of the application.
@@ -272,24 +280,24 @@ webNotifications.showForSession.accesske
 webNotifications.alwaysShow=Always Show Notifications
 webNotifications.alwaysShow.accesskey=A
 webNotifications.neverShow=Always Block Notifications
 webNotifications.neverShow.accesskey=N
 webNotifications.showFromSite=Would you like to show notifications from %S?
 
 # Pointer lock UI
 
-pointerLock.allow=Hide pointer
-pointerLock.allow.accesskey=H
+pointerLock.allow2=Hide pointer
+pointerLock.allow2.accesskey=H
 pointerLock.alwaysAllow=Always allow hiding
 pointerLock.alwaysAllow.accesskey=A
 pointerLock.neverAllow=Never allow hiding
 pointerLock.neverAllow.accesskey=N
-pointerLock.title=Would you like to allow the pointer to be hidden on %S?
-pointerLock.autoLock.title=%S will hide the pointer.
+pointerLock.title2=Would you like to allow the pointer to be hidden on %S?
+pointerLock.autoLock.title2=%S will hide the pointer.
 
 # Phishing/Malware Notification Bar.
 # LOCALIZATION NOTE (notAForgery, notAnAttack)
 # The two button strings will never be shown at the same time, so
 # it's okay for them to have the same access key
 safebrowsing.getMeOutOfHereButton.label=Kwanya woko ki kany!
 safebrowsing.getMeOutOfHereButton.accessKey=G
 safebrowsing.reportedWebForgery=Kimiyo Ngec me tim teto kube me goba-goba!
@@ -307,17 +315,17 @@ ctrlTab.showAll.label=;Nyut Dirica #1 ma
 
 # LOCALIZATION NOTE (addKeywordTitleAutoFill): %S will be replaced by the page's title
 # Used as the bookmark name when saving a keyword for a search field.
 addKeywordTitleAutoFill=Yeny %S
 
 # TabView
 # LOCALIZATION NOTE (tabview.title): %S is the application name.
 tabview.title=%S - Gur Diricani weng
-# LOCALIZATION NOTE (tabview.moveToUnnamedGroup.label): Semi-colon list of plural forms.
+# LOCALIZATION NOTE (tabview.moveToUnnamedGroup.label): Semicolon-separated list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the page title of the first tab in the unnamed group, 
 # #2 is the number of remaining tabs.
 tabview.moveToUnnamedGroup.label=#1 ki 1 mukene;#1 ki #2 mukene
 
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name=Dwok kit ma obedo tye kede
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description=Kit ma nen kwede.
 
@@ -356,53 +364,51 @@ syncPromoNotification.addons.description
 # 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. 
 
 # Mozilla data reporting notification (Telemetry, Firefox Health Report, etc)
 dataReportingNotification.message       = %1$S automatically sends some data to %2$S so that we can improve your experience.
 dataReportingNotification.button.label  = Choose What I Share
 dataReportingNotification.button.accessKey  = C
 
-# Keyword.URL reset prompt
-# LOCALIZATION NOTE (keywordPrompt.message):
-#  - %1$S is brandShortName
-#  - %2$S is a host name (e.g. "somewebsearch.com") from the current value of keyword.URL
-#  - %3$S is the name of the default search engine (e.g. "Google")
-keywordPrompt.message = %1$S tye katic ki '%2$S' pi yeny mogo ma i bar me kabedo. Onyo ce imito dwogo yeny man odoco (%3$S)?
-
-# LOCALIZATION NOTE (keywordPrompt.yesButton): %1$S is the name of the default search engine
-keywordPrompt.yesButton = Eyo, ti ki %1$S
-keywordPrompt.yesButton.accessKey = Y
-
-# LOCALIZATION NOTE (keywordPrompt.noButton): %1$S is a host name (e.g. "somewebsearch.com") from the current value of keyword.URL
-keywordPrompt.noButton = Pe, mede tic ki '%1$S'
-keywordPrompt.noButton.accessKey  = 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 (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.
 # LOCALIZATION NOTE (fullscreen.rememberDecision): displayed when we enter HTML5 fullscreen mode, %S is the domain name of the focused website (e.g. mozilla.com).
 fullscreen.rememberDecision=Poo wii i moko tam pi %S
 
-# 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.
+service.toolbarbutton.label=Services
+service.toolbarbutton.tooltiptext=Services
+
+# LOCALIZATION NOTE (social.install.description): %1$S is the hostname of the social provider, %2$S is brandShortName (e.g. Firefox)
+service.install.description=Would you like to enable services from %1$S to display in your %2$S toolbar and sidebar?
+service.install.ok.label=Enable Services
+service.install.ok.accesskey=E
+service.install.learnmore=Learn More…
 
 # LOCALIZATION NOTE (social.turnOff.label): %S is the name of the social provider
 social.turnOff.label=Turn off %S
 social.turnOff.accesskey=T
 # LOCALIZATION NOTE (social.turnOn.label): %S is the name of the social provider
 social.turnOn.label=Turn on %S
 social.turnOn.accesskey=T
 
+# LOCALIZATION NOTE (social.markpage.label): %S is the name of the social provider
+social.markpage.label=Send Page to %S
+social.unmarkpage.label=Remove Page from %S
+# LOCALIZATION NOTE (social.marklink.label): %S is the name of the social provider
+social.marklink.label=Send Link to %S
+social.unmarklink.label=Remove Link from %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.closeSidebar.label=Close This Sidebar
 social.error.closeSidebar.accesskey=C
 
 # LOCALIZATION NOTE: %1$S is the label for the toolbar button, %2$S is the associated badge numbering that the social provider may provide.
@@ -424,17 +430,17 @@ 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 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, getUserMedia.sharingCamera.message, getUserMedia.sharingMicrophone.message, getUserMedia.sharingCameraAndMicrophone.message): %S is the website origin (e.g. www.mozilla.org)
 # LOCALIZATION NOTE (getUserMedia.shareSelectedDevices.label):
-# Semi-colon list of plural forms. See:
+# Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # The number of devices can be either one or two.
 getUserMedia.shareCamera.message = Would you like to share your camera with %S?
 getUserMedia.shareMicrophone.message = Would you like to share your microphone with %S?
 getUserMedia.shareCameraAndMicrophone.message = Would you like to share your camera and microphone with %S?
 getUserMedia.noVideo.label = No Video
 getUserMedia.noAudio.label = No Audio
 getUserMedia.shareSelectedDevices.label = Share Selected Device;Share Selected Devices
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/VariablesView.dtd
@@ -0,0 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
+  - keep it in English, or another language commonly spoken among web developers.
+  - You want to make that choice consistent across the developer tools.
+  - A good criteria is the language in which you'd find the best
+  - documentation on web development on the web. -->
+
+
+<!ENTITY PropertiesViewWindowTitle "Kite">
+
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/appcacheutils.properties
@@ -0,0 +1,123 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE These strings are used inside the Inspector
+# which is available from the Web Developer sub-menu -> 'Inspect'.
+#
+# The correct localization of this file might be to keep it in
+# English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best
+# documentation on web development on the web.
+
+# LOCALIZATION NOTE (noManifest): Used when an attempt is made to validate a
+# page using AppCacheUtils.jsm that has no cache manifest.
+noManifest=The specified page has no manifest.
+
+# LOCALIZATION NOTE (notUTF8): Used when an attempt is made to validate a
+# cache manifest using AppCacheUtils.jsm having a character encoding that is not
+# UTF-8.
+notUTF8=Manifest has a character encoding of %S. Manifests must have the utf-8 character encoding.
+
+# LOCALIZATION NOTE (badMimeType): Used when an attempt is made to validate a
+# cache manifest using AppCacheUtils.jsm having a mimetype that is not
+# text/cache-manifest.
+badMimeType=Manifest has a mimetype of %S. Manifests must have a mimetype of text/cache-manifest.
+
+# LOCALIZATION NOTE (duplicateURI): Used when an attempt is made to validate a
+# page using AppCacheUtils.jsm that has a cache manifest which references the
+# same URI from multiple locations.
+duplicateURI=URI %S is referenced in multiple locations. This is not allowed: %S.
+
+# LOCALIZATION NOTE (networkBlocksURI): Used when an attempt is made to validate
+# a page using AppCacheUtils.jsm that has a cache manifest which references the
+# same URI in the NETWORK section as it does in other sections.
+networkBlocksURI=NETWORK section line %S (%S) prevents caching of line %S (%S) in the %S section.
+
+# LOCALIZATION NOTE (fallbackBlocksURI): Used when an attempt is made to
+# validate a page using AppCacheUtils.jsm that has a cache manifest which
+# references the same URI in the FALLBACK section as it does in other sections.
+fallbackBlocksURI=FALLBACK section line %S (%S) prevents caching of line %S (%S) in the %S section.
+
+# LOCALIZATION NOTE (fileChangedButNotManifest): Used when an attempt is made to
+# validate a page using AppCacheUtils.jsm that has a cache manifest which
+# references a URI that has a file modified after the cache manifest.
+fileChangedButNotManifest=The file %S was modified after %S. Unless the text in the manifest file is changed the cached version will be used instead at line %S.
+
+# LOCALIZATION NOTE (cacheControlNoStore): Used when an attempt is made to
+# validate a page using AppCacheUtils.jsm that has a header preventing caching
+# or storing information.
+cacheControlNoStore=%S has cache-control set to no-store. This will prevent the application cache from storing the file at line %S.
+
+# LOCALIZATION NOTE (notAvailable): Used when an attempt is made to validate a
+# page using AppCacheUtils.jsm that is not available.
+notAvailable=%S points to a resource that is not available at line %S.
+
+# LOCALIZATION NOTE (invalidURI): Used when an invalid URI is passed to the
+# appcache.
+invalidURI=The URI passed to AppCacheUtils is invalid.
+
+# LOCALIZATION NOTE (noResults) Used when a search returns no results.
+noResults=Your search returned no results.
+
+# LOCALIZATION NOTE (cacheDisabled) Used when the cache is disabled and an
+# attempt is made to view offline data.
+cacheDisabled=Your disk cache is disabled. Please set browser.cache.disk.enable to true in about:config and try again.
+
+# LOCALIZATION NOTE (firstLineMustBeCacheManifest): Used when an attempt is made
+# to validate a cache manifest using AppCacheUtils.jsm having a first line that
+# is not "CACHE MANIFEST."
+firstLineMustBeCacheManifest=The first line of the manifest must be "CACHE MANIFEST" at line %S.
+
+# LOCALIZATION NOTE (cacheManifestOnlyFirstLine): Used when an attempt is made
+# to validate a cache manifest using AppCacheUtils.jsm having "CACHE MANIFEST"
+# on a line other than the first line.
+cacheManifestOnlyFirstLine="CACHE MANIFEST" is only valid on the first line at line %S.
+
+# LOCALIZATION NOTE (asteriskInWrongSection): Used when an attempt is made
+# to validate a cache manifest using AppCacheUtils.jsm having an asterisk (*) in
+# a section other than the network section.
+asteriskInWrongSection=Asterisk used as a wildcard in the %S section at line %S. A single line containing an asterisk is called the online whitelist wildcard flag and is only valid in the NETWORK section. Other uses of the * character are prohibited. The presence of this flag indicates that any URI not listed as cached is to be implicitly treated as being in the online whitelist namespaces. If the flag is not present then the blocking state indicates that URIs not listed explicitly in the manifest are to be treated as unavailable.
+
+# LOCALIZATION NOTE (escapeSpaces): Used when an attempt is made to validate a
+# cache manifest using AppCacheUtils.jsm having a space in a URI. Spaces are to
+# be replaced with %20.
+escapeSpaces=Spaces in URIs need to be replaced with %20 at line %S.
+
+# LOCALIZATION NOTE (slashDotDotSlashBad): Used when an attempt is made to
+# validate a cache manifest using AppCacheUtils.jsm having a URI containing
+# /../, which is invalid.
+slashDotDotSlashBad=/../ is not a valid URI prefix at line %S.
+
+# LOCALIZATION NOTE (tooManyDotDotSlashes): Used when an attempt is made to
+# validate a cache manifest using AppCacheUtils.jsm having a URI containing
+# too many ../ operators. Too many of these operaters mean that the file would
+# be below the root of the site, which is not possible.
+tooManyDotDotSlashes=Too many dot dot slash operators (../) at line %S.
+
+# LOCALIZATION NOTE (fallbackUseSpaces): Used when an attempt is made to
+# validate a cache manifest using AppCacheUtils.jsm having a FALLBACK section
+# containing more or less than the standard two URIs seperated by a single
+# space.
+fallbackUseSpaces=Only two URIs separated by spaces are allowed in the FALLBACK section at line %S.
+
+# LOCALIZATION NOTE (fallbackAsterisk): Used when an attempt is made to validate
+# a cache manifest using AppCacheUtils.jsm having a FALLBACK section that
+# attempts to use an asterisk (*) as a wildcard. In this section the URI is
+# simply a path prefix.
+fallbackAsterisk=Asterisk (*) incorrectly used as a wildcard in a fallback namespace at line %S. Namespaces simply need to match a path prefix.
+
+# LOCALIZATION NOTE (settingsBadValue): Used when an attempt is made to validate
+# a cache manifest using AppCacheUtils.jsm having a SETTINGS section containing
+# something other than the valid "prefer-online" or "fast."
+settingsBadValue=The SETTINGS section may only contain a single value, "prefer-online" or "fast" at line %S.
+
+# LOCALIZATION NOTE (invalidSectionName): Used when an attempt is made to
+# validate a cache manifest using AppCacheUtils.jsm containing an invalid
+# section name.
+invalidSectionName=Invalid section name (%S) at line %S.
+
+# LOCALIZATION NOTE (entryNotFound): Used when an attempt is made to view a
+# cache entry that does not exist.
+entryNotFound=Entry not found.
--- a/browser/chrome/browser/devtools/debugger.dtd
+++ b/browser/chrome/browser/devtools/debugger.dtd
@@ -59,16 +59,22 @@
 <!ENTITY debuggerUI.showVarsFilter.key  "V">
 <!-- LOCALIZATION NOTE (debuggerUI.showOnlyEnum): This is the label for the
   -  checkbox that toggles visibility of hidden (non-enumerable) variables and
   -  properties in stack views. The "enumerable" flag is a state of a property
   -  defined in JavaScript. When in doubt, leave untranslated. -->
 
 <!ENTITY debuggerUI.showOnlyEnum        "Show only enumerable properties">
 <!ENTITY debuggerUI.showOnlyEnum.key    "P">
+<!-- LOCALIZATION NOTE (debuggerUI.showOriginalSource): This is the label for
+  -  the checkbox that toggles the display of original or sourcemap-derived
+  -  sources. -->
+
+<!ENTITY debuggerUI.showOriginalSource      "Show original sources">
+<!ENTITY debuggerUI.showOriginalSource.key  "O">
 <!-- LOCALIZATION NOTE (debuggerUI.searchPanelTitle): This is the text that
   -  appears in the filter panel popup as a description. -->
 
 <!ENTITY debuggerUI.searchPanelTitle    "Lutic kwede">
 <!-- LOCALIZATION NOTE (debuggerUI.searchFile): This is the text that appears
   -  in the source editor's context menu for the scripts search operation. -->
 
 <!ENTITY debuggerUI.searchFile          "Yek nyig coc">
@@ -79,17 +85,16 @@
 
 <!ENTITY debuggerUI.searchGlobal        "Search in all files">
 <!ENTITY debuggerUI.searchGlobal.key    "F">
 <!-- LOCALIZATION NOTE (debuggerUI.searchFunction): This is the text that appears
   -  in the source editor's context menu for the function search operation. -->
 
 <!ENTITY debuggerUI.searchFunction      "Search for function definition">
 <!ENTITY debuggerUI.searchFunction.key  "D">
-<!ENTITY debuggerUI.searchFunction.altkey "O">
 <!-- LOCALIZATION NOTE (debuggerUI.searchToken): This is the text that appears
   -  in the source editor's context menu for the token search operation. -->
 
 <!ENTITY debuggerUI.searchToken         "Find">
 <!ENTITY debuggerUI.searchToken.key     "F">
 <!-- LOCALIZATION NOTE (debuggerUI.searchLine): This is the text that appears
   -  in the source editor's context menu for the line search operation. -->
 
--- a/browser/chrome/browser/devtools/debugger.properties
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -5,25 +5,16 @@
 # LOCALIZATION NOTE These strings are used inside the Debugger
 # which is available from the Web Developer sub-menu -> 'Debugger'.
 # The correct localization of this file might be to keep it in
 # English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
-# LOCALIZATION NOTE (confirmTabSwitch): The messages displayed for all the
-# title and buttons on the notification shown when a user attempts to open a
-# debugger in a new tab while a different tab is already being debugged.
-confirmTabSwitch.message=Gin mabalo oyabe woko i dirica matidi mukene. Mede twero loro woko en mukene ca.
-confirmTabSwitch.buttonSwitch=Lok iwot i dirica matidi ma kibalo
-confirmTabSwitch.buttonSwitch.accessKey=S
-confirmTabSwitch.buttonOpen=Yab gite
-confirmTabSwitch.buttonOpen.accessKey=O
-
 # LOCALIZATION NOTE (open.commandkey): The key used to open the debugger in
 # combination to e.g. ctrl + shift
 open.commandkey=S
 
 # LOCALIZATION NOTE (debuggerMenu.accesskey): The access key used to open the
 # debugger.
 debuggerMenu.accesskey=D
 
@@ -210,8 +201,15 @@ variablesSeparatorLabel=:
 # LOCALIZATION NOTE (watchExpressionsSeparatorLabel): The text that is displayed
 # in the watch expressions list as a separator between the code and evaluation.
 watchExpressionsSeparatorLabel= →
 
 # LOCALIZATION NOTE (functionSearchSeparatorLabel): The text that is displayed
 # in the functions search panel as a separator between function's inferred name
 # and its real name (if available).
 functionSearchSeparatorLabel=←
+
+# LOCALIZATION NOTE (resumptionOrderPanelTitle): This is the text that appears
+# as a description in the notification panel popup, when multiple debuggers are
+# open in separate tabs and the user tries to resume them in the wrong order.
+# The substitution parameter is the URL of the last paused window that must be
+# resumed first.
+resumptionOrderPanelTitle=There are one or more paused debuggers. Please resume the most-recently paused debugger first at: %S
--- a/browser/chrome/browser/devtools/gcli.properties
+++ b/browser/chrome/browser/devtools/gcli.properties
@@ -14,16 +14,30 @@
 # LOCALIZATION NOTE (canonDescNone): Short string used to describe any command
 # or command parameter when no description has been provided.
 canonDescNone=(Lok ikome peke)
 
 # LOCALIZATION NOTE (canonDefaultGroupName): The default name for a group of
 # parameters.
 canonDefaultGroupName=Gin ayera
 
+# LOCALIZATION NOTE (canonProxyDesc): A very short description of a set of
+# remote commands. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible. See
+# canonProxyManual for a fuller description of what it does.
+canonProxyDesc=Execute a command on %S
+
+# LOCALIZATION NOTE (canonProxyManual): A fuller description of a set of
+# remote commands. Displayed when the user asks for help on what it does.
+canonProxyManual=A set of commands that are executed on a remote system. The remote system is reached via %S
+
+# LOCALIZATION NOTE (canonProxyExists): An error message displayed when we try
+# to add new command (via a proxy) where one already exists in that name.
+canonProxyExists=There is already a command called '%S'
+
 # LOCALIZATION NOTE (cliEvalJavascript): The special '{' command allows entry
 # of JavaScript like traditional developer tool command lines. This describes
 # the '{' command.
 cliEvalJavascript=Ket JavaScript atira
 
 # LOCALIZATION NOTE (cliUnusedArg): When the command line has more arguments
 # than the current command can understand this is the error message shown to
 # the user.
@@ -185,16 +199,102 @@ helpManOptional=me ayera
 # of the matching sub-commands
 subCommands=Nyig coc-Madito
 
 # LOCALIZATION NOTE (subCommandsNone): Text shown as part of the output of the
 # 'help' command when the command in question should have sub-commands but in
 # fact has none
 subCommandsNone=Peke
 
+# LOCALIZATION NOTE (contextDesc): A very short description of the 'context'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible. See contextManual for
+# a fuller description of what it does.
+contextDesc=Concentrate on a group of commands
+
+# LOCALIZATION NOTE (contextManual): A fuller description of the 'context'
+# command. Displayed when the user asks for help on what it does.
+contextManual=Setup a default prefix to future commands. For example 'context git' would allow you to type 'commit' rather than 'git commit'.
+
+# LOCALIZATION NOTE (contextPrefixDesc): A short description of the 'prefix'
+# parameter to the 'context' command. This string is designed to be shown in a
+# dialog with restricted space, which is why it should be as short as
+# possible.
+contextPrefixDesc=The command prefix
+
+# LOCALIZATION NOTE (contextNotParentError): An error message displayed during
+# the processing of the 'context' command, when the found command is not a
+# parent command.
+contextNotParentError=Can't use '%1$S' as a prefix because it is not a parent command.
+
+# LOCALIZATION NOTE (contextReply): A message displayed during the processing
+# of the 'context' command, to indicate success.
+contextReply=Using %1$S as a command prefix
+
+# LOCALIZATION NOTE (contextEmptyReply): A message displayed during the
+# processing of the 'context' command, to indicate that there is no command
+# prefix
+contextEmptyReply=Command prefix is unset
+
+# LOCALIZATION NOTE (connectDesc): A very short description of the 'connect'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible. See connectManual for
+# a fuller description of what it does.
+connectDesc=Proxy commands to server
+
+# LOCALIZATION NOTE (connectManual): A fuller description of the 'connect'
+# command. Displayed when the user asks for help on what it does.
+connectManual=Connect to the server, creating local versions of the commands on the server. Remote commands initially have a prefix to distinguish them from local commands (but see the context command to get past this)
+
+# LOCALIZATION NOTE (connectPrefixDesc): A short description of the 'prefix'
+# parameter to the 'connect' command. This string is designed to be shown in a
+# dialog with restricted space, which is why it should be as short as
+# possible.
+connectPrefixDesc=Parent prefix for imported commands
+
+# LOCALIZATION NOTE (connectPortDesc): A short description of the 'port'
+# parameter to the 'connect' command. This string is designed to be shown in a
+# dialog with restricted space, which is why it should be as short as
+# possible.
+connectPortDesc=The TCP port to listen on
+
+# LOCALIZATION NOTE (connectHostDesc): A short description of the 'host'
+# parameter to the 'connect' command. This string is designed to be shown in a
+# dialog with restricted space, which is why it should be as short as
+# possible.
+connectHostDesc=The hostname to bind to
+
+# LOCALIZATION NOTE (connectDupReply): An error condition from executing the
+# 'connect' command
+connectDupReply=Connection called %S already exists.
+
+# LOCALIZATION NOTE (connectReply): The output of the 'connect' command,
+# telling the user what it has done.
+connectReply=Added %S commands.
+
+# LOCALIZATION NOTE (disconnectDesc): A very short description of the
+# 'disconnect' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+# See connectManual for a fuller description of what it does.
+disconnectDesc=Proxy commands to server
+
+# LOCALIZATION NOTE (disconnectManual): A fuller description of the
+# 'disconnect' command. Displayed when the user asks for help on what it does.
+disconnectManual=Connect to the server, creating local versions of the commands on the server. Remote commands initially have a prefix to distinguish them from local commands (but see the context command to get past this)
+
+# LOCALIZATION NOTE (disconnectPrefixDesc): A short description of the
+# 'prefix' parameter to the 'disconnect' command. This string is designed to
+# be shown in a dialog with restricted space, which is why it should be as
+# short as possible.
+disconnectPrefixDesc=Parent prefix for imported commands
+
+# LOCALIZATION NOTE (disconnectReply): The output of the 'disconnect' command,
+# telling the user what it's done.
+disconnectReply=Removed %S commands.
+
 # LOCALIZATION NOTE (prefDesc): A very short description of the 'pref'
 # command. This string is designed to be shown in a menu alongside the command
 # name, which is why it should be as short as possible. See prefManual for a
 # fuller description of what it does.
 prefDesc=Ciko pi gwoko tera
 
 # LOCALIZATION NOTE (prefManual): A fuller description of the 'pref' command.
 # Displayed when the user asks for help on what it does.
--- a/browser/chrome/browser/devtools/gclicommands.properties
+++ b/browser/chrome/browser/devtools/gclicommands.properties
@@ -7,24 +7,16 @@
 # -> 'Web Console'.
 #
 # The correct localization of this file might be to keep it in
 # English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
-# LOCALIZATION NOTE (echoDesc) A very short string used to describe the
-# function of the echo command.
-echoDesc=Nyut kwena
-
-# LOCALIZATION NOTE (echoMessageDesc) A very short string used to describe the
-# message parameter to the echo command.
-echoMessageDesc=Kwena
-
 # LOCALIZATION NOTE (helpDesc) A very short string used to describe the
 # function of the help command.
 helpDesc=Nong kony ikom cik matye
 
 # LOCALIZATION NOTE (helpAvailable) Used in the output of the help command to
 # explain the contents of the command help table.
 helpAvailable=Cik matye
 
@@ -322,28 +314,23 @@ breakDesc=Gwok ka cung manok
 # LOCALIZATION NOTE (breakManual) A longer description describing the
 # set of commands that control breakpoints.
 breakManual=Cik bot nying jami, med ci i kwany woko kacung manok
 
 # LOCALIZATION NOTE (breaklistDesc) A very short string used to describe the
 # function of the 'break list' command.
 breaklistDesc=Yar kamaleng kacung manok ma ngene
 
-# LOCALIZATION NOTE (breaklistLineEntry) Used in the output of the 'break list'
-# command to display a single line breakpoint.
-# %1$S=script URL, %2$S=line number
-breaklistLineEntry=Rek me kacung manok i %1$S:%2$S
-
 # LOCALIZATION NOTE (breaklistNone) Used in the output of the 'break list'
 # command to explain that the list is empty.
 breaklistNone=Pe kitero kacung manok
 
-# LOCALIZATION NOTE (breaklistIntro) Used in the output of the 'break list'
-# command to preface the list contents.
-breaklistIntro=Kityeko dong tero woko kacung manok magi:
+# LOCALIZATION NOTE (breaklistOutRemove) A title used in the output from the
+# 'break list' command on a button which can be used to remove breakpoints
+breaklistOutRemove=Remove
 
 # LOCALIZATION NOTE (breakaddAdded) Used in the output of the 'break add'
 # command to explain that a breakpoint was added.
 breakaddAdded=Kacung manok ma kimedo
 
 # LOCALIZATION NOTE (breakaddFailed) Used in the output of the 'break add'
 # command to explain that a breakpoint could not be added.
 breakaddFailed=Pe onongo romo tero kacung manok: %S
@@ -543,16 +530,38 @@ addonListTypeDesc=Select an add-on type
 addonListDictionaryHeading=Buk magi me gonyo leb kombedi kiketo woko:
 addonListExtensionHeading=Kityeko keto kombedi nyaa magi:
 addonListLocaleHeading=Kabedo magi kombedi dong kiketo woko:
 addonListPluginHeading=Rwak ie magi kombedi dong kiketo woko:
 addonListThemeHeading=Cal magi kommbedi dong kiketo woko:
 addonListAllHeading=The following add-ons are currently installed:
 addonListUnknownHeading=The following add-ons of the selected type are currently installed:
 
+# LOCALIZATION NOTE (addonListOutEnable, addonListOutDisable) Used in the
+# output of the 'addon list' command as the labels for the enable/disable
+# action buttons in the listing. This string is designed to be shown in a
+# small action button next to the addon name, which is why it should be as
+# short as possible.
+addonListOutEnable=Yee oti
+addonListOutDisable=Kijuko woko
+
+# LOCALIZATION NOTE (addonPending, addonPendingEnable, addonPendingDisable,
+# addonPendingUninstall, addonPendingInstall, addonPendingUpgrade) Used in
+# the output of the 'addon list' command as the descriptions of pending
+# addon operations. addonPending is used as a prefix for a list of pending
+# actions (named by the other lookup variables). These strings are designed
+# to be shown alongside addon names, which is why they should be as short
+# as possible.
+addonPending=pending
+addonPendingEnable=enable
+addonPendingDisable=disable
+addonPendingUninstall=uninstall
+addonPendingInstall=install
+addonPendingUpgrade=upgrade
+
 # LOCALIZATION NOTE (addonNameDesc) A very short description of the
 # name parameter of numerous add-on commands. This string is designed to be shown
 # in a menu alongside the command name, which is why it should be as short as
 # possible.
 addonNameDesc=Nying me med ikom
 
 # LOCALIZATION NOTE (addonNoneOfType) Used in the output of the 'addon list'
 # command when a search for add-ons of a particular type were not found.
@@ -712,16 +721,64 @@ pagemodRemoveAttributeRootDesc=Layer me 
 # to describe the 'ignoreCase' parameter to the 'pagemod remove attribute'
 # command, which is displayed in a dialog when the user is using this command.
 pagemodRemoveAttributeIgnoreCaseDesc=Tiyo tic me yeny ma pe poo wic
 
 # LOCALIZATION NOTE (pagemodRemoveAttributeResult) A string displayed as the
 # result of the 'pagemod remove attribute' command.
 pagemodRemoveAttributeResult=Layer orwato jami: %1$S. Kikwanyo jami woko: %2$S.
 
+# LOCALIZATION NOTE (toolsDesc2) A very short description of the 'tools'
+# command, the parent command for tool-hacking commands.
+# The argument (%1$S) is the browser name.
+toolsDesc2=Hack the %1$S Developer Tools
+
+# LOCALIZATION NOTE (toolsManual2) A fuller description of the 'tools'
+# command. The argument (%1$S) is the browser name.
+toolsManual2=Various commands related to hacking directly on the %1$S Developer Tools.
+
+# LOCALIZATION NOTE (toolsSrcdirDesc) A very short description of the 'tools srcdir'
+# command, for pointing your developer tools loader at a mozilla-central source tree.
+toolsSrcdirDesc=Load tools from a mozilla-central checkout
+
+# LOCALIZATION NOTE (toolsSrcdirNotFound) Shown when the 'tools srcdir' command was handed
+# an invalid srcdir.
+toolsSrcdirNotFound=%1$s does not exist or is not a mozilla-central checkout.
+
+# LOCALIZATION NOTE (toolsSrcdirReloaded) Displayed when tools have been reloaded by the
+# 'tools srcdir' command.
+toolsSrcdirReloaded=Tools loaded from %1$s.
+
+# LOCALIZATION NOTE (toolsSrcdirManual2) A full description of the 'tools srcdir'
+# command. The argument (%1$S) is the browser name.
+toolsSrcdirManual2=Load the %1$S Developer Tools from a complete mozilla-central checkout.
+
+# LOCALIZATION NOTE (toolsSrcdirDir) The srcdir argument to the 'tools srcdir' command.
+toolsSrcdirDir=A mozilla-central checkout
+
+# LOCALIZATION NOTE (toolsBuiltinDesc) A short description of the 'tools builtin'
+# command, which overrides a previous 'tools srcdir' command.
+toolsBuiltinDesc=Use the builtin tools
+
+# LOCALIZATION NOTE (toolsBuiltinDesc) A fuller description of the 'tools builtin'
+# command.
+toolsBuiltinManual=Use the builtin tools, overriding any previous srcdir command.
+
+# LOCALIZATION NOTE (toolsBuiltinReloaded) Displayed when tools are loaded with the
+# 'tools builtin' command.
+toolsBuiltinReloaded=Builtin tools loaded.
+
+# LOCALIZATION NOTE (toolsReloadDesc) A short description of the 'tools reload' command.
+# which will reload the tools from the current srcdir.
+toolsReloadDesc=Reload the developer tools
+
+# LOCALIZATION NOTE (toolsReloaded2) Displayed when tools are reloaded with the 'tools
+# reload' command.
+toolsReloaded2=Tools reloaded.
+
 # LOCALIZATION NOTE (cookieDesc) A very short description of the 'cookie'
 # command. See cookieManual 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.
 cookieDesc=Yar ka maleng ci iwir layeny intanet
 
 # LOCALIZATION NOTE (cookieManual) A fuller description of the 'cookie'
 # command, displayed when the user asks for help on what it does.
@@ -737,17 +794,17 @@ cookieListDesc=Yar ka maleng layeny inta
 cookieListManual=Yar ka maleng nying jami me layeny intanet ma pire tek i pot buk matye.
 
 # LOCALIZATION NOTE (cookieListOutHost,cookieListOutPath,cookieListOutExpires,cookieListOutAttributes):
 # The 'cookie list' command has a number of headings for cookie properties.
 # Particular care should be taken in translating these strings as they have
 # references to names in the cookies spec.
 cookieListOutHost=Won gang:
 cookieListOutPath=Yo:
-cookieListOutExpires=Kare ne okato woko:
+cookieListOutExpires=Expires:
 cookieListOutAttributes=Attributes:
 
 # LOCALIZATION NOTE (cookieListOutNone) The output of the 'cookie list' command
 # uses this string when no cookie attributes (like httpOnly, secure, etc) apply
 cookieListOutNone=Peke
 
 # LOCALIZATION NOTE (cookieListOutSession) The output of the 'cookie list'
 # command uses this string to describe a cookie with an expiry value of '0'
@@ -764,17 +821,17 @@ cookieListOutNonePage=No cookies found f
 cookieListOutNoneHost=No cookies found for host %1$S
 
 # LOCALIZATION NOTE (cookieListOutEdit) A title used in the output from the
 # 'cookie list' command on a button which can be used to edit cookie values
 cookieListOutEdit=Yub
 
 # LOCALIZATION NOTE (cookieListOutRemove) A title used in the output from the
 # 'cookie list' command on a button which can be used to remove cookies
-cookieListOutRemove=Kwany woko
+cookieListOutRemove=Remove
 
 # LOCALIZATION NOTE (cookieRemoveDesc) A very short description of the
 # 'cookie remove' 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.
 cookieRemoveDesc=Kwany layeny intanet
 
 # LOCALIZATION NOTE (cookieRemoveManual) A fuller description of the 'cookie remove'
 # command, displayed when the user asks for help on what it does.
@@ -1056,16 +1113,91 @@ paintflashingChromeDesc=chrome frames
 # LOCALIZATION NOTE (paintflashingManual) A longer description describing the
 # set of commands that control paint flashing.
 paintflashingManual=Draw repainted areas in different colors
 
 # LOCALIZATION NOTE (paintflashingTooltip) A string displayed as the
 # tooltip of button in devtools toolbox which toggles paint flashing.
 paintflashingTooltip=Highlight painted area
 
+# LOCALIZATION NOTE (paintflashingOnDesc) A very short string used to describe the
+# function of the "paintflashing on" command.
+paintflashingToggleDesc=Toggle paint flashing
+
+# LOCALIZATION NOTE (appCacheDesc) A very short string used to describe the
+# function of the "appcache" command
+appCacheDesc=Application cache utilities
+
+# LOCALIZATION NOTE (appCacheValidateDesc) A very short string used to describe
+# the function of the "appcache validate" command.
+appCacheValidateDesc=Validate cache manifest
+
+# LOCALIZATION NOTE (appCacheValidateManual) A fuller description of the
+# 'validate' parameter to the 'appcache' command, displayed when the user asks
+# for help on what it does.
+appCacheValidateManual=Find issues relating to a cache manifest and the files that it references
+
+# LOCALIZATION NOTE (appCacheValidateUriDesc) A very short string used to describe
+# the function of the "uri" parameter of the appcache validate" command.
+appCacheValidateUriDesc=URI to check
+
+# LOCALIZATION NOTE (appCacheValidated) Displayed by the "appcache validate"
+# command when it has been successfully validated.
+appCacheValidatedSuccessfully=Appcache validated successfully.
+
+# LOCALIZATION NOTE (appCacheClearDesc) A very short string used to describe
+# the function of the "appcache clear" command.
+appCacheClearDesc=Clear entries from the application cache
+
+# LOCALIZATION NOTE (appCacheClearManual) A fuller description of the
+# 'appcache clear' command, displayed when the user asks for help on what it does.
+appCacheClearManual=Clear one or more entries from the application cache
+
+# LOCALIZATION NOTE (appCacheClearCleared) Displayed by the "appcache clear"
+# command when entries are successfully cleared.
+appCacheClearCleared=Entries cleared successfully.
+
+# LOCALIZATION NOTE (AppCacheListDesc) A very short string used to describe
+# the function of the "appcache list" command.
+appCacheListDesc=Display a list of application cache entries.
+
+# LOCALIZATION NOTE (AppCacheListManual) A fuller description of the
+# 'appcache list' command, displayed when the user asks for help on what it does.
+appCacheListManual=Display a list of all application cache entries. If the search parameter is used then the table displays the entries containing the search term.
+
+# LOCALIZATION NOTE (AppCacheListSearchDesc) A very short string used to describe
+# the function of the "search" parameter of the appcache list" command.
+appCacheListSearchDesc=Filter results using a search term.
+
+# LOCALIZATION NOTE (AppCacheList*) Row headers for the 'appcache list' command.
+appCacheListKey=Key:
+appCacheListDataSize=Data size:
+appCacheListDeviceID=Device ID:
+appCacheListExpirationTime=Expires:
+appCacheListFetchCount=Fetch count:
+appCacheListLastFetched=Last fetched:
+appCacheListLastModified=Last modified:
+
+# LOCALIZATION NOTE (appCacheListViewEntry) The text for the view entry button
+# of the 'appcache list' command.
+appCacheListViewEntry=View Entry
+
+# LOCALIZATION NOTE (appCacheViewEntryDesc) A very short string used to describe
+# the function of the "appcache viewentry" command.
+appCacheViewEntryDesc=Open a new tab containing the specified cache entry information.
+
+# LOCALIZATION NOTE (appCacheViewEntryManual) A fuller description of the
+# 'appcache viewentry' command, displayed when the user asks for help on what it
+# does.
+appCacheViewEntryManual=Open a new tab containing the specified cache entry information.
+
+# LOCALIZATION NOTE (appCacheViewEntryKey) A very short string used to describe
+# the function of the "key" parameter of the 'appcache viewentry' command.
+appCacheViewEntryKey=The key for the entry to display.
+
 # LOCALIZATION NOTE (profilerDesc) A very short string used to describe the
 # function of the profiler command.
 profilerDesc=Manage profiler
 
 # LOCALIZATION NOTE (profilerManual) A longer description describing the
 # set of commands that control the profiler.
 profilerManual=Commands to start or stop a JavaScript profiler
 
@@ -1108,21 +1240,45 @@ profilerAlreadyFinished=This profile has
 # an operation cannot be completed because the profile in question could not be
 # found.
 profilerNotFound=Profile not found
 
 # LOCALIZATION NOTE (profilerNotStarted) A message that is displayed whenever
 # an operation cannot be completed because the profile in question has not been
 # started yet. It also contains a hint to use the 'profile start' command to
 # start the profiler.
-profilerNotStarted=This profile has not been started yet. Use 'profile start' to start profliling
+profilerNotStarted2=This profile has not been started yet. Use 'profile start' to start profiling
 
 # LOCALIZATION NOTE (profilerStarting) A very short string that indicates that
 # we're starting the profiler.
-profilerStarting=Starting...
+profilerStarting2=Cako…
 
 # LOCALIZATION NOTE (profilerStopping) A very short string that indicates that
 # we're stopping the profiler.
-profilerStopping=Stopping...
+profilerStopping2=Stopping…
 
 # LOCALIZATION NOTE (profilerNotReady) A message that is displayed whenever
 # an operation cannot be completed because the profiler has not been opened yet.
 profilerNotReady=For this command to work you need to open the profiler first
+
+# LOCALIZATION NOTE (listenDesc) A very short string used to describe the
+# function of the 'listen' command.
+listenDesc=Open a remote debug port
+
+# LOCALIZATION NOTE (listenManual) A longer description of the 'listen'
+# command.
+listenManual=Firefox can allow remote debugging over a TCP/IP connection. For security reasons this is turned off by default, but can be enabled using this command.
+
+# LOCALIZATION NOTE (listenPortDesc) A very short string used to describe the
+# function of 'port' parameter to the 'listen' command.
+listenPortDesc=The TCP port to listen on
+
+# LOCALIZATION NOTE (listenDisabledOutput) Text of a message output during the
+# execution of the 'listen' command.
+listenDisabledOutput=Listen is disabled by the devtools.debugger.remote-enabled preference
+
+# LOCALIZATION NOTE (listenInitOutput) Text of a message output during the
+# execution of the 'listen' command. %1$S is a port number
+listenInitOutput=Listening on port %1$S
+
+# LOCALIZATION NOTE (listenNoInitOutput) Text of a message output during the
+# execution of the 'listen' command.
+listenNoInitOutput=DebuggerServer not initialized
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/netmonitor.dtd
@@ -0,0 +1,134 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<!-- LOCALIZATION NOTE : FILE This file contains the Network Monitor strings -->
+<!-- LOCALIZATION NOTE : FILE Do not translate commandkey -->
+<!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
+  - keep it in English, or another language commonly spoken among web developers.
+  - You want to make that choice consistent across the developer tools.
+  - A good criteria is the language in which you'd find the best
+  - documentation on web development on the web. -->
+<!-- LOCALIZATION NOTE (netmonitorUI.emptyNotice): This is the label displayed
+  -  in the network table when empty. -->
+
+
+
+<!ENTITY netmonitorUI.emptyNotice         "Reload the page to see detailed information about network activity.">
+<!-- LOCALIZATION NOTE (netmonitorUI.toolbar.status): This is the label displayed
+  -  in the network table toolbar, above the "status" column. -->
+
+<!ENTITY netmonitorUI.toolbar.status      "√">
+<!-- LOCALIZATION NOTE (netmonitorUI.toolbar.method): This is the label displayed
+  -  in the network table toolbar, above the "method" column. -->
+
+<!ENTITY netmonitorUI.toolbar.method      "Method">
+<!-- LOCALIZATION NOTE (netmonitorUI.toolbar.file): This is the label displayed
+  -  in the network table toolbar, above the "file" column. -->
+
+<!ENTITY netmonitorUI.toolbar.file        "File">
+<!-- LOCALIZATION NOTE (netmonitorUI.toolbar.domain): This is the label displayed
+  -  in the network table toolbar, above the "domain" column. -->
+
+<!ENTITY netmonitorUI.toolbar.domain      "Domain">
+<!-- LOCALIZATION NOTE (netmonitorUI.toolbar.type): This is the label displayed
+  -  in the network table toolbar, above the "type" column. -->
+
+<!ENTITY netmonitorUI.toolbar.type        "Type">
+<!-- LOCALIZATION NOTE (netmonitorUI.toolbar.size): This is the label displayed
+  -  in the network table toolbar, above the "size" column. -->
+
+<!ENTITY netmonitorUI.toolbar.size        "Dite">
+<!-- LOCALIZATION NOTE (netmonitorUI.toolbar.waterfall): This is the label displayed
+  -  in the network table toolbar, above the "waterfall" column. -->
+
+<!ENTITY netmonitorUI.toolbar.waterfall   "Timeline">
+<!-- LOCALIZATION NOTE (debuggerUI.tab.headers): This is the label displayed
+  -  in the network details pane identifying the headers tab. -->
+
+<!ENTITY netmonitorUI.tab.headers         "Headers">
+<!-- LOCALIZATION NOTE (debuggerUI.tab.cookies): This is the label displayed
+  -  in the network details pane identifying the cookies tab. -->
+
+<!ENTITY netmonitorUI.tab.cookies         "Kakube me intanet">
+<!-- LOCALIZATION NOTE (debuggerUI.tab.params): This is the label displayed
+  -  in the network details pane identifying the params tab. -->
+
+<!ENTITY netmonitorUI.tab.params          "Params">
+<!-- LOCALIZATION NOTE (debuggerUI.tab.response): This is the label displayed
+  -  in the network details pane identifying the response tab. -->
+
+<!ENTITY netmonitorUI.tab.response        "Response">
+<!-- LOCALIZATION NOTE (debuggerUI.tab.timings): This is the label displayed
+  -  in the network details pane identifying the timings tab. -->
+
+<!ENTITY netmonitorUI.tab.timings         "Timings">
+<!-- LOCALIZATION NOTE (debuggerUI.panesButton.tooltip): This is the tooltip for
+  -  the button that toggles the panes visible or hidden in the netmonitor UI. -->
+
+<!ENTITY netmonitorUI.panesButton.tooltip "Toggle network info">
+<!-- LOCALIZATION NOTE (debuggerUI.summary.url): This is the label displayed
+  -  in the network details headers tab identifying the URL. -->
+
+<!ENTITY netmonitorUI.summary.url         "Request URL:">
+<!-- LOCALIZATION NOTE (debuggerUI.summary.method): This is the label displayed
+  -  in the network details headers tab identifying the method. -->
+
+<!ENTITY netmonitorUI.summary.method      "Request method:">
+<!-- LOCALIZATION NOTE (debuggerUI.summary.status): This is the label displayed
+  -  in the network details headers tab identifying the status code. -->
+
+<!ENTITY netmonitorUI.summary.status      "Status code:">
+<!-- LOCALIZATION NOTE (debuggerUI.summary.version): This is the label displayed
+  -  in the network details headers tab identifying the http version. -->
+
+<!ENTITY netmonitorUI.summary.version     "Cik:">
+<!-- LOCALIZATION NOTE (debuggerUI.summary.size): This is the label displayed
+  -  in the network details headers tab identifying the headers size. -->
+
+<!ENTITY netmonitorUI.summary.size        "Headers size:">
+<!-- LOCALIZATION NOTE (debuggerUI.response.name): This is the label displayed
+  -  in the network details response tab identifying an image's file name. -->
+
+<!ENTITY netmonitorUI.response.name       "Nying:">
+<!-- LOCALIZATION NOTE (debuggerUI.response.dimensions): This is the label displayed
+  -  in the network details response tab identifying an image's dimensions. -->
+
+<!ENTITY netmonitorUI.response.dimensions "Kit dite:">
+<!-- LOCALIZATION NOTE (debuggerUI.response.mime): This is the label displayed
+  -  in the network details response tab identifying an image's mime. -->
+
+<!ENTITY netmonitorUI.response.mime       "MIME Type:">
+<!-- LOCALIZATION NOTE (debuggerUI.response.encoding): This is the label displayed
+  -  in the network details response tab identifying an image's encoding. -->
+
+<!ENTITY netmonitorUI.response.encoding   "Kit me pwonyo ne:">
+<!-- LOCALIZATION NOTE (debuggerUI.timings.blocked): This is the label displayed
+  -  in the network details timings tab identifying the amount of time spent
+  -  in a "blocked" state. -->
+
+<!ENTITY netmonitorUI.timings.blocked     "Blocked:">
+<!-- LOCALIZATION NOTE (debuggerUI.timings.dns): This is the label displayed
+  -  in the network details timings tab identifying the amount of time spent
+  -  in a "dns" state. -->
+
+<!ENTITY netmonitorUI.timings.dns         "DNS resolution:">
+<!-- LOCALIZATION NOTE (debuggerUI.timings.connect): This is the label displayed
+  -  in the network details timings tab identifying the amount of time spent
+  -  in a "connect" state. -->
+
+<!ENTITY netmonitorUI.timings.connect     "Connecting:">
+<!-- LOCALIZATION NOTE (debuggerUI.timings.send): This is the label displayed
+  -  in the network details timings tab identifying the amount of time spent
+  -  in a "send" state. -->
+
+<!ENTITY netmonitorUI.timings.send        "Sending:">
+<!-- LOCALIZATION NOTE (debuggerUI.timings.wait): This is the label displayed
+  -  in the network details timings tab identifying the amount of time spent
+  -  in a "wait" state. -->
+
+<!ENTITY netmonitorUI.timings.wait        "Waiting:">
+<!-- LOCALIZATION NOTE (debuggerUI.timings.receive): This is the label displayed
+  -  in the network details timings tab identifying the amount of time spent
+  -  in a "receive" state. -->
+
+<!ENTITY netmonitorUI.timings.receive     "Receiving:">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/netmonitor.properties
@@ -0,0 +1,118 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.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 Network Monitor
+# which is available from the Web Developer sub-menu -> 'Network Monitor'.
+# 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 (netmonitor.label):
+# This string is displayed in the title of the tab when the Network Monitor is
+# displayed inside the developer tools window and in the Developer Tools Menu.
+netmonitor.label=Kakube me wiyamo
+
+# LOCALIZATION NOTE (netmonitor.commandkey, netmonitor.accesskey)
+# Used for the menuitem in the tool menu
+netmonitor.commandkey=Q
+netmonitor.accesskey=N
+
+# LOCALIZATION NOTE (netmonitor.tooltip):
+# This string is displayed in the tooltip of the tab when the Network Monitor is
+# displayed inside the developer tools window.
+netmonitor.tooltip=Network Monitor
+
+# LOCALIZATION NOTE (collapseDetailsPane): This is the tooltip for the button
+# that collapses the network details pane in the UI.
+collapseDetailsPane=Hide request details
+
+# LOCALIZATION NOTE (expandDetailsPane): This is the tooltip for the button
+# that expands the network details pane in the UI.
+expandDetailsPane=Show request details
+
+# LOCALIZATION NOTE (headersEmptyText): This is the text displayed in the
+# headers tab of the network details pane when there are no headers available.
+headersEmptyText=No headers for this request
+
+# LOCALIZATION NOTE (headersFilterText): This is the text displayed in the
+# headers tab of the network details pane for the filtering input.
+headersFilterText=Filter headers
+
+# LOCALIZATION NOTE (cookiesEmptyText): This is the text displayed in the
+# cookies tab of the network details pane when there are no cookies available.
+cookiesEmptyText=No cookies for this request
+
+# LOCALIZATION NOTE (cookiesFilterText): This is the text displayed in the
+# cookies tab of the network details pane for the filtering input.
+cookiesFilterText=Filter cookies
+
+# LOCALIZATION NOTE (paramsEmptyText): This is the text displayed in the
+# params tab of the network details pane when there are no params available.
+paramsEmptyText=No parameters for this request
+
+# LOCALIZATION NOTE (paramsFilterText): This is the text displayed in the
+# params tab of the network details pane for the filtering input.
+paramsFilterText=Filter request parameters
+
+# LOCALIZATION NOTE (paramsQueryString): This is the label displayed
+# in the network details params tab identifying the query string.
+paramsQueryString=Query string
+
+# LOCALIZATION NOTE (paramsFormData): This is the label displayed
+# in the network details params tab identifying the form data.
+paramsFormData=Form data
+
+# LOCALIZATION NOTE (paramsPostPayload): This is the label displayed
+# in the network details params tab identifying the request payload.
+paramsPostPayload=Request payload
+
+# LOCALIZATION NOTE (requestHeaders): This is the label displayed
+# in the network details headers tab identifying the request headers.
+requestHeaders=Request headers
+
+# LOCALIZATION NOTE (responseHeaders): This is the label displayed
+# in the network details headers tab identifying the response headers.
+responseHeaders=Response headers
+
+# LOCALIZATION NOTE (requestCookies): This is the label displayed
+# in the network details params tab identifying the request cookies.
+requestCookies=Request cookies
+
+# LOCALIZATION NOTE (responseCookies): This is the label displayed
+# in the network details params tab identifying the response cookies.
+responseCookies=Response cookies
+
+# LOCALIZATION NOTE (jsonFilterText): This is the text displayed
+# in the response tab of the network details pane for the JSON filtering input.
+jsonFilterText=Filter properties
+
+# LOCALIZATION NOTE (jsonScopeName): This is the text displayed
+# in the response tab of the network details pane for a JSON scope.
+jsonScopeName=JSON
+
+# LOCALIZATION NOTE (jsonpScopeName): This is the text displayed
+# in the response tab of the network details pane for a JSONP scope.
+jsonpScopeName=JSONP → callback %S()
+
+# LOCALIZATION NOTE (networkMenu.sortedAsc): This is the tooltip displayed
+# in the network table toolbar, for any column that is sorted ascending.
+networkMenu.sortedAsc=Sorted ascending
+
+# LOCALIZATION NOTE (networkMenu.sortedDesc): This is the tooltip displayed
+# in the network table toolbar, for any column that is sorted descending.
+networkMenu.sortedDesc=Sorted descending
+
+# LOCALIZATION NOTE (networkMenu.sizeKB): This is the label displayed
+# in the network menu specifying the size of a request (in kilobytes).
+networkMenu.sizeKB=%SKB
+
+# LOCALIZATION NOTE (networkMenu.totalMS): This is the label displayed
+# in the network menu specifying the time for a request to finish (in milliseconds).
+networkMenu.totalMS=→ %S ms
+
+# LOCALIZATION NOTE (networkMenu.divisionMS): This is the label displayed
+# in the network menu specifying timing interval divisions (in milliseconds).
+networkMenu.divisionMS=%S ms
--- a/browser/chrome/browser/devtools/profiler.properties
+++ b/browser/chrome/browser/devtools/profiler.properties
@@ -10,19 +10,19 @@
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
 # LOCALIZATION NOTE (profiler.label):
 # This string is displayed in the title of the tab when the profiler is
 # displayed inside the developer tools window and in the Developer Tools Menu.
 profiler.label=Profiler
 
-# LOCALIZATION NOTE (profiler.commandkey, profiler.accesskey)
+# LOCALIZATION NOTE (profiler2.commandkey, profiler.accesskey)
 # Used for the menuitem in the tool menu
-profiler.commandkey=VK_F5
+profiler2.commandkey=VK_F5
 profiler.accesskey=P
 
 # LOCALIZATION NOTE (profiler.tooltip):
 # This string is displayed in the tooltip of the tab when the profiler is
 # displayed inside the developer tools window.
 profiler.tooltip=Profiler
 
 # LOCALIZATION NOTE (profiler.profileName):
--- a/browser/chrome/browser/devtools/scratchpad.properties
+++ b/browser/chrome/browser/devtools/scratchpad.properties
@@ -6,22 +6,16 @@
 # which is available from the Web Developer sub-menu -> 'Scratchpad'.
 #
 # The correct localization of this file might be to keep it in
 # English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
-# LOCALIZATION NOTE  (propertyPanel.updateButton.label): Used in the Property
-# Panel that is opened by the Scratchpad window when inspecting an object. This
-# is the Update button label.
-propertyPanel.updateButton.label=Mi ngec
-propertyPanel.updateButton.accesskey=U
-
 # LOCALIZATION NOTE  (export.fileOverwriteConfirmation): This is displayed when
 # 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.
--- a/browser/chrome/browser/devtools/styleeditor.dtd
+++ b/browser/chrome/browser/devtools/styleeditor.dtd
@@ -3,56 +3,39 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <!-- LOCALIZATION NOTE : FILE This file contains the Style Editor window strings -->
 <!-- LOCALIZATION NOTE : FILE Do not translate commandkeys -->
 <!-- LOCALIZATION NOTE : The correct localization of this file might be to keep
      it in English, or another language commonly spoken among web developers.
      You want to make that choice consistent across the developer tools.
      A good criteria is the language in which you'd find the best documentation
      on web development on the web. -->
-<!-- LOCALIZATION NOTE (window.title): This is the default title for Style Editor
-     main window. NB: the property chromeWindowTitle in styleeditor.properties
-     is used to dynamically update the Style Editor window title with the title
-     of the web page it is editing. -->
 
 
-<!ENTITY window.title               "Layub Kit">
-
 <!ENTITY newButton.label            "Nyen">
 <!ENTITY newButton.tooltip          "Cwe ki i med kit pot buk manyen i kom coc acoya">
 <!ENTITY newButton.accesskey        "N">
-<!ENTITY newButton.commandkey       "n">
 
 <!ENTITY importButton.label         "Kel ki woko…">
 <!ENTITY importButton.tooltip       "Kel ki woko ci i med kit pot buk i kom coc acoya">
 <!ENTITY importButton.accesskey     "e">
-<!ENTITY importButton.commandkey    "i">
 
 <!ENTITY visibilityToggle.tooltip   "Mak kit pot buk manonge">
-<!ENTITY visibilityToggle.accesskey "V">
 
 <!ENTITY saveButton.label           "Gwok">
 <!ENTITY saveButton.tooltip         "Gwok kit pot buk ma i pwail">
 <!ENTITY saveButton.accesskey       "G">
-<!ENTITY saveButton.commandkey      "s">
-<!-- LOCALICATION NOTE  (scoped.label): This is shown in a stylesheets list item
-     when the stylesheet uses the scoped attribute on the <style> element. -->
-
-<!ENTITY scoped.label               "Kityeko woko.">
 
 <!ENTITY editorTextbox.placeholder  "Co CSS kany.">
 <!-- LOCALICATION NOTE  (noStyleSheet.label): This is shown when a page has no
      stylesheet. -->
 
 <!ENTITY noStyleSheet.label         "Pot buk man pe ki kit pot buk.">
 <!-- LOCALICATION NOTE  (noStyleSheet-tip-start.label): This is the start of a
      tip sentence shown when there is no stylesheet. It suggests to create a new
      stylesheet and provides an action link to do so. -->
 
 <!ENTITY noStyleSheet-tip-start.label  "Onyo i romo maro ">
 <!-- LOCALICATION NOTE  (noStyleSheet-tip-action.label): This is text for the
      link that triggers creation of a new stylesheet. -->
 <!ENTITY noStyleSheet-tip-action.label "Med kit pot buk manyen">
 <!-- LOCALICATION NOTE  (noStyleSheet-tip-end.label): End of the tip sentence -->
 <!ENTITY noStyleSheet-tip-end.label    "?">
-<!-- LOCALIZATION NOTE  (closeCmd.key): Accel + this key closes the window. -->
-
-<!ENTITY closeCmd.key                  "W">
--- a/browser/chrome/browser/devtools/styleeditor.properties
+++ b/browser/chrome/browser/devtools/styleeditor.properties
@@ -20,65 +20,55 @@ chromeWindowTitle=Layub Kit [%S]
 # the argument is the index (order) of the containing <style> element in the
 # document.
 inlineStyleSheet=<inline style sheet #%S>
 
 # LOCALIZATION NOTE  (newStyleSheet): This is the default name for a new
 # user-created style sheet.
 newStyleSheet=Kir pot buk manyen #%S
 
-# LOCALIZATION NOTE  (ruleCount.label): Semi-colon list of plural forms.
+# LOCALIZATION NOTE  (ruleCount.label): Semicolon-separated list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # This is shown in the style sheets list.
 # #1 rule.
 # example: 111 rules.
 ruleCount.label=#1 cik.;#1 cik.
 
-# LOCALIZATION NOTE  (error-load.label): This is shown when loading fails.
+# LOCALIZATION NOTE  (error-load): This is shown when loading fails.
 error-load=Pe onongo romo pango kit pot buk.
 
-# LOCALIZATION NOTE  (error-save.label): This is shown when saving fails.
+# LOCALIZATION NOTE  (error-save): This is shown when saving fails.
 error-save=Pe onongo romo gwoko kit pot buk.
 
 # LOCALIZATION NOTE  (importStyleSheet.title): This is the file picker title,
 # when you import a style sheet into the Style Editor.
 importStyleSheet.title=Kel kit pot buk
 
-# LOCALIZATION NOTE  (importStyleSheet.title): This is the *.css filter title
+# LOCALIZATION NOTE  (importStyleSheet.filter): This is the *.css filter title
 importStyleSheet.filter=Pwail me CSS
 
 # LOCALIZATION NOTE  (saveStyleSheet.title): This is the file picker title,
 # when you save a style sheet from the Style Editor.
 saveStyleSheet.title=Gwok kit pot buk
 
-# LOCALIZATION NOTE  (saveStyleSheet.title): This is the *.css filter title
+# LOCALIZATION NOTE  (saveStyleSheet.filter): This is the *.css filter title
 saveStyleSheet.filter=Pwail me CSS
 
 # LOCALIZATION NOTE  (open.commandkey): This the key to use in
 # conjunction with shift to open the style editor
 open.commandkey=VK_F7
 
 # LOCALIZATION NOTE (open.accesskey): The access key used to open the style
 # editor.
 open.accesskey=y
 
 # LOCALIZATION NOTE  (saveStyleSheet.commandkey): This the key to use in
 # conjunction with accel (Command on Mac or Ctrl on other platforms) to Save
 saveStyleSheet.commandkey=S
 
-# LOCALIZATION NOTE  (undo.commandkey): This the key to use in
-# conjunction with accel (Command on Mac or Ctrl on other platforms) to Undo a
-# change in the editor.
-undo.commandkey=Z
-
-# LOCALIZATION NOTE  (redo.commandkey): This the key to use in
-# conjunction with accel+shift (accel is Command on Mac or Ctrl on other
-# platforms) to Redo a change in the editor.
-redo.commandkey=Z
-
 # LOCALIZATION NOTE (ToolboxStyleEditor.label):
 # This string is displayed in the title of the tab when the debugger is
 # displayed inside the developer tools window and in the Developer Tools Menu.
 ToolboxStyleEditor.label=Layub Kit
 
 # LOCALIZATION NOTE (ToolboxStyleEditor.tooltip):
 # This string is displayed in the tooltip of the tab when the debugger is
 # displayed inside the developer tools window.
--- a/browser/chrome/browser/devtools/toolbox.dtd
+++ b/browser/chrome/browser/devtools/toolbox.dtd
@@ -1,7 +1,46 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<!-- LOCALIZATION NOTE : FILE This file contains the Toolbox strings -->
+<!-- LOCALIZATION NOTE : FILE Do not translate key -->
+
 
 <!ENTITY closeCmd.key  "W">
 
-<!ENTITY toolboxCloseButton.tooltip  "Close Developer Tools">
+<!ENTITY toolboxCloseButton.tooltip    "Close Developer Tools">
+<!ENTITY toolboxOptionsButton.key      "O">
+<!-- LOCALIZATION NOTE (options.context.label): This is the label for the
+  -  heading of the group of two about:config preferences to toggle chrome
+  -  and remote debugging in the options panel. -->
+
+<!ENTITY options.context.label         "Advanced settings (requires a browser restart)">
+<!-- LOCALIZATION NOTE (options.enableChrome.label): This is the label for the
+  -  checkbox that toggles chrome debugging, i.e. devtools.chrome.enabled
+  -  boolean preference in about:config, in the options panel. -->
+
+<!ENTITY options.enableChrome.label    "Enable chrome debugging">
+<!ENTITY options.enableChrome.tooltip  "Turning this option on will allow you to use various developer tools in browser context">
+<!-- LOCALIZATION NOTE (options.enableRemote.label): This is the label for the
+  -  checkbox that toggles remote debugging, i.e. devtools.debugger.remote-enabled
+  -  boolean preference in about:config, in the options panel. -->
+
+<!ENTITY options.enableRemote.label    "Enable remote debugging">
+<!ENTITY options.enableRemote.tooltip  "Turning this option on will allow the developer tools to debug remote Firefox instance like Firefox OS">
+<!-- LOCALIZATION NOTE (options.selectDefaultTools.label): This is the label for
+  -  the heading of group of checkboxes corresponding to the default developer
+  -  tools. -->
+
+<!ENTITY options.selectDefaultTools.label     "Default Firefox Developer Tools">
+<!-- LOCALIZATION NOTE (options.selectDefaultTools.label): This is the label for
+  -  the heading of group of checkboxes corresponding to the developer tools
+  -  added by add-ons. This heading is hidden when there is no developer tool
+  -  installed by add-ons. -->
+
+<!ENTITY options.selectAdditionalTools.label  "Developer Tools installed by add-ons">
+<!-- LOCALIZATION NOTE (options.selectDevToolsTheme.label): This is the label for
+  -  the heading of the radiobox corresponding to the theme of the developer
+  -  tools. -->
+
+<!ENTITY options.selectDevToolsTheme.label   "Choose DevTools theme:">
+<!ENTITY options.darkTheme.label             "Dark theme">
+<!ENTITY options.lightTheme.label            "Light theme">
--- a/browser/chrome/browser/devtools/toolbox.properties
+++ b/browser/chrome/browser/devtools/toolbox.properties
@@ -29,8 +29,12 @@ toolboxToggleButton.tooltip=%1$S, %2$S\n
 # used to format the title of the toolbox.
 # The name of the selected tool: %1$S.
 # The url of the page being tooled: %2$S.
 toolbox.titleTemplate=%1$S - %2$S
 
 # LOCALIZATION NOTE (toolbox.defaultTitle): This is used as the tool
 # name when no tool is selected.
 toolbox.defaultTitle=Developer Tools
+
+# LOCALIZATION NOTE (optionsButton.tooltip): This is used as the tooltip
+# for the optiosn panel tab.
+optionsButton.tooltip=Toolbox Options
--- a/browser/chrome/browser/devtools/webConsole.dtd
+++ b/browser/chrome/browser/devtools/webConsole.dtd
@@ -4,16 +4,17 @@
 <!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
   - keep it in English, or another language commonly spoken among web developers.
   - You want to make that choice consistent across the developer tools.
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
 
 
 <!ENTITY window.title "Web Console">
+<!ENTITY browserConsole.title "Browser Console">
 
 <!ENTITY networkPanel.requestURLColon             "Request URL:">
 <!ENTITY networkPanel.requestMethodColon          "Request Method:">
 <!ENTITY networkPanel.statusCodeColon             "Status Code:">
 
 <!ENTITY networkPanel.requestHeaders              "Kwa Luwiye">
 <!ENTITY networkPanel.requestCookie               "Kakube ma kicwalo">
 <!ENTITY networkPanel.requestBody                 "Kwa Kome">
@@ -43,37 +44,41 @@
   -  filters. -->
 
 <!ENTITY btnPageNet.label   "Malubo kore">
 <!ENTITY btnPageNet.tooltip "Dony i kakube me wiyamo">
 <!ENTITY btnPageCSS.label   "CSS">
 <!ENTITY btnPageCSS.tooltip "Ket CSS bal mapyem">
 <!ENTITY btnPageJS.label    "JS">
 <!ENTITY btnPageJS.tooltip  "Ket Javascript weko woko">
+<!ENTITY btnPageSecurity.label "Security">
+<!ENTITY btnPageSecurity.tooltip "Log security errors and warnings">
 <!-- LOCALIZATION NOTE (btnPageLogging): This is used as the text of the
   -  the toolbar. It shows or hides messages that the web developer inserted on
   -  the page for debugging purposes, using calls such console.log() and
   -  console.error(). -->
 
 <!ENTITY btnPageLogging.label   "Keto">
 <!ENTITY btnPageLogging.tooltip "Log messages sent to the window.console object">
 <!ENTITY btnConsoleErrors       "Bal">
 <!ENTITY btnConsoleInfo         "Ngec">
 <!ENTITY btnConsoleWarnings     "Cik">
 <!ENTITY btnConsoleLog          "Ket">
 
-<!ENTITY filterBox.placeholder "Filter">
+<!ENTITY filterOutput.placeholder "Filter output">
 <!ENTITY btnClear.label        "Clear">
 <!ENTITY btnClear.tooltip      "Ruc oko Kacoc me Web ma kato woko">
 
 <!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">
+
+<!ENTITY closeCmd.key  "W">
--- a/browser/chrome/browser/devtools/webconsole.properties
+++ b/browser/chrome/browser/devtools/webconsole.properties
@@ -4,23 +4,23 @@
 
 # LOCALIZATION NOTE
 # The correct localization of this file might be to keep it in
 # English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
-typeError=Bal: 
-typeWarning=Cik: 
-typeNetwork=Kakube me intanet: 
-typeException=Weko woko:  
-typeCssParser=CSS Parser: 
-typeStrict=Cik ma Olobakino: 
-msgCategory=Kwone: 
+typeError=Error:
+typeWarning=Warning:
+typeNetwork=Network:
+typeException=Exception:
+typeCssParser=CSS Parser:
+typeStrict=Strict Warning:
+msgCategory=Category:
 errLine=Rek: %S
 btnHide=Kan
 btnPrefs=En ma imito
 categoryPage=Pot buk:
 categoryConsole=Coc:
 btnMutation=Juko DOM ocung manok
 tipMutation=Tel DOM gin matime donyo cung manok
 btnGlobal=Kwena me wilobo
@@ -29,38 +29,17 @@ localConsole=Coc me kagwoko
 clearConsoleCmd.label=Jwa Coc
 clearConsoleCmd.accesskey=e
 close.button=Lor
 close.accesskey=C
 update.button=Ngec
 update.accesskey=U
 cmd.commandkey=k
 webConsoleCmd.accesskey=W
-# LOCALIZATION NOTE FOR `jsPropertyTitle` AND `jsPropertyInspectTitle`:
-#
-# The "PropertyPanel" is used to display a JS object to the user.
-# If it is clear which object is being inspected (e.g., window, document object)
-# the title of the panel is based on the `jsPropertyInspectTitle` string.
-# If it isn't clear which object is being inspected, the `jsPropertyTitle` string
-# gets used. This can be the case when the user logs an object to the WebConsole
-# output using the console.log(aObjectToInspect) method.
-#
-# You can find a screenshot of the PropertyPanel here:
-#   https://bug585030.bugzilla.mozilla.org/attachment.cgi?id=464034
-jsPropertyTitle=Gin makwedo Cal
-# LOCALIZATION NOTE (jsPropertyInspectTitle):
-#
-# The %S is replaced by the evaluated code the user clicked on in the console.
-#
-# Example: The user executed `window.document` in the WebConsole. The `document`
-# object is written to the output. If the user clicks on the `document` output
-# in the console, a PropertyPanel will show up. The title of the PropertyPanel
-# is set to `Inspect: window.document` because the clicked `document` object was
-# evaluated based on the `window.document` string.
-jsPropertyInspectTitle=Kwed: %S
+
 # LOCALIZATION NOTE (timestampFormat): %1$02S = hours (24-hour clock),
 # %2$02S = minutes, %3$02S = seconds, %4$03S = milliseconds.
 timestampFormat=%02S:%02S:%02S.%03S
 
 helperFuncUnsupportedTypeError=Pe romo lwongo gono coc iwi kit cal man.
 NetworkPanel.label=Kwed Kwac me kakube me wiyamo
 # LOCALIZATION NOTE (NetworkPanel.deltaDurationMS):
 #
@@ -159,32 +138,39 @@ remoteWebConsoleSelectTabTitle=Tab list 
 # LOCALIZATION NOTE (remoteWebConsoleSelectTabMessage): The message displayed on the
 # Web Console prompt asking the user to pick a tab to attach to.
 remoteWebConsoleSelectTabMessage=Select one of the tabs you want to attach to, or select the global console.
 
 # LOCALIZATION NOTE (listTabs.globalConsoleActor): The string displayed for the
 # global console in the tabs selection.
 listTabs.globalConsoleActor=*Global Console*
 
-# LOCALIZATION NOTE (ToolboxWebconsole.label):
-# This string is displayed in the title of the tab when the web console is
-# displayed inside the developer tools window it is probably the same string
-# as webConsoleWindowTitleAndURL before the '-'
-ToolboxWebconsole.label=Web Console
+# LOCALIZATION NOTE (MenuWebconsole.label):
+# This string is displayed in the Tools menu as a shortcut to open the devtools
+# with the web console tab selected.
+MenuWebconsole.label=Web Console
+
+# LOCALIZATION NOTE (ToolboxTabWebconsole.label):
+# This string is displayed as the label of the tab in the devtools window.
+ToolboxTabWebconsole.label=Console
 
 # LOCALIZATION NOTE (ToolboxWebconsole.tooltip):
 # This string is displayed in the tooltip of the tab when the web console is
 # displayed inside the developer tools window.
 ToolboxWebconsole.tooltip=Web Console
 
 # LOCALIZATION NOTE (longStringEllipsis): The string displayed after a long
 # string. This string is clickable such that the rest of the string is retrieved
 # from the server.
 longStringEllipsis=[…]
 
+# LOCALIZATION NOTE (longStringTooLong): The string displayed after the user
+# tries to expand a long string.
+longStringTooLong=The string you are trying to view is too long to be displayed by the Web Console.
+
 # LOCALIZATION NOTE (executeEmptyInput): This is displayed when the user tries
 # to execute code, but the input is empty.
 executeEmptyInput=No value to execute.
 
 # LOCALIZATION NOTE (NetworkPanel.fetchRemainingResponseContentLink): This is
 # displayed in the network panel when the response body is only partially
 # available.
 NetworkPanel.fetchRemainingResponseContentLink=Fetch the remaining %1$S bytes
@@ -192,8 +178,17 @@ NetworkPanel.fetchRemainingResponseConte
 # LOCALIZATION NOTE (NetworkPanel.fetchRemainingRequestContentLink): This is
 # displayed in the network panel when the request body is only partially
 # available.
 NetworkPanel.fetchRemainingRequestContentLink=Fetch the request body (%1$S bytes)
 
 # LOCALIZATION NOTE (connectionTimeout): Message displayed when the Remote Web
 # Console fails to connect to the server due to a timeout.
 connectionTimeout=Connection timeout. Check the Error Console on both ends for potential error messages. Reopen the Web Console to try again.
+
+# LOCALIZATION NOTE (propertiesFilterPlaceholder): This is the text that
+# appears in the filter text box for the properties view container.
+propertiesFilterPlaceholder=Filter properties
+
+# LOCALIZATION NOTE (emptyPropertiesList): The text that is displayed in the
+# properties pane when there are no properties to display.
+emptyPropertiesList=No properties to display
+
--- a/browser/chrome/browser/migration/migration.properties
+++ b/browser/chrome/browser/migration/migration.properties
@@ -43,9 +43,9 @@ 16_firefox=Mung ma kigwoko
 
 32_ie=Me amara
 32_safari=Alama buk
 32_chrome=Alama buk
 
 64_ie=Tic Mapat
 64_safari=Tic Mapat
 64_chrome=Tic Mapat
-64_firefox=Keto Alama me buk pi Gwoko tic
+64_firefox_other=Other Data
--- a/browser/chrome/browser/pageInfo.dtd
+++ b/browser/chrome/browser/pageInfo.dtd
@@ -61,17 +61,17 @@
 <!ENTITY  permImage             "Pang Cal">
 <!ENTITY  permPopup             "Yab pye-iwi Dirija">
 <!ENTITY  permCookie            "Ter Kakube">
 <!ENTITY  permNotifications     "Show Notifications">
 <!ENTITY  permInstall           "Ket Nyayo onyo deyo">
 <!ENTITY  permGeo               "Nywak Kabedo">
 <!ENTITY  permPlugins           "Ket rwako iyie">
 <!ENTITY  permFullscreen        "Ket Wang kompiuta lung">
-<!ENTITY  permPointerLock       "Hide the Pointer">
+<!ENTITY  permPointerLock2      "Hide the Mouse Pointer">
 
 <!ENTITY  permIndexedDB              "Gwok Citoa mape I wiyamo">
 <!ENTITY  permClearStorage           "Ywe Citoa">
 <!ENTITY  permClearStorage.accesskey "C">
 
 <!ENTITY  securityTab           "Gwoko kuc">
 <!ENTITY  securityTab.accesskey "S">
 <!ENTITY  securityHeader        "Ngec me Gwoko kuc pi pot buk man">
--- a/browser/chrome/browser/places/places.properties
+++ b/browser/chrome/browser/places/places.properties
@@ -52,17 +52,17 @@ tabs.openWarningTitle=Mok yabo
 tabs.openWarningMultipleBranded=I cok ki yabo %S lanyik.  Man twero dwoki piny %S kun pot buk tye ka pango.  I moko ada ni i mito mede anyim?
 tabs.openButtonMultiple=Yab lanyut dirija mukene
 tabs.openWarningPromptMeBranded=Nyang an i kare me yabo lanyut dirija mapol romo dwoko piny %S
 
 SelectImport=kel pwail me Alama me buk
 EnterExport=Cwal woko pwail me Alama me buk
 
 detailsPane.noItems=Jami pe
-# LOCALIZATION NOTE (detailsPane.itemsCountLabel): Semi-colon list of plural forms.
+# LOCALIZATION NOTE (detailsPane.itemsCountLabel): Semicolon-separated list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 number of items
 # example: 111 items
 detailsPane.itemsCountLabel=Gin acel; gin #1
 
 mostVisitedTitle=Ma kilimo Maloyo
 recentlyBookmarkedTitle=Ma kiketo Alama me buk kombedi
 recentTagsTitle=Lanyut macok
--- a/browser/chrome/browser/preferences/aboutPermissions.properties
+++ b/browser/chrome/browser/preferences/aboutPermissions.properties
@@ -1,9 +1,13 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# LOCALIZATION NOTE (visitCount): #1 is the number of history visits for a site
+# LOCALIZATION NOTE (visitCount): Semicolon-separated list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of history visits for a site
 visitCount=#1 lim;#1 limo
 
+# LOCALIZATION NOTE (passwordsCount, cookiesCount): Semicolon-separated list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 passwordsCount=#1 mung kigwoko pi di bar me Web man.;#1 mung kigwoko gi pi di bar me Web man.
 cookiesCount=#1 kitero woko kakube me di bar me Web man.;#1 kitero woko kakube me di bar me Web man.
deleted file mode 100644
--- a/browser/chrome/browser/preferences/advanced-scripts.dtd
+++ /dev/null
@@ -1,15 +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 advancedJSDialog.title         "Kite me tero JavaScript madit">
-<!ENTITY window.width                   "37em">
-
-<!ENTITY allowScripts.label             "Yee ki coc me:">
-
-<!ENTITY moveResizePopupWindows.label     "Nyik onyo lok dit pa dirija ma pye atura">
-<!ENTITY moveResizePopupWindows.accesskey "N">
-<!ENTITY raiseLowerWindows.label        "Nyik malu onyo dwok ping dirija">
-<!ENTITY raiseLowerWindows.accesskey    "i">
-<!ENTITY disableContextMenus.label      "Mi ka nongo pe tii onyo lok">
-<!ENTITY disableContextMenus.accesskey  "M">
--- a/browser/chrome/browser/preferences/advanced.dtd
+++ b/browser/chrome/browser/preferences/advanced.dtd
@@ -111,24 +111,17 @@
 <!ENTITY offlineNotifyExceptions.accesskey "u">
 
 <!ENTITY offlineAppsList2.label          "Kakube man gutye ki jami me tic labongo kube iwi yamo:">
 <!ENTITY offlineAppsList.height          "7em">
 <!ENTITY offlineAppsListRemove.label     "Kwany woko…">
 <!ENTITY offlineAppsListRemove.accesskey "K">
 <!ENTITY offlineAppRemove.confirm        "Kwany woko jami ma pe iwi yamo">
 
-<!ENTITY encryptionTab.label             "Kano">
-
-<!ENTITY protocols.label                 "Cik">
-<!ENTITY useSSL3.label                   "Tii ki SSL 3.0">
-<!ENTITY useSSL3.accesskey               "3">
-<!ENTITY useTLS1.label                   "Tii ki TLS 1.0">
-<!ENTITY useTLS1.accesskey               "1">
-<!ENTITY certificates.label              "Certificates">
+<!ENTITY certificateTab.label            "Certificates">
 <!ENTITY certSelection.description       "Ka lapok tic kwayo pi Certificate para:">
 <!ENTITY certs.auto                      "Yer acel pire kekene">
 <!ENTITY certs.auto.accesskey            "I">
 <!ENTITY certs.ask                       "Penya caa weng">
 <!ENTITY certs.ask.accesskey             "i">
 <!ENTITY viewCerts.label                 "Nen karatac me ngec">
 <!ENTITY viewCerts.accesskey             "t">
 <!ENTITY viewCRLs.label                  "Revocation me yiko">
--- a/browser/chrome/browser/preferences/content.dtd
+++ b/browser/chrome/browser/preferences/content.dtd
@@ -2,30 +2,16 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY  blockPopups.label           "Jami me windows me Bloc pop-up">
 <!ENTITY  blockPopups.accesskey       "B">
 <!ENTITY  popupExceptions.label       "Mukene…">
 <!ENTITY  popupExceptions.accesskey   "e">
 
-<!ENTITY  loadImages.label            "Ket cale kene">
-<!ENTITY  loadImages.accesskey        "l">
-<!ENTITY  exceptions.label            "Mukene…">
-<!ENTITY  exceptions.accesskey        "u">
-
-<!ENTITY  enableJavaScript.label      "Mi JavaScript tii">
-<!ENTITY  enableJavaScript.accesskey  "J">
-<!ENTITY  advancedJS.label            "Madito…">
-<!ENTITY  advancedJS.accesskey        "d">
-
-<!ENTITY  enableJava.label            "Mii Java tii">
-<!ENTITY  enableJava.accesskey        "i">
-
-
 <!ENTITY  fontsAndColors.label        "Kite me &amp; Kala mapol">
 
 <!ENTITY  defaultFont.label           "Kite ma iyi acaki:">
 <!ENTITY  defaultFont.accesskey       "K">
 <!ENTITY  defaultSize.label           "Caji:">
 <!ENTITY  defaultSize.accesskey       "C">
 
 <!ENTITY  advancedFonts.label         "Madito…">
--- a/browser/chrome/browser/preferences/preferences.properties
+++ b/browser/chrome/browser/preferences/preferences.properties
@@ -16,18 +16,16 @@ labelDefaultFont=Kit ma obino kwede (%S)
 #### Permissions Manager
 
 cookiepermissionstext=I twero nyutu pot buk me web mene ma pol kare onyo ma pe oweko me tic ki kakube.  Co kanonge kikome pi ka ma imito lono eka ite dino Bulok, Ye pi Kare mo, onyo Ye.
 cookiepermissionstitle=En opokere - Lapo wi intanet
 addonspermissionstext=In itwero poko pot buk me web mene ma kiweko i keto lamed ikome. Goo kanonge kikome me kakube ame imito i wek ki idii Wek.
 addons_permissions_title=Kakube Makiweko - Lamed ikome Maki keto
 popuppermissionstext=In itwero poko pot buk me web mene makiweko pi yabo dirica mapye. Goo kanonge kikome me kakube ame imito i wek ki idii Wek.
 popuppermissionstitle=Kakube maki weko - Pye
-imagepermissionstext=In itwero poko pot buk ame web mene makiweko i cano cale. Goo kanonge kikome me kakube ame imito i loo ki idii Bulok onyo Wek.
-imagepermissionstitle=En opokere - Cale
 invalidURI=Tim ber iket nyingi matio
 invalidURITitle=I keto Nyingi Mape tio
 
 #### Master Password
 
 pw_change2empty_in_fips_mode=In itye kombedi i kit FIPS. FIPS mito Icwil me donyo Madit ma yie nono.
 pw_change_failed_title=Loko Icwil me donyo Pe olare
 
--- a/browser/chrome/browser/preferences/tabs.dtd
+++ b/browser/chrome/browser/preferences/tabs.dtd
@@ -6,19 +6,16 @@
 <!ENTITY newWindowsAsTabs.accesskey   "t">
 
 <!ENTITY warnCloseMultipleTabs.label  "Kwenyoro an ka itye ka loro tab mapol">
 <!ENTITY warnCloseMultipleTabs.accesskey  "a">
 
 <!ENTITY warnOpenManyTabs.label       "Kwenyoro an ka yabo tab mapol twero dwoko cen dwiro pa &brandShortName;">
 <!ENTITY warnOpenManyTabs.accesskey   "a">
 
-<!ENTITY showTabBar.label             "Nyut bar me tab kare ki kare">
-<!ENTITY showTabBar.accesskey         "e">
-
 <!ENTITY restoreTabsOnDemand.label        "Pe iket tab wa ka iyero">
 <!ENTITY restoreTabsOnDemand.accesskey    "i">
 
 <!ENTITY switchToNewTabs.label        "Ka ayabo lakub iyi tab manyen, dok wa iye oyoto">
 <!ENTITY switchToNewTabs.accesskey    "d">
 
 <!ENTITY showTabsInTaskbar.label          "Nyut tab mukato angec i Dirija me bar metic">
 <!ENTITY showTabsInTaskbar.accesskey      "t">
--- a/browser/chrome/browser/quitDialog.properties
+++ b/browser/chrome/browser/quitDialog.properties
@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 quitDialogTitle=Weki %S
 
 quitTitle=&Weki
 cancelTitle=&Ngol
 saveTitle=&Kan ci iweki
-neverAsk=Pe i peny i anyim
+neverAsk2=&Do not ask next time
 message=I mito %S gwoko Diricani matidi ki diricamapol ka oyabe ma anyim?
 messageNoWindows=I mito %S gwoko Dirica ni matino i ka kare ma oyabe?
--- a/browser/chrome/browser/syncSetup.properties
+++ b/browser/chrome/browser/syncSetup.properties
@@ -8,36 +8,37 @@ button.syncOptionsCancel.label = Juki
 
 invalidEmail.label          = email address ma obale
 serverInvalid.label         = Tim ber iket lapok tic me URL matiyo
 usernameNotAvailable.label  = Tye dong katic
 
 verifying.label = Moko…
 
 # LOCALIZATION NOTE (additionalClientCount.label):
-# Semi-colon list of plural forms. See:
+# Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the number of additional clients (was %S for a short while, use #1 instead, even if both work)
 additionalClientCount.label = ki #1 nyonyo mukene #1 nyonyo mukene
 # LOCALIZATION NOTE (bookmarksCount.label):
-# Semi-colon list of plural forms. See:
+# Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the number of bookmarks (was %S for a short while, use #1 instead, even if both work)
 bookmarksCount.label        = #1 alama pot buk;#1 alama pot buk
 # LOCALIZATION NOTE (historyDaysCount.label):
-# Semi-colon list of plural forms. See:
+# Semicolon-separated list of plural forms. See:
 # 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:
+# Semicolon-separated 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):
+# LOCALIZATION NOTE (addonsCount.label): Semicolon-separated list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #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.
deleted file mode 100644
--- a/browser/feedback/main.dtd
+++ /dev/null
@@ -1,37 +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 testpilot.brand.label                      "Tem Ladwo dege">
-<!ENTITY testpilot.settings.label                   "Ter">
-<!ENTITY testpilot.settings.dataSubmission.label    "Cwalo Tic">
-<!ENTITY testpilot.settings.notifications.label     "Mino ngec">
-<!ENTITY testpilot.settings.notifyWhen.label        "Wek ange ka…">
-<!ENTITY testpilot.settings.readyToSubmit.label     "Kwan tye atera me cwalo">
-<!ENTITY testpilot.settings.newStudy.label          "Tye kwan mo manyen">
-<!ENTITY testpilot.settings.hasNewResults.label     "Kwan ace acel tye ki adwogi manyen">
-<!ENTITY testpilot.settings.alwaysSubmitData.label  "Cwal tic mamega me oyoto (pe ipenya)">
-<!ENTITY testpilot.allYourStudies.label             "Kwan mamegi Weng ma itiyo kwede…">
-<!ENTITY testpilot.about.label                      "Makwako Tem Ladwo dege">
-<!-- all studies window -->
-
-<!ENTITY testpilot.studiesWindow.title                  "Lakwan me Dwoyo Dege mamegi">
-<!ENTITY testpilot.studiesWindow.currentStudies.label   "Kwan Matye">
-<!ENTITY testpilot.studiesWindow.finishedStudies.label  "Otyeko Kwan">
-<!ENTITY testpilot.studiesWindow.studyFindings.label    "Adwogi me Kwan">
-<!ENTITY testpilot.studiesWindow.settings.label         "Tero">
-<!ENTITY testpilot.studiesWindow.stillLoadingMessage    "Tye kacano, tim ber ikur…">
-<!-- raw data dialog -->
-
-<!ENTITY testpilot.rawDataWindow.title                  "Tem Ladwo dege: Tic ma numu">
-<!-- notification -->
-
-<!ENTITY testpilot.notification.close.tooltip            "Lor">
-<!-- Firefox 4 beta version UI -->
-
-<!ENTITY testpilot.enable.label                        "Kel Kwan ma Kitiyo kwede">
-<!ENTITY testpilot.feedbackbutton.label                "Adwogi">
-<!ENTITY testpilot.happy.label        "Firefox Yomo Yia Pien…">
-<!ENTITY testpilot.sad.label          "Firefox Cwero Yia Pien…">
-<!ENTITY testpilot.broken.label      "Cwal ngec pi dye bar me kakube man calo otur…">
-<!ENTITY testpilot.idea.label        "Mini wa tam…">
deleted file mode 100644
--- a/browser/feedback/main.properties
+++ /dev/null
@@ -1,102 +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/.
-
-# description for add-on manager
-extensions.testpilot@labs.mozilla.com.description = Kony wek Firefox obed maber kun iketo kwan pa dano matiyo kwede.
-
-# common
-testpilot.fullBrandName = Pailot me Temo Lab pa Mozilla
-testpilot.moreInfo = Ngec Mapol
-testpilot.submit = Cwal
-testpilot.takeSurvey = kwany kwed
-
-# Feedback button menu
-testpilot.turnOn = Kel Kwan ma Kitiyo kwede
-testpilot.turnOff = Nek Kwan pa Latic kwede
-
-# studies window
-testpilot.studiesWindow.noStudies = Wan watye katic kombedi ikwan manyen; obidwongo dogolani macokcoki! Cik Yiti!
-testpilot.studiesWindow.uploading = Tye kaketo…
-testpilot.studiesWindow.unableToReachServer = Pe romo oo i Mozilla; tim ber item dok lacen.
-testpilot.studiesWindow.thanksForContributing = Apwoyo mina tami!
-testpilot.studiesWindow.finishedOn = Otum I kom %S
-testpilot.studiesWindow.canceledStudy = (Ijuko woko kwan man)
-testpilot.studiesWindow.missedStudy = (I keng kwan man woko)
-testpilot.studiesWindow.willStart = Bicake %S
-testpilot.studiesWindow.gatheringData = Tye kaguro tic.
-testpilot.studiesWindow.willFinish = Bitum i kom %S
-testpilot.studiesWindow.proposeStudy = Tyen lok me kwanni
-
-# for pages
-testpilot.page.commentsAndDiscussions = Miyo tam & Leyo lok »
-testpilot.page.proposeATest = Wac gin Atema »
-testpilot.page.testpilotOnTwitter = @MozTestPilot ikom Twitter »
-
-# status page
-testpilot.statusPage.uploadingData = Kombedi pe tye keto katic...
-testpilot.statusPage.uploadErrorMsg = Oops! Bal onongo tye ikube bot lapok tic me Mozilla. gwok nyo lakub me intanet mamegi tye lapiny?
-testpilot.statusPage.willRetry = Ladwo dege ma kitye katemoni Bitemo odoco, dong piman tye kakare me loro pot buk man kombedi.
-testpilot.statusPage.endedAlready = (Otyeko gik woko dong pe ibed kaneno pot buk man)
-testpilot.statusPage.todayAt =  tin, i %S
-testpilot.statusPage.endOn = ikom%S
-# LOCALIZATION NOTE (numExtensions): Semi-colon list of plural forms.
-# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-# #1 = number of extensions
-# example: "2 extensions"
-testpilot.statusPage.numExtensions = #1 nyayo;#1 nyayo
-testpilot.statusPage.recursEveryNumberOfDays = Tem man mede nino %Ski ducu. cawa weng ma kityeko:
-testpilot.statusPage.askMeBeforeSubmitData = Penya ka ce amito cwalo tic mamega.
-testpilot.statusPage.alwaysSubmitData = Pol kare cwal tic mamega, pe i penya ki apeny pire.
-testpilot.statusPage.neverSubmitData = Pe i cwal tic mamega, dok pe ipenya pire.
-testpilot.statusPage.loading = Tye kapango, tim ber i kur manok…
-
-# quit page
-testpilot.quitPage.aboutToQuit = Icok weko woko "%S" kwan.
-testpilot.quitPage.optionalMessage = (Tye imitini) Ka ce itye ki dakika, tim ber iwek wange pingo iyero me weko kwan woko.
-testpilot.quitPage.reason = Tyen lok:
-testpilot.quitPage.recurringStudy = Man obedo kwan ma mede anyim. pol kare wabiniangi cawa ma anyim manongo watye kakwan.  Ka ce pe imito winyo dok pi kwan man, rok bok mate piny kanyi:
-testpilot.quitPage.quitForever = Wek woko kwan man mamede.
-testpilot.quitPage.quitStudy = Wek Kwan woko »
-
-# welcome page
-testpilot.welcomePage.thankYou = Wapwoyo matek me donyo ikin lutem dwoyo dege!
-testpilot.welcomePage.gettingStarted = Tye kacake
-testpilot.welcomePage.pleaseTake = Tim ber ikwany
-testpilot.welcomePage.backgroundSurvey = Kwed pa ladwo dege
-testpilot.welcomePage.clickToOpenStudiesWindow = Dii kany me neno kwan matye kawot anyim.
-testpilot.welcomePage.testpilotAddon = Tem lamed pa Ladwo dege
-testpilot.welcomePage.iconExplanation = « Nen cal man ki tung acuc me layeny dirica.
-testpilot.welcomePage.moreIconExplanation = Itwero dino kome wek inong acaki me Tem Pailot.
-testpilot.welcomePage.notificationInfo = Cal man bi pye iwiye malo pi mino ngec ka kwan mito bedo atera ni.
-testpilot.welcomePage.privacyPolicy = Cik mamako dano
-testpilot.welcomePage.legalNotices = Ngec Bot lwak
-
-# survey page
-testpilot.surveyPage.saveAnswers = Gwok lagam me lok
-testpilot.surveyPage.submitAnswers = Cwal Lagam
-testpilot.surveyPage.changeAnswers = Lok Lagam
-testpilot.surveyPage.loading = Tye kaketo, tim ber i kur kong manok…
-testpilot.surveyPage.thankYouForFinishingSurvey = Wpwoyo tyeko kwed man. Lagam mamegi bi kati kacel kwede dul lanyut tic mabinoni.
-testpilot.surveyPage.reviewOrChangeYourAnswers = Ka onongo imito neno ne odoco onyo loko lagam mamegi, iromo timo ne i cawa mo keken kun itiyo ki ladi ma itereni.
-
-# modules/task.js
-testpilot.finishedTask.finishedStudy = Ber mada! Ityeko woko "%S" kwan!
-testpilot.finishedTask.allRelatedDataDeleted = Tic weng marwate ki kwan man kikwanyo woko ki i kompiuta mamegi.
-
-# modules/setup.js
-testpilot.notification.update = Ngec…
-testpilot.notification.thankYouForUploadingData = Apwoyo!
-testpilot.notification.thankYouForUploadingData.message = Apwoyo matek me keto tic mamegi.
-testpilot.notification.readyToSubmit = Tye atera me Cwalo
-testpilot.notification.readyToSubmit.message = Tem Pailot "%S" kwan otyeko cobo guro dok tye atera me cwalo.
-testpilot.notification.newTestPilotStudy = Kwan me Temo ladwo dege Manyen
-testpilot.notification.newTestPilotStudy.pre.message = Latem Ladwo dege "%S" kwan dong cok cake.
-testpilot.notification.newTestPilotSurvey = Latem Ladwo dege Manyen
-testpilot.notification.newTestPilotSurvey.message = Tem Ladwo dege "%S" wot tye.
-testpilot.notification.newTestPilotResults = Adwogi me Tem pa ladwo dege Manyen
-testpilot.notification.newTestPilotResults.message = Adwogi manyen kombedi nonge pi Temo ladwo dege "%S" kwan.
-testpilot.notification.autoUploadedData = Apwoyo!
-testpilot.notification.autoUploadedData.message = Tem Pailot "%S" kwan dong otyeko ki tic mamegi kicwalo woko!
-testpilot.notification.extensionUpdate = Nyayo ngec
-testpilot.notification.extensionUpdate.message = Kwan acel mamegi mito cik manyen pa Tem Pailot. Iromo nongo cik ma okati kun itiyo ki Med-ikome Dirija.
--- a/browser/installer/nsisstrings.properties
+++ b/browser/installer/nsisstrings.properties
@@ -15,32 +15,31 @@
 # 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.
+INTRO_BLURB1=Thanks for choosing $BrandFullName, the browser that chooses you above everything else.
 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
--- a/browser/pdfviewer/viewer.properties
+++ b/browser/pdfviewer/viewer.properties
@@ -48,19 +48,16 @@ toggle_sidebar.title=Toggle Sidebar
 toggle_sidebar_label=Toggle Sidebar
 outline.title=Nyut ryeno rek pa Coc acoya
 outline_label=Ryeno rek me Coc acoya
 thumbs.title=Nyut Capa cing
 thumbs_label=Capa cing
 findbar.title=Find in Document
 findbar_label=Nong
 
-# Document outline messages
-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}}
 
@@ -118,8 +115,9 @@ missing_file_error=Missing PDF file.
 # the PDF spec (32000-1:2008 Table 169 – Annotation types).
 # Some common types are e.g.: "Check", "Text", "Comment", "Note"
 text_annotation_type=[{{type}} Lok angea manok]
 request_password=I ung otyeko gwoko PDF:
 
 printing_not_supported=Warning: Printing is not fully supported by this browser.
 printing_not_ready=Warning: The PDF is not fully loaded for printing.
 web_fonts_disabled=Web fonts are disabled: unable to use embedded PDF fonts.
+web_colors_disabled=Web colors are disabled.
--- a/browser/profile/chrome/userContent-example.css
+++ b/browser/profile/chrome/userContent-example.css
@@ -9,23 +9,16 @@
 
 /*
  * This file can be used to apply a style to all web pages you view
  * Rules without !important are overruled by author rules if the
  * author sets any.  Rules with !important overrule author rules.
  */
 
 /*
- * example: turn off "blink" element blinking
- *
- * blink { text-decoration: none ! important; }
- *
- */
-
-/*
  * example: give all tables a 2px border
  *
  * table { border: 2px solid; }
  */
 
 /*
  * example: turn off "marquee" element
  *
--- a/dom/chrome/dom/dom.properties
+++ b/dom/chrome/dom/dom.properties
@@ -78,17 +78,16 @@ 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.
 FullScreenDeniedContentOnly=Request for full-screen was denied because requesting element is in the chrome document and the fullscreen API is configured for content only.
 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.
 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.
 # LOCALIZATION NOTE: Do not translate AudioBufferSourceNode
 MediaBufferSourceNodeResampleOutOfMemory=Insufficient memory to resample the AudioBufferSourceNode for playback.
 # LOCALIZATION NOTE: Do not translate decodeAudioData.
 MediaDecodeAudioDataUnknownContentType=The buffer passed to decodeAudioData contains an unknown content type.
@@ -123,14 +122,16 @@ MozSliceWarning=Tic me mozSlice ikom cal
 # LOCALIZATION NOTE: Do not translate "Components"
 ComponentsWarning=The Components object is deprecated. It will soon be removed.
 PluginHangUITitle=Warning: Unresponsive plugin
 PluginHangUIMessage=%S may be busy, or it may have stopped responding. You can stop the plugin now, or you can continue to see if the plugin will complete.
 PluginHangUIWaitButton=Continue
 PluginHangUIStopButton=Stop plugin
 # LOCALIZATION NOTE: Do not translate "mozHidden", "mozVisibilityState", "hidden", or "visibilityState"
 PrefixedVisibilityApiWarning='mozHidden' and 'mozVisibilityState' are deprecated.  Please use the unprefixed 'hidden' and 'visibilityState' instead.
-# LOCALIZATION NOTE: Do not translate "X-Content-Security-Policy", "X-Content-Security-Policy-Report-Only",  "Content-Security-Policy" or "Content-Security-Policy-Report-Only"
-OldCSPHeaderDeprecated=The X-Content-Security-Policy and X-Content-Security-Report-Only headers will be deprecated in the future. Please use the Content-Security-Policy and Content-Security-Report-Only headers with CSP spec compliant syntax instead.
-# LOCALIZATION NOTE: Do not translate "X-Content-Security-Policy/Report-Only" or "Content-Security-Policy/Report-Only"
-BothCSPHeadersPresent=This site specified both an X-Content-Security-Policy/Report-Only header and a Content-Security-Policy/Report-Only header. The X-Content-Security-Policy/Report-Only header(s) will be ignored.
 # LOCALIZATION NOTE: Do not translate "NodeIterator" or "detach()".
 NodeIteratorDetachWarning=Calling detach() on a NodeIterator no longer has an effect.
+# LOCALIZATION NOTE: Do not translate "Mozilla Audio Data API" and "Web Audio API".
+MozAudioDataWarning=The Mozilla Audio Data API is deprecated.  Please use the Web Audio API instead.
+# LOCALIZATION NOTE: Do not translate "LenientThis" and "this"
+LenientThisWarning=Ignoring get or set of property that has [LenientThis] because the "this" object is incorrect.
+# LOCALIZATION NOTE: Do not translate "nsIDOMWindowUtils", "getWindowWithOuterId", or "nsIWindowMediator"
+GetWindowWithOuterIdWarning=Use of nsIDOMWindowUtils.getOuterWindowWithId() is deprecated.  Instead, use the nsIWindowMediator method of the same name.
--- a/dom/chrome/plugins.properties
+++ b/dom/chrome/plugins.properties
@@ -2,18 +2,18 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # LOCALIZATION NOTE (plugins.properties):
 #    Those strings are inserted into an HTML page, so you all HTML characters
 #    have to be escaped in a way that they show up correctly in HTML!
 
 title_label=Makwako rwako i kumpiuta
-enabledplugins_label=Rwak ma giyee
-nopluginsareenabled_label=Rwak me giyee pe ononge
+installedplugins_label=Installed plugins
+nopluginsareinstalled_label=No installed plugins found
 findpluginupdates_label=Nong ngec manyen pi rwak ma kiketo ki i
 file_label=Pwail:
 path_label=Yo:
 version_label=Cik:
 state_label=State:
 mimetype_label=Kit MIME
 description_label=Tito lok iye
 suffixes_label=Suffixes
new file mode 100644
--- /dev/null
+++ b/dom/chrome/security/security.properties
@@ -0,0 +1,11 @@
+# Mixed Content Blocker
+# LOCALIZATION NOTE: "%1$S" is the URI of the blocked mixed content resource
+BlockMixedDisplayContent = Blocked loading mixed display content "%1$S"
+BlockMixedActiveContent = Blocked loading mixed active content "%1$S"
+
+# CSP
+ReportOnlyCSPIgnored=Report-only CSP policy will be ignored because there are other non-report-only CSP policies applied.
+# LOCALIZATION NOTE: Do not translate "X-Content-Security-Policy", "X-Content-Security-Policy-Report-Only",  "Content-Security-Policy" or "Content-Security-Policy-Report-Only"
+OldCSPHeaderDeprecated=The X-Content-Security-Policy and X-Content-Security-Report-Only headers will be deprecated in the future. Please use the Content-Security-Policy and Content-Security-Report-Only headers with CSP spec compliant syntax instead.
+# LOCALIZATION NOTE: Do not translate "X-Content-Security-Policy/Report-Only" or "Content-Security-Policy/Report-Only"
+BothCSPHeadersPresent=This site specified both an X-Content-Security-Policy/Report-Only header and a Content-Security-Policy/Report-Only header. The X-Content-Security-Policy/Report-Only header(s) will be ignored.
--- a/toolkit/chrome/global/aboutRights.dtd
+++ b/toolkit/chrome/global/aboutRights.dtd
@@ -48,17 +48,17 @@
 <!-- Note that this paragraph references a couple of entities from
      preferences/security.dtd, so that we can refer to text the user sees in
      the UI, without this page being forgotten every time those strings are
      updated.  -->
 <!-- intro paragraph for branded builds -->
 
 <!ENTITY rights2.webservices-a "&brandFullName; uses web-based information services (&quot;Services&quot;) to provide some of the features provided for your use with this binary version of &brandShortName; under the terms described below. If you do not want to use one or more of the Services or the terms below are unacceptable, you may disable the feature or Service(s). Instructions on how to disable a particular feature or Service may be found ">
 <!ENTITY rights2.webservices-b "kany">
-<!ENTITY rights2.webservices-c ".">
+<!ENTITY rights3.webservices-c ". Other features and Services can be disabled in the application preferences.">
 <!-- safe browsing points for branded builds -->
 
 <!ENTITY rights.safebrowsing-a "Yengo Maber: ">
 <!ENTITY rights.safebrowsing-b "Juko woko kit me yengo pe kimoko calo twero kelo woti i kakube mape tye maber.  Ka ce imito juko kit jami odoco, lub yoo magi:">
 <!ENTITY rights.safebrowsing-term1 "Yab tic ma imito">
 <!ENTITY rights.safebrowsing-term2 "Yer lagwok kuc">
 <!ENTITY rights.safebrowsing-term3 "Uncheck the options to &quot;&blockAttackSites.label;&quot; and &quot;&blockWebForgeries.label;&quot;">
 <!ENTITY rights.safebrowsing-term4 "Pe kijuko Yengo Maber">
deleted file mode 100644
--- a/toolkit/chrome/global/aboutRights.properties
+++ /dev/null
@@ -1,7 +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/.
-
-buttonLabel = Nge twero ni…
-buttonAccessKey = K
-notifyRightsText = %S tye me nono ki purugram mape giculo pire ki Guti me Mozilla labongo magoba.
--- a/toolkit/chrome/mozapps/downloads/unknownContentType.dtd
+++ b/toolkit/chrome/mozapps/downloads/unknownContentType.dtd
@@ -11,16 +11,16 @@
 <!ENTITY  other.label                 "Mukene…">
 
 <!ENTITY  saveFile.label              "Gwok Pwail">
 <!ENTITY  saveFile.accesskey          "G">
 
 <!ENTITY  rememberChoice.label        "Tim mman pire kene pi fail ma cal kit man kombedi ceto kwede anyim.">
 <!ENTITY  rememberChoice.accesskey    "p">
 
-<!ENTITY  whichIsA.label              "Ma en aye obedo:">
+<!ENTITY  whichIs.label              "which is:">
 
 <!ENTITY  chooseHandlerMac.label      "Yer…">
 <!ENTITY  chooseHandlerMac.accesskey  "Y">
 <!ENTITY  chooseHandler.label         "Yeny…">
 <!ENTITY  chooseHandler.accesskey     "Y">
 
 <!ENTITY  unknownPromptText.label     "I mito gwoko pwail man?">
--- a/toolkit/chrome/mozapps/extensions/extensions.dtd
+++ b/toolkit/chrome/mozapps/extensions/extensions.dtd
@@ -85,16 +85,23 @@
 <!ENTITY cmd.enableAddon.label                "Mi tii">
 <!ENTITY cmd.enableAddon.accesskey            "M">
 <!ENTITY cmd.disableAddon.label               "Kwany woko">
 <!ENTITY cmd.disableAddon.accesskey           "K">
 <!ENTITY cmd.enableTheme.label                "Gin me aloka iye ma laol jo">
 <!ENTITY cmd.enableTheme.accesskey            "G">
 <!ENTITY cmd.disableTheme.label               "Juk Gin me aloka iye ma laol jo">
 <!ENTITY cmd.disableTheme.accesskey           "G">
+<!ENTITY cmd.askToActivate.label              "Ask to Activate">
+<!ENTITY cmd.askToActivate.tooltip            "Ask to use this add-on each time">
+<!ENTITY cmd.alwaysActivate.label             "Always Activate">
+<!ENTITY cmd.alwaysActivate.tooltip           "Always use this add-on">
+<!ENTITY cmd.neverActivate.label              "Never Activate">
+<!ENTITY cmd.neverActivate.tooltip            "Never use this add-on">
+<!ENTITY cmd.stateMenu.tooltip                "Change when this add-on runs">
 <!ENTITY cmd.installAddon.label               "Keti">
 <!ENTITY cmd.installAddon.accesskey           "K">
 <!ENTITY cmd.uninstallAddon.label             "Kwany woko">
 <!ENTITY cmd.uninstallAddon.accesskey         "K">
 <!ENTITY cmd.showPreferencesWin.label         "Gin ayera">
 <!ENTITY cmd.showPreferencesWin.tooltip       "Lok gin ayera ikom lamed eni ni">
 <!ENTITY cmd.showPreferencesUnix.label        "Gin ma imito">
 <!ENTITY cmd.showPreferencesUnix.tooltip      "Lok gin ma imito ikom lamed eni ni">
--- a/toolkit/chrome/mozapps/extensions/extensions.properties
+++ b/toolkit/chrome/mozapps/extensions/extensions.properties
@@ -8,17 +8,19 @@ aboutWindowCloseButton=Lor
 #LOCALIZATION NOTE (aboutWindowVersionString) %S is the addon version
 aboutWindowVersionString=kite %S
 #LOCALIZATION NOTE (aboutAddon) %S is the addon name
 aboutAddon=Makwako %S
 
 #LOCALIZATION NOTE (uninstallNotice) %S is the add-on name
 uninstallNotice=%S kityeko kwanyo.
 
-#LOCALIZATION NOTE (numReviews) #1 is the number of reviews
+#LOCALIZATION NOTE (numReviews): Semicolon-separated list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of reviews
 numReviews=#1 nen doki;#1 makineno
 
 #LOCALIZATION NOTE (dateUpdated) %S is the date the addon was last updated
 dateUpdated=Ki mino Ngec %S
 
 #LOCALIZATION NOTE (notification.incompatible) %1$S is the add-on name, %2$S is brand name, %3$S is application version
 notification.incompatible=%1$S pe rwate kwede %2$S %3$S.
 #LOCALIZATION NOTE (notification.blocked) %1$S is the add-on name
@@ -101,17 +103,19 @@ installFromFile.filterName=Lamed ikome
 
 uninstallAddonTooltip=Pe i ket lamed ikom ma eni ni
 uninstallAddonRestartRequiredTooltip=Pe i ket lamed ikom ma eni ni (cak nitit mite)
 enableAddonTooltip=Mi lamed ikome cake
 enableAddonRestartRequiredTooltip=Mi lamed ikome cake (cak nitit mite)
 disableAddonTooltip=Kwany lamed eni ni
 disableAddonRestartRequiredTooltip=Kwany lamed ikome (cak nitit mite)
 
-#LOCALIZATION NOTE (showAllSearchResults) #1 is the total number of search results
+#LOCALIZATION NOTE (showAllSearchResults): Semicolon-separated list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the total number of search results
 showAllSearchResults=Nen adwogi acel;Nen weng #1 adwogi
 
 #LOCALIZATION NOTE (addon.purchase.label) displayed on a button in the list
 # view, %S is the price of the add-on including currency symbol
 addon.purchase.label=Wil pi %S…
 addon.purchase.tooltip=Lim lamed ikom kanyuto jami ki iwil lamed ikome ma eni ni
 #LOCALIZATION NOTE (cmd.purchaseAddon.label) displayed on a button in the detail
 # view, %S is the price of the add-on including currency symbol
rename from browser/webapp-uninstaller/webapp-uninstaller.properties
rename to webapprt/webapp-uninstaller/webapp-uninstaller.properties
rename from browser/webapprt/webapp.dtd
rename to webapprt/webapprt/webapp.dtd
rename from browser/webapprt/webapp.properties
rename to webapprt/webapprt/webapp.properties