Migrating files for Firefox 33
authorMarcelo Poli <mpoli@lt24.zzn.com>
Sat, 26 Jul 2014 13:33:18 -0300
changeset 1782 db642623dea68d305faf1e1ecbf9445a036811dd
parent 1754 94a644c36aafd27ca5fe4b2d3a9636cf3bfa95a4
child 1783 7f35f68179328cd2821be6f6d86e8e8fda9e3bf6
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:47:06 +0000
Migrating files for Firefox 33
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/devtools/app-manager.properties
browser/chrome/browser/devtools/canvasdebugger.properties
browser/chrome/browser/devtools/debugger.dtd
browser/chrome/browser/devtools/debugger.properties
browser/chrome/browser/devtools/gcli.properties
browser/chrome/browser/devtools/gclicommands.properties
browser/chrome/browser/devtools/inspector.properties
browser/chrome/browser/devtools/netmonitor.dtd
browser/chrome/browser/devtools/netmonitor.properties
browser/chrome/browser/devtools/profiler.properties
browser/chrome/browser/devtools/projecteditor.properties
browser/chrome/browser/devtools/scratchpad.properties
browser/chrome/browser/devtools/shadereditor.properties
browser/chrome/browser/devtools/sourceeditor.properties
browser/chrome/browser/devtools/styleeditor.properties
browser/chrome/browser/devtools/toolbox.dtd
browser/chrome/browser/devtools/toolbox.properties
browser/chrome/browser/devtools/webaudioeditor.properties
browser/chrome/browser/devtools/webconsole.properties
browser/chrome/browser/loop/loop.properties
browser/chrome/browser/pageInfo.dtd
browser/chrome/browser/pageInfo.properties
browser/chrome/browser/preferences/advanced.dtd
browser/chrome/browser/preferences/content.dtd
browser/chrome/browser/preferences/preferences.dtd
browser/chrome/browser/translation.dtd
calendar/chrome/calendar/preferences/alarms.dtd
calendar/chrome/lightning/lightning.dtd
chat/xmpp.properties
dom/chrome/layout/css.properties
dom/chrome/plugins.properties
mail/chrome/messenger/chat.properties
mail/chrome/messenger/messenger.properties
mail/chrome/messenger/messengercompose/composeMsgs.properties
mail/chrome/messenger/preferences/chat.dtd
mail/chrome/messenger/preferences/privacy.dtd
mail/chrome/messenger/sanitize.dtd
mobile/android/base/android_strings.dtd
mobile/android/base/sync_strings.dtd
mobile/android/chrome/aboutApps.dtd
mobile/android/chrome/browser.properties
security/manager/chrome/pippki/pippki.dtd
suite/chrome/browser/region.properties
suite/chrome/common/bookmarks/editBookmarkOverlay.dtd
suite/chrome/common/notification.dtd
suite/chrome/common/notification.properties
suite/chrome/common/pref/pref-offlineapps.dtd
suite/chrome/common/pref/pref-security.dtd
suite/chrome/common/pref/prefutilities.dtd
suite/chrome/common/pref/prefutilities.properties
suite/chrome/mailnews/addressbook/addressBook.properties
suite/chrome/mailnews/compose/composeMsgs.properties
suite/installer/windows/custom.properties
toolkit/chrome/formautofill/requestAutocomplete.dtd
toolkit/chrome/global/aboutSupport.dtd
toolkit/chrome/global/devtools/csscoverage.dtd
toolkit/chrome/global/devtools/csscoverage.properties
toolkit/chrome/global/devtools/styleinspector.properties
toolkit/chrome/mozapps/extensions/extensions.properties
toolkit/chrome/mozapps/preferences/ocsp.dtd
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -77,16 +77,23 @@ when there are no windows but Firefox is
 
 <!ENTITY menubarCmd.label "Barra de menú">
 <!ENTITY menubarCmd.accesskey "M">
 <!ENTITY navbarCmd.label "Barra de navegación">
 <!ENTITY personalbarCmd.label "Barra de marcadores">
 <!ENTITY personalbarCmd.accesskey "B">
 <!ENTITY bookmarksToolbarItem.label "Items de la barra de marcadores">
 
+<!ENTITY toolbarContextMenu.reloadAllTabs.label "Recargar todas las pestañas">
+<!ENTITY toolbarContextMenu.reloadAllTabs.accesskey "a">
+<!ENTITY toolbarContextMenu.bookmarkAllTabs.label "Marcar todas las pestañas…">
+<!ENTITY toolbarContextMenu.bookmarkAllTabs.accesskey "t">
+<!ENTITY toolbarContextMenu.undoCloseTab.label "Deshacer cerrar pestaña">
+<!ENTITY toolbarContextMenu.undoCloseTab.accesskey "h">
+
 <!ENTITY pageSourceCmd.label "Código fuente">
 <!ENTITY pageSourceCmd.accesskey "o">
 <!ENTITY pageSourceCmd.commandkey "u">
 <!ENTITY pageInfoCmd.label "Información de la página">
 <!ENTITY pageInfoCmd.accesskey "I">
 <!ENTITY pageInfoCmd.commandkey "i">
 <!-- LOCALIZATION NOTE (enterFullScreenCmd.label, exitFullScreenCmd.label):
 These should match what Safari and other Apple applications use on OS X Lion. -->
@@ -252,16 +259,18 @@ These should match what Safari and other
 <!ENTITY browserToolboxMenu.label     "Barra de herramientas del navegador">
 <!ENTITY browserToolboxMenu.accesskey "e">
 
 <!ENTITY devToolbarCloseButton.tooltiptext "Cerrar barra de desarrolladores">
 <!ENTITY devToolbarMenu.label "Barra de desarrolladores">
 <!ENTITY devToolbarMenu.accesskey          "r">
 <!ENTITY devAppMgrMenu.label               "Administrador de aplicaciones">
 <!ENTITY devAppMgrMenu.accesskey           "A">
+<!ENTITY webide.label                      "WebIDE">
+<!ENTITY webide.accesskey                  "W">
 <!ENTITY devToolbar.keycode                "VK_F2">
 <!ENTITY devToolbar.keytext                "F2">
 <!ENTITY devToolboxMenuItem.label          "Intercambiar herramientas">
 <!ENTITY devToolboxMenuItem.accesskey      "t">
 <!ENTITY devToolboxMenuItem.keytext        "I">
 
 <!ENTITY devToolbarToolsButton.tooltip     "Intercambiar herramientas de desarrollador">
 <!ENTITY devToolbarOtherToolsButton.label  "Más herramientas">
@@ -700,22 +709,27 @@ The word "toolbar" is appended automatic
 
 <!ENTITY social.markpageMenu.accesskey "p">
 <!ENTITY social.markpageMenu.label "Guardar página en…">
 <!ENTITY social.marklinkMenu.accesskey "l">
 <!ENTITY social.marklinkMenu.label "Guardar enlace en…">
 
 <!ENTITY getUserMedia.selectCamera.label "Cámara a compartir:">
 <!ENTITY getUserMedia.selectCamera.accesskey "C">
+<!ENTITY getUserMedia.selectWindowOrScreen.label "Ventana o pantalla a compartir:">
+<!ENTITY getUserMedia.selectWindowOrScreen.accesskey "V">
 <!ENTITY getUserMedia.selectMicrophone.label "Micrófono a compartir:">
 <!ENTITY getUserMedia.selectMicrophone.accesskey "M">
+<!ENTITY getUserMedia.allWindowsShared.message "Todas las ventanas visibles de su pantalla serán compartidas.">
 
 <!ENTITY webrtcIndicatorButton.label "Acceso a cámara / micrófono">
 <!ENTITY webrtcIndicatorButton.tooltip "Mostrar sitios con los cuales esté compartiendo cámara o micrófono">
 
+<!ENTITY loopCallButton.tooltip "Invitar a alguien a hablar">
+
 <!ENTITY mixedContentBlocked.moreinfo "La mayor parte de los sitios web aún funcionan correctamente cuando este contenido es bloqueado.">
 
 <!ENTITY pointerLock.notification.message "Pulse ESC en cualquier momento para mostrarlo nuevamente.">
 
 <!ENTITY pluginNotification.showAll.label "Mostrar todo">
 <!ENTITY pluginNotification.showAll.accesskey "s">
 
 <!-- LOCALIZATION NOTE (pluginActivateNow.label, pluginActivateAlways.label, pluginBlockNow.label): These should be the same as the matching strings in browser.properties -->
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -107,16 +107,27 @@ installPlugin.ignoreButton.accesskey=N
 
 crashedpluginsMessage.title=El plugin %S ha fallado.
 crashedpluginsMessage.reloadButton.label=Recargar la página
 crashedpluginsMessage.reloadButton.accesskey=R
 crashedpluginsMessage.submitButton.label=Enviar un informe de problemas
 crashedpluginsMessage.submitButton.accesskey=E
 crashedpluginsMessage.learnMore=Conocer más…
 
+# Keyword fixup messages
+# LOCALIZATION NOTE (keywordURIFixup.message): Used when the user tries to visit
+# a local host page, by the time the DNS request recognizes it, we have already
+# loaded a search page for the given word.  An infobar then asks to the user
+# whether he rather wanted to visit the host.  %S is the recognized host.
+keywordURIFixup.message=¿Tal vez quiere ir a %S?
+keywordURIFixup.goTo=Si, ir a %S
+keywordURIFixup.goTo.accesskey=i
+keywordURIFixup.dismiss=No gracias
+keywordURIFixup.dismiss.accesskey=N
+
 ## Plugin doorhanger strings
 # LOCALIZATION NOTE (pluginActivateNew.message): Used for newly-installed
 # plugins which are not known to be unsafe. %1$S is the plugin name and %2$S
 # is the site domain.
 pluginActivateNew.message=¿Permitir que %2$S ejecute "%1$S"?
 pluginActivateMultiple.message=¿Permitir que %S ejecute plugins?
 pluginActivate.learnMore=Conocer más…
 # LOCALIZATION NOTE (pluginActivateOutdated.message, pluginActivateOutdated.label):
@@ -287,18 +298,16 @@ indexedDB.usage=Este sitio web (%1$S) está intentando guardar más de %2$S MB de datos en su computadora para usar sin conexión.
 
 identity.encrypted2=La conexión a este sitio web es segura.
 identity.mixed_display_loaded=La conexión a este sitio web no es totalmente segura porque contiene elementos sin cifrar (como las imágenes).
 identity.mixed_active_loaded2=Este sitio web contiene material interactivo que no está cifrado (como scripts). Otras personas pueden ver o modificar el comportamiento del sitio web.
 identity.unencrypted=Su conexión a este sitio web no está cifrada.
 
 identity.unknown.tooltip=Este sitio web no provee información de identidad.
 
-identity.ownerUnknown2=(desconocido)
-
 # LOCALIZATION NOTE (identity.chrome): %S is replaced with the brandShortName.
 identity.chrome=Esta es una página de %S segura.
 
 # Edit Bookmark UI
 editBookmarkPanel.pageBookmarkedTitle=Página marcada
 editBookmarkPanel.pageBookmarkedDescription=%S siempre recordará esta página para usted.
 editBookmarkPanel.bookmarkedRemovedTitle=Marcador eliminado
 editBookmarkPanel.editBookmarkTitle=Editar este marcador
@@ -480,28 +489,38 @@ 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
 
-# LOCALIZATION NOTE (getUserMedia.shareCamera.message, getUserMedia.shareMicrophone.message, getUserMedia.shareCameraAndMicrophone.message): %S is the website origin (e.g. www.mozilla.org)
+# LOCALIZATION NOTE (getUserMedia.shareCamera.message, getUserMedia.shareMicrophone.message,
+#                    getUserMedia.shareScreen.message, getUserMedia.shareCameraAndMicrophone.message,
+#                    getUserMedia.shareScreenAndMicrophone.message):
+#  %S is the website origin (e.g. www.mozilla.org)
+getUserMedia.shareCamera.message = ¿Desea compartir su cámara con %S?
+getUserMedia.shareMicrophone.message = ¿Desea compartir su micrófono con %S?
+getUserMedia.shareScreen.message = ¿Desea compartir su pantalla con %S?
+getUserMedia.shareCameraAndMicrophone.message = ¿Desea compartir su cámara y su micrófono con %S?
+getUserMedia.shareScreenAndMicrophone.message = ¿Desea compartir su micrófono y su pantalla con %S?
+getUserMedia.noVideo.label = Sin video
+getUserMedia.noWindowOrScreen.label = Sin ventana ni pantalla
+getUserMedia.noAudio.label = Sin audio
+getUserMedia.shareEntireScreen.label = Pantalla completa
 # LOCALIZATION NOTE (getUserMedia.shareSelectedDevices.label):
 # Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # The number of devices can be either one or two.
-getUserMedia.shareCamera.message = ¿Desea compartir su cámara con %S?
-getUserMedia.shareMicrophone.message = ¿Desea compartir su micrófono con %S?
-getUserMedia.shareCameraAndMicrophone.message = ¿Desea compartir su cámara y su micrófono con %S?
-getUserMedia.noVideo.label = Sin video
-getUserMedia.noAudio.label = Sin audio
 getUserMedia.shareSelectedDevices.label = Compartir dispositivo seleccionado;Compartir dispositivos seleccionados
 getUserMedia.shareSelectedDevices.accesskey = s
+getUserMedia.shareScreen.label = Compartir pantalla
+getUserMedia.shareWindow.label = Compartir ventana seleccionada
+getUserMedia.shareSelectedItems.label = Compartir items seleccionados
 getUserMedia.always.label = Siempre compartir
 getUserMedia.always.accesskey = a
 getUserMedia.denyRequest.label = No compartir
 getUserMedia.denyRequest.accesskey = N
 getUserMedia.never.label = Nunca compartir
 getUserMedia.never.accesskey = u
 getUserMedia.sharingCamera.message2 = Actualmente está compartiendo su cámara con esta página.
 getUserMedia.sharingMicrophone.message2 = Actualmente está compartiendo su micrófocno con esta página.
