Migrating central to aurora for Firefox 17 SEAMONKEY_2_14b1_BUILD1 SEAMONKEY_2_14b1_RELEASE SEAMONKEY_2_14b2_BUILD1 SEAMONKEY_2_14b2_RELEASE SEAMONKEY_2_14b3_BUILD1 SEAMONKEY_2_14b3_RELEASE THUNDERBIRD_17_0b1_BUILD1 THUNDERBIRD_17_0b1_RELEASE THUNDERBIRD_17_0b2_BUILD1 THUNDERBIRD_17_0b2_RELEASE
authorMarcelo Poli <mpoli@lt24.zzn.com>
Tue, 28 Aug 2012 23:08:39 -0300
changeset 1196 3924bcfaddc87f2e4a991d0ecc37907d545256f3
parent 1158 20bc1de564ec7af25199432aa40a6272f8b3e200
child 1197 95333ac9ecd6d14970229846a3360e86a445ff06
child 1207 e4bfaa9c8dac4fda6afe39060e551d4efc226304
child 1214 34d2957b3c76186b75bac021904a61c3593737ed
child 1218 a912baca70c534b939b48b50bf227f3e0f6ae44f
child 1221 6858a48511a0b44dd15bc2feb70a5e1bb58f48f6
child 1224 48768bd36a8a212b02d70c301b5542079c825091
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:47:06 +0000
Migrating central to aurora for Firefox 17
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/devtools/debugger.properties
browser/chrome/browser/devtools/gclicommands.properties
browser/chrome/browser/devtools/scratchpad.properties
browser/chrome/browser/devtools/styleinspector.properties
browser/chrome/browser/devtools/webConsole.dtd
browser/chrome/browser/devtools/webconsole.properties
browser/chrome/browser/downloads/downloads.dtd
browser/chrome/browser/downloads/downloads.properties
chat/conversations.properties
chat/irc.properties
dom/chrome/dom/dom.properties
dom/chrome/layout/css.properties
mail/chrome/messenger/FilterEditor.dtd
mail/chrome/messenger/FilterListDialog.dtd
mail/chrome/messenger/aboutDialog.dtd
mail/chrome/messenger/am-mdn.dtd
mail/chrome/messenger/filter.properties
mail/chrome/messenger/folderProps.dtd
mail/chrome/messenger/messenger.dtd
mail/chrome/messenger/messenger.properties
mail/chrome/messenger/messengercompose/sendProgress.dtd
mail/chrome/messenger/messengercompose/sendProgress.properties
mail/chrome/messenger/msgHdrViewOverlay.dtd
mail/chrome/messenger/preferences/general.dtd
mail/chrome/messenger/prefs.properties
mail/chrome/messenger/sanitize.dtd
mail/chrome/messenger/searchTermOverlay.dtd
mobile/android/base/android_strings.dtd
mobile/android/base/sync_strings.dtd
mobile/android/chrome/aboutAddons.dtd
mobile/android/chrome/aboutApps.dtd
mobile/android/chrome/aboutFeedback.dtd
mobile/android/chrome/aboutReader.properties
mobile/android/chrome/browser.properties
security/manager/chrome/pippki/deviceManager.dtd
suite/chrome/browser/linkToolbar.dtd
suite/chrome/common/contentAreaCommands.dtd
suite/chrome/common/setDesktopBackground.dtd
suite/chrome/mailnews/FilterEditor.dtd
suite/chrome/mailnews/compose/sendProgress.dtd
suite/chrome/mailnews/compose/sendProgress.properties
suite/chrome/mailnews/folderProps.dtd
suite/chrome/mailnews/pref/am-mdn.dtd
suite/chrome/mailnews/pref/prefs.properties
suite/chrome/mailnews/search.properties
suite/chrome/mailnews/searchTermOverlay.dtd
toolkit/chrome/global-platform/mac/platformKeys.properties
toolkit/chrome/global-platform/unix/platformKeys.properties
toolkit/chrome/global-platform/win/platformKeys.properties
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -237,39 +237,30 @@ These should match what Safari and other
 
 <!ENTITY inspectCloseButton.tooltiptext "Cerrar Inspector">
 
 <!ENTITY devToolbarCloseButton.tooltiptext "Cerrar barra de desarrolladores">
 <!ENTITY devToolbarMenu.label "Barra de desarrolladores">
 <!ENTITY devToolbarMenu.accesskey          "r">
 <!ENTITY devToolbar.keycode                "VK_F2">
 <!ENTITY devToolbar.keytext                "F2">
+<!ENTITY devToolbarOtherToolsButton.label  "Más herramientas">
 
 <!ENTITY webConsoleButton.label "Consola web">
 <!ENTITY inspectorButton.label "Inspector">
 
 <!ENTITY inspectorHTMLCopyInner.label       "Copiar InnerHTML">
 <!ENTITY inspectorHTMLCopyInner.accesskey   "I">
 
 <!ENTITY inspectorHTMLCopyOuter.label       "Copiar OuterHTML">
 <!ENTITY inspectorHTMLCopyOuter.accesskey   "O">
 
 <!ENTITY inspectorHTMLDelete.label          "Borrar nodo">
 <!ENTITY inspectorHTMLDelete.accesskey      "n">
 
-<!-- LOCALIZATION NOTE (inspectOptionButton.*): The menu in the Inspector
-  -  toolbar.  -->
-<!ENTITY inspectOptionButton.tooltiptext    "Opciones del inspector">
-
-<!-- LOCALIZATION NOTE: These are for the menu in the Inspector Toolbar -->
-<!ENTITY inspectorToggleVeil.label          "Oscurcer la página">
-<!ENTITY inspectorToggleVeil.accesskey      "u">
-<!ENTITY inspectorToggleInfobar.label       "Mostrar información del nodo">
-<!ENTITY inspectorToggleInfobar.accesskey   "s">
-
 <!-- LOCALIZATION NOTE (inspect3DViewButton.label): This button shows an
   -  alternate view for the Inspector, creating a 3D visualization of the
   -  webpage. -->
 <!ENTITY inspect3DViewButton.label     "Vista 3D">
 <!ENTITY inspect3DViewButton.accesskey "V">
 
 <!ENTITY inspectStyleButton.label     "Estilo">
 <!ENTITY inspectStyleButton.accesskey "s">
@@ -638,15 +629,30 @@ The word "toolbar" is appended automatic
 located in front of the breadcrumbs display in the inspector toolbar. The button
 doesn't display any label, but exposes a label to screen-readers with "aria-label".
 -->
 <!ENTITY markupButton.arialabel          "Markup">
 <!-- LOCALIZATION NOTE (markupButton.accesskey): The key bound to the Markup panel's
 toolbar button -->
 <!ENTITY markupButton.accesskey          "M">
 
-<!ENTITY socialToolbar.title        "Botón de barra social">
+<!ENTITY socialToolbar.title        "Barra de herramientas sociales">
 <!ENTITY social.notLoggedIn.label   "No ingresado">
 
+<!-- LOCALIZATION NOTE (social.ok.label, social.ok.accesskey): this string is
+     used for the "OK" button for two different social panels. One appears when
+     the feature is activated (social.activated.* below), and the other when
+     the user clicks the "Share" button a second time (social.sharePopup.*
+     below). -->
+<!ENTITY social.ok.label       "Aceptar">
+<!ENTITY social.ok.accesskey   "A">
+
 <!ENTITY social.sharePopup.undo.label     "Descompartir">
 <!ENTITY social.sharePopup.undo.accesskey "D">
-<!ENTITY social.sharePopup.ok.label       "Aceptar">
-<!ENTITY social.sharePopup.ok.accesskey   "A">
+<!ENTITY social.sharePopup.shared.label   "Ha compartido esta página.">
+<!ENTITY social.sharePopup.portrait.arialabel "Imagen de perfil de usuario">
+
+<!ENTITY social.toggleSidebar.label "Mostrar barra lateral">
+<!ENTITY social.toggleSidebar.accesskey "s">
+
+<!ENTITY social.activated.undobutton.label "Deshacer">
+<!ENTITY social.activated.undobutton.accesskey "h">
+
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -365,11 +365,41 @@ webapps.install.success = Aplicación instalada
 # brandFullName, and %2$S by the value of the toolkit.telemetry.server_owner preference.
 telemetryOptOutPrompt = %1$S envía información acerca del rendimiento, hardware, uso y personalizaciones hacia %2$S para ayudar a mejorar %3$S.
 
 # LOCALIZATION NOTE (fullscreen.entered): displayed when we enter HTML5 fullscreen mode, %S is the domain name of the focused website (e.g. mozilla.com).
 fullscreen.entered=%S ahora está en pantalla completa.
 # LOCALIZATION NOTE (fullscreen.rememberDecision): displayed when we enter HTML5 fullscreen mode, %S is the domain name of the focused website (e.g. mozilla.com).
 fullscreen.rememberDecision=Recordar la decisión para %S
 
-social.shareButton.tooltip=Compartir ésto
-social.shareButton.sharedtooltip=Ha compartido ésto
-social.pageShared.label=Página compartida
+# LOCALIZATION NOTE (social.toggle.label): %1$S is the name of the social provider, %2$S is brandShortName (e.g. Firefox)
+social.toggle.label=%1$S para %2$S
+social.toggle.accesskey=p
+
+# LOCALIZATION NOTE (social.activated.description): %1$S is the name of the social provider, %2$S is brandShortName (e.g. Firefox)
+social.activated.description=Ha activado %1$S para %2$S.
+
+# LOCALIZATION NOTE (social.error.message): %1$S is brandShortName (e.g. Firefox), %2$S is the name of the social provider
+social.error.message=%1$S no se puede conectar con %2$S en este momento.
+social.error.tryAgain.label=Reintentar
+social.error.tryAgain.accesskey=t
+social.error.ok.label=Aceptar
+social.error.ok.accesskey=A
+social.error.closeSidebar.label=Cerrar esta barra lateral
+social.error.closeSidebar.accesskey=C
+
+# Identity notifications popups
+identity.termsOfService = Términos del servicio
+identity.privacyPolicy = Política de privacidad
+identity.chooseIdentity.description = Sign in to %S
+identity.chooseIdentity.label = Usar un correo existente
+identity.newIdentity.label = Usar un correo diferente
+identity.newIdentity.accessKey = e
+identity.newIdentity.email.placeholder = Correo electrónico
+# LOCALIZATION NOTE (identity.newIdentity.description, identity.chooseIdentity.description): %S is the website origin (ie. https://www.mozilla.org) shown in popup notifications.
+identity.newIdentity.description = Ingrese su dirección de correo electrónico para ingresar a %S
+identity.next.label = Siguiente
+identity.next.accessKey = n
+# LOCALIZATION NOTE: shown in the popup notification when a user successfully logs into a website
+# LOCALIZATION NOTE (identity.loggedIn.description): %S is the website origin (ie. https://www.mozilla.org)
+identity.loggedIn.description = Signed in as: %S
+identity.loggedIn.signOut.label = Sign Out
+identity.loggedIn.signOut.accessKey = O
--- a/browser/chrome/browser/devtools/debugger.properties
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -54,24 +54,33 @@ resumeTooltip=Clic para continuar
 # LOCALIZATION NOTE (emptyStackText): The text that is displayed in the stack
 # frames list when there are no frames to display.
 emptyStackText=No hay pilas para mostrar.
 
 # LOCALIZATION NOTE (emptyBreakpointsText): The text that is displayed in the
 # breakpoints list when there are no breakpoints to display.
 emptyBreakpointsText=No breakpoints to display.
 
+
+# LOCALIZATION NOTE (noScriptsText): The text to display in the menulist when
+# there are no scripts.
+noScriptsText=No hay scripts
+
+# LOCALIZATION NOTE (noMatchingScriptsText): The text to display in the
+# menulist when there are no matching scripts after filtering.
+noMatchingScriptsText=No hay scripts que coincidan
+
 # LOCALIZATION NOTE (breakpointMenuItem): The text for all the elements that
 # are displayed in the breakpoints menu item popup.
 breakpointMenuItem.enableSelf=Enable breakpoint
 breakpointMenuItem.disableSelf=Disable breakpoint
 breakpointMenuItem.deleteSelf=Remove breakpoint
-breakpointMenuItem.enableOthers=Enable others
-breakpointMenuItem.disableOthers=Disable others
-breakpointMenuItem.deleteOthers=Remove others
+breakpointMenuItem.enableOthers=Habilitar otros
+breakpointMenuItem.disableOthers=Deshabilitar otros
+breakpointMenuItem.deleteOthers=Eliminar otros
 breakpointMenuItem.enableAll=Enable all breakpoints
 breakpointMenuItem.disableAll=Disable all breakpoints
 breakpointMenuItem.deleteAll=Remove all breakpoints
 
 # LOCALIZATION NOTE (loadingText): The text that is displayed in the script
 # editor when the laoding process has started but there is no file to display
 # yet.
 loadingText=Cargando\u2026
