New and obsolete strings
authorEduardo Trápani <eduardo@esperanto.org.uy>
Wed, 25 Jan 2012 12:30:25 -0200
changeset 285 f31583fc5bfd60770dcf2aeb8bd2cd4d0c609c26
parent 284 b1f31dd65de13c54b0d525ccc7be65319c738536
child 286 0086cf2e914f175de4353cb092e13128cd6a00f9
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:46:40 +0000
New and obsolete strings
browser/chrome/browser/aboutDialog.dtd
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/devtools/gcli.properties
browser/chrome/browser/devtools/scratchpad.properties
browser/chrome/browser/devtools/styleeditor.dtd
browser/chrome/browser/devtools/styleeditor.properties
browser/chrome/browser/devtools/styleinspector.properties
browser/chrome/browser/devtools/tilt.properties
browser/chrome/browser/devtools/webconsole.properties
browser/chrome/browser/migration/migration.dtd
browser/chrome/browser/migration/migration.properties
browser/chrome/browser/places/places.properties
browser/chrome/browser/preferences/advanced.dtd
browser/chrome/browser/preferences/preferences.properties
--- a/browser/chrome/browser/aboutDialog.dtd
+++ b/browser/chrome/browser/aboutDialog.dtd
@@ -1,17 +1,31 @@
 <!ENTITY aboutDialog.title          "Pri &brandFullName;">
 
+<!-- LOCALIZATION NOTE (warningDesc.version): This is a warning about the experimental nature of Nightly and Aurora builds. It is only shown in those versions. -->
+<!ENTITY warningDesc.version        "&brandShortName; estas prova version kaj povas esti nestabila.">
+<!-- LOCALIZATION NOTE (warningDesc.telemetry): This is a notification that Nightly/Aurora builds automatically send Telemetry data back to Mozilla. It is only shown in those versions. "It" refers to brandShortName. -->
+<!ENTITY warningDesc.telemetry      "Ĝi aŭtomate sendas testajn informojn reen al &vendorShortName; por helpi plibonigi &brandShortName;.">
+
+<!-- LOCALIZATION NOTE (community.exp.*) This paragraph is shown in "experimental" builds, i.e. Nightly and Aurora builds, instead of the other "community.*" strings below. -->
+<!ENTITY community.exp.start        "">
+<!-- LOCALIZATION NOTE (community.exp.mozillaLink): This is a link title that links to http://www.mozilla.org/. -->
+<!ENTITY community.exp.mozillaLink  "&vendorShortName;">
+<!ENTITY community.exp.middle       " estas ">
+<!-- LOCALIZATION NOTE (community.exp.creditslink): This is a link title that links to about:credits. -->
+<!ENTITY community.exp.creditsLink  "tutmonda komunumo">
+<!ENTITY community.exp.end          " kiu kunlaboras por konservi la Teksaĵon malfermita, publika kaj alirebla por ĉiuj.">
+
 <!ENTITY community.start2           "&brandShortName; estas projektita de ">
 <!-- LOCALIZATION NOTE (community.mozillaLink): This is a link title that links to http://www.mozilla.org/. -->
 <!ENTITY community.mozillaLink      "&vendorShortName;">
 <!ENTITY community.middle2          ", a ">
 <!-- LOCALIZATION NOTE (community.creditsLink): This is a link title that links to about:credits. -->
 <!ENTITY community.creditsLink      "tutmonda komunumo">
-<!ENTITY community.end2             " kiu kunlaboras por igi la Interreton pli bona. Ni kredas ke la Interreto devus esti malfermita, publika kaj alirebla por ĉiuj, sen limigoj.">
+<!ENTITY community.end3             " kiu kunlaboras por konservi la Teksaĵon malfermita, publika kaj alirebla por ĉiuj.">
 
 <!ENTITY contribute.start           "Ĉu tio aspektas interese? ">
 <!-- LOCALIZATION NOTE (contribute.getInvolvedLink): This is a link title that links to http://www.mozilla.org/contribute/. -->
 <!ENTITY contribute.getInvolvedLink "Partoprenu do!">
 <!ENTITY contribute.end             "">
 
 <!-- LOCALIZATION NOTE (bottomLinks.license): This is a link title that links to about:license. -->
 <!ENTITY bottomLinks.license        "Permesila informo">
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -212,19 +212,28 @@ can reach it easily. -->
 <!ENTITY scratchpad.accesskey         "r">
 <!ENTITY scratchpad.keycode           "VK_F4">
 <!ENTITY scratchpad.keytext           "F4">
 
 <!ENTITY inspectPanelTitle.label        "HTML">
 <!ENTITY inspectButton.label            "Inspekti">
 <!ENTITY inspectButton.accesskey        "I">
 <!ENTITY inspectCloseButton.tooltiptext "Fermi inspektilon">