--- a/browser/chrome/browser/devtools/app-manager.properties
+++ b/browser/chrome/browser/devtools/app-manager.properties
@@ -24,17 +24,17 @@ validator.noAccessManifestURL=No se pued
 # LOCALIZATION NOTE (validator.invalidHostedManifestURL): %1$S is the URI of
 # the manifest, %2$S is the error message.
 validator.invalidHostedManifestURL=URL de manfiesto alojado no válida '%1$S': %2$S
 validator.invalidProjectType=Tipo de proyecto desconocido '%S'
 # LOCALIZATION NOTE (validator.missNameManifestProperty, validator.missIconsManifestProperty):
 # don't translate 'icons' and 'name'.
 validator.missNameManifestProperty=Falta 'name' en el manifiesto y es obligatorio.
 validator.missIconsManifestProperty=Falta 'icons' en el manifiesto.
-validator.missIconMarketplace=el envío de la aplicación al Marketplace necesita al menos un icono de 128px
+validator.missIconMarketplace2=el envío de la aplicación al Marketplace necesita un icono de 128px
 validator.invalidAppType=Tipo de aplicación desconocido: '%S'.
 validator.invalidHostedPriviledges=Aplicación alojada no puede ser tipo '%S'.
 validator.noCertifiedSupport=las aplicaciones 'certificadas' no están totalmente soportadas por el administrador de aplicaiones.
 validator.nonAbsoluteLaunchPath=La ruta de inicio debe ser una ruta absoluta que comience con '/': '%S'
 validator.accessFailedLaunchPath=No se puede acceder al documento de inicio de la aplicación '%S'
 # LOCALIZATION NOTE (validator.accessFailedLaunchPathBadHttpCode): %1$S is the URI of
 # the launch document, %2$S is the http error code.
 validator.accessFailedLaunchPathBadHttpCode=No se puede acceder al documento de inicio de la aplicación '%1$S', se obtuvo el código HTTP %2$S
--- a/browser/chrome/browser/devtools/canvasdebugger.properties
+++ b/browser/chrome/browser/devtools/canvasdebugger.properties
@@ -10,16 +10,20 @@
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
 # LOCALIZATION NOTE (ToolboxCanvasDebugger.label):
 # This string is displayed in the title of the tab when the Shader Editor is
 # displayed inside the developer tools window and in the Developer Tools Menu.
 ToolboxCanvasDebugger.label=Canvas
 
+# LOCALIZATION NOTE (ToolboxCanvasDebugger.panelLabel):
+# This is used as the label for the toolbox panel.
+ToolboxCanvasDebugger.panelLabel=Panel de canvas
+
 # LOCALIZATION NOTE (ToolboxCanvasDebugger.tooltip):
 # This string is displayed in the tooltip of the tab when the Shader Editor is
 # displayed inside the developer tools window.
 ToolboxCanvasDebugger.tooltip=Herramientas para inspeccionar y depurar contextos <canvas>
 
 # LOCALIZATION NOTE (noSnapshotsText): The text to display in the snapshots menu
 # when there are no recorded snapshots yet.
 noSnapshotsText=No hay capturas aún.
--- a/browser/chrome/browser/devtools/debugger.dtd
+++ b/browser/chrome/browser/devtools/debugger.dtd
@@ -90,16 +90,22 @@ button that pretty prints the selected s
 <!ENTITY debuggerUI.showOnlyEnum.accesskey "p">
 
 <!-- LOCALIZATION NOTE (debuggerUI.showOriginalSource): This is the label for
   -  the checkbox that toggles the display of original or sourcemap-derived
   -  sources. -->
 <!ENTITY debuggerUI.showOriginalSource      "Mostrar fuentes originales">
 <!ENTITY debuggerUI.showOriginalSource.accesskey "o">
 
+<!-- LOCALIZATION NOTE (debuggerUI.autoBlackBox): This is the label for
+  -  the checkbox that toggles whether sources that we suspect are minified are
+  -  automatically black boxed or not. -->
+<!ENTITY debuggerUI.autoBlackBox           "Caja negra automática para fuentes minificados">
+<!ENTITY debuggerUI.autoBlackBox.accesskey "j">
+
 <!-- LOCALIZATION NOTE (debuggerUI.searchPanelOperators): This is the text that
   -  appears in the filter panel popup as a header for the operators part. -->
 <!ENTITY debuggerUI.searchPanelOperators    "Operadores:">
 
 <!-- LOCALIZATION NOTE (debuggerUI.searchFile): This is the text that appears
   -  in the source editor's context menu for the scripts search operation. -->
 <!ENTITY debuggerUI.searchFile          "Filtrar scripts">
 <!ENTITY debuggerUI.searchFile.key      "P">
--- a/browser/chrome/browser/devtools/debugger.properties
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -10,16 +10,20 @@
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
 # LOCALIZATION NOTE (ToolboxDebugger.label):
 # This string is displayed in the title of the tab when the debugger is
 # displayed inside the developer tools window and in the Developer Tools Menu.
 ToolboxDebugger.label=Depurador
 
+# LOCALIZATION NOTE (ToolboxDebugger.panelLabel):
+# This is used as the label for the toolbox panel.
+ToolboxDebugger.panelLabel=Panel del depurador
+
 # LOCALIZATION NOTE (DebuggerWindowTitle):
 # The title displayed for the debugger window.
 DebuggerWindowTitle=Depurador del navegador
 
 # LOCALIZATION NOTE (DebuggerWindowScriptTitle):
 # The title displayed for the debugger window when a script is selected.
 DebuggerWindowScriptTitle=Depurador del navegador - %S
 
--- a/browser/chrome/browser/devtools/gcli.properties
+++ b/browser/chrome/browser/devtools/gcli.properties
@@ -215,30 +215,26 @@ helpManDefault=opcional, predeterminado=
 # command. 'GCLI' is a project name and should be left untranslated.
 helpIntro=GCLI es un experimento para crear una línea de comandos para desarrolladores web muy fácil de usar.
 
 # LOCALIZATION NOTE (subCommands): Text shown as part of the output of the
 # 'help' command when the command in question has sub-commands, before a list
 # of the matching sub-commands
 subCommands=Subcomandos
 
-# LOCALIZATION NOTE (contextDesc): A very short description of the 'context'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible. See contextManual for
-# a fuller description of what it does.
-contextDesc=Concentrar en un grupo de comandos
+# LOCALIZATION NOTE: This error message is displayed when the command line is
+# cannot find a match for the parse types.
+commandParseError=Error de análisis de la línea de comandos
 
-# LOCALIZATION NOTE (contextManual): A fuller description of the 'context'
-# command. Displayed when the user asks for help on what it does.
+# LOCALIZATION NOTE (contextDesc, contextManual, contextPrefixDesc): These
+# strings are used to describe the 'context' command and its 'prefix'
+# parameter. See localization comment for 'connect' for an explanation about
+# 'prefix'.
+contextDesc=Concentrar en un grupo de comandos
 contextManual=Configurar un prefijo predeterminado para comandos futuros. Por ejemplo 'context git' podría permitirle escribir 'commit' en lugar de 'git commit'.
-
-# LOCALIZATION NOTE (contextPrefixDesc): A short description of the 'prefix'
-# parameter to the 'context' command. This string is designed to be shown in a
-# dialog with restricted space, which is why it should be as short as
-# possible.
 contextPrefixDesc=El prefijo del comando
 
 # LOCALIZATION NOTE (contextNotParentError): An error message displayed during
 # the processing of the 'context' command, when the found command is not a
 # parent command.
 contextNotParentError=No se puede usar '%1$S' como prefijo porque no es un comando padre.
 
 # LOCALIZATION NOTE (contextReply): A message displayed during the processing
--- a/browser/chrome/browser/devtools/gclicommands.properties
+++ b/browser/chrome/browser/devtools/gclicommands.properties
@@ -1386,8 +1386,34 @@ listenNoInitOutput=DebuggerServer no está inicializado
 # mediaEmulateType, mediaResetDesc, mediaResetManual) These strings describe
 # the 'media' commands and all available parameters.
 mediaDesc=Emulación de tipo de medios CSS
 mediaEmulateDesc=Emular un tipo de medios CSS especificado
 mediaEmulateManual=Ver el documento como si fuera dibujado en un dispositivo que soporta el tipo de medios especificado, con las reglas CSS relevantes aplicadas.
 mediaEmulateType=El tipo de medios a emular
 mediaResetDesc=Dejar de emular un tipo de medios CSS
 
+# LOCALIZATION NOTE (injectDesc, injectManual, injectLibraryDesc, injectLoaded,
+# injectFailed) These strings describe the 'inject' commands and all available
+# parameters.
+injectDesc=Inyectar librerías comunes en la página
+injectManual2=Inyecta librerías coimunes en el contenido de la página que también puede accederse desde consola.
+injectLibraryDesc=Seleccione la librería a inyectar o ingrese una URI válida de script para inyectar
+injectLoaded=%1$S cargada
+injectFailed=Falló la carga de %1$S - URI inválida
+
+# LOCALIZATION NOTE (folderDesc, folderOpenDesc, folderOpenDir,
+# folderOpenProfileDesc) These strings describe the 'folder' commands and
+# all available parameters.
+folderDesc=Carpetas abiertas
+folderOpenDesc=Ruta de carpetas abiertas
+folderOpenDir=Ruta de directorio
+folderOpenProfileDesc=Directorio de perfil abierto
+
+# LOCALIZATION NOTE (folderInvalidPath) A string displayed as the result
+# of the 'folder open' command with an invalid folder path.
+folderInvalidPath=Ingrese una ruta válida
+
+# LOCALIZATION NOTE (folderOpenDirResult) A very short string used to
+# describe the result of the 'folder open' command.
+# The argument (%1$S) is the folder path.
+folderOpenDirResult=Se abrió %1$S
+
--- a/browser/chrome/browser/devtools/inspector.properties
+++ b/browser/chrome/browser/devtools/inspector.properties
@@ -32,16 +32,17 @@ debuggerPausedWarning.message=El depurador está en pausa. Algunas características como la selección por mouse no funcionarán.
 nodeMenu.tooltiptext=Operaciones del nodo
 
 
 # LOCALIZATION NOTE (inspector.*)
 # Used for the menuitem in the tool menu
 inspector.label=Inspector
 inspector.commandkey=I
 inspector.accesskey=I
+inspector.panelLabel=Panel del inspector
 
 # LOCALIZATION NOTE (markupView.more.*)
 # When there are too many nodes to load at once, we will offer to
 # show all the nodes.
 markupView.more.showing=Algunos nodos se ocultaron.
 markupView.more.showAll=Mostrar todos los %S nodos
 inspector.tooltip=Inspector de DOM y estilos
 
--- a/browser/chrome/browser/devtools/netmonitor.dtd
+++ b/browser/chrome/browser/devtools/netmonitor.dtd
@@ -11,19 +11,21 @@
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
 
 <!-- LOCALIZATION NOTE (netmonitorUI.perfNotice1/2): These are the labels displayed
   -  in the network table when empty to start performance analysis. -->
 <!ENTITY netmonitorUI.perfNotice1         "• Clic en el">
 <!ENTITY netmonitorUI.perfNotice2         "botón para iniciar el análisis de rendimiento.">
 
-<!-- LOCALIZATION NOTE (netmonitorUI.emptyNotice3): This is the label displayed
-  -  in the network table when empty. -->
-<!ENTITY netmonitorUI.emptyNotice3        "• Realice un pedido o recargue la página para ver información detallada sobre la actividad de red.">
+<!-- LOCALIZATION NOTE (netmonitorUI.reload1/2/3): These are the labels displayed
+  -  in the network table when empty to start logging network requests. -->
+<!ENTITY netmonitorUI.reloadNotice1       "• Realizar un pedido o">
+<!ENTITY netmonitorUI.reloadNotice2       "Recargar">
+<!ENTITY netmonitorUI.reloadNotice3       "la página para ver información detallada sobre la actividad de la red.">
 
 <!-- LOCALIZATION NOTE (netmonitorUI.toolbar.status2): This is the label displayed
   -  in the network table toolbar, above the "status" column. -->
 <!ENTITY netmonitorUI.toolbar.status2     "✓">
 
 <!-- LOCALIZATION NOTE (netmonitorUI.toolbar.method): This is the label displayed
   -  in the network table toolbar, above the "method" column. -->
 <!ENTITY netmonitorUI.toolbar.method      "Método">
--- a/browser/chrome/browser/devtools/netmonitor.properties
+++ b/browser/chrome/browser/devtools/netmonitor.properties
@@ -10,16 +10,20 @@
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
 # LOCALIZATION NOTE (netmonitor.label):
 # This string is displayed in the title of the tab when the Network Monitor is
 # displayed inside the developer tools window and in the Developer Tools Menu.
 netmonitor.label=Red
 
+# LOCALIZATION NOTE (netmonitor.panelLabel):
+# This is used as the label for the toolbox panel.
+netmonitor.panelLabel=Panel de red
+
 # LOCALIZATION NOTE (netmonitor.commandkey, netmonitor.accesskey)
 # Used for the menuitem in the tool menu
 netmonitor.commandkey=Q
 netmonitor.accesskey=R
 
 # LOCALIZATION NOTE (netmonitor.tooltip):
 # This string is displayed in the tooltip of the tab when the Network Monitor is
 # displayed inside the developer tools window.
--- a/browser/chrome/browser/devtools/profiler.properties
+++ b/browser/chrome/browser/devtools/profiler.properties
@@ -10,16 +10,20 @@
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
 # LOCALIZATION NOTE (profiler.label):
 # This string is displayed in the title of the tab when the profiler is
 # displayed inside the developer tools window and in the Developer Tools Menu.
 profiler.label=Perfilador
 
+# LOCALIZATION NOTE (profiler.panelLabel):
+# This is used as the label for the toolbox panel.
+profiler.panelLabel=Panel del perfilador
+
 # LOCALIZATION NOTE (profiler2.commandkey, profiler.accesskey)
 # Used for the menuitem in the tool menu
 profiler2.commandkey=VK_F5
 profiler.accesskey=f
 
 # LOCALIZATION NOTE (profiler.tooltip2):
 # This string is displayed in the tooltip of the tab when the profiler is
 # displayed inside the developer tools window.
--- a/browser/chrome/browser/devtools/projecteditor.properties
+++ b/browser/chrome/browser/devtools/projecteditor.properties
@@ -11,20 +11,44 @@
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
 # LOCALIZATION NOTE (projecteditor.deleteLabel):
 # This string is displayed as a context menu item for allowing the selected
 # file / folder to be deleted
 projecteditor.deleteLabel=Borrar
 
