Migrating l10n-central to aurora
authorMarcelo Poli <mpoli@lt24.zzn.com>
Wed, 09 Nov 2011 23:24:19 -0300
changeset 797 2ebb3c37099fd61b9d083d908005a0923fba0a34
parent 738 2a95a435157945e7d72dc064c3b91c43b31bbaeb
child 798 60e102d353046617fb1b36bb6657493b38984fd1
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:47:06 +0000
Migrating l10n-central to aurora
browser/chrome/browser/aboutHome.dtd
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/devtools/gcli.properties
browser/chrome/browser/devtools/gclicommands.properties
browser/chrome/browser/devtools/inspector.properties
browser/chrome/browser/devtools/scratchpad.dtd
browser/chrome/browser/devtools/scratchpad.dtd~
browser/chrome/browser/devtools/scratchpad.properties
browser/chrome/browser/devtools/styleinspector.dtd
browser/chrome/browser/devtools/styleinspector.dtd~
browser/chrome/browser/devtools/styleinspector.properties
browser/chrome/browser/devtools/webConsole.dtd
browser/chrome/browser/devtools/webconsole.properties
browser/chrome/browser/inspector.properties
browser/chrome/browser/preferences/advanced-scripts.dtd
browser/chrome/browser/preferences/advanced.dtd
browser/chrome/browser/preferences/sync.dtd
browser/chrome/browser/scratchpad.dtd
browser/chrome/browser/scratchpad.properties
browser/chrome/browser/styleinspector.dtd
browser/chrome/browser/styleinspector.properties
browser/chrome/browser/syncProgress.dtd
browser/chrome/browser/syncSetup.dtd
browser/chrome/overrides/appstrings.properties
browser/chrome/overrides/netError.dtd
browser/profile/bookmarks.inc
calendar/chrome/calendar/calendar.dtd
dom/chrome/appstrings.properties
dom/chrome/dom/dom.properties
dom/chrome/layout/htmlparser.properties
dom/chrome/netError.dtd
editor/ui/chrome/composer/editingOverlay.dtd
editor/ui/chrome/composer/editorOverlay.dtd
mail/chrome/messenger/addressbook/abMainWindow.dtd
mail/chrome/messenger/messenger.properties
mobile/chrome/aboutHome.dtd
mobile/chrome/overrides/appstrings.properties
mobile/chrome/overrides/netError.dtd
mobile/chrome/sync.dtd
security/manager/chrome/pipnss/pipnss.properties
services/sync/errors.properties
suite/chrome/common/contentAreaCommands.dtd
suite/chrome/common/pref/pref-advanced.dtd
suite/chrome/common/sync/syncGenericChange.properties
suite/chrome/common/sync/syncSetup.dtd
suite/chrome/mailnews/compose/messengercompose.dtd
suite/chrome/mailnews/mailKeysOverlay.dtd
suite/chrome/mailnews/messenger.dtd
suite/installer/mac/README.txt
suite/installer/unix/README
suite/installer/windows/README.txt
toolkit/chrome/global/headsUpDisplay.properties
toolkit/chrome/global/videocontrols.dtd
toolkit/chrome/global/webConsole.dtd
toolkit/chrome/mozapps/downloads/downloads.properties
toolkit/chrome/mozapps/extensions/extensions.properties
toolkit/chrome/mozapps/plugins/plugins.dtd
--- a/browser/chrome/browser/aboutHome.dtd
+++ b/browser/chrome/browser/aboutHome.dtd
@@ -14,8 +14,11 @@
      text in <a/> will be linked to the Firefox features page on mozilla.com
 -->
 <!ENTITY abouthome.defaultSnippet1.v1 "¡Gracias por elegir Firefox! Para sacar el mayor provecho de su navegador, conozca más sobre las <a>últimas características</a>.">
 <!-- LOCALIZATION NOTE (abouthome.defaultSnippet2.v1):
      text in <a/> will be linked to the featured add-ons on addons.mozilla.org
 -->
 <!ENTITY abouthome.defaultSnippet2.v1 "Es fácil personalizar su Firefox exactamente de la forma en que lo desee. <a>Hay miles de complementos para elegir</a>.">
 
+<!ENTITY abouthome.syncSetup.label   "Configurar Sync">
+<!ENTITY abouthome.pairDevice.label  "Asociar un dispositivo">
+
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -85,16 +85,17 @@ can reach it easily. -->
 
 <!ENTITY fullScreenMinimize.tooltip "Minimizar">
 <!ENTITY fullScreenRestore.tooltip "Restaurar">
 <!ENTITY fullScreenClose.tooltip "Cerrar">
 <!ENTITY fullScreenAutohide.label "Ocultar barras de herramientas">
 <!ENTITY fullScreenAutohide.accesskey "h">
 <!ENTITY fullScreenExit.label "Salir de pantalla completa">
 <!ENTITY fullScreenExit.accesskey "S">
+<!ENTITY domFullScreenWarning.label "Pulse ESC para salir de pantalla completa">
 
 <!ENTITY closeWindow.label "Cerrar ventana">
 <!ENTITY closeWindow.accesskey "C">
 
 <!ENTITY bookmarksMenu.label "Marcadores">
 <!ENTITY bookmarksMenu.accesskey "M">
 <!ENTITY bookmarkThisPageCmd.label "Marcar esta página">
 <!ENTITY bookmarkThisPageCmd.commandkey "d">
@@ -211,16 +212,19 @@ can reach it easily. -->
 <!ENTITY scratchpad.label             "Borrador">
 <!ENTITY scratchpad.accesskey         "B">
 <!ENTITY scratchpad.keycode           "VK_F4">
 <!ENTITY scratchpad.keytext           "F4">
 
 <!ENTITY inspectPanelTitle.label      "HTML">
 <!ENTITY inspectButton.label          "Inspeccionar">
 <!ENTITY inspectButton.accesskey      "I">
+<!ENTITY inspectCloseButton.tooltiptext "Cerrar Inspector">
+<!ENTITY inspectStyleButton.label     "Estilo">
+<!ENTITY inspectStyleButton.accesskey "s">
 
 <!ENTITY getMoreDevtoolsCmd.label        "Obtener más herramientas">
 <!ENTITY getMoreDevtoolsCmd.accesskey    "m">
 
 <!ENTITY fileMenu.label "Archivo">
 <!ENTITY fileMenu.accesskey "A">
 <!ENTITY newNavigatorCmd.label "Nueva ventana">
 <!ENTITY newNavigatorCmd.key "N">
@@ -429,17 +433,22 @@ can reach it easily. -->
 <!ENTITY mediaUnmute.label           "Unmute">
 <!ENTITY mediaUnmute.accesskey       "m">
 <!ENTITY mediaShowControls.label     "Mostrar controles">
 <!ENTITY mediaShowControls.accesskey "c">
 <!ENTITY mediaHideControls.label     "Ocultar controles">
 <!ENTITY mediaHideControls.accesskey "c">
 <!ENTITY videoFullScreen.label       "Pantalla completa">
 <!ENTITY videoFullScreen.accesskey   "n">
-
+<!ENTITY videoSaveImage.label        "Guardar captura como…">
+<!ENTITY videoSaveImage.accesskey    "G">
+<!ENTITY videoShowStats.label        "Mostrar estadísticas">
+<!ENTITY videoShowStats.accesskey    "t">
+<!ENTITY videoHideStats.label        "Ocultar estadisticas">
+<!ENTITY videoHideStats.accesskey    "t">
 
 <!-- LOCALIZATION NOTE :
 fullZoomEnlargeCmd.commandkey3, fullZoomReduceCmd.commandkey2 and
 fullZoomResetCmd.commandkey2 are alternative acceleration keys for zoom.
 If shift key is needed with your locale popular keyboard for them,
 you can use these alternative items. Otherwise, their values should be empty.  -->
 
 <!ENTITY fullZoomEnlargeCmd.label "Aumentar">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -106,17 +106,17 @@ blockedpluginsMessage.infoButton.label=Detalles…
 blockedpluginsMessage.infoButton.accesskey=D
 blockedpluginsMessage.searchButton.label=Actualizar plugins…
 blockedpluginsMessage.searchButton.accesskey=u
 crashedpluginsMessage.title=El plugin %S ha fallado.
 crashedpluginsMessage.reloadButton.label=Recargar la página
 crashedpluginsMessage.reloadButton.accesskey=R
 crashedpluginsMessage.submitButton.label=Enviar un informe de problemas
 crashedpluginsMessage.submitButton.accesskey=E