+<!ENTITY inspect3DButton.label        "3D">
+<!ENTITY inspect3DButton.accesskey    "M">
 <!ENTITY inspectStyleButton.label     "Stilo">
 <!ENTITY inspectStyleButton.accesskey "S">
 
+<!-- LOCALIZATION NOTE (styleeditor.label): This menu item label appears
+  -  in the Tools menu. -->
+<!ENTITY styleeditor.label            "Redaktado de stiloj">
+<!ENTITY styleeditor.accesskey        "i">
+<!ENTITY styleeditor.keycode          "VK_F7">
+<!ENTITY styleeditor.keytext          "F7">
+
 <!ENTITY getMoreDevtoolsCmd.label        "Akiri pli da iloj">
 <!ENTITY getMoreDevtoolsCmd.accesskey    "A">
 
 <!ENTITY fileMenu.label         "Dosiero"> 
 <!ENTITY fileMenu.accesskey       "o">
 <!ENTITY newNavigatorCmd.label        "Nova fenestro">
 <!ENTITY newNavigatorCmd.key        "N">
 <!ENTITY newNavigatorCmd.accesskey      "N">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -243,24 +243,23 @@ puAlertTitle=%S ĝisdatigita
 puAlertText=Alklaku ĉi tie por vidi detalojn
 
 # Geolocation UI
 
 # LOCALIZATION NOTE (geolocation.shareLocation geolocation.dontShareLocation geolocation.alwaysShare geolocation.neverShare): 
 #If you're having trouble with the word Share, please use Allow and Block in your language.
 geolocation.shareLocation=Diskonigi lokon
 geolocation.shareLocation.accesskey=D
-geolocation.dontShareLocation=Ne diskonigi
-geolocation.dontShareLocation.accesskey=o
-geolocation.alwaysShare=Ĉiam kunhavigi
-geolocation.alwaysShare.accesskey=A
-geolocation.neverShare=Neniam kunhavigi
-geolocation.neverShare.accesskey=N
-geolocation.siteWantsToKnow=%S volas scii kie vi estas.
-geolocation.fileWantsToKnow=La dosiero %S volas koni vian lokon.
+geolocation.neverShareLocation=Neniam diskonigi lokon
+geolocation.neverShareLocation.accesskey=o
+geolocation.alwaysShareLocation=Ĉiam diskonigi lokon
+geolocation.alwaysShareLocation.accesskey=A
+geolocation.shareWithSite=Ĉu vi ŝatus diskonigi vian lokon al %S?
+geolocation.shareWithFile=Ĉu vi ŝatus diskonigi vian lokon al la dosiero %S?
+
 # LOCALIZATION NOTE (geolocation.learnMore): Use the unicode ellipsis char, \u2026,
 # or use "..." if \u2026 doesn't suit traditions in your locale.
 geolocation.learnMore=Plia informo…
 
 # 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
--- a/browser/chrome/browser/devtools/gcli.properties
+++ b/browser/chrome/browser/devtools/gcli.properties
@@ -89,8 +89,55 @@ nodeParseSyntax=Eraro de sintakso en la serĉado de CSS
 # error message is displayed.
 nodeParseMultiple=Tro multe da kongruaĵoj (%S)
 
 # LOCALIZATION NOTE (nodeParseNone): When the command line is expecting a CSS
 # string that matches a single node, but no nodes match, this error message is
 # displayed.
 nodeParseNone=Nenio kongruas
 