+# LOCALIZATION NOTE (projecteditor.deletePromptTitle):
+# This string is displayed as as the title of the confirm prompt that checks
+# to make sure if a file or folder should be removed.
+projecteditor.deletePromptTitle=Borrar
+
+# LOCALIZATION NOTE (projecteditor.deleteFolderPromptMessage):
+# This string is displayed as as the message of the confirm prompt that checks
+# to make sure if a folder should be removed.
+projecteditor.deleteFolderPromptMessage=¿Está seguro de querer borrar esta carpeta?
+
+# LOCALIZATION NOTE (projecteditor.deleteFilePromptMessage):
+# This string is displayed as as the message of the confirm prompt that checks
+# to make sure if a file should be removed.
+projecteditor.deleteFilePromptMessage=¿Está seguro de querer borrar este archivo?
+
 # LOCALIZATION NOTE (projecteditor.newLabel):
 # This string is displayed as a context menu item for adding a new file to
 # the directory
-projecteditor.newLabel=Nuevo...
+projecteditor.newLabel=Nuevo…
+
+# LOCALIZATION NOTE (projecteditor.saveLabel):
+# This string is displayed as a menu item for saving the current file.
+projecteditor.saveLabel=Guardar
+
+# LOCALIZATION NOTE (projecteditor.saveAsLabel):
+# This string is displayed as a menu item for saving the current file
+# with a new name.
+projecteditor.saveAsLabel=Guardar como…
 
 # LOCALIZATION NOTE (projecteditor.selectFileLabel):
 # This string is displayed as the title on the file picker when saving a file
 projecteditor.selectFileLabel=Seleccionar un archivo
 
 # LOCALIZATION NOTE (projecteditor.openFolderLabel):
 # This string is displayed as the title on the file picker when opening a folder
 projecteditor.openFolderLabel=Seleccionar una carpeta
--- a/browser/chrome/browser/devtools/scratchpad.properties
+++ b/browser/chrome/browser/devtools/scratchpad.properties
@@ -90,12 +90,16 @@ propertiesFilterPlaceholder=Propiedades 
 # fails to connect to the server due to a timeout.
 connectionTimeout=Conexión expirada. Verifique la consola de errores en ambos extremos por potenciales mensajes de error. Reabra el borrador e intente nuevamente.
 
 # LOCALIZATION NOTE (scratchpad.label): this string is displayed in the title of
 # the tab when the Scratchpad is displayed inside the developer tools window and
 # in the Developer Tools Menu.
 scratchpad.label=Borrador
 
+# LOCALIZATION NOTE (scratchpad.panelLabel): this is used as the
+# label for the toolbox panel.
+scratchpad.panelLabel=Panel del borrador
+
 # LOCALIZATION NOTE (scratchpad.tooltip):  This string is displayed in the
 # tooltip of the tab when the Scratchpad is displayed inside the developer tools
 # window.
 scratchpad.tooltip=Borrador
--- a/browser/chrome/browser/devtools/shadereditor.properties
+++ b/browser/chrome/browser/devtools/shadereditor.properties
@@ -10,16 +10,20 @@
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
 # LOCALIZATION NOTE (ToolboxShaderEditor.label):
 # This string is displayed in the title of the tab when the Shader Editor is
 # displayed inside the developer tools window and in the Developer Tools Menu.
 ToolboxShaderEditor.label=Shader Editor
 
+# LOCALIZATION NOTE (ToolboxShaderEditor.panelLabel):
+# This is used as the label for the toolbox panel.
+ToolboxShaderEditor.panelLabel=Shader Editor Panel
+
 # LOCALIZATION NOTE (ToolboxShaderEditor.tooltip):
 # This string is displayed in the tooltip of the tab when the Shader Editor is
 # displayed inside the developer tools window.
 ToolboxShaderEditor.tooltip=Live GLSL shader language editor for WebGL
 
 # LOCALIZATION NOTE (shadersList.programLabel):
 # This string is displayed in the programs list of the Shader Editor,
 # identifying a set of linked GLSL shaders.
--- a/browser/chrome/browser/devtools/sourceeditor.properties
+++ b/browser/chrome/browser/devtools/sourceeditor.properties
@@ -44,16 +44,25 @@ annotation.breakpoint.title=Breakpoint: 
 annotation.currentLine=Línea actual
 
 # LOCALIZATION NOTE  (annotation.debugLocation.title): This is the text shown in
 # a tooltip displayed in any of the editor gutters when the user hovers the
 # current debugger location. The debugger can pause the JavaScript execution at
 # user-defined lines.
 annotation.debugLocation.title=Paso actual: %S
 
+# LOCALIZATION NOTE  (autocompletion.docsLink): This is the text shown on
+# the link inside of the documentation popup.  If you type 'document' in Scratchpad
+# then press Shift+Space you can see the popup.
+autocompletion.docsLink=docs
+
+# LOCALIZATION NOTE  (autocompletion.notFound): This is the text shown in
+# the documentation popup if Tern fails to find a type for the object.
+autocompletion.notFound=no encotrado
+
 # LOCALIZATION NOTE  (jumpToLine.commandkey): This the key to use in
 # conjunction with accel (Command on Mac or Ctrl on other platforms) to jump to
 # a specific line in the editor.
 jumpToLine.commandkey=J
 
 # LOCALIZATION NOTE  (toggleComment.commandkey): This the key to use in
 # conjunction with accel (Command on Mac or Ctrl on other platforms) to either
 # comment or uncomment selected lines in the editor.
@@ -84,12 +93,13 @@ moveLineUp.commandkey=Alt-Arriba
 # conjunction with accel (Command on Mac or Ctrl on other platforms) to move
 # the selected lines down.
 moveLineDown.commandkey=Alt-Abajo
 
 # LOCALIZATION NOTE  (autocomplete.commandkey): This is the key to use
 # in conjunction with Ctrl for autocompletion.
 autocompletion.commandkey=Espacio
 
-# LOCALIZATION NOTE  (showInformation.commandkey): This is the key to use to
+# LOCALIZATION NOTE  (showInformation2.commandkey): This is the key to use to
 # show more information, like type inference.
-showInformation.commandkey=May-Espacio
+showInformation2.commandkey=May-Ctrl-Espacio
 
+
--- a/browser/chrome/browser/devtools/styleeditor.properties
+++ b/browser/chrome/browser/devtools/styleeditor.properties
@@ -68,16 +68,20 @@ open.accesskey=i
 # conjunction with accel (Command on Mac or Ctrl on other platforms) to Save
 saveStyleSheet.commandkey=S
 
 # LOCALIZATION NOTE (ToolboxStyleEditor.label):
 # This string is displayed in the title of the tab when the debugger is
 # displayed inside the developer tools window and in the Developer Tools Menu.
 ToolboxStyleEditor.label=Editor de estilo
 
+# LOCALIZATION NOTE (ToolboxStyleEditor.panelLabel):
+# This is used as the label for the toolbox panel.
+ToolboxStyleEditor.panelLabel=Panel del editor de estilo
+
 # LOCALIZATION NOTE (ToolboxStyleEditor.tooltip2):
 # This string is displayed in the tooltip of the tab when the style editor is
 # displayed inside the developer tools window.
 ToolboxStyleEditor.tooltip2=Editor de hojas de estilo (CSS)
 
 # LOCALIZATION NOTE (confirmNavigationAway): Shown in a notification box when
 # the user tries to navigate away from a web page.
 confirmNavigationAway.message=Si deja esta página, los cambios no guardados en el editor de estilo se perderán.
--- a/browser/chrome/browser/devtools/toolbox.dtd
+++ b/browser/chrome/browser/devtools/toolbox.dtd
@@ -78,21 +78,21 @@
 <!ENTITY options.enableRemote.tooltip  "Encender esta opción permitirá que las herramientas de desarrollador depuren una instancia remota de Firefox como ser Firefox OS">
 
 <!-- LOCALIZATION NOTE (options.disableJavaScript.label,
   -  options.disableJavaScript.tooltip): This is the options panel label and
   -  tooltip for the checkbox that toggles JavaScript on or off. -->
 <!ENTITY options.disableJavaScript.label     "Deshabilitar JavaScript *">
 <!ENTITY options.disableJavaScript.tooltip  "Activar esta opción deshabilitará JavaScript para la pestaña actual. Si la pestaña o la caja de herramientas se cierran, esta opción será olvidada.">
 
-<!-- LOCALIZATION NOTE (options.disableCache.label,
-  -  options.disableCache.tooltip): This is the options panel label and
+<!-- LOCALIZATION NOTE (options.disableCache.label2,
+  -  options.disableCache.tooltip2): This is the options panel label and
   -  tooltip for the checkbox that toggles the cache on or off. -->
-<!ENTITY options.disableCache.label     "Deshabilitar Caché *">
-<!ENTITY options.disableCache.tooltip   "Activar esta opción deshabilitará caché para la pestaña actual. Si la pestaña o la caja de herramientas son cerradas, esta configuración será olvidada.">
+<!ENTITY options.disableCache.label2     "Deshabilitar caché (cuando las herramientas están abiertas)">
+<!ENTITY options.disableCache.tooltip2   "Activar esta opción deshabilitará caché para todas las pestañas que tengan las herramientas abiertas.">
 
 <!-- LOCALIZATION NOTE (options.selectDefaultTools.label): This is the label for
   -  the heading of group of checkboxes corresponding to the default developer
   -  tools. -->
 <!ENTITY options.selectDefaultTools.label     "Herramientas de desarrollador de Firefox predeterminadas">
 
 <!-- LOCALIZATION NOTE (options.selectDefaultTools.label): This is the label for
   -  the heading of group of checkboxes corresponding to the developer tools
--- a/browser/chrome/browser/devtools/toolbox.properties
+++ b/browser/chrome/browser/devtools/toolbox.properties
@@ -30,20 +30,28 @@ toolboxToggleButton.tooltip=%1$S, %2$S\n
 # The name of the selected tool: %1$S.
 # The url of the page being tooled: %2$S.
 toolbox.titleTemplate=%1$S - %2$S
 
 # LOCALIZATION NOTE (toolbox.defaultTitle): This is used as the tool
 # name when no tool is selected.
 toolbox.defaultTitle=Herramientas de desarrollador
 
+# LOCALIZATION NOTE (toolbox.label): This is used as the label for the
+# toolbox as a whole
+toolbox.label=Herramientas de desarrollador
+
 # LOCALIZATION NOTE (optionsButton.tooltip): This is used as the tooltip
 # for the optiosn panel tab.
 optionsButton.tooltip=Opciones de herramientas
 
+# LOCALIZATION NOTE (options.panelLabel): This is used as the label for the
+# toolbox panel.
+options.panelLabel=Panel de opciones de herramientas
+
 # LOCALIZATION NOTE (options.toolNotSupported): This is the template
 # used to add a * marker to the label for the Options Panel tool checkbox for the
 # tool which is not supported for the current toolbox target.
 # The name of the tool: %1$S.
 options.toolNotSupportedMarker=%1$S *
 
 # LOCALIZATION NOTE (scratchpad.keycode)
 # Used for opening scratchpad from the detached toolbox window
--- a/browser/chrome/browser/devtools/webaudioeditor.properties
+++ b/browser/chrome/browser/devtools/webaudioeditor.properties
@@ -1,25 +1,30 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# LOCALIZATION NOTE These strings are used inside the Debugger
-# which is available from the Web Developer sub-menu -> 'Debugger'.
+# LOCALIZATION NOTE These strings are used inside the Web Audio tool
+# which is available in the developer tools' toolbox, once
+# enabled in the developer tools' preference "Web Audio".
 # The correct localization of this file might be to keep it in
 # English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
 # LOCALIZATION NOTE (ToolboxWebAudioEditor1.label):
 # This string is displayed in the title of the tab when the Web Audio Editor
 # is displayed inside the developer tools window and in the Developer Tools Menu.
 ToolboxWebAudioEditor1.label=Audio web
 
+# LOCALIZATION NOTE (ToolboxWebAudioEditor1.panelLabel):
+# This is used as the label for the toolbox panel.
+ToolboxWebAudioEditor1.panelLabel=Panel de audio web
+
 # LOCALIZATION NOTE (ToolboxWebAudioEditor1.tooltip):
 # This string is displayed in the tooltip of the tab when the Web Audio Editor is
 # displayed inside the developer tools window.
 ToolboxWebAudioEditor1.tooltip=Visualizador de contexto de audio web e inspector de nodos de audio
 
 # LOCALIZATION NOTE (collapseInspector): This is the tooltip for the button
 # that collapses the inspector in the web audio tool UI.
 collapseInspector=Colapsar inspector
--- a/browser/chrome/browser/devtools/webconsole.properties
+++ b/browser/chrome/browser/devtools/webconsole.properties
@@ -169,16 +169,20 @@ listTabs.globalConsoleActor=*Consola glo
 # This string is displayed in the Tools menu as a shortcut to open the devtools
 # with the web console tab selected.
 MenuWebconsole.label=Consola web
 
 # LOCALIZATION NOTE (ToolboxTabWebconsole.label):
 # This string is displayed as the label of the tab in the devtools window.
 ToolboxTabWebconsole.label=Consola
 
