Partial fix
authorMarcelo Poli <mpoli@lt24.zzn.com>
Tue, 29 Oct 2013 21:31:45 -0300
changeset 1562 7b65d74c28a0778f79ccf6d1ddd8dd23c3b15c91
parent 1537 206ed911b6bf81ac4c3400cd42356ef83ee6b524
child 1563 f0d164d55069b7ff2cbe87cfec431da7a76cecbe
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:47:06 +0000
Partial fix
browser/chrome/browser/browser.properties
browser/chrome/browser/devtools/debugger.dtd
browser/chrome/browser/devtools/scratchpad.properties
browser/chrome/browser/devtools/styleeditor.properties
browser/chrome/browser/devtools/styleinspector.properties
browser/chrome/browser/devtools/toolbox.dtd
browser/chrome/browser/devtools/webConsole.dtd
browser/chrome/browser/places/places.dtd
browser/chrome/browser/places/places.properties
browser/metro/chrome/browser.dtd
browser/metro/chrome/browser.properties
browser/metro/chrome/preferences.dtd
browser/searchplugins/metrolist.txt
dom/chrome/appstrings.properties
mobile/android/base/android_strings.dtd
mobile/android/chrome/aboutHome.dtd
mobile/android/chrome/browser.properties
toolkit/chrome/global/aboutTelemetry.properties
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -426,16 +426,18 @@ service.install.ok.accesskey=e
 service.install.learnmore=Conocer más…
 
 # LOCALIZATION NOTE (social.turnOff.label): %S is the name of the social provider
 social.turnOff.label=Desactivar %S
 social.turnOff.accesskey=t
 # LOCALIZATION NOTE (social.turnOn.label): %S is the name of the social provider
 social.turnOn.label=Activar %S
 social.turnOn.accesskey=t
+social.turnOffAll.label=Desactivar todos los servicios
+social.turnOnAll.label=Activar todos los servicios
 
 # LOCALIZATION NOTE (social.markpageMenu.label): %S is the name of the social provider
 social.markpageMenu.label=Guardar página en %S
 # LOCALIZATION NOTE (social.marklinkMenu.label): %S is the name of the social provider
 social.marklinkMenu.label=Guardar enlace en %S
 
 # LOCALIZATION NOTE (social.error.message): %1$S is brandShortName (e.g. Firefox), %2$S is the name of the social provider
 social.error.message=%1$S no se puede conectar con %2$S en este momento.
--- a/browser/chrome/browser/devtools/debugger.dtd
+++ b/browser/chrome/browser/devtools/debugger.dtd
@@ -28,16 +28,20 @@
   - the text displayed in the button to stop black boxing the currently selected
   - source. -->
 <!ENTITY debuggerUI.blackBoxMessage.unBlackBoxButton "Quitar este fuente de la caja negra">
 
 <!-- LOCALIZATION NOTE (debuggerUI.optsButton.tooltip): This is the tooltip for
   -  the button that opens up an options context menu for the debugger UI. -->
 <!ENTITY debuggerUI.optsButton.tooltip  "Opciones del depurador">
 
+<!-- LOCALIZATION NOTE (debuggerUI.sources.prettyPrint): This is the tooltip for the
+button that pretty prints the selected source. -->
+<!ENTITY debuggerUI.sources.prettyPrint "Emprolijar fuente">
+
 <!-- LOCALIZATION NOTE (debuggerUI.pauseExceptions): This is the label for the
   -  checkbox that toggles pausing on exceptions. -->
 <!ENTITY debuggerUI.pauseExceptions          "Pausar en excepciones">
 <!ENTITY debuggerUI.pauseExceptions.key "E">
 
 <!-- LOCALIZATION NOTE (debuggerUI.pauseExceptions): This is the label for the
   -  checkbox that toggles ignoring caught exceptions. -->
 <!ENTITY debuggerUI.ignoreCaughtExceptions     "Ignore caught exceptions">
@@ -117,16 +121,21 @@
 <!ENTITY debuggerUI.seMenuBreak.key     "B">
 
 <!-- LOCALIZATION NOTE (debuggerUI.seMenuCondBreak): This is the text that
   -  appears in the source editor context menu for adding a conditional
   -  breakpoint. -->
 <!ENTITY debuggerUI.seMenuCondBreak     "Add conditional breakpoint">
 <!ENTITY debuggerUI.seMenuCondBreak.key "B">
 
+<!-- LOCALIZATION NOTE (debuggerUI.instruments.*): This is the text that
+  -  appears in the debugger's instruments pane tabs. -->
+<!ENTITY debuggerUI.tabs.variables      "Variables">
+<!ENTITY debuggerUI.tabs.events         "Eventos">
+
 <!-- LOCALIZATION NOTE (debuggerUI.seMenuAddWatch): This is the text that
   -  appears in the source editor context menu for adding an expression. -->
 <!ENTITY debuggerUI.seMenuAddWatch      "Seleccionar para ver expresión">
 <!ENTITY debuggerUI.seMenuAddWatch.key  "E">
 
 <!-- LOCALIZATION NOTE (debuggerUI.addWatch): This is the text that
   -  appears in the watch expressions context menu for adding an expression. -->
 <!ENTITY debuggerUI.addWatch            "Add watch expression">