+# LOCALIZATION NOTE (helpDesc): A very short description of the 'help'
+# 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 helpManual for a
+# fuller description of what it does.
+helpDesc=Ricevi helpon pri disponeblaj ordonoj
+
+# LOCALIZATION NOTE (helpManual): A fuller description of the 'help' command.
+# Displayed when the user asks for help on what it does.
+helpManual=Provizi helpo pri specifa ordono (se oni provizas tekston por serĉi kaj ekzakta kongruo estas trovita) aŭ pri la disponeblaj ordonoj (se oni ne provizas tekston por serĉi aŭ se ekzakta kongruo ne estas trovita).
+
+# LOCALIZATION NOTE (helpSearchDesc): A very short description of the 'search'
+# parameter to the 'help' command. See helpSearchManual for a fuller
+# description of what it does. This string is designed to be shown in a dialog
+# with restricted space, which is why it should be as short as possible.
+helpSearchDesc=Serĉi tekston
+
+# LOCALIZATION NOTE (helpSearchManual): A fuller description of the 'search'
+# parameter to the 'help' command. Displayed when the user asks for help on
+# what it does.
+helpSearchManual=La teksto estas uzata por redukti la liston de ordonoj montrataj al la uzanto.  Iu parto de la teksto povas kongrui.  Regulaj esprimoj ne estas subtenataj.
+
+# LOCALIZATION NOTE (helpManSynopsis): A heading shown at the top of a help
+# page for a command in the console It labels a summary of the parameters to
+# the command
+helpManSynopsis=Resumo
+
+# LOCALIZATION NOTE (helpManDescription): A heading shown in a help page for a
+# command in the console. This heading precedes the top level description.
+helpManDescription=Priskribo
+
+# LOCALIZATION NOTE (helpManParameters): A heading shown above the parameters
+# in a help page for a command in the console.
+helpManParameters=Parametro
+
+# LOCALIZATION NOTE (helpManNone): Some text shown under the parameters
+# heading in a help page for a command which has no parameters.
+helpManNone=Neniu
+
+# LOCALIZATION NOTE (introHeader): The heading displayed at the top of the
+# output for the help command
+introHeader=Bonvenon al la iloj de Firefox por disvolvantoj
+
+# LOCALIZATION NOTE (introBody): The text displayed at the top of the output
+# for the help command, just before the list of commands. This text is wrapped
+# inside a link to a localized MDN article
+introBody=Por pli da informo vidu MDN.
+
--- a/browser/chrome/browser/devtools/scratchpad.properties
+++ b/browser/chrome/browser/devtools/scratchpad.properties
@@ -24,16 +24,24 @@ openFile.failed=Ne eblis legi la dosiero
 # LOCALIZATION NOTE  (saveFileAs): This is the file picker title, when you save
 # a file in Scratchpad.
 saveFileAs=Konservi dosieron kiel
 
 # LOCALIZATION NOTE  (saveFile.failed): This is the message displayed when file
 # save fails.
 saveFile.failed=Malsukcesa konservado de dosiero.
 