+# LOCALIZATION NOTE (ToolboxWebConsole.panelLabel): the string used as the
+# label for the toolbox panel.
+ToolboxWebConsole.panelLabel=Panel de consola
+
 # LOCALIZATION NOTE (ToolboxWebconsole.tooltip):
 # This string is displayed in the tooltip of the tab when the web console is
 # displayed inside the developer tools window.
 ToolboxWebconsole.tooltip=Consola web
 
 # LOCALIZATION NOTE (longStringEllipsis): The string displayed after a long
 # string. This string is clickable such that the rest of the string is retrieved
 # from the server.
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/loop/loop.properties
@@ -0,0 +1,40 @@
+# 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/.
+
+# Panel Strings
+
+share_link_header_text=Comparta este enlace para invitar a alguien para hablar:
+
+# Status text
+display_name_dnd_status=No molestar
+display_name_available_status=Disponible
+
+unable_retrieve_url=Lo sentimos, no se pudo recuperar una url de llamada.
+
+# Conversation Window Strings
+
+incoming_call_title=Llamada entrante…
+incoming_call=Llamada entrante
+accept_button=Aceptar
+decline_button=Rechazar
+hangup_button_title=Colgar
+mute_local_audio_button_title=Enmudecer el audio
+unmute_local_audio_button_title=Desenmudecer el audio
+mute_local_video_button_title=Anular el video
+unmute_local_video_button_title=Continuar el video
+
+peer_ended_conversation=La otra parte finalizó la conversación.
+call_has_ended=La llamada ha finalizado.
+close_window=Cerrar esta ventana
+
+cannot_start_call_session_not_ready=No se puede iniciar la llamada, la sesión no está lista.
+network_disconnected=La conexión de red terminó abruptamente.
+
+connection_error_see_console_notification=Call failed; see console for details.
+## LOCALIZATION NOTE (legal_text_and_links): In this item, don't translate the
+## part between {{..}}
+legal_text_and_links=Al usar este producto está aceptando los <a \
+  target="_blank" href="{{terms_of_use_url}}">términos de uso</a> y el <a \
+  href="{{privacy_notice_url}}">aviso de privacidad</a>.
+
--- a/browser/chrome/browser/pageInfo.dtd
+++ b/browser/chrome/browser/pageInfo.dtd
@@ -20,18 +20,16 @@
 <!ENTITY generalSize "Tamaño:">
 <!ENTITY  generalMode           "Modo de dibujo:">
 <!ENTITY generalReferrer "URL referente:">
 <!ENTITY  generalSource         "Caché fuente:">     
 <!ENTITY generalModified "Modificado:">
 <!ENTITY generalEncoding "Codificación:">
 <!ENTITY generalMetaName "Nombre">
 <!ENTITY generalMetaContent "Contenido">
-<!ENTITY  generalSecurityDetails   "Detalles">
-<!ENTITY  generalSecurityDetails.accesskey "D">
 
 <!ENTITY mediaTab "Medios">
 <!ENTITY  mediaTab.accesskey    "e">
 <!ENTITY  mediaLocation         "Ubicación:">
 <!ENTITY  mediaText             "Texto asociado:">
 <!ENTITY mediaAltHeader "Texto alternativo">
 <!ENTITY mediaAddress "Dirección">
 <!ENTITY mediaType "Tipo">
@@ -60,17 +58,16 @@
 <!ENTITY  permissionsFor        "Permisos para:">
 <!ENTITY  permPlugins           "Activar plugins">
 
 <!ENTITY  permClearStorage           "Limpiar almacenamiento">
 <!ENTITY  permClearStorage.accesskey "c">
 
 <!ENTITY  securityTab           "Seguridad">
 <!ENTITY  securityTab.accesskey "S">
-<!ENTITY  securityHeader        "Información de seguridad para esta página">
 <!ENTITY  securityView.certView "Ver certificado">
 <!ENTITY  securityView.accesskey "V">
 <!ENTITY  securityView.unknown   "Desconocido">
 
 
 <!ENTITY  securityView.identity.header   "Identidad del sitio web">
 <!ENTITY  securityView.identity.owner    "Autor:">
 <!ENTITY  securityView.identity.domain   "Sitio web:">
--- a/browser/chrome/browser/pageInfo.properties
+++ b/browser/chrome/browser/pageInfo.properties
@@ -33,17 +33,16 @@ mediaAnimatedImageType=Imagen %S (animad
 mediaDimensions=%Spx × %Spx
 mediaDimensionsScaled=%Spx × %Spx (escalada a %Spx × %Spx)
 
 generalQuirksMode=Modo quirks
 generalStrictMode=Modo cumplimiento de estándares
 generalSize=%S KB (%S bytes)
 generalMetaTag=Meta (1 tag)
 generalMetaTags=Meta (%S tags)
-generalSiteIdentity=Este sitio web es propiedad de %S\nHa sido verificado por %S
 
 feedRss=RSS
 feedAtom=Atom
 feedXML=XML
 
 securityNoOwner=Este sitio web no provee información de su propietario.
 securityOneVisit=Sí, una vez
 securityNVisits=Sí, %S veces
--- a/browser/chrome/browser/preferences/advanced.dtd
+++ b/browser/chrome/browser/preferences/advanced.dtd
@@ -125,15 +125,15 @@
 <!ENTITY offlineAppRemove.confirm        "Eliminar datos sin conexión">
 
 <!ENTITY certificateTab.label            "Certificados">
 <!ENTITY certSelection.description       "Cuando un servidor requiera mi certificado personal:">
 <!ENTITY certs.auto                      "Seleccionar uno automáticamente">
 <!ENTITY certs.auto.accesskey            "l">
 <!ENTITY certs.ask                       "Preguntarme cada vez">
 <!ENTITY certs.ask.accesskey             "P">
+<!ENTITY enableOCSP.label                "Solicitar a los servidores respondedores de OCSP que confirmen la validez actual de los certificados">
+<!ENTITY enableOCSP.accesskey            "O">
 <!ENTITY viewCerts.label                 "Ver Certificados">
 <!ENTITY viewCerts.accesskey             "s">
-<!ENTITY verify2.label                   "Validación">
-<!ENTITY verify2.accesskey               "V">
 <!ENTITY viewSecurityDevices.label       "Dispositivos de Seguridad">
 <!ENTITY viewSecurityDevices.accesskey   "D">
 
--- a/browser/chrome/browser/preferences/content.dtd
+++ b/browser/chrome/browser/preferences/content.dtd
@@ -28,8 +28,18 @@
 <!ENTITY chooseButton.label           "Seleccionar…">
 <!ENTITY chooseButton.accesskey       "o">
 
 <!ENTITY translateWebPages.label      "Traducir contenido web">
 <!ENTITY translateWebPages.accesskey  "T">
 <!ENTITY translateExceptions.label    "Excepciones…">
 <!ENTITY translateExceptions.accesskey "x">
 
+<!-- LOCALIZATION NOTE (translation.options.attribution.beforeLogo,
+  -                     translation.options.attribution.afterLogo):
+  -  These 2 strings are displayed before and after a 'Microsoft Translator'
+  -  logo.
+  -  The translations for these strings should match the translations in
+  -  browser/translation.dtd
+  -->
+<!ENTITY translation.options.attribution.beforeLogo "Traducciones por">
+<!ENTITY translation.options.attribution.afterLogo "">
+
--- a/browser/chrome/browser/preferences/preferences.dtd
+++ b/browser/chrome/browser/preferences/preferences.dtd
@@ -1,14 +1,15 @@
 <!-- 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  prefWindow.titleWin     "Opciones">
+<!ENTITY  prefWindow.title        "Preferencias">
 <!ENTITY  prefWindow.titleGNOME   "Preferencias de &brandShortName;">
 <!-- When making changes to prefWindow.styleWin test both Windows Classic and
      Luna since widget heights are different based on the OS theme -->
 <!ENTITY  prefWinMinSize.styleWin2      "width: 42em; min-height: 37.5em;">
 <!ENTITY  prefWinMinSize.styleMac       "width: 55em; min-height: 40em;">
 <!ENTITY  prefWinMinSize.styleGNOME     "width: 47em; min-height: 40.5em;">
 
 <!ENTITY  paneGeneral.title       "General">
--- a/browser/chrome/browser/translation.dtd
+++ b/browser/chrome/browser/translation.dtd
@@ -52,8 +52,16 @@
   -  The accesskey values used here should not clash with the value used for
   -  translation.options.neverForLanguage.accesskey in translation.properties
   -->
 <!ENTITY translation.options.neverForSite.label "Nunca traducir este sitio">
 <!ENTITY translation.options.neverForSite.accesskey "e">
 <!ENTITY translation.options.preferences.label  "Preferencias de traducción">
 <!ENTITY translation.options.preferences.accesskey "t">
 
+<!-- LOCALIZATION NOTE (translation.options.attribution.beforeLogo,
+  -                     translation.options.attribution.afterLogo):
+  -  These 2 strings are displayed before and after a 'Microsoft Translator'
+  -  logo.
+  -->
+<!ENTITY translation.options.attribution.beforeLogo "Traducción por">
+<!ENTITY translation.options.attribution.afterLogo "">
+
--- a/calendar/chrome/calendar/preferences/alarms.dtd
+++ b/calendar/chrome/calendar/preferences/alarms.dtd
@@ -26,13 +26,11 @@
 <!ENTITY pref.defalarm4todos.label "Configuración predeterminada de alarma para tareas:">
 <!ENTITY pref.defalarm4todos.accesskey "a">
 <!ENTITY pref.alarm.on "Encendida">
 <!ENTITY pref.alarm.off "Apagada">
 <!ENTITY pref.defalarmlen4events.label "Tiempo predeterminado en que una alarma se activa antes de un evento:">
 <!ENTITY pref.defalarmlen4events.accesskey "u">
 <!ENTITY pref.defalarmlen4todos.label "Tiempo predeterminado en que una alarma se activa antes de una tares:">
 <!ENTITY pref.defalarmlen4todos.accesskey "o">
-<!ENTITY pref.defaultemail.label "Dirección predeterminada a la que enviar las alarmas:">
-<!ENTITY pref.defaulttext.label "Texto predeterminado para alarmas:">
 
 <!ENTITY pref.defaultsnoozelength.label "Longitud predeterminada del silenciado:" >
 <!ENTITY pref.defaultsnoozelength.accesskey "s">
--- a/calendar/chrome/lightning/lightning.dtd
+++ b/calendar/chrome/lightning/lightning.dtd
@@ -53,16 +53,19 @@
 <!ENTITY lightning.imipbar.btnDelete.label                                  "Borrar">
 <!ENTITY lightning.imipbar.btnDelete.tooltiptext                            "Borrar del calendario">
 <!ENTITY lightning.imipbar.btnDetails.label                                 "Detalles…">
 <!ENTITY lightning.imipbar.btnDetails.tooltiptext                           "Mostrar detalles del evento">
 <!ENTITY lightning.imipbar.btnMore.label                                    "Más">
 <!ENTITY lightning.imipbar.btnMore.tooltiptext                              "Clic para mostrar más opciones">
 <!ENTITY lightning.imipbar.btnReconfirm2.label                              "Reconfirmar">
 <!ENTITY lightning.imipbar.btnReconfirm.tooltiptext                         "Envía una reconfirmación al organizador">
+<!ENTITY lightning.imipbar.btnSaveCopy.label                                "Guardar una copia">
+<!ENTITY lightning.imipbar.btnSaveCopy.tooltiptext                          "Guarda una copia del evento en el calendario independientemente de responder al organizador. La lista de asistentes será borrada.">
+
 <!ENTITY lightning.imipbar.btnTentative.label                               "Tentativa">
 <!ENTITY lightning.imipbar.btnTentative2.tooltiptext                        "Aceptar invitación al evento tentativamente">
 <!ENTITY lightning.imipbar.btnTentativeRecurrences.label                    "Tentativa para todas">
 <!ENTITY lightning.imipbar.btnTentativeRecurrences2.tooltiptext             "Aceptar invitación tentativamente para todas las recurrencias del evento">
 <!ENTITY lightning.imipbar.btnUpdate.label                                  "Actualizar">
 <!ENTITY lightning.imipbar.btnUpdate.tooltiptext                            "Actualizar evento en el calendario">
 <!ENTITY lightning.imipbar.description "Este mensaje contiene una invitación a un evento.">
 
--- a/chat/xmpp.properties
+++ b/chat/xmpp.properties
@@ -6,17 +6,17 @@
 #   These will be displayed in the account manager in order to show the progress
 #   of the connection.
 #   (These will be displayed in account.connection.progress from
 #    accounts.properties, which adds … at the end, so do not include
 #    periods at the end of these messages.)
 connection.initializingStream=Initializing stream
 connection.initializingEncryption=Inicializando cifrado
 connection.authenticating=Autenticando
-connection.gettingResource=Obteniendo recurso
+connection.gettingResource=Getting resource
 connection.downloadingRoster=Descargando lista de contactos
 
 # LOCALIZATION NOTE (connection.error.*)
 #   These will show in the account manager if an error occurs during the
 #   connection attempt.
 connection.error.invalidUsername=Nombre de usuario inválido (el nombre de usuario debería contener una '@')
 connection.error.failedToCreateASocket=Failed to create a socket (Are you offline?)
 connection.error.serverClosedConnection=El servidor cerró la conexión
@@ -24,27 +24,31 @@ connection.error.resetByPeer=Connection 
 connection.error.timedOut=The connection timed out
 connection.error.receivedUnexpectedData=Se recibieron datos inesperados
 connection.error.incorrectResponse=Se recibió una respuesta incorrecta
 connection.error.startTLSRequired=El servidor requiere cifrado pero está deshabilitado
 connection.error.startTLSNotSupported=El servidor no soporta cifrado pero la configuración lo requiere
 connection.error.failedToStartTLS=No se pudo iniciar el cifrado
 connection.error.noAuthMec=El sevidor no ofrece mencanismo de autenticación
 connection.error.noCompatibleAuthMec=Ninguno de los mecanismos de autenticación ofrecidos por el servidor es soportado
-connection.error.notSendingPasswordInClear=El servidor solamente soporta autenticación enviando la contraseña en texto plano
+connection.error.notSendingPasswordInClear=The server only supports authentication by sending the password in cleartext
 connection.error.authenticationFailure=Falla de autenticación
 connection.error.notAuthorized=No autorizado (¿Ingresó la contraseña incorrecta?)
-connection.error.failedToGetAResource=Falla al obtener un recurso
+connection.error.failedToGetAResource=Failed to get a resource
 
 
 # LOCALIZATION NOTE (conversation.error.notDelivered):
 #   This is displayed in a conversation as an error message when a message
 #   the user has sent wasn't delivered.
 #   %S is replaced by the text of the message that wasn't delivered.
 conversation.error.notDelivered=Este mensaje no pudo ser entregado: %S
+#   This is displayed in a conversation as an error message when joining a MUC
+#   fails.
+#   %S is the name of the MUC.
+conversation.error.joinFailed=No se pudo unir: %S
 
 # LOCALIZATION NOTE (tooltip.*):
 #   These are the titles of lines of information that will appear in
 #   the tooltip showing details about a contact or conversation.
 # LOCALIZATION NOTE (tooltip.status):
 #   %S will be replaced by the XMPP resource identifier
 tooltip.status=Status (%S)
 tooltip.statusNoResource=Estado
--- a/dom/chrome/layout/css.properties
+++ b/dom/chrome/layout/css.properties
@@ -39,16 +39,24 @@ PEKeyframeBrace=Se esperaba { de apertur
 PESkipDeclBraceEOF=} cerrando un bloque de declaración
 PESkipRSBraceEOF=} cerrando un grupo de reglas inválido
 PEBadSelectorRSIgnored=Grupo de reglas ignorado por un mal selector.
 PEBadSelectorKeyframeRuleIgnored=Regla keyframe ignorada devido a un mal selector.
 PESelectorListExtraEOF=',' o '{'
 PESelectorListExtra=Se esperaba ',' o '{' pero se encontró '%1$S'.
 PESelectorGroupNoSelector=Se esperaba selector.
 PESelectorGroupExtraCombinator=Dangling combinator.
