Partial fix
authorMarcelo Poli <mpoli@lt24.zzn.com>
Tue, 04 Mar 2014 14:43:58 -0300
changeset 1642 a25f867926725ee5660da1cc329c9ab1a4b80d32
parent 1641 b28e5ddfbdd56626d0e0ea24db216a47643242fc
child 1643 b20fd720e1553e71389c0d6a7214d24f3059f8e6
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:47:06 +0000
Partial fix
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/customizableui/customizableWidgets.properties
browser/chrome/browser/devtools/debugger.dtd
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -10,17 +10,17 @@
 <!-- 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 appmenu.tooltip                     "Abrir menú">
 <!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
@@ -94,16 +94,26 @@ These should match what Safari and other
 <!ENTITY exitFullScreenCmd.label "Salir de pantalla completa">
 <!ENTITY exitFullScreenCmd.accesskey "l">
 <!ENTITY fullScreenCmd.label "Pantalla completa">
 <!ENTITY fullScreenCmd.accesskey "l">
 <!ENTITY fullScreenCmd.macCommandKey "f">
 <!ENTITY showAllTabsCmd.label "Mostrar todas las pestañas">
 <!ENTITY showAllTabsCmd.accesskey "a">
 
+<!ENTITY fxaSignIn.label "Ingresar a &syncBrand.shortName.label;">
+<!ENTITY fxaSignInError.label "Reconectar a &syncBrand.shortName.label;">
+<!ENTITY syncStartPanel.heading "&brandShortName; ahora está sincronizado">
+<!ENTITY syncStartPanel.subTitle "Puede administrar &syncBrand.shortName.label; en Opciones.">
+<!ENTITY syncStartPanel.subTitleUnix "Puede administrar &syncBrand.shortName.label; en Preferencias.">
+<!ENTITY syncErrorPanel.heading "No se puede conectar a &syncBrand.shortName.label;">
+<!ENTITY syncErrorPanel.subTitle "Ingrese para continuar sincronización.">
+<!ENTITY syncErrorPanel.signInButton.label "Ingresar">
+<!ENTITY syncErrorPanel.signInButton.accesskey "s">
+
 <!ENTITY fullScreenMinimize.tooltip "Minimizar">
 <!ENTITY fullScreenRestore.tooltip "Restaurar">
 <!ENTITY fullScreenClose.tooltip "Cerrar">
 <!ENTITY fullScreenAutohide.label "Ocultar barras de herramientas">
 <!ENTITY fullScreenAutohide.accesskey "h">
 <!ENTITY fullScreenExit.label "Salir de pantalla completa">
 <!ENTITY fullScreenExit.accesskey "S">
 <!ENTITY fullscreenAllowButton.label "Permitir">
@@ -114,29 +124,31 @@ These should match what Safari and other
 <!ENTITY leaveDOMFullScreen.accesskey "S">
 
 <!ENTITY closeWindow.label "Cerrar ventana">
 <!ENTITY closeWindow.accesskey "C">
 
 <!ENTITY bookmarksMenu.label "Marcadores">
 <!ENTITY bookmarksMenu.accesskey "M">
 <!ENTITY bookmarkThisPageCmd.label "Marcar esta página">
+<!ENTITY editThisBookmarkCmd.label "Editar este marcador">
 <!ENTITY bookmarkThisPageCmd.commandkey "d">
 <!ENTITY markPageCmd.commandkey "l">
 <!ENTITY sharePageCmd.label "Compartir esta página">
 <!ENTITY sharePageCmd.commandkey "S">
 <!ENTITY sharePageCmd.accesskey "s">
 <!ENTITY shareLinkCmd.label "Compartir este enlace">
 <!ENTITY shareLinkCmd.accesskey "s">
 <!ENTITY shareImageCmd.label "Compartir esta imagen">
 <!ENTITY shareImageCmd.accesskey "s">
 <!ENTITY shareSelectCmd.label "Compartir selección">
 <!ENTITY shareSelectCmd.accesskey "s">
 <!ENTITY shareVideoCmd.label "Compartir este video">
 <!ENTITY shareVideoCmd.accesskey "s">
+<!ENTITY feedsMenu.label "Suscribir">
 <!ENTITY subscribeToPageMenupopup.label "Suscribirse a esta página">
 <!ENTITY subscribeToPageMenuitem.label "Suscribirse a esta página…">
 <!ENTITY addCurPagesCmd.label "Marcar todas las pestañas…">
 <!ENTITY showAllBookmarks2.label "Mostrar todos los marcadores">
 <!ENTITY unsortedBookmarksCmd.label "Marcadores sin ordenar">
 <!ENTITY bookmarksToolbarChevron.tooltip "Mostrar más marcadores">
 
 <!ENTITY backCmd.label "Atrás">
