Migrating central to aurora for Firefox 28
authorMarcelo Poli <mpoli@lt24.zzn.com>
Wed, 18 Dec 2013 21:42:12 -0300
changeset 1596 4ee67f5db927235c066ba730cba2f7eb4648aa4e
parent 1571 572a5e21c5d2c33aa517ae340055d98c15d1abff
child 1597 4ae566e8a8ff73df6c60ea8d3bf2617c3131f604
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:47:06 +0000
Migrating central to aurora for Firefox 28
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/charsetMenu.dtd
browser/chrome/browser/charsetMenu.properties
browser/chrome/browser/devtools/app-manager.dtd
browser/chrome/browser/devtools/app-manager.properties
browser/chrome/browser/devtools/debugger.properties
browser/chrome/browser/devtools/netmonitor.dtd
browser/chrome/browser/devtools/scratchpad.properties
browser/chrome/browser/devtools/sourceeditor.properties
browser/chrome/browser/devtools/styleinspector.properties
browser/chrome/browser/devtools/toolbox.dtd
browser/chrome/browser/places/places.properties
browser/chrome/browser/preferences/content.dtd
browser/chrome/browser/preferences/fonts.dtd
browser/chrome/browser/preferences/main.dtd
browser/chrome/browser/preferences/security.dtd
browser/chrome/browser/syncSetup.dtd
browser/metro/chrome/browser.dtd
browser/metro/chrome/browser.properties
browser/metro/chrome/searchPanel.dtd
dom/chrome/accessibility/AccessFu.properties
dom/chrome/dom/dom.properties
dom/chrome/layout/css.properties
mail/chrome/messenger/messenger.dtd
mail/chrome/messenger/messenger.properties
mail/chrome/messenger/messengercompose/composeMsgs.properties
mail/chrome/messenger/messengercompose/messengercompose.dtd
mail/chrome/messenger/msgHdrViewOverlay.dtd
mail/chrome/messenger/offline.properties
mail/chrome/messenger/prefs.properties
mobile/android/base/android_strings.dtd
mobile/android/chrome/browser.properties
mobile/android/chrome/config.dtd
mobile/android/chrome/config.properties
mobile/android/chrome/handling.properties
suite/chrome/common/quitDialog.properties
suite/chrome/mailnews/pref/pref-character_encoding.dtd
toolkit/chrome/global-platform/mac/intl.properties
toolkit/chrome/global-platform/unix/intl.properties
toolkit/chrome/global-platform/win/intl.properties
toolkit/chrome/global/aboutTelemetry.properties
toolkit/chrome/global/devtools/styleinspector.properties
toolkit/chrome/global/intl.properties
webapprt/webapprt/getUserMediaDialog.dtd
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -10,16 +10,19 @@
 <!-- LOCALIZATION NOTE (mainWindow.titlemodifier) : DONT_TRANSLATE -->
 <!ENTITY mainWindow.titlemodifier "&brandFullName;">
 <!-- LOCALIZATION NOTE (mainWindow.titlemodifiermenuseparator): DONT_TRANSLATE -->
 <!ENTITY mainWindow.titlemodifiermenuseparator " - ">
 <!-- LOCALIZATION NOTE (mainWindow.titlePrivateBrowsingSuffix): This will be appended to the window's title
                                                                 inside the private browsing mode -->
 <!ENTITY mainWindow.titlePrivateBrowsingSuffix "(Navegación privada)">
 
+<!ENTITY appmenu.title                       "Personalizar y controlar &brandFullName;">
+<!ENTITY navbarOverflow.label                "Más herramientas…">
+
 <!-- Tab context menu -->
 <!ENTITY  reloadTab.label                    "Recargar pestaña">
 <!ENTITY  reloadTab.accesskey                "r">
 <!ENTITY  reloadAllTabs.label                "Recargar todas las pestañas">
 <!ENTITY  reloadAllTabs.accesskey            "A">
 <!-- LOCALIZATION NOTE (closeTabsToTheEnd.label): This should indicate the
 direction in which tabs are closed, i.e. locales that use RTL mode should say
 left instead of right. -->
@@ -161,16 +164,17 @@ These should match what Safari and other
 <!ENTITY goEndCap.tooltip "Ir a la dirección de la barra de direcciones">
 <!ENTITY printButton.label "Imprimir">
 <!ENTITY printButton.tooltip "Imprimir esta página">
 
 <!ENTITY backForwardItem.title        "Atrás/Adelante">
 <!ENTITY locationItem.title "Dirección">
 <!ENTITY searchItem.title "Buscar">
 <!ENTITY throbberItem.title "Progreso">
+<!ENTITY viewBookmarksSidebar.label    "Mostrar en barra lateral">
 <!ENTITY bookmarksItem.title "Marcadores">
 
 <!-- Toolbar items --> 
 <!ENTITY appMenuButton.label          "Menú">
 <!ENTITY appMenuButton.tooltip        "Abrir menú de &brandShortName;">
 <!ENTITY homeButton.label             "Inicio">
 
 <!ENTITY tabGroupsButton.label        "Grupos de pestañas">
@@ -181,17 +185,17 @@ These should match what Safari and other
 
 <!ENTITY bookmarksButton.label "Marcadores">
 <!ENTITY bookmarksButton.tooltip "Mostrar sus marcadores">
 <!ENTITY bookmarksCmd.commandkey "b">
 
 <!ENTITY bookmarksMenuButton.label          "Marcadores">
 <!ENTITY bookmarksMenuButton.tooltip        "Mostrar sus marcadores">
 <!ENTITY bookmarksMenuButton.unsorted.label "Marcadores sin ordenar">
-<!ENTITY viewBookmarksSidebar.label         "Mostrar en barra lateral">
+<!ENTITY viewBookmarksSidebar2.label        "Ver barra lateral de marcadores">
 <!ENTITY viewBookmarksToolbar.label         "Ver barra de marcadores">
 
 <!-- LOCALIZATION NOTE (bookmarksSidebarGtkCmd.commandkey): This command
   -  key should not contain the letters A-F, since these are reserved
   -  shortcut keys on Linux. -->
 <!ENTITY bookmarksGtkCmd.commandkey "o">
 <!ENTITY bookmarksWinCmd.commandkey "i">
 
@@ -248,31 +252,30 @@ These should match what Safari and other
   -  "Scratchpad" in your locale. You should feel free to find a close
   -  approximation to it or choose a word (or words) that means
   -  "simple discardable text editor". -->
 <!ENTITY scratchpad.label             "Borrador">
 <!ENTITY scratchpad.accesskey         "B">
 <!ENTITY scratchpad.keycode           "VK_F4">
 <!ENTITY scratchpad.keytext           "F4">
 
-<!-- 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 chromeDebuggerMenu.accesskey   "e">
+<!-- LOCALIZATION NOTE (browserToolboxMenu.label): This is the label for the
+  -  application menu item that opens the browser toolbox UI in the Tools menu. -->
+<!ENTITY browserToolboxMenu.label     "Barra de herramientas del navegador">
+<!ENTITY browserToolboxMenu.accesskey "e">
 
 <!ENTITY devToolbarCloseButton.tooltiptext "Cerrar barra de desarrolladores">
 <!ENTITY devToolbarMenu.label "Barra de desarrolladores">
 <!ENTITY devToolbarMenu.accesskey          "r">
 <!ENTITY devAppMgrMenu.label               "Administrador de aplicaciones">
 <!ENTITY devAppMgrMenu.accesskey           "A">
 <!ENTITY 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">
 <!ENTITY devToolbarOtherToolsButton.label  "Más herramientas">
 
 <!ENTITY getMoreDevtoolsCmd.label        "Obtener más herramientas">
 <!ENTITY getMoreDevtoolsCmd.accesskey    "m">
 
@@ -335,32 +338,56 @@ These should match what Safari and other
 <!ENTITY historyUndoMenu.label "Pestañas cerradas recientemente">
 <!-- LOCALIZATION NOTE (historyUndoWindowMenu): see bug 394759 -->
 <!ENTITY historyUndoWindowMenu.label "Ventanas cerradas recientemente">
 <!ENTITY historyRestoreLastSession.label "Restaurar sesión previa">
 
 <!ENTITY showAllHistoryCmd2.label "Mostrar todo el historial">
 <!ENTITY showAllHistoryCmd.commandkey "h">
 
+<!ENTITY appMenuCustomize.label "Personalizar">
+<!ENTITY appMenuCustomizeExit.label "Salir de personalizar">
+<!ENTITY appMenuHistory.label "Historial">
+<!ENTITY appMenuHistory.showAll.label "Mostrar todo el historial">
+<!ENTITY appMenuHistory.clearRecent.label "Limpiar historial reciente…">
+<!ENTITY appMenuHistory.restoreSession.label "Restaurar sesión previa">
+
+<!ENTITY customizeMenu.addToToolbar.label "Agregar a barra de herramientas">
+<!ENTITY customizeMenu.addToToolbar.accesskey "A">
+<!ENTITY customizeMenu.addToPanel.label "Agregar al menú">
+<!ENTITY customizeMenu.addToPanel.accesskey "m">
+<!ENTITY customizeMenu.removeFromToolbar.label "Eliminar de la barra de herramientas">
+<!ENTITY customizeMenu.removeFromToolbar.accesskey "R">
+<!ENTITY customizeMenu.removeFromMenu.label "Eliminar del menú">
+<!ENTITY customizeMenu.removeFromMenu.accesskey "r">
+<!ENTITY customizeMenu.addMoreItems.label "Agregar más ítems…">
+<!ENTITY customizeMenu.addMoreItems.accesskey "A">
+
 <!ENTITY appMenuEdit.label "Editar">
 <!ENTITY appMenuCustomize.label "Personalizar">
 <!ENTITY appMenuToolbarLayout.label "Personalizar barras…">
 <!ENTITY appMenuSidebars.label "Barras laterales">
 <!ENTITY appMenuFind.label "Buscar…">
 <!ENTITY appMenuUnsorted.label "Marcadores sin ordenar">
 <!ENTITY appMenuWebDeveloper.label "Desarrollador web">
 <!ENTITY appMenuGettingStarted.label "Primeros pasos">
 <!ENTITY appMenuSafeMode.label "Reiniciar con los complementos deshabilitados…">
 <!ENTITY appMenuSafeMode.accesskey "R">
 
 <!ENTITY openCmd.commandkey           "l">
 <!ENTITY urlbar.placeholder2          "Buscar o ingresar dirección">
 <!ENTITY urlbar.accesskey             "d">
 <!ENTITY urlbar.switchToTab.label     "Cambiar a pestaña:">
 
+<!-- LOCALIZATION NOTE (toggleMenuPanelMac.key) ideally this should be the same as
+     toggleMenuPanel. However, the modifier is different on mac (cmd+shift rather than ctrl)
+     and so you may need to pick a different key to avoid conflicts with other shortcuts. -->
+<!ENTITY toggleMenuPanel.key          "m">
+<!ENTITY toggleMenuPanelMac.key       "m">
+
 <!-- 
   Comment duplicated from browser-sets.inc:
 
   Search Command Key Logic works like this:
   
   Unix: Ctrl+J (0.8, 0.9 support)
         Ctrl+K (cross platform binding)
   Mac:  Cmd+K (cross platform binding)
@@ -431,16 +458,17 @@ These should match what Safari and other
 <!ENTITY bookmarkPageCmd2.accesskey   "M">
 
 <!ENTITY bookmarkThisLinkCmd.label      "Marcar este enlace">
 <!ENTITY bookmarkThisLinkCmd.accesskey  "l">
 <!ENTITY bookmarkThisFrameCmd.label      "Marcar este marco…">
 <!ENTITY bookmarkThisFrameCmd.accesskey  "r">
 <!ENTITY emailPageCmd.label           "Enlace por correo…">
 <!ENTITY emailPageCmd.accesskey       "E">