+PECounterStyleNotIdent=Se esperaba un identificador para el nombre de la regla de estilo de @counter-style.
+PECounterStyleBadName=El nombre de la regla @counter-style rule no puede ser '%1$S'.
+PECounterStyleBadBlockStart=Se esperaba '{' para comenzar la regla @counter-style pero se encontró '%1$S'.
+PECounterStyleEOF='}' de cierre de bloque @counter-style
+PECounterDescExpected=Expected counter descriptor but found '%1$S'.
+PEUnknownCounterDesc=Descriptor desconocido '%1$S' en regla @counter-style.
+PECounterExtendsNotIdent=Expected identifier for extends system but found '%1$S'.
+PECounterASWeight=Cada peso en el descriptor additive-symbols debe ser menor que el peso anterior.
 PEClassSelEOF=nombre de clase
 PEClassSelNotIdent=Se esperaba identificador para selector de clase pero se encontró '%1$S'.
 PETypeSelEOF=tipo de elemento
 PETypeSelNotType=Se esperaba nombre de elemento o '*' pero se encontró '%1$S'.
 PEUnknownNamespacePrefix=Prefijo de namespace desconocido '%1$S'.
 PEAttributeNameEOF=nombre de atributo
 PEAttributeNameExpected=Se esperaba identificador para nombre de atributo pero se encontró '%1$S'.
 PEAttributeNameOrNamespaceExpected=Se esperaba nombre de atributo o namespace pero se encontró '%1$S'.
--- a/dom/chrome/plugins.properties
+++ b/dom/chrome/plugins.properties
@@ -15,9 +15,11 @@ path_label=Ruta:
 version_label=Versión:
 state_label=Estado:
 state_enabled=Habilitado
 state_disabled=Deshabilitado
 mimetype_label=Tipo MIME
 description_label=Descripción
 suffixes_label=Sufijos
 
+openH264_name=Codec de video OpenH264 provisto por Cisco Systems, Inc.
+openH264_description=Reproducción de video web y uso de video chats.
 
--- a/mail/chrome/messenger/chat.properties
+++ b/mail/chrome/messenger/chat.properties
@@ -83,8 +83,10 @@ dateTime=%1$S %2$S
 log.today=Hoy
 log.yesterday=Ayer
 
 #LOCALIZATION NOTE
 # These are special groups in the log tree for the last 3-7 days and
 # the last 8-14 days.
 log.currentWeek=Esta semana
 log.previousWeek=La semana pasada
+
+messagePreview=Nuevo mensaje de chat
--- a/mail/chrome/messenger/messenger.properties
+++ b/mail/chrome/messenger/messenger.properties
@@ -533,21 +533,21 @@ copyToFolderAgainAccessKey=o
 alwaysLoadRemoteContentForSender2= Siempre cargar contenido remoto para %1$S 
 
 #LOCALIZATION NOTE(mdnBarMessageNormal) %1$S is the name of the sender
 mdnBarMessageNormal=%1$S ha pedido ser notificado cuando lea este mensaje.
 #LOCALIZATION NOTE(mdnBarMessageAddressDiffers) %1$S is the name of the sender, %2$S is the address(es) to send return receipt to
 mdnBarMessageAddressDiffers=%1$S ha pedido ser notificado (en %2$S) cuando lea este mensaje.
 
 # mailCommands.js
-emptyJunkTitle=Confirmar
-emptyJunkMessage=¿Está seguro de querer borrar todos los mensajes y subcarpetas de la carpeta Basura de forma permanente?
+emptyJunkFolderTitle=Vaciar "%S"
+emptyJunkFolderMessage=¿Borra todos los mensajes y subcarpetas de la carpeta Basura?
 emptyJunkDontAsk=No preguntar nuevamente.
-emptyTrashTitle=Confirmar
-emptyTrashMessage=¿Está seguro de querer borrar todos los mensajes y subcarpetas de la Papelera de forma permanente?
+emptyTrashFolderTitle=Vaciar "%S"
+emptyTrashFolderMessage=¿Borra todos los mensajes y subcarpetas de la Papelera?
 emptyTrashDontAsk=No preguntar nuevamente.
 
 # junkCommands.js
 junkAnalysisPercentComplete=Análisis de basura %S completo
 processingJunkMessages=Procesando mensajes basura
 
 # Messenger bootstrapping messages
 fileNotFoundTitle = Archivo no encontrado
--- a/mail/chrome/messenger/messengercompose/composeMsgs.properties
+++ b/mail/chrome/messenger/messengercompose/composeMsgs.properties
@@ -245,17 +245,19 @@ assemblingMailInformation=Ensamblando información de correo…
 gatheringAttachment=Adjuntando %S…
 creatingMailMessage=Creando mensaje de correo…
 
 ## LOCALIZATION NOTE (copyMessageStart): argument %S is folder name
 copyMessageStart=Copiando mensaje a la carpeta %S…
 copyMessageComplete=Copia completa.
 copyMessageFailed=Falló la copia.
 
-sendLargeMessageWarning=¡Advertencia! Está por enviar un mensaje de %d bytes. ¿Está seguro de querer hacer esto?
+## LOCALIZATION NOTE (largeMessageSendWarning):
+## Do not translate %S. It is the size of the message in user-friendly notation.
+largeMessageSendWarning=¡Advertencia! Está por enviar un mensaje de tamaño %d que puede exceder los límites permitidos del servidor de correo. ¿Está seguro de querer hacer esto?
 
 sendingMessage=Enviando mensaje…
 sendMessageErrorTitle=Error al enviar el mensaje
 postingMessage=Publicando mensaje…
 
 sendLaterErrorTitle=Erro al enviar después
 saveDraftErrorTitle=Error al guardar borrador
 saveTemplateErrorTitle=Error al guardar plantilla
--- a/mail/chrome/messenger/preferences/chat.dtd
+++ b/mail/chrome/messenger/preferences/chat.dtd
@@ -21,16 +21,20 @@ sentence. -->
 <!ENTITY  andSetStatusToAway.accesskey  "A">
 
 <!ENTITY  sendTyping.label              "Send typing notifications in conversations">
 <!ENTITY  sendTyping.accesskey          "t">
 
 <!ENTITY  chatNotifications.label             "Cuando lleguen mensajes dirigidos a usted:">
 <!ENTITY  desktopChatNotifications.label      "Mostrar una notifiación">
 <!ENTITY  desktopChatNotifications.accesskey  "c">
+<!ENTITY  completeNotification.label          "con nombre de remitente y vista previa de mensaje">
+<!ENTITY  buddyInfoOnly.label                 "solo con nombre de remitente">
+<!ENTITY  dummyNotification.label             "sin otra información">
+
 <!ENTITY  chatSound.accesskey                 "d">
 <!ENTITY  chatSound.label                     "Reproducir un sonido">
 <!ENTITY  play.label                          "Reproducir">
 <!ENTITY  play.accesskey                      "p">
 <!ENTITY  systemSound.label                   "Sonido predeterminado para nuevo correo">
 <!ENTITY  systemSound.accesskey               "d">
 <!ENTITY  customsound.label                   "Usar el siguiente archivo de sonido">
 <!ENTITY  customsound.accesskey               "U">
--- a/mail/chrome/messenger/preferences/privacy.dtd
+++ b/mail/chrome/messenger/preferences/privacy.dtd
@@ -9,16 +9,18 @@
 <!ENTITY acceptRemoteContent.accesskey "a">
 <!ENTITY remoteContentExceptions.label "Excepciones…">
 <!ENTITY remoteContentExceptions.accesskey "x">
 <!ENTITY acceptRemoteContentInfo.label "Conozca más sobre los problemas de privacidad del contenido remoto">
 
 <!-- Web Content -->
 <!ENTITY captionWebContent.label "Contenido web">
 
+<!ENTITY keepHistory.label "Recordar sitios web y enlaces que haya visitado">
+<!ENTITY keepHistory.accesskey "R">
 <!ENTITY acceptCookies.label "Aceptar cookies de los citios">
 <!ENTITY acceptCookies.accesskey "A">
 <!ENTITY acceptThirdParty.pre.label "Aceptar cookies de terceros:">
 <!ENTITY acceptThirdParty.pre.accesskey "c">
 <!ENTITY acceptThirdParty.always.label "Siempre">
 <!ENTITY acceptThirdParty.never.label "Nunca">
 <!ENTITY acceptThirdParty.visited.label "De visitados">
 <!ENTITY keepUntil.label "Mantener hasta:">
--- a/mail/chrome/messenger/sanitize.dtd
+++ b/mail/chrome/messenger/sanitize.dtd
@@ -19,19 +19,18 @@ that require it.  -->
 <!ENTITY clearTimeDuration.suffix         "">
 
 <!-- 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">
 
-<!-- LOCALIZATION NOTE (item*): itemHistoryAndDownloads.* and
-     itemBrowsingHistory.* will never be used at the same time, so they can
-     have the same accesskey. -->
+<!ENTITY itemHistory.label                 "Historial de navegación">
+<!ENTITY itemHistory.accesskey             "H">
 <!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 -->
--- a/mobile/android/base/android_strings.dtd
+++ b/mobile/android/base/android_strings.dtd
@@ -6,16 +6,17 @@
 <!ENTITY  no_space_to_start_error "No hay suficiente espacio para que &brandShortName; pueda iniciarse.">
 <!ENTITY  error_loading_file "Ha ocurrido un error mientras se trataban de cargar los archivos necesarios para ejecutar &brandShortName;">
 
 <!-- Localization note: These are used as the titles of different pages on the home screen.
      They are automatically converted to all caps by the Android platform. -->
 <!ENTITY  bookmarks_title "Marcadores">
 <!ENTITY  history_title "Historial">
 <!ENTITY  reading_list_title "Lista de lectura">
+<!ENTITY  recent_tabs_title "Pestañas recientes">
 
 <!ENTITY  switch_to_tab "Cambiar a pestaña">
 
 <!ENTITY  crash_reporter_title "Informe de fallos de &brandShortName;">
 <!ENTITY  crash_message2 "&brandShortName; tuvo un problema y ha fallado. Tus pestañas deberían aparecer listadas en la página de inicio de &brandShortName; al reiniciar.">
 <!ENTITY  crash_send_report_message3 "Decirle a &vendorShortName; sobre esta falla para que la puedan arreglar">
 <!ENTITY  crash_include_url2 "Incluir la dirección de la página en la que estabas">
 <!ENTITY  crash_sorry "Disculpanos">
@@ -38,18 +39,18 @@
 <!ENTITY bookmark "Marcador">
 <!ENTITY bookmark_added "Marcador agregado">
 <!ENTITY bookmark_removed "Marcador eliminado">
 <!ENTITY bookmark_updated "Marcador actualizado">
 <!ENTITY bookmark_options "Opciones">
 
 <!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 history_week_section2 "Última semana">
+<!ENTITY history_older_section2 "Último mes">
 
 <!ENTITY go "Ir">
 <!ENTITY search "Buscar">
 <!ENTITY reload "Recargar">
 <!ENTITY forward "Adelante">
 <!ENTITY menu "Menú">
 <!ENTITY back "Atrás">
 <!ENTITY stop "Detener">
@@ -104,17 +105,16 @@
 <!ENTITY pref_search_hint "CONSEJO: Agregá cualquier sitio web a la lista de buscadores con una presión larga en su campo de búsqueda y luego tocando el ícono &formatI;.">
 <!ENTITY pref_category_devtools "Herramientas de desarrollador">
 <!ENTITY pref_developer_remotedebugging "Depuración remota">
 <!ENTITY pref_remember_signons "Recordar contraseñas">
 
 <!ENTITY pref_category_home "Inicio">
 <!ENTITY pref_category_home_summary "Personalizá tu página de inicio">
 <!ENTITY pref_category_home_panels "Paneles">
-<!ENTITY pref_home_add_panel "Agregar paneles">
 <!ENTITY home_add_panel_title "Agregar un panel nuevo">
 <!ENTITY home_add_panel_empty "Lo sentimos, no podemos encontrar ningún panel para agregar.">
 <!-- Localization note (home_add_panel_installed):
      The &formatS; will be replaced with the name of the new panel the user just
      selected to be added to the home page. -->
 <!ENTITY home_add_panel_installed "\'&formatS;\' agregado a la página de inicio">
 <!ENTITY pref_category_home_content_settings "Configuración de contenido">
 <!ENTITY pref_home_updates "Actualizaciones automáticas">
@@ -252,16 +252,17 @@ size. -->
 <!ENTITY save_as_pdf "Guardar como PDF">
 <!ENTITY find_in_page "Buscar en la página">
 <!ENTITY desktop_mode "Pedir versión de escritorio">
 <!ENTITY page "Página">
 <!ENTITY tools "Herramientas">
 <!ENTITY new_tab "Nueva pestaña">
 <!ENTITY new_private_tab "Nueva pestaña privada">
 <!ENTITY close_all_tabs "Cerrar todas las pestañas">
+<!ENTITY close_private_tabs "Cerrar pestañas privadas">
 <!ENTITY tabs_normal "Pestañas">
 <!ENTITY tabs_private "Privadas">
 <!ENTITY tabs_synced "Sincronizadas">
 <!ENTITY set_image_fail "No se puede establecer imagen">
 <!ENTITY set_image_chooser_title "Poner imagen como">
 
 <!-- Localization note (find_text, find_prev, find_next, find_close) : These strings are used
      as alternate text for accessibility. They are not visible in the UI. -->
