Acholi: update from Aurora 17
authorSan Emmanuel James [Pootle] <sjolweny85@yahoo.co.uk>
Mon, 08 Oct 2012 20:50:40 +0200
changeset 37 4a223f85b8c83be77ca6005f73ce0384bfdfc4ab
parent 30 59950fdabc57a0939296ef29c96d434183c697ed
child 45 23de37884fb3810745cdea793e024b16baae3b64
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:39:32 +0000
Acholi: update from Aurora 17 140 words not translated for user1
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/devtools/debugger.dtd
browser/chrome/browser/devtools/debugger.properties
browser/chrome/browser/devtools/gclicommands.properties
browser/chrome/browser/devtools/scratchpad.properties
browser/chrome/browser/devtools/styleinspector.properties
browser/chrome/browser/devtools/webConsole.dtd
browser/chrome/browser/devtools/webconsole.properties
browser/chrome/browser/downloads/downloads.dtd
browser/chrome/browser/downloads/downloads.properties
browser/chrome/browser/pageInfo.dtd
browser/chrome/overrides/settingsChange.dtd
dom/chrome/dom/dom.properties
dom/chrome/layout/css.properties
dom/chrome/layout/htmlparser.properties
mobile/android/base/android_strings.dtd
mobile/android/base/sync_strings.dtd
mobile/android/chrome/aboutAddons.dtd
mobile/android/chrome/aboutApps.dtd
mobile/android/chrome/aboutFeedback.dtd
mobile/android/chrome/aboutReader.properties
mobile/android/chrome/browser.properties
security/manager/chrome/pippki/deviceManager.dtd
toolkit/chrome/global-platform/mac/platformKeys.properties
toolkit/chrome/global-platform/unix/platformKeys.properties
toolkit/chrome/global-platform/win/platformKeys.properties
toolkit/chrome/global/notification.dtd
toolkit/chrome/mozapps/plugins/plugins.dtd
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -236,38 +236,29 @@ These should match what Safari and other
 
 <!ENTITY inspectCloseButton.tooltiptext "Langic Matut">
 
 <!ENTITY devToolbarCloseButton.tooltiptext "Lor Gin tic pa Luyub">
 <!ENTITY devToolbarMenu.label              "Luyub Bar me gin tic">
 <!ENTITY devToolbarMenu.accesskey          "y">
 <!ENTITY devToolbar.keycode                "VK_F2">
 <!ENTITY devToolbar.keytext                "F2">
+<!ENTITY devToolbarOtherToolsButton.label  "More Tools">
 
 <!ENTITY webConsoleButton.label "Web Console">
 <!ENTITY inspectorButton.label "Lakwed te">
 
 <!ENTITY inspectorHTMLCopyInner.label       "Lok HTML ma iyie">
 <!ENTITY inspectorHTMLCopyInner.accesskey   "H">
 
 <!ENTITY inspectorHTMLCopyOuter.label       "Lok HTML ma woko">
 <!ENTITY inspectorHTMLCopyOuter.accesskey   "H">
 
 <!ENTITY inspectorHTMLDelete.label          "Jwa woko coc">
 <!ENTITY inspectorHTMLDelete.accesskey      "J">
-<!-- LOCALIZATION NOTE (inspectOptionButton.*): The menu in the Inspector
-  -  toolbar.  -->
-
-<!ENTITY inspectOptionButton.tooltiptext    "Me ayera pi Lakwed te">
-<!-- LOCALIZATION NOTE: These are for the menu in the Inspector Toolbar -->
-
-<!ENTITY inspectorToggleVeil.label          "Mii Pot buk obed macol">
-<!ENTITY inspectorToggleVeil.accesskey      "M">
-<!ENTITY inspectorToggleInfobar.label       "Nyut ngec macek">
-<!ENTITY inspectorToggleInfobar.accesskey   "N">
 <!-- LOCALIZATION NOTE (inspect3DViewButton.label): This button shows an
   -  alternate view for the Inspector, creating a 3D visualization of the
   -  webpage. -->
 
 <!ENTITY inspect3DViewButton.label     "Nen 3D">
 <!ENTITY inspect3DViewButton.accesskey "n">
 
 <!ENTITY inspectStyleButton.label     "Kit">
@@ -286,19 +277,19 @@ These should match what Safari and other
 <!ENTITY fileMenu.label         "Pwail"> 
 <!ENTITY fileMenu.accesskey       "P">
 <!ENTITY newNavigatorCmd.label        "Dirica Manyen">
 <!ENTITY newNavigatorCmd.key        "N">
 <!ENTITY newNavigatorCmd.accesskey      "D">
 
 <!ENTITY editMenu.label         "Yub"> 
 <!ENTITY editMenu.accesskey       "Y"> 
-<!ENTITY undoCmd.label            "Dok cen">  
+<!ENTITY undoCmd.label            "Undo">  
 <!ENTITY undoCmd.key            "Z">  
-<!ENTITY undoCmd.accesskey          "D"> 
+<!ENTITY undoCmd.accesskey          "U"> 
 <!ENTITY redoCmd.label            "Nwo timo">  
 <!ENTITY redoCmd.key            "Y">  
 <!ENTITY redoCmd.accesskey          "N"> 
 <!ENTITY cutCmd.label           "Ngol">  
 <!ENTITY cutCmd.key             "X">  
 <!ENTITY cutCmd.accesskey         "l"> 
 <!ENTITY copyCmd.label            "Kobi">  
 <!ENTITY copyCmd.key            "C">  
@@ -652,12 +643,19 @@ doesn't display any label, but exposes a
 <!ENTITY markupButton.arialabel          "Ket coc">
 <!-- LOCALIZATION NOTE (markupButton.accesskey): The key bound to the Markup panel's
 toolbar button -->
 <!ENTITY markupButton.accesskey          "M">
 
 <!ENTITY socialToolbar.title        "Mapeca me Gin tic me Kube pa lwak">
 <!ENTITY social.notLoggedIn.label   "Not logged in">
 
-<!ENTITY social.sharePopup.undo.label     "Pe onywako">
-<!ENTITY social.sharePopup.undo.accesskey "P">
-<!ENTITY social.sharePopup.ok.label       "Kakare">
-<!ENTITY social.sharePopup.ok.accesskey   "K">
+<!ENTITY social.ok.label       "Kakare">
+<!ENTITY social.ok.accesskey   "K">
+
+<!ENTITY social.toggleSidebar.label "Show sidebar">
+<!ENTITY social.toggleSidebar.accesskey "s">
+
+<!ENTITY social.toggleNotifications.label "Show desktop notifications">
+<!ENTITY social.toggleNotifications.accesskey "n">
+
+<!ENTITY social.activated.undobutton.label "Undo">
+<!ENTITY social.activated.undobutton.accesskey "U">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -115,22 +115,32 @@ crashedpluginsMessage.reloadButton.label
 crashedpluginsMessage.reloadButton.accesskey=R
 crashedpluginsMessage.submitButton.label=Cwal ngec me to woko
 crashedpluginsMessage.submitButton.accesskey=S
 crashedpluginsMessage.learnMore=Nong ngec madwong…
 carbonFailurePluginsMessage.message=Pot buk man penyo pi tic ki rwako iye gin maromo ngwec ka i kit bit-32
 carbonFailurePluginsMessage.restartButton.label=Nwo cako ii kit bit-32
 carbonFailurePluginsMessage.restartButton.accesskey=R
 activatePluginsMessage.message=Onyo imito keto rwako iyie ikom pot buk man?
-activatePluginsMessage.label=Ket rwako iyie
+activatePluginsMessage.label=Activate All Plugins
 activatePluginsMessage.accesskey=A
 activatePluginsMessage.always=Pol kare ket rwak iyie pi dyer bar man
 activatePluginsMessage.always.accesskey=c
 activatePluginsMessage.never=Pe i ket rwak iyie pi dyer bar man
 activatePluginsMessage.never.accesskey=N
+activateSinglePlugin=Activate
+PluginClickToPlay=Click here to activate the %S plugin.
+# LOCALIZATION NOTE - "vulnerable" indicates there is a security bug in the
+# plugin that is being exploited by attackers.
+PluginVulnerableUpdatable=This plugin is vulnerable and should be updated.
+PluginVulnerableNoUpdate=This plugin has security vulnerabilities.
+vulnerableUpdatablePluginWarning=Outdated Version!
+vulnerableNoUpdatePluginWarning=Vulnerable Plugin!
+vulnerablePluginsMessage=Some plugins have been deactivated for your safety.
+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 (sanitizeEverythingWarning2): Warning that appears when
@@ -353,22 +363,55 @@ telemetryNoButtonLabel = Pe
 telemetryNoButtonAccessKey = N
 
 # Webapps notification popup
 webapps.install = Keti
 webapps.install.accesskey = I
 #LOCALIZATION NOTE (webapps.requestInstall) %1$S is the web app name, %2$S is the site from which the web app is installed
 webapps.requestInstall = Onyo imito keto "%1$S" ni aa ki dyer bar man (%2$S)?
 webapps.install.success = Gityeko keto dong Purugram
+# LOCALIZATION NOTE (webapps.uninstall.notification): %S will be replaced with the name of the uninstalled web app
+webapps.uninstall.notification = %S has been uninstalled from your computer.
+webapps.uninstall.label = Uninstall App
 
 # Telemetry opt-out prompt for Aurora and Nightly
 # LOCALIZATION NOTE (telemetryOptOutPrompt): %1$S and %3$S will be replaced by
 # brandFullName, and %2$S by the value of the toolkit.telemetry.server_owner preference.
 telemetryOptOutPrompt = %1$S cwal ngec ikom kit matiyo kwede, nyonyo, tice ki ketone mamegi cen bot %2$S pi konyo yiko %3$S.
 
 # LOCALIZATION NOTE (fullscreen.entered): displayed when we enter HTML5 fullscreen mode, %S is the domain name of the focused website (e.g. mozilla.com).
 fullscreen.entered=%S kombedi dong tye ki wang kompiuta lung.
 # 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
 