+# LOCALIZATION NOTE  (confirmClose): This is message in the prompt dialog when
+# you try to close a scratchpad with unsaved changes.
+confirmClose=Ĉu vi ŝatus konservi la ŝanĝojn vi faris en tiu ĉi malneta redaktilo?
+
+# LOCALIZATION NOTE  (confirmClose.title): This is title of the prompt dialog when
+# you try to close a scratchpad with unsaved changes.
+confirmClose.title=Nekonservitaj ŝanĝoj
+
 # 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 * Tio ĉi estas malneta redaktilo por JavaScript.n *n * Tajpu ion en JavaScript, poste alklaku per la alia butono aŭ elektu el la menuo Ruli:n * 1. Ruli por taksi la elektitan tekston,n * 2. Inspekti por malfonigi inspektilon de objekto sur la rezulto, aŭ,n * 3. Montri por enmeti la rezulton en komenton post la elektita teksto.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=Tiu ĉi malneta redaktilo rulas en la kunteksto de retesplorilo.
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/styleeditor.dtd
@@ -0,0 +1,62 @@
+<!-- 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               "Redaktado de stiloj">
+
+<!ENTITY newButton.label            "Nova">
+<!ENTITY newButton.tooltip          "Krei kaj aldoni novan stilfolion al la dokumento">
+<!ENTITY newButton.accesskey        "N">
+<!ENTITY newButton.commandkey       "n">
+
+<!ENTITY importButton.label         "Importi…">
+<!ENTITY importButton.tooltip       "Importi kaj aldoni ekzistantan stilfolion al la dokumento">
+<!ENTITY importButton.accesskey     "I">
+<!ENTITY importButton.commandkey    "i">
+
+<!ENTITY searchInput.tooltip        "Filtri stilfoliojn per nomo">
+<!ENTITY searchInput.placeholder    "Serĉi stilfolion">
+
+<!-- LOCALIZATION NOTE  (searchNoResults): This is shown when searching a term
+     that is not found in any stylesheet or stylesheet name. -->
+<!ENTITY searchNoResults.label      "Neniu kongrua stilfolio estis trovita.">
+
+<!-- LOCALIZATION NOTE  (searchClearButton): This button clears the search input
+     box and is visible only when a search term has been typed. -->
+<!ENTITY searchClearButton.label    "Viŝi">
+
+<!ENTITY visibilityToggle.tooltip   "Ŝalti/malŝalti la videblon de stilfolio">
+<!ENTITY visibilityToggle.accesskey "V">
+
+<!ENTITY saveButton.label           "Konservi">
+<!ENTITY saveButton.tooltip         "Konservi tiun ĉi stilfolion en dosiero">
+<!ENTITY saveButton.accesskey       "K">
+<!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               "kun aplikregiono.">
+
+<!ENTITY editorTextbox.placeholder  "Tajpu CSS ĉi tie.">
+
+<!-- LOCALICATION NOTE  (noStyleSheet.label): This is shown when a page has no
+     stylesheet. -->
+<!ENTITY noStyleSheet.label         "Tiu ĉi paĝo ne havas stilfolion.">
+
+<!-- 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  "Eble vi ŝatus ">
+<!-- LOCALICATION NOTE  (noStyleSheet-tip-action.label): This is text for the
+     link that triggers creation of a new stylesheet. -->
+<!ENTITY noStyleSheet-tip-action.label "aldoni novan stilfolion">
+<!-- LOCALICATION NOTE  (noStyleSheet-tip-end.label): End of the tip sentence -->
+<!ENTITY noStyleSheet-tip-end.label    "?">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/styleeditor.properties
@@ -0,0 +1,64 @@
+# LOCALIZATION NOTE These strings are used inside the Style Editor.
+# LOCALIZATION NOTE The correct localization of this file might be to keep it
+# in English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best documentation
+# on web development on the web.
+
+# LOCALIZATION NOTE  (chromeWindowTitle): This is the title of the Style Editor
+# 'chrome' window. That is, the main window with the stylesheets list.
+# The argument is either the content document's title or its href if no title
+# is available.
+chromeWindowTitle=Redaktado de stiloj [%S]
+
+# LOCALIZATION NOTE  (inlineStyleSheet): This is the name used for an style sheet
+# that is declared inline in the <style> element. Shown in the stylesheets list.
+# the argument is the index (order) of the containing <style> element in the
+# document.
+inlineStyleSheet=<enteksta stilfolio #%S>
+
+# LOCALIZATION NOTE  (newStyleSheet): This is the default name for a new
+# user-created style sheet.
+newStyleSheet=Nova stilfolio #%S
+
+# LOCALIZATION NOTE  (ruleCount.label): Semi-colon 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 regulo.;#1 reguloj.
+
+# LOCALIZATION NOTE  (error-load.label): This is shown when loading fails.
+error-load=La stilfolio ne povis esti ŝargita.
+
+# LOCALIZATION NOTE  (error-save.label): This is shown when saving fails.
+error-save=La stilfolio ne povis esti konservita.
+
+# LOCALIZATION NOTE  (importStyleSheet.title): This is the file picker title,
+# when you import a style sheet into the Style Editor.
+importStyleSheet.title=Importi stilfolion
+
+# LOCALIZATION NOTE  (importStyleSheet.title): This is the *.css filter title
+importStyleSheet.filter=CSS dosieroj
+
+# LOCALIZATION NOTE  (saveStyleSheet.title): This is the file picker title,
+# when you save a style sheet from the Style Editor.
+saveStyleSheet.title=Konservi stilfolion
+
+# LOCALIZATION NOTE  (saveStyleSheet.title): This is the *.css filter title
+saveStyleSheet.filter=CSS dosieroj
+
+# 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
+
--- a/browser/chrome/browser/devtools/styleinspector.properties
+++ b/browser/chrome/browser/devtools/styleinspector.properties
@@ -1,9 +1,15 @@
 # LOCALIZATION NOTE These strings are used inside the Style Inspector.
+#
+# The correct localization of this file might be to keep it in
+# English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best
+# documentation on web development on the web.
 
 # LOCALIZATION NOTE (panelTitle): This is the panel title
 panelTitle=Inspektilo de stiloj
 
 # LOCALIZATION NOTE (rule.status): For each style property the panel shows
 # the rules which hold that specific property. For every rule, the rule status
 # is also displayed: a rule can be the best match, a match, a parent match, or a
 # rule did not match the element the user has highlighted.
@@ -20,26 +26,16 @@ rule.sourceInline=enteksta
 rule.sourceElement=elemento
 
 # 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=Heredita el %S (%S)
 