--- a/browser/chrome/browser/devtools/scratchpad.properties
+++ b/browser/chrome/browser/devtools/scratchpad.properties
@@ -88,8 +88,18 @@ propertiesFilterPlaceholder=Propiedades 
 
 # 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
+
+# LOCALIZATION NOTE (scratchpad.tooltip):  This string is displayed in the
+# tooltip of the tab when the Scratchpad is displayed inside the developer tools
+# window.
+scratchpad.tooltip=Borrador
--- a/browser/chrome/browser/devtools/styleeditor.properties
+++ b/browser/chrome/browser/devtools/styleeditor.properties
@@ -64,20 +64,20 @@ open.accesskey=i
 # conjunction with accel (Command on Mac or Ctrl on other platforms) to Save
 saveStyleSheet.commandkey=S
 
 # LOCALIZATION NOTE (ToolboxStyleEditor.label):
 # This string is displayed in the title of the tab when the debugger is
 # displayed inside the developer tools window and in the Developer Tools Menu.
 ToolboxStyleEditor.label=Editor de estilo
 
-# LOCALIZATION NOTE (ToolboxStyleEditor.tooltip):
-# This string is displayed in the tooltip of the tab when the debugger is
+# LOCALIZATION NOTE (ToolboxStyleEditor.tooltip2):
+# This string is displayed in the tooltip of the tab when the style editor is
 # displayed inside the developer tools window.
-ToolboxStyleEditor.tooltip=Editor de hojas de estilo CSS
+ToolboxStyleEditor.tooltip2=Editor de hojas de estilo (CSS)
 
 # LOCALIZATION NOTE (confirmNavigationAway): Shown in a notification box when
 # the user tries to navigate away from a web page.
 confirmNavigationAway.message=Si deja esta página, los cambios no guardados en el editor de estilo se perderán.
 confirmNavigationAway.buttonLeave=Dejar página
 confirmNavigationAway.buttonLeaveAccesskey=D
 confirmNavigationAway.buttonStay=Permanecer en la página
 confirmNavigationAway.buttonStayAccesskey=S
--- a/browser/chrome/browser/devtools/styleinspector.properties
+++ b/browser/chrome/browser/devtools/styleinspector.properties
@@ -53,8 +53,40 @@ helpLinkTitle=Lea la documentación de esta propiedad
 # 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
@@ -16,24 +16,46 @@
 <!ENTITY toolboxZoomIn.key2            "="> <!-- + is above this key on many keyboards -->
 <!ENTITY toolboxZoomOut.key            "-">
 <!ENTITY toolboxZoomReset.key          "0">
 
 <!-- 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.requiresRestart2): This is the requires
-  -  restart label at right of settings that require a browser restart to be
-  -  effective. -->
-<!ENTITY options.context.requiresRestart2  "Requiere reinicio del navegador">
+<!-- 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">
+
+<!-- LOCALIZATION NOTE (options.defaultColorUnit.label): This is the label for a
+  -  dropdown list that controls the default color unit used in the inspector.
+  -  This label is visible in the options panel. -->
+<!ENTITY options.defaultColorUnit.label "Unidad de color predeterminada">
+
+<!-- LOCALIZATION NOTE (options.defaultColorUnit.accesskey): This is the access
+  -  key for a dropdown list that controls the default color unit used in the
+  -  inspector. This is visible in the options panel. -->
+<!ENTITY options.defaultColorUnit.accesskey "U">
 
-<!-- LOCALIZATION NOTE (options.restartButton.label): This is the label for the
-  -  restart button next to options.context.requiresRestart2 label. -->
-<!ENTITY options.restartButton.label  "Reiniciar ahora">
+<!-- LOCALIZATION NOTE (options.defaultColorUnit.hex): This is used in the
+  -  'Default color unit' dropdown list and is visible in the options panel. -->
+<!ENTITY options.defaultColorUnit.hex "Hex">
+
+<!-- LOCALIZATION NOTE (options.defaultColorUnit.hsl): This is used in the
+  -  'Default color unit' dropdown list and is visible in the options panel. -->
+<!ENTITY options.defaultColorUnit.hsl "HSL(A)">
+
+<!-- LOCALIZATION NOTE (options.defaultColorUnit.rgb): This is used in the
+  -  'Default color unit' dropdown list and is visible in the options panel. -->
+<!ENTITY options.defaultColorUnit.rgb "RGB(A)">
+
+<!-- LOCALIZATION NOTE (options.defaultColorUnit.name): This is used in
+  -  the 'Default color unit' dropdown list and is visible in the options panel.
+  -  -->
+<!ENTITY options.defaultColorUnit.name "Nombres de colores">
 
 <!-- LOCALIZATION NOTE (options.context.triggersPageRefresh2): This is the
   -  triggers page refresh label next to the settings in the advanced settings
   -  group in the options panel which trigger page reload. -->
 <!ENTITY options.context.triggersPageRefresh2  "Solo sesión actual, recarga la página">
 
 <!-- LOCALIZATION NOTE (options.enableChrome.label3): This is the label for the
   -  checkbox that toggles chrome debugging, i.e. devtools.chrome.enabled
