Some fixes
authorMarcelo Poli <mpoli@lt24.zzn.com>
Wed, 18 Sep 2013 01:14:31 -0300
changeset 1530 c20c3918f73e63ef90399525e8c2b344631998e0
parent 1529 2ecd2ce58832434e23720e060de74daa78fc27b0
child 1531 5a8ebd5760f4c12322bfa4076973aa520537a7aa
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:47:06 +0000
Some fixes
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/devtools/debugger.dtd
browser/chrome/browser/devtools/debugger.properties
browser/chrome/browser/devtools/gcli.properties
browser/chrome/browser/devtools/gclicommands.properties
browser/chrome/browser/devtools/netmonitor.dtd
browser/chrome/browser/devtools/profiler.dtd
browser/chrome/browser/devtools/profiler.properties
browser/chrome/browser/devtools/responsiveUI.properties
browser/chrome/browser/devtools/scratchpad.dtd
browser/chrome/browser/devtools/styleinspector.properties
browser/chrome/browser/devtools/toolbox.properties
browser/chrome/browser/devtools/webConsole.dtd
browser/chrome/browser/devtools/webconsole.properties
browser/chrome/browser/feeds/subscribe.properties
dom/chrome/accessibility/AccessFu.properties
dom/chrome/appstrings.properties
dom/chrome/dom/dom.properties
dom/chrome/layout/HtmlForm.properties
dom/chrome/layout/MediaDocument.properties
dom/chrome/mathml/mathml.properties
dom/chrome/security/csp.properties
dom/chrome/security/security.properties
mobile/android/chrome/aboutAddons.dtd
mobile/android/chrome/aboutAddons.properties
mobile/android/chrome/browser.properties
mobile/profile/bookmarks.inc
security/manager/chrome/pippki/pippki.properties
webapprt/webapprt/webapp.dtd
webapprt/webapprt/webapp.properties
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -41,16 +41,21 @@ can reach it easily. -->
 <!ENTITY  moveToGroup.accesskey              "M">
 <!ENTITY  moveToNewGroup.label               "Nuevo grupo">
 <!ENTITY  moveToNewWindow.label              "Mover a nueva ventana">
 <!ENTITY  moveToNewWindow.accesskey          "v">
 <!ENTITY  bookmarkAllTabs.label              "Marcar todas las pestañas…">
 <!ENTITY  bookmarkAllTabs.accesskey          "t">
 <!ENTITY  undoCloseTab.label                 "Deshacer cerrar pestaña">
 <!ENTITY  undoCloseTab.accesskey             "h">
+<!-- LOCALIZATION NOTE (undoCloseTabs.label) : This label is used
+when the previous tab-closing operation closed more than one tab. It
+replaces the undoCloseTab.label and will use the same accesskey as the
+undoCloseTab.label so users will not need to learn new keyboard controls. -->
+<!ENTITY  undoCloseTabs.label                "Deshacer cerrar pestañas">
 <!ENTITY  closeTab.label                     "Cerrar pestaña">
 <!ENTITY  closeTab.accesskey                 "c">
 
 <!ENTITY  listAllTabs.label      "Listar todas las pestañas">
 
 <!ENTITY tabCmd.label "Nueva pestaña">
 <!ENTITY tabCmd.accesskey "t">
 <!ENTITY tabCmd.commandkey "t">
@@ -250,16 +255,18 @@ These should match what Safari and other
 
 <!-- LOCALIZATION NOTE (chromeDebuggerMenu.label): This is the label for the
   -  application menu item that opens the browser debugger UI in the Tools menu. -->
 <!ENTITY chromeDebuggerMenu.label       "Depurador del navegador">
 
 <!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 devToolbar.keycode                "VK_F2">
 <!ENTITY devToolbar.keytext                "F2">
 <!ENTITY devToolboxMenuItem.label          "Intercambiar herramientas">
 <!ENTITY devToolboxMenuItem.accesskey      "t">
 <!ENTITY devToolboxMenuItem.keycode        "I">
 <!ENTITY devToolboxMenuItem.keytext        "I">
 
 <!ENTITY devToolbarToolsButton.tooltip     "Intercambiar herramientas de desarrollador">
@@ -669,19 +676,20 @@ The word "toolbar" is appended automatic
 <!ENTITY social.learnMore.label "Conocer más…">
 <!ENTITY social.learnMore.accesskey "m">
 <!ENTITY social.closeNotificationItem.label "No ahora">
 
 <!ENTITY social.chatBar.commandkey "c">
 <!ENTITY social.chatBar.label "Focus chats">
 <!ENTITY social.chatBar.accesskey "c">
 
-<!-- labels are set dynamically, see browser.properties -->
-<!ENTITY social.markpage.accesskey "m">
-<!ENTITY social.marklink.accesskey "M">
+<!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.selectMicrophone.label "Micrófono a compartir:">
 <!ENTITY getUserMedia.selectMicrophone.accesskey "M">
 
 <!ENTITY webrtcIndicatorButton.label "Acceso a cámara / micrófono">
 <!ENTITY webrtcIndicatorButton.tooltip "Mostrar sitios con los cuales esté compartiendo cámara o micrófono">
@@ -693,8 +701,14 @@ The word "toolbar" is appended automatic
 
 <!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 -->
 <!ENTITY pluginActivateNow.label "Permitir ahora">
 <!ENTITY pluginActivateAlways.label "Permitir y recordar">
 <!ENTITY pluginBlockNow.label "Bloquear plugin">
+
+<!ENTITY tabCrashed.header "Pestaña colgada">
+<!ENTITY tabCrashed.message "Bueno, esto es vergonzoso. Tratamos de mostrar esta página web, pero no está respondiendo.">
+<!ENTITY tabCrashed.tryAgain "Intentar nuevamente">
+
+
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -405,16 +405,17 @@ dataReportingNotification.button.label  
 dataReportingNotification.button.accessKey  = c
 
 # Webapps notification popup
 webapps.install = Instalar
 webapps.install.accesskey = I
 #LOCALIZATION NOTE (webapps.requestInstall) %1$S is the web app name, %2$S is the site from which the web app is installed
 webapps.requestInstall = ¿Desea instalar "%1$S" desde este sitio (%2$S)?
 webapps.install.success = Aplicación instalada
+webapps.install.inprogress = Instalación en proceso
 
 # LOCALIZATION NOTE (fullscreen.entered): displayed when we enter HTML5 fullscreen mode, %S is the domain name of the focused website (e.g. mozilla.com).
 fullscreen.entered=%S ahora está en pantalla completa.
 # LOCALIZATION NOTE (fullscreen.rememberDecision): displayed when we enter HTML5 fullscreen mode, %S is the domain name of the focused website (e.g. mozilla.com).
 fullscreen.rememberDecision=Recordar la decisión para %S
 
 service.toolbarbutton.label=Servicios
 service.toolbarbutton.tooltiptext=Servicios