@@ -332,22 +344,25 @@ These should match what Safari and other
 <!-- 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 appMenuCustomize.tooltip "Personalizar el menú y las barras de herramientas">
 <!ENTITY appMenuCustomizeExit.label "Salir de personalizar">
+<!ENTITY appMenuCustomizeExit.tooltip "Finalizar personalización">
 <!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 appMenuHistory.viewSidebar.label "Ver barra lateral de historial">
+<!ENTITY appMenuHelp.tooltip "Abrir menú de ayuda">
 
 <!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.moveToToolbar.label "Mover a barra de herramientas">
 <!ENTITY customizeMenu.moveToToolbar.accesskey "o">
 <!-- LOCALIZATION NOTE (customizeMenu.moveToPanel.accesskey) can appear on the
@@ -375,22 +390,16 @@ These should match what Safari and other
 <!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)
@@ -594,16 +603,17 @@ you can use these alternative items. Oth
 <!ENTITY fullScreenButton.tooltip       "Mostrar la ventana en pantalla completa">
 
 <!ENTITY zoomOutButton.tooltip          "Acercar">
 <!ENTITY zoomInButton.tooltip           "Alejar">
 <!ENTITY zoomControls.label             "Controles de zoom">
 
 <!ENTITY quitApplicationCmdWin.label "Salir">
 <!ENTITY quitApplicationCmdWin.accesskey "S">
+<!ENTITY quitApplicationCmdWin.tooltip     "Salir de &brandShortName;">
 <!ENTITY goBackCmd.commandKey "[">
 <!ENTITY goForwardCmd.commandKey "]">
 <!ENTITY quitApplicationCmd.label "Salir">
 <!ENTITY quitApplicationCmd.accesskey "S">
 <!ENTITY quitApplicationCmdMac.label    "Salir de &brandShortName;">
 <!-- LOCALIZATION NOTE(quitApplicationCmdUnix.key): This keyboard shortcut is used by both Linux and OSX builds. -->
 <!ENTITY quitApplicationCmdUnix.key     "Q">
 
@@ -712,18 +722,22 @@ The word "toolbar" is appended automatic
 <!ENTITY social.learnMore.label "Conocer más…">
 <!ENTITY social.learnMore.accesskey "m">
 <!ENTITY social.closeNotificationItem.label "No ahora">
 
 
 
 <!ENTITY 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.menuAndToolbars.header2 "Herramientas y funcionalidades adicionales">
+<!ENTITY customizeMode.menuAndToolbars.empty "¿Quiere más herramientas?">
+<!ENTITY customizeMode.menuAndToolbars.emptyLink "Elija entre miles de complementos">
 <!ENTITY customizeMode.restoreDefaults "Restaurar predeterminadas">
+<!ENTITY customizeMode.toolbars "Mostrar / ocultar barras de herramientas">
+<!ENTITY customizeMode.titlebar "Barra de títulos">
 
 <!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">
@@ -757,9 +771,14 @@ The word "toolbar" is appended automatic
      a CSS length value. -->
 <!ENTITY pluginNotification.width "28em">
 
 <!ENTITY tabCrashed.header "Pestaña colgada">
 <!ENTITY tabCrashed.message "Bueno, esto es vergonzoso. Tratamos de mostrar esta página web, pero no está respondiendo.">
 <!ENTITY tabCrashed.checkSendReport "Decirle a &vendorShortName; sobre este cuelgue así pueden arreglarlo.">
 <!ENTITY tabCrashed.tryAgain "Intentar nuevamente">
 
+<!ENTITY uiTour.infoPanel.close "Cerrar">
 
+<!ENTITY openLocationCmd.label         "Abrir ubicación…">
+<!ENTITY openLocationCmd.accesskey     "u">
+ <!ENTITY switchToMetroCmd2.label       "Reiniciar en &brandShortName; para Windows 8 Táctil">
+
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -201,16 +201,22 @@ update.downloadAndInstallButton.accesske
 
 # RSS Pretty Print
 feedShowFeedNew=Suscribirse a '%S'…
 
 menuOpenAllInTabs.label=Abrir todo en pestañas
 
 # History menu
 menuRestoreAllTabs.label=Restaurar todas las pestañas