@@ -344,20 +345,20 @@ size. -->
 <!-- Localization note (home_top_sites_add): This string is used as placeholder
      text underneath empty thumbnails in the Top Sites page on about:home. -->
 <!ENTITY home_top_sites_add "Agregar un sitio">
 
 <!ENTITY home_history_title "Historial">
 <!ENTITY home_clear_history_button "Limpiar historial de navegación">
 <!ENTITY home_clear_history_confirm "¿Querés limpiar tu historial?">
 <!ENTITY home_bookmarks_empty "Los marcadores que guardés van a aparecer acá.">
+<!ENTITY home_closed_tabs_title "Pestañas recientemente cerradas">
 <!ENTITY home_last_tabs_title "Pestañas de la última vez">
-<!ENTITY home_last_tabs_open "Abrir todas las pestañas de la última vez">
 <!ENTITY home_last_tabs_empty "Tus pestañas recientes aparecen acá.">
-<!ENTITY home_most_recent_title "Más recientes">
+<!ENTITY home_open_all "Abrir todas">
 <!ENTITY home_most_recent_empty "Los sitios web visitados mas recientemente aparecen acá.">
 <!ENTITY home_reading_list_empty "Los artículos guardados para ver más tarde aparecen acá.">
 <!-- Localization note (home_reading_list_hint): The "TIP" string is synonymous to "hint", "clue", etc. This string is displayed
      as an advisory message on how to add content to the reading list when the reading list empty.
      The placeholder &formatI; will be replaced by a small image of the icon described, and can be moved to wherever
      it is applicable. -->
 <!ENTITY home_reading_list_hint2 "CONSEJO: Guardá artículos en tu lista de lectura con una presión larga en el ícono  &formatI; cuando aparezca en la barra de título.">
 <!-- Localization note (home_reading_list_hint_accessible): This string is used
@@ -367,16 +368,20 @@ size. -->
 <!-- Localization note (home_default_empty): This string is used as the default text when there
      is no data to show in an about:home panel that was created by an add-on. -->
 <!ENTITY home_default_empty "No se encontró contenido para este panel.">
 
 <!-- Localization note (home_move_up_to_filter): The variable is replaced by the name of the
      previous location in the navigation, such as the previous folder -->
 <!ENTITY home_move_up_to_filter "Hacia &formatS;">
 
+<!ENTITY private_browsing_title "Navegación privada">
+<!ENTITY private_tabs_panel_empty_desc "Tus pestañasa privadas aparecen acá. Aunque no guardamos nungún historial de navegación o cookies, los marcadores y archivos descargados se mantendrán en tu dispositivo.">
+<!ENTITY private_tabs_panel_learn_more "¿Querés saber más?">
+
 <!ENTITY pin_site_dialog_hint "Ingresá una palabra a buscar">
 
 <!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 -->
--- a/mobile/android/base/sync_strings.dtd
+++ b/mobile/android/base/sync_strings.dtd
@@ -103,16 +103,20 @@
 <!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ñasync.subtitle.connectlocatio.'>
 
 <!-- Firefox account strings. -->
 
 <!ENTITY fxaccount_full_label 'Cuentas de Firefox'>
+
+<!ENTITY fxaccount_custom_server_account_title 'Usando cuenta en servidor'>
+<!ENTITY fxaccount_custom_server_sync_title 'Guardando datos de Sync en servidor'>
+
 <!-- Localization note: these are shown in all screens that query the
      user for an email address and password. Hide and show are button
      labels. -->
 <!ENTITY fxaccount_email_hint 'Correo electrónico'>
 <!ENTITY fxaccount_password_hint 'Contraseña'>
 <!ENTITY fxaccount_password_hide 'Ocultar'>
 <!ENTITY fxaccount_password_show 'Mostrar'>
 
@@ -164,17 +168,19 @@
 <!ENTITY fxaccount_account_verified_description2 'Tus datos comenzarán a sincronizarse momentáneamente.'>
 
 <!ENTITY fxaccount_update_credentials_header 'Ingresar'>
 <!ENTITY fxaccount_update_credentials_button_label 'Ingresar'>
 <!ENTITY fxaccount_update_credentials_unknown_error 'No se puede ingresar'>
 
 <!ENTITY fxaccount_status_header2 'Cuenta de Firefox'>
 <!ENTITY fxaccount_status_signed_in_as 'Ingresado como'>
+<!ENTITY fxaccount_status_auth_server 'Servidor de cuenta'>
 <!ENTITY fxaccount_status_device_name 'Nombre de dispositivo'>
+<!ENTITY fxaccount_status_sync_server 'Servidor de Sync'>
 <!ENTITY fxaccount_status_sync '&syncBrand.shortName.label;'>
 <!ENTITY fxaccount_status_sync_enabled '&syncBrand.shortName.label;: habilitado'>
 <!ENTITY fxaccount_status_needs_verification2 'Tu cuenta necesita ser verificada. Tocá para reenviar el correo electrónico de verificación.'>
 <!ENTITY fxaccount_status_needs_credentials 'No se puede conectar. Tocá para ingresar.'>
 <!ENTITY fxaccount_status_needs_upgrade 'Necesitás actualizar &brandShortName; para ingresar.'>
 <!ENTITY fxaccount_status_needs_master_sync_automatically_enabled '&syncBrand.shortName.label; Está configurado, pero no se está sincronizando automáticamente. Habilitá “Auto-sync data” en Ajustes de Android &gt; Uso de datos.'>
 <!ENTITY fxaccount_status_needs_account_enabled '&syncBrand.shortName.label; está configurado, pero no se está sincronizando automáticamente. Golpeá para comenzar a sincronizar.'>
 <!ENTITY fxaccount_status_bookmarks 'Marcadores'>
--- a/mobile/android/chrome/aboutApps.dtd
+++ b/mobile/android/chrome/aboutApps.dtd
@@ -2,10 +2,9 @@
    - 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.title2                          "Aplicaciones">
 <!ENTITY aboutApps.header                          "Tus aplicaciones">
 
 <!ENTITY aboutApps.browseMarketplace "Revisar el Marketplace de Firefox">
 <!ENTITY aboutApps.uninstall "Desinstalar">
-<!ENTITY aboutApps.addToHomescreen "Agregar a pantalla de inicio">
 <!ENTITY aboutApps.checkForUpdates "Buscar actualizaciones">
--- a/mobile/android/chrome/browser.properties
+++ b/mobile/android/chrome/browser.properties
@@ -237,26 +237,16 @@ stacktrace.anonymousFunction=<anónimo>
 stacktrace.outputMessage=Stack trace from %S, function %S, line %S.
 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.message2=%S incluye contenido de un plugin. ¿Querés activarlo?
 clickToPlayPlugins.activate=Activar
 clickToPlayPlugins.dontActivate=No activar
 # 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
 # LOCALIZATION NOTE (clickToPlayPlugins.playPlugins): Label that
--- a/security/manager/chrome/pippki/pippki.dtd
+++ b/security/manager/chrome/pippki/pippki.dtd
@@ -89,11 +89,8 @@
 <!ENTITY formSigning.cert "Certificado de firma">
 <!ENTITY formSigning.confirmPassword "Para confirmar que acepta firmar este mensaje usando su certificado seleccionado, confirme ingresando la contraseña maestra:">
 
 <!-- Strings for protectedAuth dialog -->
 <!ENTITY protectedAuth.title "Autenticación protegida por token">
 <!ENTITY protectedAuth.msg "Autentíquese con el token. El método de autenticación depende del tipo de token.">
 <!ENTITY protectedAuth.tokenName.label "Token:">
 
-<!ENTITY certErrorDlg.title "Fallo en conexión segura">
-<!ENTITY certErrorDlg.info1 "Puede haber un problema con la configuración del servidor o puede ser alguien tratando hacerse pasar por el servidor.">
-<!ENTITY certErrorDlg.info2 "Si se ha conectado exitosamente a este servidor en el pasado el error puede ser temporal y puede intentarlo nuevamente.">
--- a/suite/chrome/browser/region.properties
+++ b/suite/chrome/browser/region.properties
@@ -3,17 +3,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # navigator.properties
 #
 # all.js
 #
 browser.startup.homepage=http://www.seamonkey-project.org/start/
 browser.throbber.url=http://www.seamonkey-project.org/
-browser.search.defaulturl=http://www.google.com/search?q=
 
 browser.translation.service=http://translate.google.com/translate?prev=/language_tools&u=
 browser.translation.serviceDomain=translate.google.com
 browser.validate.html.service=http://validator.w3.org/check?charset=%28detect+automatically%29&doctype=Inline&uri=
 
 #config.js
 #
 startup.homepage_override_url=http://www.seamonkey-project.org/releases/seamonkey%VERSION%/
--- a/suite/chrome/common/bookmarks/editBookmarkOverlay.dtd
+++ b/suite/chrome/common/bookmarks/editBookmarkOverlay.dtd
@@ -1,12 +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/. -->
-
 <!ENTITY editBookmarkOverlay.name.label                      "Nombre:">
 <!ENTITY editBookmarkOverlay.name.accesskey                  "N">
 <!ENTITY editBookmarkOverlay.location.label                  "Dirección:">
 <!ENTITY editBookmarkOverlay.location.accesskey              "D">
 <!ENTITY editBookmarkOverlay.feedLocation.label              "Dirección del canal:">
 <!ENTITY editBookmarkOverlay.feedLocation.accesskey          "i">
 <!ENTITY editBookmarkOverlay.siteLocation.label              "Dirección del sitio:">
 <!ENTITY editBookmarkOverlay.siteLocation.accesskey          "s">
@@ -17,14 +13,12 @@
 <!ENTITY editBookmarkOverlay.tags.label                      "Etiquetas:">
 <!ENTITY editBookmarkOverlay.tags.accesskey                  "t">
 <!ENTITY editBookmarkOverlay.tagsEmptyDesc.label             "Separar etiquetas con comas">
 <!ENTITY editBookmarkOverlay.description.label               "Descripción:">
 <!ENTITY editBookmarkOverlay.description.accesskey           "D">
 <!ENTITY editBookmarkOverlay.keyword.label                   "Palabra clave:">
 <!ENTITY editBookmarkOverlay.keyword.accesskey               "P">
 <!ENTITY editBookmarkOverlay.tagsExpanderDown.tooltip        "Mostrar todas las etiquetas">
-<!ENTITY editBookmarkOverlay.loadInSidebar.label             "Cargar este marcador en la barra lateral">
-<!ENTITY editBookmarkOverlay.loadInSidebar.accesskey         "b">
 <!ENTITY editBookmarkOverlay.choose.label                    "Seleccionar…">
 <!ENTITY editBookmarkOverlay.newFolderButton.label           "Nueva carpeta">
 <!ENTITY editBookmarkOverlay.newFolderButton.accesskey       "N">
 <!ENTITY editBookmarkOverlay.newFolderButton.tooltip         "Crear nueva carpeta">
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/notification.dtd
@@ -0,0 +1,15 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY closeNotification.tooltip "Cerrar este mensaje">
+
+<!-- LOCALIZATION NOTE (closeNotificationItem.label): This entity is used
+     to replace the Toolkit default closeNotificationItem.label ("Not Now")
+     which is ambiguous in some cases. Thus, make sure to select a phrase
+     that clearly relates to closing the current doorhanger. -->
+<!ENTITY closeNotificationItem.label "Descartar notificación">
+
+<!ENTITY checkForUpdates "Buscar actualizaciones…">
+
+<!ENTITY learnMore "Conocer más…">
--- a/suite/chrome/common/notification.properties
+++ b/suite/chrome/common/notification.properties
@@ -114,54 +114,59 @@ lwthemeInstallNotification.manageButton.
 
 # LOCALIZATION NOTE (lwthemeNeedsRestart.message):
 # %S will be replaced with the new theme name.
 lwthemeNeedsRestart.message=%S se instalará después de reiniciar.
 lwthemeNeedsRestart.restartButton=Reiniciar ahora
 lwthemeNeedsRestart.restartButton.accesskey=R
 
 # Geolocation UI
-# LOCALIZATION NOTE (geolocation.shareLocation geolocation.dontShareLocation): 
-#If you're having trouble with the word Share, please use Allow and Block in your language.
+# LOCALIZATION NOTE (geolocation.shareLocation geolocation.dontShareThisRequest geolocation.alwaysShareForSite geolocation.neverShareForSite):
+#shareLocation is always visible, other entries are contextually relative to it
+#if this doesn't work for your language, use explicit Share or Allow/Block.
 geolocation.shareLocation=Compartir ubicación
 geolocation.shareLocation.accesskey=a
-geolocation.dontShareLocation=No compartir
-geolocation.dontShareLocation.accesskey=o
-geolocation.alwaysShareLocation=Siempre compartir
-geolocation.alwaysShareLocation.accesskey=a
-geolocation.neverShareLocation=Nunca compartir
-geolocation.neverShareLocation.accesskey=N
+geolocation.dontShareThisRequest=No para esta solicitud
+geolocation.dontShareThisRequest.accesskey=o
+geolocation.alwaysShareForSite=Siempre para este sitio
+geolocation.alwaysShareForSite.accesskey=a
+geolocation.neverShareForSite=Nunca para este sitio
+geolocation.neverShareForSite.accesskey=N
 geolocation.siteWantsToKnow=%S quiere conocer su ubicación.
 geolocation.fileWantsToKnow=El archivo %S quiere conocer su ubicación.
 # LOCALIZATION NOTE (geolocation.learnMore): Use the unicode ellipsis char, \u2026,
 # or use "..." unless \u2026 doesn't suit traditions in your locale.
 geolocation.learnMore=Saber más…
 geolocation.remember=Recordar para este sitio
 
 # Desktop Notifications
+# LOCALIZATION NOTE (webnotifications.showForSession webnotifications.dontShowThisSession webnotifications.alwaysShowForSite webnotifications.neverShowForSite):
+#showForSession is always visible, other entries are contextually relative to it
+#if this doesn't work for your language, use explicit Show or Allow/Block.
 webNotifications.showForSession=Mostrar notificaciones
 webNotifications.showForSession.accesskey=M