--- a/browser/chrome/browser/devtools/gclicommands.properties
+++ b/browser/chrome/browser/devtools/gclicommands.properties
@@ -850,8 +850,73 @@ calllogStopDesc=Stop function call loggi
 # LOCALIZATION NOTE (calllogStopNoLogging) A string displayed as the result of
 # the 'calllog stop' command when there is nothing to stop.
 calllogStopNoLogging=No call logging is currently active
 
 # LOCALIZATION NOTE (calllogStopReply) A string displayed as the result of
 # the 'calllog stop' command when there are logging actions to stop.
 calllogStopReply=Stopped call logging. Active contexts: %1$S.
 
+# LOCALIZATION NOTE (calllogStartChromeDesc) A very short description of the
+# 'calllog chromestart' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+calllogChromeStartDesc=Start logging function calls for chrome code to the console
+
+# LOCALIZATION NOTE (calllogChromeSourceTypeDesc) A very short description of the
+# 'calllog chromestart <sourceType>' parameter. This string is designed to be
+# shown in a menu alongside the command name, which is why it should be as short as possible.
+calllogChromeSourceTypeDesc=Global object, JSM URI, or JS to get a global object from
+
+# LOCALIZATION NOTE (calllogChromeSourceTypeDesc) A very short description of the
+# 'calllog chromestart' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+calllogChromeSourceTypeManual=The global object, URI of a JSM, or JS to execute in the chrome window from which to obtain a global object
+
+# LOCALIZATION NOTE (calllogChromeStartReply) A string displayed as the result
+# of the 'calllog chromestart' command.
+calllogChromeStartReply=Call logging started.
+
+# LOCALIZATION NOTE (calllogChromeStopDesc) A very short description of the
+# 'calllog chromestop' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+calllogChromeStopDesc=Stop function call logging
+
+# LOCALIZATION NOTE (calllogChromeStopNoLogging) A string displayed as the
+# result of the 'calllog chromestop' command when there is nothing to stop.
+calllogChromeStopNoLogging=No call logging for chrome code is currently active
+
+# LOCALIZATION NOTE (calllogStopReply) A string displayed as the result of
+# the 'calllog chromestop' command when there are logging actions to stop.
+calllogChromeStopReply=Stopped call logging. Active contexts: %1$S.
+
+# LOCALIZATION NOTE (callLogChromeAnonFunction) A string displayed as the result
+# of the 'calllog chromestart' command when an anonymouse function is to be
+# logged.
+callLogChromeAnonFunction=<anónimo>
+
+# LOCALIZATION NOTE (callLogChromeMethodCall) A string displayed as the result
+# of the 'calllog chromestart' command to proceed a method name when it is to be
+# logged.
+callLogChromeMethodCall=Llamada a método
+
+# LOCALIZATION NOTE (callLogChromeInvalidJSM) A string displayed as the result
+# of the 'calllog chromestart' command with an invalid JSM or JSM path.
+callLogChromeInvalidJSM=Invalid JSM!
+
+# LOCALIZATION NOTE (callLogChromeVarNotFoundContent) A string displayed as the
+# result of the 'calllog chromestart' command with a source type of
+# content-variable and an invalid variable name.
+callLogChromeVarNotFoundContent=Variable no encontrada en ventana de contenido.
+
+# LOCALIZATION NOTE (callLogChromeVarNotFoundChrome) A string displayed as the
+# result of the 'calllog chromestart' command with a source type of
+# chrome-variable and an invalid variable name.
+callLogChromeVarNotFoundChrome=Variable no encontrada en ventana de chrome.
+
+# LOCALIZATION NOTE (callLogChromeEvalException) A string displayed as the
+# result of the 'calllog chromestart' command with a source type of javascript
+# and invalid JavaScript code.
+callLogChromeEvalException=Javascript evaluado lanzó la siguiente excepción
+
+# LOCALIZATION NOTE (callLogChromeEvalNeedsObject) A string displayed as the
+# result of passing a non-JavaScript object creating source via the
+# 'calllog chromestart javascript' command.
+callLogChromeEvalNeedsObject=The JavaScript source must evaluate to an object whose method calls are to be logged e.g. "({a1: function() {this.a2()},a2: function() {}});"
--- a/browser/chrome/browser/devtools/scratchpad.properties
+++ b/browser/chrome/browser/devtools/scratchpad.properties
@@ -52,17 +52,17 @@ confirmClose=¿Desea guardar los cambios que hizo en este borrador?
 
 # LOCALIZATION NOTE  (confirmClose.title): This is title of the prompt dialog when
 # you try to close a scratchpad with unsaved changes.
 confirmClose.title=Cambios sin guardar
 
 # 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
+scratchpadIntro1=/*\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 (%1$S),\n * 2. Inspeccionar para mostrar un inspector de objetos sobre el resultado (%2$S) o\n * 3. Mostrar para insertar el resultado  en un comentario después de la selección. (%3$S)\n */\n\n
 
 # LOCALIZATION NOTE  (notification.browserContext): This is the message displayed
 # over the top of the editor when the user has switched to browser context.
 browserContext.notification=Este borrador se ejecuta en el contexto del navegador.
 
 # LOCALIZATION NOTE (help.openDocumentationPage): This returns a localized link with
 # documentation for Scratchpad on MDN.
 help.openDocumentationPage=https://developer.mozilla.org/es/Herramientas/Borrador
--- a/browser/chrome/browser/devtools/styleinspector.properties
+++ b/browser/chrome/browser/devtools/styleinspector.properties
@@ -25,21 +25,21 @@ 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 (rule.inheritedSource): Shown for CSS rules
-# that were inherited from a parent node.  Will be passed a node
-# identifier and a source location.
-# e.g "Inherited from body#bodyID (styles.css:20)"
-rule.inheritedSource=Heredada de %S (%S)
+# LOCALIZATION NOTE (rule.inheritedFrom): Shown for CSS rules
+# that were inherited from a parent node. Will be passed a node
+# identifier of the parent node.
+# e.g "Inherited from body#bodyID"
+rule.inheritedFrom=Heredada de %S
 
 # LOCALIZATION NOTE (style.highlighter.button): These strings are used inside
 # sidebar of the Highlighter for the style inspector button.
 # "Computed" refers to the Computed Style of the element.
 style.highlighter.button.label2=Computed
 style.highlighter.accesskey2=c
 style.highlighter.button.tooltip2=Inspect element computed styles
 
--- a/browser/chrome/browser/devtools/webConsole.dtd
+++ b/browser/chrome/browser/devtools/webConsole.dtd
@@ -3,24 +3,88 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
   - keep it in English, or another language commonly spoken among web developers.
   - You want to make that choice consistent across the developer tools.
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
 
+<!ENTITY window.title "Consola web">
+
 <!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             "Encabezados de respuesta">
 <!ENTITY networkPanel.responseBody                "Cuerpo de respuesta">
 <!ENTITY networkPanel.responseBodyCached          "Datos en caché">
 <!ENTITY networkPanel.responseBodyUnknownType     "Tipo de contenido desconocido">
 <!ENTITY networkPanel.responseNoBody              "No hay cuerpo de respuesta">
 <!ENTITY networkPanel.responseImage               "Imagen recibida">
 <!ENTITY networkPanel.responseImageCached         "Imagen en caché">