-crashedpluginsMessage.learnMore=Aprender más…
+crashedpluginsMessage.learnMore=Conocer más…
 carbonFailurePluginsMessage.message=Esta página solicita usar un plugin que solo puede ejecutarse en modo 32-bits
 carbonFailurePluginsMessage.restartButton.label=Reiniciar en modo 32-bits
 carbonFailurePluginsMessage.restartButton.accesskey=R
 
 # 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 -->
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/gcli.properties
@@ -0,0 +1,96 @@
+# LOCALIZATION NOTE These strings are used inside the Web Console
+# command line which is available from the Web Developer sub-menu
+# -> 'Web Console'.
+# The correct localization of this file might be to keep it in
+# English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best
+# documentation on web development on the web.
+
+# LOCALIZATION NOTE (canonDescNone): Short string used to describe any command
+# or command parameter when no description has been provided.
+canonDescNone=(Sin descripción)
+
+# LOCALIZATION NOTE (cliEvalJavascript): The special '{' command allows entry
+# of JavaScript like traditional developer tool command lines. This describes
+# the '{' command.
+cliEvalJavascript=Ingrese JavaScript directamente
+
+# LOCALIZATION NOTE (fieldSelectionSelect): When a command has a parameter
+# that has a number of pre-defined options the user interface presents these
+# in a drop-down menu, where the first 'option' is an indicator that a
+# selection should be made. This string describes that first option.
+fieldSelectionSelect=Seleccione %S ...
+
+# LOCALIZATION NOTE (fieldArrayAdd): When a command has a parameter that can
+# be repeated a number of times (e.g. like the 'cat a.txt b.txt' command) the
+# user interface presents buttons to add and remove arguments. This string is
+# used to add arguments.
+fieldArrayAdd=Agregar
+
+# LOCALIZATION NOTE (fieldArrayDel): When a command has a parameter that can
+# be repeated a number of times (e.g. like the 'cat a.txt b.txt' command) the
+# user interface presents buttons to add and remove arguments. This string is
+# used to remove arguments.
+fieldArrayDel=Borrar
+
+# LOCALIZATION NOTE (jstypeParseScope): The command line provides completion
+# for JavaScript commands, however there are times when the scope of what
+# we're completing against can't be used. This error message is displayed when
+# this happens.
+jstypeParseScope=Alcance perdido
+
+# LOCALIZATION NOTE (jstypeParseMissing): When the command line is doing
+# JavaScript completion, sometimes the property to be completed does not
+# exist. This error message is displayed when this happens.
+jstypeParseMissing=No se encuentra la propiedad '%S'
+
+# LOCALIZATION NOTE (jstypeBeginSyntax): When the command line is doing
+# JavaScript completion using invalid JavaScript, this error message is
+# displayed.
+jstypeBeginSyntax=Error de sintaxis
+
+# LOCALIZATION NOTE (jstypeBeginUnterm): When the command line is doing
+# JavaScript completion using a string that is not properly terminated, this
+# error message is displayed.
+jstypeBeginUnterm=Cadena literal sin terminar
+
+# LOCALIZATION NOTE (jstypeParseError): If the system for providing JavaScript
+# completions encounters and error it displays this.
+jstypeParseError=Error
+
+# LOCALIZATION NOTE (typesNumberNan): When the command line is passed a
+# number, however the input string is not a valid number, this error message
+# is displayed.
+typesNumberNan=No se puede convertir "%S" a un número.
+
+# LOCALIZATION NOTE (typesNumberMax): When the command line is passed a
+# number, but the number is bigger than the largest allowed number, this error
+# message is displayed.
+typesNumberMax=%1$S es mayor que el máximo permitido: %2$S.
+
+# LOCALIZATION NOTE (typesNumberMin): When the command line is passed a
+# number, but the number is lower than the smallest allowed number, this error
+# message is displayed.
+typesNumberMin=%1$S es menor que el mínimo permitido: %2$S.
+
+# LOCALIZATION NOTE (typesSelectionNomatch): When the command line is passed
+# an option with a limited number of correct values, but the passed value is
+# not one of them, this error message is displayed.
+typesSelectionNomatch=No se puede usar '%S'.
+
+# LOCALIZATION NOTE (nodeParseSyntax): When the command line is expecting a
+# CSS query string, however the passed string is not valid, this error message
+# is displayed.
+nodeParseSyntax=Error de sintaxis en consulta CSS
+
+# LOCALIZATION NOTE (nodeParseMultiple): When the command line is expecting a
+# CSS string that matches a single node, but more than one node matches, this
+# error message is displayed.
+nodeParseMultiple=Demasiadas coincidencias (%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=Sin coincidencia
+
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/gclicommands.properties
@@ -0,0 +1,60 @@
+# LOCALIZATION NOTE These strings are used inside Web Console commands.
+# The Web Console command line is available from the Web Developer sub-menu
+# -> 'Web Console'.
+#
+# The correct localization of this file might be to keep it in
+# English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best
+# documentation on web development on the web.
+
+# LOCALIZATION NOTE (echoDesc) A very short string used to describe the
+# function of the echo command.
+echoDesc=Mostrar un mensaje
+
+# LOCALIZATION NOTE (echoMessageDesc) A very short string used to describe the
+# message parameter to the echo command.
+echoMessageDesc=Mensaje
+
+# LOCALIZATION NOTE (helpDesc) A very short string used to describe the
+# function of the help command.
+helpDesc=Obtener ayuda sobre los comandos disponibles
+
+# LOCALIZATION NOTE (helpAvailable) Used in the output of the help command to
+# explain the contents of the command help table.
+helpAvailable=Comandos disponibles
+
+# LOCALIZATION NOTE (consoleDesc) A very short string used to describe the
+# function of the console command.
+consoleDesc=Comandos para controlar la consola
+
+# LOCALIZATION NOTE (consoleManual) A longer description describing the
+# set of commands that control the console.
+consoleManual=Filtrar, limpiar y cerrar la consola web
+
+# LOCALIZATION NOTE (consoleclearDesc) A very short string used to describe the
+# function of the 'console clear' command.
+consoleclearDesc=Limpiar la consola
+
+# LOCALIZATION NOTE (inspectDesc) A very short description of the 'inspect'
+# command. See inspectManual 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.
+inspectDesc=Inspeccionar un nodo
+
+# LOCALIZATION NOTE (inspectManual) A fuller description of the 'inspect'
+# command, displayed when the user asks for help on what it does.
+inspectManual=Investigar las dimensiones y propiedades de un elemento usando \
+un selector CSS para abrir el resaltador de DOM
+
+# 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=Selector 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=Un selector CSS para usar con Document.querySelector que \
+identifica un elemento solo
+
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/inspector.properties
@@ -0,0 +1,30 @@
+# LOCALIZATION NOTE (confirmNavigationAway): Used in the Inspector tool, when
+# the user tries to navigate away from a web page, to confirm the change of
+# page.
+confirmNavigationAway.message=Dejar esta página cerrará el inspector y se perderán los cambios que haya hecho.
+confirmNavigationAway.buttonLeave=Dejar la página
+confirmNavigationAway.buttonLeaveAccesskey=l
+confirmNavigationAway.buttonStay=Quedarse en la página
+confirmNavigationAway.buttonStayAccesskey=s
+
+breadcrumbs.siblings=Hermanos
+# LOCALIZATION NOTE (htmlPanel): Used in the Inspector tool's openInspectorUI
+# method when registering the HTML panel.
+
+# LOCALIZATION NOTE (htmlPanel.label): This is a lable for a button that
+# activates the Web Developer->Inspect UI's HTML Tree Panel.
+htmlPanel.label=HTML
+
+# LOCALIZATION NOTE (htmlPanel.tooltiptext): The text that appears when a user
+# hovers over the HTML panel's toolbar button.
+htmlPanel.tooltiptext=Panel HTML
+
+# LOCALIZATION NOTE (htmlPanel.accesskey): The key bound to the HTML panel's
+# toolbar button.
+htmlPanel.accesskey=H
+
+# LOCALIZATION NOTE (ruleView.*): Button label, accesskey and tooltip text
+# associated with the Highlighter's CSS Rule View in the Style Sidebar.
+ruleView.label=Reglas
+ruleView.accesskey=R
+ruleView.tooltiptext=Ver y editar CSS
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/scratchpad.dtd
@@ -0,0 +1,118 @@
+<!-- LOCALIZATION NOTE : FILE This file contains the Scratchpad window strings -->
+<!-- LOCALIZATION NOTE : FILE Do not translate commandkeys -->
+
+<!-- LOCALIZATION NOTE (scratchpad.title):
+  -  The Scratchpad is intended to provide a simple text editor for creating
+  -  and evaluating bits of JavaScript code for the purposes of function
+  -  prototyping, experimentation and convenient scripting.
+  -
+  -  It's quite possible that you won't have a good analogue for the word
+  -  "Scratchpad" in your locale. You should feel free to find a close
+  -  approximation to it or choose a word (or words) that means
+  -  "simple discardable text editor". -->
+<!ENTITY window.title                 "Borrador">
+
+<!ENTITY fileMenu.label               "Archivo">
+<!ENTITY fileMenu.accesskey           "A">
+
+<!ENTITY newWindowCmd.label           "Nueva ventana">
+<!ENTITY newWindowCmd.accesskey       "N">
+<!ENTITY newWindowCmd.commandkey      "n">
+
+<!ENTITY openFileCmd.label            "Abrir archivo…">
+<!ENTITY openFileCmd.accesskey        "b">
+<!ENTITY openFileCmd.commandkey       "o">
+
+<!ENTITY saveFileCmd.label            "Guardar">
+<!ENTITY saveFileCmd.accesskey        "G">
+<!ENTITY saveFileCmd.commandkey       "s">
+
+<!ENTITY saveFileAsCmd.label          "Guardar como…">
+<!ENTITY saveFileAsCmd.accesskey      "o">
+
+<!ENTITY closeCmd.label               "Cerrar">
+<!ENTITY closeCmd.key                 "C">
+<!ENTITY closeCmd.accesskey           "C">
+
+<!ENTITY editMenu.label               "Editar">
+<!ENTITY editMenu.accesskey           "E">
+
+<!ENTITY undoCmd.label                "Deshacer">
+<!ENTITY undoCmd.key                  "Z">
+<!ENTITY undoCmd.accesskey            "D">
+
+<!ENTITY redoCmd.label                "Rehacer">
+<!ENTITY redoCmd.key                  "Y">
+<!ENTITY redoCmd.accesskey            "R">
+
+<!ENTITY cutCmd.label                 "Cortar">
+<!ENTITY cutCmd.key                   "X">
+<!ENTITY cutCmd.accesskey             "t">
+
+<!ENTITY copyCmd.label                "Copiar">
+<!ENTITY copyCmd.key                  "C">
+<!ENTITY copyCmd.accesskey            "C">
+
+<!ENTITY pasteCmd.label               "Pegar">
+<!ENTITY pasteCmd.key                 "V">
+<!ENTITY pasteCmd.accesskey           "P">
+
+<!ENTITY selectAllCmd.label           "Seleccionar todo">
+<!ENTITY selectAllCmd.key             "A">
+<!ENTITY selectAllCmd.accesskey       "a">
+
+<!ENTITY run.label                    "Ejecutar">
+<!ENTITY run.accesskey                "E">
+<!ENTITY run.key                      "r">
+
+<!ENTITY inspect.label                "Inspeccionar">
+<!ENTITY inspect.accesskey            "I">
+<!ENTITY inspect.key                  "i">
+
+<!ENTITY display.label                "Mostrar">
+<!ENTITY display.accesskey            "M">
+<!ENTITY display.key                  "l">
+
+<!-- LOCALIZATION NOTE (environmentMenu.label, accesskey): This menu item was
+  -  renamed from "Context" to avoid confusion with the right-click context
+  -  menu in the text area. It refers to the JavaScript Environment (or context)
+  -  the user is evaluating against. I.e., Content (current tab) or Chrome
+  -  (browser).
+  -->
+<!ENTITY environmentMenu.label        "Entorno">
+<!ENTITY environmentMenu.accesskey    "n">
+
+
+<!ENTITY contentContext.label         "Contenido">
+<!ENTITY contentContext.accesskey     "C">
+
+<!-- LOCALIZATION NOTE (browserContext.label, accesskey): This menu item is used
+  -  to select an execution environment for the browser window itself as opposed
+  -  to content. This is a feature for browser and addon developers and only
+  -  enabled via the devtools.chrome.enabled preference. Formerly, this label
+  -  was called "Chrome".
+  -->
+<!ENTITY browserContext.label         "Navegador">
+<!ENTITY browserContext.accesskey     "N">
+
+<!-- LOCALIZATION NOTE (resetContext2.label): This command allows the developer
+  -  to reset/clear the global object of the environment where the code executes.
+  -->
+<!ENTITY resetContext2.label          "Reiniciar variables">
+<!ENTITY resetContext2.accesskey      "v">
+
+<!ENTITY executeMenu.label            "Ejecutar">
+<!ENTITY executeMenu.accesskey        "j">
+
+<!-- LOCALIZATION NOTE (errorConsoleCmd.commandkey): This command key launches
+  -  the browser Error Console, the key should be identical to the property of
+  -  the same name in browser.dtd.
+  -->
+<!ENTITY errorConsoleCmd.commandkey   "j">
+
+<!-- LOCALIZATION NOTE (webConsoleCmd.commandkey): This command key launches
+  -  the browser WebConsole, the key should be identical to the property of
+  -  the same name in browser.dtd.
+  -->
+<!ENTITY webConsoleCmd.commandkey     "k">
+
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/scratchpad.dtd~
@@ -0,0 +1,117 @@
+<!-- LOCALIZATION NOTE : FILE This file contains the Scratchpad window strings -->
+<!-- LOCALIZATION NOTE : FILE Do not translate commandkeys -->
+
+<!-- LOCALIZATION NOTE (scratchpad.title):
+  -  The Scratchpad is intended to provide a simple text editor for creating
+  -  and evaluating bits of JavaScript code for the purposes of function
+  -  prototyping, experimentation and convenient scripting.
+  -
+  -  It's quite possible that you won't have a good analogue for the word
+  -  "Scratchpad" in your locale. You should feel free to find a close
+  -  approximation to it or choose a word (or words) that means
+  -  "simple discardable text editor". -->
+<!ENTITY window.title                 "Borrador">
+
+<!ENTITY fileMenu.label               "Archivo">
+<!ENTITY fileMenu.accesskey           "A">
+
+<!ENTITY newWindowCmd.label           "Nueva ventana">
+<!ENTITY newWindowCmd.accesskey       "N">
+<!ENTITY newWindowCmd.commandkey      "n">
+
+<!ENTITY openFileCmd.label            "Abrir archivo…">
+<!ENTITY openFileCmd.accesskey        "b">
+<!ENTITY openFileCmd.commandkey       "o">
+
+<!ENTITY saveFileCmd.label            "Guardar">
+<!ENTITY saveFileCmd.accesskey        "G">
+<!ENTITY saveFileCmd.commandkey       "s">
+
+<!ENTITY saveFileAsCmd.label          "Guardar como…">
+<!ENTITY saveFileAsCmd.accesskey      "o">
+
+<!ENTITY closeCmd.label               "Cerrar">
+<!ENTITY closeCmd.key                 "C">
+<!ENTITY closeCmd.accesskey           "C">
+
+<!ENTITY editMenu.label               "Editar">
+<!ENTITY editMenu.accesskey           "E">
+
+<!ENTITY undoCmd.label                "Deshacer">
+<!ENTITY undoCmd.key                  "Z">
+<!ENTITY undoCmd.accesskey            "D">
+
+<!ENTITY redoCmd.label                "Rehacer">
+<!ENTITY redoCmd.key                  "Y">
+<!ENTITY redoCmd.accesskey            "R">
+
+<!ENTITY cutCmd.label                 "Cortar">
+<!ENTITY cutCmd.key                   "X">
+<!ENTITY cutCmd.accesskey             "t">
+
+<!ENTITY copyCmd.label                "Copiar">
+<!ENTITY copyCmd.key                  "C">
+<!ENTITY copyCmd.accesskey            "C">
+
+<!ENTITY pasteCmd.label               "Pegar">
+<!ENTITY pasteCmd.key                 "V">
+<!ENTITY pasteCmd.accesskey           "P">
+
+<!ENTITY selectAllCmd.label           "Seleccionar todo">
+<!ENTITY selectAllCmd.key             "A">
+<!ENTITY selectAllCmd.accesskey       "a">
+
+<!ENTITY run.label                    "Ejecutar">
+<!ENTITY run.accesskey                "E">
+<!ENTITY run.key                      "r">
+
+<!ENTITY inspect.label                "Inspeccionar">
+<!ENTITY inspect.accesskey            "I">
+<!ENTITY inspect.key                  "i">
+
+<!ENTITY display.label                "Mostrar">
+<!ENTITY display.accesskey            "M">
+<!ENTITY display.key                  "l">
+
+<!-- LOCALIZATION NOTE (environmentMenu.label, accesskey): This menu item was
+  -  renamed from "Context" to avoid confusion with the right-click context
+  -  menu in the text area. It refers to the JavaScript Environment (or context)
+  -  the user is evaluating against. I.e., Content (current tab) or Chrome
+  -  (browser).
+  -->
+<!ENTITY environmentMenu.label        "Entorno">
+<!ENTITY environmentMenu.accesskey    "n">
+
+
+<!ENTITY contentContext.label         "Contenido">
+<!ENTITY contentContext.accesskey     "C">
+
+<!-- LOCALIZATION NOTE (browserContext.label, accesskey): This menu item is used
+  -  to select an execution environment for the browser window itself as opposed
+  -  to content. This is a feature for browser and addon developers and only
+  -  enabled via the devtools.chrome.enabled preference. Formerly, this label
+  -  was called "Chrome".
+  -->
+<!ENTITY browserContext.label         "Navegador">
+<!ENTITY browserContext.accesskey     "N">
+
+<!-- LOCALIZATION NOTE (resetContext.label): This command allows the developer
+  -  to reset/clear the global object of the context where the code executes.
+  -->
+<!ENTITY resetContext.label           "Reiniciar">
+<!ENTITY resetContext.accesskey       "R">
+
+<!ENTITY executeMenu.label            "Ejecutar">
+<!ENTITY executeMenu.accesskey        "j">
+
+<!ENTITY toolsMenu.label              "Herramientas">
+<!ENTITY toolsMenu.accesskey          "t">
+
+<!ENTITY errorConsoleCmd.label        "Consola de errores">
+<!ENTITY errorConsoleCmd.accesskey    "C">
+<!ENTITY errorConsoleCmd.commandkey   "j">
+
+<!ENTITY webConsoleCmd.label          "Consola web">
+<!ENTITY webConsoleCmd.accesskey      "w">
+<!ENTITY webConsoleCmd.commandkey     "k">
+
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/scratchpad.properties
@@ -0,0 +1,40 @@
+# LOCALIZATION NOTE  (propertyPanel.updateButton.label): Used in the Property
+# Panel that is opened by the Scratchpad window when inspecting an object. This
+# is the Update button label.
+propertyPanel.updateButton.label=Actualizar
+propertyPanel.updateButton.accesskey=u
+
+# LOCALIZATION NOTE  (export.fileOverwriteConfirmation): This is displayed when
+# the user attempts to save to an already existing file.
+export.fileOverwriteConfirmation=El archivo ya existe. ¿Sobreescribir?
+
+# LOCALIZATION NOTE  (browserWindow.unavailable): This error message is shown
+# when Scratchpad does not find any recently active window of navigator:browser
+# type.
+browserWindow.unavailable=Borrador no puede encontrar ninguna ventana de navegador en la que ejecutar el código.
+
+# LOCALIZATION NOTE  (openFile.title): This is the file picker title, when you
+# open a file from Scratchpad.
+openFile.title=Abrir archivo
+
+# LOCALIZATION NOTE  (openFile.failed): This is the message displayed when file
+# open fails.
+openFile.failed=No se pudo escribir el archivo.
+
+# LOCALIZATION NOTE  (saveFileAs): This is the file picker title, when you save
+# a file in Scratchpad.
+saveFileAs=Guardar archivo como
+
+# LOCALIZATION NOTE  (saveFile.failed): This is the message displayed when file
+# save fails.
+saveFile.failed=Falló la operación de guardar el archivo.
+
+# 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 * Este es un borrador de JavaScript.\n *\n * Ingrese algo en JavaScript, luego haga clic derecho o seleccione del menú Ejecutar:\n * 1. Ejecutar para evaluar el texto seleccionado,\n * 2. Inspeccionar para mostrar un inspector de objetos sobre el resultado o\n * 3. Mostrar para insertar el resultado  en un comentario después de la selección.\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=Este borrador se ejecuta en el contexto del navegador.
+
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/styleinspector.dtd
@@ -0,0 +1,35 @@
+<!-- LOCALIZATION NOTE (userStylesLabel): This is the label for the checkbox
+  -  that specifies whether the styles that are not from the user's stylesheet
+  -  should be displayed or not. -->
+<!ENTITY userStylesLabel    "Solamente estilos de usuario">
+
+<!-- LOCALIZATION NOTE (userStylesSearch): This is the placeholder that goes in
+  -  the search box when no search term has been entered. -->
+<!ENTITY userStylesSearch      "Buscar">
+
+<!-- LOCALIZATION NOTE (selectedElementLabel): This is the label for the path of
+  -  the highlighted element in the web page. This path is based on the document
+  -  tree. -->
+<!ENTITY selectedElementLabel  "Elemento seleccionado:">
+
+<!-- LOCALIZATION NOTE (helpLinkTitle): For each style property
+  -  the user can hover it and get a help link button which allows one to
+  -  quickly jump to the documentation from the Mozilla Developer Network site.
+  -  This is the link title shown in the hover tooltip. -->
+<!ENTITY helpLinkTitle         "Lea la documentación de esta propiedad">
+
+<!-- LOCALIZATION NOTE (unmatchedSelectors): For each style property
+  -  the panel shows whether there are any selectors that do not match the
+  -  currently selected element. -->
+<!ENTITY unmatchedSelectors    "Hay selectores que no coinciden">
+
+<!-- LOCALIZATION NOTE (bestMatch, matched, parentMatch & unmatched): 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. -->
+<!ENTITY bestMatch             "Mejor coincidencia">
+<!ENTITY matched               "Coincidencia">
+<!ENTITY parentMatch           "Parent Match">
+<!ENTITY unmatched             "Sin coincidencia">
+
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/styleinspector.dtd~
@@ -0,0 +1,26 @@
+<!-- LOCALIZATION NOTE (userStylesLabel): This is the label for the checkbox
+  -  that specifies whether the styles that are not from the user's stylesheet
+  -  should be displayed or not. -->
+<!ENTITY userStylesLabel    "Solamente estilos de usuario">
+
+<!-- LOCALIZATION NOTE (lookingAtLabel): This is the label for the path of
+  -  the highlighted element in the web page. This path is based on the document
+  -  tree. -->
+<!ENTITY lookingAtLabel        "Examinando:">
+
+<!-- LOCALIZATION NOTE (helpLinkTitle): For each style property
+  -  the user can hover it and get a help link button which allows one to
+  -  quickly jump to the documentation from the Mozilla Developer Network site.
+  -  This is the link title shown in the hover tooltip. -->
+<!ENTITY helpLinkTitle         "Lea la documentación de esta propiedad">
+
+<!-- LOCALIZATION NOTE (matchedSelectors): For each style property the
+  -  panel shows whether there are any selectors that match the currently
+  -  selected element. -->
+<!ENTITY matchedSelectors      "Hay selectores que coinciden">
+
+<!-- LOCALIZATION NOTE (unmatchedSelectors): For each style property
+  -  the panel shows whether there are any selectors that do not match the
+  -  currently selected element. -->
+<!ENTITY unmatchedSelectors    "Hay selectores que no coinciden">
+
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/styleinspector.properties
@@ -0,0 +1,37 @@
+# LOCALIZATION NOTE These strings are used inside the Style Inspector.
+
+# LOCALIZATION NOTE (panelTitle): This is the panel title
+panelTitle=Inspector de estilos
+
+# 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.
+rule.status.BEST=Mejor coincidencia
+rule.status.MATCHED=Coincidencia
+rule.status.PARENT_MATCH=Coincidencia del padre
+rule.status.UNMATCHED=Sin coincidencia
+
+# 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=interno
+rule.sourceElement=elemento
+
+# LOCALIZATION NOTE (group): Style properties are displayed in categories and
+# these are the category names.
+group.Text_Fonts_and_Color=Texto, tipografía y color
+group.Background=Fondo
+group.Dimensions=Dimensiones
+group.Positioning_and_Page_Flow=Posicionamiento y diseño
+group.Borders=Bordes
+group.Lists=Listas
+group.Effects_and_Other=Efectos y otros
+
+# LOCALIZATION NOTE (style.highlighter.button): These strings are used inside
+# html tree of the highlighter for the style inspector button
+style.highlighter.button.label1=Propiedades
+style.highlighter.accesskey1=P
+style.highlighter.button.tooltip=Inspeccionar estilos de los elementos
+
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/webConsole.dtd
@@ -0,0 +1,16 @@
+<!ENTITY networkPanel.requestURL                  "URL solicitada">
+<!ENTITY networkPanel.requestMethod               "Método solicitado">
+<!ENTITY networkPanel.statusCode                  "Código de estado">
+
+<!ENTITY networkPanel.requestHeaders              "Encabezados solicitados">
+<!ENTITY networkPanel.requestCookie               "Cookie enviada">
+<!ENTITY networkPanel.requestBody                 "Cuerpo solicitado">
+<!ENTITY networkPanel.requestFormData             "Datos de formulario enviados">
+
+<!ENTITY networkPanel.responseHeaders             "Response Headers">
+<!ENTITY networkPanel.responseBody                "Response Body">
+<!ENTITY networkPanel.responseBodyCached          "Datos en caché">
+<!ENTITY networkPanel.responseBodyUnknownType     "Tipo de contenido desconocido">
+<!ENTITY networkPanel.responseNoBody              "No Response Body">
+<!ENTITY networkPanel.responseImage               "Imagen recibida">
+<!ENTITY networkPanel.responseImageCached         "Imagen en caché">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/webconsole.properties
@@ -0,0 +1,191 @@
+typeError=Error: 
+typeWarning=Advertencia: 
+typeNetwork=Red: 
+typeException=Excepción:  
+typeCssParser=CSS Parser: 
+typeStrict=Advertencia estricta: 
+msgCategory=Categoría: 
+errLine=Línea: %S
+btnHide=Ocultar
+btnPrefs=Preferenciass
+categoryPage=Página:
+categoryConsole=Consola:
+btnMutation=Mutación de DOM
+tipMutation=Toggle DOM Mutation event logging
+btnPageNet=Red
+tipPageNet=Registrar accesos de red
+btnPageCSS=CSS
+tipPageCSS=Registrar errores de parseo CSS
+btnPageJS=JS
+tipPageJS=Registrar excepciones de JavaScript
+# LOCALIZATION NOTE (btnPageWebDeveloper):
+#
+# This is used as the text of the "Web Developer" 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=Desarrollador web
+# LOCALIZATION NOTE (tipPageWebDeveloper):
+#
+# This is used as the text of the tool tip for the "Web Developer" button on
+# the toolbar.
+tipPageWebDeveloper=Registrar mensajes enviados al objeto "consola"
+btnConsoleErrors=Errores
+tipConsoleErrors=Registrar llamadas a console.error()
+btnConsoleInfo=Información
+tipConsoleInfo=Registrar llamadas a console.info()
+btnConsoleWarnings=Advertencias
+tipConsoleWarnings=Registrar llamadas a console.warn()
+btnConsoleLog=Registro
+tipConsoleLog=Registrar llamadas a console.log()
+btnGlobal=Mensajes globales
+tipGlobal=Toggle Global Message logging
+localConsole=Consola local
+clearConsoleCmd.label=Limpiar consola
+clearConsoleCmd.accesskey=L
+# LOCALIZATION NOTE (btnClear):
+#
+# This is used as the text of the "Clear" button for the toolbar. It clears the
+# contents of the console.
+btnClear=Limpiar
+stringFilter=Filtro
+close.button=Cerrar
+close.accesskey=C
+update.button=Actualizar
+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)
+# the title of the panel is based on the `jsPropertyInspectTitle` string.
+# If it isn't clear which object is being inspected, the `jsPropertyTitle` string
+# gets used. This can be the case when the user logs an object to the WebConsole
+# output using the console.log(aObjectToInspect) method.
+#
+# You can find a screenshot of the PropertyPanel here:
+#   https://bug585030.bugzilla.mozilla.org/attachment.cgi?id=464034
+jsPropertyTitle=Inspector de objetos
+# LOCALIZATION NOTE FOR `jsPropertyInspectTitle`:
+#
+# The %S is replaced by the evaluated code the user clicked on in the console.
+#
+# Example: The user executed `window.document` in the WebConsole. The `document`
+# object is written to the output. If the user clicks on the `document` output
+# in the console, a PropertyPanel will show up. The title of the PropertyPanel
+# is set to `Inspect: window.document` because the clicked `document` object was
+# evaluated based on the `window.document` string.
+jsPropertyInspectTitle=Inspeccionar: %S
+saveBodies.label=Registrar pedidos y cuerpos de respuesta
+saveBodies.accesskey=p
+copyCmd.label=Copiar
+copyCmd.accesskey=C
+selectAllCmd.label=Seleccionar todo
+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=No se puede llamar a pprint en este tipo de objeto.
+
+NetworkPanel.label=Inspeccionar solicitud de red
+# LOCALIZATION NOTE (NetworkPanel.deltaDurationMS):
+#
+# This string is used to show the duration between two network events (e.g
+# request and respones header or response header and response body).
+NetworkPanel.durationMS=%Sms
+# LOCALIZATION NOTE (NetworkPanel.imageSizeDeltaDurationMS):
+# This string is used to show the duration between the response header and the
+# response body event. It also shows the size of the received or cached image.
+#
+# The first %S is replace by the width of the inspected image.
+# The second %S is replaced by the height of the inspected image.
+# The third %S is replaced by the duration between the response header and the
+# response body event.
+NetworkPanel.imageSizeDeltaDurationMS=%Sx%Spx, Δ%Sms
+# LOCALIZATION NOTE (NetworkPanel.responseBodyUnableToDisplay.content):
+#
+# This string is displayed within the response body section of the NetworkPanel
+# if the content type of the network request can't be displayed in the
+# 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=NO se pueden mostrar las respuestas de tipo "%S"
+ConsoleAPIDisabled=La API de registro de la consola web (console.log, console.info, console.warn, console.error) ha sido deshabilitada por un script en esta página.
+
+# LOCALIZATION NOTE (inspectStyle.nullObjectPassed):
+# This message is returned when a null object is passed in to inspectstyle()
+inspectStyle.nullObjectPassed=El objeto es nulo
+
+# LOCALIZATION NOTE (inspectStyle.mustBeDomNode):
+# This message is returned when a non-DOM node is passed in to inspectstyle()
+inspectStyle.mustBeDomNode=El objeto debe ser un nodo DOM válido
+
+# LOCALIZATION NOTE (inspectStyle.nodeHasNoStyleProps):
+# This message is returned when an unstyleable object is passed in to inspectstyle()
+inspectStyle.nodeHasNoStyleProps=El objeto no puede tener estilo
+
+# LOCALIZATION NOTE (inspectStyle.styleInspectorNotEnabled):
+# This message is returned when devtools.styleinspector.enabled is not set to
+# true
+inspectStyle.styleInspectorNotEnabled=El inspector de estilos no está habilitado. Establezca la opción devtools.styleinspector.enabled a true en about:config para usar este comando.
+
+# LOCALIZATION NOTE (webConsolePosition): The label shown for the menu which
+# allows the user to toggle between the Web Console positioning types.
+webConsolePosition=Posición
+
+# LOCALIZATION NOTE (webConsolePositionTooltip): The tooltip shown when the user
+# hovers the Position button in the Web Console toolbar.
+webConsolePositionTooltip=Posicionar la consola web encima o debajo del documento
+
+# LOCALIZATION NOTE (webConsolePositionAbove): When this option is selected the
+# Web Console interface is displayed above the web page.
+webConsolePositionAbove=Encima
+
+# LOCALIZATION NOTE (webConsolePositionBelow): When this option is selected the
+# Web Console interface is displayed below the web page.
+webConsolePositionBelow=Debajo
+
+# LOCALIZATION NOTE (webConsolePositionWindow): When this option is selected the
+# Web Console interface is displayed in a floating panel.
+webConsolePositionWindow=Ventana
+
+# LOCALIZATION NOTE (webConsoleWindowTitleAndURL): The Web Console floating
+# panel title, followed by the web page URL.
+webConsoleWindowTitleAndURL=Consola web - %S
+
+# LOCALIZATION NOTE (Autocomplete.label):
+# The autocomplete popup panel label/title.
+Autocomplete.label=Autocomplete popup
+
+# LOCALIZATION NOTE (stacktrace.anonymousFunction):
+# This string is used to display JavaScript functions that have no given name -
+# they are said to be anonymous. See stacktrace.outputMessage.
+stacktrace.anonymousFunction=<anónima>
+
+# LOCALIZATION NOTE (stacktrace.outputMessage):
+# This string is used in the Web Console output to identify a web developer call
+# to console.trace(). The stack trace of JavaScript function calls is displayed.
+# In this minimal message we only show the last call.
+stacktrace.outputMessage=Stack trace from %S, function %S, line %S.
+# LOCALIZATION NOTE (stacktrace.outputMessage):
+# This string is used in the Web Console output to identify a web developer call
+# to console.trace(). The stack trace of JavaScript function calls is displayed.
+# In this minimal message we only show the last call.
+stacktrace.outputMessage=Rastreo de pila desde %S, función %S, línea %S.
+
+# LOCALIZATION NOTE (timerStarted):
+# This string is used to display the result of the console.time() call.
+# %S=name of timer
+timerStarted=%S: temporizador iniciado
+
+# LOCALIZATION NOTE (timeEnd):
+# This string is used to display the result of the console.timeEnd() call.
+# %1$S=name of timer, %2$S=number of milliseconds
+timeEnd=%1$S: %2$Sms
+
+maxTimersExceeded=El máximo permitido de temporizadores en esta página fue superado.
+
deleted file mode 100644
--- a/browser/chrome/browser/inspector.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# LOCALIZATION NOTE (confirmNavigationAway): Used in the Inspector tool, when
-# the user tries to navigate away from a web page, to confirm the change of
-# page.
-confirmNavigationAway.message=Dejar esta página cerrará el inspector y se perderán los cambios que haya hecho.
-confirmNavigationAway.buttonLeave=Dejar la página
-confirmNavigationAway.buttonLeaveAccesskey=l
-confirmNavigationAway.buttonStay=Quedarse en la página
-confirmNavigationAway.buttonStayAccesskey=s
-
-# LOCALIZATION NOTE (htmlPanel): Used in the Inspector tool's openInspectorUI
-# method when registering the HTML panel.
-
-# LOCALIZATION NOTE (htmlPanel.label): This is a lable for a button that
-# activates the Web Developer->Inspect UI's HTML Tree Panel.
-htmlPanel.label=HTML
-
-# LOCALIZATION NOTE (htmlPanel.tooltiptext): The text that appears when a user
-# hovers over the HTML panel's toolbar button.
-htmlPanel.tooltiptext=Panel HTML
-
-# LOCALIZATION NOTE (htmlPanel.accesskey): The key bound to the HTML panel's
-# toolbar button.
-htmlPanel.accesskey=H
--- a/browser/chrome/browser/preferences/advanced-scripts.dtd
+++ b/browser/chrome/browser/preferences/advanced-scripts.dtd
@@ -35,15 +35,15 @@
 #endif
    - ***** END LICENSE BLOCK ***** -->
 
 <!ENTITY advancedJSDialog.title         "Configuración Avanzada de JavaScript">
 <!ENTITY window.width                   "37em">
 
 <!ENTITY allowScripts.label             "Permitir a los scripts:">
 