-webNotifications.dontShowForSession=No mostrar
-webNotifications.dontShowForSession.accesskey=o
-webNotifications.alwaysShow=Siempre mostrar
-webNotifications.alwaysShow.accesskey=a
-webNotifications.neverShow=Nunca mostrar
-webNotifications.neverShow.accesskey=N
+webNotifications.dontShowThisSession=No para esta sesión
+webNotifications.dontShowThisSession.accesskey=o
+webNotifications.alwaysShowForSite=Siempre para este sitio
+webNotifications.alwaysShowForSite.accesskey=a
+webNotifications.neverShowForSite=Nunca para este sitio
+webNotifications.neverShowForSite.accesskey=N
 webNotifications.showFromSite=¿Desea mostrar notificaciones de %S?
 webNotifications.remember=Recordar para este sitio web
 
 # IndexedDB
 offlineApps.permissions=Este sitio web (%S) está ofreciendo guardar datos en su computadora para usar sin conexión.
+offlineApps.private=Está en una ventana privada. Este sitio web (%S) no tiene permitido guardar datos en su computadora para usar sin conexión.
 offlineApps.quota=Este sitio web (%1$S) está intentando guardar más de %2$SMB de datos en su computadora para usar sin conexión.
-offlineApps.allow=Permitir
-offlineApps.allow.accesskey=P
+offlineApps.always=Siempre permitir
+offlineApps.always.accesskey=S
 offlineApps.later=No ahora
 offlineApps.later.accesskey=N
-offlineApps.deny=Nunca para este sitio
-offlineApps.deny.accesskey=e
+offlineApps.never=Nunca para este sitio
+offlineApps.never.accesskey=e
 
 # Block autorefresh
 refreshBlocked.goButton=Permitir
 refreshBlocked.goButton.accesskey=P
 refreshBlocked.refreshLabel=%S evitó que esta página se recargara automáticamente.
 refreshBlocked.redirectLabel=%S evitó que esta página se redirigiera automáticamente a otra página.
 
 # LOCALIZATION NOTE (lockPrompt.text)
--- a/suite/chrome/common/pref/pref-offlineapps.dtd
+++ b/suite/chrome/common/pref/pref-offlineapps.dtd
@@ -1,21 +1,21 @@
-<!-- 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/. -->
-
 <!-- extracted from content/pref-offlineapps.xul -->
 
 <!--LOCALIZATION NOTE : FILE Offline Apps prefs dialog -->
 <!ENTITY pref.offlineapps.title             "Aplicaciones web sin conexión">
 <!ENTITY pref.offlineCache.caption          "Contenido web y datos de usuario sin conexión">
 
 <!ENTITY clearOfflineAppCache.label         "Limpiar">
 <!ENTITY clearOfflineAppCache.accesskey     "L">
 
-<!ENTITY offlineNotify.label                "Informarme cuando un sitio web pida guardar datos para usar sin conexión.">
-<!ENTITY offlineNotify.accesskey            "n">
+<!ENTITY offlineAlwaysAllow.label           "Permitir que todos los sitios guarden datos para usar sin conexión">
+<!ENTITY offlineAlwaysAllow.accesskey       "a">
+<!ENTITY offlineExplicit.label              "Solo permitir sitios web con permisos explícitos">
+<!ENTITY offlineExplicit.accesskey          "o">
+<!ENTITY offlineNotifyAsk.label             "Notificarme cuando un sitio web pida guardar datos para usar sin conexión.">
+<!ENTITY offlineNotifyAsk.accesskey         "N">
 <!ENTITY offlineNotifyPermissions.label     "Administrar permisos">
 <!ENTITY offlineNotifyPermissions.accesskey "p">
 
-<!ENTITY offlineAppsList.label              "Los siguientes sitios web tienen permitido guardar datos para uso sin conexión:">
+<!ENTITY offlineAppsUsage.label             "Los siguientes sitios web están usando almacenamiento sin conexión:">
 <!ENTITY offlineAppsListRemove.label        "Limpiar datos…">
 <!ENTITY offlineAppsListRemove.accesskey    "d">
--- a/suite/chrome/common/pref/pref-security.dtd
+++ b/suite/chrome/common/pref/pref-security.dtd
@@ -10,24 +10,31 @@
 
 <!ENTITY dntTellSites.label               "Decirle a los sitios mis preferencias de rastreo">
 <!ENTITY dntTellSites.accesskey           "t">
 <!ENTITY dntTrackingNotOkay.label         "No deseo ser rastreado">
 <!ENTITY dntTrackingNotOkay.accesskey     "N">
 <!ENTITY dntTrackingOkay.label            "Consiento ser rastreado">
 <!ENTITY dntTrackingOkay.accesskey        "C">
 
+<!ENTITY geoLocation.label                "Navegación dependiente de la ubicación">
+<!ENTITY geoIntro.label                   "Los sitios web pueden solicitar información sobre su ubicación actual.">
+
+<!ENTITY geoEnabled.label                 "Solicitar permiso si se realiza un pedido">
+<!ENTITY geoEnabled.accesskey             "m">
+<!ENTITY geoDisabled.label                "Deshabilitar esa funcionalidad y denegar todos los pedidos">
+<!ENTITY geoDisabled.accesskey            "D">
 
 <!-- LOCALIZATION NOTE (safeBrowsing.label, blockWebForgeries.label, blockAttackSites.label):
   The methods by which forged (phished) and attack sites will be detected by
   phishing providers will vary from human review to machine-based heuristics
   to a combination of both, so it's important that these strings convey the
   meaning "reported" (and not something like "known").
 -->
-<!ENTITY safeBrowsing.label               "Navegación privada">
-<!ENTITY safeBrowsingIntro.label          "&brandShortName; puede bloquear sitios informados por incluir contenido malicioso.">
+<!ENTITY safeBrowsing.label               "Navegación segura">
+<!ENTITY safeBrowsingIntro.label          "&brandShortName; puede bloquear sitios informados por mantener contenido malicioso.">
 
 <!ENTITY blockAttackSites.label           "Bloquear sitios informados por ataques (malware, virus)">
 <!ENTITY blockAttackSites.accesskey       "B">
 
 <!ENTITY blockWebForgeries.label          "Bloquear sitios informados por falsificación (Phishing)">
 <!ENTITY blockWebForgeries.accesskey      "P">
 
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/pref/prefutilities.dtd
@@ -0,0 +1,40 @@
+<!-- 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 FallbackCharset.auto         "Default for Current Locale">
+<!-- LOCALIZATION NOTE (FallbackCharset.arabic):
+     Translate "Arabic" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY FallbackCharset.arabic       "Arabic">
+<!ENTITY FallbackCharset.baltic       "Baltic">
+<!ENTITY FallbackCharset.ceiso        "Central European, ISO">
+<!ENTITY FallbackCharset.cewindows    "Central European, Microsoft">
+<!-- LOCALIZATION NOTE (FallbackCharset.simplified):
+     Translate "Chinese" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY FallbackCharset.simplified   "Chinese, Simplified">
+<!-- LOCALIZATION NOTE (FallbackCharset.traditional):
+     Translate "Chinese" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY FallbackCharset.traditional  "Chinese, Traditional">
+<!ENTITY FallbackCharset.cyrillic     "Cyrillic">
+<!-- LOCALIZATION NOTE (FallbackCharset.greek):
+     Translate "Greek" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY FallbackCharset.greek        "Greek">
+<!-- LOCALIZATION NOTE (FallbackCharset.hebrew):
+     Translate "Hebrew" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY FallbackCharset.hebrew       "Hebrew">
+<!-- LOCALIZATION NOTE (FallbackCharset.japanese):
+     Translate "Japanese" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY FallbackCharset.japanese     "Japanese">
+<!-- LOCALIZATION NOTE (FallbackCharset.korean):
+     Translate "Korean" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY FallbackCharset.korean       "Korean">
+<!-- LOCALIZATION NOTE (FallbackCharset.thai):
+     Translate "Thai" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY FallbackCharset.thai         "Thai">
+<!-- LOCALIZATION NOTE (FallbackCharset.turkish):
+     Translate "Turkish" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY FallbackCharset.turkish      "Turkish">
+<!-- LOCALIZATION NOTE (FallbackCharset.vietnamese):
+     Translate "Vietnamese" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY FallbackCharset.vietnamese   "Vietnamese">
+<!ENTITY FallbackCharset.other        "Other (including Western European)">
--- a/suite/chrome/common/pref/prefutilities.properties
+++ b/suite/chrome/common/pref/prefutilities.properties
@@ -2,17 +2,17 @@
 # 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/.
 
 cachefolder=Seleccionar carpeta de caché
 #LOCALIZATION NOTE (%1$S) is the size and (%2$S) is the unit of disk space.
 cacheSizeInfo=El caché está usando actualmente %1$S %2$S de espacio en disco.
 
 # Offline apps
-appCacheSizeInfo=Su caché de apliaciones está usando actualmente %1$S %2$S de espacio en disco.
+offlineAppSizeInfo=Su almacenamiento sin conexión está usando actualmente %1$S %2$S de espacio en disco.
 offlineAppRemoveTitle=Eliminar datos de sitios web sin conexión
 offlineAppRemovePrompt=Después de eliminar estos datos, %S no estará disponible sin conexión.  ¿Seguro desea eliminar este sitio web sin conexión?
 offlineAppRemoveConfirm=Eliminar datos sin conexión
 
 # LOCALIZATION NOTE: The next string is for the disk usage of the
 # offline application
 #   e.g. offlineAppUsage : "50.23 MB"
 #   %1$S = size (in bytes or megabytes, ...)
--- a/suite/chrome/mailnews/addressbook/addressBook.properties
+++ b/suite/chrome/mailnews/addressbook/addressBook.properties
@@ -56,19 +56,20 @@ propertyBirthday=Cumpleaños
 propertyCustom1=Personalizado 1
 propertyCustom2=Personalizado 2
 propertyCustom3=Personalizado 3
 propertyCustom4=Personalizado 4
 
 ## LOCALIZATION NOTE (dateformat)
 ## Only used if the year isn't present and should be in the format used by Date.toLocaleFormat
 ## see http://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Global_Objects/Date/toLocaleFormat
-## %B is the month's localized name and %e is the day of the month [1-31]
+## %B is the month's localized name and %d is the day of the month [1-31].
+## Don't go using %e here, since it breaks things on Windows!
 ## Separators (a space, dash, etc.) can be used
-dateformat=%e de %B
+dateFormatMonthDay=%d de %B
 
 ## LOCALIZATION NOTE (cityAndStateAndZip): 
 ## %1$S is city, %2$S is state, %3$S is zip
 cityAndStateAndZip=%1$S, %2$S (%3$S)
 ## LOCALIZATION NOTE (cityAndStateNoZip): 
 ## %1$S is city, %2$S is state
 cityAndStateNoZip=%1$S, %2$S
 ## LOCALIZATION NOTE (cityOrStateAndZip): 
--- a/suite/chrome/mailnews/compose/composeMsgs.properties
+++ b/suite/chrome/mailnews/compose/composeMsgs.properties
@@ -245,17 +245,19 @@ assemblingMailInformation=Ensamblando información de correo…
 gatheringAttachment=Adjuntando %S…
 creatingMailMessage=Creando mensaje de correo…
 
 ## LOCALIZATION NOTE (copyMessageStart): argument %S is folder name
 copyMessageStart=Copiando mensaje a la carpeta %S…
 copyMessageComplete=Copia completa.
 copyMessageFailed=Falló la copia.
 
-sendLargeMessageWarning=¡Advertencia! Está por enviar un mensaje de %d bytes. ¿Está seguro de querer hacer esto?
+## LOCALIZATION NOTE (largeMessageSendWarning):
+## %S is the message size in user-friendly notation. Do not translate.
+largeMessageSendWarning=¡Advertencia! Está por enviar un mensaje de tamaño %S que puede exceder los límites permitidos del servidor de correo. ¿Está seguro de querer hacer esto?
 
 sendingMessage=Enviando mensaje…
 sendMessageErrorTitle=Error al enviar el mensaje
 postingMessage=Publicando mensaje…
 
 sendLaterErrorTitle=Erro al enviar después
 saveDraftErrorTitle=Error al guardar borrador
 saveTemplateErrorTitle=Error al guardar plantilla
--- a/suite/installer/windows/custom.properties
+++ b/suite/installer/windows/custom.properties
@@ -1,11 +1,44 @@
-# 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/.
+# ***** 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 the Mozilla Installer code.
+#
+# The Initial Developer of the Original Code is Mozilla Foundation
+# Portions created by the Initial Developer are Copyright (C) 2006
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#  Robert Strong <robert.bugzilla@gmail.com>
+#  Frank Wein <mcsmurf@mcsmurf.de>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
 
 # LOCALIZATION NOTE:
 
 # This file must be saved as UTF8
 
 # Accesskeys are defined by prefixing the letter that is to be used for the
 # accesskey with an ampersand (e.g. &).
 
@@ -21,18 +54,16 @@
 REG_APP_DESC=$BrandShortName ofrece navegación web segura y fácil. Una interfase de usuario familiar, características de seguridad mejoradas incluyendo protección de robo de identidad online y búsqueda integerada que le permiten obtener lo máximo de la web.
 OPTIONAL_COMPONENTS_TITLE=Seleccione componentes opcionales
 OPTIONAL_COMPONENTS_SUBTITLE=Seleccione que características de $BrandFullNameDA desea instalar.
 OPTIONAL_COMPONENTS_LABEL=Componentes opcionales:
 DOMI_TITLE=Inspector DOM
 DOMI_TEXT=Inspecciona la estructura y propiedades de una ventana y su contenido.
 DEBUGQA_TITLE=Interfaz de Control de calidad
 DEBUGQA_TEXT=Interfaz de control de calidad adicional para el desarrollo de $BrandShortName.
-VENKMAN_TITLE=Depurador JavaScript
-VENKMAN_TEXT=JavaScript debugger and profiler
 CHATZILLA_TITLE=ChatZilla
 CHATZILLA_TEXT=Un cliente de IRC limpio, fácil de usar y altamente extensible.
 CONTEXT_OPTIONS=&Opciones de $BrandShortName
 CONTEXT_SAFE_MODE=Modo &seguro de $BrandShortName
 SAFE_MODE=Modo seguro
 # MAILNEWS_TEXT appears in Windows (All) Programs menu as "SeaMonkey $(MAILNEWS_TEXT)"
 MAILNEWS_TEXT=Correo
 PROFILE_TEXT=Administrador de perfiles