-social.shareButton.tooltip=Nywak man
-social.shareButton.sharedtooltip=I nywako man
-social.pageShared.label=Otyeko nywako pot buk
+# LOCALIZATION NOTE (social.toggle.label): %1$S is the name of the social provider, %2$S is brandShortName (e.g. Firefox)
+social.toggle.label=%1$S for %2$S
+social.toggle.accesskey=f
+
+# LOCALIZATION NOTE (social.activated.description): %1$S is the name of the social provider, %2$S is brandShortName (e.g. Firefox)
+social.activated.description=You've turned on %1$S for %2$S.
+
+# LOCALIZATION NOTE (social.error.message): %1$S is brandShortName (e.g. Firefox), %2$S is the name of the social provider
+social.error.message=%1$S is unable to connect with %2$S right now.
+social.error.tryAgain.label=Try Again
+social.error.tryAgain.accesskey=T
+social.error.ok.label=OK
+social.error.ok.accesskey=O
+social.error.closeSidebar.label=Close This Sidebar
+social.error.closeSidebar.accesskey=C
+
+# Identity notifications popups
+identity.termsOfService = Terms of Service
+identity.privacyPolicy = Privacy Policy
+identity.chooseIdentity.description = Sign in to %S
+identity.chooseIdentity.label = Use an existing email
+identity.newIdentity.label = Use a different email
+identity.newIdentity.accessKey = e
+identity.newIdentity.email.placeholder = Email
+# LOCALIZATION NOTE (identity.newIdentity.description, identity.chooseIdentity.description): %S is the website origin (ie. https://www.mozilla.org) shown in popup notifications.
+identity.newIdentity.description = Enter your email address to sign in to %S
+identity.next.label = En mukene
+identity.next.accessKey = n
+# LOCALIZATION NOTE: shown in the popup notification when a user successfully logs into a website
+# LOCALIZATION NOTE (identity.loggedIn.description): %S is the website origin (ie. https://www.mozilla.org)
+identity.loggedIn.description = Signed in as: %S
+identity.loggedIn.signOut.label = Sign Out
+identity.loggedIn.signOut.accessKey = O
--- a/browser/chrome/browser/devtools/debugger.dtd
+++ b/browser/chrome/browser/devtools/debugger.dtd
@@ -62,9 +62,9 @@
 <!ENTITY debuggerUI.propertiesTitle  "Kabedo me nongo">
 <!-- LOCALIZATION NOTE (debuggerUI.emptyFilterText): This is the text that
   -  appears in the filter text box when it is empty. -->
 
 <!ENTITY debuggerUI.emptyFilterText  "Yek nyig coc">
 <!-- LOCALIZATION NOTE (emptyScriptText): The text to display in the menulist when
   - there are no scripts. -->
 
-<!ENTITY debuggerUI.emptyScriptText  "Nyig coc pe.">
+<!ENTITY debuggerUI.emptyScriptText  "Nyig coc pe">
--- a/browser/chrome/browser/devtools/debugger.properties
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -54,16 +54,24 @@ resumeTooltip=Dii wek dwogi
 # LOCALIZATION NOTE (emptyStackText): The text that is displayed in the stack
 # frames list when there are no frames to display.
 emptyStackText=Yaro ka maleng pe omoko.
 
 # LOCALIZATION NOTE (emptyBreakpointsText): The text that is displayed in the
 # breakpoints list when there are no breakpoints to display.
 emptyBreakpointsText=Pe kiyaro breakpoints ka maleng.
 
+# LOCALIZATION NOTE (noScriptsText): The text to display in the menulist when
+# there are no scripts.
+noScriptsText=No scripts
+
+# LOCALIZATION NOTE (noMatchingScriptsText): The text to display in the
+# menulist when there are no matching scripts after filtering.
+noMatchingScriptsText=Pe tye nyig coc ma rwate
+
 # LOCALIZATION NOTE (breakpointMenuItem): The text for all the elements that
 # are displayed in the breakpoints menu item popup.
 breakpointMenuItem.enableSelf=Mii breakpoint oti
 breakpointMenuItem.disableSelf=Jwik woko breakpoint
 breakpointMenuItem.deleteSelf=Kwany woko breakpoint
 breakpointMenuItem.enableOthers=Mii mukene
 breakpointMenuItem.disableOthers=Jwik mukene
 breakpointMenuItem.deleteOthers=Kwany mukene woko
--- a/browser/chrome/browser/devtools/gclicommands.properties
+++ b/browser/chrome/browser/devtools/gclicommands.properties
@@ -43,17 +43,17 @@ consoleclearDesc=Jwa ka coc
 # LOCALIZATION NOTE (screenshotDesc) A very short description of the
 # 'screenshot' command. See screenshotManual for a fuller description of what
 # it does. This string is designed to be shown in a menu alongside the
 # command name, which is why it should be as short as possible.
 screenshotDesc=Gwok cal me pot buk
 
 # LOCALIZATION NOTE (screenshotManual) A fuller description of the 'screenshot'
 # command, displayed when the user asks for help on what it does.
-screenshotManual=Gwok cal me PNG pi dirica weng manonge (me ayera i yonge gal manok)
+screenshotManual=Save a PNG image of the entire visible window (optionally after a delay)
 
 # LOCALIZATION NOTE (screenshotFilenameDesc) A very short string to describe
 # the 'filename' parameter to the 'screenshot' command, which is displayed in
 # a dialog when the user is using this command.
 screenshotFilenameDesc=Ka ma nying pwail gik iyie
 
 # LOCALIZATION NOTE (screenshotFilenameManual) A fuller description of the
 # 'filename' parameter to the 'screenshot' command, displayed when the user
@@ -111,17 +111,17 @@ inspectManual=Kwed yore ki kit me jami m
 # LOCALIZATION NOTE (inspectNodeDesc) A very short string to describe the
 # 'node' parameter to the 'inspect' command, which is displayed in a dialog
 # when the user is using this command.
 inspectNodeDesc=Layer CSS
 
 # LOCALIZATION NOTE (inspectNodeManual) A fuller description of the 'node'
 # parameter to the 'inspect' command, displayed when the user asks for help
 # on what it does.
-inspectNodeManual=Layer CSS me tic kwede Document.querySelector ma nyutu gin acel
+inspectNodeManual=A CSS selector for use with document.querySelector which identifies a single element
 
 # LOCALIZATION NOTE (tiltDesc) A very short description of the 'tilt'
 # command. See tiltManual for a fuller description of what it does. This
 # string is designed to be shown in a menu alongside the command name, which
 # is why it should be as short as possible.
 tiltDesc=Nyut cal me pot buk me web i 3D
 
 # LOCALIZATION NOTE (tiltManual) A fuller description of the 'tilt'
@@ -241,17 +241,17 @@ tiltResetManual=Ter odoco kit aloka mo k
 # LOCALIZATION NOTE (tiltCloseDesc) A very short description of the 'tilt close'
 # command. See tiltCloseManual 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.
 tiltCloseDesc=Lor gin anena ka ce tye twolo
 
 # LOCALIZATION NOTE (tiltCloseManual) A fuller description of the 'tilt close'
 # command, displayed when the user asks for help on what it does.
-tiltCloseManual=Lor gin anena ki dok cen i ka ma cero me kwedo oaa iye
+tiltCloseManual=Close the visualization and switch back to the Inspector's default highlighter
 
 # LOCALIZATION NOTE (breakDesc) A very short string used to describe the
 # function of the break command.
 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
@@ -449,66 +449,66 @@ addonDesc=Kob med ikome
 # LOCALIZATION NOTE (addonListDesc) A very short description of the 'addon list'
 # command. This string is designed to be shown in a menu alongside the command
 # name, which is why it should be as short as possible.
 addonListDesc=Nyut amed ikome ma kiketo
 
 # LOCALIZATION NOTE (addonListTypeDesc) A very short description of the
 # 'addon list <type>' 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.
-addonListTypeDesc=Yer ci imed ikome kit
+addonListTypeDesc=Select an add-on type
 
 # LOCALIZATION NOTE (addonListDictionaryHeading, addonListExtensionHeading,
 # addonListLocaleHeading, addonListPluginHeading, addonListThemeHeading,
 # addonListUnknownHeading) Used in the output of the 'addon list' command as the
 # first line of output.
 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=Lamed ikom magi kombedi dong kiketo woko:
-addonListUnknownHeading=Lame ikom magi pi kit madong kiyero kombedi 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 (addonNameDesc) A very short description of the
-# name parameter of numerous addon commands. This string is designed to be shown
+# 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 addons of a particular type were not found.
-addonNoneOfType=Pe kiketo lamed ikom kit man.
+# command when a search for add-ons of a particular type were not found.
+addonNoneOfType=There are no add-ons of that type installed.
 
 # LOCALIZATION NOTE (addonEnableDesc) A very short description of the
 # 'addon enable <type>' 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.
 addonEnableDesc=Mii lamed ikom ma kipoko yore oti
 
 # LOCALIZATION NOTE (addonAlreadyEnabled) Used in the output of the
-# 'addon enable' command when an attempt is made to enable an addon is already
-# enabled.
+# 'addon enable' command when an attempt is made to enable an add-on that is
+# already enabled.
 addonAlreadyEnabled=%S tye dong katic.
 
 # LOCALIZATION NOTE (addonEnabled) Used in the output of the 'addon enable'
-# command when an addon is enabled.
+# command when an add-on is enabled.
 addonEnabled=%S tye dong katic.
 
 # LOCALIZATION NOTE (addonDisableDesc) A very short description of the
 # 'addon disable <type>' 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.
 addonDisableDesc=Jwik woko med ikom ma kipoko yore
 
 # LOCALIZATION NOTE (addonAlreadyDisabled) Used in the output of the
-# 'addon disable' command when an attempt is made to disable an addon is already
-# disabled.
+# 'addon disable' command when an attempt is made to disable an add-on that is
+# already disabled.
 addonAlreadyDisabled=%S kityeko kwanyo woko.
 
 # LOCALIZATION NOTE (addonDisabled) Used in the output of the 'addon disable'