@@ -427,22 +428,20 @@ service.install.learnmore=Conocer más…
 
 # LOCALIZATION NOTE (social.turnOff.label): %S is the name of the social provider
 social.turnOff.label=Desactivar %S
 social.turnOff.accesskey=t
 # LOCALIZATION NOTE (social.turnOn.label): %S is the name of the social provider
 social.turnOn.label=Activar %S
 social.turnOn.accesskey=t
 
-# LOCALIZATION NOTE (social.markpage.label): %S is the name of the social provider
-social.markpage.label=Enviar página a %S
-social.unmarkpage.label=Eliminar página de %S
-# LOCALIZATION NOTE (social.marklink.label): %S is the name of the social provider
-social.marklink.label=Enviar enlace a %S
-social.unmarklink.label=Eliminar enlace de %S
+# LOCALIZATION NOTE (social.markpageMenu.label): %S is the name of the social provider
+social.markpageMenu.label=Guardar página en %S
+# LOCALIZATION NOTE (social.marklinkMenu.label): %S is the name of the social provider
+social.marklinkMenu.label=Guardar enlace en %S
 
 # LOCALIZATION NOTE (social.error.message): %1$S is brandShortName (e.g. Firefox), %2$S is the name of the social provider
 social.error.message=%1$S no se puede conectar con %2$S en este momento.
 social.error.tryAgain.label=Reintentar
 social.error.tryAgain.accesskey=t
 social.error.closeSidebar.label=Cerrar esta barra lateral
 social.error.closeSidebar.accesskey=C
 
--- a/browser/chrome/browser/devtools/debugger.dtd
+++ b/browser/chrome/browser/devtools/debugger.dtd
@@ -33,16 +33,21 @@
   -  the button that opens up an options context menu for the debugger UI. -->
 <!ENTITY debuggerUI.optsButton.tooltip  "Opciones del depurador">
 
 <!-- LOCALIZATION NOTE (debuggerUI.pauseExceptions): This is the label for the
   -  checkbox that toggles pausing on exceptions. -->
 <!ENTITY debuggerUI.pauseExceptions          "Pausar en excepciones">
 <!ENTITY debuggerUI.pauseExceptions.key "E">
 
+<!-- LOCALIZATION NOTE (debuggerUI.pauseExceptions): This is the label for the
+  -  checkbox that toggles ignoring caught exceptions. -->
+<!ENTITY debuggerUI.ignoreCaughtExceptions     "Ignore caught exceptions">
+<!ENTITY debuggerUI.ignoreCaughtExceptions.key "C">
+
 <!-- LOCALIZATION NOTE (debuggerUI.showPanesOnInit): This is the label for the
   -  checkbox that toggles visibility of panes when opening the debugger. -->
 <!ENTITY debuggerUI.showPanesOnInit     "Mostrar vistas al iniciar">
 <!ENTITY debuggerUI.showPanesOnInit.key "S">
 
 <!-- LOCALIZATION NOTE (debuggerUI.showVarsFilter): This is the label for the
   -  checkbox that toggles visibility of a designated variables filter box. -->
 <!ENTITY debuggerUI.showVarsFilter      "Mostrar filtro de variables">
--- a/browser/chrome/browser/devtools/debugger.properties
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -123,16 +123,20 @@ breakpointMenuItem.enableAll=Enable all 
 breakpointMenuItem.disableAll=Disable all breakpoints
 breakpointMenuItem.deleteAll=Remove all breakpoints
 
 # LOCALIZATION NOTE (loadingText): The text that is displayed in the script
 # editor when the laoding process has started but there is no file to display
 # yet.
 loadingText=Cargando\u2026
 
+# LOCALIZATION NOTE (errorLoadingText): The text that is displayed in the debugger
+# viewer when there is an error loading a file
+errorLoadingText=Error cargando fuente:\n
+
 # LOCALIZATION NOTE (emptyStackText): The text that is displayed in the watch
 # expressions list to add a new item.
 addWatchExpressionText=Add watch expression
 
 # LOCALIZATION NOTE (emptyVariablesText): The text that is displayed in the
 # variables pane when there are no variables to display.
 emptyVariablesText=No hay variables que mostrar.
 
--- a/browser/chrome/browser/devtools/gcli.properties
+++ b/browser/chrome/browser/devtools/gcli.properties
@@ -42,16 +42,20 @@ cliEvalJavascript=Ingrese JavaScript dir
 # than the current command can understand this is the error message shown to
 # the user.
 cliUnusedArg=Demasiados argumentos
 
 # LOCALIZATION NOTE (cliOptions): The title of the dialog which displays the
 # options that are available to the current command.
 cliOptions=Opciones disponibles
 
+# LOCALIZATION NOTE: The error message when the user types a command that
+# isn't registered
+cliUnknownCommand=Comando inválido
+
 # LOCALIZATION NOTE: Error message given when a file argument points to a file
 # that does not exist, but should (e.g. for use with File->Open) %1$S is a
 # filename
 fileErrNotExists='%1$S' no existe
 
 # LOCALIZATION NOTE: Error message given when a file argument points to a file
 # that exists, but should not (e.g. for use with File->Save As) %1$S is a
 # filename
@@ -198,20 +202,16 @@ helpSearchManual3=cadena a buscar para r
 # page for a command in the console It labels a summary of the parameters to
 # the command
 helpManSynopsis=Sinopsis
 
 # LOCALIZATION NOTE (helpManDescription): A heading shown in a help page for a
 # command in the console. This heading precedes the top level description.
 helpManDescription=Descripción
 
-# LOCALIZATION NOTE (helpManParameters): A heading shown above the parameters
-# in a help page for a command in the console.
-helpManParameters=Parámetros
-
 # LOCALIZATION NOTE (helpManNone): Some text shown under the parameters
 # heading in a help page for a command which has no parameters.
 helpManNone=Ninguno
 
 # LOCALIZATION NOTE (helpListAll): The heading shown in response to the 'help'
 # command when used without a filter, just above the list of known commands.
 helpListAll=Comandos disponibles:
 
--- a/browser/chrome/browser/devtools/gclicommands.properties
+++ b/browser/chrome/browser/devtools/gclicommands.properties
@@ -423,16 +423,20 @@ dbgBlackBoxDesc=Black box sources in the
 # LOCALIZATION NOTE (dbgBlackBoxSourceDesc) A very short string used to describe the
 # 'source' parameter to the 'dbg blackbox' command.
 dbgBlackBoxSourceDesc=A specific source to black box
 
 # LOCALIZATION NOTE (dbgBlackBoxGlobDesc) A very short string used to describe the
 # 'glob' parameter to the 'dbg blackbox' command.
 dbgBlackBoxGlobDesc=Black box all sources that match this glob (for example: "*.min.js")
 
+# LOCALIZATION NOTE (dbgBlackBoxInvertDesc) A very short string used to describe the
+# 'invert' parameter to the 'dbg blackbox' command.
+dbgBlackBoxInvertDesc=Invert matching, so that we black box every source that is not the source provided or does not match the provided glob pattern.
+
 # LOCALIZATION NOTE (dbgBlackBoxEmptyDesc) A very short string used to let the
 # user know that no sources were black boxed.
 dbgBlackBoxEmptyDesc=(No sources black boxed)
 
 # LOCALIZATION NOTE (dbgBlackBoxNonEmptyDesc) A very short string used to let the
 # user know which sources were black boxed.
 dbgBlackBoxNonEmptyDesc=The following sources were black boxed:
 