-<!ENTITY moveResizeWindows.label        "Mover o cambiar tamaño de ventanas existentes">
-<!ENTITY moveResizeWindows.accesskey    "M">
+<!ENTITY moveResizePopupWindows.label     "Mover o cambiar tamaño de ventanas emergentes">
+<!ENTITY moveResizePopupWindows.accesskey "M">
 <!ENTITY raiseLowerWindows.label        "Subir o bajar las ventanas">
 <!ENTITY raiseLowerWindows.accesskey    "S">
 <!ENTITY disableContextMenus.label      "Deshabilitar o reemplazar menús contextuales">
 <!ENTITY disableContextMenus.accesskey  "D">
 
--- a/browser/chrome/browser/preferences/advanced.dtd
+++ b/browser/chrome/browser/preferences/advanced.dtd
@@ -53,32 +53,38 @@
 <!ENTITY limitCacheSizeAfter.label       "MB de espacio">
 <!ENTITY clearCacheNow.label             "Limpiar ahora">
 <!ENTITY clearCacheNow.accesskey         "h">
 <!ENTITY overrideSmartCacheSize.label    "Anular administración automática de caché">
 <!ENTITY overrideSmartCacheSize.accesskey "o">
 
 <!ENTITY updateTab.label                 "Actualizaciones">
 
-<!ENTITY autoCheck.label                 "Automáticamente chequear por actualizaciones de:">
-<!ENTITY enableAppUpdate.label           "&brandShortName;">
-<!ENTITY enableAppUpdate.accesskey       "r">
-<!ENTITY enableAddonsUpdate2.label        "Complementos">
-<!ENTITY enableAddonsUpdate2.accesskey    "C">
+<!ENTITY updateApp.label                 "Actualizaciones de &brandShortName;:">
+<!ENTITY updateAuto.label                "Instalar actualizaciones automáticamente (recomendado: mejoras de seguridad)">
+<!ENTITY updateAuto.accesskey            "a">
+<!ENTITY updateCheck.label               "Buscar actualizaciones, pero dejarme elegir si deseo instalarlas">
+<!ENTITY updateCheck.accesskey           "c">
+<!ENTITY updateManual.label              "Nunca buscar actualizaciones (no recomendado: riesgos de seguridad)">
+<!ENTITY updateManual.accesskey          "N">
+
+<!ENTITY updateAutoAddonWarn.label       "Avisarme si ésto deshabilitará alguno de mis complementos">
+<!ENTITY updateAutoAddonWarn.accesskey   "v">
+
+<!ENTITY updateHistory.label             "Mostrar historial de actualizaciones">
+<!ENTITY updateHistory.accesskey         "h">
+
+
+<!ENTITY updateOthers.label              "Actualizar automáticamente:">
+<!ENTITY enableAddonsUpdate3.label       "Complementos">
+<!ENTITY enableAddonsUpdate3.accesskey   "o">
 <!ENTITY enableSearchUpdate.label        "Motores de búsqueda">
 <!ENTITY enableSearchUpdate.accesskey    "M">
-<!ENTITY whenUpdatesFound.label          "Cuando se encuentren actualizaciones de &brandShortName;:">
-<!ENTITY askMe.label                     "Preguntarme qué deseo hacer">
-<!ENTITY askMe.accesskey                 "P">
-<!ENTITY modeAutomatic.label             "Automáticamente descargar e instalar la actualización">
-<!ENTITY modeAutomatic.accesskey         "d">
-<!ENTITY modeAutoAddonWarn.label         "Avisarme si deshabilitará alguna de mis extensiones">
-<!ENTITY modeAutoAddonWarn.accesskey     "x">
 <!ENTITY updateHistory.label             "Mostar el historial de actualizaciones">
-<!ENTITY updateHistory.accesskey         "H">
+<!ENTITY updateHistory.accesskey         "h">
 
 <!ENTITY offlineNotify.label             "Informarme cuando un sitio web pida guardar datos para usar sin conexión">
 <!ENTITY offlineNotify.accesskey         "t">
 <!ENTITY offlineNotifyExceptions.label   "Excepciones…">
 <!ENTITY offlineNotifyExceptions.accesskey "x">
 
 <!ENTITY offlineAppsList.label           "Los siguientes sitios web tiene datos instalados para uso sin conexión:">
 <!ENTITY offlineAppsList.height          "7em">
--- a/browser/chrome/browser/preferences/sync.dtd
+++ b/browser/chrome/browser/preferences/sync.dtd
@@ -11,17 +11,18 @@
 
 <!-- Manage Account -->
 <!ENTITY manageAccount.label "Administrar cuenta">
 <!ENTITY manageAccount.accesskey "A">
 <!ENTITY viewQuota.label              "Ver cuota">
 <!ENTITY changePassword2.label        "Cambiar contraseña…">
 <!ENTITY myRecoveryKey.label          "Mi clave de recuperación">
 <!ENTITY resetSync2.label             "Restablecer Sync…">
-<!ENTITY addDevice.label              "Agregar un dispositivo">
+
+<!ENTITY pairDevice.label             "Asociar un dispositivo">
 
 <!ENTITY syncMy.label               "Sincronizar mis">
 <!ENTITY engine.bookmarks.label     "Marcadores">
 <!ENTITY engine.bookmarks.accesskey "M">
 <!ENTITY engine.tabs.label          "Pestañas">
 <!ENTITY engine.tabs.accesskey      "t">
 <!ENTITY engine.history.label       "Historial">
 <!ENTITY engine.history.accesskey   "r">
deleted file mode 100644
--- a/browser/chrome/browser/scratchpad.dtd
+++ /dev/null
@@ -1,117 +0,0 @@
-<!-- LOCALIZATION NOTE : FILE This file contains the Scratchpad window strings -->
-<!-- LOCALIZATION NOTE : FILE Do not translate commandkeys -->
-
-<!-- LOCALIZATION NOTE (scratchpad.title):
-  -  The Scratchpad is intended to provide a simple text editor for creating
-  -  and evaluating bits of JavaScript code for the purposes of function
-  -  prototyping, experimentation and convenient scripting.
-  -
-  -  It's quite possible that you won't have a good analogue for the word
-  -  "Scratchpad" in your locale. You should feel free to find a close
-  -  approximation to it or choose a word (or words) that means
-  -  "simple discardable text editor". -->
-<!ENTITY window.title                 "Borrador">
-
-<!ENTITY fileMenu.label               "Archivo">
-<!ENTITY fileMenu.accesskey           "A">
-
-<!ENTITY newWindowCmd.label           "Nueva ventana">
-<!ENTITY newWindowCmd.accesskey       "N">
-<!ENTITY newWindowCmd.commandkey      "n">
-
-<!ENTITY openFileCmd.label            "Abrir archivo…">
-<!ENTITY openFileCmd.accesskey        "b">
-<!ENTITY openFileCmd.commandkey       "o">
-
-<!ENTITY saveFileCmd.label            "Guardar">
-<!ENTITY saveFileCmd.accesskey        "G">
-<!ENTITY saveFileCmd.commandkey       "s">
-
-<!ENTITY saveFileAsCmd.label          "Guardar como…">
-<!ENTITY saveFileAsCmd.accesskey      "o">
-
-<!ENTITY closeCmd.label               "Cerrar">
-<!ENTITY closeCmd.key                 "C">
-<!ENTITY closeCmd.accesskey           "C">
-
-<!ENTITY editMenu.label               "Editar">
-<!ENTITY editMenu.accesskey           "E">
-
-<!ENTITY undoCmd.label                "Deshacer">
-<!ENTITY undoCmd.key                  "Z">
-<!ENTITY undoCmd.accesskey            "D">
-
-<!ENTITY redoCmd.label                "Rehacer">
-<!ENTITY redoCmd.key                  "Y">
-<!ENTITY redoCmd.accesskey            "R">
-
-<!ENTITY cutCmd.label                 "Cortar">
-<!ENTITY cutCmd.key                   "X">
-<!ENTITY cutCmd.accesskey             "t">
-
-<!ENTITY copyCmd.label                "Copiar">
-<!ENTITY copyCmd.key                  "C">
-<!ENTITY copyCmd.accesskey            "C">
-
-<!ENTITY pasteCmd.label               "Pegar">
-<!ENTITY pasteCmd.key                 "V">
-<!ENTITY pasteCmd.accesskey           "P">
-
-<!ENTITY selectAllCmd.label           "Seleccionar todo">
-<!ENTITY selectAllCmd.key             "A">
-<!ENTITY selectAllCmd.accesskey       "a">
-
-<!ENTITY run.label                    "Ejecutar">
-<!ENTITY run.accesskey                "E">
-<!ENTITY run.key                      "r">
-
-<!ENTITY inspect.label                "Inspeccionar">
-<!ENTITY inspect.accesskey            "I">
-<!ENTITY inspect.key                  "i">
-
-<!ENTITY display.label                "Mostrar">
-<!ENTITY display.accesskey            "M">
-<!ENTITY display.key                  "l">
-
-<!-- LOCALIZATION NOTE (environmentMenu.label, accesskey): This menu item was
-  -  renamed from "Context" to avoid confusion with the right-click context
-  -  menu in the text area. It refers to the JavaScript Environment (or context)
-  -  the user is evaluating against. I.e., Content (current tab) or Chrome
-  -  (browser).
-  -->
-<!ENTITY environmentMenu.label        "Entorno">
-<!ENTITY environmentMenu.accesskey    "n">
-
-
-<!ENTITY contentContext.label         "Contenido">
-<!ENTITY contentContext.accesskey     "C">
-
-<!-- LOCALIZATION NOTE (browserContext.label, accesskey): This menu item is used
-  -  to select an execution environment for the browser window itself as opposed
-  -  to content. This is a feature for browser and addon developers and only
-  -  enabled via the devtools.chrome.enabled preference. Formerly, this label
-  -  was called "Chrome".
-  -->
-<!ENTITY browserContext.label         "Navegador">
-<!ENTITY browserContext.accesskey     "N">
-
-<!-- LOCALIZATION NOTE (resetContext.label): This command allows the developer
-  -  to reset/clear the global object of the context where the code executes.
-  -->
-<!ENTITY resetContext.label           "Reiniciar">
-<!ENTITY resetContext.accesskey       "R">
-
-<!ENTITY executeMenu.label            "Ejecutar">
-<!ENTITY executeMenu.accesskey        "j">
-
-<!ENTITY toolsMenu.label              "Herramientas">
-<!ENTITY toolsMenu.accesskey          "t">
-
-<!ENTITY errorConsoleCmd.label        "Consola de errores">
-<!ENTITY errorConsoleCmd.accesskey    "C">
-<!ENTITY errorConsoleCmd.commandkey   "j">
-
-<!ENTITY webConsoleCmd.label          "Consola web">
-<!ENTITY webConsoleCmd.accesskey      "w">
-<!ENTITY webConsoleCmd.commandkey     "k">
-
deleted file mode 100644
--- a/browser/chrome/browser/scratchpad.properties
+++ /dev/null
@@ -1,36 +0,0 @@
-# LOCALIZATION NOTE  (propertyPanel.updateButton.label): Used in the Property
-# Panel that is opened by the Scratchpad window when inspecting an object. This
-# is the Update button label.
-propertyPanel.updateButton.label=Actualizar
-propertyPanel.updateButton.accesskey=u
-
-# LOCALIZATION NOTE  (export.fileOverwriteConfirmation): This is displayed when
-# the user attempts to save to an already existing file.
-export.fileOverwriteConfirmation=El archivo ya existe. ¿Sobreescribir?
-
-# LOCALIZATION NOTE  (browserWindow.unavailable): This error message is shown
-# when Scratchpad does not find any recently active window of navigator:browser
-# type.
-browserWindow.unavailable=Borrador no puede encontrar ninguna ventana de navegador en la que ejecutar el código.
-
-# LOCALIZATION NOTE  (openFile.title): This is the file picker title, when you
-# open a file from Scratchpad.
-openFile.title=Abrir archivo
-
-# LOCALIZATION NOTE  (openFile.failed): This is the message displayed when file
-# open fails.
-openFile.failed=No se pudo escribir el archivo.
-
-# LOCALIZATION NOTE  (saveFileAs): This is the file picker title, when you save
-# a file in Scratchpad.
-saveFileAs=Guardar archivo como
-
-# LOCALIZATION NOTE  (saveFile.failed): This is the message displayed when file
-# save fails.
-saveFile.failed=Falló la operación de guardar el archivo.
-
-# 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 * Este es un borrador de JavaScript.\n *\n * Ingrese algo en JavaScript, luego haga clic derecho o seleccione del menú Ejecutar:\n * 1. Ejecutar para evaluar el texto seleccionado,\n * 2. Inspeccionar para mostrar un inspector de objetos sobre el resultado o\n * 3. Mostrar para insertar el resultado  en un comentario después de la selección.\n */\n\n
-
deleted file mode 100644
--- a/browser/chrome/browser/styleinspector.dtd
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- LOCALIZATION NOTE (userStylesLabel): This is the label for the checkbox
-  -  that specifies whether the styles that are not from the user's stylesheet
-  -  should be displayed or not. -->
-<!ENTITY userStylesLabel    "Solamente estilos de usuario">
-
-<!-- LOCALIZATION NOTE (lookingAtLabel): This is the label for the path of
-  -  the highlighted element in the web page. This path is based on the document
-  -  tree. -->
-<!ENTITY lookingAtLabel        "Examinando:">
-
-<!-- LOCALIZATION NOTE (helpLinkTitle): For each style property
-  -  the user can hover it and get a help link button which allows one to
-  -  quickly jump to the documentation from the Mozilla Developer Network site.
-  -  This is the link title shown in the hover tooltip. -->
-<!ENTITY helpLinkTitle         "Lea la documentación de esta propiedad">
deleted file mode 100644
--- a/browser/chrome/browser/styleinspector.properties
+++ /dev/null
@@ -1,50 +0,0 @@
-# LOCALIZATION NOTE These strings are used inside the Style Inspector.
-
-# LOCALIZATION NOTE (panelTitle): This is the panel title
-panelTitle=Inspector de estilos
-
-# LOCALIZATION NOTE (property.numberOfMatchedSelectors): For each style property the
-# panel shows the number of selectors which match the currently selected
-# element, counted from all stylesheets in the web page inspected.
-# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-property.numberOfMatchedSelectors=1 selector coincide;#1 selectores coinciden
-
-# LOCALIZATION NOTE (property.numberOfUnmatchedSelectors): For each style
-# property the panel shows the number of selectors which do not match the
-# currently selected element, counted from all stylesheets in the web page
-# inspected.
-# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-property.numberOfUnmatchedSelectors=1 selector no coincide;#1 selectores no coinciden
-
-# 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.
-rule.status.BEST=Mejor coincidencia
-rule.status.MATCHED=Coincidencia
-rule.status.PARENT_MATCH=Coincidencia del padre
-rule.status.UNMATCHED=Sin coincidencia
-
-# 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=interno
-rule.sourceElement=elemento
-
-# LOCALIZATION NOTE (group): Style properties are displayed in categories and
-# these are the category names.
-group.Text_Fonts_and_Color=Texto, tipografía y color
-group.Background=Fondo
-group.Dimensions=Dimensiones
-group.Positioning_and_Page_Flow=Posicionamiento y diseño
-group.Borders=Bordes
-group.Lists=Listas
-group.Effects_and_Other=Efectos y otros
-
-# LOCALIZATION NOTE (style.highlighter.button): These strings are used inside
-# html tree of the highlighter for the style inspector button
-style.highlighter.button.label=Estilo
-style.highlighter.accesskey=s
-style.highlighter.button.tooltip=Inspeccionar estilos de los elementos
-
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/syncProgress.dtd
@@ -0,0 +1,11 @@
+<!ENTITY % brandDTD
+    SYSTEM "chrome://branding/locale/brand.dtd">
+    %brandDTD;
+
+<!-- These strings are used in the sync progress upload page -->
+<!ENTITY syncProgress.pageTitle    "Su primera sincronización">
+<!ENTITY syncProgress.textBlurb    "Sus datos están siendo cifrados y subidos en segundo plano. Puede cerrar esta pestaña y continuar usando &brandShortName;.">
+<!ENTITY syncProgress.closeButton  "Cerrar">
+<!ENTITY syncProgress.logoAltText  "&brandShortName; logo">
+<!ENTITY syncProgress.diffText     "&brandShortName; ahora sincronizará automáticamente en segundo plano.  Puede cerrar esta pestaña y continuar usando &brandShortName;.">
+
--- a/browser/chrome/browser/syncSetup.dtd
+++ b/browser/chrome/browser/syncSetup.dtd
@@ -1,16 +1,15 @@
 <!ENTITY accountSetupTitle.label "Configuración de &syncBrand.fullName.label;">
 
 <!-- First page of the wizard -->
 
 <!ENTITY setup.pickSetupType.description "Bienvenido, si nunca usó &syncBrand.fullName.label; antes, necesitará crear una cuenta nueva.">
 <!ENTITY button.createNewAccount.label "Crear una cuenta nueva">