-# command when an addon is disabled.
+# command when an add-on is disabled.
 addonDisabled=%S kityeko kwanyo woko.
 
 # LOCALIZATION NOTE (exportDesc) A very short description of the 'export'
 # 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.
 exportDesc=Cwal woko jami
 
 # LOCALIZATION NOTE (exportHtmlDesc) A very short description of the 'export
@@ -692,17 +692,17 @@ cookieRemoveKeyDesc=Lagony pa layeny int
 
 # LOCALIZATION NOTE (cookieSetDesc) A very short description of the
 # 'cookie set' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
 cookieSetDesc=Ter layeny me intanet
 
 # LOCALIZATION NOTE (cookieSetManual) A fuller description of the 'cookie set'
 # command, displayed when the user asks for help on what it does.
-cookieSetManual=Ter layeny me intanet kun ipoko yor nying pa lagony, pire t ek ci kiyero ayera acel onyo mapol pi gn magi: kare ne kato (max-age in seconds or the expires date in GMTString format), yoo beo gang, gwoko maber
+cookieSetManual=Set a cookie by specifying a key name, its value and optionally one or more of the following attributes: expires (max-age in seconds or the expires date in GMTString format), path, domain, secure
 
 # LOCALIZATION NOTE (cookieSetKeyDesc) A very short string to describe the
 # 'key' parameter to the 'cookie set' command, which is displayed in a dialog
 # when the user is using this command.
 cookieSetKeyDesc=Lagony pa layeny me intanet me atera
 
 # LOCALIZATION NOTE (cookieSetValueDesc) A very short string to describe the
 # 'value' parameter to the 'cookie set' command, which is displayed in a dialog
@@ -726,22 +726,22 @@ cookieSetDomainDesc=The domain of the co
 # LOCALIZATION NOTE (cookieSetSecureDesc) A very short string to describe the
 # 'secure' parameter to the 'cookie set' command, which is displayed in a dialog
 # when the user is using this command.
 cookieSetSecureDesc=Otyeko kobo ka iwi https
 
 # LOCALIZATION NOTE (jsbDesc) A very short description of the
 # 'jsb' 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.
-jsbDesc=Gin deyo Javascript
+jsbDesc=JavaScript beautifier
 
 # LOCALIZATION NOTE (jsbUrlDesc) A very short description of the
 # 'jsb <url>' parameter. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
-jsbUrlDesc=URL me pwail me JS pi miyo bedo mamwonya
+jsbUrlDesc=The URL of the JS file to beautify
 
 # LOCALIZATION NOTE (jsbIndentSizeDesc) A very short description of the
 # 'jsb <indentSize>' parameter. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
 jsbIndentSizeDesc=Kit matye kwede iyi wango
 
 # LOCALIZATION NOTE (jsbIndentSizeManual) A fuller description of the
 # 'jsb <indentChar>' parameter, displayed when the user asks for help on what it
@@ -751,17 +751,17 @@ jsbIndentSizeManual=Namba me wangokwede 
 # LOCALIZATION NOTE (jsbIndentCharDesc) A very short description of the
 # 'jsb <indentChar>' parameter. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
 jsbIndentCharDesc=Gitiyo ki wangoi loko kite irek acel acel
 
 # LOCALIZATION NOTE (jsbIndentCharManual) A fuller description of the
 # 'jsb <indentChar>' parameter, displayed when the user asks for help on what it
 # does.
-jsbIndentCharManual=Kitiyo ki wango kite irek acel acel, yore me ayera obedo lago kine onyo lanyik.
+jsbIndentCharManual=The chars used to indent each line. The possible choices are space or tab.
 
 # LOCALIZATION NOTE (jsbPreserveNewlinesDesc) A very short description of the
 # 'jsb <jsbPreserveNewlines>' parameter. This string is designed to be shown
 # in a menu alongside the command name, which is why it should be as short as
 # possible.
 jsbPreserveNewlinesDesc=Gwok codo rek matye?
 
 # LOCALIZATION NOTE (jsbPreserveNewlinesManual) A fuller description of the
@@ -835,22 +835,88 @@ calllogDesc=Cwal wek ter  jogo tic me go
 
 # LOCALIZATION NOTE (calllogStartDesc) A very short description of the
 # 'calllog start' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
 calllogStartDesc=Cak ngolo tic me lwongo dw oko ika coc
 
 # LOCALIZATION NOTE (calllogStartReply) A string displayed as the result of
 # the 'calllog start' command.
-calllogStartReply=Dong gicako ngolo lwongo/goyo cim
+calllogStartReply=Call logging started.
 
 # LOCALIZATION NOTE (calllogStopDesc) A very short description of the
 # 'calllog stop' 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.
-calllogStopDesc=Jwik ngolo tic me goyo cim
+calllogStopDesc=Stop function call logging
 
 # LOCALIZATION NOTE (calllogStopNoLogging) A string displayed as the result of
 # the 'calllog stop' command when there is nothing to stop.
 calllogStopNoLogging=Ngolo goyo cim bene dong tye katic
 
 # LOCALIZATION NOTE (calllogStopReply) A string displayed as the result of
 # the 'calllog stop' command when there are logging actions to stop.
-calllogStopReply=Jwik ngolo lwongo/goyo cim. Lok matiyo: %1$S.
+calllogStopReply=Stopped call logging. Active contexts: %1$S.
+
+# LOCALIZATION NOTE (calllogStartChromeDesc) A very short description of the
+# 'calllog chromestart' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+calllogChromeStartDesc=Start logging function calls for chrome code to the console
+
+# LOCALIZATION NOTE (calllogChromeSourceTypeDesc) A very short description of the
+# 'calllog chromestart <sourceType>' parameter. This string is designed to be
+# shown in a menu alongside the command name, which is why it should be as short as possible.
+calllogChromeSourceTypeDesc=Global object, JSM URI, or JS to get a global object from
+
+# LOCALIZATION NOTE (calllogChromeSourceTypeDesc) A very short description of the
+# 'calllog chromestart' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+calllogChromeSourceTypeManual=The global object, URI of a JSM, or JS to execute in the chrome window from which to obtain a global object
+
+# LOCALIZATION NOTE (calllogChromeStartReply) A string displayed as the result
+# of the 'calllog chromestart' command.
+calllogChromeStartReply=Call logging started.
+
+# LOCALIZATION NOTE (calllogChromeStopDesc) A very short description of the
+# 'calllog chromestop' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+calllogChromeStopDesc=Stop function call logging
+
+# LOCALIZATION NOTE (calllogChromeStopNoLogging) A string displayed as the
+# result of the 'calllog chromestop' command when there is nothing to stop.
+calllogChromeStopNoLogging=No call logging for chrome code is currently active
+
+# LOCALIZATION NOTE (calllogStopReply) A string displayed as the result of
+# the 'calllog chromestop' command when there are logging actions to stop.
+calllogChromeStopReply=Stopped call logging. Active contexts: %1$S.
+
+# LOCALIZATION NOTE (callLogChromeAnonFunction) A string displayed as the result
+# of the 'calllog chromestart' command when an anonymouse function is to be
+# logged.
+callLogChromeAnonFunction=<anonymous>
+
+# LOCALIZATION NOTE (callLogChromeMethodCall) A string displayed as the result
+# of the 'calllog chromestart' command to proceed a method name when it is to be
+# logged.
+callLogChromeMethodCall=Method call
+
+# LOCALIZATION NOTE (callLogChromeInvalidJSM) A string displayed as the result
+# of the 'calllog chromestart' command with an invalid JSM or JSM path.
+callLogChromeInvalidJSM=Invalid JSM!
+
+# LOCALIZATION NOTE (callLogChromeVarNotFoundContent) A string displayed as the
+# result of the 'calllog chromestart' command with a source type of
+# content-variable and an invalid variable name.
+callLogChromeVarNotFoundContent=Variable not found in content window.
+
+# LOCALIZATION NOTE (callLogChromeVarNotFoundChrome) A string displayed as the
+# result of the 'calllog chromestart' command with a source type of
+# chrome-variable and an invalid variable name.
+callLogChromeVarNotFoundChrome=Variable not found in chrome window.
+
+# LOCALIZATION NOTE (callLogChromeEvalException) A string displayed as the
+# result of the 'calllog chromestart' command with a source type of javascript
+# and invalid JavaScript code.
+callLogChromeEvalException=Evaluated javascript threw the following exception
+
+# LOCALIZATION NOTE (callLogChromeEvalNeedsObject) A string displayed as the
+# result of passing a non-JavaScript object creating source via the
+# 'calllog chromestart javascript' command.
+callLogChromeEvalNeedsObject=The JavaScript source must evaluate to an object whose method calls are to be logged e.g. "({a1: function() {this.a2()},a2: function() {}});"
--- a/browser/chrome/browser/devtools/scratchpad.properties
+++ b/browser/chrome/browser/devtools/scratchpad.properties
@@ -52,17 +52,17 @@ confirmClose=I mito gwoko aloka loka ma 
 
 # LOCALIZATION NOTE  (confirmClose.title): This is title of the prompt dialog when
 # you try to close a scratchpad with unsaved changes.
 confirmClose.title=Aloka loka ma pe kigwoko
 
 # LOCALIZATION NOTE  (scratchpadIntro): This is a multi-line comment explaining
 # how to use the Scratchpad. Note that this should be a valid JavaScript
 # comment inside /* and */.