@@ -461,16 +465,20 @@ dbgUnBlackBoxEmptyDesc=(Did not stop bla
 # user know which sources we stopped black boxing.
 dbgUnBlackBoxNonEmptyDesc=Stopped black boxing the following sources:
 
 # LOCALIZATION NOTE (dbgUnBlackBoxErrorDesc) A very short string used to let the
 # user know there was an error black boxing a source (whose url follows this
 # text).
 dbgUnBlackBoxErrorDesc=Error stopping black boxing:
 
+# LOCALIZATION NOTE (dbgUnBlackBoxInvertDesc) A very short string used to describe the
+# 'invert' parameter to the 'dbg unblackbox' command.
+dbgUnBlackBoxInvertDesc=Invert matching, so that we stop black boxing every source that is not the source provided or does not match the provided glob pattern.
+
 # LOCALIZATION NOTE (consolecloseDesc) A very short description of the
 # 'console close' 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.
 consolecloseDesc=Cerrar la consola
 
 # LOCALIZATION NOTE (consoleopenDesc) A very short description of the
 # 'console open' 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.
@@ -1316,16 +1324,20 @@ profilerNotFound=Perfil no encontrado
 # started yet. It also contains a hint to use the 'profile start' command to
 # start the profiler.
 profilerNotStarted3=El perfilador aún no ha sido iniciado. Use 'profile start' para iniciar el perfilado
 
 # LOCALIZATION NOTE (profilerStarted2) A very short string that indicates that
 # we have started recording.
 profilerStarted2=Grabando…
 
+# LOCALIZATION NOTE (profilerStopped) A very short string that indicates that
+# we have stopped recording.
+profilerStopped=Detenido…
+
 # LOCALIZATION NOTE (profilerNotReady) A message that is displayed whenever
 # an operation cannot be completed because the profiler has not been opened yet.
 profilerNotReady=Para que este comando funcione, primero necesita abrir el perfilador
 
 # LOCALIZATION NOTE (listenDesc) A very short string used to describe the
 # function of the 'listen' command.
 listenDesc=Abrir un puerto de depuración remota
 
--- a/browser/chrome/browser/devtools/netmonitor.dtd
+++ b/browser/chrome/browser/devtools/netmonitor.dtd
@@ -172,24 +172,34 @@
 <!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrl): This is the label displayed
   -  on the context menu that copies the selected request's url -->
 <!ENTITY netmonitorUI.context.copyUrl      "Copiar URL">
 
 <!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrl.accesskey): This is the access key
   -  for the Copy URL menu item displayed in the context menu for a request -->
 <!ENTITY netmonitorUI.context.copyUrl.accesskey  "C">
 
-<!-- LOCALIZATION NOTE (debuggerUI.summary.resend): This is the label displayed
-  -  on the button in the headers tab that opens a form to resend the currently
+<!-- LOCALIZATION NOTE (debuggerUI.summary.editAndResend): This is the label displayed
+  -  on the button in the headers tab that opens a form to edit and resend the currently
      displayed request -->
-<!ENTITY netmonitorUI.summary.resend      "Reenviar">
+<!ENTITY netmonitorUI.summary.editAndResend      "Editar y reenviar">
+
+<!-- LOCALIZATION NOTE (debuggerUI.summary.editAndResend.accesskey): This is the access key
+  -  for the "Edit and Resend" menu item displayed in the context menu for a request -->
+<!ENTITY netmonitorUI.summary.editAndResend.accesskey  "r">
 
-<!-- LOCALIZATION NOTE (debuggerUI.summary.resend.accesskey): This is the access key
-  -  for the Resend menu item displayed in the context menu for a request -->
-<!ENTITY netmonitorUI.summary.resend.accesskey  "R">
+<!-- LOCALIZATION NOTE (netmonitorUI.context.newTab):  This is the label
+  -  for the Open in New Tab menu item displayed in the context menu of the
+  -  network container  -->
+<!ENTITY netmonitorUI.context.newTab      "Abrir en nueva pestaña">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.context.newTab.accesskey): This is the access key
+  -  for the Open in New Tab menu item displayed in the context menu of the
+  -  network container -->
+<!ENTITY netmonitorUI.context.newTab.accesskey  "b">
 
 <!-- LOCALIZATION NOTE (debuggerUI.custom.newRequest): This is the label displayed
   -  as the title of the new custom request form -->
 <!ENTITY netmonitorUI.custom.newRequest   "Nuevo pedido">
 
 <!-- LOCALIZATION NOTE (debuggerUI.custom.query): This is the label displayed
   -  above the query string entry in the custom request form -->
 <!ENTITY netmonitorUI.custom.query        "Cadena de búsqueda:">
--- a/browser/chrome/browser/devtools/profiler.dtd
+++ b/browser/chrome/browser/devtools/profiler.dtd
@@ -5,23 +5,15 @@
 <!-- LOCALIZATION NOTE : FILE This file contains the Profiler strings -->
 
 <!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
   - keep it in English, or another language commonly spoken among web developers.
   - You want to make that choice consistent across the developer tools.
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
 
-<!-- LOCALIZATION NOTE (profilerNew.label): This is the label for the
-  -  button that creates a new profile. -->
-<!ENTITY profilerNew.label "Nuevo">
-
-<!-- LOCALIZATION NOTE (profilerStart.label): This is the label for the
-  -  button that starts the profiler. -->
-<!ENTITY profilerStart.label "Iniciar">
-
-<!-- LOCALIZATION NOTE (profilerStop.label): This is the label for the
-  -  button that stops the profiler. -->
-<!ENTITY profilerStop.label "Detener">
-
 <!-- LOCALIZATION NOTE (profiler.importProfile): This string is displayed
   -  on a button that opens a dialog to import a saved profile data file. -->
 <!ENTITY importProfile.label "Importar…">
+
+<!-- LOCALIZATION NOTE (profiler.startProfiler): This string is displayed
+  -  on a button that starts a new profile  -->
+<!ENTITY startProfiler.tooltip "Comenzar perfilado">
--- a/browser/chrome/browser/devtools/profiler.properties
+++ b/browser/chrome/browser/devtools/profiler.properties
@@ -50,44 +50,29 @@ profiler.runningTime=Tiempo de ejecución
 # As opposed to the total time which is how much time was spent in that
 # function and in functions it called.
 profiler.self=Self
 
 # LOCALIZATION NOTE (profiler.symbolName)
 # This string is displayed as a table header in the profiler UI.
 profiler.symbolName=Nombre de símbolo
 