--- a/browser/chrome/browser/devtools/webConsole.dtd
+++ b/browser/chrome/browser/devtools/webConsole.dtd
@@ -63,35 +63,35 @@
 <!ENTITY btnPageSecurity.accesskey "S">
 
 <!-- LOCALIZATION NOTE (btnPageLogging): This is used as the text of the
   -  the toolbar. It shows or hides messages that the web developer inserted on
   -  the page for debugging purposes, using calls such console.log() and
   -  console.error(). -->
 <!ENTITY btnPageLogging.label   "Registro">
 <!ENTITY btnPageLogging.tooltip "Registrar mensajes enviados al objeto window.console">
-<!ENTITY btnPageLogging.accesskey2 "R">
+<!ENTITY btnPageLogging.accesskey3 "R">
 <!ENTITY btnConsoleErrors       "Errores">
 <!ENTITY btnConsoleInfo         "Información">
 <!ENTITY btnConsoleWarnings     "Advertencias">
 <!ENTITY btnConsoleLog          "Registro">
 
 <!ENTITY filterOutput.placeholder "Salida del filtro">
 <!ENTITY btnClear.label        "Limpiar">
 <!ENTITY btnClear.tooltip      "Limpiar la salida de la consola web">
+<!ENTITY btnClear.accesskey    "r">
 
 <!ENTITY fullZoomEnlargeCmd.commandkey  "+">
 <!ENTITY fullZoomEnlargeCmd.commandkey2 "="> <!-- + is above this key on many keyboards -->
 <!ENTITY fullZoomEnlargeCmd.commandkey3 "">
 
 <!ENTITY fullZoomReduceCmd.commandkey   "-">
 <!ENTITY fullZoomReduceCmd.commandkey2  "">
 
 <!ENTITY fullZoomResetCmd.commandkey    "0">
 <!ENTITY fullZoomResetCmd.commandkey2   "">
 
 <!ENTITY copyURLCmd.label     "Copiar dirección del enlace">
 <!ENTITY copyURLCmd.accesskey "a">
 
 <!ENTITY closeCmd.key         "W">
 <!ENTITY findCmd.key          "F">
-<!ENTITY clearOutputCmd.key   "K">
 <!ENTITY clearOutputCtrl.key  "L">
--- a/browser/chrome/browser/places/places.dtd
+++ b/browser/chrome/browser/places/places.dtd
@@ -56,17 +56,17 @@
 <!ENTITY cmd.open_tab.accesskey           "i">
 <!ENTITY cmd.open_all_in_tabs.label       "Abrir todo en pestañas">
 <!ENTITY cmd.open_all_in_tabs.accesskey   "o">
 
 <!ENTITY cmd.properties.label             "Propiedades">
 <!ENTITY cmd.properties.accesskey         "d">
 
 <!ENTITY cmd.sortby_name.label            "Ordenar por nombre">
-<!ENTITY cmd.sortby_name.accesskey        "n">
+<!ENTITY cmd.sortby_name.accesskey        "S">
 <!ENTITY cmd.context_sortby_name.accesskey  "r">
 
 <!ENTITY cmd.new_bookmark.label             "Nuevo marcador…">
 <!ENTITY cmd.new_bookmark.accesskey         "m">
 <!ENTITY cmd.new_folder.label               "Nueva carpeta…">
 <!ENTITY cmd.new_folder.accesskey           "N">
 <!ENTITY cmd.context_new_folder.accesskey   "N">
 <!ENTITY cmd.new_separator.label            "Nuevo separador">
@@ -76,17 +76,17 @@
 <!ENTITY cmd.reloadLivebookmark.accesskey   "R">
 
 <!ENTITY cmd.moveBookmarks.label            "Mover…">
 <!ENTITY cmd.moveBookmarks.accesskey        "M">
 
 <!ENTITY col.name.label                    "Nombre">
 <!ENTITY col.tags.label                    "Etiquetas">
 <!ENTITY col.url.label                     "Dirección">
-<!ENTITY col.lastvisit.label               "Fecha de visita">
+<!ENTITY col.mostrecentvisit.label "Visita más reciente">
 <!ENTITY col.visitcount.label              "Cantidad de visitas">
 <!ENTITY col.keyword.label                 "Palabra clave">
 <!ENTITY col.description.label             "Descripción">
 <!ENTITY col.dateadded.label               "Agregado">
 <!ENTITY col.lastmodified.label            "Última modificación">
 
 <!ENTITY search.label                      "Buscar:">
 <!ENTITY search.accesskey                  "S">
--- a/browser/chrome/browser/places/places.properties
+++ b/browser/chrome/browser/places/places.properties
@@ -20,34 +20,38 @@ bookmarksRestoreParseError=No se puede p
 
 bookmarksLivemarkLoading=Cargando marcador vivo…
 bookmarksLivemarkFailed=El marcador vivo falló al cargarse.
 
 menuOpenLivemarkOrigin.label=Abrir "%S"
 
 sortByName=Ordenar '%S' por nombre
 sortByNameGeneric=Ordenar por nombre