+# LOCALIZATION NOTE (menuRestoreAllTabsSubview.label): like menuRestoreAllTabs.label,
+# but used in the history subview in the panel UI, so needs to mention these are *closed* tabs.
+menuRestoreAllTabsSubview.label=Restaurar pestañas cerradas
+# LOCALIZATION NOTE (menuRestoreAllWindowsSubview.label): like menuRestoreAllWindows.label,
+# but used in the history subview in the panel UI, so needs to mention these are *closed* windows.
+menuRestoreAllWindowsSubview.label=Restaurar ventanas cerradas
 # LOCALIZATION NOTE (menuRestoreAllWindows, menuUndoCloseWindowLabel, menuUndoCloseWindowSingleTabLabel):
 # see bug 394759
 menuRestoreAllWindows.label=Restaurar todas las ventanas
 # LOCALIZATION NOTE (menuUndoCloseWindowLabel): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 Window Title, #2 Number of tabs
 menuUndoCloseWindowLabel=#1 (y otra pestaña);#1 (y otras #2 pestañas)
 menuUndoCloseWindowSingleTabLabel=#1
@@ -224,19 +230,37 @@ tabHistory.goForward=Avanzar a esta página
 pasteAndGo.label=Pegar e ir
 
 # Block autorefresh
 refreshBlocked.goButton=Permitir
 refreshBlocked.goButton.accesskey=P
 refreshBlocked.refreshLabel=%S evitó que esta página se recargue automáticamente.
 refreshBlocked.redirectLabel=%S evitó que esta página se redireccione automáticamente a otra página.
 
+# General bookmarks button
+# LOCALIZATION NOTE (bookmarksMenuButton.tooltip):
+# %S is the keyboard shortcut for "Show All Bookmarks"
+bookmarksMenuButton.tooltip=Mostrar marcadores (%S)
 # Star button
 starButtonOn.tooltip=Editar este marcador
 starButtonOff.tooltip=Marcar esta página
+starButtonOverflowed.label=Marcar esta página
+starButtonOverflowedStarred.label=Editar este marcador
+
+# Print button tooltip on OS X
+# LOCALIZATION NOTE (printButton.tooltip):
+# Use the unicode ellipsis char, \u2026,
+# or use "..." if \u2026 doesn't suit traditions in your locale.
+# %S is the keyboard shortcut for "Print"
+printButton.tooltip=Imprimir esta página… (%S)
+
+# New Window button tooltip
+# LOCALIZATION NOTE (newWindowButton.tooltip):
+# %S is the keyboard shortcut for "New Window"
+newWindowButton.tooltip=Abrir una nueva ventana (%S)
 
 # Offline web applications
 offlineApps.available=Este sitio web (%S) está ofreciendo guardar datos en su computadora para usar sin conexión.
 offlineApps.allow=Permitir
 offlineApps.allowAccessKey=P
 offlineApps.never=Nunca para este sitio
 offlineApps.neverAccessKey=e
 offlineApps.notNow=No ahora
@@ -349,16 +373,19 @@ addKeywordTitleAutoFill=Buscar %S
 # LOCALIZATION NOTE (tabview.title): %S is the application name.
 tabview.title=%S - Agrupar pestañas
 # LOCALIZATION NOTE (tabview.moveToUnnamedGroup.label): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the page title of the first tab in the unnamed group, 
 # #2 is the number of remaining tabs.
 tabview.moveToUnnamedGroup.label=#1 y 1 más;#1 y #2 más
 
+# LOCALIZATION NOTE (tabviewButton.tooltip): %S is the keyboard shortcut for tab groups
+tabviewButton.tooltip=Agrupar pestañas (%S)
+
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name=Predeterminado
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description=El tema predeterminado.
 
 # safeModeRestart
 safeModeRestartPromptTitle=Reiniciar con los complementos deshabilitados
 safeModeRestartPromptMessage=¿Seguro desea deshabilitar todos los complementos y reiniciar?
 safeModeRestartButton=Reiniciar
 
@@ -405,16 +432,19 @@ webapps.requestInstall = ¿Desea instalar "%1$S" desde este sitio (%2$S)?
 webapps.install.success = Aplicación instalada
 webapps.install.inprogress = Instalación en proceso
 
 # LOCALIZATION NOTE (fullscreen.entered): displayed when we enter HTML5 fullscreen mode, %S is the domain name of the focused website (e.g. mozilla.com).
 fullscreen.entered=%S ahora está en pantalla completa.
 # LOCALIZATION NOTE (fullscreen.rememberDecision): displayed when we enter HTML5 fullscreen mode, %S is the domain name of the focused website (e.g. mozilla.com).
 fullscreen.rememberDecision=Recordar la decisión para %S
 