-# LOCALIZATION NOTE (profiler.startProfiling)
-# This string is displayed around the button that starts the profiler.
-# String argument will be replaced with a Start button.
-profiler.startProfiling=Clic aquí %S para comenzar a perfilar
-
-# LOCALIZATION NOTE (profiler.stopProfiling)
-# This string is displayed around the button that stops the profiler.
-# String argument will be replaced with a Stop button.
-profiler.stopProfiling = Clic aquí %S para dejar de perfilar
-
 # LOCALIZATION NOTE (profiler.start)
 # This string is displayed on the button that starts the profiler.
 profiler.start=Iniciar
 
 # LOCALIZATION NOTE (profiler.stop)
 # This string is displayed on the button that stops the profiler.
 profiler.stop=Detener
 
 # LOCALIZATION NOTE (profiler.loading)
 # This string is displayed above the progress bar when the profiler
 # is busy loading and parsing the report.
 profiler.loading=Cargando perfil…
 
-# LOCALIZATION NOTE (profiler.alreadyRunning)
-# This string is displayed in the profiler whenever there is already
-# another running profile. Users can run only one profile at a time.
-profiler.alreadyRunning=El perfilador ya se está ejecutando. Si desea ejecutar este perfil, detenga el perfil %S primero.
-
 # LOCALIZATION NOTE (profiler.stateIdle)
 # This string is used to show that the profile in question is in IDLE
 # state meaning that it hasn't been started yet.
 profiler.stateIdle=Ocioso
 
 # LOCALIZATION NOTE (profiler.stateRunning)
 # This string is used to show that the profile in question is in RUNNING
 # state meaning that it has been started and currently gathering profile data.
@@ -99,16 +84,26 @@ profiler.stateRunning=Ejecutándose
 profiler.stateCompleted=Completo
 
 # LOCALIZATION NOTE (profiler.sidebarNotice)
 # This string is displayed in the profiler sidebar when there are no
 # existing profiles to show (usually happens when the user opens the
 # profiler for the first time).
 profiler.sidebarNotice=Aún no hay perfiles.
 
+# LOCALIZATION NOTE (profiler.startProfilerString)
+# This string is displayed on the profiler button when no active
+# profiling sessions are running
+profiler.startProfilerString=Comenzar perfilado
+
+# LOCALIZATION NOTE (profiler.stopProfilerString)
+# This string is displayed on the profiler button when an active
+# profiling session is running
+profiler.stopProfilerString=Detener perfilado
+
 # LOCALIZATION NOTE (profiler.save)
 # This string is displayed as a label for a button that opens a Save File
 # dialog where user can save generated profiler to a file.
 profiler.save=Guardar
 
 # LOCALIZATION NOTE (profiler.saveFileAs)
 # This string as a title for a Save File dialog.
 profiler.saveFileAs=Guardar perfil como
--- a/browser/chrome/browser/devtools/responsiveUI.properties
+++ b/browser/chrome/browser/devtools/responsiveUI.properties
@@ -7,18 +7,29 @@
 #
 # 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  (responsiveUI.rotate): label of the rotate button.
-responsiveUI.rotate=rotar
+# LOCALIZATION NOTE  (responsiveUI.rotate2): tooltip of the rotate button.
+responsiveUI.rotate2=Rotar
+
+# LOCALIZATION NOTE  (responsiveUI.screenshot): tooltip of the screenshot button.
+responsiveUI.screenshot=Captura
+
+# LOCALIZATION NOTE (responsiveUI.screenshotGeneratedFilename): The auto generated filename.
+# The first argument (%1$S) is the date string in yyyy-mm-dd format and the second
+# argument (%2$S) is the time string in HH.MM.SS format.
+responsiveUI.screenshotGeneratedFilename=Captura de pantalla %1$S - %2$S
+
+# LOCALIZATION NOTE  (responsiveUI.touch): tooltip of the touch button.
+responsiveUI.touch=Simular eventos táctiles (puede ser necesario recargar la página)
 
 # LOCALIZATION NOTE  (responsiveUI.addPreset): label of the add preset button.
 responsiveUI.addPreset=Add Preset
 
 # LOCALIZATION NOTE  (responsiveUI.removePreset): label of the remove preset button.
 responsiveUI.removePreset=Remove Preset
 
 # LOCALIZATION NOTE  (responsiveUI.customResolution): label of the first item
@@ -36,8 +47,20 @@ responsiveUI.namedResolution=%S (%S)
 responsiveUI.customNamePromptTitle=Vista de diseño adaptable
 
 # LOCALIZATION NOTE (responsiveUI.close): tooltip text of the close button.
 responsiveUI.close=Dejar vista de diseño adaptable
 
 # LOCALIZATION NOTE  (responsiveUI.customNamePromptMsg): prompt message when asking
 # the user to specify a name for a new custom preset.
 responsiveUI.customNamePromptMsg=Give a name to the %Sx%S preset
+
+# LOCALIZATION NOTE (responsiveUI.resizer): tooltip showed when
+# overring the resizers.
+responsiveUI.resizerTooltip=Use la tecla Control para más precisión. Use la tecla Mayúsculas para redondear el tamaǹo.
+
+# LOCALIZATION NOTE (responsiveUI.needReload): notification that appears
+# when touch events are enabled
+responsiveUI.needReload=If touch event listeners have been added earlier, the page needs to be reloaded.
+responsiveUI.notificationReload=Recargar
+responsiveUI.notificationReload_accesskey=R
+responsiveUI.dontShowReloadNotification=No mostrar nuevamente
+responsiveUI.dontShowReloadNotification_accesskey=N
--- a/browser/chrome/browser/devtools/scratchpad.dtd
+++ b/browser/chrome/browser/devtools/scratchpad.dtd
@@ -60,16 +60,19 @@
 <!ENTITY inspect.label                "Inspeccionar">
 <!ENTITY inspect.accesskey            "I">
 <!ENTITY inspect.key                  "i">
 
 <!ENTITY display.label                "Mostrar">
 <!ENTITY display.accesskey            "M">
 <!ENTITY display.key                  "l">
 
+<!ENTITY pprint.label                 "Impresión prolija">
+<!ENTITY pprint.key                   "p">
+
 <!-- LOCALIZATION NOTE (environmentMenu.label, accesskey): This menu item was
   -  renamed from "Context" to avoid confusion with the right-click context
   -  menu in the text area. It refers to the JavaScript Environment (or context)
   -  the user is evaluating against. I.e., Content (current tab) or Chrome
   -  (browser).
   -->
 <!ENTITY environmentMenu.label        "Entorno">
 <!ENTITY environmentMenu.accesskey    "n">
--- a/browser/chrome/browser/devtools/styleinspector.properties
+++ b/browser/chrome/browser/devtools/styleinspector.properties
@@ -30,16 +30,24 @@ rule.sourceInline=interno
 rule.sourceElement=elemento
 
 # LOCALIZATION NOTE (rule.inheritedFrom): Shown for CSS rules
 # that were inherited from a parent node. Will be passed a node
 # identifier of the parent node.
 # e.g "Inherited from body#bodyID"
 rule.inheritedFrom=Heredada de %S
 