-view.sortBy.name.label=Ordenar por nombre
-view.sortBy.name.accesskey=n
-view.sortBy.url.label=Ordenar por dirección
-view.sortBy.url.accesskey=O
-view.sortBy.date.label=Ordenar por fecha de visita
-view.sortBy.date.accesskey=v
-view.sortBy.visitCount.label=Ordenar por cantidad de visitas
-view.sortBy.visitCount.accesskey=c
-view.sortBy.keyword.label=Ordenar por palabra clave
-view.sortBy.keyword.accesskey=p
-view.sortBy.description.label=Ordenar por descripción
-view.sortBy.description.accesskey=d
-view.sortBy.dateAdded.label=Ordenar por agregado
-view.sortBy.dateAdded.accesskey=g
-view.sortBy.lastModified.label=Ordenar por última modificación
-view.sortBy.lastModified.accesskey=m
-view.sortBy.tags.label=Ordenar por etiquetas
-view.sortBy.tags.accesskey=e
+# LOCALIZATION NOTE (view.sortBy.1.name.label): sortBy properties are versioned.
+# When any of these changes, all of the properties must be bumped, and the
+# change must be annotated here.  Both label and accesskey must be updated.
+# - version 1: changed view.sortBy.1.date.
+view.sortBy.1.name.label=Ordenar por nombre
+view.sortBy.1.name.accesskey=n
+view.sortBy.1.url.label=Ordenar por dirección
+view.sortBy.1.url.accesskey=O
+view.sortBy.1.date.label=Ordenar por fecha de visita
+view.sortBy.1.date.accesskey=v
+view.sortBy.1.visitCount.label=Ordenar por cantidad de visitas
+view.sortBy.1.visitCount.accesskey=c
+view.sortBy.1.keyword.label=Ordenar por palabra clave
+view.sortBy.1.keyword.accesskey=p
+view.sortBy.1.description.label=Ordenar por descripción
+view.sortBy.1.description.accesskey=d
+view.sortBy.1.dateAdded.label=Ordenar por agregado
+view.sortBy.1.dateAdded.accesskey=g
+view.sortBy.1.lastModified.label=Ordenar por última modificación
+view.sortBy.1.lastModified.accesskey=m
+view.sortBy.1.tags.label=Ordenar por etiquetas
+view.sortBy.1.tags.accesskey=e
 
 searchBookmarks=Buscar en marcadores
 searchHistory=Buscar en historial
 searchDownloads=Buscar en descargas
 
 tabs.openWarningTitle=Confirmar apertura
 tabs.openWarningMultipleBranded=Está por abrir %S pestañas.  Ésto puede hacer que %S funcione mucho más lento mientras las páginas se cargan.  ¿Está seguro que quiere continuar?
 tabs.openButtonMultiple=Abrir pestañas
--- a/browser/metro/chrome/browser.dtd
+++ b/browser/metro/chrome/browser.dtd
@@ -1,41 +1,41 @@
 <!-- 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/. -->
 
 <!-- NAVBAR AND AUTOCOMPLETE -->
 
-<!ENTITY urlbar.emptytext      "Enter Search or Address">
+<!ENTITY urlbar.emptytext      "Ingrese búsqueda o dirección">
 
 <!ENTITY back.label            "Atrás">
 <!ENTITY forward.label         "Adelante">
 <!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 topSitesHeader.label        "Top Sites">
+<!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,
                         narrowHistoryHeader.label,
                         narrowRemoteTabsHeader.label )
      are shortened versions of topSitesHeader.label, bookmarksHeader.label, recentHistoryHeader.label
      and remoteTabsHeader.label. Need to be two words or shorter to fit in narrow vertical space.
       -->
-<!ENTITY narrowTopSitesHeader.label      "Top Sites">
+<!ENTITY narrowTopSitesHeader.label      "Más visitados">
 <!ENTITY narrowBookmarksHeader.label     "Marcadores">
 <!ENTITY narrowRecentHistoryHeader.label "Historial reciente">
 <!ENTITY narrowRemoteTabsHeader.label    "Pestañas remotas">
 
 <!ENTITY downloadsHeader.label     "Descargas">
 <!ENTITY downloadShowPage.label    "Ir a página">
 <!ENTITY downloadShow2.label       "Buscar">
 <!ENTITY downloadOpen2.label       "Abrir">
@@ -73,23 +73,23 @@
 <!-- LINK CONTEXT MENU -->
 <!ENTITY contextOpenLinkTab.label          "Abrir enlace en nueva pestaña">
 <!ENTITY contextCopyLinkHref.label         "Copiar enlace">
 <!ENTITY contextBookmarkLinkHref.label     "Marcar enlace">
 
 <!-- IMAGE CONTEXT MENU -->
 <!-- LOCALIZATION NOTE (contextSaveImageLib.label): saves an image to the users "pictures library"
      (Explorer -> left hand side navigation pane -> Libraries -> Pictures) -->