+<!ENTITY switchToMetroCmd.label       "Reiniciar &brandShortName; en estilo Windows 8">
 <!ENTITY savePageCmd.label "Guardar página como…">
 <!ENTITY savePageCmd.accesskey "a">
 <!-- alternate for content area context menu -->
 <!ENTITY savePageCmd.accesskey2 "P">
 <!ENTITY savePageCmd.commandkey "s">
 <!ENTITY saveFrameCmd.label "Guardar marco como…">
 <!ENTITY saveFrameCmd.accesskey "m">
 <!ENTITY printFrameCmd.label          "Imprimir marco…">
@@ -637,17 +665,17 @@ just addresses the organization to follo
 
 <!ENTITY identity.moreInfoLinkText "Más información…">
 
 <!ENTITY identity.permissions "Permisos">
 
 <!-- LOCALIZATION NOTE (identity.help.tooltip) : This string should be the
      localized title of this SUMO article
      https://support.mozilla.org/kb/how-do-i-tell-if-my-connection-is-secure -->
-<!ENTITY identity.help.tooltip "Cómo saber si mi conexión a un sitio web es segura?">
+<!ENTITY identity.help.tooltip "How do I tell if my connection to a website is secure?">
 
 <!-- Name for the tabs toolbar as spoken by screen readers.
 The word "toolbar" is appended automatically and should not be contained below! -->
 <!ENTITY tabsToolbar.label "Pestañas del navegador">
 
 <!-- LOCALIZATION NOTE (syncTabsMenu2.label): This appears in the history menu -->
 <!ENTITY syncTabsMenu2.label     "Pestañas de otros dispositivos">
 
@@ -678,16 +706,23 @@ The word "toolbar" is appended automatic
 
 <!ENTITY social.activated.description "Se han habilitado servicios de <label/>. Puede cambiar su configuración para estos servicios en el <label class='text-link'>administrador de complementos</label>.">
 <!ENTITY social.activated.undo.label "¡Epa, deshacer ésto!">
 <!ENTITY social.activated.undo.accesskey "h">
 <!ENTITY social.learnMore.label "Conocer más…">
 <!ENTITY social.learnMore.accesskey "m">
 <!ENTITY social.closeNotificationItem.label "No ahora">
 
+
+
+<!ENTITY customizeMode.tabTitle "Personalizar &brandShortName;">
+<!ENTITY customizeMode.menuAndToolbars.label "Menú y barras de herramientas">
+<!ENTITY customizeMode.menuAndToolbars.header "Más herramientas para agregar al menú y la barra">
+<!ENTITY customizeMode.restoreDefaults "Restaurar predeterminadas">
+
 <!ENTITY social.chatBar.commandkey "c">
 <!ENTITY social.chatBar.label "Focus chats">
 <!ENTITY social.chatBar.accesskey "c">
 
 <!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…">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -161,16 +161,24 @@ pluginContinue.accesskey=C
 # in-page UI
 PluginClickToActivate=Activar %S.
 # LOCALIZATION NOTE - "vulnerable" indicates there is a security bug in the
 # plugin that is being exploited by attackers.
 PluginVulnerableUpdatable=Este plugin es vulnerable y debería actualizarse.
 PluginVulnerableNoUpdate=Este plugin tiene vulnerabilidades de seguridad.
 pluginInfo.unknownPlugin=Desconocido
 
+# infobar UI
+pluginContinueBlocking.label=Continuar bloqueo
+pluginContinueBlocking.accesskey=b
+# LOCALIZATION NOTE (pluginActivateTrigger): Use the unicode ellipsis char, \u2026,
+# or use "..." if \u2026 doesn't suit traditions in your locale.
+pluginActivateTrigger.label=Permitir…
+pluginActivateTrigger.accesskey=P
+
 # Sanitize
 # LOCALIZATION NOTE (sanitizeDialog2.everything.title): When "Time range to
 # clear" is set to "Everything", the Clear Recent History dialog's title is
 # changed to this.  See UI mockup and comment 11 at bug 480169 -->
 sanitizeDialog2.everything.title=Borrar todo el historial
 sanitizeButtonOK=Borrar ahora
 # LOCALIZATION NOTE (sanitizeButtonClearing): The label for the default
 # button between the user clicking it and the window closing.  Indicates the
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/charsetMenu.dtd
@@ -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/. -->
+
+<!ENTITY charsetMenu.label             "Codificación de caracteres">
+<!ENTITY charsetMenu.accesskey         "C">
+<!ENTITY charsetMenuAutodet.label      "Autodetectar">
+<!ENTITY charsetMenuAutodet.accesskey  "d"><!-- A reserved for Arabic -->
+
+<!ENTITY charsetMenuAutodet.off.label     "(desactivado)">
+<!ENTITY charsetMenuAutodet.off.accesskey "o">
+<!ENTITY charsetMenuAutodet.ja.label      "Japonés">
+<!ENTITY charsetMenuAutodet.ja.accesskey  "J">
+<!ENTITY charsetMenuAutodet.ru.label      "Ruso">
+<!ENTITY charsetMenuAutodet.ru.accesskey  "R">
+<!ENTITY charsetMenuAutodet.uk.label      "Ucraniano">
+<!ENTITY charsetMenuAutodet.uk.accesskey  "U">
+
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/charsetMenu.properties
@@ -0,0 +1,105 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE: The property keys ending with ".key" are for access keys.
+# Localizations may add or delete properties where the property key ends with
+# ".key" as appropriate for the localization. The code that uses this data can
+# deal with the absence of an access key for an item.
+# 
+# Make sure the keys defined here don't collide with
+# charsetMenuAutodet.accesskey in charsetMenu.dtd.
+#
+# In the en-US version of this file, access keys are given to the following:
+# * UTF-8
+# * All encodings that are the fallback encoding for some locale in Firefox
+# * All encodings that are the fallback encoding for some locale in IE
+# * All Japanese encodings
+#
+# For the items whose property key does not end in ".key" and whose value
+# includes "(" U+0028 LEFT PARENTHESIS, the "(" character is significant for
+# processing by CharsetMenu.jsm. If your localization does not use ASCII
+# parentheses where en-US does in this file, please file a bug to make
+# CharsetMenu.jsm also recognize the delimiter your localization uses.
+# (When this code was developed, all localizations appeared to use
+# U+0028 LEFT PARENTHESIS for this purpose.)
+
+# Globally-relevant
+UTF-8.key        = U
+UTF-8            = Unicode
+windows-1252.key = O
+windows-1252     = Occidental
+
+# Arabic
+windows-1256.key = a
+windows-1256     = Árabe (Windows)
+ISO-8859-6       = Árabe (ISO)
+
+# Baltic
+windows-1257.key = B
+windows-1257     = Báltico (Windows)
+ISO-8859-4       = Báltico (ISO)
+
+# Central European
+windows-1250.key =         E
+windows-1250     = Europeo central (Windows)
+ISO-8859-2.key   =       l
+ISO-8859-2       = Europeo central (ISO)
+
+# Chinese, Simplified
+gbk.key          =          S
+gbk              = Chino, simplificado (GBK)
+gb18030          = Chino, simplificado (GB18030)
+
+# Chinese, Traditional
+Big5.key         =          t
+Big5             = Chino, tradicional
+
+# Cyrillic
+windows-1251.key = C
+windows-1251     = Cirílico (Windows)
+ISO-8859-5       = Cirílico (ISO)
+KOI8-R           = Cirílico (KOI8-R)
+KOI8-U           = Cirílico (KOI8-U)
+IBM866           = Cirílico (DOS)
+
+# Greek
+windows-1253.key = G
+windows-1253     = Griego (Windows)
+ISO-8859-7.key   =          O
+ISO-8859-7       = Griego (ISO)
+
+# Hebrew
+windows-1255.key = H
+windows-1255     = Hebreo (Windows)
+ISO-8859-8-I     = Hebreo (ISO)
+# LOCALIZATION NOTE (ISO-8859-8): The value for this item should begin with
+# the same word for Hebrew as the values for windows-1255 and ISO-8859-8-I
+# so that this item sorts right after those two in the collation order for your
+# locale.
+ISO-8859-8       = Hebreo, visual
+
+# Japanese
+Shift_JIS.key    = J
+Shift_JIS        = Japonés (Shift_JIS)
+EUC-JP.key       =   p
+EUC-JP           = Japonés (EUC-JP)
+ISO-2022-JP.key  =     n
+ISO-2022-JP      = Japonés (ISO-2022-JP)
+
+# Korean
+EUC-KR.key       = C
+EUC-KR           = Coreano
+
+# Thai
+windows-874.key  =    i
+windows-874      = Tailandés
+
+# Turkish
+windows-1254.key =   r
+windows-1254     = Turco
+
+# Vietnamese
+windows-1258.key = V
+windows-1258     = Vietnamita
+
--- a/browser/chrome/browser/devtools/app-manager.dtd
+++ b/browser/chrome/browser/devtools/app-manager.dtd
@@ -13,17 +13,17 @@
 <!ENTITY device.notConnected "No conectado. Conecte el dispositivo indicado debajo.">
 <!ENTITY device.startApp "Iniciar">
 <!ENTITY device.startAppTooltip "Iniciar esta aplicación en el dispositivo.">
 <!ENTITY device.stopApp "Detener">
 <!ENTITY device.stopAppTooltip "Detener esta aplicación en el dispositivo.">
 <!ENTITY device.debugApp "Depurar">
 <!ENTITY device.debugAppTooltip "Abre las herramientas de desarrollador conectadas a esta aplicación en el dispositivo.">
 <!ENTITY device.name "Nombre">
-<!ENTITY device.app "Aplicación">
+<!ENTITY device.plain "Simple (predeterminada)">
 <!ENTITY device.privileged "Privilegiada">
 <!ENTITY device.certified "Certificada">
 <!ENTITY device.allow "Permitir">
 <!ENTITY device.allowTooltip "Este permiso está habilitado para aplicaciones de este tipo.">
 <!ENTITY device.prompt "Preguntar">
 <!ENTITY device.promptTooltip "Este permiso requiere confirmación del usuario para aplicaciones de este tipo.">
 <!ENTITY device.deny "Denegar">
 <!ENTITY device.denyTooltip "Este permiso está denegado para aplicaciones de este tipo.">
@@ -67,22 +67,27 @@
 <!ENTITY projects.addHostedTooltip "Agregar una nueva aplicación alojada (enlace a un archivo manifest.webapp) desde un sitio remoto.">
 <!ENTITY projects.title "Aplicaciones locales">
 <!ENTITY projects.appDetails "Detalles de la aplicación">
 <!ENTITY projects.removeAppFromList "Eliminar esta aplicación de la lista de aplicaciones en las que está trabajando. Ésto no la removerá del dispositivo o del simulador.">
 <!ENTITY projects.updateApp "Actualizar">
 <!ENTITY projects.updateAppTooltip "Ejecuta pruebas de validación de la aplicación y la actualiza en el dispositivo conectado">
 <!ENTITY projects.debugApp "Depurar">
 <!ENTITY projects.debugAppTooltip "Abre las herramientas de desarrollador conectadas a esta aplicación">