-# LOCALIZATION NOTE (group): Style properties are displayed in categories and
-# these are the category names.
-group.Text_Fonts_and_Color=Teksto, tiparoj kaj koloroj
-group.Background=Fono
-group.Dimensions=Dimensioj
-group.Positioning_and_Page_Flow=Pozicio kaj fluo de paĝo
-group.Borders=Randoj
-group.Lists=Listoj
-group.Effects_and_Other=Efektoj kaj ceteraĵoj
-
 # LOCALIZATION NOTE (style.highlighter.button): These strings are used inside
 # sidebar of the Highlighter for the style inspector button
 style.highlighter.button.label1=Atributoj
 style.highlighter.accesskey1=A
 style.highlighter.button.tooltip=Inspekti stilojn de elementoj
 
 # LOCALIZATION NOTE (helpLinkTitle): For each style property
 # the user can hover it and get a help link button which allows one to
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/tilt.properties
@@ -0,0 +1,45 @@
+# LOCALIZATION NOTE These strings are used inside the Tilt Inspector
+# which is available from the Web Developer sub-menu -> 'Tilt'.
+#
+# The correct localization of this file might be to keep it in
+# English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best
+# documentation on web development on the web.
+
+# LOCALIZATION NOTE (initTilt.error): Tilt requires WebGL capabilities, which
+# are not available on every hardware. This message is displayed as an modal
+# popup window when initialization fails because of unsupported hardware.
+initTilt.error = Could not initialize Tilt, please check the\ntroubleshooting information available at http://get.webgl.org/troubleshooting
+
+# LOCALIZATION NOTE (initWebGL.error): Tilt requires WebGL capabilities, which
+# are not available on every hardware. This message is displayed in the console
+# when initialization fails because of unsupported hardware.
+initWebGL.error = Could not initialize the WebGL context, your hardware or drivers may not support it.
+
+# LOCALIZATION NOTE (linkProgram.error): This error happens when the WebGL
+# context can't link two compiled shader programs together. It is displayed in
+# the Error Console.
+linkProgram.error = Could not initialize shader program: %S
+
+# LOCALIZATION NOTE (compileShader.source.error): This error is caused when the
+# source (uri or path) of a shader is not the expected one. It is displayed in
+# the Error Console.
+compileShader.source.error = Bad shader source type (expected String).
+
+# LOCALIATION NOTE (compileShader.type.error): There are two types of shader
+# programs - vertex and fragment. At a shader initialization, if none of these
+# two types is specified, this compile-time error is shown. It is displayed in
+# the Error Console.
+compileShader.type.error = Wrong shader type specified for: %S
+
+# LOCALIZATION NOTE (compileShader.compile.error): If the shader source and
+# type are correctly specified, there may be syntax errors in the shader code.
+# If this is the case, this compile-time error is shown. It is displayed in
+# the Error Console.
+compileShader.compile.error = Shader compile status:\n%S
+
+# LOCALIZATION NOTE (compileShader.source.error): This error is caused when the
+# source (canvas or image) of a texture is not as expected. It is displayed in
+# the Error Console.
+initTexture.source.error = Bad texture source type (expected Image).
--- a/browser/chrome/browser/devtools/webconsole.properties
+++ b/browser/chrome/browser/devtools/webconsole.properties
@@ -13,29 +13,27 @@ categoryConsole=Konzolo:
 btnMutation=Mutacio de DOM
 tipMutation=Ŝalti/malŝalti registradon de eventoj pri mutacio de DOM
 btnPageNet=Reto
 tipPageNet=Registri retajn alirojn
 btnPageCSS=CSS
 tipPageCSS=Registri analizajn erarojn de CSS
 btnPageJS=JS
 tipPageJS=Registri esceptojn de JavaScript
-# LOCALIZATION NOTE (btnPageWebDeveloper):
+# LOCALIZATION NOTE (btnPageLogging):
 #
-# This is used as the text of the "Web Developer" button on the toolbar. It
+# 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(). You
-# may wish to localize this as "Page" if that is clearer in your locale. See
-# bug 601667 for more information.
-btnPageWebDeveloper=Disvolvanto de TTT
-# LOCALIZATION NOTE (tipPageWebDeveloper):
+# debugging purposes, using calls such console.log() and console.error().
+btnPageLogging=Registrado
+# LOCALIZATION NOTE (tipPageLogging):
 #
-# This is used as the text of the tool tip for the "Web Developer" button on
+# This is used as the text of the tool tip for the "Logging" button on
 # the toolbar.
-tipPageWebDeveloper=Registri mesaĝojn senditaj al la objekto konzolo
+tipPageLogging=Registri mesaĝojn senditajn al la objekto "konzolo"
 btnConsoleErrors=Eraroj
 tipConsoleErrors=Registri vokojn al console.error()
 btnConsoleInfo=Informo
 tipConsoleInfo=Registri vokojn al console.info()
 btnConsoleWarnings=Warnings
 tipConsoleWarnings=Log calls to console.warn()
 btnConsoleLog=Registro
 tipConsoleLog=Registri vokojn al console.log()