-<!ENTITY contextSaveImageLib.label         "Save to picture library">
+<!ENTITY contextSaveImageLib.label         "Guardar en biblioteca de imágenes">
 <!ENTITY contextCopyImage.label            "Copiar imagen">
 <!ENTITY contextCopyImageLocation.label    "Copiar dirección de la imagen">
 <!ENTITY contextOpenImageTab.label         "Abrir imagen en nueva pestaña">
 
 <!-- VIDEO CONTEXT MENU -->
-<!ENTITY contextSaveVideoLib.label         "Save to video library">
+<!ENTITY contextSaveVideoLib.label         "Guardar en biblioteca de video">
 <!ENTITY contextCopyVideoLocation.label    "Copiar dirección del video">
 <!ENTITY contextOpenVideoTab.label         "Abrir video en nueva pestaña">
 
 <!-- KEYBOARD SHORTCUTS -->
 <!ENTITY reload.key "r">
 <!ENTITY focusURL.key "l">
 <!ENTITY urlbar.accesskey "d">
 <!ENTITY openFile.key "o">
--- a/browser/metro/chrome/browser.properties
+++ b/browser/metro/chrome/browser.properties
@@ -11,134 +11,134 @@
 
 # LOCALIZATION NOTE (browser.search.contextTextSearchLabel2): search context
 # menu item text will be: |Search (browser.search.defaultenginename) for "string"|
 # browser.search.defaultenginename is defined in region.properties
 browser.search.contextTextSearchLabel2=Search %S for "%S"
 
 # Contextual Appbar - Button Labels
 
-contextAppbar2.pin.topSites=Pin to Top Sites
-contextAppbar2.pin.bookmarks=Pin to Bookmarks
-contextAppbar2.pin.recentHistory=Pin to Recent History
-contextAppbar2.pin.downloads=Pin to Downloads
+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=Unpin from Top Sites
-contextAppbar2.unpin.bookmarks=Unpin from Bookmarks
-contextAppbar2.unpin.recentHistory=Unpin from Recent History
-contextAppbar2.unpin.downloads=Unpin from Downloads
+contextAppbar2.unpin.topSites=Despegar de más visitados
+contextAppbar2.unpin.bookmarks=Despegar de marcadores
+contextAppbar2.unpin.recentHistory=Despegar de historial reciente
+contextAppbar2.unpin.downloads=Despegar de descargas
 
 # LOCALIZATION NOTE (contextAppbar2.delete): Deletes selected pages.
-contextAppbar2.delete=Delete
+contextAppbar2.delete=Borrar
 
 # LOCALIZATION NOTE (contextAppbar2.restore): Undoes a previous deletion.
 # Button with this label only appears immediately after a deletion.
-contextAppbar2.restore=Undo delete
+contextAppbar2.restore=Deshacer borrar
 
 # LOCALIZATION NOTE (contextAppbar2.clear): Unselects pages without modification.
-contextAppbar2.clear=Clear selection
+contextAppbar2.clear=Limpiar selección
 
 # Settings Charms
-aboutCharm1=About
-optionsCharm=Options
-helpOnlineCharm=Help (online)
+aboutCharm1=Acerca
+optionsCharm=Opciones
+helpOnlineCharm=Ayuda (en línea)
 
 # General
 # LOCALIZATION NOTE (browserForSaveLocation): Title for the "Save..." file picker dialog
-browserForSaveLocation=Save Location
+browserForSaveLocation=Guardar dirección
 # LOCALIZATION NOTE (browserForSaveLocation): Title for the "Open..." file picker dialog
-browserForOpenLocation=Open Location
+browserForOpenLocation=Abrir dirección
 
 # Download Manager
-downloadsUnknownSize=Unknown size
-downloadRun=Run
-downloadSave=Save
-downloadCancel=Cancel
-downloadTryAgain=Try Again
-downloadRunNow=Run it now
+downloadsUnknownSize=Tamaño desconocido
+downloadRun=Ejecutar
+downloadSave=Guardar
+downloadCancel=Cancelar
+downloadTryAgain=Reintentar
+downloadRunNow=Ejecutar ahora
 # LOCALIZATION NOTE (downloadShowInFiles): 'Files' refers to the Windows 8 file explorer
-downloadShowInFiles=Show in Files
+downloadShowInFiles=Mostrar en archivos
 
 # Alerts
-alertLinkBookmarked=Bookmark added
-alertDownloads=Downloads
-alertDownloadsStart=Downloading: %S
-alertDownloadsDone=%S has finished downloading
+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=Downloading #1, #2, #3
-alertDownloadsDone2=%S has been downloaded
-alertTapToSave=Tap to save this file.
-alertDownloadsSize=Download too big
-alertDownloadsNoSpace=Not enough storage space
+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=Do you want to run or save #1 (#2) from #3?
+alertDownloadSave=¿Desea ejecutar 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=Downloading one file, #2, #3;Downloading #1 files, #2, #3
+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=One download has been completed;#1 downloads have been completed
-alertDownloadFailed=Sorry, downloading %S failed.
+alertMultipleDownloadsComplete=Se completó una descarga;Se completaron #1 descargas
+alertDownloadFailed=Falló la descarga de %S.
 
 # Popup Blocker
 # LOCALIZATION NOTE (popupWarning.message): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is brandShortName and #2 is the number of pop-ups blocked.