-<!ENTITY setup.haveAccount.label "Ya tengo una cuenta de &syncBrand.fullName.label;">
-<!ENTITY button.connect.label    "Conectar">
+<!ENTITY button.haveAccount.label      "Ya tengo una cuenta">
 
 <!ENTITY setup.choicePage.title.label "¿Ha usado &syncBrand.fullName.label; antes?">
 <!ENTITY setup.choicePage.new.label "Nunca usé &syncBrand.shortName.label; antes">
 <!ENTITY setup.choicePage.existing.label "Ya estoy usando &syncBrand.shortName.label; en otra computadora">
 
 <!-- New Account AND Existing Account -->
 <!ENTITY server.label               "Servidor">
 <!ENTITY serverType.main.label "Servidor de &syncBrand.fullName.label;">
@@ -48,25 +47,23 @@
 <!ENTITY syncGenerateNewKey.label  "Generar una nueva clave">
 <!ENTITY recoveryKeyBackup.description "Se requiere su clave de recuperación para acceder a &syncBrand.fullName.label; en otros dispositivos. Debe crear una copia de seguridad. No podemos ayudarlo a recuperar su clave de recuperación.">
 
 <!ENTITY button.syncKeyBackup.print.label     "Imprimir…">
 <!ENTITY button.syncKeyBackup.print.accesskey "p">
 <!ENTITY button.syncKeyBackup.save.label      "Guardar…">
 <!ENTITY button.syncKeyBackup.save.accesskey  "G">
 
-<!-- New Account Page 3: Captcha -->
-<!ENTITY setup.captchaPage2.title.label     "Confirme que no es un robot">
-<!-- Existing Account Page 1: Add Device (incl. Add a Device dialog strings) -->
-<!ENTITY addDevice.title.label              "Agregar un dispositivo">
+<!-- Existing Account Page 1: Pair a Device (incl. Pair a Device dialog strings) -->
+<!ENTITY pairDevice.title.label             "Asociar un dispositivo">
 <!ENTITY addDevice.showMeHow.label          "Mostrarme cómo.">
 <!ENTITY addDevice.dontHaveDevice.label     "No tengo el dispositivo conmigo">
-<!ENTITY addDevice.setup.description.label  "Para activar, vaya a Opciones de &syncBrand.shortName.label; en su otro dispositivo y seleccione &#x0022;Agregar un dispositivo&#x0022;.">
+<!ENTITY pairDevice.setup.description.label  "Para activar, seleccione &#x0022;Asociar un dispositivo&#x0022; en su otro dispositivo.">
 <!ENTITY addDevice.setup.enterCode.label    "Ahí ingrese este código:">
-<!ENTITY addDevice.dialog.description.label "Para activar su nuevo dispositivo, vaya a Opciones de &syncBrand.shortName.label; en el dispositivo y seleccione &#x0022;Conectar.&#x0022;">
+<!ENTITY pairDevice.dialog.description.label "Para activar su nuevo dispositivo, seleccione &#x0022;Configurar Sync&#x0022; en el dispositivo.">
 <!ENTITY addDevice.dialog.enterCode.label   "Ingrese el código que provee el dispositivo:">
 <!ENTITY addDevice.dialog.tryAgain.label    "Intente nuevamente.">
 <!ENTITY addDevice.dialog.successful.label  "El dispositivo fue agregado exitosamente. La sincronización inicial puede tomar varios minutos y terminará en segundo plano.">
 <!ENTITY addDevice.dialog.recoveryKey.label     "Para activar su dispositivo necesitará ingresar su clave de recuperación. Imprima o guarde esta clave y téngala a mano.">
 <!ENTITY addDevice.dialog.connected.label   "Dispositivo conectado">
 
 <!-- Existing Account Page 2: Manual Login -->
 <!ENTITY setup.signInPage.title.label "Ingresar">
--- a/browser/chrome/overrides/appstrings.properties
+++ b/browser/chrome/overrides/appstrings.properties
@@ -42,16 +42,17 @@ connectionFailure = Firefox no puede establecer una conexión con el servidor en %S.
 netInterrupt = La conexión con %S fue interrumpida mientras la página se estaba cargando.
 netTimeout = El servidor en %S está tomando demasiado tiempo para responder.
 redirectLoop = Firefox ha detectado que el servidor está redirigiendo el pedido para %S en una forma que nunca se completará.
 ## LOCALIZATION NOTE (confirmRepostPrompt): In this item, don't translate "%S"
 confirmRepostPrompt=Para mostrar esta página, %S debe enviar información que repetirá cualquier acción (como una búsqueda o compra) que haya sido realizada anteriormente.
 resendButton.label=Reenviar
 unknownSocketType = Firefox no sabe como comunicarse con el servidor.
 netReset = La conexión con el servidor fue restablecida mientras se cargaba la página.
+notCached=Este documento ya no está disponible
 netOffline = Firefox está actualmente en modo sin conexión y no puede navegar la web.
 isprinting = El documento no puede cambiar mientras se esté imprimiendo o en vista previa.
 deniedPortAccess = Esta dirección usa un puerto de red normalemente usado para propósitos diferentes que la navegación web. Firefox ha cancelado el pedido para su protección.
 proxyResolveFailure = Firefox está configurado para usar un servidor proxy que no puede ser encontrado.
 proxyConnectFailure = Firefox está configurado para usar un servidor proxy que está rechazando las conexiones.
 contentEncodingError=La página que está tratando de ver no puede mostrarse porque usa un formato de compresión inválido o no soportado. Contacte a los dueños del sitio web para informarles de este problema.
 unsafeContentType=La página que está tratando de ver no puede mostrarse porque está contenida en un tipo de archivo que puede no ser seguro de abrir. Contacte a los dueños del sitio web para informarles de este problema.
 externalProtocolTitle = Pedido de protocolo externo
--- a/browser/chrome/overrides/netError.dtd
+++ b/browser/chrome/overrides/netError.dtd
@@ -47,16 +47,19 @@
   <li>Asegúrese de estar usando las barras correctas (ej.
     <strong>/</strong>).</li>
 </ul>
 ">
 
 <!ENTITY netInterrupt.title "La conexión fue interrumpida">
 <!ENTITY netInterrupt.longDesc "&sharedLongDesc;">
 
+<!ENTITY notCached.title "Documento expirado">
+<!ENTITY notCached.longDesc "<p>El documento solicitado no está disponible en caché de Firefox.</p><ul><li>Como una precaución de seguridad, Firefox no reenvía automáticamente documentos sensibles.</li><li>Haga clic en Intente nuevamente para solicitar el documento al sitio web nuevamente.</li></ul>">
+
 <!ENTITY netOffline.title "Modo sin conexión a la red">
 <!ENTITY netOffline.longDesc2 "
 <ul>
   <li>Presione &quot;Intente nuevamente&quot; para volver al modo con conexión y recargar la página.</li>
 </ul>
 ">
 
 <!ENTITY contentEncodingError.title "Error de codificación de contenido">
--- a/browser/profile/bookmarks.inc
+++ b/browser/profile/bookmarks.inc
@@ -9,22 +9,16 @@
 
 #define bookmarks_toolbarfolder Carpeta de barra de marcadores
 #define bookmarks_toolbarfolder_description Agregue marcadores a esta carpeta para verlos en la barra de marcadores
 
 # LOCALIZATION NOTE (getting_started):
 # link title for http://www.mozilla.com/en-US/firefox/central/
 #define getting_started Primeros pasos
 
-# LOCALIZATION NOTE (latest_headlines):
-# link title for the live bookmarks sample, a redirect on
-# http://fxfeeds.mozilla.com/en-US/firefox/headlines.xml
-# Changing the redirect is subject to approval of l10n-drivers.
-#define latest_headlines &#218;ltimas noticias
-
 # LOCALIZATION NOTE (firefox_heading):
 # Firefox links folder name
 #define firefox_heading Mozilla Firefox
 
 # LOCALIZATION NOTE (firefox_help):
 # link title for http://www.mozilla.com/en-US/firefox/help/
 #define firefox_help Ayuda y tutoriales
 
--- a/calendar/chrome/calendar/calendar.dtd
+++ b/calendar/chrome/calendar/calendar.dtd
@@ -317,17 +317,17 @@
 <!ENTITY calendarproperties.wcap.label     "Sun Java System Calendar Server (WCAP)">
 <!ENTITY calendarproperties.format.label   "Formato:">
 <!ENTITY calendarproperties.location.label "Dirección:">
 <!ENTITY calendarproperties.refreshInterval.label          "Refrescar calendario:">
 <!ENTITY calendarproperties.refreshInterval.manual.label   "Manualmente">
 <!ENTITY calendarproperties.name.label     "Nombre:">
 <!ENTITY calendarproperties.readonly.label "Sólo lectura">
 <!ENTITY calendarproperties.firealarms.label "Mostrar alarmas">
-<!ENTITY calendarproperties.cache.label    "Caché">
+<!ENTITY calendarproperties.cache2.label    "Caché">
 <!ENTITY calendarproperties.enabled.label "Cambiar a este calendario">
 <!ENTITY calendarproperties.forceDisabled.label            "No pudo encontrase el proveedor de este calendario. Ésto pasa a menudo si ha deshabilitado o desinstalado ciertos complementos.">
 <!ENTITY calendarproperties.unsubscribe.label              "Desuscribir">
 <!ENTITY calendarproperties.unsubscribe.accesskey          "U">
 
 <!-- Calendar Publish Dialog -->
 <!ENTITY calendar.publish.dialog.title              "Publicar Calendario">
 <!ENTITY calendar.publish.url.label                 "URL de publicación">
--- a/dom/chrome/appstrings.properties
+++ b/dom/chrome/appstrings.properties
@@ -41,16 +41,17 @@ protocolNotFound=%S no es un protocolo r
 connectionFailure=La conexión fue rechazada intentando contactar %S.
 netInterrupt=La conexión con %S ha terminado sorpresivamente. Algunos datos pueden haber sido transferidos.
 netTimeout=El intento de conexión con %S ha tomado mucho tiempo.
 redirectLoop=Se ha alcanzado el límite de redirecciones para esta dirección. La página no pudo ser cargada. Ésto puede ser causado por cookies bloqueadas.
 confirmRepostPrompt=Para mostrar esta página, la aplicación debe enviar información que repetirá cualquier acción (como una búsqueda o compra) que haya sido realizada anteriormente.
 resendButton.label=Reenviar
 unknownSocketType=Este documento no puede ser cargado a menos que se instale el Administrador de Seguridad (PSM). Baje e instale el PSM e intente de nuevo, o contacte al administrador.
 netReset=El documento no contiene datos.
+notCached=Este documento ya no está disponible.
 netOffline=Este documento no puede mostrarse sin conexión. Para conectarse, desmarque Trabajar Sin Conexión del menú Archivo.
 isprinting=El documento no se puede cambiar mientras se imprime o en vista previa.
 deniedPortAccess=El acceso al puerto solicitado ha sido deshabilitado por razones de seguridad.
 proxyResolveFailure=El proxy que ha configurado no puede ser encontrado. Verifique la configuración e intente nuevamente.
 proxyConnectFailure=La conexión fue rechazada al tratar de conectar el servidor proxy configurado. Verifique la configuración del proxy e intente nuevamente.
 contentEncodingError=La página que está tratando de ver no puede mostrarse porque usa una forma de compresión no válida o no soportada. Contacte a los dueños del sitio para informarles de este problema.
 unsafeContentType=La página que está tratando de ver no puede mostrarse porque está contenida en un tipo de archivo que puede no ser seguro de abrir. Contacte a los dueños del sitio web  contact the website owners para informarles de este problema.
 externalProtocolTitle=Pedido de protocolo externo
--- a/dom/chrome/dom/dom.properties
+++ b/dom/chrome/dom/dom.properties
@@ -105,20 +105,16 @@ RemoveChildWarning=El uso de attributes'
 AppendChildWarning=El uso de attributes' appendChild() es obsoleto. Use value en su lugar.
 CloneNodeWarning=El uso de attributes' cloneNode() es obsoleto.
 OwnerDocumentWarning=El uso de attributes' ownerDocument attribute es obsoleto.
 NormalizeWarning=El uso de attributes' normalize() es obsoleto.
 IsSupportedWarning=El uso de attributes' isSupported() es obsoleto.
 IsEqualNodeWarning=El uso de attributes' isEqualNode() es obsoleto.
 TextContentWarning=El uso de attributes' textContent attribute es obsoleto. Use value en su lugar.
 EnablePrivilegeWarning=El uso de enablePrivilege es obsoleto.  Use código que se ejecute con el sistea principal (ej. una extensión) en su lugar.
+PositionWarning=El uso del atributo de posición de progreso de eventos de XMLHttpRequest es obsoleto.
+TotalSizeWarning=El usoe del atributo totalSize de progreso de eventos de XMLHttpRequest es obsoleto.
 nsIJSONDecodeDeprecatedWarning=nsIJSON.decode es obsoleto.  Use JSON.parse en su lugar.
 nsIJSONEncodeDeprecatedWarning=nsIJSON.encode es obsoleto.  Use JSON.stringify en su lugar.
 nsIDOMWindowInternalWarning=El uso de nsIDOMWindowInternal es obsoleto. Use nsIDOMWindow en su lugar.
-IsSameNodeWarning=El uso de isSameNode es obsoleto.  Use A == B para buscar igualdad en su lugar.
-ReplaceWholeTextWarning=El uso de replaceWholeText es obsoleto. Llame a normalize() en el nivel padre y establezca el atributo data o use textContent en su lugar.
-XmlEncodingWarning=El uso de xmlEncoding es obsoleto.
-XmlVersionWarning=El uso de xmlVersion es obsoleto.
 InputEncodingWarning=El uso de inputEncoding es obsoleto.
-XmlStandaloneWarning=El uso de xmlStandalone es obsoleto.
-IsElementContentWhitespaceWarning=El uso de isElementContentWhitespaceWarning es obsoleto.
 GlobalStorageWarning=El uso de globalStorage es obsoleto. Use localStorage en su lugar.
 