-scratchpadIntro=/*\n * Man aye obedo buk gwar coc me Java.\n *\n * Ket coc me Java, eka ite Dino tung cem onyo yer ki Acaki Keto:\n * 1. Ket wek kwan coc ma kiyero,\n * 2. Kwed me kelo Lakwed Cal ikom adwogi, onyo,\n * 3. Yar ka maleng me rono adwogi i tam amia iyonge yera.\n*/\n\n
+scratchpadIntro1=/*\n * This is a JavaScript Scratchpad.\n *\n * Enter some JavaScript, then Right Click or choose from the Execute Menu:\n * 1. Run to evaluate the selected text (%1$S),\n * 2. Inspect to bring up an Object Inspector on the result (%2$S), or,\n * 3. Display to insert the result in a comment after the selection. (%3$S)\n */\n\n
 
 # LOCALIZATION NOTE  (notification.browserContext): This is the message displayed
 # over the top of the editor when the user has switched to browser context.
 browserContext.notification=Ka coc ma eni ni ngweco woko ki coc pa Layeny.
 
 # LOCALIZATION NOTE (help.openDocumentationPage): This returns a localized link with
 # documentation for Scratchpad on MDN.
 help.openDocumentationPage=https://developer.mozilla.org/en/Tools/Scratchpad
--- a/browser/chrome/browser/devtools/styleinspector.properties
+++ b/browser/chrome/browser/devtools/styleinspector.properties
@@ -25,21 +25,21 @@ rule.status.UNMATCHED=Pe rwate
 
 # LOCALIZATION NOTE (rule.sourceElement, rule.sourceInline): For each
 # style property the panel shows the rules which hold that specific property.
 # For every rule, the rule source is also displayed: a rule can come from a
 # file, from the same page (inline), or from the element itself (element).
 rule.sourceInline=iyi rek
 rule.sourceElement=jami
 
-# LOCALIZATION NOTE (rule.inheritedSource): Shown for CSS rules
-# that were inherited from a parent node.  Will be passed a node
-# identifier and a source location.
-# e.g "Inherited from body#bodyID (styles.css:20)"
-rule.inheritedSource=Olako ki %S (%S)
+# LOCALIZATION NOTE (rule.inheritedFrom): Shown for CSS rules
+# that were inherited from a parent node. Will be passed a node
+# identifier of the parent node.
+# e.g "Inherited from body#bodyID"
+rule.inheritedFrom=Inherited from %S
 
 # LOCALIZATION NOTE (style.highlighter.button): These strings are used inside
 # sidebar of the Highlighter for the style inspector button.
 # "Computed" refers to the Computed Style of the element.
 style.highlighter.button.label2=Oribo cura ne
 style.highlighter.accesskey2=C
 style.highlighter.button.tooltip2=Kwed kit jami ma kiribo cura ne ki kompiuta
 
--- a/browser/chrome/browser/devtools/webConsole.dtd
+++ b/browser/chrome/browser/devtools/webConsole.dtd
@@ -3,24 +3,89 @@
    - 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 window.title "Web Console">
+
 <!ENTITY networkPanel.requestURL                  "Kwa URL">
 <!ENTITY networkPanel.requestMethod               "Kwa Yore">
 <!ENTITY networkPanel.statusCode                  "Kit Nyig coc">
 
 <!ENTITY networkPanel.requestHeaders              "Kwa Luwiye">
 <!ENTITY networkPanel.requestCookie               "Kakube ma kicwalo">
 <!ENTITY networkPanel.requestBody                 "Kwa Kome">
 <!ENTITY networkPanel.requestFormData             "Kicwalo Tic me Fom">
 
 <!ENTITY networkPanel.responseHeaders             "Dwok lok ma Lawiye">
 <!ENTITY networkPanel.responseBody                "Kom Dwoko lok">
 <!ENTITY networkPanel.responseBodyCached          "Tic ma kigwoko">
 <!ENTITY networkPanel.responseBodyUnknownType     "Kit Jami matye iyie Mape ngene">
 <!ENTITY networkPanel.responseNoBody              "Kom Dwoko lok peke">
 <!ENTITY networkPanel.responseImage               "Cal ma Kigamo">
 <!ENTITY networkPanel.responseImageCached         "Cal ma Kigwoko">
+<!-- LOCALIZATION NOTE (saveBodies.label): You can see this string in the Web
+   - Console context menu. -->
+
+<!ENTITY saveBodies.label     "Log Request and Response Bodies">
+<!ENTITY saveBodies.accesskey "L">
+<!-- LOCALIZATION NOTE (btnPageNet.label): This string is used for the menu
+  -  button that allows users to toggle the network logging output.
+  -  This string and the following strings toggle various kinds of output
+  -  filters. -->
+
+<!ENTITY btnPageNet.label   "Malubo kore">
+<!ENTITY btnPageNet.tooltip "Dony i kakube me wiyamo">
+<!ENTITY btnPageCSS.label   "CSS">
+<!ENTITY btnPageCSS.tooltip "Ket CSS bal mapyem">
+<!ENTITY btnPageJS.label    "JS">
+<!ENTITY btnPageJS.tooltip  "Ket Javascript weko woko">
+<!-- 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">
+<!-- LOCALIZATION NOTE (btnPosition.label): The label shown for the menu which
+  -  allows the user to toggle between the Web Console positioning types. -->
+
+<!ENTITY btnPosition.label     "Kabedo">
+<!-- LOCALIZATION NOTE (btnPosition.tooltip): The tooltip shown when the user
+  -  hovers the Position button in the Web Console toolbar. -->
+
+<!ENTITY btnPosition.tooltip   "Ket kabedo me Coc me Web imalu onyo piny ite coc acoya">
+<!-- LOCALIZATION NOTE (positionMenu.above): When this option is selected the
+  -  Web Console interface is displayed above the web page. -->
+
+<!ENTITY positionMenu.above    "Malu">
+<!-- LOCALIZATION NOTE (positionMenu.below): When this option is selected the
+  -  Web Console interface is displayed below the web page. -->
+
+<!ENTITY positionMenu.below    "Ite">
+<!-- LOCALIZATION NOTE (positionMenu.window): When this option is selected the
+  -  Web Console interface is displayed in a floating panel. -->
+
+<!ENTITY positionMenu.window   "Window">
+
+<!ENTITY filterBox.placeholder "Filter">
+<!ENTITY btnClear.label        "Clear">
+<!ENTITY btnClear.tooltip      "Clear the Web Console output">
+<!ENTITY btnClose.tooltip      "Close the Web Console">
+
+<!ENTITY fullZoomEnlargeCmd.commandkey  "+">
+<!-- + is above this key on many keyboards -->
+<!ENTITY fullZoomEnlargeCmd.commandkey2 "="> 
+<!ENTITY fullZoomEnlargeCmd.commandkey3 "">
+
+<!ENTITY fullZoomReduceCmd.commandkey   "-">
+<!ENTITY fullZoomReduceCmd.commandkey2  "">
+
+<!ENTITY fullZoomResetCmd.commandkey    "0">
+<!ENTITY fullZoomResetCmd.commandkey2   "">
--- a/browser/chrome/browser/devtools/webconsole.properties
+++ b/browser/chrome/browser/devtools/webconsole.properties
@@ -18,52 +18,21 @@ typeStrict=Cik ma Olobakino:
 msgCategory=Kwone: 
 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
-btnPageNet=Malubo kore
-tipPageNet=Dony i kakube me wiyamo
-btnPageCSS=CSS
-tipPageCSS=Ket CSS bal mapyem
-btnPageJS=JS
-tipPageJS=Ket Javascript weko woko
-# LOCALIZATION NOTE (btnPageLogging):
-#
-# This is used as the text of the "Logging" button on 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().
-btnPageLogging=Keto
-# LOCALIZATION NOTE (tipPageLogging):
-#
-# This is used as the text of the tool tip for the "Logging" button on
-# the toolbar.
-tipPageLogging=Ket kwena ma kicwalo i "coc" cal
-btnConsoleErrors=Bal
-tipConsoleErrors=Ket lwongo i console.error()
-btnConsoleInfo=Ngec
-tipConsoleInfo=Ket lwongo i console.info()
-btnConsoleWarnings=Cik
-tipConsoleWarnings=Ket lwongo i console.warn()
-btnConsoleLog=Ket
-tipConsoleLog=Ket lwongo i console.log()
 btnGlobal=Kwena me wilobo
 tipGlobal=Ket Kwena cwalo kwena me wilobo
 localConsole=Coc me kagwoko
 clearConsoleCmd.label=Jwa Coc
 clearConsoleCmd.accesskey=e
-# LOCALIZATION NOTE (btnClear):
-#
-# This is used as the text of the "Clear" button for the toolbar. It clears the
-# contents of the console.
-btnClear=Jwa
-stringFilter=Gi yeko
 close.button=Lor
 close.accesskey=C
 update.button=Ngec
 update.accesskey=U
 # 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)
@@ -80,22 +49,16 @@ jsPropertyTitle=Gin makwedo Cal
 # 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
-saveBodies.label=Ket Kwac ki kom Lagam
-saveBodies.accesskey=L
-copyCmd.label=Lok
-copyCmd.accesskey=C
-selectAllCmd.label=Yer gin Weng
-selectAllCmd.accesskey=A
 # 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):
 #
@@ -119,50 +82,30 @@ NetworkPanel.imageSizeDeltaDurationMS=%Sx%Spx, Δ%Sms
 # flash data received from the server can't be displayed.
 #
 # The %S is replaced by the content type, that can't be displayed, examples are
 #  o application/x-shockwave-flash
 #  o music/crescendo
 NetworkPanel.responseBodyUnableToDisplay.content=Pe twero yaro ka maleng kit lagam pi "%S"
 ConsoleAPIDisabled=Keto Coc me Web API (console.log, console.info, console.warn, console.error) kityeko juko woko ki coc ma i pot buk man.
 