-popupWarning.message=#1 prevented this site from opening a pop-up window.;#1 prevented this site from opening #2 pop-up windows.
-popupButtonAllowOnce2=Allow once
-popupButtonAlwaysAllow3=Always allow
-popupButtonNeverWarn3=Never allow
+popupWarning.message=#1 evitó que este sitio abra una ventana emergente.;#1 evitó que este sitio abra #2 ventanas emergentes.
+popupButtonAllowOnce2=Permitir una vez
+popupButtonAlwaysAllow3=Permitir siempre
+popupButtonNeverWarn3=No permitir nunca
 
 # ContentPermissionsPrompt
-contentPermissions.alwaysForSite=Always for this site
-contentPermissions.neverForSite=Never for this site
+contentPermissions.alwaysForSite=Siempre para este sitio
+contentPermissions.neverForSite=Nunca para este sitio
 
 # Geolocation UI
 # LOCALIZATION NOTE (geolocation2.allow): If you're having trouble with the
 # word Share, please use Allow and Block in your language.
-geolocation2.allow=Share location
+geolocation2.allow=Compartir ubicación
 
 # LOCALIZATION NOTE (geolocation2.wantsTo offlineApps.wantsTo indexedDBQuota.wantsTo):
 # %S is the domain name of the web site.
-geolocation2.wantsTo=Share your location with %S?
+geolocation2.wantsTo=¿Compartir su ubicación con %S?
 
-geolocation.learnMore=Learn more…
+geolocation.learnMore=Conocer más…
 
 # Error Console
 typeError=Error:
-typeWarning=Warning:
+typeWarning=Advertencia:
 
 # Offline web applications
-offlineApps.allow=Allow
-offlineApps.wantsTo=%S wants to store data on your device for offline use.
+offlineApps.allow=Permitir
+offlineApps.wantsTo=%S desea guardar datos en su dispositivo para usar sin conexión.
 
 # IndexedDB Quota increases
-indexedDBQuota.allow=Allow
-indexedDBQuota.wantsTo=%S wants to store a lot of data on your device for offline use.
+indexedDBQuota.allow=Permitir
+indexedDBQuota.wantsTo=%S desea guardar una cantidad importante de datos en su dispositivo para usar sin conexión.
 
-tabs.emptyTabTitle=New Tab
+tabs.emptyTabTitle=Nueva pestaña
 
 # Open Search
 # LOCALIZATION NOTE (opensearch.search.header): %S is the word or phrase
 # typed by the user in the urlbar to search
-opensearch.search.header=Search for “%S” on:
+opensearch.search.header=Buscar “%S” en:
 
 # Check for Updates in the About Panel - button labels and accesskeys
 # LOCALIZATION NOTE - all of the following update buttons labels will only be
 # displayed one at a time. So, if a button is displayed nothing else will
 # be displayed alongside of the button. The button when displayed is located
 # directly under the Firefox version in the about dialog (see bug 596813 for
 # screenshots).
-update.checkInsideButton.label=Check for Updates
-update.checkInsideButton.accesskey=C
-update.resumeButton.label=Resume Downloading %S…
-update.resumeButton.accesskey=D
-update.openUpdateUI.applyButton.label=Apply Update…
+update.checkInsideButton.label=Buscar actualizaciones
+update.checkInsideButton.accesskey=c
+update.resumeButton.label=Continuar la descarga de %S…
+update.resumeButton.accesskey=d
+update.openUpdateUI.applyButton.label=Aplicar actualización…
 update.openUpdateUI.applyButton.accesskey=A
-update.restart.updateButton.label=Restart to Update
+update.restart.updateButton.label=Reiniciar para actualizar
 update.restart.updateButton.accesskey=R
-update.openUpdateUI.upgradeButton.label=Upgrade Now…
-update.openUpdateUI.upgradeButton.accesskey=U
-update.restart.upgradeButton.label=Upgrade Now
-update.restart.upgradeButton.accesskey=U
+update.openUpdateUI.upgradeButton.label=Actualizar ahora…
+update.openUpdateUI.upgradeButton.accesskey=u
+update.restart.upgradeButton.label=Actualizar ahora
+update.restart.upgradeButton.accesskey=u
--- a/browser/metro/chrome/preferences.dtd
+++ b/browser/metro/chrome/preferences.dtd
@@ -10,33 +10,33 @@
 <!ENTITY optionsHeader.startup.title                             "Inicio">
 <!ENTITY optionsHeader.homepage.title                            "Al iniciar &brandShortName;, mostrar">
 <!ENTITY optionsHeader.homepage.startPage.button                 "página de inicio">
 <!ENTITY optionsHeader.homepage.sessionRestore.button            "pestañas de la última vez">
 <!ENTITY optionsHeader.char.title                                "Codificación de caracteres">
 <!ENTITY optionsHeader.char.autodetect.label                     "Autodetectar">
 <!ENTITY optionsHeader.char.options.label                        "Mostrar opciones de codificación en la barra de aplicaciones">
 