+# LOCALIZATION NOTE (fullscreenButton.tooltip): %S is the keyboard shortcut for full screen
+fullscreenButton.tooltip=Mostrar la ventana en pantalla completa (%S)
+
 service.toolbarbutton.label=Servicios
 service.toolbarbutton.tooltiptext=Servicios
 
 # LOCALIZATION NOTE (social.install.description): %1$S is the hostname of the social provider, %2$S is brandShortName (e.g. Firefox)
 service.install.description=¿Desea habilitar servicios de %1$S para mostrar en las barras de herramientas y lateral de %2$S ?
 service.install.ok.label=Habilitar servicios
 service.install.ok.accesskey=e
 service.install.learnmore=Conocer más…
@@ -473,24 +503,36 @@ getUserMedia.noVideo.label = Sin video
 getUserMedia.noAudio.label = Sin audio
 getUserMedia.shareSelectedDevices.label = Compartir dispositivo seleccionado;Compartir dispositivos seleccionados
 getUserMedia.shareSelectedDevices.accesskey = s
 getUserMedia.denyRequest.label = No compartir
 getUserMedia.denyRequest.accesskey = N
 getUserMedia.sharingCamera.message2 = Actualmente está compartiendo su cámara con esta página.
 getUserMedia.sharingMicrophone.message2 = Actualmente está compartiendo su micrófocno con esta página.
 getUserMedia.sharingCameraAndMicrophone.message2 = Actualmente está compartiendo su cámara y micrófono con esta página.
+getUserMedia.continueSharing.label = Continuar compartiendo
+getUserMedia.continueSharing.accesskey = C
+getUserMedia.stopSharing.label = Dejar de compartir
+getUserMedia.stopSharing.accesskey = D
 
 # Mixed Content Blocker Doorhanger Notification
 # LOCALIZATION NOTE - %S is brandShortName
 mixedContentBlocked.message = %S ha bloqueado contenido que no era seguro.
 mixedContentBlocked.keepBlockingButton.label = Seguir bloqueando
 mixedContentBlocked.keepBlockingButton.accesskey = b
 mixedContentBlocked.unblock.label = Deshabilitar protección en esta página
 mixedContentBlocked.unblock.accesskey = D
 
 # LOCALIZATION NOTE - %S is brandShortName
 slowStartup.message = %S parece que está… lento… al… arrancar.
 slowStartup.helpButton.label = Descubrir como acelerarlo
 slowStartup.helpButton.accesskey = l
 slowStartup.disableNotificationButton.label = No avisarme nuevamente
 slowStartup.disableNotificationButton.accesskey = a
 
+
+# LOCALIZATION NOTE(customizeTips.tip0): %1$S will be replaced with the text defined
+# in customizeTips.tip0.hint, %2$S will be replaced with brandShortName, %3$S will
+# be replaced with a hyperlink containing the text defined in customizeTips.tip0.learnMore.
+customizeTips.tip0 = %1$S: Puede personalizar %2$S para trabajar de la forma que desee. Simplemente arrastra cualquiera de los siguientes al menú o la barra deherramientas. %3$S sobre personalizar %2$S.
+customizeTips.tip0.hint = Consejo
+customizeTips.tip0.learnMore = Conocer más
+
--- a/browser/chrome/browser/customizableui/customizableWidgets.properties
+++ b/browser/chrome/browser/customizableui/customizableWidgets.properties
@@ -1,83 +1,100 @@
 # 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/.
 
 history-panelmenu.label = Historial
-# LOCALIZATION NOTE (history-panelmenu.tooltiptext): Use the unicode ellipsis char,
-# \u2026, or use "..." if \u2026 doesn't suit traditions in your locale.
-history-panelmenu.tooltiptext = Historial… (%S)
+# LOCALIZATION NOTE(history-panelmenu.tooltiptext2): %S is the keyboard shortcut
+history-panelmenu.tooltiptext2 = Mostrar historial… (%S)
 
 privatebrowsing-button.label = Nueva ventana privada
 # LOCALIZATION NOTE(privatebrowsing-button.tooltiptext): %S is the keyboard shortcut
 privatebrowsing-button.tooltiptext = Abrir una nueva ventana de navegación privada (%S)
 
 save-page-button.label = Guardar página