-# LOCALIZATION NOTE (webConsolePosition): The label shown for the menu which
-# allows the user to toggle between the Web Console positioning types.
-webConsolePosition=Kabedo
-
-# LOCALIZATION NOTE (webConsolePositionTooltip): The tooltip shown when the user
-# hovers the Position button in the Web Console toolbar.
-webConsolePositionTooltip=Ket kabedo me Coc me Web imalu onyo piny ite coc acoya
-
-# LOCALIZATION NOTE (webConsolePositionAbove): When this option is selected the
-# Web Console interface is displayed above the web page.
-webConsolePositionAbove=Malu
-
-# LOCALIZATION NOTE (webConsolePositionBelow): When this option is selected the
-# Web Console interface is displayed below the web page.
-webConsolePositionBelow=Ite
-
-# LOCALIZATION NOTE (webConsolePositionWindow): When this option is selected the
-# Web Console interface is displayed in a floating panel.
-webConsolePositionWindow=Dirica
-
 # LOCALIZATION NOTE (webConsoleWindowTitleAndURL): The Web Console floating
 # panel title, followed by the web page URL.
 # For RTL languages you need to set the LRM in the string to give the URL
 # the correct direction.
 webConsoleWindowTitleAndURL=Coc me Web - %S
 
 # LOCALIZATION NOTE (webConsoleMixedContentWarning): Message displayed after a
 # URL in the Web Console that has been flagged for Mixed Content (i.e. http
 # content in an https page)
 webConsoleMixedContentWarning=Jami mnonge iyie Mu rube
 
 # LOCALIZATION NOTE (scratchpad.linkText):
 # The text used in the right hand side of the web console command line when
-# Javascript is being entered, to indicate how to jump into scratchpad mode
+# JavaScript is being entered, to indicate how to jump into scratchpad mode
 scratchpad.linkText=Shift+RETURN - Yab i Coc me tutunu
 
 # LOCALIZATION NOTE (gcliterm.instanceLabel): The console displays
 # objects using their type (from the constructor function) in this descriptive
 # string
 gcliterm.instanceLabel=Cutcut pi %S
 
 # LOCALIZATION NOTE (Autocomplete.label):
--- a/browser/chrome/browser/downloads/downloads.dtd
+++ b/browser/chrome/browser/downloads/downloads.dtd
@@ -6,16 +6,23 @@
      -->
 
 <!ENTITY indicator.tooltiptext            "Kwany">
 <!-- LOCALIZATION NOTE (downloads.title):
      Used by screen readers to describe the Downloads Panel.
      -->
 
 <!ENTITY downloads.title                  "Kwanyo">