-<!ENTITY clearPrivateData.title                                  "Clear Private Data">
-<!ENTITY clearPrivateData.label                                  "Clear your browsing history, passwords, cookies, and form data on this device">
-<!ENTITY clearPrivateData.button                                 "Clear">
-<!ENTITY clearPrivateData.done                                   "Done!">
+<!ENTITY clearPrivateData.title                                  "Limpiar datos privados">
+<!ENTITY clearPrivateData.label                                  "Limpiar historial de navegación, contraseñas, cookies y datos de formularios de este dispositivo">
+<!ENTITY clearPrivateData.button                                 "Limpiar">
+<!ENTITY clearPrivateData.done                                   "¡Listo!">
 <!ENTITY clearPrivateData.history                                "Historial de navegación">
 <!ENTITY clearPrivateData.otherdata                              "Otros datos (contraseñas, caché, cookies, etc)">
 <!ENTITY clearPrivateData.downloadHist                           "Historial de descargas">
 <!ENTITY clearPrivateData.cookies                                "Cookies">
 <!ENTITY clearPrivateData.cache                                  "Caché">
 <!ENTITY clearPrivateData.sitePref                               "Preferencias de sitio">
 <!ENTITY clearPrivateData.formSearchHist                         "Form &amp; search history">
-<!ENTITY clearPrivateData.passwords                              "Saved passwords">
+<!ENTITY clearPrivateData.passwords                              "Contraseñas guardadas">
 <!ENTITY clearPrivateData.offline                                "Offline website data">
 <!ENTITY clearPrivateData.logins                                 "Active logins">
 
-<!ENTITY optionsHeader.privacy.passwords.label                   "Remember Passwords">
-<!ENTITY doNotTrack.title                                        "Do Not Track">
-<!ENTITY doNotTrack.desc                                         "Tell sites:">
-<!ENTITY doNotTrack.options.trackingNotOkay                      "I do not want to be tracked">
+<!ENTITY optionsHeader.privacy.passwords.label                   "Recordar contraseñas">
+<!ENTITY doNotTrack.title                                        "No rastrear">
+<!ENTITY doNotTrack.desc                                         "Decirle a los sitios:">
+<!ENTITY doNotTrack.options.trackingNotOkay                      "No quiero ser rastreado">
 <!ENTITY doNotTrack.options.noPreference                         "Nothing about my tracking preferences">
-<!ENTITY doNotTrack.options.trackingOkay                         "I want to be tracked">
+<!ENTITY doNotTrack.options.trackingOkay                         "Quiero ser rastreado">
 <!ENTITY optionsHeader.reporting.title                           "Crash Reporter">
 <!ENTITY optionsHeader.reporting.crashes.label                   "&brandShortName; submits crash reports to help Mozilla make your browser more stable and secure">
 <!ENTITY optionsHeader.telemetry.title                            "Telemetry">
 <!ENTITY optionsHeader.telemetry.label                            "Shares usage statistics about &brandShortName; with Mozilla to help us make your browser better">
new file mode 100644
--- /dev/null
+++ b/browser/searchplugins/metrolist.txt
@@ -0,0 +1,4 @@
+bing
+googlemetrofx
+wikipedia
+yahoo
--- a/dom/chrome/appstrings.properties
+++ b/dom/chrome/appstrings.properties
@@ -28,10 +28,9 @@ externalProtocolPrompt=Una aplicación externa debe iniciarse para manejar %1$S: enlaces. Enalce pedido:\n\n\n%2$S\nAplicación: %3$S\n\n\nSi no está solicitando este pedido, puede ser un intento de explotar una debilidad de aquel programa. Cancele este pedido a menos que esté seguro que no es malicioso.\n
 externalProtocolUnknown=<Desconocido>
 externalProtocolChkMsg=Recordar para todos los enlaces de este tipo.
 externalProtocolLaunchBtn=Iniciar aplicación
 malwareBlocked=El sitio web %S ha sido reportado como un sitio de ataque y fue bloqueado basado en sus preferencias de seguridad.
 phishingBlocked=El sitio web %S ha sido reportado como un sitio fraudulento diseñado para engañar usuarios para que compartan información personal o financiera.
 cspFrameAncestorBlocked=Esta página tiene una política de seguridad de contenido que evita que sea incrustada de esta forma.
 corruptedContentError=La página que está tratando de ver no puede mostrarse porque se detectó un error en la transmisión de los datos.
 remoteXUL=Esta página usa una tecnología no soportada que ya no está disponible por defecto.
-#LOCALIZATION NOTE (tabcrashed): The following string is shown in the tab title if a page with a blank title has crashed. Current UX says that the tab title should remain blank
-tabcrashed=
+
--- a/mobile/android/base/android_strings.dtd
+++ b/mobile/android/base/android_strings.dtd
@@ -220,27 +220,26 @@ size. -->
 <!ENTITY contextmenu_add_to_launcher "Agregar a pantalla de inicio">
 <!ENTITY contextmenu_share "Compartir">
 <!ENTITY contextmenu_pasteandgo "Pegar e ir">
 <!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_bookmarks_edit "Editar">