+# LOCALIZATION NOTE (rule.pseudoElement): Shown for CSS rules
+# pseudo element header
+rule.pseudoElement=Pseudo-elementos
+
+# LOCALIZATION NOTE (rule.pseudoElement): Shown for CSS rules
+# pseudo element header
+rule.selectedElement=Este elemento
+
 # LOCALIZATION NOTE (helpLinkTitle): For each style property
 # the user can hover it and get a help link button which allows one to
 # quickly jump to the documentation from the Mozilla Developer Network site.
 # This is the link title shown in the hover tooltip.
 helpLinkTitle=Lea la documentación de esta propiedad
 
 # LOCALIZATION NOTE (rule.warning.title): When an invalid property value is
 # entered into the rule view a warning icon is displayed. This text is used for
--- a/browser/chrome/browser/devtools/toolbox.properties
+++ b/browser/chrome/browser/devtools/toolbox.properties
@@ -39,8 +39,18 @@ toolbox.defaultTitle=Herramientas de des
 # for the optiosn panel tab.
 optionsButton.tooltip=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
+# Needs to match scratchpad.keycode from browser.dtd
+scratchpad.keycode=VK_F4
+
+# LOCALIZATION NOTE (browserConsoleCmd.commandkey)
+# Used for toggling the browser console from the detached toolbox window
+# Needs to match browserConsoleCmd.commandkey from browser.dtd
+browserConsoleCmd.commandkey=j
--- a/browser/chrome/browser/devtools/webConsole.dtd
+++ b/browser/chrome/browser/devtools/webConsole.dtd
@@ -63,26 +63,25 @@
 <!ENTITY btnPageSecurity.accesskey "S">
 
 <!-- LOCALIZATION NOTE (btnPageLogging): This is used as the text of the
   -  the toolbar. It shows or hides messages that the web developer inserted on
   -  the page for debugging purposes, using calls such console.log() and
   -  console.error(). -->
 <!ENTITY btnPageLogging.label   "Registro">
 <!ENTITY btnPageLogging.tooltip "Registrar mensajes enviados al objeto window.console">
-<!ENTITY btnPageLogging.accesskey "e">
+<!ENTITY btnPageLogging.accesskey2 "R">
 <!ENTITY btnConsoleErrors       "Errores">
 <!ENTITY btnConsoleInfo         "Información">
 <!ENTITY btnConsoleWarnings     "Advertencias">
 <!ENTITY btnConsoleLog          "Registro">
 
 <!ENTITY filterOutput.placeholder "Salida del filtro">
 <!ENTITY btnClear.label        "Limpiar">
 <!ENTITY btnClear.tooltip      "Limpiar la salida de la consola web">
-<!ENTITY btnClear.accesskey    "r">
 
 <!ENTITY fullZoomEnlargeCmd.commandkey  "+">
 <!ENTITY fullZoomEnlargeCmd.commandkey2 "="> <!-- + is above this key on many keyboards -->
 <!ENTITY fullZoomEnlargeCmd.commandkey3 "">
 
 <!ENTITY fullZoomReduceCmd.commandkey   "-">
 <!ENTITY fullZoomReduceCmd.commandkey2  "">
 
@@ -90,8 +89,9 @@
 <!ENTITY fullZoomResetCmd.commandkey2   "">
 
 <!ENTITY copyURLCmd.label     "Copiar dirección del enlace">
 <!ENTITY copyURLCmd.accesskey "a">
 
 <!ENTITY closeCmd.key         "W">
 <!ENTITY findCmd.key          "F">
 <!ENTITY clearOutputCmd.key   "K">
+<!ENTITY clearOutputCtrl.key  "L">
--- a/browser/chrome/browser/devtools/webconsole.properties
+++ b/browser/chrome/browser/devtools/webconsole.properties
@@ -74,16 +74,20 @@ ConsoleAPIDisabled=La API de registro de la consola web (console.log, console.info, console.warn, console.error) ha sido deshabilitada por un script en esta página.
 # the correct direction.
 webConsoleWindowTitleAndURL=Consola web - %S
 
 # LOCALIZATION NOTE (webConsoleMixedContentWarning): Message displayed after a
 # URL in the Web Console that has been flagged for Mixed Content (i.e. http
 # content in an https page)
 webConsoleMixedContentWarning=Contenido mezclado
 
+# LOCALIZATION NOTE (webConsoleMoreInfoLabel): the more info tag displayed
+# after security related web console messages.
+webConsoleMoreInfoLabel=Conocer más
+
 # LOCALIZATION NOTE (scratchpad.linkText):
 # The text used in the right hand side of the web console command line when
 # Javascript is being entered, to indicate how to jump into scratchpad mode
 scratchpad.linkText=May+ENTER - Abrir en borrador
 
 # LOCALIZATION NOTE (gcliterm.instanceLabel): The console displays
 # objects using their type (from the constructor function) in this descriptive
 # string
--- a/browser/chrome/browser/feeds/subscribe.properties
+++ b/browser/chrome/browser/feeds/subscribe.properties
@@ -44,11 +44,9 @@ feedSubscriptionVideoPodcast1=Este es un
 feedSubscriptionFeed2=Puede suscribirse a este canal para recibir actualizaciones cuando este contenido cambie.
 feedSubscriptionAudioPodcast2=Puede suscribirse a este podcast para recibir actualizaciones cuando este contenido cambie.
 feedSubscriptionVideoPodcast2=Puede suscribirse a este podcast de video para recibir actualizaciones cuando este contenido cambie.
 
 # Protocol Handling
 # "Add %appName (%appDomain) as an application for %protocolType links?"
 addProtocolHandler=¿Agregar %S (%S) como una aplicación para los enlaces de %S?
 addProtocolHandlerAddButton=Agregar aplicación
-# "%appName has already been added as an application for %protocolType links."
-protocolHandlerRegistered=%S ya ha sido agregado como una aplicación para los enlaces de %S.
 
--- a/dom/chrome/accessibility/AccessFu.properties
+++ b/dom/chrome/accessibility/AccessFu.properties
@@ -77,16 +77,22 @@ headingLevel   =       nivel de encabeza
 
 # more sophisticated list announcement
 listStart      =       Primer ítem
 listEnd        =       Último ítem
 # LOCALIZATION NOTE (listItemsCount): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 listItemsCount =       1 ítem;#1 ítems
 
+# LOCALIZATION NOTE: %1$S is the item's role name (e.g. "tab"),
+# %2$S is the position of the item n the set.
+# %3$S is the total number of such items in the set.
+# An expanded example would read "tab 2 of 5".
+objItemOf      =       %1$S %2$S de %3$S
+
 # Landmark announcements
 banner         =       banner
 complementary  =       complementario
 contentinfo    =       info de contenido
 main           =       principal
 navigation     =       navegación
 search         =       búsqueda
 
@@ -118,32 +124,37 @@ openAction     =      abierto
 closeAction    =      cerrado
 switchAction   =      switched
 clickAction    =      clicked
 collapseAction =      colapsado
 expandAction   =      expandido
 activateAction =      activado
 cycleAction    =      cycled
 