@@ -109,33 +107,17 @@ NetworkPanel.imageSizeDeltaDurationMS=%Sx%Spx, Δ%Sms
 # NetworkPanel. E.g. any kind of text is easy to display, but some audio or
 # 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=Ne eblas montri respondojn de tipo "%S"
 ConsoleAPIDisabled=The Web Console logging API (console.log, console.info, console.warn, console.error) has been disabled by a script on this page.
-
-# LOCALIZATION NOTE (inspectStyle.nullObjectPassed):
-# This message is returned when a null object is passed in to inspectstyle()
-inspectStyle.nullObjectPassed=Nula objekto
-
-# LOCALIZATION NOTE (inspectStyle.mustBeDomNode):
-# This message is returned when a non-DOM node is passed in to inspectstyle()
-inspectStyle.mustBeDomNode=La objekto devas esti valida nodo de DOM
-
-# LOCALIZATION NOTE (inspectStyle.nodeHasNoStyleProps):
-# This message is returned when an unstyleable object is passed in to inspectstyle()
-inspectStyle.nodeHasNoStyleProps=La objekto ne povas ricevi stilon
-
-# LOCALIZATION NOTE (inspectStyle.styleInspectorNotEnabled):
-# This message is returned when devtools.styleinspector.enabled is not set to
-# true
-inspectStyle.styleInspectorNotEnabled=La inspektilo de stiloj ne estas aktiva. Bonvolu difini la opcion devtools.styleinspector.enabled kiel vera en about:config, por povi uzi tiun ordonon.
+iel vera en about:config, por povi uzi tiun ordonon.
 
 # LOCALIZATION NOTE (webConsolePosition): The label shown for the menu which
 # allows the user to toggle between the Web Console positioning types.
 webConsolePosition=Pozicio
 
 # LOCALIZATION NOTE (webConsolePositionTooltip): The tooltip shown when the user
 # hovers the Position button in the Web Console toolbar.
 webConsolePositionTooltip=Loki la Konzolon de TTT super aŭ malsuper la dokumento
--- a/browser/chrome/browser/migration/migration.dtd
+++ b/browser/chrome/browser/migration/migration.dtd
@@ -4,22 +4,20 @@
 <!ENTITY importFrom.label               "Importi opciojn, legosignojn, historion, pasvortojn kaj aliajn datumojn el:">
 <!ENTITY importFromUnix.label           "Importi preferojn, legosignojn, historion, pasvortojn kaj aliajn datumojn el:">
 <!ENTITY importFromBookmarks.label      "Importi legosignojn el:">
 
 <!ENTITY importFromIE.label             "Microsoft Internet Explorer">
 <!ENTITY importFromIE.accesskey         "M">
 <!ENTITY importFromNothing.label        "Importi nenion">
 <!ENTITY importFromNothing.accesskey    "N">
-<!ENTITY importFromSeamonkey.label      "Netscape 6, 7 or Mozilla 1.x">
-<!ENTITY importFromSeamonkey.accesskey  "N">
-<!ENTITY importFromOpera.label          "Opera">
-<!ENTITY importFromOpera.accesskey      "O">
 <!ENTITY importFromSafari.label         "Safari">
 <!ENTITY importFromSafari.accesskey     "S">
+<!ENTITY importFromChrome.label         "Chrome">
+<!ENTITY importFromChrome.accesskey     "C">
 <!ENTITY importFromHTMLFile.label       "From an HTML File">
 <!ENTITY importFromHTMLFile.accesskey   "F">
 
 <!ENTITY noMigrationSources.label       "Neniu programo, enhavanta legosignojn, historion aŭ pasvortajn datumojn, estis trovita.">
 
 <!ENTITY importSource.title             "Importi agordojn kaj datumojn">
 <!ENTITY importItems.title              "Elementoj importotaj">
 <!ENTITY importItems.label              "Elekti elementojn importotajn:">
--- a/browser/chrome/browser/migration/migration.properties
+++ b/browser/chrome/browser/migration/migration.properties
@@ -1,54 +1,43 @@
 profileName_format=%S %S
 
 # Browser Specific
 sourceNameIE=Internet Explorer
-sourceNameSeamonkey=Netscape 6/7/Mozilla
-sourceNameOpera=Opera
 sourceNameSafari=Safari