new file mode 100644
--- /dev/null
+++ b/dom/chrome/layout/htmlparser.properties
@@ -0,0 +1,151 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is HTML parser error reporting code.
+#
+# The Initial Developer of the Original Code is
+# Mozilla Foundation.
+# Portions created by the Initial Developer are Copyright (C) 2011
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Henri Sivonen <hsivonen@iki.fi>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+# The bulk of the messages in this file are derived from 
+# http://hg.mozilla.org/projects/htmlparser/file/1f633cef7de7/src/nu/validator/htmlparser/impl/ErrorReportingTokenizer.java
+# which is available under the MIT license.
+
+# Tokenizer errors
+errGarbageAfterLtSlash=Garbage after \u201C</\u201D.
+errLtSlashGt=Saw \u201C</>\u201D. Probable causes: Unescaped \u201C<\u201D (escape as \u201C&lt;\u201D) or mistyped end tag.
+errCharRefLacksSemicolon=Character reference was not terminated by a semicolon.
+errNoDigitsInNCR=No digits in numeric character reference.
+errGtInSystemId=\u201C>\u201D in system identifier.
+errGtInPublicId=\u201C>\u201D in public identifier.
+errNamelessDoctype=Nameless doctype.
+errConsecutiveHyphens=Consecutive hyphens did not terminate a comment. \u201C--\u201D is not permitted inside a comment, but e.g. \u201C- -\u201D is.
+errPrematureEndOfComment=Premature end of comment. Use \u201C-->\u201D to end a comment properly.
+errBogusComment=Bogus comment.
+errUnquotedAttributeLt=\u201C<\u201D in an unquoted attribute value. Probable cause: Missing \u201C>\u201D immediately before.
+errUnquotedAttributeGrave=\u201C`\u201D in an unquoted attribute value. Probable cause: Using the wrong character as a quote.
+errUnquotedAttributeQuote=Quote in an unquoted attribute value. Probable causes: Attributes running together or a URL query string in an unquoted attribute value.
+errUnquotedAttributeEquals=\u201C=\u201D in an unquoted attribute value. Probable causes: Attributes running together or a URL query string in an unquoted attribute value.
+errSlashNotFollowedByGt=A slash was not immediate followed by \u201C>\u201D.
+errNoSpaceBetweenAttributes=No space between attributes.
+errUnquotedAttributeStartLt=\u201C<\u201D at the start of an unquoted attribute value. Probable cause: Missing \u201C>\u201D immediately before
+errUnquotedAttributeStartGrave=\u201C`\u201D at the start of an unquoted attribute value. Probable cause: Using the wrong character as a quote.
+errUnquotedAttributeStartEquals=\u201C=\u201D at the start of an unquoted attribute value. Probable cause: Stray duplicate equals sign.
+errAttributeValueMissing=Attribute value missing.
+errBadCharBeforeAttributeNameLt=Saw \u201C<\u201D when expecting an attribute name. Probable cause: Missing \u201C>\u201D immediately before.
+errEqualsSignBeforeAttributeName=Saw \u201C=\u201D when expecting an attribute name. Probable cause: Attribute name missing.
+errBadCharAfterLt=Bad character after \u201C<\u201D. Probable cause: Unescaped \u201C<\u201D. Try escaping it as \u201C&lt;\u201D.
+errLtGt=Saw \u201C<>\u201D. Probable causes: Unescaped \u201C<\u201D (escape as \u201C&lt;\u201D) or mistyped start tag.
+errProcessingInstruction=Saw \u201C<?\u201D. Probable cause: Attempt to use an XML processing instruction in HTML. (XML processing instructions are not supported in HTML.)
+errUnescapedAmpersandInterpretedAsCharacterReference=The string following \u201C&\u201D was interpreted as a character reference. (\u201C&\u201D probably should have been escaped as \u201C&amp;\u201D.)
+errNotSemicolonTerminated=Named character reference was not terminated by a semicolon. (Or \u201C&\u201D should have been escaped as \u201C&amp;\u201D.)
+errNoNamedCharacterMatch=\u201C&\u201D did not start a character reference. (\u201C&\u201D probably should have been escaped as \u201C&amp;\u201D.)
+errQuoteBeforeAttributeName=Saw a quote when expecting an attribute name. Probable cause: \u201C=\u201D missing immediately before.
+errLtInAttributeName=\u201C<\u201D in attribute name. Probable cause: \u201C>\u201D missing immediately before.
+errQuoteInAttributeName=Quote in attribute name. Probable cause: Matching quote missing somewhere earlier.
+errExpectedPublicId=Expected a public identifier but the doctype ended.
+errBogusDoctype=Bogus doctype.
+maybeErrAttributesOnEndTag=End tag had attributes.
+maybeErrSlashInEndTag=Stray \u201C/\u201D at the end of an end tag.
+errNcrNonCharacter=Character reference expands to a non-character.
+errNcrSurrogate=Character reference expands to a surrogate.
+errNcrControlChar=Character reference expands to a control character.
+errNcrCr=A numeric character reference expanded to carriage return.
+errNcrInC1Range=A numeric character reference expanded to the C1 controls range.
+errEofInPublicId=End of file inside public identifier.
+errEofInComment=End of file inside comment.
+errEofInDoctype=End of file inside doctype.
+errEofInAttributeValue=End of file reached when inside an attribute value. Ignoring tag.
+errEofInAttributeName=End of file occurred in an attribute name. Ignoring tag.
+errEofWithoutGt=Saw end of file without the previous tag ending with \u201C>\u201D. Ignoring tag.
+errEofInTagName=End of file seen when looking for tag name. Ignoring tag.
+errEofInEndTag=End of file inside end tag. Ignoring tag.
+errEofAfterLt=End of file after \u201C<\u201D.
+errNcrOutOfRange=Character reference outside the permissible Unicode range.
+errNcrUnassigned=Character reference expands to a permanently unassigned code point.
+errDuplicateAttribute=Duplicate attribute.
+errEofInSystemId=End of file inside system identifier.
+errExpectedSystemId=Expected a system identifier but the doctype ended.
+errMissingSpaceBeforeDoctypeName=Missing space before doctype name.
+errHyphenHyphenBang=\u201C--!\u201D found in comment.
+errNcrControlChar=Character reference expands to a control character.
+errNcrZero=Character reference expands to zero.
+errNoSpaceBetweenDoctypeSystemKeywordAndQuote=No space between the doctype \u201CSYSTEM\u201D keyword and the quote.
+errNoSpaceBetweenPublicAndSystemIds=No space between the doctype public and system identifiers.
+errNoSpaceBetweenDoctypePublicKeywordAndQuote=No space between the doctype \u201CPUBLIC\u201D keyword and the quote.
+
+# Tree builder errors
+errStrayStartTag2=Stray start tag “%1$S”.
+errStrayEndTag=Stray end tag \u201C%1$S\u201D.
+errUnclosedElements=End tag \u201C%1$S\u201D seen, but there were open elements.
+errUnclosedElementsImplied=End tag \u201C%1$S\u201D implied, but there were open elements.
+errUnclosedElementsCell=A table cell was implicitly closed, but there were open elements.
+errStrayDoctype=Stray doctype.
+errAlmostStandardsDoctype=Almost standards mode doctype. Expected \u201C<!DOCTYPE html>\u201D.
+errQuirkyDoctype=Quirky doctype. Expected \u201C<!DOCTYPE html>\u201D.
+errNonSpaceInTrailer=Non-space character in page trailer.
+errNonSpaceAfterFrameset=Non-space after \u201Cframeset\u201D.
+errNonSpaceInFrameset=Non-space in \u201Cframeset\u201D.
+errNonSpaceAfterBody=Non-space character after body.
+errNonSpaceInColgroupInFragment=Non-space in \u201Ccolgroup\u201D when parsing fragment.
+errNonSpaceInNoscriptInHead=Non-space character inside \u201Cnoscript\u201D inside \u201Chead\u201D.
+errFooBetweenHeadAndBody=\u201C%1$S\u201D element between \u201Chead\u201D and \u201Cbody\u201D.
+errStartTagWithoutDoctype=Start tag seen without seeing a doctype first. Expected \u201C<!DOCTYPE html>\u201D.
+errNoSelectInTableScope=No \u201Cselect\u201D in table scope.
+errStartSelectWhereEndSelectExpected=\u201Cselect\u201D start tag where end tag expected.
+errStartTagWithSelectOpen=\u201C%1$S\u201D start tag with \u201Cselect\u201D open.
+errBadStartTagInHead=Bad start tag in \u201C%1$S\u201D in \u201Chead\u201D.
+errImage=Saw a start tag \u201Cimage\u201D.
+errIsindex=\u201Cisindex\u201D seen.
+errFooSeenWhenFooOpen=An \u201C%1$S\u201D start tag seen but an element of the same type was already open.
+errHeadingWhenHeadingOpen=Heading cannot be a child of another heading.
+errFramesetStart=\u201Cframeset\u201D start tag seen.
+errNoCellToClose=No cell to close.
+errStartTagInTable=Start tag \u201C%1$S\u201D seen in \u201Ctable\u201D.
+errFormWhenFormOpen=Saw a \u201Cform\u201D start tag, but there was already an active \u201Cform\u201D element. Nested forms are not allowed. Ignoring the tag.
+errTableSeenWhileTableOpen=Start tag for \u201Ctable\u201D seen but the previous \u201Ctable\u201D is still open.
+errStartTagInTableBody=\u201C%1$S\u201D start tag in table body.
+errEndTagSeenWithoutDoctype=End tag seen without seeing a doctype first. Expected \u201C<!DOCTYPE html>\u201D.
+errEndTagAfterBody=Saw an end tag after \u201Cbody\u201D had been closed.
+errEndTagSeenWithSelectOpen=\u201C%1$S\u201D end tag with \u201Cselect\u201D open.
+errGarbageInColgroup=Garbage in \u201Ccolgroup\u201D fragment.
+errEndTagBr=End tag \u201Cbr\u201D.
+errNoElementToCloseButEndTagSeen=No \u201C%1$S\u201D element in scope but a \u201C%1$S\u201D end tag seen.
+errHtmlStartTagInForeignContext=HTML start tag \u201C%1$S\u201D in a foreign namespace context.
+errTableClosedWhileCaptionOpen=\u201Ctable\u201D closed but \u201Ccaption\u201D was still open.
+errNoTableRowToClose=No table row to close.
+errNonSpaceInTable=Misplaced non-space characters insided a table.
+errUnclosedChildrenInRuby=Unclosed children in \u201Cruby\u201D.
+errStartTagSeenWithoutRuby=Start tag \u201C%1$S\u201D seen without a \u201Cruby\u201D element being open.
+errSelfClosing=Self-closing syntax (\u201C/>\u201D) used on a non-void HTML element. Ignoring the slash and treating as a start tag.
+errNoCheckUnclosedElementsOnStack=Unclosed elements on stack.
+errEndTagDidNotMatchCurrentOpenElement=End tag \u201C%1$S\u201D did not match the name of the current open element (\u201C%2$S\u201D).
+errEndTagViolatesNestingRules=End tag \u201C%1$S\u201D violates nesting rules.
--- a/dom/chrome/netError.dtd
+++ b/dom/chrome/netError.dtd
@@ -19,16 +19,19 @@
 <!ENTITY generic.longDesc "<p>No hay información adicional sobre este problema o error disponible actualmente.</p>">
 
 <!ENTITY malformedURI.title "Dirección inválida">
 <!ENTITY malformedURI.longDesc "<p>La dirección provista no tiene un formato reconocible. Verifique la barra de direcciones por errores e intente nuevamente.</p>">
 
 <!ENTITY netInterrupt.title "Transferencia de datos interrumpida">
 <!ENTITY netInterrupt.longDesc "<p>El navegador conectó exitosamente, pero la conexión fue interrumpida al transferir información.  Intente nuevamente.</p><ul><li>¿No puede navegar otros sitios?  Verifique la conexión a la red de su computadora.</li><li>¿Todavía tiene problemas? Consulte a su administrador de red o a su proveedor de Internet por asistencia.</li></ul>">
 
+<!ENTITY notCached.title "Documento expirado">
+<!ENTITY notCached.longDesc "<p>El documento solicitado no está disponible en caché del navegador.</p><ul><li>Como una precaución de seguridad, el navegador no reenvía automáticamente documentos sensibles.</li><li>Haga clic en Intente nuevamente para solicitar el documento al sitio web nuevamente.</li></ul>">
+
 <!ENTITY netOffline.title "Modo sin conexión a la red">
 <!ENTITY netOffline.longDesc2 "<p>El navegador está actualmente funcionando en el modo sin conexión a la red y no puede conectarse al ítem solicitado.</p><ul><li>¿Está la computadora conectada a una red activa?</li><li>Presione &quot;Intente nuevamente&quot; para volver al modo con conexión y recargar la página.</li></ul>">
 
 <!ENTITY contentEncodingError.title "Error de codificación de contenido">
 <!ENTITY contentEncodingError.longDesc "<p>La página que está tratando de ver no puede ser mostrada porque usa una forma de compresión no válida o no soportada.</p><ul><li>Contacte a los dueños del sitio para informarles sobre este problema.</li></ul>">
 
 <!ENTITY unsafeContentType.title "Tipo de archivo inseguro">
 <!ENTITY unsafeContentType.longDesc "
new file mode 100644
--- /dev/null
+++ b/editor/ui/chrome/composer/editingOverlay.dtd
@@ -0,0 +1,71 @@
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is Mozilla Communicator client code, released
+   - March 31, 1998.
+   -
+   - The Initial Developer of the Original Code is
+   - Netscape Communications Corporation.
+   - Portions created by the Initial Developer are Copyright (C) 1999-2000
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -   Sammy Ford
+   -   Blake Ross
+   -   Ryan Cassin (rcassin@supernova.org)
+   -   Daniel Glazman (glazman@netscape.com)
+   -   Stephen Donner (technutz@netscape.net)
+   -   Charles Manske (cmanske@netscape.com)
+   -   Ian Neal (iann_bugzilla@blueyonder.co.uk)
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either of the GNU General Public License Version 2 or later (the "GPL"),
+   - or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the GPL or the LGPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<!-- File menu items -->
+<!ENTITY openFileCmd.label "Abrir archivo…">
+<!ENTITY openFileCmd.accesskey "a">
+<!ENTITY openFileCmd.key "a">
+<!ENTITY openRemoteCmd.label "Abrir dirección…">
+<!ENTITY openRemoteCmd.accesskey "d">
+<!ENTITY openRemoteCmd.key "d">
+<!ENTITY fileRecentMenu.label "Páginas recientes">
+<!ENTITY fileRecentMenu.accesskey "r">
+<!ENTITY saveCmd.label "Guardar">
+<!ENTITY saveCmd.accesskey "G">
+<!ENTITY saveAsCmd.label "Guardar como…">
+<!ENTITY saveAsCmd.accesskey "A">
+<!ENTITY saveAsChangeEncodingCmd.label "Guardar y cambiar codif. de caracteres">
+<!ENTITY saveAsChangeEncodingCmd.accesskey "d">
+<!ENTITY publishCmd.label "Publicar">
+<!ENTITY publishCmd.accesskey "b">
+<!ENTITY publishCmd.key "S">
+<!ENTITY publishAsCmd.label "Publicar como…">
+<!ENTITY publishAsCmd.accesskey "m">
+<!ENTITY fileRevert.label "Revertir">
+<!ENTITY fileRevert.accesskey "t">
+
+<!-- Edit menu items -->
+<!ENTITY publishSettings.label "Configuración de sitio de publicación…">
+<!ENTITY publishSettings.accesskey "b">
+
--- a/editor/ui/chrome/composer/editorOverlay.dtd
+++ b/editor/ui/chrome/composer/editorOverlay.dtd
@@ -38,52 +38,24 @@
    - the provisions above, a recipient may use your version of this file under
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <!-- Attn: Localization - some of the menus in this dialog directly affect mail also. -->
 
 <!-- File menu items -->
-<!ENTITY fileMenu.label "Archivo">
-<!ENTITY fileMenu.accesskey "A">
-<!ENTITY openFileCmd.label "Abrir archivo…">
-<!ENTITY openFileCmd.accesskey "a">
-<!ENTITY openFileCmd.key "a">
-<!ENTITY openRemoteCmd.label "Abrir dirección…">
-<!ENTITY openRemoteCmd.accesskey "d">
-<!ENTITY openRemoteCmd.key "d">
-<!ENTITY fileRecentMenu.label "Páginas recientes">
-<!ENTITY fileRecentMenu.accesskey "r">
-<!ENTITY fileRevert.label "Volver a la última copia guardada">
-<!ENTITY fileRevert.accesskey "v">
-<!ENTITY saveCmd.label "Guardar">
-<!ENTITY saveCmd.accesskey "G">
 <!ENTITY saveCmd.key "G">
-<!ENTITY saveAsCmd.label "Guardar como…">
-<!ENTITY saveAsCmd.accesskey "A">
-
-<!ENTITY publishCmd.label "Publicar">
-<!ENTITY publishCmd.accesskey "b">
-<!ENTITY publishCmd.key "S">
-<!ENTITY publishAsCmd.label "Publicar como…">
-<!ENTITY publishAsCmd.accesskey "m">
-<!ENTITY saveAsChangeEncodingCmd.label "Guardar y cambiar codif. de caracteres">
-<!ENTITY saveAsChangeEncodingCmd.accesskey "d">
 
 <!-- Edit menu items -->
-<!ENTITY editMenu.label "Editar">
-<!ENTITY editMenu.accesskey "e">
 <!ENTITY pasteNoFormatting.label "Pegar sin formato">
 <!ENTITY pasteNoFormatting.accesskey "f">
 <!ENTITY pasteNoFormatting.key "V">
 <!ENTITY pasteAs.label "Pegar como">
 <!ENTITY pasteAs.accesskey "a">
-<!ENTITY publishSettings.label "Configuración de sitio de publicación…">
-<!ENTITY publishSettings.accesskey "b">
 <!ENTITY pasteAsQuotationCmd.label "Pegar como cita">
 <!ENTITY pasteAsQuotationCmd.accesskey "g">
 <!ENTITY pasteAsQuotationCmd.key "o">
 <!ENTITY findCmd.label "Buscar y reemplazar…">
 <!ENTITY enableInlineSpellChecker.label "Ortografía mientras tipea">
 <!ENTITY enableInlineSpellChecker.accesskey "O">
 <!ENTITY checkSpellingCmd2.label "Revisar ortografía">
 <!ENTITY checkSpellingCmd2.accesskey "g">
@@ -205,17 +177,17 @@
 <!ENTITY formatFontColor.accesskey "c">
 <!ENTITY tableOrCellColor.label "Color de fondo de la tabla o celda…">
 <!ENTITY tableOrCellColor.accesskey "b">
 
 <!ENTITY formatRemoveStyles.key "y">
 <!ENTITY formatRemoveLinks.key "k">
 <!ENTITY formatRemoveNamedAnchors.label "Eliminar enlaces internos con nombre">
 <!ENTITY formatRemoveNamedAnchors.accesskey "m">
-<!ENTITY formatRemoveNamedAnchors.key "a">
+<!ENTITY formatRemoveNamedAnchors2.key "r">
 
 <!ENTITY paragraphMenu.label "Párrafo">
 <!ENTITY paragraphMenu.accesskey "P">
 <!ENTITY paragraphParagraphCmd.label "Párrafo">
 <!ENTITY paragraphParagraphCmd.accesskey "P">
 <!ENTITY heading1Cmd.label "Título 1">
 <!ENTITY heading1Cmd.accesskey "1">
 <!ENTITY heading2Cmd.label "Título 2">