+# Live regions
+# 'hidden' will be spoken when something disappears in a live region.
+hidden         =      oculto
+
 # Tab states
 tabLoading     =      cargando
 tabLoaded      =      cargada
 tabNew         =      nueva pestaña
 tabLoadStopped =      carga detenida
 tabReload      =      recargando
 
 # Object states
 stateChecked     =    checked
 stateNotChecked  =    not checked
 stateExpanded    =    expandido
 stateCollapsed   =    colapsado
 stateUnavailable =    no disponible
 stateRequired    =    requerido
 stateTraversed   =    visitado
 stateHasPopup    =    tiene emergente
+stateSelected    =    seleccionado
 
 # App modes
 editingMode    =      editando
 navigationMode =      navegando
 
 # Quick navigation modes
 quicknav_Simple      = Default
 quicknav_Anchor      = Anchors
--- a/dom/chrome/appstrings.properties
+++ b/dom/chrome/appstrings.properties
@@ -28,8 +28,10 @@ externalProtocolPrompt=Una aplicación externa debe iniciarse para manejar %1$S: enlaces. Enalce pedido:\n\n\n%2$S\nAplicación: %3$S\n\n\nSi no está solicitando este pedido, puede ser un intento de explotar una debilidad de aquel programa. Cancele este pedido a menos que esté seguro que no es malicioso.\n
 externalProtocolUnknown=<Desconocido>
 externalProtocolChkMsg=Recordar para todos los enlaces de este tipo.
 externalProtocolLaunchBtn=Iniciar aplicación
 malwareBlocked=El sitio web %S ha sido reportado como un sitio de ataque y fue bloqueado basado en sus preferencias de seguridad.
 phishingBlocked=El sitio web %S ha sido reportado como un sitio fraudulento diseñado para engañar usuarios para que compartan información personal o financiera.
 cspFrameAncestorBlocked=Esta página tiene una política de seguridad de contenido que evita que sea incrustada de esta forma.
 corruptedContentError=La página que está tratando de ver no puede mostrarse porque se detectó un error en la transmisión de los datos.
 remoteXUL=Esta página usa una tecnología no soportada que ya no está disponible por defecto.
+#LOCALIZATION NOTE (tabcrashed): The following string is shown in the tab title if a page with a blank title has crashed. Current UX says that the tab title should remain blank
+tabcrashed=
--- a/dom/chrome/dom/dom.properties
+++ b/dom/chrome/dom/dom.properties
@@ -130,8 +130,10 @@ MozAudioDataWarning=Mozilla Audio Data A
 # LOCALIZATION NOTE: Do not translate "LenientThis" and "this"
 LenientThisWarning=Ignorando get o set de la propiedad que tiene [LenientThis] porque el objeto "this" es incorrecto.
 # LOCALIZATION NOTE: Do not translate "nsIDOMWindowUtils", "getWindowWithOuterId", or "nsIWindowMediator"
 GetWindowWithOuterIdWarning=El uso de nsIDOMWindowUtils.getOuterWindowWithId() es obsoleto.  En su lugar use el método nsIWindowMediator del mismo nombre.
 # LOCALIZATION NOTE: Do not translate "getPreventDefault" or "defaultPrevented".
 GetPreventDefaultWarning=El uso de getPreventDefault() es obsoleto.  Use defaultPrevented en su lugar.
 # LOCALIZATION NOTE: Do not translate "getUserData", "setUserData", "WeakMap", or "element.dataset".
 GetSetUserDataWarning=El uso de getUserData() o setUserData() es obsoleto.  Use WeakMap o element.dataset en su lugar.
+# LOCALIZATION NOTE: Do not translate "mozGetAsFile" or "toBlob"
+MozGetAsFileWarning=El método no estándar mozGetAsFile es obsoleto y pronto será eliminado.  Use el método estándar toBlob en su lugar.
--- a/dom/chrome/layout/HtmlForm.properties
+++ b/dom/chrome/layout/HtmlForm.properties
@@ -23,8 +23,16 @@ NoFileSelected=No se seleccionó un archivo.
 # LOCALIZATION NOTE (NoFilesSelected): this string is shown on a
 # <input type='file' multiple> when there is no file selected yet.
 NoFilesSelected=No se seleccionaron archivos.
 # LOCALIZATION NOTE (XFilesSelected): this string is shown on a
 # <input type='file' multiple> when there are more than one selected file.
 # %S will be a number greater or equal to 2.
 XFilesSelected=%S archivos seleccionados.
 ColorPicker=Seleccione un color
+# LOCALIZATION NOTE (AndNMoreFiles): Semi-colon list of plural forms. 
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals 
+# This string is shown at the end of the tooltip text for <input type='file'
+# multiple> when there are more than 21 files selected (when we will only list
+# the first 20, plus an "and X more" line). #1 represents the number of files
+# minus 20 and will always be a number equal to or greater than 2. So the
+# singular case will never be used.
+AndNMoreFiles=y uno más;y #1 más
--- a/dom/chrome/layout/MediaDocument.properties
+++ b/dom/chrome/layout/MediaDocument.properties
@@ -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/.
 
-#LOCALIZATION NOTE (ImageTitleWithDimensionsAndFile): first %S is filename, second %S is type, third %S is width and fourth %S is height
+#LOCALIZATION NOTE (ImageTitleWithDimensions2AndFile): first %S is filename, second %S is type, third %S is width and fourth %S is height
 #LOCALIZATION NOTE (ImageTitleWithoutDimensions): first %S is filename, second %S is type
-#LOCALIZATION NOTE (ImageTitleWithDimensions): first %S is type, second %S is width and third %S is height
+#LOCALIZATION NOTE (ImageTitleWithDimensions2): first %S is type, second %S is width and third %S is height
 #LOCALIZATION NOTE (ImageTitleWithNeitherDimensionsNorFile): first %S is type
 #LOCALIZATION NOTE (MediaTitleWithFile): first %S is filename, second %S is type
 #LOCALIZATION NOTE (MediaTitleWithNoInfo): first %S is type
-ImageTitleWithDimensionsAndFile=%S (Imagen %S, %Sx%S pixels)
+ImageTitleWithDimensions2AndFile=%S (Imagen %S, %S\u00A0\u00D7\u00A0%S pixels)
 ImageTitleWithoutDimensions=%S (Imagen %S)
-ImageTitleWithDimensions=(Imagen %S, %Sx%S pixels)
+ImageTitleWithDimensions2=(Imagen %S, %S\u00A0\u00D7\u00A0%S pixels)
 ImageTitleWithNeitherDimensionsNorFile=(Imagen %S)
 MediaTitleWithFile=%S (Objeto %S)
 MediaTitleWithNoInfo=(Objeto %S)
 
 InvalidImage=La imagen \u201C%S\u201D no puede mostrarse, porque contiene errores.
 ScaledImage=Escala (%S%%)
 
 TitleWithStatus=%S - %S