-# LOCALIZATION NOTE(save-page-button.tooltiptext): %S is the keyboard shortcut
-save-page-button.tooltiptext = Guardar esta página (%S)
+# LOCALIZATION NOTE(save-page-button.tooltiptext2): %S is the keyboard shortcut
+# Use the unicode ellipsis char, \u2026, or use "..." if \u2026 doesn't suit traditions in your locale.
+save-page-button.tooltiptext2 = Guardar esta página… (%S)
 
 find-button.label = Buscar
-# LOCALIZATION NOTE(find-button.tooltiptext): %S is the keyboard shortcut
-find-button.tooltiptext = Buscar en esta página (%S)
+# LOCALIZATION NOTE(find-button.tooltiptext2): %S is the keyboard shortcut.
+# Use the unicode ellipsis char, \u2026, or use "..." if \u2026 doesn't suit traditions in your locale.
+find-button.tooltiptext2 = Buscar en esta página… (%S)
 
 open-file-button.label = Abrir archivo
-# LOCALIZATION NOTE(open-file-button.tooltiptext): %S is the keyboard shortcut
-open-file-button.tooltiptext = Abrir archivo (%S)
+# LOCALIZATION NOTE (open-file-button.tooltiptext2): %S is the keyboard shortcut.
+# Use the unicode ellipsis char, \u2026, or use "..." if \u2026 doesn't suit traditions in your locale.
+open-file-button.tooltiptext2 = Abrir archivo… (%S)
 
 developer-button.label = Desarrollador
 # LOCALIZATION NOTE(developer-button.tooltiptext): %S is the keyboard shortcut
 developer-button.tooltiptext = Herramientas para desarrollador web (%S)
 
 add-ons-button.label = Complementos
 # LOCALIZATION NOTE(add-ons-button.tooltiptext2): %S is the keyboard shortcut
 add-ons-button.tooltiptext2 = Abrir administrador de complementos (%S)
 
 switch-to-metro-button2.label = Windows 8 Táctil
 # LOCALIZATION NOTE(switch-to-metro-button2.tooltiptext): %S is the brand short name
 switch-to-metro-button2.tooltiptext = Reiniciar %S para Windows 8 Táctil
 
 preferences-button.label = Preferencias
-# LOCALIZATION NOTE (preferences-button.tooltiptext): Use the unicode ellipsis char,
-# \u2026, or use "..." if \u2026 doesn't suit traditions in your locale.
-preferences-button.tooltiptext = Preferencias…
+preferences-button.tooltiptext2 = Abrir preferencias
+preferences-button.tooltiptext.withshortcut = Abrir preferencias (%S)
 # LOCALIZATION NOTE (preferences-button.labelWin): Windows-only label for Options
 preferences-button.labelWin = Opciones
 # LOCALIZATION NOTE (preferences-button.tooltipWin): Windows-only tooltip for Options
-preferences-button.tooltipWin = Opciones
+preferences-button.tooltipWin2 = Abrir opciones
 
 zoom-controls.label = Controles de zoom
 zoom-controls.tooltiptext = Controles de zoom
 
 zoom-out-button.label = Alejar
-zoom-out-button.tooltiptext = Alejar
+# LOCALIZATION NOTE(zoom-out-button.tooltiptext2): %S is the keyboard shortcut.
+zoom-out-button.tooltiptext2 = Alejar (%S)
 
 # LOCALIZATION NOTE(zoom-reset-button.label): %S is the current zoom level,
 # %% will be displayed as a single % character (% is commonly used to define
 # format specifiers, so it needs to be escaped).
 zoom-reset-button.label = %S%%
-zoom-reset-button.tooltiptext = Reiniciar nivel de zoom
+# LOCALIZATION NOTE(zoom-reset-button.tooltiptext2): %S is the keyboard shortcut.
+zoom-reset-button.tooltiptext2 = Reiniciar nivel de zoom (%S)
 
 zoom-in-button.label = Acercar
-zoom-in-button.tooltiptext = Acercar
+# LOCALIZATION NOTE(zoom-in-button.tooltiptext2): %S is the keyboard shortcut.
+zoom-in-button.tooltiptext2 = Acercar (%S)
 
 edit-controls.label = Editar controles
 edit-controls.tooltiptext = Editar controles
 
 cut-button.label = Cortar
-cut-button.tooltiptext = Cortar
+# LOCALIZATION NOTE(cut-button.tooltiptext2): %S is the keyboard shortcut.
+cut-button.tooltiptext2 = Cortar (%S)
 
 copy-button.label = Copiar