--- a/mail/chrome/messenger/addressbook/abMainWindow.dtd
+++ b/mail/chrome/messenger/addressbook/abMainWindow.dtd
@@ -86,18 +86,20 @@
 <!ENTITY showTaskbarCmd.label "Barra de estado">
 <!ENTITY showTaskbarCmd.accesskey "s">
 <!ENTITY customizeToolbar.label "Personalizar…">
 <!ENTITY customizeToolbar.accesskey "P">
 <!ENTITY showContactPane.label                          "Vista de resumen de contactos">
 <!ENTITY showContactPane.accesskey                      "C">
 <!ENTITY menu_ShowNameAs.label "Mostrar nombre como">
 <!ENTITY menu_ShowNameAs.accesskey "n">
-<!ENTITY firstLastCmd.label "Nombre, apellido">
-<!ENTITY firstLastCmd.accesskey "N">
+<!-- LOCALIZATION NOTE (firstLastCmd2.label): We're not including a comma here
+because displayed names don't have the comma in between. -->
+<!ENTITY firstLastCmd2.label                            "Nombre y apellido">
+<!ENTITY firstLastCmd2.accesskey                        "N">
 <!ENTITY lastFirstCmd.label "Apellido, nombre">
 <!ENTITY lastFirstCmd.accesskey "l">
 <!ENTITY displayNameCmd.label "Nombre mostrado">
 <!ENTITY displayNameCmd.accesskey "d">
 <!ENTITY sortMenu.label "Ordenar por">
 <!ENTITY sortMenu.accesskey "O">
 
 <!-- Tools Menu -->
--- a/mail/chrome/messenger/messenger.properties
+++ b/mail/chrome/messenger/messenger.properties
@@ -561,16 +561,19 @@ headerreply-toFieldMe=Yo
 # LOCALIZATION NOTE (headerccFieldMe): first person prepositional object
 # pronoun used in the "cc" header of the message header pane.
 headerccFieldMe=Yo
 
 # LOCALIZATION NOTE (headerbccFieldMe): first person prepositional object
 # pronoun used in the "bcc" header of the message header pane.
 headerbccFieldMe=Yo
 
+expandAttachmentPaneTooltip=Mostrar el panel de adjuntos
+collapseAttachmentPaneTooltip=Ocultar el panel de adjuntos
+
 # Shown when content tabs are being loaded.
 loadingTab=Cargando…
 
 # LOCALIZATION NOTE (xpinstallPromptWarning):
 # %1$S is replaced by brandShortName, %2$S is replaced by the host name of the
 # site.
 xpinstallPromptWarning=%1$S evitó que el sitio (%2$S) le pidiera instalar software en su computadora.
 xpinstallPromptAllowButton=Permitir
--- a/mobile/chrome/aboutHome.dtd
+++ b/mobile/chrome/aboutHome.dtd
@@ -14,10 +14,19 @@
 <!-- LOCALIZATION NOTE:
      (aboutHome.downloadAurora): First line of a multi-line button. Treat as a title.
 -->
 <!ENTITY aboutHome.downloadAurora		"Descargá Aurora">
 <!-- LOCALIZATION NOTE:
      (aboutHome.forAndroid): Second line of a multi-line button. Treat as a subtitle.
 -->
 <!ENTITY aboutHome.forAndroid			"para Android">
+<!-- LOCALIZATION NOTE:
+     (aboutHome.setupSync): This string should match the desktop
+     equivalent, in particular concerning syncBrand.fullName.label.
+-->
+<!ENTITY aboutHome.setupSync      "Configurar Sync">
+<!-- LOCALIZATION NOTE:
+     (aboutHome.syncPairDevice): This string should match the desktop
+     equivalent, in particular concerning syncBrand.fullName.label.
+-->
+<!ENTITY aboutHome.syncPairDevice       "Asociar un dispositivo">
 
-
--- a/mobile/chrome/overrides/appstrings.properties
+++ b/mobile/chrome/overrides/appstrings.properties
@@ -42,16 +42,17 @@ connectionFailure=Firefox no puede establecer una conexión con el servidor en %S.
 netInterrupt=La conexión con %S fue interrumpida mientras la página se estaba cargando.
 netTimeout=El servidor en %S está tomando demasiado tiempo en responder.
 redirectLoop=Firefox ha detectado que el servidor está redirigiendo el pedido para esta dirección en una forma que nunca se completará.
 ## LOCALIZATION NOTE (confirmRepostPrompt): In this item, don't translate "%S"
 confirmRepostPrompt=Para mostrar esta página, %S debe enviar información que repetirá cualquier acción (como una búsqueda o confirmación de una orden) que haya hecho anteriormente.
 resendButton.label=Reenviar
 unknownSocketType=Firefox no sabe como comunicarse con el servidor.
 netReset=La conexión con el servidor fue restablecida mientras se cargaba la página.
+notCached=Este documento no está más disponible.
 netOffline=Firefox está actualmente en modo sin conexión y no puede navegar la web.
 isprinting=El documento no puede cambiar mientras se esté imprimiendo o en vista previa.
 deniedPortAccess=Esta dirección usa un puerto de red normalemente usado para propósitos diferentes que la navegación web. Firefox ha cancelado el pedido para tu protección.
 proxyResolveFailure=Firefox está configurado para usar un servidor proxy que no puede ser encontrado.
 proxyConnectFailure=Firefox está configurado para usar un servidor proxy que está rechazando las conexiones.
 contentEncodingError=La página que estás tratando de ver no puede mostrarse porque usa un formato de compresión no válido o no soportado.
 unsafeContentType=La página que está tratando de ver no puede mostrarse porque está contenida en un tipo de archivo que puede no ser seguro de abrir. Contacte a los dueños del sitio web para informarles de este problema.
 externalProtocolTitle=Pedido de protocolo externo
--- a/mobile/chrome/overrides/netError.dtd
+++ b/mobile/chrome/overrides/netError.dtd
@@ -40,16 +40,19 @@
   <li>Las direcciones web por lo general se escriben como <strong>http://www.ejemplo.com/</strong></li>
   <li>Asegurate de estar usando las barras diagonales (ej. <strong>/</strong>).</li>
 </ul>
 ">
 
 <!ENTITY netInterrupt.title "La conexión fue interrumpida">
 <!ENTITY netInterrupt.longDesc "&sharedLongDesc2;">
 
+<!ENTITY notCached.title "Documento expirado">
+<!ENTITY notCached.longDesc "<p>El documento solicitado no está disponible en el caché de &brandShortName;.</p><ul><li>Como una precaución de seguridad, &brandShortName; no vuelve a solicitar documentos sensibles automáticamente.</li><li>Haga clic en Intentar nuevamente para solicitar el documento de nuevo al sitio web.</li></ul>">
+
 <!ENTITY netOffline.title "Modo sin conexión a la red">
 <!ENTITY netOffline.longDesc2 "
 <ul>
   <li>Probá nuevamente. &brandShortName; intentará abrir una conexión y recargar la página.</li>
 </ul>
 ">
 
 <!ENTITY contentEncodingError.title "Error de codificación de contenido">
--- a/mobile/chrome/sync.dtd
+++ b/mobile/chrome/sync.dtd
@@ -3,19 +3,26 @@
 <!ENTITY sync.connect               "Conectar">
 <!ENTITY sync.connected             "Conectado">
 <!ENTITY sync.details               "Detalles">
 <!ENTITY sync.deviceName            "Este dispositivo">
 <!ENTITY sync.disconnect            "Desconectar">
 <!ENTITY sync.syncNow               "Sincronizar ahora">
 
 <!ENTITY sync.setup.title           "Conectar a Sync">
-<!ENTITY sync.setup.jpake           "Desde una computadora conectada con Firefox Sync, andá a Opciones de Sync y seleccioná &#x0022;Agregar un dispositivo&#x0022;">
+<!ENTITY sync.setup.pair            "Para activar, seleccioná &#x0022;Asociar un dispositivo&#x0022; en tu otro dispositivo.">
 <!ENTITY sync.fallback              "No estoy cerca de mi computadora…">
 <!ENTITY sync.setup.manual          "Ingresá tu información de cuenta de Sync">
 <!ENTITY sync.account               "Nombre de cuenta">
 <!ENTITY sync.password              "Contraseña">
 <!ENTITY sync.recoveryKey           "Clave de recuperación">
 <!ENTITY sync.customServer          "Usar servidor personalizado">
 <!ENTITY sync.serverURL             "URL del servidor">
 <!ENTITY sync.setup.connect         "Conectar">
 <!ENTITY sync.setup.cancel          "Cancelar">
 <!ENTITY sync.setup.tutorial        "Mostrarme cómo">
+<!ENTITY sync.setup.waiting2        "Esperando al otro dispositivo…">
+
+<!ENTITY sync.pair.title            "Asociar un dispositivo">
+<!ENTITY sync.pair.description      "Para activar tu nuevo dispositivo, seleccioná &#x0022;Configurar Sync&#x0022; en el dispositivo.">
+<!ENTITY sync.setup.close           "Cerrar">
+<!ENTITY sync.setup.waitingdownload "Tus datos ahora están siendo descargados en segundo plano. Podés cerrar esta ventana en cualquier momento.">
+
--- a/security/manager/chrome/pipnss/pipnss.properties
+++ b/security/manager/chrome/pipnss/pipnss.properties
@@ -349,17 +349,16 @@ certErrorTrust_MissingChain=El certifica
 certErrorTrust_CaInvalid=El certificado no es confiable porque fue emitido por una CA no válida.
 certErrorTrust_Issuer=El certificado no es confiable porque el certificado del emisor no es confiable.
 certErrorTrust_ExpiredIssuer=El certificado no es confiable porque el certificado del emisor ha expirado.
 certErrorTrust_Untrusted=El certificado no viene de una fuente confiable.
 
 certErrorMismatch=El certificado no es válido para el dominio %S.
 # LOCALIZATION NOTE (certErrorMismatchSingle2): Do not translate <a id="cert_domain_link" title="%1$S">%1$S</a>
 certErrorMismatchSingle2=El certificado solamente es válido para <a id="cert_domain_link" title="%1$S">%1$S</a>.
-certErrorMismatchSinglePlain=El certificado solamente es válido para %S
 certErrorMismatchMultiple=El certificado solamente es válido para los siguientes nombres:
 certErrorMismatchNoNames=El certificado no es válido para ningún nombre de servidor.
 
 # LOCALIZATION NOTE (certErrorExpiredNow): Do not translate %1$S (date+time of expired certificate) or %2$S (current date+time)
 certErrorExpiredNow=El certificado ha expirado el %1$S. La fecha actual es %2$S.
 # LOCALIZATION NOTE (certErrorNotYetValidNow): Do not translate %1$S (date+time certificate will become valid) or %2$S (current date+time)
 certErrorNotYetValidNow=El certificado no será válido hasta %1$S. La fecha actual es %2$S.
 
--- a/services/sync/errors.properties
+++ b/services/sync/errors.properties
@@ -10,15 +10,14 @@ error.sync.failed_partial     = Uno o más tipos de datos no pudieron ser sincronizados
 error.sync.reason.server_maintenance = El servidor de Firefox Sync está en mantenimiento, la sincronización reiniciará automáticamente.
 
 invalid-captcha = Palabras incorrectas, inténtelo nuevamente
 weak-password   = Use una contraseña más segura
 
 # this is the fallback, if we hit an error we didn't bother to localize
 error.reason.unknown          = Error desconocido
 
-change.password.pwSameAsRecoveryKey  = La contraseña no puede ser igual a la clave de recuperación
 change.password.pwSameAsPassword     = La contraseña no puede ser igual a la contraseña actual
 change.password.pwSameAsUsername     = La contraseña no puede ser igual al nombre de usuario
 change.password.pwSameAsEmail        = La contraseña no puede ser igual a la dirección de correo electrónico
 change.password.mismatch             = Las contraseñas ingresadas no son iguales
 change.password.tooShort             = La contraseña ingresada es muy corta
 
--- a/suite/chrome/common/contentAreaCommands.dtd
+++ b/suite/chrome/common/contentAreaCommands.dtd
@@ -99,16 +99,22 @@
 <!ENTITY mediaUnmute.label            "Escuchar">
 <!ENTITY mediaUnmute.accesskey        "E">
 <!ENTITY mediaShowControls.label      "Mostrar controles de medios">
 <!ENTITY mediaShowControls.accesskey  "a">
 <!ENTITY mediaHideControls.label      "Ocultar controles de medios">
 <!ENTITY mediaHideControls.accesskey  "a">
 <!ENTITY videoFullScreen.label        "Pantalla completa">
 <!ENTITY videoFullScreen.accesskey    "l">
+<!ENTITY videoSaveImage.label         "Guardar captura como…">
+<!ENTITY videoSaveImage.accesskey     "G">
+<!ENTITY videoShowStats.label         "Mostrar estadísticas">
+<!ENTITY videoShowStats.accesskey     "t">
+<!ENTITY videoHideStats.label         "Ocultar estadísticas">
+<!ENTITY videoHideStats.accesskey     "t">
 <!ENTITY search.accesskey             "W">
 <!ENTITY bidiSwitchPageDirectionItem.label        "Cambiar dirección de la página">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey    "g">
 <!ENTITY bidiSwitchTextDirectionItem.label        "Cambiar dirección del texto">
 <!ENTITY bidiSwitchTextDirectionItem.accesskey    "C">
 <!ENTITY spellAddToDictionary.label     "Agregar al diccionario">
 <!ENTITY spellAddToDictionary.accesskey "o">
 <!ENTITY spellIgnoreWord.label          "Ignorar palabra">
--- a/suite/chrome/common/pref/pref-advanced.dtd
+++ b/suite/chrome/common/pref/pref-advanced.dtd
@@ -4,8 +4,13 @@
 <!ENTITY systemPref.caption         "Preferencias del sistema">
 <!ENTITY systemPrefCheck.label      "Usar las preferencias del sistema">
 <!ENTITY systemPrefCheck.accesskey  "U">
 <!ENTITY systemPref.desc            "Con esta opción, &brandShortName; hereda las preferencias del sistema. Las preferencias del sistema se usarán en lugar de las preferencias de &brandShortName;.">
 
 <!ENTITY prefCheckDefault.caption   "Integración con el sistema">
 <!ENTITY prefCheckDefaultClient.label "Verificar las opciones predeterminadas de la aplicación al iniciar">
 <!ENTITY prefCheckDefaultClient.accesskey "c">
+
+<!ENTITY crashReports.caption       "Informe de fallos">
+<!ENTITY submitCrashes.label        "Enviar informe de fallos">
+<!ENTITY submitCrashes.accesskey    "s">
+
--- a/suite/chrome/common/sync/syncGenericChange.properties
+++ b/suite/chrome/common/sync/syncGenericChange.properties
@@ -9,17 +9,16 @@ change.password.status.error = Hubo un error al cambiar la contraseña.
 change.password3.introText = La contraseña debe tener al menos 8 caracteres de longitud.  No puede ser igual que su nombre ni que su clave de recuperación.
 change.password.warningText = Nota: Todos sus otros dispositivos no se podrán conectar a su cuenta una vez que cambie esta contraseña.
 
 change.recoverykey.title = Mi clave de recuperación
 change.recoverykey.acceptButton = Cambiar clave de recuperación
 change.recoverykey.label = Cambiando clave de recuperación y subiendo datos locales, espere…
 change.recoverykey.error = ¡Hubo un error al cambiar la clave de recuperación!
 change.recoverykey.success = ¡La clave de recuperación se cambió exitosamente!
-change.recoverykey.introText    = SeaMonkey se preocupa por su privacidad
 change.recoverykey.introText2   = Para asegurar su total privacidad, todos sus datos son cifrados antes de ser subidos. La clave para descifrar sus datos no es subida.
 # LOCALIZATION NOTE (change.recoverykey.warningText) "Sync" should match &syncBrand.shortName.label; from syncBrand.dtd
 change.recoverykey.warningText = Nota: Cambiar ésto borrará todos los datos guardados en el servidor Sync y subirá datos nuevos asegurados por esta clave de recuperación. Sus otros dispositivos no se sincronizarán hasta que la nueva clave de recuperación se ingrese en ese dispositivo.
 
 new.recoverykey.label = Su clave de recuperación
 
 # LOCALIZATION NOTE (new.password.title): This (and associated new.password/passphrase) are used on a second computer when it detects that your password or passphrase has been changed on a different device.
 new.password.title = Actualizar contraseña
--- a/suite/chrome/common/sync/syncSetup.dtd
+++ b/suite/chrome/common/sync/syncSetup.dtd
@@ -39,18 +39,17 @@
 <!ENTITY setup.tosAgree3.label "">
 <!ENTITY setup.tosAgree2.accesskey "">
 
 <!-- New Account Page 2: Sync Key -->
 <!ENTITY setup.newRecoveryKeyPage.title.label "&brandShortName; se preocupa por su privacidad">
 <!ENTITY setup.newRecoveryKeyPage.description.label "Para asegurar su total privacidad, todos sus datos son cifrados antes de ser subidos. La clave de recuperacion necesaria para descifrar sus datos no es subida.">
 <!ENTITY recoveryKeyEntry.label        "Su clave de recuperación">
 <!ENTITY recoveryKeyEntry.accesskey    "r">
-<!ENTITY recoveryKeyGenerate.label     "Generar">
-<!ENTITY recoveryKeyGenerate.accesskey "G">
+<!ENTITY recoveryGenerateNewKey.label  "Generar una nueva clave">
 <!ENTITY recoveryKeyBackup.description "Se requiere su clave de recuperación para acceder a &syncBrand.fullName.label; en otros dispositivos. Debe crear una copia de seguridad. No podemos ayudarlo a recuperar su clave de recuperación.">
 
 <!ENTITY button.syncKeyBackup.print.label     "Imprimir…">
 <!ENTITY button.syncKeyBackup.print.accesskey "p">
 <!ENTITY button.syncKeyBackup.save.label      "Guardar…">
 <!ENTITY button.syncKeyBackup.save.accesskey  "G">
 
 <!-- New Account Page 3: Captcha -->
--- a/suite/chrome/mailnews/compose/messengercompose.dtd
+++ b/suite/chrome/mailnews/compose/messengercompose.dtd
@@ -36,17 +36,16 @@
 <!ENTITY sendLaterCmd.label "Enviar más tarde">
 <!ENTITY sendLaterCmd.keycode "VK_RETURN">
 <!ENTITY sendLaterCmd.accesskey "E">
 
 <!-- Edit menu items -->
 <!ENTITY editRewrapCmd.label "Reajuste de línea">
 <!ENTITY editRewrapCmd.key "R">
 <!ENTITY editRewrapCmd.accesskey  "R">
-<!ENTITY findCmd.label "Buscar y reemplazar…">
 <!ENTITY accountManagerCmd.label "Opciones de cuentas de correo y noticias…">
 <!ENTITY accountManagerCmd.accesskey "O">
 
 <!-- View menu items -->
 <!ENTITY showComposeToolbarCmd.label "Barra de herramientas de correo">
 <!ENTITY showComposeToolbarCmd.accesskey "o">
 <!ENTITY showFormatToolbarCmd.label "Barra de herramientas de formato">
 <!ENTITY showFormatToolbarCmd.accesskey "f">