+<!ENTITY projects.saveManifest "Guardar">
+<!ENTITY projects.saveManifestTooltip "Guardar el contenido del editor de manifiestos.">
 <!ENTITY projects.hostedManifestPlaceHolder2 "http://ejemplo.com/app/manifest.webapp">
 <!ENTITY projects.noProjects "No hay proyectos. Agregar una nueva aplicación empaquetada debajo (un directorio) o una aplicación alojada (enlace a un archivo de manifiesto).">
 <!ENTITY projects.manifestEditor "Manifest Editor">
 <!ENTITY projects.manifestEditorTooltip "Edite el manifiesto de la aplicación en el panel aquí debajo.  El botón Actualizar guardará los cambios y actualizará la aplicación.">
 <!ENTITY projects.manifestViewer "Visor de manifiesto">
 <!ENTITY projects.manifestViewerTooltip "Examine el manifiesto de la aplicación en el panel aquí debajo.">
+<!ENTITY projects.valid "Válido">
+<!ENTITY projects.error "Error">
+<!ENTITY projects.warning "Advertencia">
 
 <!ENTITY help.title "Administrador de aplicaciones">
 <!ENTITY help.close "Cerrar">
 <!ENTITY help.intro "Esta herramienta lo ayudará a construir e instalar aplicaciones web en dispositivos compatibles (ej. Firefox OS). La pestaña <strong>Aplicaciones</strong> lo asistirán en el proceso de validación e instalación de su aplicación. La pestaña <strong>Dispositivo</strong> dará información sobre el dispositivo conectado. Use la barra de herramientas que está debajo para conectar a un dispositivo o iniciar el simulador.">
 <!ENTITY help.usefullLinks "Enlaces útiles:">
 <!ENTITY help.appMgrDoc "Documentación: Usando el administrador de aplicaciones">
 <!ENTITY help.configuringDevice "Como configurar su dispositivo con Firefox OS">
 <!ENTITY help.troubleShooting "Solución de problmeas">
--- a/browser/chrome/browser/devtools/app-manager.properties
+++ b/browser/chrome/browser/devtools/app-manager.properties
@@ -29,13 +29,13 @@ validator.invalidProjectType=Tipo de pro
 # don't translate 'icons' and 'name'.
 validator.missNameManifestProperty=Falta 'name' en el manifiesto y es obligatorio.
 validator.missIconsManifestProperty=Falta 'icons' en el manifiesto.
 validator.missIconMarketplace=el envío de la aplicación al Marketplace necesita al menos un icono de 128px
 validator.invalidAppType=Tipo de aplicación desconocido: '%S'.
 validator.invalidHostedPriviledges=Aplicación alojada no puede ser tipo '%S'.
 validator.noCertifiedSupport=las aplicaciones 'certificadas' no están totalmente soportadas por el administrador de aplicaiones.
 validator.nonAbsoluteLaunchPath=La ruta de inicio debe ser una ruta absoluta que comience con '/': '%S'
-validator.invalidLaunchPath=No se puede acceder al documento de inicio de la aplicación '%S'
-# LOCALIZATION NOTE (validator.invalidLaunchPathBadHttpCode): %1$S is the URI of
+validator.accessFailedLaunchPath=No se puede acceder al documento de inicio de la aplicación '%S'
+# LOCALIZATION NOTE (validator.accessFailedLaunchPathBadHttpCode): %1$S is the URI of
 # the launch document, %2$S is the http error code.
-validator.invalidLaunchPathBadHttpCode=No se puede acceder al documento de inicio de la aplicación '%1$S', se obtuvo el código HTTP %2$S
+validator.accessFailedLaunchPathBadHttpCode=No se puede acceder al documento de inicio de la aplicación '%1$S', se obtuvo el código HTTP %2$S
 
--- a/browser/chrome/browser/devtools/debugger.properties
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -135,16 +135,20 @@ emptySearchText=Buscar scripts (%S)
 # appears in the filter text box when it is empty and the chrome globals
 # container is selected.
 emptyChromeGlobalsFilterText=Filtrar globales de chrome (%S)
 
 # LOCALIZATION NOTE (emptyVariablesFilterText): This is the text that
 # appears in the filter text box for the variables view container.
 emptyVariablesFilterText=Filtrar variables
 
+# LOCALIZATION NOTE (emptyPropertiesFilterText): This is the text that
+# appears in the filter text box for the editor's variables view bubble.
+emptyPropertiesFilterText=Propiedades de filtro
+
 # LOCALIZATION NOTE (searchPanelFilter): This is the text that appears in the
 # filter panel popup for the filter scripts operation.
 searchPanelFilter=Filtrar scripts (%S)
 
 # LOCALIZATION NOTE (searchPanelGlobal): This is the text that appears in the
 # filter panel popup for the global search operation.
 searchPanelGlobal=Buscar en todos los archivos (%S)
 
--- a/browser/chrome/browser/devtools/netmonitor.dtd
+++ b/browser/chrome/browser/devtools/netmonitor.dtd
@@ -10,19 +10,19 @@
   - 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 (netmonitorUI.emptyNotice2): This is the label displayed
   -  in the network table when empty. -->
 <!ENTITY netmonitorUI.emptyNotice2        "Hacer un pedido o recargar la página para ver información detallada sobre la actividad de la red.">
 
-<!-- LOCALIZATION NOTE (netmonitorUI.toolbar.status): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.toolbar.status2): This is the label displayed
   -  in the network table toolbar, above the "status" column. -->
-<!ENTITY netmonitorUI.toolbar.status      "√">
+<!ENTITY netmonitorUI.toolbar.status2     "✓">
 
 <!-- LOCALIZATION NOTE (netmonitorUI.toolbar.method): This is the label displayed
   -  in the network table toolbar, above the "method" column. -->
 <!ENTITY netmonitorUI.toolbar.method      "Método">
 
 <!-- LOCALIZATION NOTE (netmonitorUI.toolbar.file): This is the label displayed
   -  in the network table toolbar, above the "file" column. -->
 <!ENTITY netmonitorUI.toolbar.file        "Archivo">
@@ -94,16 +94,20 @@
 <!-- LOCALIZATION NOTE (debuggerUI.footer.filterMedia): This is the label displayed
   -  in the network details footer for the "Media" filtering button. -->
 <!ENTITY netmonitorUI.footer.filterMedia  "Medios">
 
 <!-- LOCALIZATION NOTE (debuggerUI.footer.filterFlash): This is the label displayed
   -  in the network details footer for the "Flash" filtering button. -->
 <!ENTITY netmonitorUI.footer.filterFlash  "Flash">
 
+<!-- LOCALIZATION NOTE (debuggerUI.footer.clear): This is the label displayed
+  -  in the network details footer for the "Clear" button. -->
+<!ENTITY netmonitorUI.footer.clear  "Limpiar">
+
 <!-- LOCALIZATION NOTE (debuggerUI.panesButton.tooltip): This is the tooltip for
   -  the button that toggles the panes visible or hidden in the netmonitor UI. -->
 <!ENTITY netmonitorUI.panesButton.tooltip "Alternar información de red">
 
 <!-- LOCALIZATION NOTE (debuggerUI.summary.url): This is the label displayed
   -  in the network details headers tab identifying the URL. -->
 <!ENTITY netmonitorUI.summary.url         "URL solicitada:">
 
--- a/browser/chrome/browser/devtools/scratchpad.properties
+++ b/browser/chrome/browser/devtools/scratchpad.properties
@@ -81,20 +81,16 @@ help.openDocumentationPage=https://devel
 # LOCALIZATION NOTE (fileExists.notification): This is the message displayed
 # over the top of the the editor when a file does not exist.
 fileNoLongerExists.notification=Este archivo no existe más.
 
 # LOCALIZATION NOTE (propertiesFilterPlaceholder): this is the text that
 # appears in the filter text box for the properties view container.
 propertiesFilterPlaceholder=Propiedades de filtro
 
-# LOCALIZATION NOTE (stringConversionFailed): Happens when a value cannot be
-# converted to a string for inspection.
-stringConversionFailed=No se puede convertir el valor a cadena.
-
 # LOCALIZATION NOTE (connectionTimeout): message displayed when the Remote Scratchpad
 # fails to connect to the server due to a timeout.
 connectionTimeout=Conexión expirada. Verifique la consola de errores en ambos extremos por potenciales mensajes de error. Reabra el borrador e intente nuevamente.
 
 # LOCALIZATION NOTE (scratchpad.label): this string is displayed in the title of
 # the tab when the Scratchpad is displayed inside the developer tools window and
 # in the Developer Tools Menu.
 scratchpad.label=Borrador
--- a/browser/chrome/browser/devtools/sourceeditor.properties
+++ b/browser/chrome/browser/devtools/sourceeditor.properties
@@ -44,8 +44,43 @@ annotation.breakpoint.title=Breakpoint: 
 annotation.currentLine=Línea actual
 
 # LOCALIZATION NOTE  (annotation.debugLocation.title): This is the text shown in
 # a tooltip displayed in any of the editor gutters when the user hovers the
 # current debugger location. The debugger can pause the JavaScript execution at
 # user-defined lines.
 annotation.debugLocation.title=Paso actual: %S
 
+# LOCALIZATION NOTE  (jumpToLine.commandkey): This the key to use in
+# conjunction with accel (Command on Mac or Ctrl on other platforms) to jump to
+# a specific line in the editor.
+jumpToLine.commandkey=J
+
+# LOCALIZATION NOTE  (toggleComment.commandkey): This the key to use in
+# conjunction with accel (Command on Mac or Ctrl on other platforms) to either
+# comment or uncomment selected lines in the editor.
+toggleComment.commandkey=/
+
+# LOCALIZATION NOTE  (toolboxPrevTool.commandkey): This the key to use in
+# conjunction with accel (Command on Mac or Ctrl on other platforms) to reduce
+# indentation level in CodeMirror. However, its default value also used by
+# the Toolbox to switch between tools so we disable it.
+#
+# DO NOT translate this key without proper synchronization with toolbox.dtd.
+indentLess.commandkey=[
+
+# LOCALIZATION NOTE  (toolboxPrevTool.commandkey): This the key to use in
+# conjunction with accel (Command on Mac or Ctrl on other platforms) to increase
+# indentation level in CodeMirror. However, its default value also used by
+# the Toolbox to switch between tools
+#
+# DO NOT translate this key without proper synchronization with toolbox.dtd.
+indentMore.commandkey=]
+
+# LOCALIZATION NOTE  (moveLineUp.commandkey): This the key to use in
+# conjunction with accel (Command on Mac or Ctrl on other platforms) to move
+# the selected lines up.
+moveLineUp.commandkey=Alt-Arriba
+
+# LOCALIZATION NOTE  (moveLineDown.commandkey): This the key to use in
+# conjunction with accel (Command on Mac or Ctrl on other platforms) to move
+# the selected lines down.
+moveLineDown.commandkey=Alt-Abajo
deleted file mode 100644
--- a/browser/chrome/browser/devtools/styleinspector.properties
+++ /dev/null
@@ -1,92 +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/.
-
-# LOCALIZATION NOTE These strings are used inside the Style Inspector.
-#
-# 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 (panelTitle): This is the panel title
-panelTitle=Inspector de estilos
-
-# LOCALIZATION NOTE (rule.status): For each style property the panel shows
-# the rules which hold that specific property. For every rule, the rule status
-# is also displayed: a rule can be the best match, a match, a parent match, or a
-# rule did not match the element the user has highlighted.
-rule.status.BEST=Mejor coincidencia
-rule.status.MATCHED=Coincidencia
-rule.status.PARENT_MATCH=Coincidencia del padre
-
-# LOCALIZATION NOTE (rule.sourceElement, rule.sourceInline): For each
-# style property the panel shows the rules which hold that specific property.
-# For every rule, the rule source is also displayed: a rule can come from a
-# file, from the same page (inline), or from the element itself (element).
-rule.sourceInline=interno
-rule.sourceElement=elemento
-
-# LOCALIZATION NOTE (rule.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
-# the title attribute of the warning icon.
-rule.warning.title=Valor de propiedad no válido
-
-# LOCALIZATION NOTE (ruleView.empty): Text displayed when the highlighter is
-# first opened and there's no node selected in the rule view.
-rule.empty=Ningún elemento seleccionado.
-
-# LOCALIZATION NOTE (ruleView.contextmenu.selectAll): Text displayed in the
-# rule view context menu.
-ruleView.contextmenu.selectAll=Seleccionar todo
-
-# LOCALIZATION NOTE (ruleView.contextmenu.selectAll.accessKey): Access key for
-# the rule view context menu "Select all" entry.
-ruleView.contextmenu.selectAll.accessKey=a
-
-# LOCALIZATION NOTE (ruleView.contextmenu.copy): Text displayed in the rule view
-# context menu.
-ruleView.contextmenu.copy=Copiar
-
-# LOCALIZATION NOTE (ruleView.contextmenu.copy.accessKey): Access key for
-# the rule view context menu "Select all" entry.
-ruleView.contextmenu.copy.accessKey=C
-
-# LOCALIZATION NOTE (computedView.contextmenu.selectAll): Text displayed in the
-# computed view context menu.
-computedView.contextmenu.selectAll=Seleccionar todo
-
-# LOCALIZATION NOTE (computedView.contextmenu.selectAll.accessKey): Access key for
-# the computed view context menu "Select all" entry.
-computedView.contextmenu.selectAll.accessKey=a
-
-# LOCALIZATION NOTE (computedView.contextmenu.copy): Text displayed in the
-# computed view context menu.
-computedView.contextmenu.copy=Copiar
-
-# LOCALIZATION NOTE (computedView.contextmenu.copy.accessKey): Access key for
-# the computed view context menu "Select all" entry.
-computedView.contextmenu.copy.accessKey=C
-
--- a/browser/chrome/browser/devtools/toolbox.dtd
+++ b/browser/chrome/browser/devtools/toolbox.dtd
@@ -104,16 +104,21 @@
 
 <!-- LOCALIZATION NOTE (options.enablePersistentLogging.label): This is the
   -  label for the checkbox that toggles persistent logs in the Web Console,
   -  i.e. devtools.webconsole.persistlog a boolean preference in about:config,
   -  in the options panel. -->
 <!ENTITY options.enablePersistentLogging.label    "Habilitar registros persitentes">
 <!ENTITY options.enablePersistentLogging.tooltip  "Si habiltia esta opción la consola web no borrará la salida cada vez que se navegue a una nueva página">
 