-copy-button.tooltiptext = Copiar
+# LOCALIZATION NOTE(copy-button.tooltiptext2): %S is the keyboard shortcut.
+copy-button.tooltiptext2 = Copiar (%S)
 
 paste-button.label = Pegar
-paste-button.tooltiptext = Pegar
+# LOCALIZATION NOTE(paste-button.tooltiptext2): %S is the keyboard shortcut.
+paste-button.tooltiptext2 = Pegar (%S)
 
 # LOCALIZATION NOTE (feed-button.tooltiptext): Use the unicode ellipsis char,
 # \u2026, or use "..." if \u2026 doesn't suit traditions in your locale.
 feed-button.label = Suscribir
 feed-button.tooltiptext = Suscribir a esta página…
 
 characterencoding-button.label = Codificación de caracteres
-characterencoding-button.tooltiptext = Codificación de caracteres
+characterencoding-button.tooltiptext2 = Mostrar opciones de codificación de caracteres
 
 email-link-button.label = Enlace por correo
-email-link-button.tooltiptext = Enlace por correo
+# LOCALIZATION NOTE (email-link-button.tooltiptext2): Use the unicode ellipsis char,
+# \u2026, or use "..." if \u2026 doesn't suit traditions in your locale.
+email-link-button.tooltiptext2 = Enlace por correo…
+
+# LOCALIZATION NOTE(quit-button.tooltiptext.linux2): %1$S is the brand name (e.g. Firefox),
+# %2$S is the keyboard shortcut
+quit-button.tooltiptext.linux2 = Salir de %1$S (%2$S)
+# LOCALIZATION NOTE(quit-button.tooltiptext.mac): %1$S is the brand name (e.g. Firefox),
+# %2$S is the keyboard shortcut
+quit-button.tooltiptext.mac = Salir de %1$S (%2$S)
+
--- a/browser/chrome/browser/devtools/debugger.dtd
+++ b/browser/chrome/browser/devtools/debugger.dtd
@@ -36,16 +36,37 @@
 <!-- LOCALIZATION NOTE (debuggerUI.sources.blackBoxTooltip): This is the tooltip
   -  for the button that black boxes the selected source. -->
 <!ENTITY debuggerUI.sources.blackBoxTooltip "Toggle Black Boxing">
 
 <!-- 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.autoPrettyPrint): This is the label for the
+   -  checkbox that toggles auto pretty print. -->
+<!ENTITY debuggerUI.autoPrettyPrint     "Autoemprolijar fuentes minificados">
+<!ENTITY debuggerUI.autoPrettyPrint.accesskey "p">
+
+<!-- LOCALIZATION NOTE (debuggerUI.sources.toggleBreakpoints): This is the tooltip for the
+   -  button that toggles all breakpoints for all sources. -->
+<!ENTITY debuggerUI.sources.toggleBreakpoints "Enable/disable all breakpoints">
+
+<!-- LOCALIZATION NOTE (debuggerUI.startTracing): This is the text displayed in
+   - the button to start execution tracing. -->
+<!ENTITY debuggerUI.startTracing "Comenzar rastreo">
+
+<!-- LOCALIZATION NOTE (debuggerUI.clearButton): This is the label for
+   -  the button that clears the collected tracing data in the tracing tab. -->
+<!ENTITY debuggerUI.clearButton "Limpiar">
+
+<!-- LOCALIZATION NOTE (debuggerUI.clearButton.tooltip): This is the tooltip for
+   -  the button that clears the collected tracing data in the tracing tab. -->
+<!ENTITY debuggerUI.clearButton.tooltip "Limpiar los rastros recolectados">
+
 <!-- 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">
@@ -140,17 +161,17 @@ button that pretty prints the selected s
 <!-- 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">
-<!ENTITY debuggerUI.addWatch.key        "E">
+<!ENTITY debuggerUI.addWatch.accesskey  "E">
 
 <!-- LOCALIZATION NOTE (debuggerUI.removeWatch): This is the text that
   -  appears in the watch expressions context menu for removing all expressions. -->
 <!ENTITY debuggerUI.removeAllWatch      "Remove all watch expressions">
 <!ENTITY debuggerUI.removeAllWatch.key  "E">
 
 <!-- LOCALIZATION NOTE (debuggerUI.stepping): These are the keycodes that
   -  control the stepping commands in the debugger (continue, step over,