@@ -60,21 +59,16 @@
 <!ENTITY optionsMenu.accesskey "p">
 
 <!ENTITY quoteCmd.label "Citar mensaje">
 <!ENTITY quoteCmd.accesskey "C">
 <!ENTITY selectAddressCmd.label "Seleccionar direcciones…">
 <!ENTITY selectAddressCmd.key "">
 <!ENTITY selectAddressCmd.accesskey "a">
 
-<!ENTITY checkSpellingCmd2.label "Verificar ortografía…">
-<!ENTITY checkSpellingCmd2.accesskey "V">
-<!ENTITY enableInlineSpellChecker.label "Ortografía mientras tipea">
-<!ENTITY enableInlineSpellChecker.accesskey "s">
-
 <!ENTITY priorityMenu.label "Prioridad">
 <!ENTITY priorityMenu.accesskey "P">
 <!ENTITY lowestPriorityCmd.label "La más baja">
 <!ENTITY lowestPriorityCmd.accesskey "L">
 <!ENTITY lowPriorityCmd.label "Baja">
 <!ENTITY lowPriorityCmd.accesskey "B">
 <!ENTITY normalPriorityCmd.label "Normal">
 <!ENTITY normalPriorityCmd.accesskey "N">
new file mode 100644
--- /dev/null
+++ b/suite/chrome/mailnews/mailKeysOverlay.dtd
@@ -0,0 +1,60 @@
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is SeaMonkey MailNews.
+   -
+   - The Initial Developer of the Original Code is
+   - the Mozilla Foundation.
+   - Portions created by the Initial Developer are Copyright (C) 2011
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -   Jens Hatlak <jh@junetz.de>
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the GPL or the LGPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<!ENTITY markAsReadCmd.label      "Como leídos">
+<!ENTITY markAsReadCmd.accesskey  "l">
+<!ENTITY markAsReadCmd.key        "m">
+
+<!ENTITY markFlaggedCmd.label     "Destacado">
+<!ENTITY markFlaggedCmd.accesskey "D">
+<!ENTITY markFlaggedCmd.key       "i">
+
+<!ENTITY openMessageWindowCmd.label     "Abrir mensaje">
+<!ENTITY openMessageWindowCmd.accesskey "A">
+<!ENTITY openMessageWindowCmd.key       "o">
+
+<!ENTITY tagCmd0.key "0">
+<!ENTITY tagCmd1.key "1">
+<!ENTITY tagCmd2.key "2">
+<!ENTITY tagCmd3.key "3">
+<!ENTITY tagCmd4.key "4">
+<!ENTITY tagCmd5.key "5">
+<!ENTITY tagCmd6.key "6">
+<!ENTITY tagCmd7.key "7">
+<!ENTITY tagCmd8.key "8">
+<!ENTITY tagCmd9.key "9">
+
--- a/suite/chrome/mailnews/messenger.dtd
+++ b/suite/chrome/mailnews/messenger.dtd
@@ -365,60 +365,41 @@
 <!ENTITY fileHereMenu.label "Archivar aquí">
 <!ENTITY fileHereMenu.accesskey "A">
 <!ENTITY copyHereMenu.label "Copiar aquí">
 <!ENTITY copyHereMenu.accesskey "C">
 <!ENTITY tagMenu.label "Etiqueta">
 <!ENTITY tagMenu.accesskey "E">
 <!ENTITY tagCustomize.label "Personalizar…">
 <!ENTITY tagCustomize.accesskey "P">
-<!ENTITY tagCmd0.key "0">
-<!ENTITY tagCmd1.key "1">
-<!ENTITY tagCmd2.key "2">
-<!ENTITY tagCmd3.key "3">
-<!ENTITY tagCmd4.key "4">
-<!ENTITY tagCmd5.key "5">
-<!ENTITY tagCmd6.key "6">
-<!ENTITY tagCmd7.key "7">
-<!ENTITY tagCmd8.key "8">
-<!ENTITY tagCmd9.key "9">
 <!ENTITY markMenu.label "Marcar">
 <!ENTITY markMenu.accesskey "c">
-<!ENTITY markAsReadCmd.label "Como leídos">
-<!ENTITY markAsReadCmd.accesskey "l">
-<!ENTITY markAsReadCmd.key "m">
 <!ENTITY markThreadAsReadCmd.label "Conversación como leída">
 <!ENTITY markThreadAsReadCmd.accesskey "C">
 <!ENTITY markThreadAsReadCmd.key "r">
 <!ENTITY markReadByDateCmd.label "Como leídos por fecha…">
 <!ENTITY markReadByDateCmd.accesskey "d">
 <!ENTITY markReadByDateCmd.key "c">
 <!ENTITY markAllReadCmd.label "Todos leídos">
 <!ENTITY markAllReadCmd.accesskey "T">
 <!ENTITY markAllReadCmd.key "c">
-<!ENTITY markFlaggedCmd.label "Destacado">
-<!ENTITY markFlaggedCmd.accesskey "D">
-<!ENTITY markFlaggedCmd.key "i">
 <!ENTITY markAsJunkCmd.label "Como correo basura">
 <!ENTITY markAsJunkCmd.accesskey "s">
 <!ENTITY markAsJunkCmd.key "j">
 <!ENTITY markAsNotJunkCmd.label "Como correo normal">
 <!ENTITY markAsNotJunkCmd.accesskey "n">
 <!ENTITY markAsNotJunkCmd.key "j">
 <!ENTITY recalculateJunkScoreCmd.label "Ejecutar controles de correo basura">
 <!ENTITY recalculateJunkScoreCmd.accesskey "c">
 <!ENTITY markAsShowRemoteCmd.label "Mostrar contenido remoto">
 <!ENTITY markAsShowRemoteCmd.accesskey "e">
 <!ENTITY markAsShowRemoteCmd.key "r">
 <!ENTITY markAsNotPhishCmd.label "No es fraude">
 <!ENTITY markAsNotPhishCmd.accesskey "s">
 <!ENTITY markAsNotPhishCmd.key "p">
-<!ENTITY openMessageWindowCmd.label "Abrir mensaje">
-<!ENTITY openMessageWindowCmd.accesskey "A">
-<!ENTITY openMessageWindowCmd.key "o">
 <!ENTITY openFeedMessage.label "Open Feed Message">
 <!ENTITY openFeedMessage.accesskey "O">
 <!ENTITY openFeedWebPageInWindow.label "Página web en nueva ventana">
 <!ENTITY openFeedWebPageInWindow.accesskey "w">
 <!ENTITY openFeedSummaryInWindow.label "Resumen en nueva ventana">
 <!ENTITY openFeedSummaryInWindow.accesskey "s">
 <!ENTITY openFeedWebPageInMP.label "Intercambiár página web y resumen en la vista de mensaje">
 <!ENTITY openFeedWebPageInMP.accesskey "t">
deleted file mode 100644
--- a/suite/installer/mac/README.txt
+++ /dev/null
@@ -1,118 +0,0 @@
-  = = = = = = = = = = = = = = SeaMonkey Read Me = = = = = = = = = = = = = = =
-
-  Thank you for downloading SeaMonkey. This file contains information on the
-  following topics:
-  
-  - System & Hardware Requirements
-  - Installation
-  - Where Information is Stored
-  - Uninstallation
-  - Getting SeaMonkey
-  - More Information & Feedback
-  - License
-
-  For information on known problems and installation issues, please read the
-  release notes. They can be found along with the releases at
-  
-  http://www.seamonkey-project.org/releases/.
-
-
-  System & Hardware Requirements
-  ------------------------------
-
-  System Requirements:
-
-  - Mac OS X 10.4 and later
-
-
-  Hardware Requirements:
-
-  - Macintosh computer with an Intel x86 or PowerPC G3/G4/G5 processor
-  - 256 MB RAM
-  - 200 MB of free hard disk space
-
-
-  Installation
-  ------------
-
-  To install SeaMonkey, follow these steps:
-
-  1. Drag the SeaMonkey application icon to the Applications folder
-
-  2. Eject the disk image
-
-  3. If you want SeaMonkey to be accessible from the Dock, drag the SeaMonkey
-     icon from the Applications folder to the Dock
-
-
-  Where Information is Stored
-  ---------------------------
-
-  When you run SeaMonkey for the first time, a "SeaMonkey" folder is created in
-
-  ~/Library/Application Support/ (where ~ is your home directory).
-
-  Your personal settings, bookmarks, e-mail, passwords etc. are stored in a
-  profile folder inside the SeaMonkey folder. The profile folder is located at
-
-  ~/Library/Application Support/SeaMonkey/Profiles/[randomString.profileName].
-
-  SeaMonkey stores its cache in ~/Library/Cache/SeaMonkey. Certain settings
-  (like the last root folder used by the Save dialog) are stored in
-
-  ~/Library/Preferences/org.mozilla.seamonkey.plist.
-
-
-  Uninstallation
-  --------------
-
-  To uninstall SeaMonkey (but keep your personal settings, bookmarks etc.),
-  simply drag the SeaMonkey icon from your Applications folder to the Trash.
-
-  To completely remove all traces of SeaMonkey from your computer
-  (including your personal settings, bookmarks, e-mail, passwords etc.),
-  follow these steps:
-
-  1. Drag the SeaMonkey icon from your Applications folder to the Trash
-
-  2. Drag the ~/Library/Application Support/SeaMonkey folder to the Trash
-
-  3. Drag the ~/Library/Cache/SeaMonkey folder to the Trash
-
-  4. Drag the ~/Library/Preferences/org.mozilla.seamonkey.plist file to the
-     trash
-
-
-  Getting SeaMonkey
-  -----------------
-
-  For testing purposes, nightly builds of SeaMonkey are provided regularly.
-  They reflect the current development and may be buggy.
-
-  Nightly builds from various dates are available on the mozilla.org FTP site
-  at http://ftp.mozilla.org/pub/mozilla.org/seamonkey/nightly/.
-
-  For the very latest builds, see
-
-  http://ftp.mozilla.org/pub/mozilla.org/seamonkey/nightly/latest-trunk/.
-
-  If you are looking for a more polished version of SeaMonkey, you can download
-  official releases from
-  
-  http://www.seamonkey-project.org/releases/.
-
-  More Information & Feedback
-  ---------------------------
-
-  For more info on SeaMonkey, see http://www.seamonkey-project.org/. To submit
-  bugs or other feedback, see http://www.seamonkey-project.org/dev/get-involved
-  and check out Bugzilla at https://bugzilla.mozilla.org/ for known bugs,
-  bug-writing guidelines, and more. You can also get help with Bugzilla by
-  pointing your IRC client to #mozillazine at irc.mozilla.org.
-
-
-  License
-  -------
-
-  SeaMonkey is subject to the terms detailed in the license agreement
-  available at http://www.mozilla.org/legal/eula/seamonkey-en.html.
deleted file mode 100644
--- a/suite/installer/unix/README
+++ /dev/null
@@ -1,137 +0,0 @@
-==========================================================================
-
-= = = = = = = = = = = = =  SeaMonkey Read Me   = = = = = = = = = = = = = =
-
-==========================================================================
-
-SeaMonkey is subject to the terms detailed in the license agreement
-accompanying it.
-
-This Read Me file contains information about system requirements and
-installation instructions for the Linux builds of SeaMonkey.
-
-For more info on SeaMonkey, see http://www.seamonkey-project.org/
-To submit bugs or other feedback, see
-http://www.seamonkey-project.org/dev/get-involved and check out Bugzilla
-at https://bugzilla.mozilla.org/ for links to known bugs, bug-writing
-guidelines, and more. You can also get help with Bugzilla by pointing your
-IRC client to #mozillazine at irc.mozilla.org.
-
-
-==========================================================================
-
-                          Getting SeaMonkey
-
-==========================================================================
-
-You can download nightly builds of SeaMonkey from the mozilla.org FTP site
-at
-
-  http://ftp.mozilla.org/pub/mozilla.org/seamonkey/nightly/
-
-For the very latest builds, see
-
-  http://ftp.mozilla.org/pub/mozilla.org/seamonkey/nightly/latest-trunk/
-
-Keep in mind that nightly builds, which are used by mozilla.org developers
-for testing, may be buggy. If you are looking for a more polished version
-of SeaMonkey, the SeaMonkey project releases builds of SeaMonkey regularly
-that you can download from
-
-  http://www.seamonkey-project.org/releases/
-
-Be sure to read the SeaMonkey release notes for information on known
-problems and installation issues with SeaMonkey.  The release notes can be
-found at the preceding URL along with the releases themselves.
-
-
-==========================================================================
-
-                         System Requirements
-
-==========================================================================
-
-* Linux
-
-   - The following library versions (or compatible) are required:
-     glibc 2.3.2, X.org 1.x, GTK 2.x, fontconfig, pango 1.10, libstdc++ 6.
-     Red Hat Enterprise Linux 5, Fedora Core 6, ubuntu 6.10 ("Edgy"),
-     Debian "Lenny" (testing), and openSUSE 10.2 (or later) installations
-     should work.
-   - Intel Pentium class processor (500 MHz or faster recommended)
-   - 128 MB RAM
-   - 50 MB free hard disk space
-
-
-==========================================================================
-
-                      Installation Instructions
-
-==========================================================================
-
-Note that the installation instructions use the bash shell. If you're not
-using bash, adjust the commands accordingly.
-
-Install into a clean (new) directory.
-Installing on top of previously released builds may cause problems.
-
-Note: These instructions do not tell you how to build SeaMonkey.
-For info on building SeaMonkey from the mozilla.org source code, see
-
-  http://developer.mozilla.org/en/docs/Build_Documentation
-
-
-Installation Instructions
--------------------------------
-
-  Note: There is no installer available, but just extracting the tar.bz2
-  to the default directory (usually /usr/local/seamonkey) achieves the
-  same result as an installer would.
-
-  To install SeaMonkey by downloading the tar.bz2 file:
-
-  1. Create a directory named "seamonkey" (mkdir seamonkey) and change
-     to that directory (cd seamonkey).
-
-  2. Click the link on the site you're downloading SeaMonkey from to
-     download the package (seamonkey*.tar.bz2) file into the seamonkey
-     directory.
-
-  3. Change to the seamonkey directory (cd seamonkey) and decompress the
-     file with the following command:
-
-       tar jxvf sea*.tar.bz2
-
-     This creates a "seamonkey" directory under your seamonkey directory.
-
-  4. Change to the seamonkey directory (cd seamonkey).
-
-  5. Run SeaMonkey with the following run script:
-
-    ./seamonkey
-
-
-  To hook up SeaMonkey complete with icon to the GNOME Panel,
-  follow these steps:
-
-  1. Click the GNOME Main Menu button, open the Panel menu, and then open
-     the Add to Panel submenu and choose Launcher.
-
-  2. Right-click the icon for SeaMonkey on the Panel and enter the
-     following command:
-
-       directory_name./seamonkey
-
-     where directory_name is the name of the directory you downloaded
-     SeaMonkey to. For example, the default directory that SeaMonkey
-     suggests is /usr/local/seamonkey.
-
-  3. Type in a name for the icon, and type in a comment if you wish.
-
-  4. Click the icon button and type in the following as the icon's location:
-
-       directory_name/chrome/icons/default/default.xpm
-
-     where directory_name is the directory where you installed SeaMonkey.
-     For example, the default directory is
-     /usr/local/seamonkey/chrome/icons/default/default.xpm.
deleted file mode 100644
--- a/suite/installer/windows/README.txt
+++ /dev/null
@@ -1,122 +0,0 @@
-==========================================================================
-
-= = = = = = = = = = = = =  SeaMonkey Read Me   = = = = = = = = = = = = = =
-
-==========================================================================
-
-SeaMonkey is subject to the terms detailed in the license agreement
-accompanying it.
-
-This Read Me file contains information about system requirements and
-installation instructions for the Windows builds of SeaMonkey.
-
-For more info on SeaMonkey, see http://www.seamonkey-project.org/
-To submit bugs or other feedback, see
-http://www.seamonkey-project.org/dev/get-involved and check out Bugzilla
-at https://bugzilla.mozilla.org/ for links to known bugs, bug-writing
-guidelines, and more. You can also get help with Bugzilla by pointing your
-IRC client to #mozillazine at irc.mozilla.org.
-
-
-==========================================================================
-
-                          Getting SeaMonkey
-
-==========================================================================
-
-You can download nightly builds of SeaMonkey from the mozilla.org FTP site
-at
-
-  http://ftp.mozilla.org/pub/mozilla.org/seamonkey/nightly/
-
-For the very latest builds, see
-
-  http://ftp.mozilla.org/pub/mozilla.org/seamonkey/nightly/latest-trunk/
-
-Keep in mind that nightly builds, which are used by mozilla.org developers
-for testing, may be buggy. If you are looking for a more polished version
-of SeaMonkey, the SeaMonkey project releases builds of SeaMonkey regularly
-that you can download from
-
-  http://www.seamonkey-project.org/releases/
-
-Be sure to read the SeaMonkey release notes for information on known
-problems and installation issues with SeaMonkey.  The release notes can be
-found at the preceding URL along with the releases themselves.
-
-
-==========================================================================
-
-                         System Requirements
-
-==========================================================================
-
-*Windows
-
-   - Windows 2000, XP or Vista
-   - Intel Pentium class processor (500 MHz or faster recommended)
-   - 128 MB RAM
-   - 50 MB free hard disk space
-
-
-==========================================================================
-
-                      Installation Instructions
-
-==========================================================================
-
-It is strongly recommended that you exit all programs before running the
-setup program. Also, you should temporarily disable virus-detection
-software.
-
-Install into a clean (new) directory. Installing on top of previously
-released builds may cause problems.
-
-Note: These instructions do not tell you how to build SeaMonkey.
-For info on building SeaMonkey from the mozilla.org source code, see
-
-  http://developer.mozilla.org/en/docs/Build_Documentation
-
-
-Windows Installation Instructions
----------------------------------
-
-Note: For Windows 2000/XP systems, you need Administrator privileges to
-install SeaMonkey. If you see an "Error 5" message during installation,
-make sure you're running the installation with Administrator privileges.
-
-
-   To install SeaMonkey by downloading the SeaMonkey installer,
-   follow these steps:
-
-   1. Click the link to seamonkey-x.xx.en-US.win32.installer.exe (or
-      similar file name) on the site you're downloading SeaMonkey from to
-      download the installer file to your machine.
-
-   2. Navigate to where you downloaded the file and double-click the
-      installer file icon on your machine to begin the Setup program.
-
-   3. Follow the on-screen instructions in the setup program. The program
-      starts automatically the first time.
-
-
-   To install SeaMonkey by downloading the .zip file and installing
-   manually, follow these steps:
-
-   1. Click the link to seamonkey-x.xx.en-US.win32.zip (or similar file
-      name) on the site you're downloading SeaMonkey from to download the
-      .zip file to your machine.
-
-   2. Navigate to where you downloaded the file and double-click the
-      compressed file.
-
-      Note: This step assumes you already have a recent version of WinZip
-      (or a similar zip tool) installed, and that you know how to use it.
-      If not, you can get WinZip and information about the program at
-      www.winzip.com.
-
-   3. Extract the .zip file to a directory such as
-        C:\Program Files\mozilla.org\SeaMonkey.
-
-   4. To start SeaMonkey, navigate to the directory you extracted
-      SeaMonkey to and double-click the seamonkey.exe icon.
--- a/toolkit/chrome/global/headsUpDisplay.properties
+++ b/toolkit/chrome/global/headsUpDisplay.properties
@@ -1,170 +1,8 @@
-typeError=Error: 
-typeWarning=Advertencia: 
-typeNetwork=Red: 
-typeException=Excepción:  
-typeCssParser=CSS Parser: 
-typeStrict=Advertencia estricta: 
-msgCategory=Categoría: 
-errLine=Línea: %S
-btnHide=Ocultar
-btnPrefs=Preferenciass
-categoryPage=Página:
-categoryConsole=Consola:
-btnMutation=Mutación de DOM
-tipMutation=Toggle DOM Mutation event logging
-btnPageNet=Red
-tipPageNet=Registrar accesos de red
-btnPageCSS=CSS
-tipPageCSS=Registrar errores de parseo CSS
-btnPageJS=JS
-tipPageJS=Registrar excepciones de JavaScript
-# LOCALIZATION NOTE (btnPageWebDeveloper):
-#
-# This is used as the text of the "Web Developer" 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=Desarrollador web
-# LOCALIZATION NOTE (tipPageWebDeveloper):
-#
-# This is used as the text of the tool tip for the "Web Developer" button on
-# the toolbar.
-tipPageWebDeveloper=Registrar mensajes enviados al objeto "consola"
-btnConsoleErrors=Errores
-tipConsoleErrors=Registrar llamadas a console.error()
-btnConsoleInfo=Información
-tipConsoleInfo=Registrar llamadas a console.info()
-btnConsoleWarnings=Advertencias
-tipConsoleWarnings=Registrar llamadas a console.warn()
-btnConsoleLog=Registro
-tipConsoleLog=Registrar llamadas a console.log()
-btnGlobal=Mensajes globales
-tipGlobal=Toggle Global Message logging
-localConsole=Consola local
-clearConsoleCmd.label=Limpiar consola
-clearConsoleCmd.accesskey=L
-# LOCALIZATION NOTE (btnClear):
-#
-# This is used as the text of the "Clear" button for the toolbar. It clears the
-# contents of the console.
-btnClear=Limpiar
-stringFilter=Filtro
-close.button=Cerrar
-close.accesskey=C
-update.button=Actualizar
-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)
-# the title of the panel is based on the `jsPropertyInspectTitle` string.
-# If it isn't clear which object is being inspected, the `jsPropertyTitle` string
-# gets used. This can be the case when the user logs an object to the WebConsole
-# output using the console.log(aObjectToInspect) method.
-#
-# You can find a screenshot of the PropertyPanel here:
-#   https://bug585030.bugzilla.mozilla.org/attachment.cgi?id=464034
-jsPropertyTitle=Inspector de objetos
-# LOCALIZATION NOTE FOR `jsPropertyInspectTitle`:
-#
-# The %S is replaced by the evaluated code the user clicked on in the console.
-#
-# Example: The user executed `window.document` in the WebConsole. The `document`
-# object is written to the output. If the user clicks on the `document` output
-# in the console, a PropertyPanel will show up. The title of the PropertyPanel
-# is set to `Inspect: window.document` because the clicked `document` object was
-# evaluated based on the `window.document` string.
-jsPropertyInspectTitle=Inspeccionar: %S
-saveBodies.label=Registrar pedidos y cuerpos de respuesta
-saveBodies.accesskey=p
-copyCmd.label=Copiar
-copyCmd.accesskey=C
-selectAllCmd.label=Seleccionar todo
-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=No se puede llamar a pprint en este tipo de objeto.
-
-NetworkPanel.label=Inspeccionar solicitud de red
-# LOCALIZATION NOTE (NetworkPanel.deltaDurationMS):
-#
-# This string is used to show the duration between two network events (e.g
-# request and respones header or response header and response body).
-NetworkPanel.durationMS=%Sms
-# LOCALIZATION NOTE (NetworkPanel.imageSizeDeltaDurationMS):
-# This string is used to show the duration between the response header and the
-# response body event. It also shows the size of the received or cached image.
-#
-# The first %S is replace by the width of the inspected image.
-# The second %S is replaced by the height of the inspected image.
-# The third %S is replaced by the duration between the response header and the
-# response body event.
-NetworkPanel.imageSizeDeltaDurationMS=%Sx%Spx, Δ%Sms
-# LOCALIZATION NOTE (NetworkPanel.responseBodyUnableToDisplay.content):
-#
-# This string is displayed within the response body section of the NetworkPanel
-# if the content type of the network request can't be displayed in the
-# 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=NO se pueden mostrar las respuestas de tipo "%S"
-ConsoleAPIDisabled=La API de registro de la consola web (console.log, console.info, console.warn, console.error) ha sido deshabilitada por un script en esta página.
-
-# LOCALIZATION NOTE (inspectStyle.nullObjectPassed):
-# This message is returned when a null object is passed in to inspectstyle()
-inspectStyle.nullObjectPassed=El objeto es nulo
-
-# LOCALIZATION NOTE (inspectStyle.mustBeDomNode):
-# This message is returned when a non-DOM node is passed in to inspectstyle()
-inspectStyle.mustBeDomNode=El objeto debe ser un nodo DOM válido
-
-# LOCALIZATION NOTE (inspectStyle.nodeHasNoStyleProps):
-# This message is returned when an unstyleable object is passed in to inspectstyle()
-inspectStyle.nodeHasNoStyleProps=El objeto no puede tener estilo
-
-# LOCALIZATION NOTE (inspectStyle.styleInspectorNotEnabled):
-# This message is returned when devtools.styleinspector.enabled is not set to
-# true
-inspectStyle.styleInspectorNotEnabled=El inspector de estilos no está habilitado. Establezca la opción devtools.styleinspector.enabled a true en about:config para usar este comando.
-
-# LOCALIZATION NOTE (webConsolePosition): The label shown for the menu which
-# allows the user to toggle between the Web Console positioning types.
-webConsolePosition=Posición
-
-# LOCALIZATION NOTE (webConsolePositionTooltip): The tooltip shown when the user
-# hovers the Position button in the Web Console toolbar.
-webConsolePositionTooltip=Posicionar la consola web encima o debajo del documento
-
-# LOCALIZATION NOTE (webConsolePositionAbove): When this option is selected the
-# Web Console interface is displayed above the web page.
-webConsolePositionAbove=Encima
-
-# LOCALIZATION NOTE (webConsolePositionBelow): When this option is selected the
-# Web Console interface is displayed below the web page.
-webConsolePositionBelow=Debajo
-
-# LOCALIZATION NOTE (webConsolePositionWindow): When this option is selected the
-# Web Console interface is displayed in a floating panel.
-webConsolePositionWindow=Ventana
-
-# LOCALIZATION NOTE (webConsoleWindowTitleAndURL): The Web Console floating
-# panel title, followed by the web page URL.
-webConsoleWindowTitleAndURL=Consola web - %S
-
-# LOCALIZATION NOTE (Autocomplete.label):
-# The autocomplete popup panel label/title.
-Autocomplete.label=Autocomplete popup
 
 # LOCALIZATION NOTE (stacktrace.anonymousFunction):
 # This string is used to display JavaScript functions that have no given name -
 # they are said to be anonymous. See stacktrace.outputMessage.
 stacktrace.anonymousFunction=<anónima>
 
 # LOCALIZATION NOTE (stacktrace.outputMessage):
 # This string is used in the Web Console output to identify a web developer call