+<!-- 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">
+<!ENTITY options.timestampMessages.tooltip    "Si habiita esta opción, los comandos y la salida de la consola web mostrarán un marca de tiempo">
+
 <!-- LOCALIZATION NOTE (options.profiler.label): This is the label for the
   -  heading of the group of JavaScript Profiler preferences in the options
   -  panel. -->
 <!ENTITY options.profiler.label            "Perfilador de JavaScript">
 
 <!-- LOCALIZATION NOTE (options.showPlatformData.label): This is the
   -  label for the checkbox that toggles the display of the platform data in the,
   -  Profiler i.e. devtools.profiler.ui.show-platform-data a boolean preference
--- a/browser/chrome/browser/places/places.properties
+++ b/browser/chrome/browser/places/places.properties
@@ -65,16 +65,20 @@ detailsPane.noItems=Ningún ítem
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 number of items
 # example: 111 items
 detailsPane.itemsCountLabel=Un ítem;#1 ítems
 
 mostVisitedTitle=Más visitados
 recentlyBookmarkedTitle=Marcadores recientes
 recentTagsTitle=Etiquetas recientes
+# LOCALIZATION NOTE (windows8TouchTitle): this is the name of the folder used
+# to store bookmarks created in Metro mode and share bookmarks between Metro
+# and Desktop.
+windows8TouchTitle=Windows 8 Táctil
 
 OrganizerQueryHistory=Historial
 OrganizerQueryDownloads=Descargas
 OrganizerQueryAllBookmarks=Todos los marcadores
 OrganizerQueryTags=Etiquetas
 
 # LOCALIZATION NOTE (tagResultLabel) :
 # This is what we use to form the label (for screen readers)
--- a/browser/chrome/browser/preferences/content.dtd
+++ b/browser/chrome/browser/preferences/content.dtd
@@ -1,12 +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  popups.label                "Emergentes">
+
 <!ENTITY  blockPopups.label           "Bloquear ventanas emergentes">
 <!ENTITY  blockPopups.accesskey       "B">
 <!ENTITY  popupExceptions.label       "Excepciones…">
 <!ENTITY  popupExceptions.accesskey   "E">
 
 <!ENTITY  fontsAndColors.label        "Fuentes y colores">
 
 <!ENTITY  defaultFont.label           "Fuente por defecto:">
--- a/browser/chrome/browser/preferences/fonts.dtd
+++ b/browser/chrome/browser/preferences/fonts.dtd
@@ -63,12 +63,49 @@
 
 <!-- default font type -->
 <!ENTITY  useDefaultFontSerif.label               "Serif">
 <!ENTITY  useDefaultFontSansSerif.label           "Sans Serif">
 
 <!ENTITY  allowPagesToUse.label                   "Permitir a las páginas elegir sus propias fuentes, en lugar de mis selecciones hechas arriba">
 <!ENTITY  allowPagesToUse.accesskey               "e">
 
-<!ENTITY languages.customize.Fallback.grouplabel  "Codificación de caracteres para contenido heredado">
+<!ENTITY languages.customize.Fallback.grouplabel  "Character Encoding for Legacy Content">
 <!ENTITY languages.customize.Fallback.label       "Fallback Character Encoding:">
 <!ENTITY languages.customize.Fallback.accesskey   "C">
-<!ENTITY languages.customize.Fallback.desc        "Esta codificación de caracteres es usada para contenido heredado que falló en la declaración de su codificación.">
+<!ENTITY languages.customize.Fallback.desc        "Esta codificación de caracteres es usada paa contenido  legacy que falló en la declaración de su codificación.">
+
+<!ENTITY languages.customize.Fallback.auto        "Default for Current Locale">
+<!-- LOCALIZATION NOTE (languages.customize.Fallback.arabic):
+     Translate "Arabic" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY languages.customize.Fallback.arabic      "Árabe">
+<!ENTITY languages.customize.Fallback.baltic      "Báltico">
+<!ENTITY languages.customize.Fallback.ceiso       "Europeo central, ISO">
+<!ENTITY languages.customize.Fallback.cewindows   "Europeo central, Microsoft">
+<!-- LOCALIZATION NOTE (languages.customize.Fallback.simplified):
+     Translate "Chinese" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY languages.customize.Fallback.simplified  "Chino, simplificado">
+<!-- LOCALIZATION NOTE (languages.customize.Fallback.traditional):
+     Translate "Chinese" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY languages.customize.Fallback.traditional "Chino, tradicional">
+<!ENTITY languages.customize.Fallback.cyrillic    "Cirílico">
+<!-- LOCALIZATION NOTE (languages.customize.Fallback.greek):
+     Translate "Greek" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY languages.customize.Fallback.greek       "Griego">
+<!-- LOCALIZATION NOTE (languages.customize.Fallback.hebrew):
+     Translate "Hebrew" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY languages.customize.Fallback.hebrew      "Hebreo">
+<!-- LOCALIZATION NOTE (languages.customize.Fallback.japanese):
+     Translate "Japanese" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY languages.customize.Fallback.japanese    "Japonés">
+<!-- LOCALIZATION NOTE (languages.customize.Fallback.korean):
+     Translate "Korean" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY languages.customize.Fallback.korean      "Coreano">
+<!-- LOCALIZATION NOTE (languages.customize.Fallback.thai):
+     Translate "Thai" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY languages.customize.Fallback.thai        "Tailandés">
+<!-- LOCALIZATION NOTE (languages.customize.Fallback.turkish):
+     Translate "Turkish" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY languages.customize.Fallback.turkish     "Turco">
+<!-- LOCALIZATION NOTE (languages.customize.Fallback.vietnamese):
+     Translate "Vietnamese" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY languages.customize.Fallback.vietnamese  "Vietnamita">
+<!ENTITY languages.customize.Fallback.other       "Otro (incl. europeo occidental)">
--- a/browser/chrome/browser/preferences/main.dtd
+++ b/browser/chrome/browser/preferences/main.dtd
@@ -17,20 +17,16 @@
 <!ENTITY useMultiple.label         "Usar páginas actuales">
 <!ENTITY chooseBookmark.label      "Usar un marcador…">
 <!ENTITY chooseBookmark.accesskey  "m">
 <!ENTITY restoreDefault.label      "Restaurar predeterminadas">
 <!ENTITY restoreDefault.accesskey  "R">
 
 <!ENTITY downloads.label     "Descargas">
 
-<!ENTITY showWhenDownloading.label     "Mostrar la ventana de descargas al descargar un archivo">
-<!ENTITY showWhenDownloading.accesskey "d">
-<!ENTITY closeWhenDone.label "Cerrarla cuando finalicen todas las descargas">
-<!ENTITY closeWhenDone.accesskey "f">
 <!ENTITY saveTo.label "Guardar archivos en">
 <!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">
