Migrating central to aurora for Firefox 34
authorMarcelo Poli <mpoli@lt24.zzn.com>
Mon, 08 Sep 2014 17:14:01 -0300
changeset 1819 8c0d5b1379f6ff6f57904ec8a2880fbb55909a62
parent 1792 f9afeb177a145ce9d78013f7c9c64a6744a98053
child 1820 823b4bf6eecbcf61da438facf85ae80c6c809065
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:47:06 +0000
Migrating central to aurora for Firefox 34
browser/chrome/browser/aboutCertError.dtd
browser/chrome/browser/aboutDialog.dtd
browser/chrome/browser/aboutPrivateBrowsing.dtd
browser/chrome/browser/customizableui/customizableWidgets.properties
browser/chrome/browser/devtools/profiler.dtd
browser/chrome/browser/devtools/profiler.properties
browser/chrome/browser/devtools/projecteditor.properties
browser/chrome/browser/devtools/scratchpad.properties
browser/chrome/browser/devtools/toolbox.dtd
browser/chrome/browser/devtools/toolbox.properties
browser/chrome/browser/devtools/webconsole.properties
browser/chrome/browser/devtools/webide.dtd
browser/chrome/browser/devtools/webide.properties
browser/chrome/browser/lightweightThemes.properties
browser/chrome/browser/loop/loop.properties
browser/chrome/browser/newTab.dtd
browser/chrome/browser/newTab.properties
browser/chrome/browser/preferences/fonts.dtd
browser/chrome/browser/preferences/main.dtd
browser/chrome/browser/preferences/preferences.properties
browser/chrome/browser/preferences/privacy.dtd
browser/chrome/browser/quitDialog.properties
browser/chrome/browser/shellservice.properties
browser/chrome/browser/webrtcIndicator.properties
dom/chrome/accessibility/AccessFu.properties
dom/chrome/security/csp.properties
mobile/android/base/sync_strings.dtd
mobile/android/chrome/browser.properties
security/manager/chrome/pipnss/nsserrors.properties
security/manager/chrome/pippki/pippki.dtd
toolkit/chrome/global/aboutSupport.properties
toolkit/chrome/global/actions.dtd
webapprt/webapprt/downloads/downloads.dtd
webapprt/webapprt/webapp.properties
--- a/browser/chrome/browser/aboutCertError.dtd
+++ b/browser/chrome/browser/aboutCertError.dtd
@@ -21,16 +21,20 @@ forma segura a <b>#1</b>, pero no podemos confirmar que su conexión sea segura.">
 <!ENTITY certerror.introPara2 "Normalmente, cuando se trata de conectar de forma segura,
 los sitios presentan un identificación confiable para probar que está
 dirigiéndose al lugar correcto. Sin embargo, la identidad de este sitio no puede verificarse.">
 
 <!ENTITY certerror.whatShouldIDo.heading "¿Qué debería hacer?">
 <!ENTITY certerror.whatShouldIDo.content "Si usualmente se conecta a 
 este sitio sin problemas, este error podría significar que alguien está
 tratando de imitar ese sitio y no debería continuar.">
+<!ENTITY certerror.whatShouldIDo.badStsCertExplanation "Este sitio usa HTTP
+Strict Transport Security (HSTS) para especificar que &brandShortName; solamente se conecte
+de forma segura. Como resultado, no se puede agregar una excepción para este
+certificado.">
 <!ENTITY certerror.getMeOutOfHere.label "¡Sáquenme de aquí!">
 
 <!ENTITY certerror.expert.heading "Comprendo los riesgos">
 <!ENTITY certerror.expert.content "Si entiende lo que está pasando, puede
 decirle a &brandShortName; que comience a confiar en la identificación de este sitio.
 <b>Aunque confíe en el sitio, este error podría significar que alguien está
 alterando su conexión.</b>">
 <!ENTITY certerror.expert.contentPara2 "No agregue una excepción a menos que
--- a/browser/chrome/browser/aboutDialog.dtd
+++ b/browser/chrome/browser/aboutDialog.dtd
@@ -6,17 +6,17 @@
 
 <!-- LOCALIZATION NOTE (update.checkForUpdatesButton.*, update.updateButton.*, update.applyButtonBillboard.*):
 # Only one button is present at a time.
 # The button when displayed is located directly under the Firefox version in
 # the about dialog (see bug 596813 for screenshots).
 -->
 <!ENTITY update.checkForUpdatesButton.label       "Buscar actualizaciones">
 <!ENTITY update.checkForUpdatesButton.accesskey   "c">
-<!ENTITY update.updateButton.label                "Reiniciar para actualizar">
+<!ENTITY update.updateButton.label2                "Reiniciar &brandShortName; para actualizar">
 <!ENTITY update.updateButton.accesskey            "R">
 <!ENTITY update.applyButtonBillboard.label        "Aplicar actualización…">
 <!ENTITY update.applyButtonBillboard.accesskey    "A">
 
 
 <!-- LOCALIZATION NOTE (warningDesc.version): This is a warning about the experimental nature of Nightly and Aurora builds. It is only shown in those versions. -->
 <!ENTITY warningDesc.version        "&brandShortName; es experimental y puede ser inestable.">
 <!-- LOCALIZATION NOTE (warningDesc.telemetryDesc): This is a notification that Nightly/Aurora builds automatically send Telemetry data back to Mozilla. It is only shown in those versions. "It" refers to brandShortName. -->
--- a/browser/chrome/browser/aboutPrivateBrowsing.dtd
+++ b/browser/chrome/browser/aboutPrivateBrowsing.dtd
@@ -1,26 +1,24 @@
 <!-- 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 privatebrowsingpage.title                  "Navegación privada">
-<!ENTITY privatebrowsingpage.title.normal          "¿Desea comenzar la navegación privada?">
+<!ENTITY aboutPrivateBrowsing.title            "Está navegando de forma privada">
+<!ENTITY aboutPrivateBrowsing.title.normal     "¿Abrir una ventana privada?">
+
+<!ENTITY aboutPrivateBrowsing.subtitle         "&brandShortName; no recordará ningún historial para esta ventana.">
+<!ENTITY aboutPrivateBrowsing.subtitle.normal  "&brandShortName; no recordará ningún historial para ventanas privadas.">
 
-<!ENTITY privatebrowsingpage.perwindow.issueDesc        "&brandShortName; no recordará ningún historial para esta ventana.">
-<!ENTITY privatebrowsingpage.perwindow.issueDesc.normal "Actualmente no está en una ventana privada.">
+<!ENTITY aboutPrivateBrowsing.description      "Ésto incluye el historial de navegación, búsqueda, descargas, formularios, cookies y archivos temporales de internet. Sin embargo, los archivos que descargue o los marcadores que cree serán preservados.">
 
-<!ENTITY privatebrowsingpage.perwindow.description     "En una ventana de navegación privada, &brandShortName; no guardará el historial de navegación, búsqueda, descargas, formularios, cookies o archivos temporales de internet.  Sin embargo, los archivos que descargue o los marcadores que cree serán preservados.">
+<!ENTITY aboutPrivateBrowsing.notPrivate       "Actualmente no está en una ventana privada.">
+
+<!ENTITY aboutPrivateBrowsing.moreInfo         "Aunque esta computadora no tenga un registro de su historial de navegación, su empleador o su proveedor de internet aún pueden rastrear las páginas que visite.">
+<!ENTITY aboutPrivateBrowsing.learnMore        "Conocer más.">
 
 <!ENTITY privatebrowsingpage.openPrivateWindow.label "Abrir una ventana privada">
 <!ENTITY privatebrowsingpage.openPrivateWindow.accesskey "p">
 
-<!-- LOCALIZATION NOTE (privatebrowsingpage.howToStart4): please leave &newPrivateWindow.label; intact in the translation -->
-<!ENTITY privatebrowsingpage.howToStart4               "Para comenzar la navegación privada, también puede seleccionar &newPrivateWindow.label; en el menú.">
-<!ENTITY privatebrowsingpage.howToStop3                "Para abandonar la navegación privada puede cerrar esta ventana.">
-
-<!ENTITY privatebrowsingpage.moreInfo                  "Aunque esta computadora no tenga un registro de su historial de navegación, su proveedor de internet aún puede rastrear las páginas que visite.">
-<!ENTITY privatebrowsingpage.learnMore                 "Conocer más">
-
-
 <!-- TO BE REMOVED POST-AUSTRALIS --> 
 <!-- LOCALIZATION NOTE (privatebrowsingpage.howToStart3): please leave &basePBMenu.label; intact in the translation -->
 <!ENTITY privatebrowsingpage.howToStart3               "Para iniciar la navegación privada, también puede seleccionar &basePBMenu.label; &gt; &newPrivateWindow.label;.">
+
--- a/browser/chrome/browser/customizableui/customizableWidgets.properties
+++ b/browser/chrome/browser/customizableui/customizableWidgets.properties
@@ -89,8 +89,11 @@ email-link-button.tooltiptext3 = Enlace a esta página por correo
 
 # LOCALIZATION NOTE(quit-button.tooltiptext.linux2): %1$S is the brand name (e.g. Firefox),
 # %2$S is the keyboard shortcut
 quit-button.tooltiptext.linux2 = Salir de %1$S (%2$S)
 # LOCALIZATION NOTE(quit-button.tooltiptext.mac): %1$S is the brand name (e.g. Firefox),
 # %2$S is the keyboard shortcut
 quit-button.tooltiptext.mac = Salir de %1$S (%2$S)
 
+loop-call-button.label = Invitar a alguien a charlar
+loop-call-button.tooltiptext = Invitar a alguien a charlar
+
--- a/browser/chrome/browser/devtools/profiler.dtd
+++ b/browser/chrome/browser/devtools/profiler.dtd
@@ -1,19 +1,49 @@
 <!-- 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 : FILE This file contains the Profiler strings -->