+
+<!-- LOCALIZATION NOTE (saveBodies.label): You can see this string in the Web
+   - Console context menu. -->
+<!ENTITY saveBodies.label     "Registrar pedidos y cuerpos de respuesta">
+<!ENTITY saveBodies.accesskey "p">
+
+<!-- LOCALIZATION NOTE (btnPageNet.label): This string is used for the menu
+  -  button that allows users to toggle the network logging output.
+  -  This string and the following strings toggle various kinds of output
+  -  filters. -->
+<!ENTITY btnPageNet.label   "Red">
+<!ENTITY btnPageNet.tooltip "Registrar accesos de red">
+<!ENTITY btnPageCSS.label   "CSS">
+<!ENTITY btnPageCSS.tooltip "Registrar errores de parseo CSS">
+<!ENTITY btnPageJS.label    "JS">
+<!ENTITY btnPageJS.tooltip  "Registrar excepciones de JavaScript">
+
+<!-- LOCALIZATION NOTE (btnPageLogging): This is used as the text of the
+  -  the toolbar. It shows or hides messages that the web developer inserted on
+  -  the page for debugging purposes, using calls such console.log() and
+  -  console.error(). -->
+<!ENTITY btnPageLogging.label   "Registro">
+<!ENTITY btnPageLogging.tooltip "Registrar mensajes enviados al objeto window.console">
+<!ENTITY btnConsoleErrors       "Errores">
+<!ENTITY btnConsoleInfo         "Información">
+<!ENTITY btnConsoleWarnings     "Advertencias">
+<!ENTITY btnConsoleLog          "Registro">
+
+<!-- LOCALIZATION NOTE (btnPosition.label): The label shown for the menu which
+  -  allows the user to toggle between the Web Console positioning types. -->
+<!ENTITY btnPosition.label     "Posición">
+
+<!-- LOCALIZATION NOTE (btnPosition.tooltip): The tooltip shown when the user
+  -  hovers the Position button in the Web Console toolbar. -->
+<!ENTITY btnPosition.tooltip   "Posicionar la consola web encima o debajo del documento">
+
+<!-- LOCALIZATION NOTE (positionMenu.above): When this option is selected the
+  -  Web Console interface is displayed above the web page. -->
+<!ENTITY positionMenu.above    "Encima">
+
+<!-- LOCALIZATION NOTE (positionMenu.below): When this option is selected the
+  -  Web Console interface is displayed below the web page. -->
+<!ENTITY positionMenu.below    "Debajo">
+
+<!-- LOCALIZATION NOTE (positionMenu.window): When this option is selected the
+  -  Web Console interface is displayed in a floating panel. -->
+<!ENTITY positionMenu.window   "Ventana">
+
+<!ENTITY filterBox.placeholder "Filtro">
+<!ENTITY btnClear.label        "Limpiar">
+<!ENTITY btnClear.tooltip      "Limpiar la salida de la consola web">
+<!ENTITY btnClose.tooltip      "Cerrar la consola web">
+
+<!ENTITY fullZoomEnlargeCmd.commandkey  "+">
+<!ENTITY fullZoomEnlargeCmd.commandkey2 "="> <!-- + is above this key on many keyboards -->
+<!ENTITY fullZoomEnlargeCmd.commandkey3 "">
+
+<!ENTITY fullZoomReduceCmd.commandkey   "-">
+<!ENTITY fullZoomReduceCmd.commandkey2  "">
+
+<!ENTITY fullZoomResetCmd.commandkey    "0">
+<!ENTITY fullZoomResetCmd.commandkey2   "">
--- a/browser/chrome/browser/devtools/webconsole.properties
+++ b/browser/chrome/browser/devtools/webconsole.properties
@@ -18,90 +18,52 @@ 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 (btnPageLogging):
-#
-# This is used as the text of the "Logging" button on the toolbar. It
-# shows or hides messages that the web developer inserted on the page for
-# debugging purposes, using calls such console.log() and console.error().
-btnPageLogging=Registro
-# LOCALIZATION NOTE (tipPageLogging):
-#
-# This is used as the text of the tool tip for the "Logging" button on
-# the toolbar.
-tipPageLogging=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`:
+# LOCALIZATION NOTE (jsPropertyInspectTitle):
 #
 # The %S is replaced by the evaluated code the user clicked on in the console.
 #
 # Example: The user executed `window.document` in the WebConsole. The `document`
 # object is written to the output. If the user clicks on the `document` output
 # in the console, a PropertyPanel will show up. The title of the PropertyPanel
 # is set to `Inspect: window.document` because the clicked `document` object was
 # evaluated based on the `window.document` string.
 jsPropertyInspectTitle=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
@@ -120,38 +82,20 @@ NetworkPanel.imageSizeDeltaDurationMS=%Sx%Spx, Δ%Sms
 # flash data received from the server can't be displayed.
 #
 # The %S is replaced by the content type, that can't be displayed, examples are
 #  o application/x-shockwave-flash
 #  o music/crescendo
 NetworkPanel.responseBodyUnableToDisplay.content=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 (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.
+# For RTL languages you need to set the LRM in the string to give the URL
+# the correct direction.
 webConsoleWindowTitleAndURL=Consola web - %S
 
 # LOCALIZATION NOTE (webConsoleMixedContentWarning): Message displayed after a
 # URL in the Web Console that has been flagged for Mixed Content (i.e. http
 # content in an https page)
 webConsoleMixedContentWarning=Contenido mezclado
 
 # LOCALIZATION NOTE (scratchpad.linkText):
@@ -172,21 +116,16 @@ Autocomplete.label=Autocomplete popup
 # 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):
--- a/browser/chrome/browser/downloads/downloads.dtd
+++ b/browser/chrome/browser/downloads/downloads.dtd
@@ -7,16 +7,23 @@
      -->
 <!ENTITY indicator.tooltiptext            "Descargas">
 
 <!-- LOCALIZATION NOTE (downloads.title):
      Used by screen readers to describe the Downloads Panel.
      -->
 <!ENTITY downloads.title                  "Descargas">
 
+<!-- LOCALIZATION NOTE (downloads.width):
+     Width of the Downloads Panel list items, expressed using a CSS unit.  The
+     longest labels that should fit in the item width are usually those of
+     in-progress downloads and those of blocked downloads.
+     -->
+<!ENTITY downloads.width                  "65ch">
+
 <!ENTITY cmd.pause.label                  "Pausa">
 <!ENTITY cmd.pause.accesskey              "P">
 <!ENTITY cmd.resume.label                 "Continuar">
 <!ENTITY cmd.resume.accesskey             "r">
 <!ENTITY cmd.cancel.label                 "Cancelar">
 <!ENTITY cmd.cancel.accesskey             "C">
 <!-- LOCALIZATION NOTE (cmd.show.label, cmd.show.accesskey, cmd.showMac.label,
      cmd.showMac.accesskey):
@@ -32,10 +39,8 @@
 <!ENTITY cmd.goToDownloadPage.accesskey   "g">
 <!ENTITY cmd.copyDownloadLink.label       "Copiar enlace de descarga">
 <!ENTITY cmd.copyDownloadLink.accesskey   "l">
 <!ENTITY cmd.removeFromList.label         "Eliminar de la lista">
 <!ENTITY cmd.removeFromList.accesskey     "E">
 <!ENTITY cmd.clearList.label              "Limpiar lista">
 <!ENTITY cmd.clearList.accesskey          "a">
 
-<!ENTITY downloadshistory.label           "Mostrar todas las descargas">
-<!ENTITY downloadshistory.accesskey       "s">
--- a/browser/chrome/browser/downloads/downloads.properties
+++ b/browser/chrome/browser/downloads/downloads.properties
@@ -62,11 +62,25 @@ shortTimeLeftDays=%1$Sd
 # that we use a wider space after the separator when it is followed by a number,
 # just to avoid visually confusing it with with a minus sign with some fonts.
 # If you use a different separator, this might not be necessary.  However, there
 # is usually no need to change the separator or the order of the substitutions,
 # even for right-to-left languages, unless the defaults are not suitable.
 statusSeparator=%1$S \u2014 %2$S
 statusSeparatorBeforeNumber=%1$S \u2014  %2$S
 
+# LOCALIZATION NOTE (showMoreDownloads):
+# This string is shown in the Downloads Panel when there are more active
+# downloads than can fit in the available space.  The phrase should be read as
+# "Show N more of my recent downloads".  Use a semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/Localization_and_Plurals
+showMoreDownloads=Mostrar 1 descarga reciente más;Mostrar %1$S descargas recientes más
+# LOCALIZATION NOTE (showAllDownloads):
+# This string is shown in place of showMoreDownloads when all the downloads fit
+# in the available space, or when there are no downloads in the panel at all.
+showAllDownloads=Mostrar todas las descargas
+# LOCALIZATION NOTE (showDownloadsAccessKey):
+# This access key applies to both showMoreDownloads and showAllDownloads.
+showDownloadsAccessKey=s
+
 fileExecutableSecurityWarning="%S" es un archivo ejecutable. Los ejecutables pueden contener virus o algún código malicioso que puede dañar su computadora. Tenga cuidado al abrir este archivo. ¿Está seguro de querer ejecutar "%S"?
 fileExecutableSecurityWarningTitle=¿Abrir archivo ejecutable?
 fileExecutableSecurityWarningDontAsk=No preguntarme de nuevo
--- a/chat/conversations.properties
+++ b/chat/conversations.properties
@@ -17,26 +17,46 @@ statusChanged=%1$S es ahora %2$S.
 #  %3$S is the status text (eg. "I'm currently away from the computer").
 statusChangedWithStatusText=%1$S es ahora %2$S: %3$S.
 # LOCALIZATION NOTE (statusChangedFromUnknown[WithStatusText]):
 #  special case of the previous 2 strings for when the status was
 #  previously unknown. These 2 strings should not mislead the user
 #  into thinking the person's status has just changed.
 statusChangedFromUnknown=%1$S es %2$S.
 statusChangedFromUnknownWithStatusText=%1$S es %2$S: %3$S.
-
+# LOCALIZATION NOTE (statusKnown[WithStatusText]):
+# special case of the previous 2 strings for when an account has just
+# been reconnected, so the status is now known. These 2 strings should not
+# mislead the user into thinking the person's status has just changed.
+statusKnown=Su cuenta ha sido reconectada. (%1$S es %2$S).
+statusKnownWithStatusText=Su cuenta ha sido reconectada. (%1$S es %2$S: %3$S).
 # LOCALIZATION NOTE (statusUnknown):
 #  %S is the display name of the contact.
-statusUnknown=Su cuenta está desconectada (the status of %S is no longer known).
+statusUnknown=Su cuenta está desconectada (el estado de %S ya no es conocido).
+
 accountDisconnected=Su cuenta está desconectada.
+accountReconnected=Su cuenta ha sido reconectada.
 
 # LOCALIZATION NOTE (autoReply):
 #  %S is replaced by the text of a message that was sent as an automatic reply.
 autoReply=Auto respuesta - %S
 
+# LOCALIZATION NOTE (topicSet):
+#  %1$S is the conversation name, %2$S is the topic.
+topicSet=El tema para %1$S es: %2$S.
+# LOCALIZATION NOTE (topicNotSet):
+#  %S is the conversation name.
+topicNotSet=No hay tema para %S.
+# LOCALIZATION NOTE (topicChanged):
+#  %1$S is the user who changed the topic, %2$S is the new topic.
+topicChanged=%1$S ha cambiado el tema a : %2$S.
+# LOCALIZATION NOTE (topicCleared):
+#  %1$S is the user who cleared the topic.
+topicCleared=%1$S ha limpiado el tema.
+
 # LOCALIZATION NOTE (messenger.conversations.selections.ellipsis):
 #  ellipsis is used when copying a part of a message to show that the message was cut
 messenger.conversations.selections.ellipsis=[…]
 
 # LOCALIZATION NOTE (messenger.conversations.selections.{system,content,action}MessagesTemplate):
 #  These 3 templates are used to format selected messages before copying them.
 #  Do not translate the texts between % characters, but feel free to adjust
 #  whitespace and separators to make them fit your locale.
--- a/chat/irc.properties
+++ b/chat/irc.properties
@@ -66,17 +66,16 @@ command.quit=%S &lt;mensaje&gt;: Descone
 command.quote=%S &lt;command&gt;: Send a raw command to the server.
 command.time=%S: Displays the current local time at the IRC server.
 command.topic=%S [&lt;new topic&gt;]: View or change the channel topic.
 command.umode=%S (+|-)&lt;new mode&gt;: Set or unset a user mode.
 command.version=%S &lt;nick&gt;: Request the version of a user's client.
 command.voice=%S &lt;nick1&gt;[,&lt;nick2&gt;]*: Grant channel voice status to someone. You must be a channel operator to do this.
 command.wallops=%S &lt;message&gt;: If you don't know what this is, you probably can't use it (sends a command to all connected with the +w flag and all operators on the server.
 command.whois=%S &lt;nick&gt;: Get information on a user.
-command.whowas=%S &lt;nick&gt;: Get information on a user that has logged off.
 
 # LOCALIZATION NOTE (message.*):
 #    These are shown as system messages in the conversation.
 #    %1$S is the nick and %2$S is the nick and host of the user who joined.
 message.join=%1$S [%2$S] entered the room.
 #    %1$S is the nick of who kicked you.
 #    %2$S is message.kicked.reason, if a kick message was given.
 message.kicked.you=Ha sido expulsado por %1$S%2$S.
@@ -97,27 +96,22 @@ message.parted.you=You have left the roo
 #    %1$S is the user's nick, %2$S is message.parted.reason, if a part message is given.
 message.parted=%1$S has left the room (Part%2$S).
 #    %S is the part message supplied by the user.
 message.parted.reason=: %S
 #    %1$S is the user's nick, %2$S is message.quit2 if a quit message is given.
 message.quit=%1$S has left the room (Quit%2$S).
 #    The paramter is the quit message given by the user.
 message.quit2=: %S
-#    %1$S is the user who changed the topic, %2$S is the new topic.
-message.topicChanged=%1$S has changed the topic to: %2$S.
-#    %1$S is the user who cleared the topic.
-message.topicCleared=%1$S has cleared the topic.
-#    %1$S is the conversation name, %2$S is the topic.
-message.topic=The topic for %1$S is: %2$S.
-#    %S is the conversation name.
-message.topicNotSet=There is no topic for %S.
+#    %1$S is the nickname of the user that invited us, %2$S is the conversation
+#    name.
+message.inviteReceived=%1$S te ha invitado a %2$S.
 #    %1$S is the nickname of the invited user, %2$S is the conversation name
 #    they were invited to.
-message.invited=%1$S was successfully invited to %2$S.
+message.invited=%1$S fue exitosamente invitado a %2$S.
 #    %S is the nickname of the user who was summoned.
 message.summoned=%S was summoned.
 #    %S is the nickname of the user whose WHOIS information follows this message.
 message.whois=Información de WHOIS para %S:
 #    %1$S is the nickname of the (offline) user whose WHOWAS information follows this message.
 message.whowas=%1$S is offline. WHOWAS information for %1$S:
 #    %1$S is the entry description (from tooltip.*), %2$S is its value.
 message.whoisEntry=\ua0\ua0\ua0\ua0%1$S: %2$S
@@ -126,16 +120,17 @@ message.unknownNick=%S is an unknown nic
 
 # LOCALIZATION NOTE (error.*):
 #    These are shown as error messages in the conversation.
 #    %S is the channel name.
 error.noChannel=There is no channel: %S.
 error.tooManyChannels=Cannot join %S; you've joined too many channels.
 #    %1$S is your new nick, %2$S is the kill message from the server.
 error.nickCollision=Nick already in use, changing nick to %1$S [%2$S].
+error.erroneousNickname=%S is not an allowed nickname.
 error.banned=You are banned from this server.
 error.bannedSoon=You will soon be banned from this server.
 error.mode.wrongUser=No puede cambar modos para otros usuarios.
 #    %S is the nickname or channel name that isn't available.
 error.noSuchNick=%S is not online.
 error.wasNoSuchNick=There was no nickname: %S
 error.noSuchChannel=No hay canal: %S.
 #    %S is the channel name.
@@ -146,18 +141,25 @@ error.notChannelOp=No es operador del ca
 # LOCALIZATION NOTE (tooltip.*):
 #    These are the descriptions given in a tooltip with information received
 #    from a whois response.
 #    The human readable ("realname") description of the user.
 tooltip.realname=Nombre
 #    The username and hostname that the user connects from (usually based on the
 #    reverse DNS of the user's IP, but often mangled by the server to
 #    protect users).
-tooltip.connectedFrom=Connected from
+tooltip.connectedFrom=Conectado desde
+tooltip.registered=Registrado
+tooltip.secure=Usando una conexión segura
 # The away message of the user
 tooltip.away=Away
 tooltip.ircOp=Operador de IRC
 tooltip.channels=Actualmente en
 tooltip.server=Conectado a
 #    %1$S is the server name, %2$S is the server location.
 tooltip.serverValue=%1$S (%2$S)
 tooltip.idleTime=Inactivo por
 
+# LOCALIZATION NOTE (yes, no):
+#  These are used to turn true/false values into a yes/no response.
+yes=Sí
+no=No
+
--- a/dom/chrome/dom/dom.properties
+++ b/dom/chrome/dom/dom.properties
@@ -128,9 +128,9 @@ MozBlobBuilderWarning=El uso de MozBlobB
 # LOCALIZATION NOTE: Do not translate "DOMException", "code" and "name"
 DOMExceptionCodeWarning=El uso del atributo de código DOMException es obsoleto. Use name en su lugar.
 # LOCALIZATION NOTE: Do not translate "__exposedProps__"
 NoExposedPropsWarning=Exponer objetos JS del chrome al contexto sin __exposedProps__ es inseguro y obsoleto. Vea https://developer.mozilla.org/en/XPConnect_wrappers para más información
 # LOCALIZATION NOTE: Do not translate "Mutation Event" and "MutationObserver"
 MutationEventWarning=El uso de Mutation Event es obsoleto. Use MutationObserver en su lugar.
 # LOCALIZATION NOTE: Do not translate "Blob", "mozSlice", or "slice"
 MozSliceWarning=El uso de mozSlice en el objeto Blob object es obsoleto.  Use slice en su lugar.
-OnuploadprogressWarning=El uso del atributo onuploadprogress de XMLHttpRequest es obsoleto.
+
--- a/dom/chrome/layout/css.properties
+++ b/dom/chrome/layout/css.properties
@@ -17,17 +17,17 @@ PEUnknownAtRule=Regla at no reconocida o
 PECharsetRuleEOF=cadena de texto de charset en regla @charset
 PECharsetRuleNotString=Se esperaba charset string pero se encontró '%1$S'.
 PEGatherMediaEOF=fin de la lista de medios en una regla @import o @media
 PEGatherMediaNotComma=Se esperaba ',' en media list pero se encontró '%1$S'.
 PEGatherMediaNotIdent=Se esperaba identificador en media list pero se encontró '%1$S'.
 PEImportNotURI=Se esperaba URI en regla @import pero se encontró '%1$S'.
 PEImportBadURI=URI no válida en regla @import: '%1$S'.
 PEImportUnexpected=Se encontró una '%1$S' no esperada dentro de @import.
-PEGroupRuleEOF=fin de una regla @media o @-moz-document
+PEGroupRuleEOF2=fin de una regla @media, @supports o @-moz-document
 PEGroupRuleNestedAtRule=Regla %1$S no permitida dentro de @media o @-moz-document.
 PEMozDocRuleBadFunc=Se esperaba url(), url-prefix() o domain() en regla @-moz-document pero se encontró '%1$S'.
 PEMozDocRuleNotURI=Se esperaba URI en regla @-moz-document pero se encontró '%1$S'.
 PEMozDocRuleNotString=Cadena esperada en regla @-moz-document en función regexp() pero se econtró '%1$S'.
 PEMozDocRuleEOF=próxima URI en regla @-moz-document
 PEAtNSPrefixEOF=prefijo de namespace en una regla @namespace
 PEAtNSURIEOF=URI de namespace en una regla @namespace
 PEAtNSUnexpected=Símbolo no esperado dentro de @namespace: '%1$S'.
@@ -109,8 +109,17 @@ PEMQExpectedExpressionStart=Se esperaba '(' para comenzar expresión de consulta de medios pero se encontró '%1$S'.
 PEMQExpressionEOF=contenudi de expresión de consult de medios
 PEMQExpectedFeatureName=Expected media feature name but found '%1$S'.
 PEMQExpectedFeatureNameEnd=Se esperaba ':' o ')' después de media feature name pero se encontró '%1$S'.
 PEMQNoMinMaxWithoutValue=Características de medios con min- o max- deben tener un valor.
 PEMQExpectedFeatureValue=Se encontró un valor no válido para característica de medios.
 PEBadFontBlockStart=Se esperaba '{' para comenzar la regla @font-face pero se encontró '%1$S'.
 PEBadFontBlockEnd=Se esperaba '}' para finalizar la regla @font-face pero se encontró '%1$S'.
 PEAnonBoxNotAlone=No se esperaba una caja anónima.
+PEBadDirValue=Se esperaba 'ltr' o 'rtl' en selector de dirección pero se encontró '%1$S'.
+PESupportsConditionStartEOF='not' o '('
+PESupportsConditionInParensStartEOF='not', '(' o identificador
+PESupportsConditionNotEOF='not'
+PESupportsConditionExpectedOpenParen=Se esperaba '(' al leer condición de supports pero se econtro '%1$S'.
+PESupportsConditionExpectedCloseParen=Se esperaba ')' al leer condición de supports pero se econtro '%1$S'.
+PESupportsConditionExpectedStart=Se esperaba 'not' o '(' al leer condición de supports pero se econtro '%1$S'.
+PESupportsConditionExpectedNot=Se esperaba 'not' al leer condición de supports pero se econtro '%1$S'.
+PESupportsGroupRuleStart=Se esperaba '{' para comenzar una regla @supports pero se encontró '%1$S'.
--- a/mail/chrome/messenger/FilterEditor.dtd
+++ b/mail/chrome/messenger/FilterEditor.dtd
@@ -43,8 +43,16 @@
 <!ENTITY ignoreThread.label "Ignorar conversación">
 <!ENTITY ignoreSubthread.label "Ignorar Subconversación">
 <!ENTITY watchThread.label "Observar conversación">
 <!ENTITY stopExecution.label "Detener ejecución del filtro">
 
 <!ENTITY addAction.tooltip "Agregar una nueva acción">
 <!ENTITY removeAction.tooltip "Eliminar esta acción">
 
+<!-- LOCALIZATION NOTE
+  The values below are used to control the widths of the filter action widgets.
+  Change the values only when the localized strings in the popup menus
+  are truncated in the widgets.
+ -->
+<!ENTITY filterActionTypeFlexValue "1">
+<!ENTITY filterActionTargetFlexValue "4">
+
--- a/mail/chrome/messenger/FilterListDialog.dtd
+++ b/mail/chrome/messenger/FilterListDialog.dtd
@@ -6,28 +6,35 @@
 <!ENTITY nameColumn.label "Nombre del filtro">
 <!ENTITY activeColumn.label "Activado">
 <!ENTITY newButton.label "Nuevo…">
 <!ENTITY newButton.accesskey "N">
 <!ENTITY editButton.label "Editar…">
 <!ENTITY editButton.accesskey "E">
 <!ENTITY deleteButton.label "Borrar">
 <!ENTITY deleteButton.accesskey "B">
+<!ENTITY reorderTopButton "Mover al inicio">
+<!ENTITY reorderTopButton.accessKey "o">
+<!ENTITY reorderTopButton.toolTip "Reordenar filtro para que se ejecute antes que todos los otros">
 <!ENTITY reorderUpButton.label "Subir">
 <!ENTITY reorderUpButton.accesskey "S">
 <!ENTITY reorderDownButton.label "Bajar">
 <!ENTITY reorderDownButton.accesskey "j">
+<!ENTITY reorderBottomButton "Mover al final">
+<!ENTITY reorderBottomButton.accessKey "f">
+<!ENTITY reorderBottomButton.toolTip "Reordenar filtro para que se ejecute después que todos los otros">
 <!ENTITY filterHeader.label "Los filtros activos se ejecutan automáticamente en el orden indicado debajo.">
 <!ENTITY filtersForPrefix.label "Filtros para:">
 <!ENTITY filtersForPrefix.accesskey "F">
 <!ENTITY viewLogButton.label "Registro de filtros">
 <!ENTITY viewLogButton.accesskey "l">
 <!ENTITY runFilters.label "Ejecutar ahora">
 <!ENTITY runFilters.accesskey "r">
 <!ENTITY stopFilters.label "Parar">
 <!ENTITY stopFilters.accesskey "S">
 <!ENTITY folderPickerPrefix.label "Ejecutar los filtros seleccionados en:">
 <!ENTITY folderPickerPrefix.accesskey "c">
 <!ENTITY choosethis.label "elegir esta carpeta">
 <!ENTITY choosethisnewsserver.label "elegir este servidor de noticias">
 <!ENTITY helpButton.label "Ayuda">
 <!ENTITY helpButton.accesskey "u">
 <!ENTITY closeCmd.key "W">
+<!ENTITY searchBox.emptyText "Filtros de búsqueda por nombre…">
--- a/mail/chrome/messenger/aboutDialog.dtd
+++ b/mail/chrome/messenger/aboutDialog.dtd
@@ -51,16 +51,18 @@
 <!-- LOCALIZATION NOTE (update.downloading.start,update.downloading.end): update.downloading.start and 
      update.downloading.end all go into one line, with the amount downloaded inserted in between. As this
      is all in one line, try to make the localized text short (see bug 596813 for screenshots). The — is
      the "em dash" (long dash).
      example: Downloading update — 111 KB of 13 MB -->
 <!ENTITY update.downloading.start   "Descargando actualización — ">
 <!ENTITY update.downloading.end     "">
 
+<!ENTITY update.applying            "Aplicando actualización…">
+
 <!-- LOCALIZATION NOTE (channel.description.start,channel.description.end): channel.description.start and
      channel.description.end create one sentence, with the current channel label inserted in between.
      example: You are currently on the _Stable_ update channel. -->
 <!ENTITY channel.description.start  "Está actualmente en el canal de actualización ">
 <!ENTITY channel.description.end    ". ">
 
 <!ENTITY cmdCloseMac.commandKey "w">
 
--- a/mail/chrome/messenger/am-mdn.dtd
+++ b/mail/chrome/messenger/am-mdn.dtd
@@ -1,15 +1,17 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY pane.title "Acuses de recibo">
 <!ENTITY useGlobalPrefs.label "Usar las preferencias globales de acuse de recibo para esta cuenta">
 <!ENTITY useGlobalPrefs.accesskey "U">
+<!ENTITY globalReceipts.label         "Preferencias globales…">
+<!ENTITY globalReceipts.accesskey     "g">
 <!ENTITY useCustomPrefs.label "Personalizar acuse de recibo para esta cuenta">
 <!ENTITY useCustomPrefs.accesskey "c">
 <!ENTITY requestReceipt.label "Al enviar mensajes, solicitar siempre un acuse de recibo">
 <!ENTITY requestReceipt.accesskey "v">
 <!ENTITY receiptArrive.label "Cuando llegue un acuse de recibo:">
 <!ENTITY leaveIt.label "Dejarlo en mi bandeja de entrada">
 <!ENTITY leaveIt.accesskey "i">
 <!-- LOCALIZATION NOTE moveToSent.label Translate: 'Sent' according to Netscape glossary -->
--- a/mail/chrome/messenger/filter.properties
+++ b/mail/chrome/messenger/filter.properties
@@ -19,17 +19,21 @@ continueFilterExecution=Ha fallado la aplicación del filtro %S. ¿Quiere continuar aplicando filtros?
 promptTitle=Ejecutando filtros
 promptMsg=En este momento está procesando el filtrado de mensajes.\n¿Quiere continuar aplicando filtros?
 stopButtonLabel=Parar
 continueButtonLabel=Continuar
 cannotEnableFilter=Este filtro probablemente ha sido creado por versiones más modernas de Mozilla/Netscape. No puede habilitar este filtro porque esta versión de la aplicación no sabe cómo aplicarlo.
 dontWarnAboutDeleteCheckbox=No preguntarme de nuevo
 searchTermsInvalidTitle=Términos de búsqueda no válidos
 searchTermsInvalidMessage=Este filtro no puede guardarse porque algunos términos de búsqueda no son válidos en el contexto actual.
-
+filterCountVisibleOfTotal=%1$S de %2$S
+## LOCALIZATION NOTE(filterCountItems): Semi-colon list of plural forms.
+## See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+## #1 is the count of items in the list.# filterCountItems is a pluralForm - see 
+filterCountItems=#1 ítem; #1 ítems
 # for junk mail logging / mail filter logging
 # LOCALIZATION NOTE(junkLogDetectStr)
 # %1$S=author, %2$S=subject, %3$S=date
 junkLogDetectStr=Mensaje basura detectado desde %1$S - %2$S en %3$S
 # LOCALIZATION NOTE(logMoveStr)
 # %1$S=message id, %2$S=folder URI
 logMoveStr=id de mensaje movido = %1$S a %2$S
 # LOCALIZATION NOTE(logCopyStr)
--- a/mail/chrome/messenger/folderProps.dtd
+++ b/mail/chrome/messenger/folderProps.dtd
@@ -60,8 +60,16 @@
 <!ENTITY privileges.button.accesskey             "P">
 <!ENTITY permissionsDesc.label "Tiene los siguientes permisos:">
 <!ENTITY folderType.label "Tipo de carpeta:">
 
 <!ENTITY folderQuotaTab.label "Cuota">
 <!ENTITY folderQuotaRoot.label "Cuota raíz:">
 <!ENTITY folderQuotaUsage.label "Uso:">
 <!ENTITY folderQuotaStatus.label "Estado:">
+
+<!ENTITY numberOfMessages.label                  "Número de mensajes:">
+<!-- LOCALIZATION NOTE: When the number of messages can't be determined, this string is displayed as the number -->
+<!ENTITY numberUnknown.label                     "desconocido">
+<!ENTITY sizeOnDisk.label                        "Tamaño en disco:">
+<!-- LOCALIZATION NOTE: When the size can't be determined, this string is displayed as the size -->
+<!ENTITY sizeUnknown.label                       "desconocido">
+
--- a/mail/chrome/messenger/messenger.dtd
+++ b/mail/chrome/messenger/messenger.dtd
@@ -502,16 +502,18 @@ you can use these alternative items. Oth
 <!ENTITY runJunkControls.accesskey "u">
 <!ENTITY deleteJunk.label "Borrar mensajes marcados como basura en la carpeta">
 <!ENTITY deleteJunk.accesskey "B">
 <!ENTITY importCmd.label "Importar…">
 <!ENTITY importCmd.accesskey "p">
 <!ENTITY errorConsoleCmd.label "Consola de errores">
 <!ENTITY errorConsoleCmd.accesskey "n">
 <!ENTITY errorConsoleCmd.commandkey "j">
+<!ENTITY clearRecentHistory.label "Borrar historial reciente…">
+<!ENTITY clearRecentHistory.accesskey "h">
 <!ENTITY accountManagerCmd.label "Configuración de cuentas…">
 <!ENTITY accountManagerCmd.accesskey "f">
 <!-- LOCALIZATION NOTE (accountManagerCmdUnix.accesskey): belongs to accountManagerCmd.label,
         which is placed under the Edit menu on Unix systems -->
 <!ENTITY accountManagerCmdUnix.accesskey "f">
 
 <!-- Mail Toolbar -->
 <!ENTITY getMsgButton.label "Recibir mensajes">
@@ -543,16 +545,17 @@ you can use these alternative items. Oth
 <!ENTITY addressBookButton.label "Direcciones">
 <!ENTITY chatButton.label "Chat">
 <!ENTITY glodaSearch.title "Búsqueda global">
 <!ENTITY searchItem.title "Búsqueda rápida">
 <!ENTITY mailViewsToolbarItem.title "Vistas">
 <!ENTITY folderLocationToolbarItem.title "Dirección de la carpeta">
 <!ENTITY tagButton.label "Etiquetar">
 <!ENTITY compactButton.label "Compactar">
+<!ENTITY appmenuButton.label "Menu de aplicaciones">
 
 <!-- Mail Toolbar Tooltips-->
 <!ENTITY advancedButton.tooltip "Búsqueda avanzada de mensajes">
 <!ENTITY getMsgButton.tooltip "Recibir mensajes nuevos">
 <!ENTITY getAllNewMsgCmd.label "Recibir todos los mensajes nuevos">
 <!ENTITY getAllNewMsgCmd.accesskey "j">
 <!ENTITY newMsgButton.tooltip "Crear nuevo mensaje">
 <!ENTITY replyButton.tooltip "Responder al mensaje">
@@ -573,16 +576,24 @@ you can use these alternative items. Oth
 <!ENTITY printButton.tooltip "Imprimir este mensaje">
 <!ENTITY stopButton.tooltip "Detener la transferencia actual">
 <!ENTITY junkButton.tooltip "Marcar los mensajes seleccionados como correo basura">
 <!ENTITY notJunkButton.tooltip "Marcar los mensajes seleccionados como correo normal">
 <!ENTITY addressBookButton.tooltip "Ir a la libreta de direcciones">
 <!ENTITY chatButton.tooltip "Mostrar la pestaña de chat">
 <!ENTITY tagButton.tooltip "Etiquetar mensajes">
 <!ENTITY compactButton.tooltip "Eliminar mensajes borrados de la carpeta actual">
+<!ENTITY appmenuButton.tooltip "Mostrar el menú de aplicaciones">
+
+<!-- AppMenu Popup -->
+<!ENTITY appmenuNewMsgCmd.label "Nuevo mensaje">
+<!ENTITY appmenuNewContactCmd.label "Contacto de libreta de direcciones…">
+<!ENTITY appmenuEditMenu.label "Editar">
+<!ENTITY appmenuQFBMenu.label "Barra de filtro rápido">
+<!ENTITY appmenuToolbarLayout.label "Diseño de la barra…">
 
 <!-- Tags Menu Popup -->
 <!ENTITY addNewTag.label "Nueva etiqueta…">
 <!ENTITY addNewTag.accesskey "N">
 <!ENTITY manageTags.label "Administrar etiquetas…">
 <!ENTITY manageTags.accesskey "m">
 
 <!-- Folder Pane -->
--- a/mail/chrome/messenger/messenger.properties
+++ b/mail/chrome/messenger/messenger.properties
@@ -666,16 +666,18 @@ safeModeRestartButton=Reiniciar
 update.checkInsideButton.label=Buscar actualizaciones
 update.checkInsideButton.accesskey=c
 update.resumeButton.label=Continuar decargando %S…
 update.resumeButton.accesskey=d
 update.openUpdateUI.applyButton.label=Aplicar actualización…
 update.openUpdateUI.applyButton.accesskey=A
 update.restart.updateButton.label=Reiniciar para actualizar
 update.restart.updateButton.accesskey=R
+update.restart.restartButton.label=Actualizar y reiniciar
+update.restart.restartButton.accesskey=r
 update.openUpdateUI.upgradeButton.label=Actualizar ahora…
 update.openUpdateUI.upgradeButton.accesskey=u
 update.restart.upgradeButton.label=Actualizar ahora
 update.restart.upgradeButton.accesskey=u
 
 websearch.setDefault=Establecer este buscador como predeterminado
 websearch.isDefault=Este buscador ya es predeterminado
 
@@ -696,8 +698,22 @@ 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=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 -->
+sanitizeDialog2.everything.title=Borrar todo el historial
+sanitizeButtonOK=Borrar ahora
+# LOCALIZATION NOTE (sanitizeEverythingWarning2): Warning that appears when
+# "Time range to clear" is set to "Everything" in Clear Recent History dialog,
+# provided that the user has not modified the default set of history items to clear.
+sanitizeEverythingWarning2=Todo el historial será borrado.
+# LOCALIZATION NOTE (sanitizeSelectedWarning): Warning that appears when
+# "Time range to clear" is set to "Everything" in Clear Recent History dialog,
+# provided that the user has modified the default set of history items to clear.
+sanitizeSelectedWarning=Todos los ítems seleccionados serán borrados.
--- a/mail/chrome/messenger/messengercompose/sendProgress.dtd
+++ b/mail/chrome/messenger/messengercompose/sendProgress.dtd
@@ -1,9 +1,9 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!--LOCALIZATION NOTE sendprogress.dtd Main UI for Send Message Progress Dialog -->
-<!ENTITY sendWindow.title "Enviando mensajes">
+<!ENTITY sendDialog.title "Procesando mensaje">
 <!ENTITY status.label "Estado:">
 <!ENTITY progress.label "Progreso:">
 
--- a/mail/chrome/messenger/messengercompose/sendProgress.properties
+++ b/mail/chrome/messenger/messengercompose/sendProgress.properties
@@ -1,14 +1,20 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-titlePrefixSave=Guardando mensajes -
-titlePrefixSend=Enviando mensajes -
+# LOCALIZATION NOTE (titleSendMsgSubject):
+# %S will be replaced by the message subject.
+titleSendMsgSubject=Enviando mensaje - %S
+titleSendMsg=Enviando mensaje
+# LOCALIZATION NOTE (titleSaveMsgSubject):
+# %S will be replaced by the message subject.
+titleSaveMsgSubject=Guardando mensaje - %S
+titleSaveMsg=Guardando mensaje
 
 # LOCALIZATION NOTE (percentMsg):
 # This string is used to format the text to the right of the progress meter.
 # %S% will be replaced by the percentage of the file that has been saved
 percentMsg=%S%%
 
 messageSent=Su mensaje ha sido enviado.
 messageSaved=Su mensaje ha sido guardado.
--- a/mail/chrome/messenger/msgHdrViewOverlay.dtd
+++ b/mail/chrome/messenger/msgHdrViewOverlay.dtd
@@ -63,16 +63,20 @@
 <!ENTITY markAsUnreadMenuItem1.accesskey "r">
 <!ENTITY saveAsMenuItem1.label "Guardar como…">
 <!ENTITY saveAsMenuItem1.accesskey "g">
 <!ENTITY viewSourceMenuItem1.label "Ver fuente">
 <!ENTITY viewSourceMenuItem1.accesskey "V">
 <!ENTITY otherActionsPrint1.label "Imprimir…">
 <!ENTITY otherActionsPrint1.accesskey "p">
 
+<!-- Attachment bar context menu items -->
+<!ENTITY startExpandedCmd.label    "Mostrar vista de adjuntos al inicio">
+<!ENTITY startExpandedCmd.accesskey    "s">
+
 <!-- Attachment context menu items -->
 <!ENTITY openAttachmentCmd.label "Abrir">
 <!ENTITY openAttachmentCmd.accesskey "A">
 <!ENTITY saveAsAttachmentCmd.label "Guardar como…">
 <!ENTITY saveAsAttachmentCmd.accesskey "a">
 <!ENTITY detachAttachmentCmd.label    "Despegar…">
 <!ENTITY detachAttachmentCmd.accesskey    "D">  
 <!ENTITY deleteAttachmentCmd.label    "Borrar">
--- a/mail/chrome/messenger/preferences/general.dtd
+++ b/mail/chrome/messenger/preferences/general.dtd
@@ -27,13 +27,8 @@
 <!ENTITY systemsoundMac.label             "Alerta de sonido del sistema">
 <!ENTITY systemsoundMac.accesskey         "s">
 <!ENTITY systemsound.accesskey            "S">
 <!ENTITY customsound.label                "Usar el siguiente archivo de sonido">
 <!ENTITY customsound.accesskey            "U">
 <!ENTITY browse.label                     "Examinar…">
 <!ENTITY browse.accesskey                 "x">
 
-<!ENTITY addonsMgr.label                  "Complementos">
-<!ENTITY manageAddonsDescWin.label        "Cambiar opciones para sus complementos">
-<!ENTITY manageAddonsDescUnix2.label      "Cambiar preferencias para sus complementos">
-<!ENTITY manageAddons.label               "Administrar complementos…">
-<!ENTITY manageAddons.accesskey           "M">
--- a/mail/chrome/messenger/prefs.properties
+++ b/mail/chrome/messenger/prefs.properties
@@ -56,11 +56,18 @@ prefPanel-smtp=Configuración del servidor saliente (SMTP)
 
 # account manager multiple identity support
 #LOCALIZATION NOTE: accountName: %1$S 
 identity-list-title=Identidades para %1$S
 
 identity-edit-req=Debe especificar una dirección de correo válida para esta identidad
 identity-edit-req-title=Error al crear la identidad
 
+## LOCALIZATION NOTE (identity-delete-confirm): %S is the identity name
+# and should be put on a new line. The new line is produced with the "\n" string.
+identity-delete-confirm=¿Está seguro de querer borrar la identidad\n%S?
+## LOCALIZATION NOTE (identity-delete-confirm-title): %S is the account name
+identity-delete-confirm-title=Borrar identidad para %S
+identity-delete-confirm-button=Borrar
+
 choosefile=Elegir un archivo
 
 forAccount=Para la cuenta "%S"
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/sanitize.dtd
@@ -0,0 +1,50 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY sanitizePrefs2.title          "Opciones de borrado del historial">
+<!ENTITY sanitizeDialog2.title         "Borrar historial reciente">
+
+<!ENTITY sanitizeItems.label          "Borrar los siguientes ítems ahora:">
+<!ENTITY clearDataSettings2.label     "Cuando salga de &brandShortName;, debería borrar automáticamente:">
+
+<!-- XXX rearrange entities to match physical layout when l10n isn't an issue -->
+<!-- LOCALIZATION NOTE (clearTimeDuration.*): "Time range to clear" dropdown.
+     See UI mockup at bug 480169 -->
+<!ENTITY clearTimeDuration.label          "Intervalo de tiempo para borrar: ">
+<!ENTITY clearTimeDuration.accesskey      "t">
+<!ENTITY clearTimeDuration.lastHour       "la última hora">
+<!ENTITY clearTimeDuration.last2Hours     "las últimas 2 horas">
+<!ENTITY clearTimeDuration.last4Hours     "las últimas 4 horas">
+<!ENTITY clearTimeDuration.today          "Hoy">
+<!ENTITY clearTimeDuration.everything     "Todo">
+<!-- Localization note (clearTimeDuration.suffix) - trailing entity for languages
+that require it.  -->
+<!ENTITY clearTimeDuration.suffix         "">
+<!ENTITY clearTimeDuration.dateColumn     "Día en que se visitó">
+<!ENTITY clearTimeDuration.nameColumn     "Nombre">
+
+<!-- LOCALIZATION NOTE (detailsProgressiveDisclosure.*): Labels and accesskeys
+     of the "Details" progressive disclosure button.  See UI mockup at bug
+     480169 -->
+<!ENTITY detailsProgressiveDisclosure.label     "Detalles">
+<!ENTITY detailsProgressiveDisclosure.accesskey "e">
+
+<!ENTITY historySection.label         "Historial">
+<!ENTITY dataSection.label            "Datos">
+
+<!-- LOCALIZATION NOTE (item*): itemHistoryAndDownloads.* and
+     itemBrowsingHistory.* will never be used at the same time, so they can
+     have the same accesskey. -->
+<!ENTITY itemCookies.label                 "Cookies">
+<!ENTITY itemCookies.accesskey             "C">
+<!ENTITY itemCache.label                   "Caché">
+<!ENTITY itemCache.accesskey               "A">
+
+<!-- LOCALIZATION NOTE (sanitizeEverythingUndoWarning): Second warning paragraph
+     that appears when "Time range to clear" is set to "Everything".  See UI
+     mockup at bug 480169 -->
+<!ENTITY sanitizeEverythingUndoWarning     "Esta acción no puede deshacerse.">
+
+<!ENTITY dialog.width                 "30em">
+<!ENTITY column.width                 "14em">
--- a/mail/chrome/messenger/searchTermOverlay.dtd
+++ b/mail/chrome/messenger/searchTermOverlay.dtd
@@ -12,9 +12,9 @@
 <!-- LOCALIZATION NOTE  
   The values below are used to control the widths of the search widgets.
   Change the values only when the localized strings in the popup menus
   are truncated in the widgets.
  -->
 <!ENTITY searchTermListAttributesFlexValue "5">
 <!ENTITY searchTermListOperatorsFlexValue "5">
 <!ENTITY searchTermListValueFlexValue "5">
-<!ENTITY searchTermListButtonsFlexValue "2">
+
--- a/mobile/android/base/android_strings.dtd
+++ b/mobile/android/base/android_strings.dtd
@@ -40,16 +40,18 @@
 <!ENTITY bookmark_removed "Marcador eliminado">
 <!ENTITY bookmark_updated "Marcador actualizado">
 
 <!ENTITY history_today_section "Hoy">
 <!ENTITY history_yesterday_section "Ayer">
 <!ENTITY history_week_section "Hace 7 días">
 <!ENTITY history_older_section "Hace más de 7 días">
 
+<!ENTITY go "Ir">
+<!ENTITY search "Buscar">
 <!ENTITY reload "Recargar">
 <!ENTITY forward "Adelante">
 <!ENTITY menu "Menú">
 <!ENTITY back "Atrás">
 <!ENTITY stop "Detener">
 <!ENTITY site_security "Seguridad del sitio">
 
 <!ENTITY close_tab "Cerrar pestaña">
@@ -80,26 +82,38 @@
 <!ENTITY pref_plugins_tap_to_play "Pulsar para ejecutar">
 <!ENTITY pref_plugins_disabled "Deshabilitado">
 <!ENTITY pref_text_size "Tamaño de texto">
 <!ENTITY pref_font_size_tiny "Muy chico">
 <!ENTITY pref_font_size_small "Chico">
 <!ENTITY pref_font_size_medium "Mediano">
 <!ENTITY pref_font_size_large "Grande">
 <!ENTITY pref_font_size_xlarge "Extra grande">
+
+<!ENTITY pref_font_size_set "Juego">
+<!-- Localization note (pref_font_size_adjust_char): A button with a small version of this character
+(or combination of characters) is used to decrease the preview font size; a larger version of the
+same character/combination is used to increase the preview font size. It should be a concise
+representation of the language it is used in that will help show the text in the preview will change
+size. -->
+<!ENTITY pref_font_size_adjust_char "A">
+
+<!-- Localization note (pref_font_size_preview_text): This paragraph is used as an example to
+    demonstrate the font size setting.  It is meant to be whimsical and fun. -->
+<!ENTITY pref_font_size_preview_text "The quick orange fox jumps over your expectations with more speed, more flexibility and more security. As a non-profit, we\'re free to innovate on your behalf without any pressure to compromise. That means a better experience for you and a brighter future for the Web.">
+
 <!ENTITY pref_use_master_password "Usar contraseña maestra">
 <!ENTITY pref_sync "Sync">
 <!ENTITY pref_search_suggestions "Mostrar sugerencias de búsqueda">
 <!ENTITY pref_import_android "Importar desde Android">
 <!ENTITY pref_private_data_history "Historial de navegación y descargas">
 <!ENTITY pref_private_data_formdata "Historial de navegación y búsqueda">
-<!ENTITY pref_private_data_cookies "Cookies">
+<!ENTITY pref_private_data_cookies2 "Cookies e ingresos activos">
 <!ENTITY pref_private_data_passwords "Contraseñas guardadas">
 <!ENTITY pref_private_data_cache "Caché">
-<!ENTITY pref_private_data_sessions "Ingresos activos">
 <!ENTITY pref_private_data_offlineApps "Datos de sitios sin conexión">
 <!ENTITY pref_private_data_siteSettings "Preferencias del sitio">
 
 <!ENTITY quit "Salir">
 
 <!ENTITY addons "Complementos">
 <!ENTITY downloads "Descargas">
 <!ENTITY apps "Aplicaciones">
@@ -133,17 +147,17 @@
 	 after a page is removed from browser history. -->
 <!ENTITY history_removed "Página eliminada">
 
 <!ENTITY bookmark_edit_title "Editar marcador">
 <!ENTITY bookmark_edit_name "Nombre">
 <!ENTITY bookmark_edit_location "Dirección">
 <!ENTITY bookmark_edit_keyword "Palabra clave">
 
-<!ENTITY site_settings_title        "Borrar configuración del sitio">
+<!ENTITY site_settings_title2       "Configuración del sitio…">
 <!ENTITY site_settings_cancel       "Cancelar">
 <!ENTITY site_settings_clear        "Borrar">
 <!ENTITY site_settings_no_settings  "No hay configuración que borrar.">
 
 <!ENTITY reading_list "Lista de lectura">
 <!ENTITY reading_list_added "Página agregada a la lista de lectura">
 <!ENTITY reading_list_removed "Página eliminada de la lista de lectura">
 <!ENTITY reading_list_failed "Falló agregar la página a la lista de lectura">
@@ -159,19 +173,29 @@
 <!ENTITY button_clear_data "Limpiar datos">
 
 <!ENTITY abouthome_addons_title "Complementos para tu &brandShortName;">
 <!ENTITY abouthome_addons_browse "Examinar todos los complementos de &brandShortName;">
 <!ENTITY abouthome_last_tabs_title "Tus pestañas de la última vez">
 <!ENTITY abouthome_last_tabs_open "Abrir todas las pestañas de la última vez">
 <!ENTITY abouthome_top_sites_title "Más visitados">
 <!ENTITY abouthome_top_sites_browse "Ver todos los más visitados">
-<!ENTITY abouthome_no_top_sites "Todavía no tenés sitios más visitados. Pulsá la barra de título para empezar a navegar.">
-<!ENTITY abouthome_about_sync "Configurá Firefox Sync para acceder a tus marcadores, historial y pestañas desde tus otros dispositivos">
+<!-- Localization note (abouthome_about_sync3, abouthome_about_apps2): The
+     chevron (ex: "»"; unicode= U+00BB) is used as an arrow to show that
+     clicking this text in the promotions box will perform some action. Note
+     that a non-breaking space (unicode= U+00A0) should be used between this
+     character and the remainder of the string to prevent word wrap. -->
+<!ENTITY abouthome_about_sync3 "Configurá Firefox Sync para acceder a tus marcadores, historial y pestañas desde tus otros dispositivos&#x00A0;»">
+<!ENTITY abouthome_about_apps2 "Bajá aplicaciones del Mozilla Marketplace y descubrí lo mejor que la web tiene para ofrecer&#x00A0;»">
+<!-- Localization note (abouthome_sync_bold_name, abouthome_apps_bold_name):
+     These strings are accentuated as bold text in the "abouthome_about_..."
+     strings above. These strings should be a subset of the strings above and
+     generally be the name of the product the string describes. -->
 <!ENTITY abouthome_sync_bold_name "Firefox Sync">
+<!ENTITY abouthome_apps_bold_name "Mozilla Marketplace">
 
 <!ENTITY filepicker_title "Seleccionar archivo">
 <!ENTITY filepicker_audio_title "Seleccionar o grabar un sonido">
 <!ENTITY filepicker_image_title "Seleccionar o tomar una foto">
 <!ENTITY filepicker_video_title "Seleccionar o grabar un video">
 
 <!-- Site identity popup -->
 <!ENTITY identity_connected_to "Está conectado a">
--- a/mobile/android/base/sync_strings.dtd
+++ b/mobile/android/base/sync_strings.dtd
@@ -87,8 +87,9 @@
 
 <!-- Send tab to device. -->
 <!ENTITY sync.title.send.tab.label 'Enviar pestaña a dispositivos'>
 <!ENTITY sync.button.send.label 'Enviar'>
 <!ENTITY sync.button.set.up.sync.label 'Configurar &syncBrand.shortName.label;'>
 <!ENTITY sync.title.redirect.to.set.up.sync.label 'Configurar &syncBrand.shortName.label; para enviar pestañas'>
 <!ENTITY sync.text.redirect.to.set.up.sync.label 'Configurar &syncBrand.fullName.label; en tu dispositivo para enviar pestañas a otros dispositivos.'>
 <!ENTITY sync.text.tab.sent.label '¡Tu pestaña fue enviada!'>
+<!ENTITY sync.text.tab.not.sent.label 'Hubo un problema enviando tu pestaña.'>
--- a/mobile/android/chrome/aboutAddons.dtd
+++ b/mobile/android/chrome/aboutAddons.dtd
@@ -1,12 +1,12 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY aboutAddons.title                      "Administrador de complementos">
+<!ENTITY aboutAddons.title2                     "Complementos">
 <!ENTITY aboutAddons.header2                    "Tus complementos">
 <!ENTITY aboutAddons.options                    "Opciones">
 
 <!ENTITY addonAction.enable                     "Habilitar">
 <!ENTITY addonAction.disable                    "Deshabilitar">
 <!ENTITY addonAction.uninstall                  "Desinstalar">
 <!ENTITY addonAction.undo                       "Deshacer">
--- a/mobile/android/chrome/aboutApps.dtd
+++ b/mobile/android/chrome/aboutApps.dtd
@@ -1,12 +1,13 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY aboutApps.title "Tus aplicaciones">
+<!ENTITY aboutApps.title2                          "Aplicaciones">
+<!ENTITY aboutApps.header                          "Tus aplicaciones">
 
 <!-- LOCALIZATION NOTE (aboutApps.noApps.pre): include a trailing space as needed -->
 <!-- LOCALIZATION NOTE (aboutApps.noApps.middle): avoid leading/trailing spaces, this text is a link -->
 <!-- LOCALIZATION NOTE (aboutApps.noApps.post): include a starting space as needed -->
 <!ENTITY aboutApps.noApps.pre "No hay aplicaciones web instaladas. Bajá algunas del ">
-<!ENTITY aboutApps.noApps.middle "app store">
+<!ENTITY aboutApps.noApps.middle2 "Mozilla Marketplace">
 <!ENTITY aboutApps.noApps.post ".">
new file mode 100644
--- /dev/null
+++ b/mobile/android/chrome/aboutFeedback.dtd
@@ -0,0 +1,70 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- LOCALIZATION NOTE: The text in some of these strings is supposed to be
+     fun and playful. Please feel free to adjust the tone as works best in
+     your language and/or locale. More detailed notes below. -->
+
+<!ENTITY pageTitle                 "&brandShortName; Feedback">
+
+<!ENTITY intro.header              "¿Tenés un minuto?">
+<!ENTITY intro.message             "Contanos que pensas sobre &brandShortName; para Android hata ahora.">
+<!ENTITY intro.happyLink           "Lo amo">
+<!ENTITY intro.sadLink             "Tuve algunos problemas">
+<!ENTITY intro.ideaLink            "Tengo una idea">
+
+<!-- LOCALIZATION NOTE (support.pre): Include a trailing space as needed. -->
+<!-- LOCALIZATION NOTE (support.link): Avoid leading/trailing spaces, this text is a link. -->
+<!-- LOCALIZATION NOTE (support.post): Include a starting space as needed. -->
+<!ENTITY support.pre               "Si necesitás ayuda o tenés un problema con &brandShortName;, visitá ">
+<!ENTITY support.link              "Soporte de &brandShortName;">
+<!ENTITY support.post              ".">
+
+<!ENTITY happy.header              "¡Es bueno escuchar eso!">
+
+<!-- LOCALIZATION NOTE (happy.message): "share the love" — This feels purposely exaggerated in English,
+     but essentially it means that we want you to let others know how much you love Firefox. -->
+<!ENTITY happy.message             "¿Querés compartir tu amor dándonos una calificación de 5 estrellas en Google Play?">
+
+<!-- LOCALIZATION NOTE (happy.finePrint): "feels great" — Another exaggeration where we're trying to
+     get people to rate us by playfully telling them there's a benefit in it for them as well. -->
+<!ENTITY happy.finePrint           "Tardás menos de un minuto y se siente bien.">
+
+<!ENTITY happy.ratingLink          "Sí, vamos a Google Play">
+<!ENTITY happy.maybeLater          "Quizás después">
+<!ENTITY happy.noThanks            "No gracias">
+
+<!ENTITY sad.message               "Sentimos mucho que tengás problemas con &brandShortName;. Contanos que pasó así lo podemos arreglar.">
+<!ENTITY sad.placeholder           "Enter your feedback here">
+<!ENTITY sad.lastSite              "Último sitio visitado (opcional)">
+
+<!-- LOCALIZATION NOTE (sad.urlPlaceholder): Placeholder text that appears in "Last visited site" input box when there is no text. -->
+<!ENTITY sad.urlPlaceholder        "http://">
+<!ENTITY sad.thanksHeader          "Gracias por dejarnos saber.">
+
+<!-- LOCALIZATION NOTE (sad.thanksMessageTop): "real people" — We're stating that an actual human will look at the feedback
+     and that it doesn't just go to some automated system that looks for keywords, or something like that. -->
+<!ENTITY sad.thanksMessageTop      "Siempre estamos trabajando para mejorar &brandShortName;. Quedate tranquilo que gente real mirará tu feedback y harán lo mejor para resolver tu cuestión.">
+
+<!-- LOCALIZATION NOTE (sad.thanksMessageBottom): We're suggesting that there will be consequences for the people working
+     on Firefox if they don't resolve the user's problem, like "or if they don't fix it, we'll fire them." If this doesn't
+     work in your language, you can change it to something like "no matter what" or just remove it entirely. -->
+<!ENTITY sad.thanksMessageBottom   "O sufrirán las consecuencias.">
+
+<!-- LOCALIZATION NOTE (idea.message): In English, "please share your thoughts" could mean that we're asking the user to
+     tell us any thoughts or ideas they have about anything, so we're jokingly telling them not to use the space below
+     to tell us anything they're thinking about. -->
+<!ENTITY idea.message              "¡Nos encanta escuchar tus ideas! Compartí tus pensamientos debajo. (Solamente aquellos sobret &brandShortName;, por favor.)">
+<!ENTITY idea.placeholder          "Escribí tu idea acá">
+<!ENTITY idea.thanksHeader         "¡Gracias!">
+
+<!ENTITY idea.thanksMessageTop     "Apreciamos que te tomés tu tiempo para compartir tus pensamientos. Siempre estamos trabajando para mejorar a &brandShortName; y las contribuciones como la tuya pueden llevar a grandes cosas.">
+
+<!-- LOCALIZATION NOTE (idea.thanksMessageBottom): "high five" — This is a celebratory or congratulatory gesture.
+     It could also be a handshake, a pat on the back, a thumbs up or something similar. The idea is that it's
+     something physical, which is why they can't see it.-->
+<!ENTITY idea.thanksMessageBottom  "No podés verlo, pero estamos chocando los cinco con vos en este momento.">
+
+<!ENTITY feedback.privacy          "Para tu privacidad, no pongás ninguna información personal identificable en tu feedback.">
+<!ENTITY feedback.send             "Send Feedback">
--- a/mobile/android/chrome/aboutReader.properties
+++ b/mobile/android/chrome/aboutReader.properties
@@ -6,8 +6,10 @@ aboutReader.loading=Cargando...
 aboutReader.loadError=Falló la carga del artículo desde la página
 
 aboutReader.textTitle=Texto
 aboutReader.marginTitle=Márgenes
 
 aboutReader.colorSchemeLight=Claro
 aboutReader.colorSchemeDark=Oscuro
 aboutReader.colorSchemeSepia=Sepia
+
+aboutReader.toolbarTip=Tocá la pantalla para mostrar opciones del lector
--- a/mobile/android/chrome/browser.properties
+++ b/mobile/android/chrome/browser.properties
@@ -204,26 +204,33 @@ intl.charsetmenu.browser.static=iso-8859
 appMenu.more=Más
 
 #Text Selection
 selectionHelper.textCopied=Texto copiado al portapapeles
 
 # Context menu
 contextmenu.openInNewTab=Abrir enlace en nueva pestaña
 contextmenu.share=Compartir
+contextmenu.copyLink=Copiar enlace
 contextmenu.shareLink=Compartir enlace
 contextmenu.bookmarkLink=Marcar enlace
+contextmenu.copyEmailAddress=Copiar dirección de email
+contextmenu.shareEmailAddress=Compartir dirección de email
+contextmenu.copyPhoneNumber=Copiar número telefónico
+contextmenu.sharePhoneNumber=Compartir número telefónico
 contextmenu.changeInputMethod=Seleccionar método de entrada
 contextmenu.fullScreen=Pantalla completa
+contextmenu.copyImageLocation=Copiar dirección de la imagen
 contextmenu.shareImage=Compartir imagen
 contextmenu.saveImage=Guardar imagen
 contextmenu.addSearchEngine=Agregar buscador
 
 contextmenu.copy=Copiar
 contextmenu.copyAll=Copiar todo
+contextmenu.selectWord=Seleccionar palabra
 contextmenu.selectAll=Seleccionar todo
 contextmenu.paste=Pegar
 
 # Select UI
 selectHelper.closeMultipleSelectDialog=Listo
 
 # Web Console API
 stacktrace.anonymousFunction=<anónimo>
@@ -233,16 +240,22 @@ timer.start=%S: timer started
 # LOCALIZATION NOTE (timer.end):
 # This string is used to display the result of the console.timeEnd() call.
 # %1$S=name of timer, %2$S=number of milliseconds
 timer.end=%1$S: %2$Sms
 
 # Webapps
 webapps.installTitle=Instalar Aplicación
 webapps.alertSuccess=Instalada exitosamente
+# Shown when there is a generic problem installing an app
+webapps.installError=Error instalando aplicación
+# Shown when there is something wrong with an apps manifest
+webapps.manifestInstallError=Manifiesto de aplicación inválido
+# Shown when a network error prevented installing an app
+webapps.networkInstallError=No se pudo descargar manifiesto
 
 # Click to play plugins
 clickToPlayPlugins.message1=%S incluye contenido de un plugin. ¿Querés ejecutarlo?
 clickToPlayPlugins.yes=Sí
 clickToPlayPlugins.no=No
 # LOCALIZATION NOTE (clickToPlayPlugins.dontAskAgain): This label appears next to a
 # checkbox to indicate whether or not the user wants to make a permanent decision.
 clickToPlayPlugins.dontAskAgain=No preguntar de nuevo para este sitio
@@ -262,12 +275,17 @@ masterPassword.incorrect=Contraseña incorrecta
 # LOCALIZATION NOTE (remoteIncomingPromptTitle): The title displayed on the
 # dialog that prompts the user to allow the incoming connection.
 remoteIncomingPromptTitle=Conexión entrante
 # LOCALIZATION NOTE (remoteIncomingPromptMessage): The message displayed on the
 # dialog that prompts the user to allow the incoming connection.
 remoteIncomingPromptMessage=Se detectó un pedido entrante para permitir depuración remota. ¡Un cliente remoto puede tomar el control completo de tu navegador! ¿Permitir conexión?
 remoteIncomingPromptDisable=Deshabilitar
 
+
 # Helper apps
+helperapps.open=Abrir
+helperapps.ignore=Ignorar
+helperapps.dontAskAgain=No preguntar más para este sitio
 helperapps.openWithApp2=Abrir con aplicación %S
 helperapps.openWithList2=Abrir con una alicación
-
+helperapps.always=Siempre
+helperapps.never=Nunca
--- a/security/manager/chrome/pippki/deviceManager.dtd
+++ b/security/manager/chrome/pippki/deviceManager.dtd
@@ -1,46 +1,18 @@
-<!-- ***** 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.org code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Ian McGreer <mcgreer@netscape.com>
-   -
-   - 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 ***** -->
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 
 <!ENTITY devmgr.title "Administrador de dispositivos">
+<!-- LOCALIZATION NOTE (devmgr.style): This is CSS style for Device Manager
+     window size. Don't translate "width" nor "height". Adjust the numbers
+     to make window contents fit. -->
+<!ENTITY devmgr.style                           "width: 52em; height: 32em;">
 
 <!ENTITY devmgr.devlist.label "Módulos y dispositivos de seguridad">
 <!ENTITY devmgr.details.title "Detalles">
 <!ENTITY devmgr.details.title2 "Valor">
 <!ENTITY devmgr.status.label "Estado">
 <!ENTITY devmgr.version.label "Versión">
 
 <!ENTITY devmgr.button.changeslotname.label "Cambiar nombre de ranura">
--- a/suite/chrome/browser/linkToolbar.dtd
+++ b/suite/chrome/browser/linkToolbar.dtd
@@ -1,49 +1,16 @@
-<!-- ***** 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 Christopher Hoess <choess@stwing.upenn.edu>'s code.
-   -
-   - The Initial Developer of the Original Code is
-   - Christopher Hoess.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -      Eric Hodel <drbrain@segment7.net>
-   -      Stuart Ballard <sballard@netreach.net>
-   -
-   - 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 LGPL or the GPL. 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 ***** -->
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!-- Link Toolbar Title -->
 <!ENTITY linkToolbar.label "Barra de navegación del sitio">
 <!ENTITY linkToolbar.accesskey "a">
+<!ENTITY linkToolbar.tooltip "Barra de navegación de sitio web">
 
 <!-- Link Toolbar visibility options -->
 <!ENTITY linkToolbarAlways.label "Mostrar siempre">
 <!ENTITY linkToolbarAlways.accesskey "s">
 <!ENTITY linkToolbarAsNeeded.label "Mostrar sólo cuando sea necesario">
 <!ENTITY linkToolbarAsNeeded.accesskey "o">
 <!ENTITY linkToolbarNever.label "Ocultar siempre">
 <!ENTITY linkToolbarNever.accesskey "O">
--- a/suite/chrome/common/contentAreaCommands.dtd
+++ b/suite/chrome/common/contentAreaCommands.dtd
@@ -43,25 +43,25 @@
 <!ENTITY viewFrameSourceCmd.accesskey "V">
 <!ENTITY viewPageInfoCmd.label        "Ver información de la página">
 <!ENTITY viewPageInfoCmd.accesskey    "i">
 <!ENTITY viewFrameInfoCmd.label       "Ver información del marco">
 <!ENTITY viewFrameInfoCmd.accesskey   "i">
 <!ENTITY fitImageCmd.label            "Encajar imagen en la ventana">
 <!ENTITY fitImageCmd.accesskey        "E">
 <!ENTITY reloadImageCmd.label         "Recargar imagen">
-<!ENTITY reloadImageCmd.accesskey     "e">
+<!ENTITY reloadImageCmd.accesskey     "c">
 <!ENTITY viewImageCmd.label           "Ver imagen">
 <!ENTITY viewImageCmd.accesskey       "i">
 <!ENTITY viewVideoCmd.label           "Ver video">
 <!ENTITY viewVideoCmd.accesskey       "i">
 <!ENTITY viewBGImageCmd.label         "Ver imagen de fondo">
 <!ENTITY viewBGImageCmd.accesskey     "V">
-<!ENTITY setWallpaperCmd.label        "Elegir como fondo de pantalla">
-<!ENTITY setWallpaperCmd.accesskey    "E">
+<!ENTITY setDesktopBackgroundCmd.label     "Establecer como fondo de escritorio…">
+<!ENTITY setDesktopBackgroundCmd.accesskey "a">
 <!ENTITY bookmarkPageCmd.label        "Marcar esta página">
 <!ENTITY bookmarkPageCmd.accesskey    "M">
 <!ENTITY bookmarkLinkCmd.label        "Marcar este enlace">
 <!ENTITY bookmarkLinkCmd.accesskey    "l">
 <!ENTITY bookmarkFrameCmd.label       "Marcar este marco…">
 <!ENTITY bookmarkFrameCmd.accesskey   "M">
 <!ENTITY savePageAsCmd.label          "Guardar página como…">
 <!ENTITY savePageCmd.label            "Guardar página">
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/setDesktopBackground.dtd
@@ -0,0 +1,19 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY setDesktopBackground.title "Establecer fondo de escritorio">
+
+<!ENTITY position.label             "Posición:">
+<!ENTITY position.accesskey         "P">
+<!ENTITY position.tile.label        "Mosaico">
+<!ENTITY position.stretch.label     "Estirado">
+<!ENTITY position.center.label      "Centrado">
+<!ENTITY position.fill.label        "Relleno">
+<!ENTITY position.fit.label         "Ajustado">
+<!ENTITY picker.label               "Color:">
+<!ENTITY picker.accesskey           "C">
+<!ENTITY preview.caption            "Vista previa">
+<!ENTITY apply.label                "Aplicar">
+<!ENTITY apply.accesskey            "A">
+<!ENTITY close.label                "Cerrar">
--- a/suite/chrome/mailnews/FilterEditor.dtd
+++ b/suite/chrome/mailnews/FilterEditor.dtd
@@ -1,61 +1,11 @@
-<!-- ***** 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) 1998-1999
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
-    Alec Flett <alecf@netscape.com>
-    Seth Spitzer <sspitzer@netscape.com>
-    Allan Masri <amasri@netscape.com>
-    Henrik Gemal <bugzilla@gemal.dk>
-    Gayatri Bhimaraju <gayatrib@netscape.com>
-    Stephen Donner <stephend@netscape.com>
-    Gervase Markham <gervase.markham@univ.ox.ac.uk>
-    Håkan Waara <hwaara@chello.se>
-    Navin Gupta <naving@netscape.com>
-    David Bienvenu <bienvenu@netscape.com>
-    Sean Su <ssu@netscape.com>
-    Serge Gautheri <gautheri@noos.fr>
-    Scott MacGregor <scott@scott-macgregor.org>
-    Howard Chu <hyc@symas.com>
-    Mark Banner <mark@standard8.demon.co.uk>
-    Mike Shaver <shaver@mozilla.org>
-    Karsten Düsterloh <mnyromyr@tprac.de>
-
- 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 ***** -->
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY window.title "Reglas de filtrado">
 <!ENTITY filterEditorDialog.dimensions "width: 105ch;">
 <!ENTITY filterName.label "Nombre del filtro">
 <!ENTITY filterName.accesskey "i">
 
 <!ENTITY junk.label "Basura">
 <!ENTITY notJunk.label "No es basura">
@@ -94,8 +44,16 @@
 <!ENTITY ignoreThread.label "Ignorar conversación">
 <!ENTITY ignoreSubthread.label "Ignorar subconversación">
 <!ENTITY watchThread.label "Observar conversación">
 <!ENTITY stopExecution.label "Detener ejecución del filtro">
 
 <!ENTITY addAction.tooltip "Agregar una nueva acción">
 <!ENTITY removeAction.tooltip "Eliminar esta acción">
 
+<!-- LOCALIZATION NOTE
+  The values below are used to control the widths of the filter action widgets.
+  Change the values only when the localized strings in the popup menus
+  are truncated in the widgets.
+-->
+<!ENTITY filterActionTypeFlexValue "1">
+<!ENTITY filterActionTargetFlexValue "4">
+
--- a/suite/chrome/mailnews/compose/sendProgress.dtd
+++ b/suite/chrome/mailnews/compose/sendProgress.dtd
@@ -1,4 +1,8 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!--LOCALIZATION NOTE sendprogress.dtd Main UI for Send Message Progress Dialog -->
-<!ENTITY sendWindow.title "Enviando mensajes"> 
+<!ENTITY sendDialog.title "Procesando mensaje"> 
 <!ENTITY status.label "Estado:">
 <!ENTITY progress.label "Progreso:">
--- a/suite/chrome/mailnews/compose/sendProgress.properties
+++ b/suite/chrome/mailnews/compose/sendProgress.properties
@@ -1,10 +1,20 @@
-titlePrefixSave=Guardando mensajes -
-titlePrefixSend=Enviando mensajes -
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE (titleSendMsgSubject):
+# %S will be replaced by the message subject.
+titleSendMsgSubject=Enviando mensaje - %S
+titleSendMsg=Enviando mensaje
+# LOCALIZATION NOTE (titleSaveMsgSubject):
+# %S will be replaced by the message subject.
+titleSaveMsgSubject=Guardando mensaje - %S
+titleSaveMsg=Guardando mensaje
 
 # LOCALIZATION NOTE (percentMsg):
 # This string is used to format the text to the right of the progress meter.
 # %S% will be replaced by the percentage of the file that has been saved
 percentMsg=%S%%
 
 messageSent=Su mensaje ha sido enviado.
 messageSaved=Su mensaje ha sido guardado.
--- a/suite/chrome/mailnews/folderProps.dtd
+++ b/suite/chrome/mailnews/folderProps.dtd
@@ -1,47 +1,11 @@
-<!-- ***** 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.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 2000
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   David Bienvenu <bienvenu@netscape.com>
-   -   Mohan Bhamidipati <mohanb@netscape.com>
-   -   Lorenzo Colitti   <lorenzo@colitti.com>
-   -   Stefan Borggraefe <Stefan.Borggraefe@gmx.de>
-   -
-   - 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 ***** -->
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY folderProps.windowtitle.label           "Propiedades">
 
 <!ENTITY generalInfo.label                       "Información general">
 <!ENTITY folderCharsetTab.label                  "Juego de caracteres predeterminado:">
 <!ENTITY folderCharsetTab.accesskey              "e">
 <!ENTITY folderCharsetOverride.label             "Aplicar la configuración predeterminada a todos los mensajes de la carpeta (ignorando la autodetección y la configuración de codificación de caracteres de cada mensaje)">
 <!ENTITY folderCharsetOverride.accesskey         "A">
@@ -95,8 +59,16 @@
 <!ENTITY privileges.button.accesskey             "P">
 <!ENTITY permissionsDesc.label                   "Tiene los siguientes permisos:">
 <!ENTITY folderType.label                        "Tipo de carpeta:">
 
 <!ENTITY folderQuotaTab.label                    "Cuota">
 <!ENTITY folderQuotaRoot.label                   "Cuota raíz:">
 <!ENTITY folderQuotaUsage.label                  "Uso:">
 <!ENTITY folderQuotaStatus.label                 "Estado:">
+
+<!ENTITY numberOfMessages.label                  "Número de mensajes:">
+<!-- LOCALIZATION NOTE: When the number of messages can't be determined, this string is displayed as the number -->
+<!ENTITY numberUnknown.label                     "desconocido">
+<!ENTITY sizeOnDisk.label                        "Tamaño en disco:">
+<!-- LOCALIZATION NOTE: When the size can't be determined, this string is displayed as the size -->
+<!ENTITY sizeUnknown.label                       "desconocido">
+
--- a/suite/chrome/mailnews/pref/am-mdn.dtd
+++ b/suite/chrome/mailnews/pref/am-mdn.dtd
@@ -1,11 +1,17 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY pane.title                   "Acuses de recibo">
 <!ENTITY useGlobalPrefs.label         "Usar las preferencias globales de acuse de recibo para esta cuenta">
 <!ENTITY useGlobalPrefs.accesskey     "U">
+<!ENTITY globalReceipts.label         "Preferencias globales…">
+<!ENTITY globalReceipts.accesskey     "g">
 <!ENTITY useCustomPrefs.label         "Personalizar acuse de recibo para esta cuenta">
 <!ENTITY useCustomPrefs.accesskey     "c">
 <!ENTITY requestReceipt.label         "Al enviar mensajes, solicitar siempre un acuse de recibo">
 <!ENTITY requestReceipt.accesskey     "v">
 <!ENTITY receiptArrive.label          "Cuando llegue un acuse de recibo:">
 <!ENTITY leaveIt.label                "Dejarlo en mi bandeja de entrada">
 <!ENTITY leaveIt.accesskey            "i">
 <!-- LOCALIZATION NOTE moveToSent.label Translate: 'Sent' according to Netscape glossary -->
--- a/suite/chrome/mailnews/pref/prefs.properties
+++ b/suite/chrome/mailnews/pref/prefs.properties
@@ -1,45 +1,11 @@
-# ***** 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.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Seth Spitzer <sspitzer@netscape.com>
-#   Alec Flett <alecf@netscape.com>
-#
-# 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 *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #
 # The following are used by the Account Wizard
 #
 enterValidEmail=Por favor, ingrese una dirección de correo electrónico válida.
 accountExists=Ya existe una cuenta de correo o noticias con el mismo nombre de usuario y servidor. Pulse Atrás e introduzca un nombre de servidor diferente o pulse Cancelar.
 modifiedAccountExists=Ya existe una cuenta con ese nombre de usuario y servidor. Ingrese un nombre de usuario y/o servidor diferente.
 userNameChanged=Su nombre de usuario ha sido actualizado. Puede que también necesite actualizar su dirección de correo y/o el nombre de usuario asociado a esta cuenta.
@@ -91,11 +57,18 @@ prefPanel-smtp=Servidor saliente (SMTP)
 
 # account manager multiple identity support
 #LOCALIZATION NOTE: accountName: %1$S 
 identity-list-title=Identidades para %1$S
 
 identity-edit-req=Debe especificar una dirección de correo válida para esta identidad.
 identity-edit-req-title=Error al crear la identidad
 
+## LOCALIZATION NOTE (identity-delete-confirm): %S is the identity name
+# and should be put on a new line. The new line is produced with the "\n" string.
+identity-delete-confirm=¿Está seguro de querer borrar la identidad\n%S?
+## LOCALIZATION NOTE (identity-delete-confirm-title): %S is the account name
+identity-delete-confirm-title=Borrar identidad para %S
+identity-delete-confirm-button=Borrar
+
 choosefile=Elegir archivo
 
 forAccount=Para cuenta "%S"
--- a/suite/chrome/mailnews/search.properties
+++ b/suite/chrome/mailnews/search.properties
@@ -1,24 +1,28 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 # search and filter strings
 #
 # these are the fields that get inserted in the search line
 # for "and" searches, this looks like:
 #
 # searchAnd0 <attribute> searchAnd1 <operator> searchAnd2 <value> searchAnd4
 #
 # for example, in english this looks like:
 # and the [Sender ] [doesn't contain] [John]
 #
 # TODO: need to special-case the first line (filterindex==0)
 
 # filter stuff
 searchingMessage=Buscando…
-searchSuccessMessage=Se ha encontrado 1 coincidencia
-searchSuccessMessages=Se han encontrado %S coincidencias
-searchFailureMessage=No se han encontrado coincidencias
+# LOCALIZATION NOTE (matchesFound): #1 number of matches found
+matchesFound=#1 coincidencia encontrada;#1 coincidencias encontradas
+noMatchesFound=No se han encontrado coincidencias
 labelForStopButton=Detener
 labelForSearchButton=Buscar
 labelForStopButton.accesskey=D
 labelForSearchButton.accesskey=s
 
 moreButtonTooltipText=Agregar una nueva regla
 lessButtonTooltipText=Eliminar esta regla
--- a/suite/chrome/mailnews/searchTermOverlay.dtd
+++ b/suite/chrome/mailnews/searchTermOverlay.dtd
@@ -7,9 +7,9 @@
 <!-- LOCALIZATION NOTE  
   The values below are used to control the widths of the search widgets.
   Change the values only when the localized strings in the popup menus
   are truncated in the widgets.
  -->
 <!ENTITY searchTermListAttributesFlexValue "5">
 <!ENTITY searchTermListOperatorsFlexValue "5">
 <!ENTITY searchTermListValueFlexValue "5">
-<!ENTITY searchTermListButtonsFlexValue "2">
+
--- a/toolkit/chrome/global-platform/mac/platformKeys.properties
+++ b/toolkit/chrome/global-platform/mac/platformKeys.properties
@@ -7,16 +7,19 @@
 #these are used in XP menus to show keyboard shortcuts
 
 #the shift key - open up arrow symbol (ctrl-e)
 VK_SHIFT=\u21e7
 
 #the command key - clover leaf symbol (ctrl-q)
 VK_META=\u2318
 
+#the win key - never generated by native key event
+VK_WIN=win
+
 #the option/alt key - splitting tracks symbol (ctrl-g)
 VK_ALT=\u2325
 
 #the control key. hat symbol (ctrl-f)
 VK_CONTROL=\u2303
 
 #the separator character used between modifiers (none on Mac OS)
 MODIFIER_SEPARATOR=
--- a/toolkit/chrome/global-platform/unix/platformKeys.properties
+++ b/toolkit/chrome/global-platform/unix/platformKeys.properties
@@ -7,16 +7,19 @@
 #these are used in XP menus to show keyboard shortcuts
 
 #the shift key
 VK_SHIFT = May
 
 #the command key
 VK_META = Meta
 
+#the win key (Super key and Hyper keys are mapped to DOM Win key)
+VK_WIN=Win
+
 #the alt key
 VK_ALT = Alt
 
 #the control key
 VK_CONTROL = Ctrl
 
 #the separator character used between modifiers 
 MODIFIER_SEPARATOR = +
--- a/toolkit/chrome/global-platform/win/platformKeys.properties
+++ b/toolkit/chrome/global-platform/win/platformKeys.properties
@@ -7,16 +7,19 @@
 #these are used in XP menus to show keyboard shortcuts
 
 #the shift key
 VK_SHIFT = May
 
 #the command key
 VK_META = Meta
 
+#the win key
+VK_WIN=Win
+
 #the alt key
 VK_ALT = Alt
 
 #the control key
 VK_CONTROL = Ctrl
 
 #the separator character used between modifiers 
 MODIFIER_SEPARATOR = +