+<!-- LOCALIZATION NOTE (downloads.width):
+     Width of the Downloads Panel list items, expressed using a CSS unit.  The
+     longest labels that should fit in the item width are usually those of
+     in-progress downloads and those of blocked downloads.
+     -->
+
+<!ENTITY downloads.width                  "65ch">
 
 <!ENTITY cmd.pause.label                  "Cung manok">
 <!ENTITY cmd.pause.accesskey              "C">
 <!ENTITY cmd.resume.label                 "Chak daki">
 <!ENTITY cmd.resume.accesskey             "C">
 <!ENTITY cmd.cancel.label                 "Juki">
 <!ENTITY cmd.cancel.accesskey             "J">
 <!-- LOCALIZATION NOTE (cmd.show.label, cmd.show.accesskey, cmd.showMac.label,
@@ -32,10 +39,8 @@
 <!ENTITY cmd.goToDownloadPage.accesskey   "W">
 <!ENTITY cmd.copyDownloadLink.label       "Lok Kakube ma ki Gamo">
 <!ENTITY cmd.copyDownloadLink.accesskey   "K">
 <!ENTITY cmd.removeFromList.label         "Kwany woko ki i Nying jami">
 <!ENTITY cmd.removeFromList.accesskey     "w">
 <!ENTITY cmd.clearList.label              "Ruc Nying jami">
 <!ENTITY cmd.clearList.accesskey          "c">
 
-<!ENTITY downloadshistory.label           "Nyut Kwanyo Weng">
-<!ENTITY downloadshistory.accesskey       "N">
--- a/browser/chrome/browser/downloads/downloads.properties
+++ b/browser/chrome/browser/downloads/downloads.properties
@@ -62,11 +62,25 @@ shortTimeLeftDays=%1$Sd
 # that we use a wider space after the separator when it is followed by a number,
 # just to avoid visually confusing it with with a minus sign with some fonts.
 # If you use a different separator, this might not be necessary.  However, there
 # is usually no need to change the separator or the order of the substitutions,
 # even for right-to-left languages, unless the defaults are not suitable.
 statusSeparator=%1$S — %2$S
 statusSeparatorBeforeNumber=%1$S —  %2$S
 
+# LOCALIZATION NOTE (showMoreDownloads):
+# This string is shown in the Downloads Panel when there are more active
+# downloads than can fit in the available space.  The phrase should be read as
+# "Show N more of my recent downloads".  Use a semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/Localization_and_Plurals
+showMoreDownloads=Show 1 More Recent Download;Show %1$S More Recent Downloads
+# LOCALIZATION NOTE (showAllDownloads):
+# This string is shown in place of showMoreDownloads when all the downloads fit
+# in the available space, or when there are no downloads in the panel at all.
+showAllDownloads=Show All Downloads
+# LOCALIZATION NOTE (showDownloadsAccessKey):
+# This access key applies to both showMoreDownloads and showAllDownloads.
+showDownloadsAccessKey=S
+
 fileExecutableSecurityWarning="%S" obedo pwail ma cwale. Pwail ma cwale romo bedo ki kwidi onyo nyig coc ma rac ma romo balo kompiuta mamegi. ti ki lapeny kun yabo fail man. I moko ada ni i mito cako "%S"?
 fileExecutableSecurityWarningTitle=Yab Pwail ma Kete?
 fileExecutableSecurityWarningDontAsk=Pe i penya ki man doki
--- a/browser/chrome/browser/pageInfo.dtd
+++ b/browser/chrome/browser/pageInfo.dtd
@@ -1,13 +1,11 @@
-<!--
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
--->
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY  pageInfoWindow.width  "600">
 <!ENTITY  pageInfoWindow.height "500">
 
 <!ENTITY  copy.key              "C">
 <!ENTITY  copy.label            "Kopo">
 <!ENTITY  copy.accesskey        "K">
 <!ENTITY  selectall.key         "A">
--- a/browser/chrome/overrides/settingsChange.dtd
+++ b/browser/chrome/overrides/settingsChange.dtd
@@ -1,8 +1,7 @@
-<!-- -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
--->
+<!-- -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- -->
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY  settingsChangePreferences.label  "Kitwero loko lanyik me tic kun tiyo ki i &brandShortName; ma imito.">
 <!ENTITY  settingsChangeOptions.label      "Kitwero loko lanyik me tic kun tiyo ki i &brandShortName; ma imito.">
--- a/dom/chrome/dom/dom.properties
+++ b/dom/chrome/dom/dom.properties
@@ -128,9 +128,8 @@ MozBlobBuilderWarning=Tic me MozBlobBuil
 # LOCALIZATION NOTE: Do not translate "DOMException", "code" and "name"
 DOMExceptionCodeWarning=Tic pa yele me tiyo, nodeName yele me tiyo kiketo woko. Tii ki nying akaka.
 # LOCALIZATION NOTE: Do not translate "__exposedProps__"
 NoExposedPropsWarning=Yaro ngec pi cal me chrome JS ii jami manonge ie labongo_Props ma kiyaro ka maler_ pe ogwoke maber ci kikwanyo woko. Nen https://developer.mozilla.org/en/XPConnect_wrappers pi ngec mukene mapol.
 # LOCALIZATION NOTE: Do not translate "Mutation Event" and "MutationObserver"
 MutationEventWarning=Kityeko coyo woko tic me Juku Yuba manok. Tii ki MutationObserver akaaka.
 # LOCALIZATION NOTE: Do not translate "Blob", "mozSlice", or "slice"
 MozSliceWarning=Tic me mozSlice ikom cal me Blob otyeko woko.  Tii ki en ma kibyeko ie.
-OnuploadprogressWarning=Tic me XMLHttpRequest's onuploadprogress kityeko miyo yele me tiyo.
--- a/dom/chrome/layout/css.properties
+++ b/dom/chrome/layout/css.properties
@@ -17,17 +17,17 @@ PEUnknownAtRule=Pe kingeyo ki-cik onyo b
 PECharsetRuleEOF=Tol me charset i @charset cik
 PECharsetRuleNotString=Tol me charset ma kigeno ento ononge '%1$S'.
 PEGatherMediaEOF=Agiki me kube iwiyamo i @import onyo @media rule
 PEGatherMediaNotComma=Kigeno ',' i nying kakube me wiyamo ento ononge '%1$S'.
 PEGatherMediaNotIdent=Lapok ne ma kigeno i nying kakube me wiyamo ento ononge '%1$S'.
 PEImportNotURI=I geno URL i @import cik ento ononge '%1$S'.
 PEImportBadURI=Pe tye katic URI i @import cik: '%1$S'.
 PEImportUnexpected=Onongo en mape ogeno '%1$S'. i akina @import.
-PEGroupRuleEOF=Agiki me @media onyo @-moz-document cik
+PEGroupRuleEOF2=end of @media, @supports or @-moz-document rule
 PEGroupRuleNestedAtRule=%1$S cik pe ku weko i akina @media onyo @-moz-document cik.
 PEMozDocRuleBadFunc=Kigeno url(), url-prefix(), onyo domain() i @-moz-document cik ento pe ononge '%1$S'.
 PEMozDocRuleNotURI=Kigeno URI in @-moz-document cik ento ononge '%1$S'.
 PEMozDocRuleNotString=Tol ma kigeno i @-moz-document cik regexp() tiyo ento ononge '%1$S'.
 PEMozDocRuleEOF=Mede i URL @-moz-cik me coc acoya
 PEAtNSPrefixEOF=namespace prefix i @namespace cik
 PEAtNSURIEOF=namespace URI @namespace cik
 PEAtNSUnexpected=Pwoc mape kigeno i akina @namespace: '%1$S'.
@@ -109,8 +109,17 @@ PEMQExpectedExpressionStart=Kigeno '(' m
 PEMQExpressionEOF=jami matye iye pi waco yo me lapeny
 PEMQExpectedFeatureName=Nying kit me yo beo kigeno ento ononge '%1$S'.
 PEMQExpectedFeatureNameEnd=Kigeno ':' onyo ')' i yonge nying kit yo ento ononge '%1$S'.
 PEMQNoMinMaxWithoutValue=Kit me yo kwede min-onyo max-myero bed ki wel.
 PEMQExpectedFeatureValue=Kinongo wel mape tiyo pi kit me yo.
 PEBadFontBlockStart=Kigeno '{' me cako @font-face cik ento ononge '%1$S'.
 PEBadFontBlockEnd=Kigeno '}' me giko @font-face cik ento ononge '%1$S'.
 PEAnonBoxNotAlone=Pe ogeno canduk mape ngene.
+PEBadDirValue=Expected 'ltr' or 'rtl' in direction selector but found '%1$S'.
+PESupportsConditionStartEOF='not' or '('
+PESupportsConditionInParensStartEOF='not', '(' or identifier
+PESupportsConditionNotEOF='not'
+PESupportsConditionExpectedOpenParen=Expected '(' while parsing supports condition but found '%1$S'.
+PESupportsConditionExpectedCloseParen=Expected ')' while parsing supports condition but found '%1$S'.
+PESupportsConditionExpectedStart=Expected 'not' or '(' while parsing supports condition but found '%1$S'.
+PESupportsConditionExpectedNot=Expected 'not' while parsing supports condition but found '%1$S'.
+PESupportsGroupRuleStart=Expected '{' to begin @supports rule but found '%1$S'.
--- a/dom/chrome/layout/htmlparser.properties
+++ b/dom/chrome/layout/htmlparser.properties
@@ -1,16 +1,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Encoding warnings and errors
 EncNoDeclarationFrame=Kit me coyo coc me coc acoya ma kiyubo pe kiyaro ne kamaleng. Coc acoya romo neno mapat ka gineno labongo coc acoya yubone.
 EncNoDeclarationPlain=Kit me coyo coc nono me nyig coc acoya pw kityeko yarone ka maleng. Coc acoya twero jalo kwede ribo nyig coc i cano jami pa layeny ka ce coc acoya tye ki kit mawoko ni aa ki cano US-ASCII. Kit me coyo coc me pwail mito ni mywro kiyar ka maleng i cik me akoba onyo pwail mito tic ki alama me cik pa bayit calo capa cing me cwalo coc.
-EncNoDeclaration=Pe kiyaro woko ka maleng kit me coyo coc acoya me HTML. Coc acoya bi jalo kwede ribo nyig coc i keto layeny ka ce coc acoya tye ki kit ma aa ki i lobo mawoko keto i US-ASCII. Coyo kit me pot buk myero kiyar woko ka maleng i coc acoya onyo i cik me akoba.
+EncNoDeclaration=The character encoding of the HTML document was not declared. The document will render with garbled text in some browser configurations if the document contains characters from outside the US-ASCII range. The character encoding of the page must be declared in the document or in the transfer protocol.
 EncLateMetaFrame=Yaro woko ka maleng coyo coc acoya me HTML ma kiyubo pe ononge ikare ma onongo tye ka kelo woko bayit me pwail 1024ma okwongo. Tek kineno labongo yubone, pot buk bi kwanyo odoco pire kene. yaro woko coyo coc ka maleng mito kidir wek obed ikin bayit 1024 me acel me pwail.
 EncLateMeta=Yaro woko ka maleng cwalo coc acoya me HTML pe ononge ikare ma tye ka kelo woko bayit 1024 me acel pi pwail. Tek kineno patpat i cano layeny, pot buk man bi kwanyo odoco pire kene. Cwalo yaro ka maleng mito kidir wek obed i akina bayit 1024 me acel pi pwail.
 EncLateMetaReload=Pot buk dong kikwanyo woko, pien kit me coyo coc yaro ka maleng pi coc acoya me HTML pe ononge ikare me kelo woko bayit 1024 me acel pi pwail. Yaro ka maleng mito kidir wek obed i akina bayit 1024 me acel pi pwail.
 EncLateMetaTooLate=Kit me coyo coc yaro ka maleng pi coc acoya kinongo ne lacen me time.Yaro ka maleng coc acoya mito kidir wek obed i akina bayit 1024 me acel pi pwail.
 EncMetaUnsupported=Kit coyo coc ma pe kicwako te giyaro ne ka maleng pi coc acoya me HTML kun tiyo ki daco meta. Kicayo woko yarone ka maleng.
 EncProtocolUnsupported=Kit coyo coc ma pe kicwako te giyaro ne ka maleng i kom rwom cik me akoba. Kicayo woko yarone ka maleng.
 EncBomlessUtf16=Onongo UTF-16-ocoyo Ngec manok i Latin-nyig coc keken labongo alama me kwayo bayit ci labongo cik me akoba-rwom me yaro ka maleng. Coyo coc ma eni ni ii UTF-16 pe ci coyo kit onongo myero guyar ne ka maleng lakite mo kenyo.
 EncMetaUtf16=Ki tiyo ki daco meta me yaro ka maleng kit coyo coc calo UTF-16. Man dong kigonyo te woko calo UTF-8 aka yaro ne ka maleng.
--- a/mobile/android/base/android_strings.dtd
+++ b/mobile/android/base/android_strings.dtd
@@ -40,16 +40,18 @@
 <!ENTITY bookmark_removed "Kikwanyo woko Alama me buk">
 <!ENTITY bookmark_updated "Kimedo Alama me buk">
 
 <!ENTITY history_today_section "Tin">
 <!ENTITY history_yesterday_section "Lawo">
 <!ENTITY history_week_section "Nino 7 mukato angec">
 <!ENTITY history_older_section "Muti loyo nino 7">
 
+<!ENTITY go "Ceti">
+<!ENTITY search "Yeny">
 <!ENTITY reload "Nwo pango">
 <!ENTITY forward "Cwal anyim">
 <!ENTITY menu "Nying Jami">
 <!ENTITY back "Cen">
 <!ENTITY stop "Juk">
 <!ENTITY site_security "Ber bedo me Dyer bar">
 
 <!ENTITY close_tab "Lor Dirica matidi">
@@ -80,26 +82,37 @@
 <!ENTITY pref_plugins_tap_to_play "Gwet wek tuki">
 <!ENTITY pref_plugins_disabled "Kijuko woko">
 <!ENTITY pref_text_size "Dit pa nyig Coc">
 <!ENTITY pref_font_size_tiny "Tino">
 <!ENTITY pref_font_size_small "Tidi">
 <!ENTITY pref_font_size_medium "Dyere dyere">
 <!ENTITY pref_font_size_large "Lac">
 <!ENTITY pref_font_size_xlarge "Madit loyo">
+<!ENTITY pref_font_size_set "Set">
+<!-- Localization note (pref_font_size_adjust_char): A button with a small version of this character
+(or combination of characters) is used to decrease the preview font size; a larger version of the
+same character/combination is used to increase the preview font size. It should be a concise
+representation of the language it is used in that will help show the text in the preview will change
+size. -->
+<!ENTITY pref_font_size_adjust_char "A">
+<!-- Localization note (pref_font_size_preview_text): This paragraph is used as an example to
+    demonstrate the font size setting.  It is meant to be whimsical and fun. -->
+
+<!ENTITY pref_font_size_preview_text "The quick orange fox jumps over your expectations with more speed, more flexibility and more security. As a non-profit, we\'re free to innovate on your behalf without any pressure to compromise. That means a better experience for you and a brighter future for the Web.">
+
 <!ENTITY pref_use_master_password "Tii ki i cwil me donyo ma dit">
 <!ENTITY pref_sync "Sync">
 <!ENTITY pref_search_suggestions "Nyut byek me yeny maplo">
 <!ENTITY pref_import_android "Kel ki woko ki Android">
 <!ENTITY pref_private_data_history "Tye ka yabo &amp; Gol Mukato">
 <!ENTITY pref_private_data_formdata "Fom &amp; yeny mukato">
-<!ENTITY pref_private_data_cookies "Kakube me intanet">
+<!ENTITY pref_private_data_cookies2 "Cookies &amp; active logins">
 <!ENTITY pref_private_data_passwords "Saved passwords">
 <!ENTITY pref_private_data_cache "Kagwoko">
-<!ENTITY pref_private_data_sessions "Tye ka tic Dony iyie">
 <!ENTITY pref_private_data_offlineApps "Coc kakube me web ma pe iwi yamo">
 <!ENTITY pref_private_data_siteSettings "Gin ma imito i di bar">
 
 <!ENTITY quit "Wek woko">
 
 <!ENTITY addons "Lamed-ikome">
 <!ENTITY downloads "Kigolo woko">
 <!ENTITY apps "Purugram">
@@ -133,17 +146,17 @@
 
 <!ENTITY history_removed "Kikwanyo woko pot buk">
 
 <!ENTITY bookmark_edit_title "Yub Alama buk">
 <!ENTITY bookmark_edit_name "Nying">
 <!ENTITY bookmark_edit_location "Kabedo">
 <!ENTITY bookmark_edit_keyword "Lok mapire tek">
 
-<!ENTITY site_settings_title        "Jwa woko Tero Kakube">
+<!ENTITY site_settings_title2       "Site Settings…">
 <!ENTITY site_settings_cancel       "Jwik">
 <!ENTITY site_settings_clear        "Jwa">
 <!ENTITY site_settings_no_settings  "Ter mo peke me ajwa.">
 
 <!ENTITY reading_list "Nying jami me kwan">
 <!ENTITY reading_list_added "Kimedo woko pot buk ii Nying jami me Akwan mamegi">
 <!ENTITY reading_list_removed "Kikwanyo woko pot nuk ki Nying jami me akwani ni">
 <!ENTITY reading_list_failed "Medo pot buk pe olare ki Nying Jami me kwani">
@@ -159,19 +172,29 @@
 <!ENTITY button_clear_data "Ywe tic">
 
 <!ENTITY abouthome_addons_title "Med iwiye pi &brandShortName; megi">
 <!ENTITY abouthome_addons_browse "Yeny &brandShortName; weng pi med iwiye">
 <!ENTITY abouthome_last_tabs_title "Lanyik megi ki kare mukato angec">
 <!ENTITY abouthome_last_tabs_open "Yab Tab weng ki i kare mukato">
 <!ENTITY abouthome_top_sites_title "Kakube maloyo">
 <!ENTITY abouthome_top_sites_browse "Yeny kakube megi lung maloyo">
-<!ENTITY abouthome_no_top_sites "I pe ki kakube maloyo kombedi. Gwet Bao me Nying wek ocak yenyo.">
-<!ENTITY abouthome_about_sync "Ter kit ma Firefox neno kwede pi donyo i alama buk mapol, lok mukato ki tab ki jami me tic megi mapatpat">
+<!-- Localization note (abouthome_about_sync3, abouthome_about_apps2): The
+     chevron (ex: "»"; unicode= U+00BB) is used as an arrow to show that
+     clicking this text in the promotions box will perform some action. Note
+     that a non-breaking space (unicode= U+00A0) should be used between this
+     character and the remainder of the string to prevent word wrap. -->
+<!ENTITY abouthome_about_sync3 "Set up Firefox Sync to access bookmarks, history and tabs from your other devices&#x00A0;»">
+<!ENTITY abouthome_about_apps2 "Get apps from the Mozilla Marketplace and discover the best the Web has to offer&#x00A0;»">
+<!-- Localization note (abouthome_sync_bold_name, abouthome_apps_bold_name):
+     These strings are accentuated as bold text in the "abouthome_about_..."
+     strings above. These strings should be a subset of the strings above and
+     generally be the name of the product the string describes. -->
 <!ENTITY abouthome_sync_bold_name "Firefox Sync">
+<!ENTITY abouthome_apps_bold_name "Mozilla Marketplace">
 
 <!ENTITY filepicker_title "Yer Pwail">
 <!ENTITY filepicker_audio_title "Yer onyo ket tekod me dwon">
 <!ENTITY filepicker_image_title "Yer onyo ter cal">
 <!ENTITY filepicker_video_title "Yer onyo ket video">
 <!-- Site identity popup -->
 
 <!ENTITY identity_connected_to "Ityeko dong kube woko I">
@@ -196,8 +219,24 @@ just addresses the organization to follo
 ki Android">
 <!ENTITY bookmarkhistory_import_bookmarks "Kel ki woko alama buke
  ki Android">
 <!ENTITY bookmarkhistory_import_history "Kelo kiwoko lok mukato 
 ki Android">
 <!ENTITY bookmarkhistory_import_wait "Tim ber i kur...">
 
 <!ENTITY webapp_generic_name "Purugram">
+<!-- Updater notifications -->
+
+<!ENTITY updater_start_title "&brandShortName;">
+<!ENTITY updater_start_ticker "&brandShortName; update available&#8230;">
+<!ENTITY updater_start_select "Select to download update.">
+
+<!ENTITY updater_downloading_title "Golo &brandShortName;">
+<!ENTITY updater_downloading_ticker "Downloading &brandShortName; update&#8230;">
+<!ENTITY updater_downloading_ticker_failed "Failed to download &brandShortName; update&#8230;">
+<!ENTITY updater_downloading_select "Select to apply update when complete.">
+<!ENTITY updater_downloading_retry "Select to retry update download.">
+<!ENTITY updater_downloading_willapply "Waiting for download to complete.">
+
+<!ENTITY updater_apply_title "&brandShortName;">
+<!ENTITY updater_apply_ticker "&brandShortName; update available&#8230;">
+<!ENTITY updater_apply_select "Select to apply downloaded update.">
--- a/mobile/android/base/sync_strings.dtd
+++ b/mobile/android/base/sync_strings.dtd
@@ -87,8 +87,9 @@
 <!-- Send tab to device. -->
 
 <!ENTITY sync.title.send.tab.label "Cwal Dirica matidi Bot Jami tic">
 <!ENTITY sync.button.send.label "Cwali">
 <!ENTITY sync.button.set.up.sync.label 'Set up &syncBrand.shortName.label;'>
 <!ENTITY sync.title.redirect.to.set.up.sync.label "Kub &syncBrand.shortName.label; pi cwalo dirica matidi">
 <!ENTITY sync.text.redirect.to.set.up.sync.label "Kub &syncBrand.fullName.label; ikom jami tic mamegi w ek icwal dirica matidi ikom jamitic mukene">
 <!ENTITY sync.text.tab.sent.label "Otyeko dong cwalo dirica ni matidi!">
+<!ENTITY sync.text.tab.not.sent.label 'There was a problem sending your tab.'>
--- a/mobile/android/chrome/aboutAddons.dtd
+++ b/mobile/android/chrome/aboutAddons.dtd
@@ -1,12 +1,12 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY aboutAddons.title                      "Lalo-lamed ikome">
+<!ENTITY aboutAddons.title2                     "Lamed-ikome">
 <!ENTITY aboutAddons.header2                    "Lamed-ikome mamegi">
 <!ENTITY aboutAddons.options                    "Me ayera">
 
 <!ENTITY addonAction.enable                     "Mi tii">
 <!ENTITY addonAction.disable                    "Kijuko woko">
 <!ENTITY addonAction.uninstall                  "Pe I ket">
 <!ENTITY addonAction.undo                       "Dok cen">
--- a/mobile/android/chrome/aboutApps.dtd
+++ b/mobile/android/chrome/aboutApps.dtd
@@ -1,12 +1,13 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY aboutApps.title "Tic Mamegi">
+<!ENTITY aboutApps.title2                          "Purugram">
+<!ENTITY aboutApps.header                          "Tic Mamegi">
 <!-- LOCALIZATION NOTE (aboutApps.noApps.pre): include a trailing space as needed -->
 <!-- LOCALIZATION NOTE (aboutApps.noApps.middle): avoid leading/trailing spaces, this text is a link -->
 <!-- LOCALIZATION NOTE (aboutApps.noApps.post): include a starting space as needed -->
 
 <!ENTITY aboutApps.noApps.pre "Tic me web dong pe kiketo woko. Nong mukene ki ">
-<!ENTITY aboutApps.noApps.middle "Kagwoko tic">
+<!ENTITY aboutApps.noApps.middle2 "Mozilla Marketplace">
 <!ENTITY aboutApps.noApps.post ".">
new file mode 100644
--- /dev/null
+++ b/mobile/android/chrome/aboutFeedback.dtd
@@ -0,0 +1,70 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<!-- LOCALIZATION NOTE: The text in some of these strings is supposed to be
+     fun and playful. Please feel free to adjust the tone as works best in
+     your language and/or locale. More detailed notes below. -->
+
+
+<!ENTITY pageTitle                 "&brandShortName; Feedback">
+
+<!ENTITY intro.header              "Have a minute?">
+<!ENTITY intro.message             "Tell us what you think about &brandShortName; for Android so far.">
+<!ENTITY intro.happyLink           "I love it">
+<!ENTITY intro.sadLink             "I ran into some problems">
+<!ENTITY intro.ideaLink            "I have an idea">
+<!-- LOCALIZATION NOTE (support.pre): Include a trailing space as needed. -->
+<!-- LOCALIZATION NOTE (support.link): Avoid leading/trailing spaces, this text is a link. -->
+<!-- LOCALIZATION NOTE (support.post): Include a starting space as needed. -->
+
+<!ENTITY support.pre               "If you need help or have a problem with &brandShortName;, please visit ">
+<!ENTITY support.link              "&brandShortName; Support">
+<!ENTITY support.post              ".">
+
+<!ENTITY happy.header              "That's great to hear!">
+<!-- LOCALIZATION NOTE (happy.message): "share the love" — This feels purposely exaggerated in English,
+     but essentially it means that we want you to let others know how much you love Firefox. -->
+
+<!ENTITY happy.message             "Want to share the love by giving us a 5 star rating on Google Play?">
+<!-- LOCALIZATION NOTE (happy.finePrint): "feels great" — Another exaggeration where we're trying to
+     get people to rate us by playfully telling them there's a benefit in it for them as well. -->
+
+<!ENTITY happy.finePrint           "It takes less than a minute and feels great.">
+
+<!ENTITY happy.ratingLink          "Yes, go to Google Play">
+<!ENTITY happy.maybeLater          "Maybe Later">
+<!ENTITY happy.noThanks            "No thanks">
+
+<!ENTITY sad.message               "We're sorry that you had some problems with &brandShortName;. Please tell us what happened so that we can fix it.">
+<!ENTITY sad.placeholder           "Enter your feedback here">
+<!ENTITY sad.lastSite              "Last visited site (optional)">
+<!-- LOCALIZATION NOTE (sad.urlPlaceholder): Placeholder text that appears in "Last visited site" input box when there is no text. -->
+
+<!ENTITY sad.urlPlaceholder        "http://">
+<!ENTITY sad.thanksHeader          "Thanks for letting us know.">
+<!-- LOCALIZATION NOTE (sad.thanksMessageTop): "real people" — We're stating that an actual human will look at the feedback
+     and that it doesn't just go to some automated system that looks for keywords, or something like that. -->
+
+<!ENTITY sad.thanksMessageTop      "We're always working to make &brandShortName; better. Rest assured that real people will look at your feedback and do their very best to resolve your issue.">
+<!-- LOCALIZATION NOTE (sad.thanksMessageBottom): We're suggesting that there will be consequences for the people working
+     on Firefox if they don't resolve the user's problem, like "or if they don't fix it, we'll fire them." If this doesn't
+     work in your language, you can change it to something like "no matter what" or just remove it entirely. -->
+
+<!ENTITY sad.thanksMessageBottom   "Or else.">
+<!-- LOCALIZATION NOTE (idea.message): In English, "please share your thoughts" could mean that we're asking the user to
+     tell us any thoughts or ideas they have about anything, so we're jokingly telling them not to use the space below
+     to tell us anything they're thinking about. -->
+
+<!ENTITY idea.message              "We love hearing your ideas! Please share your thoughts below. (Just the ones about &brandShortName;, please.)">
+<!ENTITY idea.placeholder          "Enter your idea here">
+<!ENTITY idea.thanksHeader         "Apwoyo!">
+
+<!ENTITY idea.thanksMessageTop     "We appreciate you taking the time to share your thoughts. We're always working to make &brandShortName; better and contributions like yours can lead to great things.">
+<!-- LOCALIZATION NOTE (idea.thanksMessageBottom): "high five" — This is a celebratory or congratulatory gesture.
+     It could also be a handshake, a pat on the back, a thumbs up or something similar. The idea is that it's
+     something physical, which is why they can't see it.-->
+
+<!ENTITY idea.thanksMessageBottom  "You can't see it, but we're giving you a high five right now.">
+
+<!ENTITY feedback.privacy          "For your privacy, please don't include any personally identifiable information in your feedback.">
+<!ENTITY feedback.send             "Send Feedback">
--- a/mobile/android/chrome/aboutReader.properties
+++ b/mobile/android/chrome/aboutReader.properties
@@ -6,8 +6,10 @@ aboutReader.loading=Keto...
 aboutReader.loadError=Okwero keto woko cik akwana ki pot buk
 
 aboutReader.textTitle=Coc
 aboutReader.marginTitle=Margins
 
 aboutReader.colorSchemeLight=Light
 aboutReader.colorSchemeDark=Ocido
 aboutReader.colorSchemeSepia=Sepia
+
+aboutReader.toolbarTip=Tap the screen to show reader options
--- a/mobile/android/chrome/browser.properties
+++ b/mobile/android/chrome/browser.properties
@@ -204,26 +204,32 @@ intl.charsetmenu.browser.static=iso-8859
 appMenu.more=Mukene
 
 # Text Selection
 selectionHelper.textCopied=Kiloko coc i bao me coc
 
 # Context menu
 contextmenu.openInNewTab=Yab kakube i Lanyik manyen
 contextmenu.share=Share
+contextmenu.copyLink=Lok Kakube
 contextmenu.shareLink=Nywak Kakube
 contextmenu.bookmarkLink=Ket alama me Kakube
+contextmenu.copyEmailAddress=Lok Kanonge me Email
+contextmenu.shareEmailAddress=Share Email Address
+contextmenu.copyPhoneNumber=Lok Namba me Cim
+contextmenu.sharePhoneNumber=Share Phone Number
 contextmenu.changeInputMethod=Yer Yore me Tic
 contextmenu.fullScreen=Wang Komputa Weng
 contextmenu.shareImage=Share Image
 contextmenu.saveImage=Gwok Cal
 contextmenu.addSearchEngine=Med Keno me Yeny
 
 contextmenu.copy=Lok
 contextmenu.copyAll=Lok Weng
+contextmenu.selectWord=Select Word
 contextmenu.selectAll=Yer Weng
 contextmenu.paste=Daci
 
 # Select UI
 selectHelper.closeMultipleSelectDialog=Otum
 
 # Web Console API
 stacktrace.anonymousFunction=<anonymous>
@@ -233,16 +239,22 @@ timer.start=%S: cawa ocake woko
 # LOCALIZATION NOTE (timer.end):
 # This string is used to display the result of the console.timeEnd() call.
 # %1$S=name of timer, %2$S=number of milliseconds
 timer.end=%1$S: %2$Sms
 
 # Webapps
 webapps.installTitle=Ket Purugram me kompiuta
 webapps.alertSuccess=Successfully installed
+# Shown when there is a generic problem installing an app
+webapps.installError=Error installing application
+# Shown when there is something wrong with an apps manifest
+webapps.manifestInstallError=Invalid application manifest
+# Shown when a network error prevented installing an app
+webapps.networkInstallError=Could not download manifest
 
 # Click to play plugins
 clickToPlayPlugins.message1=%S tye ki rwak ie tye ki jami manonge iye. Onyo ce imito tuku ne?
 clickToPlayPlugins.yes=Eyo
 clickToPlayPlugins.no=Ku//Pe
 # LOCALIZATION NOTE (clickToPlayPlugins.dontAskAgain): This label appears next to a
 # checkbox to indicate whether or not the user wants to make a permanent decision.
 clickToPlayPlugins.dontAskAgain=Don't ask again for this site
@@ -263,10 +275,13 @@ masterPassword.incorrect=I cwil me donyo
 # dialog that prompts the user to allow the incoming connection.
 remoteIncomingPromptTitle=Kub mabino Ie
 # LOCALIZATION NOTE (remoteIncomingPromptMessage): The message displayed on the
 # dialog that prompts the user to allow the incoming connection.
 remoteIncomingPromptMessage=Kwac mogo mabino ki ie pi yeyi nongo gin mabalo kubo. lapok tic romo teri i ki tenge pi gwoko layeny mamegi maber?
 remoteIncomingPromptDisable=Kijuko woko
 
 # Helper apps
+helperapps.open=Open
+helperapps.ignore=Ignore
+helperapps.dontAskAgain=Don't ask again for this site
 helperapps.openWithApp2=Open With %S App
 helperapps.openWithList2=Open With an App
--- a/security/manager/chrome/pippki/deviceManager.dtd
+++ b/security/manager/chrome/pippki/deviceManager.dtd
@@ -1,13 +1,17 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY devmgr.title                           "Lalo Nyonyo">
+<!-- LOCALIZATION NOTE (devmgr.style): This is CSS style for Device Manager
+     window size. Don't translate "width" nor "height". Adjust the numbers
+     to make window contents fit. -->
+<!ENTITY devmgr.style                           "width: 52em; height: 32em;">
 
 <!ENTITY devmgr.devlist.label                   "Dul me Gwoko kuc ki Nyonyo">
 <!ENTITY devmgr.details.title                   "Lok kore kikore">
 <!ENTITY devmgr.details.title2                  "Wel">
 <!ENTITY devmgr.status.label                    "Kite">
 <!ENTITY devmgr.version.label                   "Cik">
 
 <!ENTITY devmgr.button.changeslotname.label     "Lok Nying Bur">
--- a/toolkit/chrome/global-platform/mac/platformKeys.properties
+++ b/toolkit/chrome/global-platform/mac/platformKeys.properties
@@ -7,16 +7,19 @@
 #these are used in XP menus to show keyboard shortcuts
 
 #the shift key - open up arrow symbol (ctrl-e)
 VK_SHIFT=⇧
 
 #the command key - clover leaf symbol (ctrl-q)
 VK_META=⌘
 
+#the win key - never generated by native key event
+VK_WIN=win
+
 #the option/alt key - splitting tracks symbol (ctrl-g)
 VK_ALT=⌥
 
 #the control key. hat symbol (ctrl-f)
 VK_CONTROL=⌃
 
 #the separator character used between modifiers (none on Mac OS)
 MODIFIER_SEPARATOR=
--- a/toolkit/chrome/global-platform/unix/platformKeys.properties
+++ b/toolkit/chrome/global-platform/unix/platformKeys.properties
@@ -7,16 +7,19 @@
 #these are used in XP menus to show keyboard shortcuts
 
 #the shift key
 VK_SHIFT=Kobi
 
 #the command key
 VK_META=Meta
 
+#the win key (Super key and Hyper keys are mapped to DOM Win key)
+VK_WIN=Win
+
 #the alt key
 VK_ALT=Alt
 
 #the control key
 VK_CONTROL=Ctrl
 
 #the separator character used between modifiers 
 MODIFIER_SEPARATOR=+
--- a/toolkit/chrome/global-platform/win/platformKeys.properties
+++ b/toolkit/chrome/global-platform/win/platformKeys.properties
@@ -7,16 +7,19 @@
 #these are used in XP menus to show keyboard shortcuts
 
 #the shift key
 VK_SHIFT=Kobi
 
 #the command key
 VK_META=Meta
 
+#the win key
+VK_WIN=Win
+
 #the alt key
 VK_ALT=Alt
 
 #the control key
 VK_CONTROL=Ctrl
 
 #the separator character used between modifiers 
 MODIFIER_SEPARATOR=+
--- a/toolkit/chrome/global/notification.dtd
+++ b/toolkit/chrome/global/notification.dtd
@@ -1,7 +1,9 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY closeNotification.tooltip "lor kwena man woko">
 
 <!ENTITY closeNotificationItem.label "Pe kombedi">
+
+<!ENTITY checkForUpdates "Rot pi Ngec…">
--- a/toolkit/chrome/mozapps/plugins/plugins.dtd
+++ b/toolkit/chrome/mozapps/plugins/plugins.dtd
@@ -28,18 +28,16 @@
 <!ENTITY unsupportedPlatform.learnMore                       "Nong ngec madwong…">
 <!-- LOCALIZATION NOTE (unsupportedPlatform.post): Mobile only. Include text here if needed for your locale. -->
 <!ENTITY unsupportedPlatform.post                            "">
 
 <!ENTITY missingPlugin                                       "Gin arwaka mite me yaro gin manonge iye kamaleng.">
 <!-- LOCALIZATION NOTE (tapToPlayPlugin): Mobile (used for touch interfaces) only has one type of plugin possible. -->
 <!ENTITY tapToPlayPlugin                                     "Gwet kany me mino gin arwaka cak tic.">
 <!ENTITY clickToPlayPlugin                                   "Click here to activate plugin.">
-<!ENTITY clickToPlayPluginVulnerableUpdateAvailable          "Dii kany wek iket rwak iyie ma kwiri.">
-<!ENTITY clickToPlayPluginVulnerableNoUpdate                 "Dii kany wek iket purugram makwiri (ngec mukene peke).">
 <!ENTITY checkForUpdates                                     "Rot pi Ngec…">
 <!ENTITY disabledPlugin                                      "Gin arwaka ma eni ni kikwanyo woko.">
 <!ENTITY blockedPlugin.label                                 "Gin arwaka ma eni ni ki gengo woko pi konyi gwoko.">
 
 <!ENTITY installPlugin                                       "Ket gin arwaka…">
 <!ENTITY managePlugins                                       "Loo gin arwaka…">
 <!-- LOCALIZATION NOTE (reloadPlugin.pre): include a trailing space as needed -->
 <!-- LOCALIZATION NOTE (reloadPlugin.middle): avoid leading/trailing spaces, this text is a link -->