-<!ENTITY contextmenu_top_bookmarks_pin "Pegar sitio">
-<!ENTITY contextmenu_top_bookmarks_unpin "Despegar sitio">
+<!ENTITY contextmenu_top_sites_edit "Editar">
+<!ENTITY contextmenu_top_sites_pin "Pegar sitio">
+<!ENTITY contextmenu_top_sites_unpin "Despegar sitio">
 
 <!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_add "Agregar un marcador">
 <!ENTITY bookmark_edit_title "Editar marcador">
 <!ENTITY bookmark_edit_name "Nombre">
 <!ENTITY bookmark_edit_location "Dirección">
 <!ENTITY bookmark_edit_keyword "Palabra clave">
 
 <!-- Localization note (site_settings_*) : These strings are used in the "Site Settings"
      dialog that appears after selecting the "Edit Site Settings" context menu item. -->
 <!ENTITY site_settings_title3       "Configuración del sitio">
@@ -265,37 +264,38 @@ size. -->
 <!ENTITY button_ok "Aceptar">
 <!ENTITY button_cancel "Cancelar">
 <!ENTITY button_yes "Si">
 <!ENTITY button_no "No">
 <!ENTITY button_clear_data "Limpiar datos">
 <!ENTITY button_set "Establecer">
 <!ENTITY button_clear "Limpiar">
 
+<!ENTITY home_top_sites_title "Más visitados">
+<!-- Localization note (home_top_sites_add): This string is used as placeholder
+     text underneath empty thumbnails in the Top Sites page on about:home. -->
+<!ENTITY home_top_sites_add "Agregar un sitio">
+
 <!ENTITY home_history_title "Historial">
 <!ENTITY home_last_tabs_title "Pestañas de la última vez">
 <!ENTITY home_last_tabs_open "Abrir todas las pestañas de la última vez">
 <!ENTITY home_last_tabs_empty "Tus pestañas recientes aparecen acá.">
 <!ENTITY home_most_recent_title "Más recientes">
 <!ENTITY home_most_recent_empty "Los sitios web visitados mas recientemente aparecen acá.">
-<!ENTITY home_most_visited_title "Más visitados">
 <!ENTITY home_reading_list_empty "Los artículos guardados para ver más tarde aparecen acá.">
 <!-- Localization note (home_reading_list_hint): The "TIP" string is synonymous to "hint", "clue", etc. This string is displayed
      as an advisory message on how to add content to the reading list when the reading list empty.
      The "&#37;I" in the string will be replaced by a small image of the icon described, and can be moved to wherever
      it is applicable. Please keep the spacing around the "&#37;I" string. -->
 <!ENTITY home_reading_list_hint "CONSEJO: Guardá artículos en tu lista de lectura con una presión larga en el ícono &#37;I cuando aparezca en la barra de título.">
 <!-- Localization note (home_reading_list_hint_accessible): This string is used
      as alternate text for accessibility. It is not visible in the UI. -->
 <!ENTITY home_reading_list_hint_accessible "CONSEJO: Guardá artículos en tu lista de lectura con una presión larga en el botón de modo lectura cuando aparezca en la barra de título.">
 
-<!ENTITY home_most_visited_empty "Los sitios web visitados mas frecuentemente aparecen acá.">
-
-<!ENTITY home_most_visited_empty "Los sitios web visitados mas frecuentemente aparecen acá.">
-<!ENTITY pin_bookmark_dialog_hint "Ingresá una palabra a buscar">
+<!ENTITY pin_site_dialog_hint "Ingresá una palabra a buscar">
 
 <!ENTITY filepicker_title "Seleccionar archivo">
 <!ENTITY filepicker_audio_title "Seleccionar o grabar un sonido">
 <!ENTITY filepicker_image_title "Seleccionar o tomar una foto">
 <!ENTITY filepicker_video_title "Seleccionar o grabar un video">
 
 <!-- Site identity popup -->
 <!ENTITY identity_connected_to "Está conectado a">
new file mode 100644
--- /dev/null
+++ b/mobile/android/chrome/aboutHome.dtd
@@ -0,0 +1,5 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY abouthome.title                  "Inicio de &brandShortName;">
--- a/mobile/android/chrome/browser.properties
+++ b/mobile/android/chrome/browser.properties
@@ -11,16 +11,19 @@ alertAddonsInstalledNoRestart=Instalación completa
 alertAddonsFail=Falló la instalación
 
 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
 
 alertFullScreenToast=Presioná ATRAS para dejar el modo de pantalla completa
 
 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
--- a/toolkit/chrome/global/aboutTelemetry.properties
+++ b/toolkit/chrome/global/aboutTelemetry.properties
@@ -40,8 +40,16 @@ histogramSum = suma
 
 disableTelemetry = Deshabiitar Telemetry
 
 enableTelemetry = Habilitar Telemetry
 
 keysHeader = Propiedad
 
 valuesHeader = Valor
+
+addonTableID = ID del complemento
+
+addonTableDetails = Detalles
+
+# Note to translators:
+# - The %1$S will be replaced with the name of an Add-on Provider (e.g. "XPI", "Plugin")
+addonProvider = Proveedor de %1$S