--- a/dom/chrome/mathml/mathml.properties
+++ b/dom/chrome/mathml/mathml.properties
@@ -1,12 +1,13 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+InvalidChild=Invalid markup: <%1$S> is not allowed as a child of <%2$S>.
 ChildCountIncorrect=Invalid markup: Incorrect number of children for <%1$S/> tag.
 DuplicateMprescripts=Invalid markup: More than one <mprescripts/> in <mmultiscripts/>.
 # LOCALIZATION NOTE:  The first child of <mmultiscript/> is the base, that is the element to which scripts are attached.
 NoBase=Invalid markup: Expected exactly one Base element in <mmultiscripts/>.  Found none.
 SubSupMismatch=Invalid markup: Incomplete subscript/superscript pair in <mmultiscripts/>.
 
 # LOCALIZATION NOTE:  When localizing the single quotes ('), follow the conventions in css.properties for your target locale.
 AttributeParsingError=Error al leer el valor '%1$S' para el atributo '%2$S' de <%3$S/>.  Atributo ignorado.
--- a/dom/chrome/security/csp.properties
+++ b/dom/chrome/security/csp.properties
@@ -1,44 +1,42 @@
 # 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/.
 
 # CSP Warnings:
-# LOCALIZATION NOTE (directiveViolated):
-# %1$S is the directive that has been violated.
-directiveViolated = Directiva %1$S violada
-# LOCALIZATION NOTE (directiveViolatedWithURI):
+# LOCALIZATION NOTE (CSPViolation):
+# %1$S is the reason why the resource has not been loaded.
+CSPViolation = La configuración de la página bloqueó la carga de un recurso: %1$S
+# LOCALIZATION NOTE (CSPViolationWithURI):
 # %1$S is the directive that has been violated.
 # %2$S is the URI of the resource which violated the directive.
-directiveViolatedWithURI = Directiva %1$S violada por %2$S
+CSPViolationWithURI = La configuración de la página bloqueó la carga de un recurso en %2$S ("%1$S").
 # LOCALIZATION NOTE (triedToSendReport):
 # %1$S is the URI we attempted to send a report to.
 triedToSendReport = Se trató de enviar informe a URI inválido: "%1$S"
 # LOCALIZATION NOTE (errorWas):
 # %1$S is the error resulting from attempting to send the report
 errorWas = el error fue: "%1$S"
 # LOCALIZATION NOTE (couldNotParseReportURI):
 # %1$S is the report URI that could not be parsed
 couldNotParseReportURI = couldn't parse report URI: %1$S
 # LOCALIZATION NOTE (couldNotProcessUnknownDirective):
 # %1$S is the unknown directive
 couldNotProcessUnknownDirective = No se puede procesar directiva desconocida '%1$S'
-# LOCALIZATION NOTE (doNotUnderstandOption):
+# LOCALIZATION NOTE (ignoringUnknownOption):
 # %1$S is the option that could not be understood
-doNotUnderstandOption = no se entiende la opción '%1$S'.  Se ingnora.
-# LOCALIZATION NOTE (notETLDPlus1):
+ignoringUnknownOption = Ignorando opción desconocida %1$S
+# LOCALIZATION NOTE (reportURInotETLDPlus1):
 # %1$S is the ETLD of the report URI that could not be used
-notETLDPlus1 = can't use report URI from non-matching eTLD+1: %1$S
-# LOCALIZATION NOTE (notSameScheme):
+reportURInotETLDPlus1 = The report URI (%1$S) must be from the same eTLD+1.
+# LOCALIZATION NOTE (reportURInotSameSchemeAsSelf, reportURInotSamePortAsSelf):
 # %1$S is the report URI that could not be used
-notSameScheme = can't use report URI with different scheme from originating document: %1$S
-# LOCALIZATION NOTE (notSamePort):
-# %1$S is the report URI that could not be used
-notSamePort = can't use report URI with different port from originating document: %1$S
+reportURInotSameSchemeAsSelf = The report URI (%1$S) must use the same scheme as the originating document.
+reportURInotSamePortAsSelf = The report URI (%1$S) must use the same port as the originating document.
 # LOCALIZATION NOTE (pageCannotSendReportsTo):
 # %1$S is the URI of the page with the policy
 # %2$S is the report URI that could not be used
 pageCannotSendReportsTo = la página en %1$S no puede enviar informes a %2$S
 allowOrDefaultSrcRequired = directiva 'allow' o 'default-src' requerida pero no está presente.  Revirtiendo a "default-src 'none'"
 # LOCALIZATION NOTE (failedToParseUnrecognizedSource):
 # %1$S is the CSP Source that could not be parsed
 failedToParseUnrecognizedSource = Failed to parse unrecoginzied source %1$S
--- a/dom/chrome/security/security.properties
+++ b/dom/chrome/security/security.properties
@@ -6,9 +6,13 @@ BlockMixedActiveContent = Blocked loadin
 # CSP
 ReportOnlyCSPIgnored=Report-only CSP policy will be ignored because there are other non-report-only CSP policies applied.
 # LOCALIZATION NOTE: Do not translate "X-Content-Security-Policy", "X-Content-Security-Policy-Report-Only",  "Content-Security-Policy" or "Content-Security-Policy-Report-Only"
 OldCSPHeaderDeprecated=The X-Content-Security-Policy and X-Content-Security-Report-Only headers will be deprecated in the future. Please use the Content-Security-Policy and Content-Security-Report-Only headers with CSP spec compliant syntax instead.
 # LOCALIZATION NOTE: Do not translate "X-Content-Security-Policy/Report-Only" or "Content-Security-Policy/Report-Only"
 BothCSPHeadersPresent=This site specified both an X-Content-Security-Policy/Report-Only header and a Content-Security-Policy/Report-Only header. The X-Content-Security-Policy/Report-Only header(s) will be ignored.
 # LOCALIZATION NOTE: Do not translate "Strict-Transport-Security" or "HSTS"
 InvalidSTSHeaders=The site specified an invalid Strict-Transport-Security header.