--- a/toolkit/chrome/global/videocontrols.dtd
+++ b/toolkit/chrome/global/videocontrols.dtd
@@ -1,12 +1,27 @@
 <!ENTITY playButton.playLabel "Reproducir">
 <!ENTITY playButton.pauseLabel "Pausa">
 <!ENTITY muteButton.muteLabel "Mudo">
 <!ENTITY muteButton.unmuteLabel "Unmute">
 
+<!ENTITY stats.media "Medio">
+<!ENTITY stats.size "Tamaño">
+<!ENTITY stats.activity "Actividad">
+<!ENTITY stats.activityPaused "Pausado">
+<!ENTITY stats.activityPlaying "Reproduciendo">
+<!ENTITY stats.activityEnded "Finalizado">
+<!ENTITY stats.activitySeeking "(buscando)">
+<!ENTITY stats.volume "Volumen">
+<!ENTITY stats.channels "Canales">
+<!ENTITY stats.sampleRate "Frecuencia de muestreo">
+<!ENTITY stats.framesParsed "Cuadros analizados">
+<!ENTITY stats.framesDecoded "Cuadros decodificados">
+<!ENTITY stats.framesPresented "Cuadros presentados">
+<!ENTITY stats.framesPainted "Cuadros dibujados">
+
 <!-- LOCALIZATION NOTE (scrubberScale.nameFormat): the #1 string is the current
 media position, and the #2 string is the total duration. For example, when at
 the 5 minute mark in a 6 hour long video, #1 would be "5:00" and #2 would be
 "6:00:00", result string would be "5:00 of 6:00:00 elapsed".
 -->
 <!ENTITY scrubberScale.nameFormat "#1 de #2">
 
deleted file mode 100644
--- a/toolkit/chrome/global/webConsole.dtd
+++ /dev/null
@@ -1,16 +0,0 @@
-<!ENTITY networkPanel.requestURL                  "URL solicitada">
-<!ENTITY networkPanel.requestMethod               "Método solicitado">
-<!ENTITY networkPanel.statusCode                  "Código de estado">
-
-<!ENTITY networkPanel.requestHeaders              "Encabezados solicitados">
-<!ENTITY networkPanel.requestCookie               "Cookie enviada">
-<!ENTITY networkPanel.requestBody                 "Cuerpo solicitado">
-<!ENTITY networkPanel.requestFormData             "Datos de formulario enviados">
-
-<!ENTITY networkPanel.responseHeaders             "Response Headers">
-<!ENTITY networkPanel.responseBody                "Response Body">
-<!ENTITY networkPanel.responseBodyCached          "Datos en caché">
-<!ENTITY networkPanel.responseBodyUnknownType     "Tipo de contenido desconocido">
-<!ENTITY networkPanel.responseNoBody              "No Response Body">
-<!ENTITY networkPanel.responseImage               "Imagen recibida">
-<!ENTITY networkPanel.responseImageCached         "Imagen en caché">
--- a/toolkit/chrome/mozapps/downloads/downloads.properties
+++ b/toolkit/chrome/mozapps/downloads/downloads.properties
@@ -37,71 +37,77 @@ cancelDownloadsOKTextMultiple = Cancelar
 dontQuitButtonWin = No salir
 dontQuitButtonMac = No salir
 dontGoOfflineButton = Mantenerse conectado
 dontEnterPrivateBrowsingButton=No entrar en el modo de Navegación Privada
 dontLeavePrivateBrowsingButton=Mantenerse en el modo de Navegación Privada
 downloadsCompleteTitle = Descargas completas
 downloadsCompleteMsg = Todos los archivos se han descargado.
 
-# LOCALIZATION NOTE (statusFormat2): \u2014 is the "em dash" (long dash)
-# #1 transfer progress; #2 rate number; #3 rate unit; #4 time left
-# example: 4 minutes left \u2014 1.1 of 11.1 GB (2.2 MB/sec)
-statusFormat2=#4 \u2014 #1 (#2 #3/seg)
+# LOCALIZATION NOTE (statusFormat3): — is the "em dash" (long dash)
+# %1$S transfer progress; %2$S rate number; %3$S rate unit; %4$S time left
+# example: 4 minutes left — 1.1 of 11.1 GB (2.2 MB/sec)
+statusFormat3=%4$S — %1$S (%2$S %3$S/seg)
 bytes=bytes
 kilobyte=KB
 megabyte=MB
 gigabyte=GB
 
-# LOCALIZATION NOTE (transferSameUnits, transferDiffUnits, transferNoTotal):
-# #1 progress number; #2 progress unit; #3 total number; #4 total unit
-# examples: 1.1 of 333 MB; 11.1 MB of 3.3 GB; 111 KB
-transferSameUnits=#1 de #3 #4
-transferDiffUnits=#1 #2 de #3 #4
-transferNoTotal=#1 #2
+# LOCALIZATION NOTE (transferSameUnits2):
+# %1$S progress number; %2$S total number; %3$S total unit
+# example: 1.1 of 333 MB
+transferSameUnits2=%1$S de %2$S %3$S
+# LOCALIZATION NOTE (transferDiffUnits2):
+# %1$S progress number; %2$S progress unit; %3$S total number; %4$S total unit
+# example: 11.1 MB of 3.3 GB
+transferDiffUnits2=%1$S %2$S de %3$S %4$S
+# LOCALIZATION NOTE (transferNoTotal2):
+# %1$S progress number; %2$S unit
+# example: 111 KB
+transferNoTotal2=%1$S %2$S
 
-# LOCALIZATION NOTE (timePair): #1 time number; #2 time unit
+# LOCALIZATION NOTE (timePair2): %1$S time number; %2$S time unit
 # example: 1 minute; 11 hours
-timePair=#1 #2
-# LOCALIZATION NOTE (timeLeftSingle): #1 time left
+timePair2=%1$S %2$S
+# LOCALIZATION NOTE (timeLeftSingle2): %1$S time left
 # example: 1 minute remaining; 11 hours remaining
-timeLeftSingle=#1 restantes
-# LOCALIZATION NOTE (timeLeftDouble): #1 time left; #2 time left sub units
+timeLeftSingle2=%1$S restantes
+# LOCALIZATION NOTE (timeLeftDouble2): %1$S time left; %2$S time left sub units
 # example: 11 hours, 2 minutes remaining; 1 day, 22 hours remaining
-timeLeftDouble=#1, #2 restantes
+timeLeftDouble2=%1$S, %2$S restantes
 timeFewSeconds=Unos pocos segundos restantes
 timeUnknown=Tiempo restante desconocido
 
 # LOCALIZATION NOTE (doneStatus): \u2014 is the "em dash" (long dash)
 # #1 download size for FINISHED or download state; #2 host (e.g., eTLD + 1, IP)
 # #2 can also be doneScheme or doneFileScheme for special URIs like file:
 # examples: 1.1 MB \u2014 website2.com; Canceled \u2014 222.net
 doneStatus=#1 \u2014 #2
 # LOCALIZATION NOTE (doneSize): #1 size number; #2 size unit
 doneSize=#1 #2
 doneSizeUnknown=Tama\u00F1o desconocido
 # LOCALIZATION NOTE (doneScheme): #1 URI scheme like data: jar: about:
-doneScheme=recurso #1
+doneScheme2=recurso %1$S
 # LOCALIZATION NOTE (doneFileScheme): Special case of doneScheme for file:
 # This is used as an eTLD replacement for local files, so make it lower case
 doneFileScheme=archivo local
 
 stateFailed=Fall\u00F3
 stateCanceled=Cancelado
 # LOCALIZATION NOTE (stateBlocked): 'Parental Controls' should be capitalized
 stateBlocked=Bloqueado por Controles de Adultos
 stateDirty=Bloqueado: La descarga puede contener virus o spyware
 
 # LOCALIZATION NOTE (stateBlockedPolicy): 'Security Zone Policy' should be capitalized 
  stateBlockedPolicy=Esta descarga ha sido bloqueada por las Pol\u00EDticas de Zona de Seguridad
 
 # LOCALIZATION NOTE (yesterday): Displayed time for files finished yesterday
 yesterday=Ayer
 # LOCALIZATION NOTE (monthDate): #1 month name; #2 date number; e.g., January 22
-monthDate=#2 de #1
+monthDate2=%2$S de %1$S
 
 fileDoesNotExistOpenTitle = No se puede abrir %S
 fileDoesNotExistShowTitle = No se puede mostrar %S
 fileDoesNotExistError = %S no existe. Puede haber sido renombrado, movido, o borrado desde que fue descargado.
 
 chooseAppFilePickerTitle = Abrir con\u2014
 
 # LOCALIZATION NOTE (downloadsTitleFiles, downloadsTitlePercent): Semi-colon list of
--- a/toolkit/chrome/mozapps/extensions/extensions.properties
+++ b/toolkit/chrome/mozapps/extensions/extensions.properties
@@ -104,9 +104,9 @@ cmd.purchaseAddon.label=Comprar por %S…
 cmd.purchaseAddon.accesskey=o
 
 eulaHeader=%S requiere que acepte el siguiente acuerdo de licencia de usuario final antes de continuar con la instalación:
 
 type.extension.name=Extensiones
 type.theme.name=Apariencia
 type.locale.name=Idiomas
 type.plugin.name=Plugins
-
+type.dictionary.name=Diccionarios
--- a/toolkit/chrome/mozapps/plugins/plugins.dtd
+++ b/toolkit/chrome/mozapps/plugins/plugins.dtd
@@ -16,29 +16,30 @@
 <!ENTITY pluginWizard.installPluginsPage.description.label "&brandShortName; está instalando plugins…">
 
 <!ENTITY pluginWizard.finalPage.description.label "&brandShortName; terminó de instalar los plugins faltantes:">
 
 <!ENTITY pluginWizard.finalPage.moreInfo.label "Ver más información sobre plugins o buscar manualmente los plugins faltantes.">
 <!ENTITY pluginWizard.finalPage.restart.label "&brandShortName; necesita reiniciarse para que funcionen los plugins.">
   
 <!ENTITY missingPlugin                                       "Se necesita un pluin para mostrar este contenido.">
+<!ENTITY clickToPlayPlugin                                   "Pulse aquí para activar el plugin.">
 <!ENTITY disabledPlugin                                      "Este plugin ha sido deshabilitado.">
 <!ENTITY blockedPlugin.label                                 "Este plugin ha sido bloqueado para su protección.">
 
 <!ENTITY installPlugin                                       "Instalar plugin…">
 <!ENTITY managePlugins                                       "Administrar plugins…">
 
 <!-- LOCALIZATION NOTE (reloadPlugin.pre): include a trailing space as needed -->
 <!-- LOCALIZATION NOTE (reloadPlugin.middle): avoid leading/trailing spaces, this text is a link -->
 <!-- LOCALIZATION NOTE (reloadPlugin.post): include a starting space as needed -->
 <!ENTITY reloadPlugin.pre                                    "">
 <!ENTITY reloadPlugin.middle                                 "Recargar la página">
 <!ENTITY reloadPlugin.post                                   " para intentar nuevamente.">
 
 <!-- LOCALIZATION NOTE (report.please): This and the other report.* strings should be as short as possible, ideally 2-3 words. -->
-<!ENTITY report.please                                       "Enviar informe de problema">
+<!ENTITY report.checkbox                                     "…y enviar informe de problema">
 <!ENTITY report.submitting                                   "Enviando informe…">
 <!ENTITY report.submitted                                    "Informe de problema enviado.">
 <!ENTITY report.disabled                                     "Informe de problemas deshabilitado.">
 <!ENTITY report.failed                                       "Falló el envío.">
 <!ENTITY report.unavailable                                  "No hay informe disponible.">