+<!-- LOCALIZATION NOTE : FILE Do not translate commandkey -->
 
 <!-- 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 (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 (profilerUI.emptyNotice1/2): This is the label shown
+  -  in the call list view when empty. -->
+<!ENTITY profilerUI.emptyNotice1    "Clic en el">
+<!ENTITY profilerUI.emptyNotice2    "botón para iniciar el registro de las llamadas a funciones de JavaScript.">
+
+<!-- LOCALIZATION NOTE (profilerUI.stopNotice1/2): This is the label shown
+  -  in the call list view while recording a profile. -->
+<!ENTITY profilerUI.stopNotice1    "Clic en el">
+<!ENTITY profilerUI.stopNotice2    "botón de nuevo para dejar de perfilar.">
+
+<!-- LOCALIZATION NOTE (profilerUI.loadingNotice): This is the label shown
+  -  in the call list view while loading a profile. -->
+<!ENTITY profilerUI.loadingNotice "Cargando…">
+
+<!-- LOCALIZATION NOTE (profilerUI.recordButton): This string is displayed
+  -  on a button that starts a new profile. -->
+<!ENTITY profilerUI.recordButton.tooltip "Registrar llamadas a funciones de JavaScript.">
 
-<!-- LOCALIZATION NOTE (profiler.startProfiler): This string is displayed
-  -  on a button that starts a new profile  -->
-<!ENTITY startProfiler.tooltip "Comenzar perfilado">
+<!-- LOCALIZATION NOTE (profilerUI.importButton): This string is displayed
+  -  on a button that opens a dialog to import a saved profile data file. -->
+<!ENTITY profilerUI.importButton "Importar…">
+
+<!-- LOCALIZATION NOTE (profilerUI.clearButton): This string is displayed
+  -  on a button that remvoes all the recordings. -->
+<!ENTITY profilerUI.clearButton "Limpiar">
+
+<!-- LOCALIZATION NOTE (profilerUI.table.*): These strings are displayed
+  -  in the call tree headers for a recording. -->
+<!ENTITY profilerUI.table.duration    "Tiempo (ms)">
+<!ENTITY profilerUI.table.percentage  "Costo">
+<!ENTITY profilerUI.table.invocations "Llamadas">
+<!ENTITY profilerUI.table.function    "Función">
+
+<!-- LOCALIZATION NOTE (profilerUI.newtab.tooltiptext): The tooltiptext shown
+  -  on the "+" (new tab) button for a profile when a selection is available. -->
+<!ENTITY profilerUI.newtab.tooltiptext "Agregar una nueva pestañá desde la selección">
--- a/browser/chrome/browser/devtools/profiler.properties
+++ b/browser/chrome/browser/devtools/profiler.properties
@@ -8,110 +8,98 @@
 # 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 (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
+profiler.label2=Rendimiento
 
 # LOCALIZATION NOTE (profiler.panelLabel):
 # This is used as the label for the toolbox panel.
-profiler.panelLabel=Panel del perfilador
+profiler.panelLabel2=Panel de rendimiento
 
 # LOCALIZATION NOTE (profiler2.commandkey, profiler.accesskey)
 # Used for the menuitem in the tool menu
-profiler2.commandkey=VK_F5
+profiler.commandkey2=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.
 profiler.tooltip2=Perfilador de JavaScript
 
-# LOCALIZATION NOTE (profiler.profileName):
-# This string is the default name for new profiles. Its parameter is a number.
-# For example: "Profile 1", "Profile 2", etc.
-profiler.profileName=Perfil %S
+# LOCALIZATION NOTE (noRecordingsText): The text to display in the
+# recordings menu when there are no recorded profiles yet.
+noRecordingsText=Aún no hay perfiles.
 
-# LOCALIZATION NOTE (profiler.completeProfile):
-# This string is displayed as a tab in the profiler UI. Clicking on it
-# displays everything that the profiler has generated so far.
-profiler.completeProfile=Perfil completo
+# LOCALIZATION NOTE (recordingsList.itemLabel):
+# This string is displayed in the recordings list of the Profiler,
+# identifying a set of function calls.
+recordingsList.itemLabel=Grabando #%S
 
-# LOCALIZATION NOTE (profiler.sampleRange):
-# This string is displayed as a tab in the profiler UI. Clicking on it
-# displays a sample range of data selected by user themselves.
-profiler.sampleRange=Rango de ejemplo
-
-# LOCALIZATION NOTE (profiler.runningTime):
-# This string is displayed as a table header in the profiler UI.
-profiler.runningTime=Tiempo de ejecución
+# LOCALIZATION NOTE (recordingsList.recordingLabel):
+# This string is displayed in the recordings list of the Profiler,
+# for an item that has not finished recording.
+recordingsList.recordingLabel=En proceso…
 
-# LOCALIZATION NOTE (profiler.self):
-# This string is displayed as a table header in the profiler UI.
-# "Self" is how much time was spent doing work directly in that function.
-# 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 (recordingsList.durationLabel):
+# This string is displayed in the recordings list of the Profiler,
+# for an item that has finished recording.
+recordingsList.durationLabel=%S ms
 
-# LOCALIZATION NOTE (profiler.symbolName)
-# This string is displayed as a table header in the profiler UI.
-profiler.symbolName=Nombre de símbolo
+# LOCALIZATION NOTE (recordingsList.saveLabel):
+# This string is displayed in the recordings list of the Profiler,
+# for saving an item to disk.
+recordingsList.saveLabel=Guardar
 
-# LOCALIZATION NOTE (profiler.start)
-# This string is displayed on the button that starts the profiler.
-profiler.start=Iniciar
+# LOCALIZATION NOTE (profile.tab):
+# This string is displayed in the profile view for a tab, after the
+# recording has finished, as the recording 'start → stop' range in milliseconds.
+profile.tab=%1$S ms → %2$S ms
 
-# 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 (graphs.fps):
+# This string is displayed in the framerate graph of the Profiler,
+# as the unit used to measure frames per second. This label should be kept
+# AS SHORT AS POSSIBLE so it doesn't obstruct important parts of the graph.
+graphs.fps=fps
 
-# 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.
-profiler.stateRunning=Ejecutándose
+# LOCALIZATION NOTE (category.*):
+# These strings are displayed in the categories graph of the Profiler,
+# as the legend for each block in every bar. These labels should be kept
+# AS SHORT AS POSSIBLE so they don't obstruct important parts of the graph.
+category.other=Gecko
+category.css=Estilos
+category.js=JIT
+category.gc=GC
+category.network=Red
+category.graphics=Gráficos
+category.storage=Almacenamiento
+category.events=Ingreso y eventos
 
-# LOCALIZATION NOTE (profiler.stateCompleted)
-# This string is used to show that the profile in question is in COMPLETED
-# state meaning that it has been started and stopped already.
-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 (table.root):
+# This string is displayed in the call tree for the root node.
+table.root=(raíz)
 
-# 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 (table.url.tooltiptext):
+# This string is displayed in the call tree as the tooltip text for the url
+# labels which, when clicked, jump to the debugger.
+table.url.tooltiptext=Ver fuente en el depurador
 
-# 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 (table.zoom.tooltiptext):
+# This string is displayed in the call tree as the tooltip text for the 'zoom'
+# buttons (small magnifying glass icons) which spawn a new tab.
+table.zoom.tooltiptext=Inspeccionar marco en nueva pestaña
 
-# 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 (recordingsList.saveDialogTitle):
+# This string is displayed as a title for saving a recording to disk.
+recordingsList.saveDialogTitle=Guardar perfil…
 
-# LOCALIZATION NOTE (profiler.saveFileAs)
-# This string as a title for a Save File dialog.
-profiler.saveFileAs=Guardar perfil como
+# LOCALIZATION NOTE (recordingsList.saveDialogJSONFilter):
+# This string is displayed as a filter for saving a recording to disk.
+recordingsList.saveDialogJSONFilter=Archivos JSON
 
-# LOCALIZATION NOTE (profiler.openFile)
-# This string as a title for a Open File dialog.
-profiler.openFile=Importar perfil
+# LOCALIZATION NOTE (recordingsList.saveDialogAllFilter):
+# This string is displayed as a filter for saving a recording to disk.
+recordingsList.saveDialogAllFilter=Todos los archivos
+
--- a/browser/chrome/browser/devtools/projecteditor.properties
+++ b/browser/chrome/browser/devtools/projecteditor.properties
@@ -6,16 +6,26 @@
 # which is used for editing files in a directory and is used inside the
 # App Manager.
 # 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 (projecteditor.confirmUnsavedTitle):
+# This string is displayed as as the title of the confirm prompt that checks
+# to make sure if the project editor can be closed without saving changes
+projecteditor.confirmUnsavedTitle=Cambios sin guardar
+
+# LOCALIZATION NOTE (projecteditor.confirmUnsavedLabel):
+# This string is displayed as the message of the confirm prompt that checks
+# to make sure if the project editor can be closed without saving changes
+projecteditor.confirmUnsavedLabel=Hay cambios sin guardar que se perderán al salir. ¿Está seguro de querer continuar?
+
 # 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.
--- a/browser/chrome/browser/devtools/scratchpad.properties
+++ b/browser/chrome/browser/devtools/scratchpad.properties
@@ -98,8 +98,19 @@ 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
+
+# LOCALIZATION NOTE (selfxss.msg): the text that is displayed when
+# a new user of the developer tools pastes code into the console
+# %1 is the text of selfxss.okstring
+selfxss.msg=Advertencia de estafa: Tenga cuidado al pegar cosas que no entienda. Podría permitir que los atacantes roben su identidad o tomen control de su computadora. Ingrese '%S' en el borrador para permitir el pegado.
+
+# LOCALIZATION NOTE (selfxss.msg): the string to be typed
+# in by a new user of the developer tools when they receive the sefxss.msg prompt.
+# Please avoid using non-keyboard characters here
+selfxss.okstring=permitir pegado
+
--- a/browser/chrome/browser/devtools/toolbox.dtd
+++ b/browser/chrome/browser/devtools/toolbox.dtd
@@ -13,16 +13,20 @@
 <!ENTITY toolboxPreviousTool.key       "[">
 
 <!ENTITY toolboxZoomIn.key             "+">
 <!ENTITY toolboxZoomIn.key2            "="> <!-- + is above this key on many keyboards -->
 <!ENTITY toolboxZoomOut.key            "-">
 <!ENTITY toolboxZoomReset.key          "0">
 
 <!ENTITY toolboxReload.key             "r">
+<!-- LOCALIZATION NOTE (toolboxFramesButton): This is the label for
+  -  the iframes menu list that appears only when the document has some.
+  -  It allows you to switch the context of the whole toolbox. -->
+<!ENTITY toolboxFramesTooltip          "Seleccionar un iframe como el documento señalado actualmente">
 
 <!-- LOCALIZATION NOTE (options.context.advancedSettings): This is the label for
   -  the heading of the advanced settings group in the options panel. -->
 <!ENTITY options.context.advancedSettings "Opciones avanzadas">
 
 <!-- LOCALIZATION NOTE (options.context.inspector): This is the label for
   -  the heading of the Inspector group in the options panel. -->
 <!ENTITY options.context.inspector "Inspector">
@@ -109,18 +113,16 @@
   -  the explanation of the * marker on a tool which is currently not supported
   -  for the target of the toolbox. -->
 <!ENTITY options.toolNotSupported.label  "* No soportado para el destino de caja de herramientas actual">
 
 <!-- LOCALIZATION NOTE (options.selectDevToolsTheme.label): This is the label for
   -  the heading of the radiobox corresponding to the theme of the developer
   -  tools. -->
 <!ENTITY options.selectDevToolsTheme.label   "Seleccionar tema de DevTools:">
-<!ENTITY options.darkTheme.label             "Tema oscuro">
-<!ENTITY options.lightTheme.label            "Tema claro">
 
 <!-- LOCALIZATION NOTE (options.webconsole.label): This is the label for the
   -  heading of the group of Web Console preferences in the options panel. -->
 <!ENTITY options.webconsole.label            "Consola web">
 
 <!-- LOCALIZATION NOTE (options.timestampMessages.label): This is the
    - label for the checkbox that toggles timestamps in the Web Console -->
 <!ENTITY options.timestampMessages.label      "Habilitar marcas de tiempo">
--- a/browser/chrome/browser/devtools/toolbox.properties
+++ b/browser/chrome/browser/devtools/toolbox.properties
@@ -38,16 +38,20 @@ toolbox.defaultTitle=Herramientas de des
 # 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.label): This is used as the label of the tab in
+# the devtools window.
+options.label=Opciones
+
 # 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.
@@ -61,8 +65,17 @@ 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
 
 # LOCALIZATION NOTE (pickButton.tooltip)
 # This is the tooltip of the pick button in the toolbox toolbar
 pickButton.tooltip=Seleccionar un elemento de la página
+
+# LOCALIZATION NOTE (options.darkTheme.label)
+# Used as a label for dark theme
+options.darkTheme.label=Tema oscuro
+
+# LOCALIZATION NOTE (options.lightTheme.label)
+# Used as a label for light theme
+options.lightTheme.label=Tema claro
+
--- a/browser/chrome/browser/devtools/webconsole.properties
+++ b/browser/chrome/browser/devtools/webconsole.properties
@@ -242,8 +242,24 @@ selfxss.msg=Advertencia de estafa: Tenga cuidado al pegar cosas que no comprenda. Podría permitir que atacantes roben su identidad o tomen control de su computadora. Ingrese '%S' debajo (sin necesidad de presionar enter) para permitir el pegado.
 # Please avoid using non-keyboard characters here
 selfxss.okstring=permitir pegado
 
 # LOCALIZATION NOTE (messageToggleDetails): the text that is displayed when
 # you hover the arrow for expanding/collapsing the message details. For
 # console.error() and other messages we show the stacktrace.
 messageToggleDetails=Mostrar/ocultar detalles del mensaje.
 
+# LOCALIZATION NOTE (emptySlotLabel): the text is displayed when an Array
+# with empty slots is printed to the console.
+# This is a semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 number of empty slots
+# example: 1 empty slot
+# example: 5 empty slots
+emptySlotLabel=#1 lugar vacío;#1 lugares vacíos
+
+# LOCALIZATION NOTE (table.index, table.iterationIndex, table.key, table.value):
+# the column header displayed in the console table widget.
+table.index=(índice)
+table.iterationIndex=(índice de iteración)
+table.key=Clave
+table.value=Valores
+
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/webide.dtd
@@ -0,0 +1,138 @@
+<!-- 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 windowTitle "Firefox WebIDE">
+
+<!ENTITY projectMenu_label "Proyecto">
+<!ENTITY projectMenu_accesskey "P">
+<!ENTITY projectMenu_newApp_label "Nueva aplicación…">
+<!ENTITY projectMenu_newApp_accesskey "N">
+<!ENTITY projectMenu_importPackagedApp_label "Abrir aplicación empaquetada…">
+<!ENTITY projectMenu_importPackagedApp_accesskey "p">
+<!ENTITY projectMenu_importHostedApp_label "Abrir aplicación alojada…">
+<!ENTITY projectMenu_importHostedApp_accesskey "j">
+<!ENTITY projectMenu_selectApp_label "Abrir aplicación…">
+<!ENTITY projectMenu_selectApp_accesskey "A">
+<!ENTITY projectMenu_play_label "Instalar y ejecutar">
+<!ENTITY projectMenu_play_accesskey "I">
+<!ENTITY projectMenu_stop_label "Detener aplicación">
+<!ENTITY projectMenu_stop_accesskey "t">
+<!ENTITY projectMenu_debug_label "Depurar aplicación">
+<!ENTITY projectMenu_debug_accesskey "D">
+<!ENTITY projectMenu_remove_label "Eliminar proyecto">
+<!ENTITY projectMenu_remove_accesskey "r">
+<!ENTITY projectMenu_showPrefs_label "Preferencias">
+<!ENTITY projectMenu_showPrefs_accesskey "e">
+
+<!ENTITY runtimeMenu_label "Runtime">
+<!ENTITY runtimeMenu_accesskey "R">
+<!ENTITY runtimeMenu_disconnect_label "Desconectar">
+<!ENTITY runtimeMenu_disconnect_accesskey "D">
+<!ENTITY runtimeMenu_showPermissionTable_label "Tabla de permisos">
+<!ENTITY runtimeMenu_showPermissionTable_accesskey "P">
+<!ENTITY runtimeMenu_takeScreenshot_label "Captura de pantalla">
+<!ENTITY runtimeMenu_takeScreenshot_accesskey "C">
+<!ENTITY runtimeMenu_showDetails_label "Runtime Info">
+<!ENTITY runtimeMenu_showDetails_accesskey "E">
+<!ENTITY runtimeMenu_showMonitor_label "Monitor">
+<!ENTITY runtimeMenu_showMonitor_accesskey "M">
+
+<!ENTITY viewMenu_label "Ver">
+<!ENTITY viewMenu_accesskey "V">
+<!ENTITY viewMenu_toggleEditor_label "Toggle Editor">
+<!ENTITY viewMenu_toggleEditor_accesskey "E">
+<!ENTITY viewMenu_showAddons_label "Administrar simuladores">
+<!ENTITY viewMenu_showAddons_accesskey "m">
+
+<!ENTITY projectButton_label "Abrir aplicaciones">
+<!ENTITY runtimeButton_label "Select Runtime">
+
+<!-- We try to repicate Firefox' bindings: -->
+<!-- quit app -->
+<!ENTITY key_quit "W">
+<!-- open menu -->
+<!ENTITY key_showProjectPanel "O">
+<!-- reload app -->
+<!ENTITY key_play "R">
+<!-- show toolbox -->
+<!ENTITY key_toggleToolbox "VK_F12">
+<!-- toggle sidebar -->
+<!ENTITY key_toggleEditor "B">
+
+<!ENTITY projectPanel_myProjects "Mis proyectos">
+<!ENTITY projectPanel_runtimeApps "Runtime Apps">
+<!ENTITY runtimePanel_USBDevices "Dispositivos USB">
+<!ENTITY runtimePanel_WiFiDevices "Dispositivos Wi-Fi">
+<!ENTITY runtimePanel_simulators "Simuladores">
+<!ENTITY runtimePanel_custom "Custom">
+<!ENTITY runtimePanel_installsimulator "Instalar simulador">
+<!ENTITY runtimePanel_noadbhelper "Instalar ADB Helper">
+<!ENTITY runtimePanel_nousbdevice "¿No puede ver su dispositivo?">
+
+<!-- Lense -->
+<!ENTITY details_valid_header "valid">
+<!ENTITY details_warning_header "advertencias">
+<!ENTITY details_error_header "errores">
+<!ENTITY details_description "Descripción">
+<!ENTITY details_location "Unicación">
+<!ENTITY details_manifestURL "ID de aplicación">
+<!ENTITY details_removeProject_button "Eliminar proyecto">
+
+<!-- New App -->
+<!ENTITY newAppWindowTitle "Nueva aplicación">
+<!ENTITY newAppHeader "Seleccionar plantilla">
+<!ENTITY newAppLoadingTemplate "Cargando plantillas…">
+<!ENTITY newAppProjectName "Nombre de proyecto:">
+
+
+<!-- Decks -->
+
+<!ENTITY deck_close "Cerrar">
+
+<!-- Addons -->
+<!ENTITY addons_title "Componentes extra">
+<!ENTITY addons_aboutaddons "Abrir administrador de complementos">
+
+<!-- Prefs -->
+<!ENTITY prefs_title "Preferencias">
+<!ENTITY prefs_editor_title "Editor">
+<!ENTITY prefs_general_title "General">
+<!ENTITY prefs_restore "Restaurar predeterminado">
+<!ENTITY prefs_simulators "Administrar simuladores">
+<!ENTITY prefs_options_enablelocalruntime "Enable local runtime">
+<!ENTITY prefs_options_enablelocalruntime_tooltip "Allow WebIDE to connect to its own runtime (running browser instance)">
+<!ENTITY prefs_options_rememberlastproject "Recordar último proyecto">
+<!ENTITY prefs_options_rememberlastproject_tooltip "Restaurar el proyecto previo cuando se inicie WebIDE">
+<!ENTITY prefs_options_templatesurl "URL de plantillas">
+<!ENTITY prefs_options_templatesurl_tooltip "Índice de plantillas disponibles">
+<!ENTITY prefs_options_showeditor "Mostrar editor">
+<!ENTITY prefs_options_showeditor_tooltip "Mostrar editor interno">
+<!ENTITY prefs_options_tabsize "Tamaño de tabulación">
+<!ENTITY prefs_options_expandtab "Tabulaciones blandas">
+<!ENTITY prefs_options_expandtab_tooltip "Usar espacios en lugar del caracter de tabulación">
+<!ENTITY prefs_options_detectindentation "Autoindentar">
+<!ENTITY prefs_options_detectindentation_tooltip "Adivinar indentación basándose en el contenido fuente">
+<!ENTITY prefs_options_autocomplete "Autocompletar">
+<!ENTITY prefs_options_autocomplete_tooltip "Enable code autocompletion">
+<!ENTITY prefs_options_autoclosebrackets "Autoclose brackets">
+<!ENTITY prefs_options_autoclosebrackets_tooltip "Automatically insert closing brackets">
+<!ENTITY prefs_options_keybindings "Keybindings">
+<!ENTITY prefs_options_keybindings_default "Predeterminado">
+
+<!-- Permissions Table -->
+<!ENTITY permissionstable_title "Tabla de permisos">
+<!ENTITY permissionstable_name_header "Nombre">
+
+<!-- Runtime Details -->
+<!ENTITY runtimedetails_title "Runtime Info">
+<!ENTITY runtimedetails_adbIsRoot "ADB is root: ">
+<!ENTITY runtimedetails_summonADBRoot "root device">
+<!ENTITY runtimedetails_ADBRootWarning "(requiere bootloader desbloqueado)">
+<!ENTITY runtimedetails_restrictedPrivileges "Privilegios restringidos de DevTools: ">
+<!ENTITY runtimedetails_requestPrivileges "solicitar privilegios superiores">
+<!ENTITY runtimedetails_privilegesWarning "(Reiniciará el dispositivo. Se requiere acceso root.)">
+
+<!-- Monitor -->
+<!ENTITY monitor_title "Monitor">
+<!ENTITY monitor_help "Ayuda">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/webide.properties
@@ -0,0 +1,66 @@
+# 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/.
+
+title_noApp=Firefox WebIDE
+title_app=Firefox WebIDE: %S
+
+runtimeButton_label=Select Runtime
+projectButton_label=Abrir aplicación
+
+mainProcess_label=Proceso principal
+
+local_runtime=Local Runtime
+remote_runtime=Remote Runtime
+remote_runtime_promptTitle=Remote Runtime
+remote_runtime_promptMessage=servidor:puerto
+
+importPackagedApp_title=Select Directory
+importHostedApp_title=Abrir aplicación alojada
+importHostedApp_header=Ingrese URL del manifiesto
+
+notification_showTroubleShooting_label=solucionar problemas
+notification_showTroubleShooting_accesskey=p
+
+# These messages appear in a notification box when an error occur.
+
+error_cantInstallNotFullyConnected=No se puede instalar el proyecto. No está completamente conectado.
+error_cantInstallValidationErrors=No se puede instalar el proyecto. Errores de validación.
+error_listRunningApps=No se puede obtener la lista de aplicaciones del dispositivo
+
+# Variable: name of the operation (in english)
+error_operationTimeout=Operation timed out: %1$S
+error_operationFail=Falló la operación: %1$S
+
+# Variable: app name
+error_cantConnectToApp=No se puede conectar a la aplicación: %1$S
+
+# Variable: error message (in english)
+error_cantFetchAddonsJSON=No se puede cargar la lista de complementos: %S
+
+addons_stable=estable
+addons_unstable=inestable
+addons_simulator_label=Simulador de Firefox OS %1$S (%2$S)
+addons_install_button=instalar
+addons_uninstall_button=desinstalar
+addons_adb_label=Complemento ADB Helper
+addons_adb_warning=Los dispositivos USB no se pueden detectar sin este complemento
+addons_status_unknown=?
+addons_status_installed=Instalado
+addons_status_uninstalled=No Instalado
+addons_status_preparing=preparando
+addons_status_downloading=descargando
+addons_status_installing=instalando
+
+runtimedetails_checkno=no
+runtimedetails_checkyes=si
+runtimedetails_checkunkown=desconocido
+runtimedetails_notUSBDevice=No es un dispositivo USB
+
+# Validation status
+status_tooltip=Estado de validación: %1$S
+status_valid=VÁLIDO
+status_warning=ADVERTENCIAS
+status_error=ERRORES
+status_unknown=DESCONOCIDO
+
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/lightweightThemes.properties
@@ -0,0 +1,18 @@
+# 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/.
+
+lightweightThemes.recommended-1.name=A Web Browser Renaissance
+lightweightThemes.recommended-1.description=A Web Browser Renaissance es (C) Sean.Martell. Disponible bajo CC-BY-SA. Sin garantía.
+
+lightweightThemes.recommended-2.name=Space Fantasy
+lightweightThemes.recommended-2.description=Space Fantasy es (C) fx5800p. Disponible bajo CC-BY-SA. Sin garantía.
+
+lightweightThemes.recommended-3.name=Linen Light
+lightweightThemes.recommended-3.description=Linen Light es (C) DVemer. Disponible bajo CC-BY-SA. Sin garantía.
+
+lightweightThemes.recommended-4.name=Pastel Gradient
+lightweightThemes.recommended-4.description=Pastel Gradient es (C) darrinhenein. Disponible bajo CC-BY. Sin garantía.
+
+lightweightThemes.recommended-5.name=Carbon Light
+lightweightThemes.recommended-5.description=Carbon Light es (C) Jaxivo. Disponible bajo CC-BY-SA. Sin garantía.
--- a/browser/chrome/browser/loop/loop.properties
+++ b/browser/chrome/browser/loop/loop.properties
@@ -12,31 +12,59 @@ 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
 incoming_call_answer_button=Contestar
+incoming_call_answer_audio_only_tooltip=Contestar con voz
 incoming_call_decline_button=Declinar
-incoming_call_ignore_button=Ignorar
+incoming_call_decline_and_block_button=Declinar y bloquear
 incoming_call_block_button=Bloquear
 hangup_button_title=Colgar
+hangup_button_caption=Finalizar llamada
 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.
+peer_ended_conversation2=La persona que estabas llamando 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>.
+
+## LOCALIZATION NOTE (legal_text_and_links2): In this item, don't translate the
+## parts between {{..}} because these will be replaced with links with the labels
+## from legal_text_tos and legal_text_privacy.
+legal_text_and_links2=Al usar este producto está aceptando los {{terms_of_use}} \
+  y el {{privacy_notice}}.
+legal_text_tos = términos de uso
+legal_text_privacy = aviso de privacidad
 
+feedback_call_experience_heading=¿Cómo fue su experiencia de comunicación?
+feedback_what_makes_you_sad=What makes you sad?
+feedback_thank_you_heading=¡Gracias por su opinión!
+feedback_category_audio_quality=Calidad de audio
+feedback_category_video_quality=Calidad de video
+feedback_category_was_disconnected=Fue desconectado
+feedback_category_confusing=Confuso
+feedback_category_other=Otra:
+feedback_custom_category_text_placeholder=¿Que falló?
+feedback_submit_button=Enviar
+feedback_back_button=Atrás
+## LOCALIZATION NOTE (feedback_window_will_close_in): In this item, don't
+## translate the part between {{..}}
+feedback_window_will_close_in=Esta ventana se cerrará en {{countdown}} segundos
+
+share_email_subject2=Invitación a charlar
+## LOCALIZATION NOTE (share_email_body2): In this item, don't translate the
+## part between {{..}} and leave the \r\n\r\n part alone
+share_email_body2=Hacé clic en este enlace para llamarme:\r\n\r\n{{callUrl}}
+share_button=Correo electrónico
+copy_url_button=Copiar
+copied_url_button=¡Copiado!
+
+
--- a/browser/chrome/browser/newTab.dtd
+++ b/browser/chrome/browser/newTab.dtd
@@ -1,14 +1,18 @@
 <!-- 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/. -->
 
 <!-- These strings are used in the about:newtab page -->
 <!ENTITY newtab.pageTitle "Nueva pestaña">
+<!ENTITY newtab.customize.title "Personalizar la página nueva pestaña">
+<!ENTITY newtab.customize.enhanced "Mejorada">
+<!ENTITY newtab.customize.classic "Clásica">
+<!ENTITY newtab.customize.blank "En blanco">
+<!ENTITY newtab.customize.what "¿Qué es esta página?">
+<!ENTITY newtab.intro.header "¿Qué es esta página?">
 <!ENTITY newtab.undo.removedLabel "Miniatura removida.">
 <!ENTITY newtab.undo.undoButton "Deshacer.">
 <!ENTITY newtab.undo.restoreButton "Restaurar todo.">
 <!ENTITY newtab.undo.closeTooltip "Ocultar">
-<!ENTITY newtab.sponsored.release.message "Este sitio patrocinador fue sugerido porque esperamos que lo encuentre interesante y porque apoya la misión de Mozilla.">
-<!ENTITY newtab.sponsored.trial.message2 "Este sitio fue sugerido porque esperamos que lo encuentre interesante y porque apoya la misión de Mozilla.">
-<!ENTITY newtab.panel.link.text "Conocer más…">
 
+
--- a/browser/chrome/browser/newTab.properties
+++ b/browser/chrome/browser/newTab.properties
@@ -1,10 +1,31 @@
 # 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/.
 
 newtab.pin=Pegar este sitio en su posición actual
 newtab.unpin=Despegar este sitio
 newtab.block=Eliminar este sitio
-newtab.show=Mostra la página de nueva pestaña
-newtab.hide=Ocultar la página de nueva pestaña
-newtab.sponsored=Mostrar información en bloques patrocinados
+# LOCALIZATION NOTE(newtab.sponsored.button): This text appears for sponsored
+# and enhanced tiles on the same line as the tile's title, so prefer short
+# strings to avoid overlap. This string should be uppercase.
+newtab.sponsored.button=PATROCINADO
+# LOCALIZATION NOTE(newtab.sponsored.explain): %1$S will be replaced inline by
+# the (X) block icon. %2$S will be replaced by an active link using string
+# newtab.learn.link as text.
+newtab.sponsored.explain=Este mosaico se está mostrando en nombre de un partner de Mozilla. Puede eliminarlo en cualquier momento haciendo clic en el botón %1$S. %2$S
+# LOCALIZATION NOTE(newtab.enhanced.explain): %1$S will be replaced inline by
+# the gear icon used to customize the new tab window. %2$S will be replaced by
+# an active link using string newtab.learn.link as text.
+newtab.enhanced.explain=Un partner de Mozilla ha mejoredo visualmente este mosaico, reemplazando la captura de pantalla. Puede deshabilitar los mosaicos mejorados haciendo clic en el botón %1$S para sus preferencias. %2$S
+# LOCALIZATION NOTE(newtab.intro.paragraph1): %1$S will be replaced inline by
+# active link using string newtab.learn.link as text.
+newtab.intro.paragraph1=Al abrir una nueva pestaña, verá mosaicos de los sitios que visita frecuentemente, junto con mosaicos que pensamos que le pueden interesar. Algunos de estos mosaicos pueden ser patrocinados por partners de Mozilla. Siempre indicamos cuales de los mosaicos son patrocinados. %1$S
+# LOCALIZATION NOTE(newtab.intro.paragraph2): %1$S will be replaced inline by
+# active link using string newtab.privacy.link as text.
+newtab.intro.paragraph2=Para proveer este servicio, Mozilla recolecta y usa cierta información analítica relacionada con el uso de los mosaicos de acuerdo con nuestra %1$S.
+# LOCALIZATION NOTE(newtab.intro.paragraph3): %1$S will be replaced inline by
+# the gear icon used to customize the new tab window.
+newtab.intro.paragraph3=Puede desactivar la funcionalidad de los mosaicos haciendo clic en el botón %1$S para sus preferencias.
+newtab.learn.link=Conocer más…
+newtab.privacy.link=Nota de privacidad
+
--- a/browser/chrome/browser/preferences/fonts.dtd
+++ b/browser/chrome/browser/preferences/fonts.dtd
@@ -1,16 +1,13 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY  fontsDialog.title                       "Fuentes">
-<!ENTITY  window.width                            "49em">
-<!ENTITY  window.macWidth                         "53em">
-<!ENTITY  window.unixWidth                        "51em">
 
 <!ENTITY  language.label                          "Fuentes para:">
 <!ENTITY  language.accesskey                      "F">
 
 <!ENTITY  size.label                              "Tamaño:">
 <!ENTITY  sizeProportional.accesskey              "T">
 <!ENTITY  sizeMonospace.accesskey                 "a">
 
@@ -19,28 +16,27 @@
 
 <!ENTITY  serif.label                             "Serif:">
 <!ENTITY  serif.accesskey                         "S">
 <!ENTITY  sans-serif.label                        "Sans-serif:">
 <!ENTITY  sans-serif.accesskey                    "n">
 <!ENTITY  monospace.label                         "Monospace:">
 <!ENTITY  monospace.accesskey                     "M">
 
-<!ENTITY  font.langGroup.latin1                   "Occidental">
-<!ENTITY  font.langGroup.latin2                   "Centroeuropeo">
+<!-- LOCALIZATION NOTE (font.langGroup.latin) :
+     Translate "Latin" as the name of Latin (Roman) script, not as the name of the Latin language. -->
+<!ENTITY  font.langGroup.latin                    "Latino">
 <!ENTITY  font.langGroup.japanese                 "Japonés">
 <!ENTITY  font.langGroup.trad-chinese             "Chino tradicional (Taiwán)">
 <!ENTITY  font.langGroup.simpl-chinese            "Chino simplificado">
 <!ENTITY  font.langGroup.trad-chinese-hk          "Chino tradicional (Hong Kong)">
 <!ENTITY  font.langGroup.korean                   "Coreano">
 <!ENTITY  font.langGroup.cyrillic                 "Cirílico">
-<!ENTITY  font.langGroup.baltic                   "Báltico">
 <!ENTITY  font.langGroup.el                       "Griego">
-<!ENTITY  font.langGroup.turkish                  "Turco">
-<!ENTITY  font.langGroup.unicode                  "Otros idiomas">
+<!ENTITY  font.langGroup.other                    "Otros sistemas de escritura">
 <!ENTITY  font.langGroup.thai                     "Tailandés">
 <!ENTITY  font.langGroup.hebrew                   "Hebreo">
 <!ENTITY  font.langGroup.arabic                   "Arábigo">
 <!ENTITY  font.langGroup.devanagari               "Devanagari">
 <!ENTITY  font.langGroup.tamil                    "Tamil">
 <!ENTITY  font.langGroup.armenian                 "Armenio">
 <!ENTITY  font.langGroup.bengali                  "Bengalí">
 <!ENTITY  font.langGroup.canadian                 "Silabario canadiense unificado">
--- a/browser/chrome/browser/preferences/main.dtd
+++ b/browser/chrome/browser/preferences/main.dtd
@@ -26,9 +26,15 @@
 <!ENTITY saveTo.accesskey "v">
 <!ENTITY chooseFolderWin.label        "Examinar…">
 <!ENTITY chooseFolderWin.accesskey    "x">
 <!ENTITY chooseFolderMac.label        "Seleccionar…">
 <!ENTITY chooseFolderMac.accesskey    "e">
 <!ENTITY alwaysAsk.label "Siempre preguntarme dónde guardar archivos">
 <!ENTITY alwaysAsk.accesskey "a">
 
+<!ENTITY alwaysCheckDefault.label        "Siempre verificar si &brandShortName; es el navegador predeterminado al iniciar">
+<!ENTITY alwaysCheckDefault2.accesskey    "g">
+<!ENTITY setAsMyDefaultBrowser.label                "Establecer &brandShortName; como navegador predeterminado">
+<!ENTITY setAsMyDefaultBrowser.accesskey            "d">
+<!ENTITY isDefault.label                 "&brandShortName; es actualmente su navegador predeterminado">
+<!ENTITY isNotDefault.label               "&brandShortName; no es su navegador predeterminado">
 
--- a/browser/chrome/browser/preferences/preferences.properties
+++ b/browser/chrome/browser/preferences/preferences.properties
@@ -89,16 +89,17 @@ can=Habilitar
 canAccessFirstParty=Allow first party only
 canSession=Habilitar durante Sesión
 cannot=Bloquear
 noCookieSelected=<sin cookie seleccionada>
 cookiesAll=Las siguientes cookies están guardadas en su computadora:
 cookiesFiltered=Las siguientes cookies coinciden con su búsqueda:
 
 #### Offline apps
+offlineAppsList.height=7em
 offlineAppRemoveTitle=Eliminar datos de sitios web sin conexión
 offlineAppRemovePrompt=Después de eliminar estos datos, %S no estará más activo sin conexión.  ¿Está seguro de querer 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/browser/chrome/browser/preferences/privacy.dtd
+++ b/browser/chrome/browser/preferences/privacy.dtd
@@ -5,16 +5,19 @@
 <!ENTITY tracking.label                 "Rastreo">
 
 <!ENTITY dntTrackingNopref.label2       "No decirle a los sitios mis preferencias de rastreo">
 <!ENTITY dntTrackingNopref.accesskey    "o">
 <!ENTITY dntTrackingNotOkay.label2      "Decirle a los sitios que no quiero ser rastreado">
 <!ENTITY dntTrackingNotOkay.accesskey   "D">
 <!ENTITY dntTrackingOkay.label2         "Decirle a los sitios que quiero ser rastreado">
 <!ENTITY dntTrackingOkay.accesskey      "t">
+<!ENTITY trackingProtection.label       "Evitar que los sitios me rastreen">
+<!ENTITY trackingProtection.accesskey   "m">
+<!ENTITY trackingProtectionLearnMore.label "Conocer más">
 <!ENTITY doNotTrackInfo.label           "Conocer más">
 
 <!ENTITY  history.label "Historial">
 
 <!ENTITY  locationBar.label             "Barra de direcciones">
 
 <!ENTITY  locbar.pre.label              "Al usar la barra de direcciones, sugerir:">
 <!ENTITY  locbar.pre.accessKey          "l">
--- a/browser/chrome/browser/quitDialog.properties
+++ b/browser/chrome/browser/quitDialog.properties
@@ -5,9 +5,10 @@
 quitDialogTitle=Salir de %S
 
 quitTitle=&Salir
 cancelTitle=&Cancelar
 saveTitle=&Guardar y salir
 neverAsk2=&No preguntar la próxima vez
 message=¿Desea que %S guarde sus pestañas y ventanas para la próxima vez que se inicie?
 messageNoWindows=¿Desea que %S guarde sus pestañas para la próxima vez que se inicie?
+messagePrivate=Está en modo de navegación privada. Salir de %S ahora descartará todas sus pestañas y ventanas abiertas.
 
--- a/browser/chrome/browser/shellservice.properties
+++ b/browser/chrome/browser/shellservice.properties
@@ -1,13 +1,23 @@
 # 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/.
 
 optionsLabel=%S &Opciones
 safeModeLabel=%S &Modo seguro
-setDefaultBrowserTitle=Navegador predeterminado
-setDefaultBrowserMessage=%S no es actualmente su navegador predeterminado. ¿Desea que sí lo sea?
-setDefaultBrowserDontAsk=Verificar también la próxima vez que inicie %S.
-alreadyDefaultBrowser=%S ya es su navegador predeterminado.
+
+# LOCALIZATION NOTE (setDefaultBrowserMessage2, setDefaultBrowserConfirm.label):
+# %S will be replaced by brandShortName
+setDefaultBrowserMessage2          = Obtenga lo mejor de %S haciéndolo su navegador predeterminado
+setDefaultBrowserConfirm.label     = Usar %S como mi navegador predeterminado
+setDefaultBrowserConfirm.accesskey = U
+setDefaultBrowserOptions.label     = Opciones
+setDefaultBrowserOptions.accesskey = O
+setDefaultBrowserNotNow.label      = No ahora
+setDefaultBrowserNotNow.accesskey  = N
+setDefaultBrowserNever.label       = No preguntarme de nuevo
+setDefaultBrowserNever.accesskey   = d
+
+
 desktopBackgroundLeafNameWin=Fondo de escritorio.bmp
 DesktopBackgroundDownloading=Guardando imagen…
 DesktopBackgroundSet=Establecer como fondo de escritorio
--- a/browser/chrome/browser/webrtcIndicator.properties
+++ b/browser/chrome/browser/webrtcIndicator.properties
@@ -7,31 +7,47 @@
 # LOCALIZATION NOTE (webrtcIndicator.windowtitle): %S is the brand name (e.g. Firefox).
 # This string is used so that the window has a title in tools that enumerate/look for window
 # titles. It is not normally visible anywhere.
 webrtcIndicator.windowtitle = %S - Indicador de compartido
 
 webrtcIndicator.sharingCameraAndMicrophone.tooltip = Su cámara y micrófono están siendo compartidos. Clic para controlar la forma de compartir.
 webrtcIndicator.sharingCamera.tooltip              = Su cámara está siendo compartida. Clic para controlar la forma de compartir.
 webrtcIndicator.sharingMicrophone.tooltip          = Su micrófono está siendo compartido. Clic para controlar la forma de compartir.
+webrtcIndicator.sharingApplication.tooltip = Se está compartiendo una aplicación. Clic para controlar la forma de compartir.
 webrtcIndicator.sharingScreen.tooltip = Su pantalla está siendo compartida. Clic para controlar la forma de compartir.
 webrtcIndicator.sharingWindow.tooltip = Una ventana está siendo compartida. Clic para controlar la forma de compartir.
 
 
 # LOCALIZATION NOTE : The following strings are only used on Mac for
 # menus attached to icons near the clock on the mac menubar.
 
 # LOCALIZATION NOTE (webrtcIndicator.sharing*With.menuitem):
 # %S is the title of the tab using the share.
 webrtcIndicator.sharingCameraWith.menuitem = Compartiendo cámara con "%S"
 webrtcIndicator.sharingMicrophoneWith.menuitem = Compartiendo micrófono con "%S"
+webrtcIndicator.sharingApplicationWith.menuitem = Compartiendo una aplicación con "%S"
 webrtcIndicator.sharingScreenWith.menuitem = Compartiendo pantalla con "%S"
 webrtcIndicator.sharingWindowWith.menuitem = Compartiendo una ventana con "%S"
 webrtcIndicator.controlSharing.menuitem = Controlar compartición
-# LOCALIZATION NOTE (webrtcIndicator.sharing*WithNTabs.menuitem):
-# Semicolon-separated list of plural forms.
+# LOCALIZATION NOTE (webrtcIndicator.sharingCameraWithNTabs.menuitem):
+# Semicolon-separated list of plural forms. See:
+# http://developer.mozilla.org/en/docs/Localization_and_Plurals
 webrtcIndicator.sharingCameraWithNTabs.menuitem = Compartiendo cámara con #1 pestaña;Compartiendo cámara con #1 pestañás
+# LOCALIZATION NOTE (webrtcIndicator.sharingMicrophoneWithNTabs.menuitem):
+# Semicolon-separated list of plural forms. See:
+# http://developer.mozilla.org/en/docs/Localization_and_Plurals
 webrtcIndicator.sharingMicrophoneWithNTabs.menuitem = Compartiendo micrófono con #1 pestaña;Compartiendo micrófono con #1 pestañas
+# LOCALIZATION NOTE (webrtcIndicator.sharingApplicationWithNTabs.menuitem):
+# Semicolon-separated list of plural forms. See:
+# http://developer.mozilla.org/en/docs/Localization_and_Plurals
+webrtcIndicator.sharingApplicationWithNTabs.menuitem = Compatiendo una aplicación con #1 pestaña;Compartiendo aplicaciones con #1 pestañas
+# LOCALIZATION NOTE (webrtcIndicator.sharingScreenWithNTabs.menuitem):
+# Semicolon-separated list of plural forms. See:
+# http://developer.mozilla.org/en/docs/Localization_and_Plurals
 webrtcIndicator.sharingScreenWithNTabs.menuitem = Compartiendo pantalla con #1 pestaña;Compartiendo pantalla con #1 pestañas
-webrtcIndicator.sharingWindowWithNTabs.menuitem = Compartiendo una ventana con #1 pestaña;Compartiendo una ventana con #1 pestañás
+# LOCALIZATION NOTE (webrtcIndicator.sharingWindowWithNTabs.menuitem):
+# Semicolon-separated list of plural forms. See:
+# http://developer.mozilla.org/en/docs/Localization_and_Plurals
+webrtcIndicator.sharingWindowWithNTabs.menuitem = Compartiendo una ventana con #1 pestaña;Compartiendo ventanas con #1 pestañas
 # LOCALIZATION NOTE (webrtcIndicator.controlSharingOn.menuitem):
 # %S is the title of the tab using the share.
 webrtcIndicator.controlSharingOn.menuitem = Controlar compartición en "%S"
--- a/dom/chrome/accessibility/AccessFu.properties
+++ b/dom/chrome/accessibility/AccessFu.properties
@@ -88,41 +88,37 @@ 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
+# LOCALIZATION NOTE: # %1$S is the position of the item n the set.
+# %2$S is the total number of such items in the set.
+# An expanded example would read "2 of 5".
+objItemOfN      =       %1$S de %2$S
 
 # Landmark announcements
 banner         =       banner
 complementary  =       complementario
 contentinfo    =       info de contenido
 main           =       principal
 navigation     =       navegación
 search         =       búsqueda
 
-# Description of a table or grid:
-# 1 is a dynamically retrieved localized role of either 'table' or 'grid'.
-# 2 is the number of columns within the table.
-# 3 is the number of rows within the table or grid.
-tableInfo = %S con %S y %S
-# LOCALIZATION NOTE (tableColumnInfo): Semi-colon list of plural forms.
+# LOCALIZATION NOTE (tblColumnInfo): Semi-colon list of plural forms.
+# Number of columns within the table.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-tableColumnInfo = 1 columna;#1 columnas
-# LOCALIZATION NOTE (tableRowInfo): Semi-colon list of plural forms.
+tblColumnInfo = con 1 columna;con #1 columnas
+# LOCALIZATION NOTE (tblRowInfo): Semi-colon list of plural forms.
+# Number of rows within the table or grid.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-tableRowInfo = 1 fila;#1 filas
+tblRowInfo = y 1 fila;y #1 filas
 
 # table or grid cell information
 columnInfo = Columna %S
 rowInfo = Fila %S
 spansColumns = abarca %S columnas
 spansRows = abarca %S filas
 
 # Invoked actions
@@ -184,24 +180,91 @@ quicknav_Link        = Enlaces
 quicknav_List        = Listas
 quicknav_PageTab     = Pestañas de páginas
 quicknav_RadioButton = Radio buttons
 quicknav_Separator   = Separadores
 quicknav_Table       = Tablas
 quicknav_Checkbox    = Check boxes
 
 # Shortened role names for braille
-linkAbbr           =       lnk
-pushbuttonAbbr     =       btn
-passwordtextAbbr   =       passwdtxt
-imagemapAbbr       =       imgmap
-figureAbbr         =       fig
-textareaAbbr       =       txtarea
+menubarAbbr        =       barra menú
+scrollbarAbbr      =       barra navegación
+gripAbbr           =       grip
+alertAbbr          =       alerta
+menupopupAbbr      =       menu popup
+documentAbbr       =       documento
+paneAbbr           =       vista
+dialogAbbr         =       diálogo
+separatorAbbr      =       separador
+toolbarAbbr        =       herramientas
+statusbarAbbr      =       barra estado
 tableAbbr          =       tbl
-tableInfoAbbr = %S %S %S
-# LOCALIZATION NOTE (tableColumnInfoAbbr): Semi-colon list of plural forms.
+columnheaderAbbr   =       encabezado columna
+rowheaderAbbr      =       encabezado fila
+columnAbbr         =       columna
+rowAbbr            =       fila
+cellAbbr           =       celda
+linkAbbr           =       lnk
+listAbbr           =       lista
+listitemAbbr       =       ítem lista
+outlineAbbr        =       esquema
+outlineitemAbbr    =       ítem esquema
+pagetabAbbr        =       pestaña
+propertypageAbbr   =       página propiedades
+graphicAbbr        =       gráphico
+pushbuttonAbbr     =       btn
+checkbuttonAbbr    =       check button
+radiobuttonAbbr    =       botón radio
+comboboxAbbr       =       combo box
+progressbarAbbr    =       barra progreso
+sliderAbbr         =       slider
+spinbuttonAbbr     =       spin button
+diagramAbbr        =       diagrama
+animationAbbr      =       animación
+equationAbbr       =       ecuación
+buttonmenuAbbr     =       menú botón
+whitespaceAbbr     =       espacio en blanco
+pagetablistAbbr    =       lista pestañas
+canvasAbbr         =       canvas
+checkmenuitemAbbr  =       check menu item
+labelAbbr          =       etiqueta
+passwordtextAbbr   =       passwdtxt
+radiomenuitemAbbr  =       item menú radio
+textcontainerAbbr  =       contenedor texto
+togglebuttonAbbr   =       toggle button
+treetableAbbr      =       tabla árbol
+headerAbbr         =       encabezado
+footerAbbr         =       pie
+paragraphAbbr      =       párrafo
+entryAbbr          =       entrada
+captionAbbr        =       título
+headingAbbr        =       encabezado
+sectionAbbr        =       sección
+formAbbr           =       formulario
+comboboxlistAbbr   =       combo box list
+comboboxoptionAbbr =       combo box option
+imagemapAbbr       =       imgmap
+listboxoptionAbbr  =       opción
+listboxAbbr        =       list box
+flatequationAbbr   =       ecuación plana
+gridcellAbbr       =       gridcell
+noteAbbr           =       nota
+figureAbbr         =       fig
+definitionlistAbbr =       lista definición
+termAbbr           =       término
+definitionAbbr     =       definición
+textareaAbbr       =       txtarea
+
+# LOCALIZATION NOTE (tblColumnInfoAbbr): Semi-colon list of plural forms.
+# Number of columns within the table.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-tableColumnInfoAbbr = #1c;#1c
-# LOCALIZATION NOTE (tableRowInfoAbbr): Semi-colon list of plural forms.
+tblColumnInfoAbbr = #1c;#1c
+# LOCALIZATION NOTE (tblRowInfoAbbr): Semi-colon list of plural forms.
+# Number of rows within the table or grid.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-tableRowInfoAbbr = #1r;#1r
+tblRowInfoAbbr = #1r;#1r
 cellInfoAbbr = c%Sr%S
 
+stateCheckedAbbr = (x)
+stateUncheckedAbbr = ( )
+statePressedAbbr = (x)
+stateUnpressedAbbr = ( )
+
--- a/dom/chrome/security/csp.properties
+++ b/dom/chrome/security/csp.properties
@@ -60,16 +60,19 @@ inlineScriptBlocked = Un intento de ejec
 # inline style refers to CSS code that is embedded into the HTML document.
 inlineStyleBlocked = Un intento de aplicar hojas de estilo incorporadas ha sido bloqueado
 # LOCALIZATION NOTE (scriptFromStringBlocked):
 # eval is a name and should not be localized.
 scriptFromStringBlocked = Un intento de llamar JavaScript desde una cadena (llamando una función como eval) ha sido bloqueado
 # LOCALIZATION NOTE (hostNameMightBeKeyword):
 # %1$S is the hostname in question and %2$S is the keyword
 hostNameMightBeKeyword = Interpretando %1$S como un nombre de servidor, no una palabra clave. Si pretende que sea una palabra clave, use '%2$S' (encerrado en comillas simples).
+# LOCALIZATION NOTE (notSupportingDirective):
+# directive is not supported (e.g. 'reflected-xss')
+notSupportingDirective = Directiva '%1$S' no soportada. La directiva y los valores serán ignorados.
 
 # CSP Errors:
 policyURINotAlone = la directiva policy-uri solamente puede aparecer sola
 noParentRequest = The policy-uri cannot be fetched without a parent request and a CSP.
 # LOCALIZATION NOTE (policyURIParseError):
 # %1$S is the URI that could not be parsed
 policyURIParseError = could not parse URI in policy URI: %1$S
 # LOCALIZATION NOTE (nonMatchingHost):
--- a/mobile/android/base/sync_strings.dtd
+++ b/mobile/android/base/sync_strings.dtd
@@ -68,16 +68,23 @@
 
 <!-- Common text -->
 <!ENTITY sync.button.cancel.label 'Cancelar'>
 <!ENTITY sync.button.connect.label 'Conectar'>
 <!ENTITY sync.button.ok.label 'Aceptar'>
   
 <!-- Account strings -->
 <!ENTITY sync.account.label '&syncBrand.fullName.label; (obsoleto)'>
+
+<!-- Localization note (sync.default.client.name): Default string of the "Device
+     name" menu item upon setting up Firefox Sync.  The placeholder &formatS1
+     will be replaced by the name of the Firefox release channel and &formatS2
+     by the model name of the Android device. Examples look like "Aurora on
+     GT-I1950" and "Fennec on MI 2S". -->
+<!ENTITY sync.default.client.name '&formatS1; en &formatS2;'>
   
 <!-- Bookmark folder strings -->
 <!ENTITY bookmarks.folder.menu.label 'Menú de marcadores'>
 <!ENTITY bookmarks.folder.places.label ''>
 <!ENTITY bookmarks.folder.tags.label 'Etiquetas'>
 <!ENTITY bookmarks.folder.toolbar.label 'Barra de marcadores'>
 <!ENTITY bookmarks.folder.unfiled.label 'Marcadores desordenados'>
 <!ENTITY bookmarks.folder.desktop.label 'Marcadores de escritorio'>
--- a/mobile/android/chrome/browser.properties
+++ b/mobile/android/chrome/browser.properties
@@ -14,16 +14,19 @@ alertDownloadsStart2=Iniciando descarga
 alertDownloadsDone2=Descarga completa
 alertCantOpenDownload=No se puede abrir el archivo. Presioná para guardarlo.
 alertDownloadsSize=Descarga demasiado grande
 alertDownloadsNoSpace=No hay espacio suficiente
 alertDownloadsToast=Descarga iniciada…
 alertDownloadsPause=Pausar
 alertDownloadsResume=Continuar
 alertDownloadsCancel=Cancelar
+# LOCALIZATION NOTE (undoCloseToast.message): This message appears in a toast
+# when the user tries to download something in Guest mode.
+downloads.disabledInGuest=Las descargas están deshabilitadas en las sesiones de invitado
 
 alertFullScreenToast=Presioná ATRAS para dejar el modo de pantalla completa
 
 # LOCALIZATION NOTE (alertSearchEngineAddedToast, alertSearchEngineErrorToast, alertSearchEngineDuplicateToast)
 # %S will be replaced by the name of the search engine (exposed by the current page)
 # that has been added; for example, 'Google'.
 alertSearchEngineAddedToast='%S' ha sido agregado como buscador
 alertSearchEngineErrorToast=No se pudo agregar '%S' como buscador
@@ -111,16 +114,45 @@ desktopNotification.dontAskAgain=No preg
 # Contacts API
 contacts.allow=Permitir
 contacts.dontAllow=No permitir
 contacts.ask=¿Permitir que %S acceda a tus contactos?
 # LOCALIZATION NOTE (contacts.dontAskAgain): This label appears next to a
 # checkbox to indicate whether or not the user wants to make a permanent decision.
 contacts.dontAskAgain=No preguntar de nuevo para este sitio
 
+# Device Storage API
+deviceStorageMusic.allow=Permitir
+deviceStorageMusic.dontAllow=No permitir
+deviceStorageMusic.ask=¿Permitir que %S acceda a tu música?
+# LOCALIZATION NOTE (deviceStorageMusic.dontAskAgain): This label appears next to a
+# checkbox to indicate whether or not the user wants to make a permanent decision.
+deviceStorageMusic.dontAskAgain=No preguntar de nuevo para este sitio
+
+deviceStoragePictures.allow=Permitir
+deviceStoragePictures.dontAllow=No permitir
+deviceStoragePictures.ask=¿Permitir que %S acceda a tus imágenes?
+# LOCALIZATION NOTE (deviceStoragePictures.dontAskAgain): This label appears next to a
+# checkbox to indicate whether or not the user wants to make a permanent decision.
+deviceStoragePictures.dontAskAgain=No preguntar de nuevo para este sitio
+
+deviceStorageSdcard.allow=Permitir
+deviceStorageSdcard.dontAllow=No permitir
+deviceStorageSdcard.ask=¿Permitir que %S acceda al almacenamiento externo?
+# LOCALIZATION NOTE (deviceStorageSdcard.dontAskAgain): This label appears next to a
+# checkbox to indicate whether or not the user wants to make a permanent decision.
+deviceStorageSdcard.dontAskAgain=No preguntar de nuevo para este sitio
+
+deviceStorageVideos.allow=Permitir
+deviceStorageVideos.dontAllow=No permitir
+deviceStorageVideos.ask=¿Permitir que %S acceda a tus videos?
+# LOCALIZATION NOTE (deviceStorageVideos.dontAskAgain): This label appears next to a
+# checkbox to indicate whether or not the user wants to make a permanent decision.
+deviceStorageVideos.dontAskAgain=No preguntar de nuevo para este sitio
+
 # New Tab Popup
 # LOCALIZATION NOTE (newtabpopup): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 number of tabs
 newtabpopup.opened=Nueva pestaña abierta;#1 nuevas pestañas abiertas
 newprivatetabpopup.opened=Nueva pestaña privada abierta;#1 nuevas pestañas privadas abiertas
 
 # LOCALIZATION NOTE (newtabpopup.switch): Ideally, this string is short (it's a
@@ -171,16 +203,18 @@ password.dontSave=No guardar
 # menu, set this to "true". Otherwise, you can leave it as "false".
 browser.menu.showCharacterEncoding=false
 
 #Text Selection
 selectionHelper.textCopied=Texto copiado al portapapeles
 
 # Casting
 casting.prompt=Enviar al dispositivo
+casting.mirrorTab=Pestaña espejo
+casting.mirrorTabStop=Dejar de espejar
 
 # Context menu
 contextmenu.openInNewTab=Abrir enlace en nueva pestaña
 contextmenu.openInPrivateTab=Abrir enlace en pestaña privada
 contextmenu.addToReadingList=Agregar a lista de lectura
 contextmenu.share=Compartir
 contextmenu.copyLink=Copiar enlace
 contextmenu.shareLink=Compartir enlace
--- a/security/manager/chrome/pipnss/nsserrors.properties
+++ b/security/manager/chrome/pipnss/nsserrors.properties
@@ -294,9 +294,11 @@ SEC_ERROR_PKCS11_FUNCTION_FAILED=Un módulo PKCS #11 devolvió CKR_FUNCTION_FAILED, indicando que la función solicitada no pudo ejecutarse. Intentando la misma operación de nuevo puede funcionar.
 SEC_ERROR_PKCS11_DEVICE_ERROR=Un módulo PKCS #11 devolvió CKR_DEVICE_ERROR, indicando que ocurrió un problema con el token o el slot.
 SEC_ERROR_BAD_INFO_ACCESS_METHOD=Método de acceso a la información desconocido en extensión de certificado.
 SEC_ERROR_CRL_IMPORT_FAILED=Error intentando importar un CRL.
 SEC_ERROR_EXPIRED_PASSWORD=La contraseña expiró.
 SEC_ERROR_LOCKED_PASSWORD=La contraseña está bloqueada.
 SEC_ERROR_UNKNOWN_PKCS11_ERROR=Error PKCS #11 desconocido.
 SEC_ERROR_BAD_CRL_DP_URL=Invalid or unsupported URL in CRL distribution point name.
 SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED=El certificado fue firmado usando un algoritmo de firma que está deshabilitado porque no es seguro.
-
+MOZILLA_PKIX_ERROR_KEY_PINNING_FAILURE=The server uses key pinning (HPKP) but no trusted certificate chain could be constructed that matches the pinset. Key pinning violations cannot be overridden.
+MOZILLA_PKIX_ERROR_CA_CERT_USED_AS_END_ENTITY=El servidor utiliza un certificado con una extensión de las restricciones básicas que lo identifica como una autoridad de certificación. Para un certificado correctamente emitido, este no debería ser el caso.
+MOZILLA_PKIX_ERROR_INADEQUATE_KEY_SIZE=El servidor presentó un certificado con un tamaño de clave que es demasiado pequeño para esteblecer una conexión segura.
--- a/security/manager/chrome/pippki/pippki.dtd
+++ b/security/manager/chrome/pippki/pippki.dtd
@@ -79,18 +79,13 @@
 <!ENTITY examineCert.label "Ver certificado">
 <!ENTITY examineCert.accesskey "V">
 
 <!-- Strings for the CreateCertInfo dialog  -->
 <!ENTITY createCertInfo.title "Generando una clave privada">
 <!ENTITY createCertInfo.msg1 "Generación de clave en proceso… Ésto puede tomar unos pocos minutos….">
 <!ENTITY createCertInfo.msg2 "Espere…">
 
-<!-- Form Signing confirmation prompt -->
-<!ENTITY formSigning.title "Pedido de firma de texto">
-<!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:">
 
--- a/toolkit/chrome/global/aboutSupport.properties
+++ b/toolkit/chrome/global/aboutSupport.properties
@@ -59,23 +59,25 @@ blockedOSVersion = Bloqueado para su versión de sistema operativo.
 
 direct2DEnabled = Direct2D habilitado
 directWriteEnabled = DirectWrite habilitado
 clearTypeParameters = Parámetros de ClearType
 clearTypeParametersNotFound = Parámetros de ClearType no enconrados
 adapterDescription = Descripción del adaptador
 adapterVendorID = ID de fabricante
 adapterDeviceID = ID de dispositivo
+adapterSubsysID = ID de subsistema
 adapterDrivers = Drivers del adaptador
 adapterRAM = RAM del adaptador
 driverVersion = Versión del driver
 driverDate = Fecha del driver
 adapterDescription2 = Descripción del adaptador (GPU #2) 
 adapterVendorID2 = ID de fabricante (GPU #2) 
 adapterDeviceID2 = ID de dispositivo (GPU #2)
+adapterSubsysID2 = ID de subsistema (GPU #2)
 adapterDrivers2 = Drivers del adaptador (GPU #2)
 adapterRAM2 = RAM del adaptador (GPU #2)
 driverVersion2 = Versión del driver (GPU #2)
 driverDate2 = Fecha del driver (GPU #2)
 isGPU2Active = GPU #2 Activa
 webglRenderer = Procesador WebGL
 
 minLibVersions = Versión mínima esperada
deleted file mode 100644
--- a/toolkit/chrome/global/actions.dtd
+++ /dev/null
@@ -1,5 +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 action.switchToTab.label "Cambiar a pestaña">
new file mode 100644
--- /dev/null
+++ b/webapprt/webapprt/downloads/downloads.dtd
@@ -0,0 +1,52 @@
+<!-- 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 (window.width2, window.height): These values should be
+close to the golden ratio (1.618:1) while making sure it's wide enough for long
+file names and tall enough to hint that there are more downloads in the list -->
+<!ENTITY window.width2                    "485">
+<!ENTITY window.height                    "300"> 
+
+<!ENTITY starting.label                   "Iniciando…">
+<!ENTITY scanning.label                   "Buscando virus…">
+
+<!ENTITY downloads.title                  "Descargas">
+
+<!ENTITY cmd.pause.label                  "Pausar">
+<!ENTITY cmd.pause.accesskey              "P">
+<!ENTITY cmd.resume.label                 "Continuar">
+<!ENTITY cmd.resume.accesskey             "R">
+<!ENTITY cmd.cancel.label                 "Cancelar">
+<!ENTITY cmd.cancel.accesskey             "C">
+<!ENTITY cmd.show.label                   "Abrir carpeta contenedora">
+<!ENTITY cmd.show.accesskey               "b">
+<!ENTITY cmd.showMac.label                "Mostrar en Finder">
+<!ENTITY cmd.showMac.accesskey            "F">
+<!ENTITY cmd.open.label                   "Abrir">
+<!ENTITY cmd.open.accesskey               "A">
+<!ENTITY cmd.openWith.label               "Abrir con…">
+<!ENTITY cmd.openWith.accesskey           "n">
+<!ENTITY cmd.retry.label                  "Reintentar">
+<!ENTITY cmd.retry.accesskey              "R">
+<!ENTITY cmd.goToDownloadPage.label       "Ir a página de descarga">
+<!ENTITY cmd.goToDownloadPage.accesskey   "I">
+<!ENTITY cmd.copyDownloadLink.label       "Copiar enlace de descarga">
+<!ENTITY cmd.copyDownloadLink.accesskey   "l">
+<!ENTITY cmd.removeFromList.label         "Eliminar de la lista">
+<!ENTITY cmd.removeFromList.accesskey     "E">
+
+<!ENTITY cmd.close.commandKey             "w">
+<!ENTITY cmd.close2.commandKey            "j">
+<!ENTITY cmd.close2Unix.commandKey        "y">
+<!ENTITY cmd.clearList.label              "Limpiar lista">
+<!ENTITY cmd.clearList.tooltip            "Elimina descargas completas, canceladas y fallidas de la lista">
+<!ENTITY cmd.clearList.accesskey          "c">
+<!ENTITY cmd.find.commandKey              "f">
+<!ENTITY cmd.search.commandKey            "k">
+
+<!ENTITY closeWhenDone.label              "Cerrar cuando se completen las descargas">
+<!ENTITY closeWhenDone.tooltip            "Cierra la ventana de descargas cuando todos los archivos se hayan descargado">
+
+<!ENTITY showFolder.label                 "Mostrar esta carpeta">
+<!ENTITY searchBox.label                  "Buscar…">
--- a/webapprt/webapprt/webapp.properties
+++ b/webapprt/webapprt/webapp.properties
@@ -35,11 +35,19 @@ 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
+# LOCALIZATION NOTE (webapps.uninstall.title): %S will be replaced with the name
+# of the webapp being uninstalled.
+webapps.uninstall.title=Desinstalar %S
+# LOCALIZATION NOTE (webapps.uninstall.description): %S will be replaced with the
+# name of the webapp being uninstalled.
+webapps.uninstall.description=¿Desea desinstalar %S?
+webapps.uninstall.uninstall=Desinstalar aplicación
+webapps.uninstall.dontuninstall=No desinstalar
 
 paymentDialog.title=Pagos
 paymentDialog.message=¿Qué proveedor de pagos desea usar?