new file mode 100644
--- /dev/null
+++ b/toolkit/chrome/formautofill/requestAutocomplete.dtd
@@ -0,0 +1,5 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- This file has no entities because the feature is still experimental. -->
--- a/toolkit/chrome/global/aboutSupport.dtd
+++ b/toolkit/chrome/global/aboutSupport.dtd
@@ -50,16 +50,18 @@ This is the Windows- and Mac-specific va
 Windows/Mac use the term "Folder" instead of "Directory" -->
 <!ENTITY aboutSupport.appBasicsProfileDirWinMac "Carpeta de perfil">
 
 <!ENTITY aboutSupport.appBasicsEnabledPlugins "Plugins habilitados">
 <!ENTITY aboutSupport.appBasicsBuildConfig "Configuración de compilación">
 <!ENTITY aboutSupport.appBasicsUserAgent "Agente de usuario">
 <!ENTITY aboutSupport.appBasicsMemoryUse "Uso de memoria">
 
+<!ENTITY aboutSupport.appBasicsMultiProcessSupport "Ventanas multiproceso">
+
 <!ENTITY aboutSupport.showDir.label "Abrir directorio">
 <!-- LOCALIZATION NOTE (aboutSupport.showMac.label): This is the Mac-specific
 variant of aboutSupport.showDir.label.  This allows us to use the preferred
 "Finder" terminology on Mac. -->
 <!ENTITY aboutSupport.showMac.label "Mostrar en Finder">
 <!-- LOCALIZATION NOTE (aboutSupport.showWin.label): This is the Windows-specific
 variant of aboutSupport.showDir.label. -->
 <!ENTITY aboutSupport.showWin.label "Mostrar carpeta">
@@ -67,16 +69,20 @@ variant of aboutSupport.showDir.label. -
 <!ENTITY aboutSupport.modifiedKeyPrefsTitle "Preferencias importantes modificadas">
 <!ENTITY aboutSupport.modifiedPrefsName "Nombre">
 <!ENTITY aboutSupport.modifiedPrefsValue "Valor">
 
 <!-- LOCALIZATION NOTE (aboutSupport.userJSTitle, aboutSupport.userJSDescription): user.js is the name of the preference override file being checked. -->
 <!ENTITY aboutSupport.userJSTitle "Preferencias en user.js">
 <!ENTITY aboutSupport.userJSDescription "Su carpeta de perfil contiene un <a id='prefs-user-js-link'>archivo user.js</a>, que incluye preferencias que no fueron creadas por &brandShortName;.">
 
+<!ENTITY aboutSupport.lockedKeyPrefsTitle "Preferencias importantes bloqueadas">
+<!ENTITY aboutSupport.lockedPrefsName "Nombre">
+<!ENTITY aboutSupport.lockedPrefsValue "Valor">
+
 <!ENTITY aboutSupport.graphicsTitle "Gráficos">
 
 <!ENTITY aboutSupport.jsTitle "JavaScript">
 <!ENTITY aboutSupport.jsIncrementalGC "GC incremental">
 
 <!ENTITY aboutSupport.a11yTitle "Accesibilidad">
 <!ENTITY aboutSupport.a11yActivated "Activada">
 <!ENTITY aboutSupport.a11yForceDisabled "Impedir accesibilidad">
--- a/toolkit/chrome/global/devtools/csscoverage.dtd
+++ b/toolkit/chrome/global/devtools/csscoverage.dtd
@@ -32,15 +32,16 @@
 <!ENTITY csscoverage.optimize.body1 "A veces puede acelerar la carga moviendo">
 <!ENTITY csscoverage.optimize.body2 "etiquetas al final de la página y creando un nuevo elemento">
 <!ENTITY csscoverage.optimize.body3 "incorporado con los estilos necesarios antes del evento 'load' al principio. Aquí están los bloques de estilo que se necesitan:">
 
 <!-- LOCALIZATION NOTE (csscoverage.noPreload):
   -  This is what we say when we have no optimization suggestions -->
 <!ENTITY csscoverage.optimize.bodyX "Todas las reglas están incorporadas.">
 
-<!-- LOCALIZATION NOTE (csscoverage.footer1, csscoverage.footer2, csscoverage.footer3):
-  -  The text displayed at the bottom of the page, with 2 being the URL opened
-  -  when the link text in 3 is clicked -->
+<!-- LOCALIZATION NOTE (csscoverage.footer1, csscoverage.footer2a,
+  -  csscoverage.footer3, csscoverage.footer4): The text displayed at the
+  -  bottom of the page, with 2a being the URL opened when the link text in 3
+  -  is clicked -->
 <!ENTITY csscoverage.footer1 "Vea">
-<!ENTITY csscoverage.footer2 "https://developer.mozilla.org/en-US/docs/Tools/CSS_Coverage">
+<!ENTITY csscoverage.footer2a "https://developer.mozilla.org/docs/Tools/CSS_Coverage">
 <!ENTITY csscoverage.footer3 "el artículo en MDN article sobre la herramienta de cobertura de CSS">
 <!ENTITY csscoverage.footer4 "por advertencias en la generación de este informe.">
--- a/toolkit/chrome/global/devtools/csscoverage.properties
+++ b/toolkit/chrome/global/devtools/csscoverage.properties
@@ -1,29 +1,32 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # LOCALIZATION NOTE These strings are used in the 'csscoverage' command and in
 # the user interface that this command creates.
 
-# LOCALIZATION NOTE (csscoverageDesc, csscoverageStartDesc, csscoverageStopDesc,
-# csscoverageOneShotDesc, csscoverageToggleDesc, csscoverageReportDesc): Short
-# descriptions of the csscoverage commands
-csscoverageDesc=Control análisis de cobertura de CSS
-csscoverageStartDesc=Comenzar a recolectar análisis de cobertura de CSS
-csscoverageStopDesc=Dejar de recolectar análisis de cobertura de CSS
-csscoverageOneShotDesc=Dejar de recolectar análisis de cobertura de CSS
-csscoverageToggleDesc=Cambiar recolección análisis de cobertura de CSS
-csscoverageReportDesc=Mostrar informe de análisis de cobertura de CSS
+# LOCALIZATION NOTE (csscoverageDesc, csscoverageStartDesc2,
+# csscoverageStopDesc2, csscoverageOneShotDesc2, csscoverageToggleDesc2,
+# csscoverageReportDesc2): Short descriptions of the csscoverage commands
+csscoverageDesc=Control de análisis de cobertura de CSS
+csscoverageStartDesc2=Comenzar a recolectar datos de cobertura de CSS
+csscoverageStopDesc2=Dejar de recolectar datos de cobertura de CSS
+csscoverageOneShotDesc2=Recolectar datos de cobertura CSS instantáneos
+csscoverageToggleDesc2=Cambiar recolección de datos de cobertura de CSS
+csscoverageReportDesc2=Mostrar informe de cobertura de CSS
+csscoverageStartNoReloadDesc=No iniciar con una recarga de página
+csscoverageStartNoReloadManual=Es mejor si iniciamos al recargar la página actual porque eso iniciará la prueba en un punto conocido, pero podría haber razones por las que no querramos hacerlo (ej. la página contiene un estado que pude perderse al recargar)
 
 # LOCALIZATION NOTE (csscoverageRunningReply, csscoverageDoneReply): Text that
 # describes the current state of the css coverage system
 csscoverageRunningReply=Ejecutar análisis de cobertura de CSS
 csscoverageDoneReply=Análisis de cobertura de CSS completo
 
 # LOCALIZATION NOTE (csscoverageRunningError, csscoverageNotRunningError,
 # csscoverageNotRunError): Error message that describe things that can go wrong
 # with the css coverage system
 csscoverageRunningError=Análisis de cobertura de CSS ya se está ejecutando
 csscoverageNotRunningError=Análisis de cobertura de CSS no se está ejecutando
 csscoverageNotRunError=Análisis de cobertura de CSS no se ha ejecutado
 csscoverageNoRemoteError=El destino no soporta cobertura de CSS
+csscoverageOneShotReportError=El informe de cobertura de CSS no está disponible para datos 'oneshot'. Use start/stop.
--- a/toolkit/chrome/global/devtools/styleinspector.properties
+++ b/toolkit/chrome/global/devtools/styleinspector.properties
@@ -75,32 +75,48 @@ ruleView.contextmenu.selectAll.accessKey
 # LOCALIZATION NOTE (ruleView.contextmenu.copy): Text displayed in the rule view
 # context menu.
 ruleView.contextmenu.copy=Copiar
 
 # LOCALIZATION NOTE (ruleView.contextmenu.copy.accessKey): Access key for
 # the rule view context menu "Select all" entry.
 ruleView.contextmenu.copy.accessKey=C
 
+# LOCALIZATION NOTE (ruleView.contextmenu.copyColor): Text displayed in the rule
+# and computed view context menu when a color value was clicked.
+ruleView.contextmenu.copyColor=Copiar color
+
+# LOCALIZATION NOTE (ruleView.contextmenu.copyColor.accessKey): Access key for
+# the rule and computed view context menu "Copy Color" entry.
+ruleView.contextmenu.copyColor.accessKey=L
+
 # LOCALIZATION NOTE (ruleView.contextmenu.showOrigSources): Text displayed in the rule view
 # context menu.
 ruleView.contextmenu.showOrigSources=Mostrar fuentes originales
 
 # LOCALIZATION NOTE (ruleView.contextmenu.showOrigSources.accessKey): Access key for
 # the rule view context menu "Show original sources" entry.
 ruleView.contextmenu.showOrigSources.accessKey=o
 
 # LOCALIZATION NOTE (ruleView.contextmenu.showCSSSources): Text displayed in the rule view
 # context menu.
 ruleView.contextmenu.showCSSSources=Mostrar fuentes CSS
 
 # LOCALIZATION NOTE (ruleView.contextmenu.showCSSSources.accessKey): Access key for
 # the rule view context menu "Show CSS sources" entry.
 ruleView.contextmenu.showCSSSources.accessKey=C
 
+# LOCALIZATION NOTE (ruleView.contextmenu.addRule): Text displayed in the
+# rule view context menu for adding a new rule to the element.
+ruleView.contextmenu.addRule=Agregar regla
+
+# LOCALIZATION NOTE (ruleView.contextmenu.addRule.accessKey): Access key for
+# the rule view context menu "Add rule" entry.
+ruleView.contextmenu.addRule.accessKey=r
+
 # LOCALIZATION NOTE (computedView.contextmenu.selectAll): Text displayed in the
 # computed view context menu.
 computedView.contextmenu.selectAll=Seleccionar todo
 
 # LOCALIZATION NOTE (computedView.contextmenu.selectAll.accessKey): Access key for
 # the computed view context menu "Select all" entry.
 computedView.contextmenu.selectAll.accessKey=a
 
--- a/toolkit/chrome/mozapps/extensions/extensions.properties
+++ b/toolkit/chrome/mozapps/extensions/extensions.properties
@@ -51,16 +51,18 @@ notification.upgrade=%1$S será actualizado después de reiniciar %2$S.
 #LOCALIZATION NOTE (notification.downloadError) %1$S is the add-on name. Not yet implemented - see https://bug593535.bugzilla.mozilla.org/attachment.cgi?id=475403
 notification.downloadError=Hubo un error al descargar %1$S.
 notification.downloadError.retry=Intentar nuevamente
 notification.downloadError.retry.tooltip=Intentar descargar este complemento nuevamente
 #LOCALIZATION NOTE (notification.installError) %1$S is the add-on name. Not yet implemented - see https://bug593535.bugzilla.mozilla.org/attachment.cgi?id=475403
 notification.installError=Hubo un error al instalar %1$S.
 notification.installError.retry=Intentar nuevamente
 notification.installError.retry.tooltip=Intentar descargar e instalar este complemento nuevamente
+#LOCALIZATION NOTE (notification.openH264Pending) OpenH264 will be automatically installed later.
+notification.openH264Pending=Será instalado en breve.
 
 #LOCALIZATION NOTE (contributionAmount2) %S is the currency amount recommended for contributions
 contributionAmount2=Contribución sugerida: %S
 
 installDownloading=Descargando
 installDownloaded=Descargado
 installDownloadFailed=Error descargando
 installVerifying=Verificando
@@ -92,16 +94,18 @@ details.notification.enable=%1$S será habilitado después de reiniciar %2$S.
 #LOCALIZATION NOTE (details.notification.disable) %1$S is the add-on name, %2$S is brand name
 details.notification.disable=%1$S será deshabilitado después de reiniciar %2$S.
 #LOCALIZATION NOTE (details.notification.install) %1$S is the add-on name, %2$S is brand name
 details.notification.install=%1$S será instalado después de reiniciar %2$S.
 #LOCALIZATION NOTE (details.notification.uninstall) %1$S is the add-on name, %2$S is brand name
 details.notification.uninstall=%1$S será desinstalado después de reiniciar %2$S.
 #LOCALIZATION NOTE (details.notification.upgrade) %1$S is the add-on name, %2$S is brand name
 details.notification.upgrade=%1$S será actualizado después de reiniciar %2$S.
+#LOCALIZATION NOTE (details.notification.openH264Pending) OpenH264 will be automatically installed later.
+details.notification.openH264Pending=Será instalado en breve.
 
 #LOCALIZATION NOTE (details.experiment.time.daysRemaining) #1 is the number of days from now that the experiment will remain active (detail view).
 details.experiment.time.daysRemaining=#1 día restante;#1 días restantes
 #LOCALIZATION NOTE (details.experiment.time.endsToday) The experiment will end in less than a day (detail view).
 details.experiment.time.endsToday=Menos de un día restante
 #LOCALIZATION NOTE (details.experiment.time.daysPassed) #1 is the number of days since the experiment ran (detail view).
 details.experiment.time.daysPassed=hace #1 día;hace #1 días
 #LOCALIZATION NOTE (details.experiment.time.endedToday) The experiment ended less than a day ago (detail view).
deleted file mode 100644
--- a/toolkit/chrome/mozapps/preferences/ocsp.dtd
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY ocspDialog.title "Verificación">
-<!ENTITY enableOCSP.label             "Usar el Online Certificate Status Protocol (OCSP) para confirmar la validez actual de los certificados">
-<!ENTITY enableOCSP.accesskey         "U">
-<!ENTITY requireOCSP.label            "Cuando falla la conexión a un servidor OCSP, tratar el certificado como no válido">
-<!ENTITY requireOCSP.accesskey        "x">
-