--- a/browser/chrome/browser/preferences/security.dtd
+++ b/browser/chrome/browser/preferences/security.dtd
@@ -1,12 +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  general.label                 "General">
+
 <!ENTITY  warnAddonInstall.label        "Avisarme cuando sitios traten de instalar complementos">
 <!ENTITY  warnAddonInstall.accesskey    "A">
 
 <!-- LOCALIZATION NOTE (blockWebForgeries.label, blockAttackSites.label):
   The methods by which forged (phished) and attack sites will be detected by
   phishing providers will vary from human review to machine-based heuristics to a
   combination of both, so it's important that these strings and
   useDownloadedList.label convey the meaning "reported" (and not something like
--- a/browser/chrome/browser/syncSetup.dtd
+++ b/browser/chrome/browser/syncSetup.dtd
@@ -28,18 +28,16 @@
 <!-- New Account Page 1: Basic Account Info -->
 <!ENTITY setup.newAccountDetailsPage.title.label "Detalles de cuenta">
 <!ENTITY setup.emailAddress.label "Correo electrónico">
 <!ENTITY setup.emailAddress.accesskey "C">
 <!ENTITY setup.choosePassword.label      "Seleccione una contraseña">
 <!ENTITY setup.choosePassword.accesskey  "e">
 <!ENTITY setup.confirmPassword.label "Confirmar contraseña">
 <!ENTITY setup.confirmPassword.accesskey "o">
-<!ENTITY setup.setupMetro.label     "Sincronizar con &brandShortName; estilo Windows 8">
-<!ENTITY setup.setupMetro.accesskey "S">
 
 <!-- LOCALIZATION NOTE: tosAgree1, tosLink, tosAgree2, ppLink, tosAgree3 are
      joined with implicit white space, so spaces in the strings aren't necessary -->
 <!ENTITY setup.tosAgree1.label "Acepto los">
 <!ENTITY setup.tosAgree1.accesskey "A">
 <!ENTITY setup.tosLink.label "Términos del servicio">
 <!ENTITY setup.tosAgree2.label "y la">
 <!ENTITY setup.ppLink.label "Política de privacidad">
--- a/browser/metro/chrome/browser.dtd
+++ b/browser/metro/chrome/browser.dtd
@@ -11,18 +11,19 @@
 <!ENTITY newtab.label          "Nueva pestaǹa">
 <!ENTITY closetab.label        "Cerrar pestaña">
 
 <!ENTITY autocompleteResultsHeader.label  "Sus resultados">
 
 <!ENTITY appbarErrorConsole.label   "Abrir consola de errores">
 <!ENTITY appbarJSShell.label        "Abrir terminal JavaScript">
 <!ENTITY appbarFindInPage2.label    "Buscar en página">
-<!ENTITY appbarViewOnDesktop2.label "Ver en escritorio">
+<!ENTITY appbarRelaunchInDesktop.label "Reiniciar en escritorio">
 <!ENTITY appbarMSMetaData2.label    "Obtener aplicación para este sitio">
+<!ENTITY appbarViewPageSource.label "Ver fuente de la página">
 
 <!ENTITY topSitesHeader.label        "Más visitados">
 <!ENTITY bookmarksHeader.label       "Marcadores">
 <!ENTITY recentHistoryHeader.label   "Historial reciente">
 <!ENTITY remoteTabsHeader.label      "Pestañas de otros dispositivos">
 
 <!-- LOCALIZATION NOTE (narrowTopSitesHeader.label,
                         narrowBookmarksHeader.label,
--- a/browser/metro/chrome/browser.properties
+++ b/browser/metro/chrome/browser.properties
@@ -17,18 +17,18 @@ browser.search.contextTextSearchLabel2=S
 # Contextual Appbar - Button Labels
 
 contextAppbar2.pin.topSites=Pegar a más visitados
 contextAppbar2.pin.bookmarks=Pegar a marcadores
 contextAppbar2.pin.recentHistory=Pegar a historial reciente
 contextAppbar2.pin.downloads=Pegar a descargas
 
 contextAppbar2.unpin.topSites=Despegar de más visitados
-contextAppbar2.unpin.bookmarks=Despegar de marcadores
-contextAppbar2.unpin.recentHistory=Despegar de historial reciente
+contextAppbar2.hide.bookmarks=Ocultar marcador
+contextAppbar2.hide.recentHistory=Ocultar
 contextAppbar2.unpin.downloads=Despegar de descargas
 
 # LOCALIZATION NOTE (contextAppbar2.delete): Deletes selected pages.
 contextAppbar2.delete=Borrar
 
 # LOCALIZATION NOTE (contextAppbar2.restore): Undoes a previous deletion.
 # Button with this label only appears immediately after a deletion.
 contextAppbar2.restore=Deshacer borrar
@@ -39,48 +39,49 @@ contextAppbar2.clear=Limpiar selección
 # Clear private data
 clearPrivateData.clearButton=Borrar
 clearPrivateData.title=Borrar datos privados
 clearPrivateData.message=¿Borrar sus datos privados?
 
 # Settings Charms
 aboutCharm1=Acerca
 optionsCharm=Opciones
+searchCharm=Buscar
 helpOnlineCharm=Ayuda (en línea)
 
 # General
 # LOCALIZATION NOTE (browserForSaveLocation): Title for the "Save..." file picker dialog
 browserForSaveLocation=Guardar dirección
 # LOCALIZATION NOTE (browserForSaveLocation): Title for the "Open..." file picker dialog
 browserForOpenLocation=Abrir dirección
 
 # Download Manager
 downloadsUnknownSize=Tamaño desconocido
-downloadRun=Ejecutar
+downloadOpen=Abrir
 downloadSave=Guardar
 downloadCancel=Cancelar
 downloadTryAgain=Reintentar
-downloadRunNow=Ejecutar ahora
+downloadOpenNow=Abrir ahora
 # LOCALIZATION NOTE (downloadShowInFiles): 'Files' refers to the Windows 8 file explorer
 downloadShowInFiles=Mostrar en archivos
 
 # Alerts
 alertLinkBookmarked=Marcador agregado
 alertDownloads=Descargas
 alertDownloadsStart=Descargando: %S
 alertDownloadsDone=%S ha terminado de descargarse
 # LOCALIZATION NOTE (alertDownloadsStart2): Used in a notification bar for download progress
 # #1 is the file name, #2 is the amount downloaded so far / total amount to download, and #3 is seconds remaining.
 alertDownloadsStart2=Descargando #1, #2, #3
 alertDownloadsDone2=%S Ha sido descargado
 alertTapToSave=Toque para guardar archivo.
 alertDownloadsSize=Descarga demasiado grande
 alertDownloadsNoSpace=No hay espacio suficiente para guardar
-# LOCALIZATION NOTE (alertDownloadSave): #1 is the file name, #2 is the file size, #3 is the file host
-alertDownloadSave=¿Desea ejecutar o guardar #1 (#2) desde #3?
+# LOCALIZATION NOTE (alertDownloadSave2): #1 is the file name, #2 is the file size, #3 is the file host
+alertDownloadSave2=¿Desea abrir o guardar #1 (#2) desde #3?
 # LOCALIZATION NOTE (alertDownloadMultiple): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the number of files, #2 is (amount downloaded so far / total amount to download) and #3 is seconds remaining
 alertDownloadMultiple=Descargando un archivo, #2, #3;Descargando #1 archivos, #2, #3
 # LOCALIZATION NOTE (alertMultipleDownloadsComplete): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the number of downloads completed
 alertMultipleDownloadsComplete=Se completó una descarga;Se completaron #1 descargas
new file mode 100644
--- /dev/null
+++ b/browser/metro/chrome/searchPanel.dtd
@@ -0,0 +1,7 @@
+<!-- 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 searchFlyoutHeader.title  "Buscar">
+<!ENTITY searchSetting.title  "Buscador predeterminado">
--- a/dom/chrome/accessibility/AccessFu.properties
+++ b/dom/chrome/accessibility/AccessFu.properties
@@ -41,22 +41,22 @@ buttonmenu     =       button menu
 whitespace     =       white space
 pagetablist    =       lista de pestañas
 canvas         =       canvas
 checkmenuitem  =       check menu item
 label          =       label
 passwordtext   =       password text
 radiomenuitem  =       radio menu item
 textcontainer  =       text container
-togglebutton   =       alternar botón
+togglebutton   =       toggle button
 treetable      =       tree table
-header         =       encabezado
-footer         =       pie
+header         =       header
+footer         =       footer
 paragraph      =       párrafo
-entry          =       entrada
+entry          =       entry
 caption        =       caption
 heading        =       encabezado
 section        =       sección
 form           =       formulario
 comboboxlist   =       combo box list
 comboboxoption =       combo box option
 imagemap       =       image map
 listboxoption  =       list box option
@@ -68,16 +68,17 @@ figure         =       figura
 definitionlist =       lista de definiciones
 term           =       término
 definition     =       definición
 
 # More sophisticated roles which are not actual numeric roles
 textarea       =       área de texto
 
 # Text input types
+textInputType_date   =       fecha
 textInputType_email  =       correo
 textInputType_search =       búsqueda
 textInputType_tel    =       teléfono
 textInputType_url    =       URL
 
 # More sophisiticated object descriptions
 headingLevel   =       nivel de encabezado %S
 
@@ -121,16 +122,17 @@ spansColumns = abarca %S columnas
 spansRows = abarca %S filas
 
 # Invoked actions
 jumpAction     =      jumped
 pressAction    =      presionado
 checkAction    =      checked
 uncheckAction  =      unchecked
 selectAction   =      seleccionado
+unselectAction =      no seleccionado
 openAction     =      abierto
 closeAction    =      cerrado
 switchAction   =      switched
 clickAction    =      clicked
 collapseAction =      colapsado
 expandAction   =      expandido
 activateAction =      activado
 cycleAction    =      cycled
--- a/dom/chrome/dom/dom.properties
+++ b/dom/chrome/dom/dom.properties
@@ -132,8 +132,14 @@ LenientThisWarning=Ignorando get o set d
 # 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.
+# LOCALIZATION NOTE: Do not translate "window.showModalDialog()" or "window.open()" 
+ShowModalDialogWarning=El uso de window.showModalDialog() es obsoleto. Use window.open() en su lugar. Para más ayuda https://developer.mozilla.org/en-US/docs/Web/API/Window.open
+# LOCALIZATION NOTE: Do not translate "cloneNode()"
+UnsafeCloneNodeWarning=El comportamiento de cloneNode() sin un argumento lógico va a cambiar de hacer un clonado profundo a un clonado superficial.  Asegúrese de pasar un argumento lógico explícito para manterner el comportamiento actual.
+# LOCALIZATION NOTE: Do not translate "importNode()"
+UnsafeImportNodeWarning=El comportamiento de importNode() sin un argumento lógico va a cambiar de hacer un clonado profundo a un clonado superficial.  Asegúrese de pasar un argumento lógico explícito para manterner el comportamiento actual.
--- a/dom/chrome/layout/css.properties
+++ b/dom/chrome/layout/css.properties
@@ -61,28 +61,30 @@ PEAttSelNoClose=Se esperaba ']' para terminar selector de atributo pero se encontró '%1$S'.
 PEAttSelBadValue=Se esperaba identificador o cadena para valor en selector de atributo pero se encontró '%1$S'.
 PEPseudoSelEOF=nombre de pseudo-clase o pseudo-elemento
 PEPseudoSelBadName=Se esperaba identifier for pseudo-class or pseudo-element pero se encontró '%1$S'.
 PEPseudoSelNonFunc=Token de función para pseudo-clase o pseudo-elemento no-función, o de la otra forma, al leer '%1$S'.
 PEPseudoSelNotPE=Se esperaba pseudo-element pero se encontró '%1$S'.
 PEPseudoSelDoubleNot=Pseudo-clase de negación no puede ser negada '%1$S'.
 PEPseudoSelPEInNot=Pseudo-elementos no pueden ser negados '%1$S'.
 PEPseudoSelNewStyleOnly=Este pseudo-elemento debe usar la forma "::": '%1$S'.
-PEPseudoSelTrailing=Se encontró un símbolo detrás de un pseudo-elemento, que debe ser la última parte de un selector:  '%1$S'.
+PEPseudoSelEndOrUserActionPC=Se esperaba el fin de un selector una pseudo-class de acción del usuario después de pseudo-element pero se encontró '%1$S'.
+PEPseudoSelNoUserActionPC=Se eseraba el fin de un selector después de pseudo-element que no soporta pseudo-classes de acción del usuario pero se encontró '%1$S'.
 PEPseudoSelMultiplePE=Pseudo-elemento extra '%1$S'.
 PEPseudoSelUnknown=Pseudo-clase o pseudo-elemento desconocido '%1$S'.
 PENegationEOF=selector dentro de negación
 PENegationBadInner=Selector simple mal escrito como negación de un argumento pseudo-class '%1$S'.
 PENegationNoClose=Falta  ')' de cierre en pseudo-clase de negación '%1$S'.
 PENegationBadArg=Falta argumento en pseudo-clase de negación '%1$S'.
 PEPseudoClassArgEOF=argumento para selector de seudo-clase
 PEPseudoClassArgNotIdent=Se esperaba identificador para parámetro de seudo-clase pero se encontró '%1$S'.
 PEPseudoClassArgNotNth=Se esperaba parte del argumento de la seudo-clase pero se encontró '%1$S'.
 PEPseudoClassNoClose=Falta ')' de cierre en seudo-clase, se encontró '%1$S' en su lugar.
 PEPseudoClassNoArg=Falta argumento en seudo-clase '%1$S'.
+PEPseudoClassNotUserAction=Se esperaba un fin de selector o una acción de usuario pseudo-clase después de un pseudo-elemento pero se encontro pseudo-clase '%1$S'.
 PESelectorEOF=selector
 PEBadDeclBlockStart=Se esperaba '{' para comenzar bloque de declaración pero se encontró '%1$S'.
 PEColorEOF=color
 PEColorNotColor=Se esperaba color pero se encontró '%1$S'.
 PEColorComponentEOF=componente de color
 PEExpectedPercent=Se esperaba un porcentaje pero se encontró '%1$S'.
 PEExpectedInt=Se esperaba un entero pero se encontró '%1$S'.
 PEColorBadRGBContents=Se esperaba número o porcentaje en rgb() pero se encontró '%1$S'.
--- a/mail/chrome/messenger/messenger.dtd
+++ b/mail/chrome/messenger/messenger.dtd
@@ -561,16 +561,28 @@
 <!ENTITY tagButton.tooltip "Etiquetar mensajes">
 <!ENTITY compactButton.tooltip "Eliminar mensajes borrados de la carpeta actual">
 <!ENTITY appmenuButton1.tooltip "Mostrar el menú de &brandShortName;">
 
 <!-- Toolbar Button Popup -->
 <!ENTITY buttonMenuForwardAsInline.label "Reenviar incorporado">
 <!ENTITY buttonMenuForwardAsAttachment.label "Reenviar como adjunto">
 
+<!--Remote Content Button Popup -->
+<!ENTITY remoteContentOptionsAllowForMsg.label "Mostrar contenido remoto en este mensaje">
+<!ENTITY remoteContentOptionsAllowForMsg.accesskey "s">
+<!ENTITY remoteContentOptionAllowForAddress.label "Mostrar contenido remoto de este remitente">
+<!ENTITY remoteContentOptionAllowForAddress.accesskey "f">
+
+<!-- Phishing Button Popup -->
+<!ENTITY phishingOptionIgnore.label "Ignorar advertencia para este mensaje">
+<!ENTITY phishingOptionIgnore.accesskey "n">
+<!ENTITY phishingOptionDisableDetection.label "Deshabilitar detección de trampas para todos los mensajes">
+<!ENTITY phishingOptionDisableDetection.accesskey "D">
+
 <!-- AppMenu Popup -->
 <!ENTITY appmenuNewMsgCmd.label "Nuevo mensaje">
 <!ENTITY appmenuNewContactCmd.label "Contacto de libreta de direcciones…">
 <!ENTITY appmenuEditMenu.label "Editar">
 <!ENTITY appmenuToolbarLayout.label "Diseño de la barra…">
 <!ENTITY appmenuSelectThread.label "Seleccionar conversación">
 <!ENTITY appmenuSelectFlagged.label "Seleccionar mensajes destacados">
 
@@ -779,37 +791,16 @@
 <!ENTITY contextPlay.accesskey "R">
 <!ENTITY contextPause.label "Pausar">
 <!ENTITY contextPause.accesskey "P">
 <!ENTITY contextMute.label "Silenciar">
 <!ENTITY contextMute.accesskey "S">
 <!ENTITY contextUnmute.label "Sonido">
 <!ENTITY contextUnmute.accesskey "d">
 
-<!-- Junk Bar -->
-<!ENTITY junkBarMessage2.label "&brandShortName; piensa que este mensaje es correo basura.">
-<!ENTITY junkBarButton1.label "No es basura">
-<!ENTITY junkInfoButton.label "?">
-
-<!-- Remote Content Bar -->
-<!ENTITY remoteContentMessage2.label "Para proteger su privacidad, &brandShortName; ha bloqueado el contenido remoto en este mensaje.">
-<!ENTITY loadRemoteContentButton3.label "Mostrar contenido remoto">
-
-<!-- Phishing Bar -->
-<!ENTITY phishingBarMessage2.label "Este mensaje puede ser una trampa.">
-<!ENTITY removePhishingBarButton1.label "Ignorar advertencia">
-<!ENTITY disablePhishingWarning1.label "Deshabilitar detección de trampas para todos los mensajes">
-<!ENTITY reportPhishingError1.label "Este mensaje no parece ser una trampa">
-
-<!-- MDN Bar -->
-<!ENTITY mdnBarIgnoreButton2.label "Ignorar">
-<!ENTITY mdnBarIgnoreButton2.accesskey "I">
-<!ENTITY mdnBarSendButton2.label "Enviar acuse de recibo">
-<!ENTITY mdnBarSendButton2.accesskey "s">
-
 <!-- Quick Search Bar -->
 <!-- LOCALIZATION NOTE (quickSearchCmd.key):
      This is actually the key used for the global message search box; we have
      not changed 
      -->
 <!ENTITY quickSearchCmd.key "k">
 <!-- LOCALIZATION NOTE (search.label.base):
      This is the base of the empty text for the global search box.  We replace
--- a/mail/chrome/messenger/messenger.properties
+++ b/mail/chrome/messenger/messenger.properties
@@ -297,16 +297,44 @@ feedsAcctType=Canales
 # LOCALIZATION NOTE(nocachedbodytitle): Do not translate "<TITLE>" or "</TITLE>" in the line below
 nocachedbodytitle=<TITLE>Pasar a modo con conexión para ver este mensaje</TITLE>
 
 # mailWindowOverlay.js
 confirmUnsubscribeTitle=Confirmar la cancelación de la suscripción
 confirmUnsubscribeText=¿Está seguro de querer cancelar la suscripción a %S?
 confirmUnsubscribeManyText=¿Está seguro de querer cancelar la suscripción a estos grupos de noticias?
 restoreAllTabs=Restaurar todas las pestañas
+# LOCALIZATION NOTE(junkBarMessage): %S is brand
+junkBarMessage=%S piensa que este mensaje es basura.
+junkBarButton=No es basura
+junkBarButtonKey=N
+junkBarInfoButton=Conocer más
+junkBarInfoButtonKey=C
+
+# LOCALIZATION NOTE(remoteContentBarMessage): %S is brand
+remoteContentBarMessage=Para proteger su privacidad, %S ha bloqueado el contenido remoto en este mensaje.
+remoteContentPrefLabel=Opciones
+remoteContentPrefAccesskey=O
+remoteContentPrefLabelUnix=Preferencias
+remoteContentPrefAccesskeyUnix=P
+
+phishingBarMessage=Este mensaje puede ser una trampa.
+phishingBarPrefLabel=Opciones
+phishingBarPrefAccesskey=O
+phishingBarPrefLabelUnix=Preferencias
+phishingBarPrefAccesskeyUnix=P
+
+mdnBarIgnoreButton=Ignorar solicitud
+mdnBarIgnoreButtonKey=n
+mdnBarSendReqButton=Enviar acuse
+mdnBarSendReqButtonKey=s
+
+draftMessageMsg=Este es un mensaje borrador.
+draftMessageButton=Editar
+draftMessageButtonKey=E
 
 # msgHdrViewOverlay.js
 openLabel=Abrir
 openLabelAccesskey=b
 saveLabel=Guardar como…
 saveLabelAccesskey=A
 detachLabel=Detach…
 detachLabelAccesskey=D
--- a/mail/chrome/messenger/messengercompose/composeMsgs.properties
+++ b/mail/chrome/messenger/messengercompose/composeMsgs.properties
@@ -293,16 +293,20 @@ SaveDialogMsg=Su mensaje se ha guardado 
 CheckMsg=No volver a mostrarme esta ventana de diálogo.
 
 ## Strings used by prompt when Quitting while in progress
 quitComposeWindowTitle=Enviando mensaje
 ## LOCALIZATION NOTE (quitComposeWindowMessage): don't translate \n
 quitComposeWindowMessage2=%1$S está en proceso de enviar un mensaje.\n¿Quiere esperar a que el mensaje haya sido enviado antes de salir o salir ahora?
 quitComposeWindowQuitButtonLabel2=&Salir
 quitComposeWindowWaitButtonLabel2=&Esperar
+quitComposeWindowSaveTitle=Guardando mensaje
+## LOCALIZATION NOTE (quitComposeWindowSaveMessage): don't translate \n
+quitComposeWindowSaveMessage=%1$S está actualmente en el proceso de guardar un mensaje.\n¿Desea esperar hasta que el mensaje haya sido guardado antes de salir o sale ahora mismo?
+
 
 ## Strings used by prompt for Ctrl-Enter check before sending message
 sendMessageCheckWindowTitle=Enviar mensaje
 sendMessageCheckLabel=¿Está seguro de estar preparado para enviar este mensaje?
 sendMessageCheckSendButtonLabel=Enviar
 
 ## reply header in composeMsg
 ## <author> wrote:
@@ -318,19 +322,19 @@ renameAttachmentTitle=Renombrar adjunto
 renameAttachmentMessage=Nuevo nombre del adjunto:
 
 ## Attachment Reminder
 ## LOCALIZATION NOTE (mail.compose.attachment_reminder_keywords): comma separated
 ##   words that that should trigger an attachment reminder.
 mail.compose.attachment_reminder_keywords=adjuntar,adjunto,.doc,.pdf,currículum,cover letter
 
 addAttachmentButton=Agregar adjunto…
-addAttachmentButton.accessskey=A
+addAttachmentButton.accesskey=A
 remindLaterButton=Recordarme más tarde
-remindLaterButton.accessskey=R
+remindLaterButton.accesskey=L
 
 attachmentReminderTitle=Recordatorio de adjunto
 attachmentReminderMsg=¿Se olvidó de agregar un adjunto?
 # LOCALIZATION NOTE (attachmentReminderKeywordsMsgs): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 number of keywords
 attachmentReminderKeywordsMsgs=Se encontró una palabra sobre adjunto: ;Se encontraron #1 palabras sobre adjuntos: 
 attachmentReminderOptionsMsg=Las palabras recordatorias de adjuntos pueden configurarse en sus preferencias
--- a/mail/chrome/messenger/messengercompose/messengercompose.dtd
+++ b/mail/chrome/messenger/messengercompose/messengercompose.dtd
@@ -23,16 +23,18 @@
 <!ENTITY attachFileCmd.key "A">
 <!ENTITY attachCloudCmd.label "Filelink">
 <!ENTITY attachCloudCmd.accesskey "i">
 <!ENTITY attachPageCmd.label "Página web…">
 <!ENTITY attachPageCmd.accesskey "w">
 <!--LOCALIZATION NOTE attachVCardCmd.label Don't translate the term 'vCard' -->
 <!ENTITY attachVCardCmd.label "Tarjeta personal (vCard)">
 <!ENTITY attachVCardCmd.accesskey "p">
+<!ENTITY remindLater.label "Recordarme más tarde">
+<!ENTITY remindLater.accesskey "d">
 <!ENTITY closeCmd.label "Cerrar">
 <!ENTITY closeCmd.key "W">
 <!ENTITY closeCmd.accesskey "C">
 <!ENTITY saveCmd.label "Guardar">
 <!ENTITY saveCmd.key "S">
 <!ENTITY saveCmd.accesskey "G">
 <!ENTITY saveAsCmd.label "Guardar como">
 <!ENTITY saveAsCmd.accesskey "a">
--- a/mail/chrome/messenger/msgHdrViewOverlay.dtd
+++ b/mail/chrome/messenger/msgHdrViewOverlay.dtd
@@ -16,18 +16,16 @@
 <!ENTITY tagsHdr4.label "Etiquetas">
 <!ENTITY dateField4.label "Fecha">
 <!ENTITY userAgentField4.label "Agente de usuario">
 <!ENTITY referencesField4.label "Referencias">
 <!ENTITY messageIdField4.label "ID del mensaje">
 <!ENTITY inReplyToField4.label "En respuesta a">
 <!ENTITY originalWebsite4.label "Sitio web">
 
-<!ENTITY editMessageDescription.label "Este mensaje es borrador…">
-<!ENTITY editMessageButton.label "Editar…">
 <!ENTITY hdrArchiveButton1.label "Archivar">
 <!ENTITY hdrArchiveButton1.tooltip "Archivar este mensaje">
 <!ENTITY hdrSmartReplyButton1.label "Respuesta inteligente">
 <!ENTITY hdrReplyButton1.label "Responder">
 <!ENTITY hdrReplyButton2.tooltip "Responder al remitente de este mensaje">
 <!ENTITY hdrReplyAllButton1.label "Responder a todos">
 <!ENTITY hdrReplyAllButton1.tooltip "Responder al remitiente y a todos los receptores">
 <!ENTITY hdrReplyListButton1.label "Responder a lista">
--- a/mail/chrome/messenger/offline.properties
+++ b/mail/chrome/messenger/offline.properties
@@ -1,25 +1,25 @@
 # 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/.
 
 # Download Messages Prompt
 downloadMessagesWindowTitle1=Descargar mensajes
 downloadMessagesLabel1=¿Quiere descargar los mensajes para usar sin conexión antes de desconectarse?
 downloadMessagesCheckboxLabel1=Preguntarme siempre al desconectar
-downloadMessagesNow=Descargar ahora
+downloadMessagesNow2=&Descargar ahora
  
 # Send Messages Prompt
 sendMessagesWindowTitle1=Mensajes no enviados
 sendMessagesLabel2=¿Quiere enviar los mensajes aún no enviados?
 sendMessagesCheckboxLabel1=Preguntarme siempre que pase a modo con conexión
-sendMessagesNow=Enviar ahora
+sendMessagesNow2=Enviar ahora
 
-processMessagesLater=Más tarde
+processMessagesLater2=&Más tarde
 
 # GetMessages While Offline Prompt 
 getMessagesOfflineWindowTitle1=Obtener mensajes
 getMessagesOfflineLabel1=En este momento se encuentra en modo Sin conexión.\n¿Quiere conectarse para bajar sus nuevos mensajes?
  
 # Send Messages Offline Prompt
 sendMessagesOfflineWindowTitle1=Mensajes No Enviados
 sendMessagesOfflineLabel1=En este momento se encuentra en modo Sin conexión.\n¿Quiere conectarse para bajar sus nuevos mensajes?
--- a/mail/chrome/messenger/prefs.properties
+++ b/mail/chrome/messenger/prefs.properties
@@ -1,16 +1,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # The following are used by the Account Wizard
 #
 enterValidEmail=Por favor, ingrese una dirección de correo electrónico válida.
-accountExists=Ya existe una cuenta de correo o noticias con el mismo nombre de usuario y servidor. Pulse Atrás e introduzca un nombre de servidor diferente, o pulse Cancelar.
+accountNameExists=Ya existe una cuenta con ese nombre. Ingrese un nombre de cuenta diferente.
+accountNameEmpty=El nombre de la cuenta no puede estar vacío.
 modifiedAccountExists=Ya existe una cuenta con ese nombre de usuario y servidor. Por favor introduzca un nombre de usuario y/o servidor diferente.
 userNameChanged=Su nombre de usuario ha sido actualizado. Puede que también tenga que actualizar su dirección de correo y/o el nombre de usuario asociado a esta cuenta.
 serverNameChanged=Ha cambiado el nombre del servidor en la configuración. Por favor, compruebe que todas las carpetas utilizadas por los filtros existen en el nuevo servidor.
 # LOCALIZATION NOTE (junkSettingsBroken): %1$S is the account name
 junkSettingsBroken=La configuración de basura de la cuenta "%1$S" posiblemente tiene un problema. ¿Desea revisarlo antes de guardar la configuración de la cuenta?
 # LOCALIZATION NOTE (localDirectoryChanged): %1$S is program name (&brandShortName;)
 localDirectoryChanged=%1$S necesita reiniciar ahora para aplicar el cambio a la configuración de directorio local.
 localDirectoryRestart=Reiniciar
--- a/mobile/android/base/android_strings.dtd
+++ b/mobile/android/base/android_strings.dtd
@@ -173,20 +173,23 @@ size. -->
 <!ENTITY datareporting_telemetry_summary "Comparte rendimiento, uso, hardware y datos de personalización sobre tu navegador con &vendorShortName; para ayudarnos a mejorar a &brandShortName;">
 <!ENTITY datareporting_crashreporter_summary "&brandShortName; envía informes de fallos para ayudar a &vendorShortName; a hacer tu navegador más estable y seguro">
 <!-- Localization note (datareporting_crashreporter_title_short) : This string matches
      (crashReporterSection.label) in en-US/chrome/browser/preferences/advanced.dtd.-->
 <!ENTITY datareporting_crashreporter_title_short "Informe de fallos">
 <!ENTITY datareporting_wifi_title "Servicios de ubicación de &vendorShortName;">
 <!ENTITY datareporting_wifi_summary "Ayudar a mejorar los servicios de geolocalización para la web abierta permitiendo que &brandShortName; recolecte y envíe datos anónimos sobre torres de celulares">
 
-<!ENTITY pref_update_autodownload "Actualizaciones automáticas">
+<!-- Localization note (pref_update_autodownload2) : This should mention downloading
+     specifically, since the pref only prevents automatic downloads and not the
+     actual notification that an update is available. -->
+<!ENTITY pref_update_autodownload2 "Descargar actualizaciones automáticamente">
 <!ENTITY pref_update_autodownload_wifi "Sólo sobre Wi-Fi">
-<!ENTITY pref_update_autodownload_disabled "Deshabilitadas">
-<!ENTITY pref_update_autodownload_enabled "Habilitadas">
+<!ENTITY pref_update_autodownload_never "Nunca">
+<!ENTITY pref_update_autodownload_always "Siempre">
 
 <!ENTITY quit "Salir">
 
 <!ENTITY addons "Complementos">
 <!ENTITY downloads "Descargas">
 <!ENTITY apps "Aplicaciones">
 <!ENTITY char_encoding "Codificación de caracteres">
 
@@ -223,16 +226,17 @@ size. -->
 <!ENTITY contextmenu_paste "Pegar">
 <!ENTITY contextmenu_copyurl "Copiar dirección">
 <!ENTITY contextmenu_edit_bookmark "Editar">
 <!ENTITY contextmenu_subscribe "Suscribir a página">
 <!ENTITY contextmenu_site_settings "Editar configuración del sitio">
 <!ENTITY contextmenu_top_sites_edit "Editar">
 <!ENTITY contextmenu_top_sites_pin "Pegar sitio">
 <!ENTITY contextmenu_top_sites_unpin "Despegar sitio">
+<!ENTITY contextmenu_add_search_engine "Agregar un buscador">
 
 <!ENTITY pref_titlebar_mode "Barra de título">
 <!ENTITY pref_titlebar_mode_title "Mostrar título de la página">
 <!ENTITY pref_titlebar_mode_url "Mostrar dirección de la página">
 
 <!ENTITY history_removed "Página eliminada">
 
 <!ENTITY bookmark_edit_title "Editar marcador">
@@ -366,8 +370,13 @@ just addresses the organization to follo
 <!ENTITY exit_guest_session "Salir de sesión de invitado">
 <!ENTITY guest_session_dialog_continue "Continuar">
 <!ENTITY guest_session_dialog_cancel "Cancelar">
 <!ENTITY new_guest_session_title "&brandShortName; se reiniciará">
 <!ENTITY new_guest_session_text "La persona que lo use no podrá ver nada de tus datos personales de navegación (como contraseñas guardadas, historial o marcadores).\n\nCuando el invitado termine, sus datos de navegación se borrarán y tu sesión se restaurará.">
 
 <!ENTITY exit_guest_session_title "&brandShortName; se reiniciará">
 <!ENTITY exit_guest_session_text "Los datos de navegación de esta sesión se borrarán.">
+
+<!-- These are only used for accessiblity for the done and overflow-menu buttons in the actionbar.
+     They are never shown to users -->
+<!ENTITY actionbar_menu "Menú">
+<!ENTITY actionbar_done "Listo">
--- a/mobile/android/chrome/browser.properties
+++ b/mobile/android/chrome/browser.properties
@@ -17,16 +17,23 @@ alertDownloadsSize=Descarga demasiado gr
 alertDownloadsNoSpace=No hay espacio suficiente
 alertDownloadsToast=Descarga iniciada…
 alertDownloadsPause=Pausar
 alertDownloadsResume=Continuar
 alertDownloadsCancel=Cancelar
 
 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
+alertSearchEngineDuplicateToast='%S' ya es uno de tus buscadores
+
 downloadCancelPromptTitle=Cancelar descarga
 downloadCancelPromptMessage=¿Querés cancelar esta descarga?
 
 # LOCALIZATION NOTE (addonError-1, addonError-2, addonError-3, addonError-4):
 # #1 is the add-on name, #2 is the add-on host, #3 is the application name
 addonError-1=El complemento no pudo descargase por una falla en la conexión a #2.
 addonError-2=El complemento de #2 no pudo instalarse porque no coincide con lo que esperaba #3.
 addonError-3=El complemento descargado desde #2 no pudo instalarse porque parece estar corrupto.
@@ -181,18 +188,17 @@ contextmenu.shareMedia=Compartir Video
 contextmenu.showControls2=Mostrar controles
 contextmenu.mute=Mudo
 contextmenu.unmute=Unmute
 contextmenu.saveVideo=Guardar video
 contextmenu.saveAudio=Guardar audio
 contextmenu.addToContacts=Agregar a contactos
 
 contextmenu.copy=Copiar
-contextmenu.copyAll=Copiar todo
-contextmenu.selectWord=Seleccionar palabra
+contextmenu.cut=Cortar
 contextmenu.selectAll=Seleccionar todo
 contextmenu.paste=Pegar
 
 # Select UI
 selectHelper.closeMultipleSelectDialog=Listo
 
 #Input widgets UI
 inputWidgetHelper.date=Elegí una fecha
--- a/mobile/android/chrome/config.dtd
+++ b/mobile/android/chrome/config.dtd
@@ -1,8 +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/. -->
 
-<!ENTITY search.placeholder2    "Preferencias de búsqueda">
-<!ENTITY clear.altText          "Limpiar">
-<!ENTITY newpref.label2         "Agregar una nueva preferencia">
+
+<!ENTITY toolbar.searchPlaceholder     "Buscar">
+
+<!ENTITY newPref.namePlaceholder       "Nombre">
+
+<!ENTITY newPref.valueBoolean          "Lógico">
+<!ENTITY newPref.valueString           "Cadena">
+<!ENTITY newPref.valueInteger          "Entero">
 
+<!ENTITY newPref.stringPlaceholder     "Ingresá una cadena">
+<!ENTITY newPref.numberPlaceholder     "Ingresá un número">
+
+<!ENTITY newPref.toggleButton          "Alternar">
+<!ENTITY newPref.cancelButton          "Cancelar">
+
+<!ENTITY contextMenu.copyPrefName      "Copiar nombre">
+<!ENTITY contextMenu.copyPrefValue     "Copiar valor">
--- a/mobile/android/chrome/config.properties
+++ b/mobile/android/chrome/config.properties
@@ -1,19 +1,9 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-addPref.title=Agregar
-addPref.selectType=Seleccioná tipo:
-addPref.type.string=Cadena
-addPref.type.integer=Entero
-addPref.type.boolean=Lógico
-addPref.enterName=Ingresá nombre:
+newPref.createButton=Crear
+newPref.changeButton=Cambiar
 
-togglePref.label=Alternar
-modifyPref.label=Modificar
-modifyPref.selectText=Seleccioná valor para %1$S:
-modifyPref.promptText=Ingresá valor para %1$S:
-modifyPref.numberErrorTitle=Valor inválido
-modifyPref.numberErrorText=El texto ingresado nofue un número
-
-resetPref.label=Reiniciar
+pref.toggleButton=Alternar
+pref.resetButton=Reiniciar
--- a/mobile/android/chrome/handling.properties
+++ b/mobile/android/chrome/handling.properties
@@ -1,5 +1,8 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 protocol.failed=No se puede encontrar una aplicación para abrir este enlace
+# A very short string shown in the button toast when no application can open the url
+protocol.toast.search=Buscar
+
--- a/suite/chrome/common/quitDialog.properties
+++ b/suite/chrome/common/quitDialog.properties
@@ -1,12 +1,8 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 quitDialogTitle=Salir de %S
 restartDialogTitle=Reiniciar %S
 
 restartNowTitle=&Reiniciar ahora
 restartLaterTitle=Reiniciar más &tarde
 quitTitle=&Salir
 cancelTitle=&Cancelar
 saveTitle=&Guardar y salir
--- a/suite/chrome/mailnews/pref/pref-character_encoding.dtd
+++ b/suite/chrome/mailnews/pref/pref-character_encoding.dtd
@@ -1,11 +1,46 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<!-- ***** BEGIN LICENSE BLOCK *****
+ Version: MPL 1.1/GPL 2.0/LGPL 2.1
+
+ The contents of this file are subject to the Mozilla Public License Version
+ 1.1 (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+ http://www.mozilla.org/MPL/
+
+ Software distributed under the License is distributed on an "AS IS" basis,
+ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ for the specific language governing rights and limitations under the
+ License.
+
+ The Original Code is Mozilla Communicator client code, released
+ March 31, 1998.
+
+ The Initial Developer of the Original Code is
+ Netscape Communications Corporation.
+ Portions created by the Initial Developer are Copyright (C) 1998-1999
+ the Initial Developer. All Rights Reserved.
+
+ Contributor(s):
+   Stefan Borggraefe <Stefan.Borggraefe@gmx.de>
+   Ian Neal <bugzilla@arlen.demon.co.uk>
+
+ Alternatively, the contents of this file may be used under the terms of
+ either of the GNU General Public License Version 2 or later (the "GPL"),
+ or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ in which case the provisions of the GPL or the LGPL are applicable instead
+ of those above. If you wish to allow use of your version of this file only
+ under the terms of either the GPL or the LGPL, and not to allow others to
+ use your version of this file under the terms of the MPL, indicate your
+ decision by deleting the provisions above and replace them with the notice
+ and other provisions required by the GPL or the LGPL. If you do not delete
+ the provisions above, a recipient may use your version of this file under
+ the terms of any one of the MPL, the GPL or the LGPL.
+
+ ***** END LICENSE BLOCK ***** -->
 
 <!ENTITY pref.character.encoding.title   "Codificación de caracteres">
 <!ENTITY messageDisplay.caption          "Vista de Mensajes">
 <!ENTITY viewDefaultCharset.label        "Codificación predeterminada:">
 <!ENTITY viewDefaultCharset.accesskey    "d">
 
 <!ENTITY composingMessages.caption       "Redactar mensajes">
 <!ENTITY useMIME.label                   "Para mensajes que contienen caracteres de 8 bits, use la codificación MIME 'quoted printable'. Deje sin tildar para enviar el mensaje como está ahora.">
--- a/toolkit/chrome/global-platform/mac/intl.properties
+++ b/toolkit/chrome/global-platform/mac/intl.properties
@@ -1,10 +1,8 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# moved from navigator/locale/navigator.properties
-intl.charset.default=ISO-8859-1
 # LOCALIZATION NOTE (intl.ellipsis): Use the unicode ellipsis char, \u2026,
 # or use "..." unless \u2026 doesn't suit traditions in your locale.
 intl.ellipsis=…
 
--- a/toolkit/chrome/global-platform/unix/intl.properties
+++ b/toolkit/chrome/global-platform/unix/intl.properties
@@ -1,10 +1,8 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# moved from navigator/locale/navigator.properties
-intl.charset.default=ISO-8859-1
 # LOCALIZATION NOTE (intl.ellipsis): Use the unicode ellipsis char, \u2026,
 # or use "..." unless \u2026 doesn't suit traditions in your locale.
 intl.ellipsis=…
 
--- a/toolkit/chrome/global-platform/win/intl.properties
+++ b/toolkit/chrome/global-platform/win/intl.properties
@@ -1,9 +1,7 @@
 # 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/.
 
-# moved from navigator/locale/navigator.properties
-intl.charset.default=ISO-8859-1
 # LOCALIZATION NOTE (intl.ellipsis): Use the unicode ellipsis char, \u2026,
 # or use "..." unless \u2026 doesn't suit traditions in your locale.
 intl.ellipsis=…
--- a/toolkit/chrome/global/aboutTelemetry.properties
+++ b/toolkit/chrome/global/aboutTelemetry.properties
@@ -33,16 +33,18 @@ memoryMapTitle = Mapa de memoria:
 errorFetchingSymbols = Ocurrió un error al descargar símbolos. Verifique que está conectado a Internet e intente nuevamente.
 
 histogramSamples = samples
 
 histogramAverage = promedio
 
 histogramSum = suma
 
+histogramCopy = Copiar
+
 disableTelemetry = Deshabiitar Telemetry
 
 enableTelemetry = Habilitar Telemetry
 
 keysHeader = Propiedad
 
 valuesHeader = Valor
 
new file mode 100644
--- /dev/null
+++ b/toolkit/chrome/global/devtools/styleinspector.properties
@@ -0,0 +1,91 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE These strings are used inside the Style Inspector.
+#
+# 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 (panelTitle): This is the panel title
+panelTitle=Inspector de estilos
+
+# LOCALIZATION NOTE (rule.status): For each style property the panel shows
+# the rules which hold that specific property. For every rule, the rule status
+# is also displayed: a rule can be the best match, a match, a parent match, or a
+# rule did not match the element the user has highlighted.
+rule.status.BEST=Mejor coincidencia
+rule.status.MATCHED=Coincidencia
+rule.status.PARENT_MATCH=Coincidencia de padre
+
+# LOCALIZATION NOTE (rule.sourceElement, rule.sourceInline): For each
+# style property the panel shows the rules which hold that specific property.
+# For every rule, the rule source is also displayed: a rule can come from a
+# file, from the same page (inline), or from the element itself (element).
+rule.sourceInline=incorporado
+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 para 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
+# the title attribute of the warning icon.
+rule.warning.title=Valor de propiedad inválido
+
+# LOCALIZATION NOTE (ruleView.empty): Text displayed when the highlighter is
+# first opened and there's no node selected in the rule view.
+rule.empty=Ningún elemento seleccionado.
+
+# LOCALIZATION NOTE (ruleView.contextmenu.selectAll): Text displayed in the
+# rule view context menu.
+ruleView.contextmenu.selectAll=Seleccionar todo
+
+# LOCALIZATION NOTE (ruleView.contextmenu.selectAll.accessKey): Access key for
+# the rule view context menu "Select all" entry.
+ruleView.contextmenu.selectAll.accessKey=a
+
+# LOCALIZATION NOTE (ruleView.contextmenu.copy): Text displayed in the rule view
+# context menu.
+ruleView.contextmenu.copy=Copiar
+
+# LOCALIZATION NOTE (ruleView.contextmenu.copy.accessKey): Access key for
+# the rule view context menu "Select all" entry.
+ruleView.contextmenu.copy.accessKey=C
+
+# LOCALIZATION NOTE (computedView.contextmenu.selectAll): Text displayed in the
+# computed view context menu.
+computedView.contextmenu.selectAll=Seleccionar todo
+
+# LOCALIZATION NOTE (computedView.contextmenu.selectAll.accessKey): Access key for
+# the computed view context menu "Select all" entry.
+computedView.contextmenu.selectAll.accessKey=a
+
+# LOCALIZATION NOTE (computedView.contextmenu.copy): Text displayed in the
+# computed view context menu.
+computedView.contextmenu.copy=Copiar
+
+# LOCALIZATION NOTE (computedView.contextmenu.copy.accessKey): Access key for
+# the computed view context menu "Select all" entry.
+computedView.contextmenu.copy.accessKey=C
--- a/toolkit/chrome/global/intl.properties
+++ b/toolkit/chrome/global/intl.properties
@@ -22,17 +22,15 @@ pluralRule=1
 # menuitems in the "selectLangs" menulist in
 # browser/components/preferences/fonts.xul
 font.language.group = x-western
 # Localization Note: Add the code for your language at the front of this entry,
 # leaving "en-us, en" for fallback. It's recommended to use the same form, e.g.
 # "ja-jp, ja, en-us, en"
 intl.accept_languages = es-ar, es, en-us, en
 intl.charsetmenu.browser.static = ISO-8859-1, UTF-8
-# Localization Note: Never change the following entry.
-intl.charset.default = ISO-8859-1
 intl.charset.detector = 
 intl.charsetmenu.mailedit = ISO-8859-1, ISO-8859-15, ISO-8859-6, armscii-8, geostd8, ISO-8859-13, ISO-8859-14, ISO-8859-2, GB2312, GB18030, Big5, KOI8-R, windows-1251, KOI8-U, ISO-8859-7, ISO-8859-8-I, windows-1255, ISO-2022-JP, EUC-KR, ISO-8859-10, ISO-8859-3, TIS-620, ISO-8859-9, UTF-8, VISCII
 # valid intl.menuitems.appendedacceskeys are: true or false, <empty string> (missing or empty preference equals false)
 intl.menuitems.alwaysappendaccesskeys = 
 # valid intl.menuitems.insertseparatorbeforeaccesskeys are: true or false, <empty string> (missing or empty preference equals false)
 intl.menuitems.insertseparatorbeforeaccesskeys = true
 
--- a/webapprt/webapprt/getUserMediaDialog.dtd
+++ b/webapprt/webapprt/getUserMediaDialog.dtd
@@ -1,17 +1,17 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this file,
    - You can obtain one at http://mozilla.org/MPL/2.0/.  -->
 
 <!-- LOCALIZATION NOTE: These are localized strings for the getUserMedia dialog
    - to ask permissions in the webapp runtime. -->
 
-<!ENTITY getUserMediaDialog.title                 "Compartir medios">
-<!ENTITY getUserMediaDialog.buttonlabelaccept     "Compartir">
-<!ENTITY getUserMediaDialog.buttonaccesskeyaccept "C">
-<!ENTITY getUserMediaDialog.buttonlabelcancel     "Cancelar">
-<!ENTITY getUserMediaDialog.buttonaccesskeycancel "n">
+<!ENTITY getUserMediaDialog.title                   "Compartir medios">
+<!ENTITY getUserMediaDialog.button.accept.label     "Compartir">
+<!ENTITY getUserMediaDialog.button.accept.accesskey "C">
+<!ENTITY getUserMediaDialog.button.cancel.label     "Cancelar">
+<!ENTITY getUserMediaDialog.button.cancel.accesskey "n">
 
-<!ENTITY getUserMediaDialog.video.label           "Seleccionar cámara">
-<!ENTITY getUserMediaDialog.video.noVideo         "Sin video">
-<!ENTITY getUserMediaDialog.audio.label           "Seleccionar micrófono">
-<!ENTITY getUserMediaDialog.audio.noAudio         "Sin audio">
+<!ENTITY getUserMediaDialog.video.label             "Seleccionar cámara">
+<!ENTITY getUserMediaDialog.video.noVideo           "Sin video">
+<!ENTITY getUserMediaDialog.audio.label             "Seleccionar micrófono">
+<!ENTITY getUserMediaDialog.audio.noAudio           "Sin audio">