+sourceNameChrome=Google Chrome
 
 importedBookmarksFolder=De %S
 importedSearchURLsFolder=Serĉado de kategoriaj vortoj (de %S)
 importedSearchURLsTitle=Serĉi en %S
 importedSearchUrlDesc=Tajpu "%S <serĉodemando>" en la retadresa strio por serĉi per %S.
 
-importedSeamonkeyBookmarksTitle=De Netscape 6/7/Mozilla
 importedSafariBookmarks=De Safari
-importedOperaHotlistTitle=De Opera
-importedOperaSearchUrls=Serĉado de kategoriaj vortoj (De Opera)
 
 # Import Sources
 1_ie=Interretaj opcioj
-1_opera=Preferoj
-1_seamonkey=Preferoj
 1_safari=Preferoj
+1_chrome=Preferoj
 
 2_ie=Kuketoj
-2_opera=Kuketoj
-2_seamonkey=Kuketoj
 2_safari=Kuketoj
+2_chrome=Kuketoj
 
 4_ie=Historio de retumado
-4_opera=Historio de retumado
-4_seamonkey=Historio de retumado
 4_safari=Historio de retumado
+4_chrome=Historio de retumado
 
 8_ie=Konservita historio de formularoj
-8_opera=Konservita historio de formularoj
-8_seamonkey=Konservita historio de formularoj
 8_safari=Konservita historio de formularoj
+8_chrome=Konservita historio de formularoj
 
 16_ie=Konservitaj pasvortoj
-16_opera=Konservitaj pasvortoj
-16_seamonkey=Konservitaj pasvortoj
 16_safari=Konservitaj pasvortoj
+16_chrome=Konservitaj pasvortoj
 
 32_ie=Plej ŝatataj
-32_opera=Legosignoj
-32_seamonkey=Legosignoj
 32_safari=Legosignoj
+32_chrome=Legosignoj
 
 64_ie=Aliaj datumoj
-64_opera=Aliaj datumoj
-64_seamonkey=Aliaj datumoj
 64_safari=Aliaj datumoj
+64_chrome=Aliaj datumoj
 
--- a/browser/chrome/browser/places/places.properties
+++ b/browser/chrome/browser/places/places.properties
@@ -54,18 +54,21 @@ tabs.openWarningPromptMeBranded=Averti m
 SelectImport=Importi dosieron de legosignoj
 EnterExport=Eksporti dosieron de legosignoj
 
 saveSearch.title=Konservi serĉadon
 saveSearch.inputLabel=Nomo:
 saveSearch.inputDefaultText=Nova serĉado
 
 detailsPane.noItems=Neniu elemento
-detailsPane.oneItem=Unu elemento
-detailsPane.multipleItems=%S elementoj
+# LOCALIZATION NOTE (detailsPane.itemsCountLabel): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 number of items
+# example: 111 items
+detailsPane.itemsCountLabel=Unu elemento;#1 elementoj
 
 mostVisitedTitle=Plej ofte vizititaj
 recentlyBookmarkedTitle=Ĵusaj legosignoj
 recentTagsTitle=Ĵusaj etikedoj
 
 OrganizerQueryHistory=Historio
 OrganizerQueryDownloads=Elŝutoj
 OrganizerQueryAllBookmarks=Ĉiuj legosignoj
--- a/browser/chrome/browser/preferences/advanced.dtd
+++ b/browser/chrome/browser/preferences/advanced.dtd
@@ -35,29 +35,33 @@
 <!ENTITY networkTab.label                "Reto">
 
 <!ENTITY connection.label                "Konektado">
 
 <!ENTITY connectionDesc.label            "Agordi la manieron kiel &brandShortName; konektiĝas al la reto">
 <!ENTITY connectionSettings.label        "Agordoj…">
 <!ENTITY connectionSettings.accesskey    "g">
 
-<!ENTITY offlineStorage.label            "Deponejo por malkonektitaĵoj">
+<!ENTITY httpCache.label                 "Teksaĵa enhavo en staplo">
+
+<!ENTITY offlineStorage2.label           "Deponejo por malkonektitaĵoj, de teksaĵa enhavo kaj de datumoj de uzanto">
 
 <!-- LOCALIZATION NOTE:
   The entities limitCacheSizeBefore.label and limitCacheSizeAfter.label appear on a single
   line in preferences as follows:
 
   &limitCacheSizeBefore.label [textbox for cache size in MB] &limitCacheSizeAfter.label;
 -->
 <!ENTITY limitCacheSizeBefore.label      "Limigi staplon al">
 <!ENTITY limitCacheSizeBefore.accesskey  "L">
 <!ENTITY limitCacheSizeAfter.label       "MO de spaco">