-
+InsecurePasswordsPresentOnPage=Hay campos de contraseña en una página insegura (http://). Ésto es un riesgo de seguridad que permite que las credenciales de ingreso de un usuario puedan ser robadas.
+InsecureFormActionPasswordsPresent=Hay campos de contraseña presentes en un formulario con una acción insegura (http://). Ésto es un riesgo de seguridad que permite que las credenciales de ingreso de un usuario puedan ser robadas.
+InsecurePasswordsPresentOnIframe=Hay campos de contraseña en un iframe inseguro (http://). Ésto es un riesgo de seguridad que permite que las credenciales de ingreso de un usuario puedan ser robadas.
+LoadingMixedActiveContent=Cargando contenido activo mixto (inseguro) en una página segura "%1$S"
+LoadingMixedDisplayContent=Loading mixed (insecure) display content on a secure page "%1$S"
--- a/mobile/android/chrome/aboutAddons.dtd
+++ b/mobile/android/chrome/aboutAddons.dtd
@@ -1,13 +1,14 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY aboutAddons.title2                     "Complementos">
 <!ENTITY aboutAddons.header2                    "Tus complementos">
 <!ENTITY aboutAddons.options                    "Opciones">
+<!ENTITY aboutAddons.browseAll                  "Navegar todos los complementos de Firefox">
 
 <!ENTITY addonAction.enable                     "Habilitar">
 <!ENTITY addonAction.disable                    "Deshabilitar">
 <!ENTITY addonAction.uninstall                  "Desinstalar">
 <!ENTITY addonAction.undo                       "Deshacer">
-<!ENTITY addonAction.setDefault                 "Hacer predeterminado">
+
--- a/mobile/android/chrome/aboutAddons.properties
+++ b/mobile/android/chrome/aboutAddons.properties
@@ -1,14 +1,11 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-addonsSearchEngine.description=Búsqueda integrada
-
 addonType.extension=Extensión
 addonType.theme=Tema
 addonType.locale=Idioma
-addonType.search=Buscador
 
 addonStatus.uninstalled=%S se desinstalará después de reiniciar.
 
 addons.browseAll=Navegar todos los complementos de Firefox
--- a/mobile/android/chrome/browser.properties
+++ b/mobile/android/chrome/browser.properties
@@ -284,8 +284,10 @@ getUserMedia.audioDevice.prompt = Micrófono a usar
 getUserMedia.sharingCamera.message2 = La cámara está encendida
 getUserMedia.sharingMicrophone.message2 = El micrófono está encendido
 getUserMedia.sharingCameraAndMicrophone.message2 = La cámara y el micrófono están encendidos
 
 #Reader mode
 readerMode.enter = Entrar en modo lector
 readerMode.exit = Salir de modo lector
 
+#Open in App
+openInApp.pageAction = Abrir en App
--- a/mobile/profile/bookmarks.inc
+++ b/mobile/profile/bookmarks.inc
@@ -18,13 +18,9 @@
 # LOCALIZATION NOTE (bookmarks_addons):
 # link title for https://addons.mozilla.org/en-US/mobile
 #define bookmarks_addons Firefox: Personalizar con complementos
 
 # LOCALIZATION NOTE (bookmarks_support):
 # link title for https://mobile.support.mozilla.com
 #define bookmarks_support Firefox: Soporte
 
-# LOCALIZATION NOTE (bookmarks_aboutHome):
-# link title for about:home
-#define bookmarks_aboutHome Inicio de Firefox
-
 #unfilter emptyLines
--- a/security/manager/chrome/pippki/pippki.properties
+++ b/security/manager/chrome/pippki/pippki.properties
@@ -8,17 +8,16 @@ CertPassPrompt=Por favor ingrese la contraseña Personal de Seguridad para el dispositivo de seguridad de claves privadas del Administrador Personal de Seguridad.
 #These are for dialogs
 #Download Cert dialog
 newCAMessage1=¿Desea confiar en "%S" para los siguientes propósitos?
 unnamedCA=Autoridad de Certificación (sin nombre)
 
 #For editing cert trust
 editTrustWindowTitle=Modificar confianza en el certificado
 editTrustCA=El certificado "%S" representa a una Autoridad de Certificación
-editTrustSSL=El certificado "%S" fue expedido por:
 editTrustEmail=El certificado "%S" fue expedido por:
 issuerNotTrusted=Debido a que usted no confía en la Autoridad de Certificación que expidió este certificado, usted no confiará en la autenticidad de este certificado a menos de lo que se indique aquí.
 issuerTrusted=Debido a que usted confia en la Autoridad de Certificación que expidió este certificado, usted confía en la autenticidad de este certificado a menos que lo indique de otra manera aquí
 issuerNotKnown=Debido a que no se conoce la Autoridad de Certificación que expidió este certificado, usted no confia en la autenticidad de este certificado a menos que lo que se indique aquí.
 issuerCertNotFound=El certificado de esta Autoridad de Certificación no ha sido encontrado.
 
 #For Deleting Certificates
 deleteSslCertConfirm3=¿Está seguro de querer eliminar las excepciones de estos servidores?
--- a/webapprt/webapprt/webapp.dtd
+++ b/webapprt/webapprt/webapp.dtd
@@ -13,22 +13,24 @@
 
 <!ENTITY quitApplicationCmdWin.label        "Salir">
 <!ENTITY quitApplicationCmdWin.accesskey    "S">
 <!ENTITY quitApplicationCmd.label           "Salir">
 <!ENTITY quitApplicationCmd.accesskey       "S">
 <!-- On Mac, we create the Quit and Hide command labels dynamically,
    - using properties in window.properties, in order to include the name
    - of the webapp in the labels without creating a DTD file for it. -->
-<!ENTITY quitApplicationCmdMac.key          "Q">
 <!ENTITY hideThisAppCmdMac.key              "H">
 <!ENTITY hideOtherAppsCmdMac.label          "Ocultar otros">
 <!ENTITY hideOtherAppsCmdMac.key            "H">
 <!ENTITY showAllAppsCmdMac.label            "Mostrar todo">
 
+<!-- LOCALIZATION NOTE(quitApplicationCmdUnix.key): This keyboard shortcut is used by both Linux and OSX -->
+<!ENTITY quitApplicationCmdUnix.key          "Q">
+
 <!ENTITY editMenu.label                     "Editar">
 <!ENTITY editMenu.accesskey                 "E">
 <!ENTITY undoCmd.label                      "Deshacer">
 <!ENTITY undoCmd.key                        "Z">
 <!ENTITY undoCmd.accesskey                  "D">
 <!ENTITY redoCmd.label                      "Rehacer">
 <!ENTITY redoCmd.key                        "Y">
 <!ENTITY redoCmd.accesskey                  "R">
--- a/webapprt/webapprt/webapp.properties
+++ b/webapprt/webapprt/webapp.properties
@@ -15,20 +15,28 @@ quitApplicationCmdMac.label=Salir de %S
 # LOCALIZATION NOTE (hideApplicationCmdMac.label): %S will be replaced with
 # the name of the webapp.
 hideApplicationCmdMac.label=Ocultar %S
 
 # LOCALIZATION NOTE (geolocation.title): %S will be replaced with the name of
 # the webapp.
 geolocation.title=%S - Compartir ubicación
 geolocation.description=¿Desea compartir su ubicación?
-geolocation.sharelocation=Compartir ubicación
-geolocation.dontshare=No compartir
+geolocation.allow=Compartir ubicación
+geolocation.deny=No compartir
 geolocation.remember=Recordar mi selección
 
+# LOCALIZATION NOTE (desktop-notification.title): %S will be replaced with the
+# name of the webapp.
+desktop-notification.title=%S - Mostrar notificaciones
+desktop-notification.description=¿Desea permitir notificaciones?
+desktop-notification.allow=Mostrar
+desktop-notification.deny=No mostrar
+desktop-notification.remember=Recordar mi decisión
+
 # LOCALIZATION NOTE (webapps.install.title): %S will be replaced with the name
 # of the webapp being installed.
 webapps.install.title=Instalar %S
 # LOCALIZATION NOTE (webapps.install.description): %S will be replaced with the
 # name of the webapp being installed.
 webapps.install.description=¿Desea instalar %S?
 webapps.install.install=Instalar splicación
 webapps.install.dontinstall=No instalar