-<!ENTITY clearCacheNow.label             "Forviŝi nun">
+<!ENTITY clearCacheNow.label             "Viŝi nun">
 <!ENTITY clearCacheNow.accesskey         "F">
+<!ENTITY clearOfflineAppCacheNow.label   "Viŝi nun">
+<!ENTITY clearOfflineAppCacheNow.accesskey "N">
 <!ENTITY overrideSmartCacheSize.label    "Superregi la aŭtomatan administradon de staplo">
 <!ENTITY overrideSmartCacheSize.accesskey "O">
 
 <!ENTITY updateTab.label                 "Ĝisdatigi">
 
 <!ENTITY updateApp.label                 "Ĝisdatigoj de &brandShortName;:">
 <!ENTITY updateAuto.label                "Aŭtomate instali ĝisdatigojn (rekomendita: pli bona sekureco)">
 <!ENTITY updateAuto.accesskey            "A">
@@ -71,27 +75,24 @@
 
 <!ENTITY updateHistory.label             "Montri la historion de ĝisdatigoj">
 <!ENTITY updateHistory.accesskey         "M">
 
 <!ENTITY useService.label                "Uzi fonan servon por instali ĝisdatigojn">
 <!ENTITY useService.accesskey            "f">
 
 <!ENTITY updateOthers.label              "Aŭtomate ĝisdatigi:">
-<!ENTITY enableAddonsUpdate3.label       "Aldonaĵojn">
-<!ENTITY enableAddonsUpdate3.accesskey   "d">
 <!ENTITY enableSearchUpdate.label        "Serĉilojn">
 <!ENTITY enableSearchUpdate.accesskey    "S">
 
 <!ENTITY offlineNotify.label             "Diri al mi kiam retejo petas la konservado de datumojn por uzi malkonektite">
 <!ENTITY offlineNotify.accesskey         "D">
 <!ENTITY offlineNotifyExceptions.label   "Esceptoj…">
 <!ENTITY offlineNotifyExceptions.accesskey "s">
 
-<!ENTITY offlineAppsList.label           "La jenaj retejoj havas konservitajn datumojn por uzi malkonektite:">
 <!ENTITY offlineAppsList.height          "7em">
 <!ENTITY offlineAppsListRemove.label     "Forigi…">
 <!ENTITY offlineAppsListRemove.accesskey "F">
 <!ENTITY offlineAppRemove.confirm        "Forigi malkonektitaĵojn">
 
 <!ENTITY encryptionTab.label             "Ĉifrado">
 
 <!ENTITY protocols.label                 "Protokoloj">
--- a/browser/chrome/browser/preferences/preferences.properties
+++ b/browser/chrome/browser/preferences/preferences.properties
@@ -100,17 +100,24 @@ offlineAppRemoveConfirm=Forigi malkonektitaĵojn
 #   %1$S = size (in bytes or megabytes, ...)
 #   %2$S = unit of measure (bytes, KB, MB, ...)
 offlineAppUsage=%1$S %2$S
 
 offlinepermissionstext=La jenaj retejoj ne rajtas konservi datumojn por uzi malkonektite:
 offlinepermissionstitle=Malkonektitaĵoj
 
 ####Preferences::Advanced::Network
-#LOCALIZATION NOTE: The next string is for the disk usage of the http cache.
-#   e.g., "Your cache is currently using 200 MB"
+#LOCALIZATION NOTE: The next string is for the disk usage of the web content cache.
+#   e.g., "Your web content cache is currently using 200 MB"
 #   %1$S = size
 #   %2$S = unit (MB, KB, etc.)
-actualCacheSize=Via staplo nun uzas %1$S %2$S de diska spaco
+actualDiskCacheSize=Via staplo por teksaĵa enhavo uzas nuntempe %1$S %2$S de diska spaco
+
+####Preferences::Advanced::Network
+#LOCALIZATION NOTE: The next string is for the disk usage of the application cache.
+#   e.g., "Your application cache is currently using 200 MB"
+#   %1$S = size
+#   %2$S = unit (MB, KB, etc.)
+actualAppCacheSize=Via staplo por programoj uzas nuntempe %1$S %2$S de diska spaco
 
 syncUnlink.title=Ĉu vi volas malligi vian aparaton?
 syncUnlink.label=Tiu ĉi aparato ne plu estos asociita al via konto de spegulado. Viaj personaj datumoj restos netuŝitaj, kaj en tiu ĉi aparato kaj en via konto de spegulado.
 syncUnlinkConfirm.label=Malligi