Update Aragonese translation strings to FF29 FIREFOX_29_0b1_BUILD2 FIREFOX_29_0b1_RELEASE FIREFOX_29_0b2_BUILD1 FIREFOX_29_0b2_RELEASE FIREFOX_29_0b3_BUILD1 FIREFOX_29_0b3_RELEASE FIREFOX_29_0b4_BUILD1 FIREFOX_29_0b4_RELEASE FIREFOX_29_0b5_BUILD1 FIREFOX_29_0b5_RELEASE FIREFOX_29_0b6_BUILD1 FIREFOX_29_0b6_RELEASE FIREFOX_29_0b7_BUILD1 FIREFOX_29_0b7_RELEASE FIREFOX_29_0b8_BUILD1 FIREFOX_29_0b8_RELEASE FIREFOX_29_0b9_BUILD1 FIREFOX_29_0b9_RELEASE
authorDaniel Martinez <entaltoaragon@gmail.com>
Fri, 14 Mar 2014 22:00:32 +0100
changeset 72 38ac87033949b7fb5e231967ee0bc517a9240533
parent 71 62a013cff50255b340a56e318a1fdbfdacb7afdf
child 73 63d6cddf0d56fee1457ac0161bc4baec5470fbae
child 74 9ca627bb7d792f993992c690f6528b2ad541a81f
child 75 0d0ce1490fda64e62b9ac80b818ad9ea75ee5be6
child 76 5b34e4d9186da33df2731bb07d6c6eddd2c3e8b2
child 77 990227670220f5a475a9959b325c6004c5442cc1
child 78 0e440de2276fff76bc830869ca2e83b428d81f53
child 79 f4db0263eec794b93d4aaf7b936e1d4a973637f6
child 80 c2a05ed3a4a7486cff1f083f27b97697d9c50e2e
child 81 6cd5f8768f6884a8bbca1781f1a1fe5b0a30e53d
child 82 15402e699e6b5be3540f91d96d6596375fed1d5e
push id24
push useraxel@mozilla.com
push dateMon, 17 Mar 2014 22:02:43 +0000
Update Aragonese translation strings to FF29
browser/chrome/browser/aboutAccounts.dtd
browser/chrome/browser/aboutDialog.dtd
browser/chrome/browser/aboutPrivateBrowsing.dtd
browser/chrome/browser/baseMenuOverlay.dtd
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/charsetMenu.dtd
browser/chrome/browser/charsetMenu.properties
browser/chrome/browser/customizableui/customizableWidgets.properties
browser/chrome/browser/devtools/app-manager.dtd
browser/chrome/browser/devtools/connection-screen.dtd
browser/chrome/browser/devtools/debugger.dtd
browser/chrome/browser/devtools/debugger.properties
browser/chrome/browser/devtools/inspector.dtd
browser/chrome/browser/devtools/netmonitor.dtd
browser/chrome/browser/devtools/netmonitor.properties
browser/chrome/browser/devtools/styleeditor.properties
browser/chrome/browser/devtools/toolbox.dtd
browser/chrome/browser/devtools/toolbox.properties
browser/chrome/browser/devtools/webconsole.properties
browser/chrome/browser/preferences/fonts.dtd
browser/chrome/browser/preferences/preferences.properties
browser/chrome/browser/preferences/privacy.dtd
browser/chrome/browser/preferences/sync.dtd
browser/chrome/browser/syncBrand.dtd
browser/chrome/browser/syncCustomize.dtd
browser/chrome/browser/syncSetup.dtd
browser/chrome/browser/syncSetup.properties
browser/chrome/browser/tabbrowser.properties
browser/chrome/overrides/netError.dtd
browser/metro/chrome/browser.dtd
browser/metro/chrome/browser.properties
browser/metro/chrome/config.dtd
browser/metro/chrome/config.properties
browser/metro/chrome/crashprompt.dtd
browser/pdfviewer/chrome.properties
browser/pdfviewer/viewer.properties
calendar/chrome/calendar/calendar-event-dialog.properties
chat/contacts.properties
chat/irc.properties
chat/logger.properties
chat/twitter.properties
chat/xmpp.properties
chat/yahoo.properties
dom/chrome/accessibility/AccessFu.properties
dom/chrome/charsetTitles.properties
dom/chrome/dom/dom.properties
dom/chrome/layout/css.properties
dom/chrome/layout/htmlparser.properties
dom/chrome/layout/printing.properties
dom/chrome/security/csp.properties
dom/chrome/security/security.properties
mail/chrome/messenger/FilterListDialog.dtd
mail/chrome/messenger/SearchDialog.dtd
mail/chrome/messenger/aboutDialog.dtd
mail/chrome/messenger/addressbook/addressBook.properties
mail/chrome/messenger/folderWidgets.properties
mail/chrome/messenger/imAccounts.dtd
mail/chrome/messenger/messenger.dtd
mail/chrome/messenger/messengercompose/composeMsgs.properties
mail/chrome/messenger/messengercompose/messengercompose.dtd
mail/chrome/messenger/msgFolderPickerOverlay.dtd
mail/chrome/messenger/preferences/advanced.dtd
mobile/android/base/android_strings.dtd
mobile/android/base/sync_strings.dtd
mobile/android/chrome/sync.properties
mobile/android/chrome/webapp.properties
mobile/overrides/netError.dtd
mobile/profile/bookmarks.inc
suite/chrome/common/help/shortcuts_mailnews.xhtml
suite/chrome/common/help/shortcuts_navigator.xhtml
suite/chrome/common/mac/platformCommunicatorOverlay.dtd
suite/chrome/mailnews/compose/composeMsgs.properties
suite/chrome/mailnews/folderWidgets.properties
suite/chrome/mailnews/messenger.properties
suite/chrome/mailnews/threadpane.dtd
toolkit/chrome/global/aboutTelemetry.dtd
toolkit/chrome/global/charsetMenu.dtd
toolkit/chrome/global/charsetMenu.properties
toolkit/chrome/global/devtools/styleinspector.properties
webapprt/webapprt/overrides/appstrings.properties
webapprt/webapprt/overrides/dom.properties
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/aboutAccounts.dtd
@@ -0,0 +1,10 @@
+<!-- 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 aboutAccounts.welcome "Bienvenius ta &syncBrand.shortName.label;">
+
+<!ENTITY aboutAccountsConfig.description "Inicie una sesión ta sincronizar as suyas pestanyas, marcapachinas, calus y mas.">
+<!ENTITY aboutAccountsConfig.startButton.label "Empecipiar">
+<!ENTITY aboutAccountsConfig.useOldSync.label "Ye fendo servir una version antiga de Sync?">
+<!ENTITY aboutAccountsConfig.manage.label "Administrar">
--- a/browser/chrome/browser/aboutDialog.dtd
+++ b/browser/chrome/browser/aboutDialog.dtd
@@ -1,14 +1,27 @@
 <!-- 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 aboutDialog.title          "Arredol de &brandFullName;">
+<!-- LOCALIZATION NOTE (update.checkForUpdatesButton.*, update.updateButton.*, update.applyButtonBillboard.*):
+# Only one button is present at a time.
+# The button when displayed is located directly under the Firefox version in
+# the about dialog (see bug 596813 for screenshots).
+-->
+
+<!ENTITY update.checkForUpdatesButton.label       "Mirar actualizacions">
+<!ENTITY update.checkForUpdatesButton.accesskey   "M">
+<!ENTITY update.updateButton.label                "Reiniciar ta esviellar">
+<!ENTITY update.updateButton.accesskey            "R">
+<!ENTITY update.applyButtonBillboard.label        "Aplicar actualización…">
+<!ENTITY update.applyButtonBillboard.accesskey    "A">
 <!-- LOCALIZATION NOTE (warningDesc.version): This is a warning about the experimental nature of Nightly and Aurora builds. It is only shown in those versions. -->
 
+
 <!ENTITY warningDesc.version        "&brandShortName; ye experimental y puede estar inestable.">
 <!-- LOCALIZATION NOTE (warningDesc.telemetryDesc): This is a notification that Nightly/Aurora builds automatically send Telemetry data back to Mozilla. It is only shown in those versions. "It" refers to brandShortName. -->
 <!ENTITY warningDesc.telemetryDesc  "Ninvia automaticament información respective a o rendimiento, hardware, uso y personalizacions ta &vendorShortName; pa amillorar &brandShortName;.">
 <!-- LOCALIZATION NOTE (community.exp.*) This paragraph is shown in "experimental" builds, i.e. Nightly and Aurora builds, instead of the other "community.*" strings below. -->
 
 <!ENTITY community.exp.start        "">
 <!-- LOCALIZATION NOTE (community.exp.mozillaLink): This is a link title that links to http://www.mozilla.org/. -->
 <!ENTITY community.exp.mozillaLink  "&vendorShortName;">
@@ -36,18 +49,16 @@
 
 <!ENTITY bottomLinks.rights         "Dreitos d'os usuarios finals">
 <!-- LOCALIZATION NOTE (bottomLinks.privacy): This is a link title that links to https://www.mozilla.org/legal/privacy/. -->
 
 <!ENTITY bottomLinks.privacy        "Politica de privacidat">
 <!-- LOCALIZATION NOTE (update.checkingForUpdates): try to make the localized text short (see bug 596813 for screenshots). -->
 
 <!ENTITY update.checkingForUpdates  "Comprebando as actualizacions…">
-<!-- LOCALIZATION NOTE (update.checkingAddonCompat): try to make the localized text short (see bug 596813 for screenshots). -->
-<!ENTITY update.checkingAddonCompat "Comprobando a compatibilidat d'os complementos…">
 <!-- LOCALIZATION NOTE (update.noUpdatesFound): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.noUpdatesFound      "&brandShortName; ye esviellau">
 <!-- LOCALIZATION NOTE (update.adminDisabled): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.adminDisabled       "Actualizacions desactivadas por o suyo administrador">
 <!-- LOCALIZATION NOTE (update.otherInstanceHandlingUpdates): try to make the localized text short -->
 <!ENTITY update.otherInstanceHandlingUpdates "Unatra instancia ye esviellando &brandShortName;">
 <!-- LOCALIZATION NOTE (update.failed.start,update.failed.linkText,update.failed.end):
      update.failed.start, update.failed.linkText, and update.failed.end all go into
--- a/browser/chrome/browser/aboutPrivateBrowsing.dtd
+++ b/browser/chrome/browser/aboutPrivateBrowsing.dtd
@@ -7,15 +7,20 @@
 
 <!ENTITY privatebrowsingpage.perwindow.issueDesc        "O &brandShortName; no recordará brenca de l'historial d'ista finestra.">
 <!ENTITY privatebrowsingpage.perwindow.issueDesc.normal "No ye en una finestra de navegación privada.">
 
 <!ENTITY privatebrowsingpage.perwindow.description     "En una finestra de navegación privada, &brandShortName; no alzará garra cosa relacionada con l'historial de navegación, as buscas, l'historial de descargas, cookies u fichers temporals d'Internet.  Manimenos, sí que se guardarán os fichers que alce u os marcapachinas que creye.">
 
 <!ENTITY privatebrowsingpage.openPrivateWindow.label "Ubrir una finestra privada">
 <!ENTITY privatebrowsingpage.openPrivateWindow.accesskey "p">
-<!-- LOCALIZATION NOTE (privatebrowsingpage.howToStart3): please leave &basePBMenu.label; intact in the translation -->
+<!-- LOCALIZATION NOTE (privatebrowsingpage.howToStart4): please leave &newPrivateWindow.label; intact in the translation -->
 
-<!ENTITY privatebrowsingpage.howToStart3               "Ta empecipiar a navegación privada, tamién puet seleccionar &basePBMenu.label; &gt; &newPrivateWindow.label;.">
+<!ENTITY privatebrowsingpage.howToStart4               "Pa empecipiar a navegación privada, puede trigar tamién &newPrivateWindow.label; d'o menú.">
 <!ENTITY privatebrowsingpage.howToStop3                "Ta aturar a navegación privada, zarre ista finestra.">
 
 <!ENTITY privatebrowsingpage.moreInfo                  "Encara que iste ordinador no conservará garra rechistro d'o suyo historial de navegación, o suyo furnidor de servicios d'internet u a suya interpresa encara podrían seguir o bayo d'as pachinas que haiga visitau.">
 <!ENTITY privatebrowsingpage.learnMore                 "Ta saber-ne mas">
+<!-- TO BE REMOVED POST-AUSTRALIS --> 
+<!-- LOCALIZATION NOTE (privatebrowsingpage.howToStart3): please leave &basePBMenu.label; intact in the translation -->
+
+
+<!ENTITY privatebrowsingpage.howToStart3               "Ta empecipiar a navegación privada, tamién puet seleccionar &basePBMenu.label; &gt; &newPrivateWindow.label;.">
--- a/browser/chrome/browser/baseMenuOverlay.dtd
+++ b/browser/chrome/browser/baseMenuOverlay.dtd
@@ -30,16 +30,19 @@
 <!ENTITY healthReport.accesskey   "e">
 
 <!ENTITY helpTroubleshootingInfo.label      "Información ta solucionar problemas">
 <!ENTITY helpTroubleshootingInfo.accesskey  "f">
 
 <!ENTITY helpFeedbackPage.label      "Ninviar una opinión…">
 <!ENTITY helpFeedbackPage.accesskey  "v">
 
+<!ENTITY helpShowTour.label             "Vesita guiada por &brandShortName;">
+<!ENTITY helpShowTour.accesskey         "s">
+
 <!ENTITY preferencesCmdMac.label        "Preferencias…">
 <!ENTITY preferencesCmdMac.commandkey   ",">
 
 <!ENTITY servicesMenuMac.label          "Servicios">
 
 <!ENTITY hideThisAppCmdMac.label        "Amagar o &brandShortName;">
 <!ENTITY hideThisAppCmdMac.commandkey   "H">
 
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -9,16 +9,19 @@
 <!ENTITY mainWindow.title "&brandFullName;">
 <!-- 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.tooltip                     "Ubrir o menú">
+<!ENTITY navbarOverflow.label                "Mas ferramientas...">
 <!-- Tab context menu -->
 
 <!ENTITY  reloadTab.label                    "Tornar a cargar a pestanya">
 <!ENTITY  reloadTab.accesskey                "g">
 <!ENTITY  reloadAllTabs.label                "Tornar a cargar todas as pestanyas">
 <!ENTITY  reloadAllTabs.accesskey            "T">
 <!-- LOCALIZATION NOTE (closeTabsToTheEnd.label): This should indicate the
 direction in which tabs are closed, i.e. locales that use RTL mode should say
@@ -49,18 +52,16 @@ can reach it easily. -->
 <!ENTITY  closeTab.label                     "Zarrar a pestaña">
 <!ENTITY  closeTab.accesskey                 "t">
 
 <!ENTITY  listAllTabs.label      "Amostrar todas as pestanyas">
 
 <!ENTITY tabCmd.label "Nueva pestanya">
 <!ENTITY tabCmd.accesskey "t">
 <!ENTITY tabCmd.commandkey "t">
-<!ENTITY openLocationCmd.label "Ubrir una adreza…">
-<!ENTITY openLocationCmd.accesskey "a">
 <!ENTITY openFileCmd.label "Ubrir un fichero…">
 <!ENTITY openFileCmd.accesskey "U">
 <!ENTITY openFileCmd.commandkey "o">
 <!ENTITY printSetupCmd.label "Configurar pachina…">
 <!ENTITY printSetupCmd.accesskey "f">
 <!ENTITY printPreviewCmd.label "Anvista preliminar">
 <!ENTITY printPreviewCmd.accesskey "r">
 <!ENTITY printCmd.label "Imprentar…">
@@ -90,16 +91,27 @@ These should match what Safari and other
 <!ENTITY exitFullScreenCmd.label "Desactivar a pantalla completa">
 <!ENTITY exitFullScreenCmd.accesskey "p">
 <!ENTITY fullScreenCmd.label "Pantalla completa">
 <!ENTITY fullScreenCmd.accesskey "P">
 <!ENTITY fullScreenCmd.macCommandKey "f">
 <!ENTITY showAllTabsCmd.label "Amostrar todas as pestanyas">
 <!ENTITY showAllTabsCmd.accesskey "a">
 
+<!ENTITY fxaSignIn.label "Connectar-se a &syncBrand.shortName.label;">
+<!ENTITY fxaSignInError.label "Tornar a connectar-se a &syncBrand.shortName.label;">
+<!ENTITY syncStartPanel.heading "O &brandShortName; se ye sincroninzando">
+<!ENTITY syncStartPanel.subTitle "Puede chestionar o &syncBrand.shortName.label; en Opcions.">
+<!ENTITY syncStartPanel.subTitleUnix "Puede chestionar o &syncBrand.shortName.label; en Preferencias.">
+<!ENTITY syncErrorPanel.heading "No s'ha puesto connectar a o &syncBrand.shortName.label;">
+<!ENTITY syncErrorPanel.subTitle "Enciente una sesión pa continar con a sincronización.">
+<!ENTITY syncErrorPanel.signInButton.label "Encetar a sesión">
+<!ENTITY syncErrorPanel.signInButton.accesskey "E">
+
+
 <!ENTITY fullScreenMinimize.tooltip "Minimizar">
 <!ENTITY fullScreenRestore.tooltip "Restaurar">
 <!ENTITY fullScreenClose.tooltip "Zarrar">
 <!ENTITY fullScreenAutohide.label "Amagar as barras de ferramientas">
 <!ENTITY fullScreenAutohide.accesskey "f">
 <!ENTITY fullScreenExit.label "Salir d'o modo pantalla completa">
 <!ENTITY fullScreenExit.accesskey "m">
 <!ENTITY fullscreenAllowButton.label "Permitir">
@@ -110,29 +122,31 @@ These should match what Safari and other
 <!ENTITY leaveDOMFullScreen.accesskey "p">
 
 <!ENTITY closeWindow.label "Zarrar a finestra">
 <!ENTITY closeWindow.accesskey "f">
 
 <!ENTITY bookmarksMenu.label "Marcapachinas">
 <!ENTITY bookmarksMenu.accesskey "c">
 <!ENTITY bookmarkThisPageCmd.label "Meter ista pachina en marcapachinas">
+<!ENTITY editThisBookmarkCmd.label "Editar iste marcapachinas">
 <!ENTITY bookmarkThisPageCmd.commandkey "d">
 <!ENTITY markPageCmd.commandkey "l">
 <!ENTITY sharePageCmd.label "Compartir ista pachina">
 <!ENTITY sharePageCmd.commandkey "S">
 <!ENTITY sharePageCmd.accesskey "t">
 <!ENTITY shareLinkCmd.label "Compartir iste vinclo">
 <!ENTITY shareLinkCmd.accesskey "t">
 <!ENTITY shareImageCmd.label "Compartir ista imachen">
 <!ENTITY shareImageCmd.accesskey "t">
 <!ENTITY shareSelectCmd.label "Compartir a selección">
 <!ENTITY shareSelectCmd.accesskey "t">
 <!ENTITY shareVideoCmd.label "Compartir iste video">
 <!ENTITY shareVideoCmd.accesskey "t">
+<!ENTITY feedsMenu.label "Conducir-me-ie">
 <!ENTITY subscribeToPageMenupopup.label "Conducir-se a ista pachina">
 <!ENTITY subscribeToPageMenuitem.label "Conducir-se a ista pachina…">
 <!ENTITY addCurPagesCmd.label "Adhibir pestanyas ta marcapachinas…">
 <!ENTITY showAllBookmarks2.label "Amostrar totz os marcapachinas">
 <!ENTITY unsortedBookmarksCmd.label "Marcapachinas sin ordenar">
 <!ENTITY bookmarksToolbarChevron.tooltip "Amostrar mas marcapachinas">
 
 <!ENTITY backCmd.label                "Enta zaga">
@@ -149,34 +163,30 @@ These should match what Safari and other
 <!ENTITY stopCmd.label                "Aturar">
 <!ENTITY stopCmd.accesskey            "u">
 <!ENTITY stopCmd.macCommandKey        ".">
 <!ENTITY stopButton.tooltip           "Aturar a carga d'ista pachina">
 <!ENTITY goEndCap.tooltip             "Ir ta la URL d'a barra d'adrezas">
 <!ENTITY printButton.label            "Imprentar">
 <!ENTITY printButton.tooltip          "Imprentar ista pachina">
 
-<!ENTITY backForwardItem.title        "Enta zaga / enta debant">
 <!ENTITY locationItem.title           "Adreza">
 <!ENTITY searchItem.title             "Mirar">
-<!ENTITY bookmarksItem.title          "Marcapachinas">
 <!-- Toolbar items --> 
 
 <!ENTITY homeButton.label             "Inicio">
 
 <!ENTITY tabGroupsButton.label        "Grupos de pestanyas">
-<!ENTITY tabGroupsButton.tooltip      "Agrupar as pestanyas">
 
 <!ENTITY bookmarksButton.label          "Marcapachinas">
 <!ENTITY bookmarksCmd.commandkey "b">
 
 <!ENTITY bookmarksMenuButton.label          "Marcapachinas">
-<!ENTITY bookmarksMenuButton.tooltip        "Amostrar os suyos marcapachinas">
 <!ENTITY bookmarksMenuButton.unsorted.label "Marcapachinas sin clasificar">
-<!ENTITY viewBookmarksSidebar.label         "Amostrar en a barra lateral">
+<!ENTITY viewBookmarksSidebar2.label        "Amostrar a barra lateral de marcapachinas">
 <!ENTITY viewBookmarksToolbar.label         "Veyer a barra de marcapachinas">
 <!-- 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">
 
@@ -291,17 +301,17 @@ These should match what Safari and other
 <!ENTITY selectAllCmd.label         "Seleccionar-lo tot">  
 <!ENTITY selectAllCmd.key         "A">  
 <!ENTITY selectAllCmd.accesskey       "a"> 
 <!ENTITY preferencesCmd2.label       "Opcions">
 <!ENTITY preferencesCmd2.accesskey     "O">
 <!ENTITY preferencesCmdUnix.label       "Preferencias">
 <!ENTITY preferencesCmdUnix.accesskey     "n"> 
 
-<!ENTITY clearRecentHistory.label               "Borrar l'historial recient…">
+<!ENTITY clearRecentHistory.label               "Borrar o historial recient…">
 
 <!ENTITY privateBrowsingCmd.commandkey          "P">
 
 <!ENTITY viewMenu.label         "Veyer"> 
 <!ENTITY viewMenu.accesskey       "V"> 
 <!ENTITY viewTabGroups.label            "Grupos de pestanyas">
 <!ENTITY viewTabGroups.accesskey        "G">
 <!ENTITY viewToolbarsMenu.label       "Barras de ferramientas"> 
@@ -317,16 +327,45 @@ These should match what Safari and other
 <!-- LOCALIZATION NOTE (historyUndoWindowMenu): see bug 394759 -->
 <!ENTITY historyUndoWindowMenu.label "Finestras zarradas en zagueras">
 <!ENTITY historyRestoreLastSession.label "Restaurar a sesión anterior">
 
 <!ENTITY showAllHistoryCmd2.label "Amostrar tot l'historial">
 <!ENTITY showAllHistoryCmd.commandkey "H">
 
 <!ENTITY appMenuCustomize.label "Personalizar">
+<!ENTITY appMenuCustomize.tooltip "Personalizar o menú y as barras de ferramientas">
+<!ENTITY appMenuCustomizeExit.label "Salir d'a personalización">
+<!ENTITY appMenuCustomizeExit.tooltip "Rematar a personalización">
+<!ENTITY appMenuHistory.label "Historial">
+<!ENTITY appMenuHistory.showAll.label "Amostrar tot l'historial">
+<!ENTITY appMenuHistory.clearRecent.label "Limpiar o historial recient...">
+<!ENTITY appMenuHistory.restoreSession.label "Restaurar a sesión anterior">
+<!ENTITY appMenuHistory.viewSidebar.label "Amostrar a barra lateral de l'historial">
+<!ENTITY appMenuHelp.tooltip "Ubrir o menú d'aduya">
+
+<!ENTITY customizeMenu.addToToolbar.label "Adhibir en a barra de ferramientas">
+<!ENTITY customizeMenu.addToToolbar.accesskey "A">
+<!ENTITY customizeMenu.addToPanel.label "Adhibir en o menú">
+<!ENTITY customizeMenu.addToPanel.accesskey "m">
+<!ENTITY customizeMenu.moveToToolbar.label "Mover ta la barra de ferramientas">
+<!ENTITY customizeMenu.moveToToolbar.accesskey "o">
+<!-- LOCALIZATION NOTE (customizeMenu.moveToPanel.accesskey) can appear on the
+     same context menu as menubarCmd and personalbarCmd, so they should have
+     different access keys. customizeMenu.moveToToolbar and 
+     customizeMenu.moveToPanel are mutually exclusive, so can share access
+     keys.  -->
+<!ENTITY customizeMenu.moveToPanel.label "Mover t'o menú">
+<!ENTITY customizeMenu.moveToPanel.accesskey "o">
+<!ENTITY customizeMenu.removeFromToolbar.label "Eliminar d'a barra de ferramientas">
+<!ENTITY customizeMenu.removeFromToolbar.accesskey "E">
+<!ENTITY customizeMenu.removeFromMenu.label "Eliminar d'o menú">
+<!ENTITY customizeMenu.removeFromMenu.accesskey "E">
+<!ENTITY customizeMenu.addMoreItems.label "Adhibir mas elementos...">
+<!ENTITY customizeMenu.addMoreItems.accesskey "A">
 
 <!ENTITY openCmd.commandkey           "I">
 <!ENTITY urlbar.placeholder2          "Termen a mirar u adreza">
 <!ENTITY urlbar.accesskey             "d">
 <!ENTITY urlbar.switchToTab.label     "Ir ta la pestanya:">
 <!-- 
   Comment duplicated from browser-sets.inc:
 
@@ -402,17 +441,16 @@ These should match what Safari and other
 <!ENTITY bookmarkPageCmd2.accesskey   "m">
 <!ENTITY bookmarkThisLinkCmd.label      "Adhibir iste vinclo a os marcapachinas">
 <!ENTITY bookmarkThisLinkCmd.accesskey  "l">
 <!ENTITY bookmarkThisFrameCmd.label      "Adhibir ista bastida a las marcapachinas">
 <!ENTITY bookmarkThisFrameCmd.accesskey  "m">
 <!ENTITY emailPageCmd.label           "Ninviar vinclo por correu…">
 <!ENTITY emailPageCmd.accesskey       "e">
 <!ENTITY switchToMetroCmd.label       "Reubrir en &brandShortName; estilo Windows 8">
-<!ENTITY switchToMetroCmd2.label      "Reubrir en &brandShortName; estilo Windows 8 tactil">
 <!ENTITY savePageCmd.label            "Alzar a pachina como…">
 <!ENTITY savePageCmd.accesskey        "a">
 <!-- alternate for content area context menu -->
 <!ENTITY savePageCmd.accesskey2       "P">
 <!ENTITY savePageCmd.commandkey       "s">
 <!ENTITY saveFrameCmd.label           "Alzar a bastida como…">
 <!ENTITY saveFrameCmd.accesskey       "A">
 <!ENTITY printFrameCmd.label          "Imprentar a bastida…">
@@ -528,16 +566,17 @@ you can use these alternative items. Oth
 <!ENTITY newTabButton.tooltip           "Ubrir una pestanya nueva">
 <!ENTITY newWindowButton.tooltip        "Ubrir una finestra nueva">
 <!ENTITY sidebarCloseButton.tooltip     "Zarrar a barra lateral">
 
 <!ENTITY fullScreenButton.tooltip       "Amostrar a finestra en pantalla completa">
 
 <!ENTITY quitApplicationCmdWin.label       "Salir"> 
 <!ENTITY quitApplicationCmdWin.accesskey   "S">
+<!ENTITY quitApplicationCmdWin.tooltip     "Salir d'o &brandShortName;">
 <!ENTITY goBackCmd.commandKey "[">
 <!ENTITY goForwardCmd.commandKey "]">
 <!ENTITY quitApplicationCmd.label       "Salir"> 
 <!ENTITY quitApplicationCmd.accesskey   "S">
 <!ENTITY quitApplicationCmdMac.label    "Salir d'o &brandShortName;">
 <!-- LOCALIZATION NOTE(quitApplicationCmdUnix.key): This keyboard shortcut is used by both Linux and OSX builds. -->
 <!ENTITY quitApplicationCmdUnix.key     "Q">
 
@@ -619,17 +658,16 @@ just addresses the organization to follo
 
 <!ENTITY syncSetup.label              "Configurar o &syncBrand.shortName.label;…">
 <!ENTITY syncSetup.accesskey          "f">
 <!ENTITY syncSyncNowItem.label        "Sincronizar agora">
 <!ENTITY syncSyncNowItem.accesskey    "z">
 <!ENTITY syncToolbarButton.label      "Sync">
 
 <!ENTITY socialToolbar.title        "Botón d'a barra de ferramientas social">
-<!ENTITY social.notLoggedIn.label   "No ha iniciau sesión">
 
 <!ENTITY social.ok.label       "Acceptar">
 <!ENTITY social.ok.accesskey   "c">
 
 <!ENTITY social.toggleSidebar.label "Amostrar a barra lateral">
 <!ENTITY social.toggleSidebar.accesskey "A">
 
 <!ENTITY social.addons.label "Chestionar os servicios…">
@@ -639,16 +677,27 @@ just addresses the organization to follo
 
 <!ENTITY social.activated.description "Os servicios de <label/> s'han activau. Puede cambiar a configuración d'istos servicios en <label class='text-link'>l'administrador de complementos</label>.">
 <!ENTITY social.activated.undo.label "Desfer-lo!">
 <!ENTITY social.activated.undo.accesskey "D">
 <!ENTITY social.learnMore.label "Saber-ne mas…">
 <!ENTITY social.learnMore.accesskey "m">
 <!ENTITY social.closeNotificationItem.label "No pas agora">
 
+
+
+<!ENTITY customizeMode.tabTitle "Personalizar o &brandShortName;">
+<!ENTITY customizeMode.menuAndToolbars.label "Menú y barras de ferramientas">
+<!ENTITY customizeMode.menuAndToolbars.header2 "Ferramientas y funcions adicionals">
+<!ENTITY customizeMode.menuAndToolbars.empty "En quiere mas, de ferramientas?">
+<!ENTITY customizeMode.menuAndToolbars.emptyLink "Trigue-las d'entre os milars de complementos">
+<!ENTITY customizeMode.restoreDefaults "Restaurar as valuras por defecto">
+<!ENTITY customizeMode.toolbars "Amostrar/amagar as barras de ferramientas">
+<!ENTITY customizeMode.titlebar "Barra de titol">
+
 <!ENTITY social.chatBar.commandkey "c">
 <!ENTITY social.chatBar.label "Enfocar as conversas">
 <!ENTITY social.chatBar.accesskey "c">
 
 <!ENTITY social.markpageMenu.accesskey "p">
 <!ENTITY social.markpageMenu.label "Alzar a pachina en...">
 <!ENTITY social.marklinkMenu.accesskey "l">
 <!ENTITY social.marklinkMenu.label "Alzar o vinclo en...">
@@ -680,16 +729,18 @@ just addresses the organization to follo
      a CSS length value. -->
 
 <!ENTITY pluginNotification.width "28em">
 
 <!ENTITY tabCrashed.header "A pestanya ha fallau">
 <!ENTITY tabCrashed.message "Se ye mirando d'amostrar ista pachina web, pero no responde pas.">
 <!ENTITY tabCrashed.checkSendReport "Notifique o fallo en &vendorShortName; ta mirar d'apanyar-lo">
 <!ENTITY tabCrashed.tryAgain "Tornar-lo a prebar">
+
+<!ENTITY uiTour.infoPanel.close "Zarrar">
 <!-- LOCALIZATION NOTE: the following strings are unused in Australis, they're
      kept here to avoid warnings from l10n tools like compare-locales on
      l10n-central. They will be definitely removed when Australis is ready
      for mozilla-aurora. -->
 
 
 <!ENTITY navbarCmd.accesskey           "n">
 <!ENTITY addonBarCmd.label             "Barra de complementos">
@@ -715,9 +766,17 @@ just addresses the organization to follo
 <!ENTITY cutButton.tooltip             "Retallar">
 <!ENTITY copyButton.tooltip            "Copiar">
 <!ENTITY pasteButton.tooltip           "Apegar">
 <!ENTITY zoomOutButton.tooltip         "Achiquir">
 <!ENTITY zoomInButton.tooltip          "Agrandir">
 <!ENTITY zoomControls.label            "Controls de mida">
 <!ENTITY addonBarCloseButton.tooltip   "Zarrar a barra de complementos">
 <!ENTITY toggleAddonBarCmd.key         "/">
+<!ENTITY backForwardItem.title         "Enta zaga / enta debant">
+<!ENTITY viewBookmarksSidebar.label    "Amostrar en a barra lateral">
+<!ENTITY bookmarksItem.title           "Marcapachinas">
+<!ENTITY openLocationCmd.label         "Ubrir una adreza…">
+<!ENTITY openLocationCmd.accesskey     "a">
+<!ENTITY bookmarksMenuButton.tooltip   "Amostrar os suyos marcapachinas">
+<!ENTITY switchToMetroCmd2.label       "Reiniciar o &brandShortName; ta o Windows 8 tactil">
+<!ENTITY tabGroupsButton.tooltip       "Agrupar as pestanyas">
 <!-- end of strings to be removed post-Australis -->
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -69,17 +69,17 @@ addonErrorBlocklisted=No s'ha puesto ins
 # LOCALIZATION NOTE (lwthemeInstallRequest.message): %S will be replaced with
 # the host name of the site.
 lwthemeInstallRequest.message=Iste puesto web (%S) ha mirau d'instalar un tema.
 lwthemeInstallRequest.allowButton=Permitir-lo
 lwthemeInstallRequest.allowButton.accesskey=r
 
 lwthemePostInstallNotification.message=S'ha instalau un nuevo tema.
 lwthemePostInstallNotification.undoButton=Desfer
-lwthemePostInstallNotification.undoButton.accesskey=U
+lwthemePostInstallNotification.undoButton.accesskey=s
 lwthemePostInstallNotification.manageButton=Administrar os temas…
 lwthemePostInstallNotification.manageButton.accesskey=n
 
 # LOCALIZATION NOTE (lwthemeNeedsRestart.message):
 # %S will be replaced with the new theme name.
 lwthemeNeedsRestart.message=S'instalará %S dimpués de reiniciar.
 lwthemeNeedsRestart.button=Reiniciar agora
 lwthemeNeedsRestart.accesskey=R
@@ -186,45 +186,37 @@ sanitizeButtonClearing=Escoscando
 # "Time range to clear" is set to "Everything" in Clear Recent History dialog,
 # provided that the user has not modified the default set of history items to clear.
 sanitizeEverythingWarning2=Se borrará tot l'historial.
 # LOCALIZATION NOTE (sanitizeSelectedWarning): Warning that appears when
 # "Time range to clear" is set to "Everything" in Clear Recent History dialog,
 # provided that the user has modified the default set of history items to clear.
 sanitizeSelectedWarning=Totz os items seleccionaus serán eliminaus.
 
-# Check for Updates in the About Dialog - 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=Buscar actualizacions
-update.checkInsideButton.accesskey=C
-update.resumeButton.label=Continar descargando %S…
-update.resumeButton.accesskey=D
-update.openUpdateUI.applyButton.label=Aplicar actualización…
-update.openUpdateUI.applyButton.accesskey=A
-update.restart.updateButton.label=Reiniciar ta esviellar
-update.restart.updateButton.accesskey=R
-update.openUpdateUI.upgradeButton.label=Esviellar agora…
-update.openUpdateUI.upgradeButton.accesskey=E
-update.restart.upgradeButton.label=Esviellar agora
-update.restart.upgradeButton.accesskey=E
+# LOCALIZATION NOTE (downloadAndInstallButton.label): %S is replaced by the
+# version of the update: "Update to 28.0".
+update.downloadAndInstallButton.label=Esviellar a la versión %S
+update.downloadAndInstallButton.accesskey=A
 
 # RSS Pretty Print
 feedShowFeedNew=Conducir-se a '%S'…
 
 menuOpenAllInTabs.label=Ubrir tot en pestanyas
 
 # History menu
 menuRestoreAllTabs.label=Restaurar todas as pestanyas
+# 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 as pestanyas zarradas
 # LOCALIZATION NOTE (menuRestoreAllWindows, menuUndoCloseWindowLabel, menuUndoCloseWindowSingleTabLabel):
 # see bug 394759
 menuRestoreAllWindows.label=Restaurar todas as finestras
+# 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 as finestras zarradas
 # LOCALIZATION NOTE (menuUndoCloseWindowLabel): Semicolon-separated list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 Window Title, #2 Number of tabs
 menuUndoCloseWindowLabel=#1 (y #2 unatra pestanya);#1 (y #2 atras pestanyas)
 menuUndoCloseWindowSingleTabLabel=#1
 
 # Unified Back-/Forward Popup
 tabHistory.current=Quedar-se en ista pachina
@@ -235,19 +227,37 @@ tabHistory.goForward=Abanzar a ista pach
 pasteAndGo.label=Apegar-lo y ir-ie
 
 # Block autorefresh
 refreshBlocked.goButton=Permitir
 refreshBlocked.goButton.accesskey=P
 refreshBlocked.refreshLabel=%S ha privau que ista pachina se recargase automaticament.
 refreshBlocked.redirectLabel=%S privó que ista pachina se reendrezase automaticament enta unatra.
 
+# General bookmarks button
+# LOCALIZATION NOTE (bookmarksMenuButton.tooltip):
+# %S is the keyboard shortcut for "Show All Bookmarks"
+bookmarksMenuButton.tooltip=Amostrar os suyos marcapachinas (%S)
 # Star button
 starButtonOn.tooltip=Editar iste marcapachinas
 starButtonOff.tooltip=Adhibir ista pachina a marcadors
+starButtonOverflowed.label=Marcar ista pachina en marcapachinas
+starButtonOverflowedStarred.label=Editar iste marcapachinas
+
+# 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=Imprente ista pachina... (%S)
+
+# New Window button tooltip
+# LOCALIZATION NOTE (newWindowButton.tooltip):
+# %S is the keyboard shortcut for "New Window"
+newWindowButton.tooltip=Ubrir una finestra nueva (%S)
 
 # Offline web applications
 offlineApps.available=Iste puesto web (%S) le demanda de almagazenar os datos en l'equipo ta usar-lo en modo sin connexión.
 offlineApps.allow=Permitir
 offlineApps.allowAccessKey=r
 offlineApps.never=Nunca ta iste puesto
 offlineApps.neverAccessKey=u
 offlineApps.notNow=No pas agora
@@ -276,17 +286,17 @@ identity.ownerUnknown2=(desconoixiu)
 
 # LOCALIZATION NOTE (identity.chrome): %S is replaced with the brandShortName.
 identity.chrome=Ista ye una pachina segura de %S.
 
 # Edit Bookmark UI
 editBookmarkPanel.pageBookmarkedTitle=Pachina adhibida a marcapachinas
 editBookmarkPanel.pageBookmarkedDescription=O %S siempre le recordará ista pachina.
 editBookmarkPanel.bookmarkedRemovedTitle=S'ha eliminau o marcapachinas
-editBookmarkPanel.editBookmarkTitle=Editar o marcapachinas
+editBookmarkPanel.editBookmarkTitle=Editar iste marcapachinas
 
 # LOCALIZATION NOTE (editBookmark.removeBookmarks.label): Semicolon-separated list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # Replacement for #1 is the number of bookmarks to be removed.
 # If this causes problems with localization you can also do "Remove Bookmarks (#1)"
 # instead of "Remove #1 Bookmarks".
 editBookmark.removeBookmarks.label=Eliminar o marcapachinas;Eliminar os #1 marcapachinas
 
@@ -360,16 +370,19 @@ addKeywordTitleAutoFill=Mirar %S
 # LOCALIZATION NOTE (tabview.title): %S is the application name.
 tabview.title=%S - Agrupar as suyas pestanyas
 # LOCALIZATION NOTE (tabview.moveToUnnamedGroup.label): Semicolon-separated 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 mas;#1 y #2 mas
 
+# LOCALIZATION NOTE (tabviewButton.tooltip): %S is the keyboard shortcut for tab groups
+tabviewButton.tooltip=Agrupar as suyas pestanyas (%S)
+
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name=Predeterminau
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description=O tema predeterminau.
 
 # safeModeRestart
 safeModeRestartPromptTitle=Reiniciar con os complementos desactivaus
 safeModeRestartPromptMessage=Ye seguro de querer desactivar totz os complementos y reiniciar?
 safeModeRestartButton=Reiniciar
 
@@ -416,16 +429,19 @@ webapps.requestInstall = Quiere instalar
 webapps.install.success = Aplicación instalada
 webapps.install.inprogress = Instalación en curso
 
 # 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 ye agora 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=Remerar ista preferencia ta %S
 
+# LOCALIZATION NOTE (fullscreenButton.tooltip): %S is the keyboard shortcut for full screen
+fullscreenButton.tooltip=Amostrar a finestra 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=Le fería goyo d'activar os servicios de %1$S pa que s'amuestren en a barra de ferramientas y a barra lateral de %2$S?
 service.install.ok.label=Activar servicios
 service.install.ok.accesskey=E
 service.install.learnmore=Saber-ne mas…
@@ -485,23 +501,35 @@ getUserMedia.noVideo.label = Sin video
 getUserMedia.noAudio.label = Sin audio
 getUserMedia.shareSelectedDevices.label = Comparte o dispositivo seleccionau;Comparte os dispositivos seleccionaus
 getUserMedia.shareSelectedDevices.accesskey = S
 getUserMedia.denyRequest.label = No compartir
 getUserMedia.denyRequest.accesskey = N
 getUserMedia.sharingCamera.message2 = Ye compartindo a suya camara con ista pachina.
 getUserMedia.sharingMicrophone.message2 = Ye compartindo o suyo microfon con ista pachina.
 getUserMedia.sharingCameraAndMicrophone.message2 = Ye compartindo a suya camera y microfono ocn ista pachina.
+getUserMedia.continueSharing.label = Continar compartindo
+getUserMedia.continueSharing.accesskey = C
+getUserMedia.stopSharing.label = Deixar de compartir
+getUserMedia.stopSharing.accesskey = D
 
 # Mixed Content Blocker Doorhanger Notification
 # LOCALIZATION NOTE - %S is brandShortName
 mixedContentBlocked.message = %S ha blocau o conteniu que no ye seguro.
 mixedContentBlocked.keepBlockingButton.label = Continar blocando
 mixedContentBlocked.keepBlockingButton.accesskey = B
 mixedContentBlocked.unblock.label = Desactivar a protección en ista pachina
 mixedContentBlocked.unblock.accesskey = D
 
 # LOCALIZATION NOTE - %S is brandShortName
 slowStartup.message = %S pareix que va pando… en… enchegar.
 slowStartup.helpButton.label = Saber-ne mas sobre cómo accelerar
 slowStartup.helpButton.accesskey = S
 slowStartup.disableNotificationButton.label = No tornar-lo a preguntar
 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 ta que funcione a la suya traza. Nomás ha d'arrocegar qualsequier d'os elementos d'alto enta o menú u enta a barra de ferramientas. %3$S sobre personalizar %2$S.
+customizeTips.tip0.hint = Consello
+customizeTips.tip0.learnMore = Saber-ne mas
deleted file mode 100644
--- a/browser/chrome/browser/charsetMenu.dtd
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY charsetMenu.label             "Codificación de caracters">
-<!ENTITY charsetMenu.accesskey         "C">
-<!ENTITY charsetMenuAutodet.label      "Autodetectar">
-<!-- A reserved for Arabic -->
-<!ENTITY charsetMenuAutodet.accesskey  "d">
-
-<!ENTITY charsetMenuAutodet.off.label     "(desactivau)">
-<!ENTITY charsetMenuAutodet.off.accesskey "s">
-<!ENTITY charsetMenuAutodet.ja.label      "Chaponés">
-<!ENTITY charsetMenuAutodet.ja.accesskey  "h">
-<!ENTITY charsetMenuAutodet.ru.label      "Ruso">
-<!ENTITY charsetMenuAutodet.ru.accesskey  "R">
-<!ENTITY charsetMenuAutodet.uk.label      "Ucrainiano">
-<!ENTITY charsetMenuAutodet.uk.accesskey  "U">
-
deleted file mode 100644
--- a/browser/chrome/browser/charsetMenu.properties
+++ /dev/null
@@ -1,103 +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: 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     = Arabe (Windows)
-ISO-8859-6       = Arabe (ISO)
-
-# Baltic
-windows-1257.key = B
-windows-1257     = Baltico (Windows)
-ISO-8859-4       = Baltico (ISO)
-
-# Central European
-windows-1250.key =         E
-windows-1250     = Europeu Central (Windows)
-ISO-8859-2.key   =       I
-ISO-8859-2       = Europeu Central (ISO)
-
-# Chinese, Simplified
-gbk.key          =          S
-gbk              = Chinés, simplificau (GBK)
-gb18030          = Chinés, simplificau (GB18030)
-
-# Chinese, Traditional
-Big5.key         =          T
-Big5             = Chinés, tradicional
-
-# Cyrillic
-windows-1251.key = C
-windows-1251     = Cirilico (Windows)
-ISO-8859-5       = Cirilico (ISO)
-KOI8-R           = Cirilico (KOI8-R)
-KOI8-U           = Cirilico (KOI8-U)
-IBM866           = Cirilico (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     = Hebreu, visual
-# LOCALIZATION NOTE (ISO-8859-8): The value for this item should begin with
-# the same word for Hebrew as the value for windows-1255 so that this item 
-# sorts right after that one in the collation order for your locale.
-ISO-8859-8       = Hebreu, visual
-
-# Japanese
-Shift_JIS.key    = J
-Shift_JIS        = Chaponés (Shift_JIS)
-EUC-JP.key       =   p
-EUC-JP           = Chaponés (EUC-JP)
-ISO-2022-JP.key  =     n
-ISO-2022-JP      = Chaponés (ISO-2022-JP)
-
-# Korean
-EUC-KR.key       = K
-EUC-KR           = Coreán
-
-# Thai
-windows-874.key  =    T
-windows-874      = Tailandés
-
-# Turkish
-windows-1254.key =   r
-windows-1254     = Turco
-
-# Vietnamese
-windows-1258.key = V
-windows-1258     = Vietnamés
-
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/customizableui/customizableWidgets.properties
@@ -0,0 +1,99 @@
+# 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.tooltiptext2): %S is the keyboard shortcut
+history-panelmenu.tooltiptext2 = Amuestre o suyo historial (%S)
+
+privatebrowsing-button.label = Nueva finestra privada
+# LOCALIZATION NOTE(privatebrowsing-button.tooltiptext): %S is the keyboard shortcut
+privatebrowsing-button.tooltiptext = Ubrir una nueva finestra de navegación privada (%S)
+
+save-page-button.label = Alzar a pachina
+# 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 = Alzar ista pachina... (%S)
+
+find-button.label = Buscar
+# 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 = Trobar en ista pachina... (%S)
+
+open-file-button.label = Ubrir un fichero
+# 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 = Ubrir un fichero... (%S)
+
+developer-button.label = Desembolicador
+# LOCALIZATION NOTE(developer-button.tooltiptext): %S is the keyboard shortcut
+developer-button.tooltiptext = Ferramientas d'o desembolicador web (%S)
+
+add-ons-button.label = Complementos
+# LOCALIZATION NOTE(add-ons-button.tooltiptext2): %S is the keyboard shortcut
+add-ons-button.tooltiptext2 = Ubrir l'administrador de complementos (%S)
+
+switch-to-metro-button2.label = Windows 8 Tactil
+# LOCALIZATION NOTE(switch-to-metro-button2.tooltiptext): %S is the brand short name
+switch-to-metro-button2.tooltiptext = Reubrir en %S ta Windows 8 Tactil
+
+preferences-button.label = Preferencias
+preferences-button.tooltiptext2 = Ubrir as preferencias
+preferences-button.tooltiptext.withshortcut = Ubrir as preferencias (%S)
+# LOCALIZATION NOTE (preferences-button.labelWin): Windows-only label for Options
+preferences-button.labelWin = Opcions
+# LOCALIZATION NOTE (preferences-button.tooltipWin): Windows-only tooltip for Options
+preferences-button.tooltipWin2 = Ubrir as opcions
+
+zoom-controls.label = Libel de zoom
+zoom-controls.tooltiptext = Libel de zoom
+
+zoom-out-button.label = Achiquir
+# LOCALIZATION NOTE(zoom-out-button.tooltiptext2): %S is the keyboard shortcut.
+zoom-out-button.tooltiptext2 = Achiquir (%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%%
+# LOCALIZATION NOTE(zoom-reset-button.tooltiptext2): %S is the keyboard shortcut.
+zoom-reset-button.tooltiptext2 = Reiniciar o libel de zoom (%S)
+
+zoom-in-button.label = Agrandir
+# LOCALIZATION NOTE(zoom-in-button.tooltiptext2): %S is the keyboard shortcut.
+zoom-in-button.tooltiptext2 = Agrandir (%S)
+
+edit-controls.label = Editar controls
+edit-controls.tooltiptext = Editar controls
+
+cut-button.label = Retallar
+# LOCALIZATION NOTE(cut-button.tooltiptext2): %S is the keyboard shortcut.
+cut-button.tooltiptext2 = Retallar (%S)
+
+copy-button.label = Copiar
+# LOCALIZATION NOTE(copy-button.tooltiptext2): %S is the keyboard shortcut.
+copy-button.tooltiptext2 = Copiar (%S)
+
+paste-button.label = Apegar
+# LOCALIZATION NOTE(paste-button.tooltiptext2): %S is the keyboard shortcut.
+paste-button.tooltiptext2 = Apegar (%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 = Conducir-se
+feed-button.tooltiptext = Conducir-se a ista pachina...
+
+characterencoding-button.label = Codificación de caracters
+characterencoding-button.tooltiptext2 = Amostrar as opcions de codificación de caracters
+
+email-link-button.label = Ninviar un vinclo
+# 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 = Ninviar por correu-e un vinclo enta la pachina...
+
+# 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/app-manager.dtd
+++ b/browser/chrome/browser/devtools/app-manager.dtd
@@ -3,88 +3,88 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY index.title "Chestor d'aplicacions">
 <!ENTITY index.projects2 "Aplicacions">
 <!ENTITY index.device2 "Dispositivo">
 <!ENTITY index.help "Aduya">
 
 <!ENTITY device.screenshot "Captura de pantalla">
-<!ENTITY device.screenshotTooltip "Ubrir una captura de pantalla d'o estau actual d'o dispositivo en una nueva pestanya.">
+<!ENTITY device.screenshotTooltip "Ubrir una captura de pantalla d'o estau actual d'o dispositivo en una pestanya nueva">
 <!ENTITY device.title "Centro de control d'o dispositivo">
 <!ENTITY device.notConnected "Sin connectar. Connecte o suyo dispositivo debaixo.">
 <!ENTITY device.startApp "Encetar">
-<!ENTITY device.startAppTooltip "Encetar ista aplicación en o dispositivo.">
+<!ENTITY device.startAppTooltip "Iniciar ista aplicación en o dispositivo">
 <!ENTITY device.stopApp "Aturar">
-<!ENTITY device.stopAppTooltip "Aturar ista aplicación en o dispositivo.">
+<!ENTITY device.stopAppTooltip "Aturar ista aplicación en o dispositivo">
 <!ENTITY device.debugApp "Depurar">
-<!ENTITY device.debugAppTooltip "Ubrir as ferramientas pa desembolicadors connectadas a ista aplicación en o dispositivo.">
+<!ENTITY device.debugAppTooltip "Ubrir as ferramientas ta desembolicadors connectadas a ista aplicación en o dispositivo">
 <!ENTITY device.name "Nombre">
 <!ENTITY device.plain "Simple (por defecto)">
 <!ENTITY device.privileged "Privilechiau">
 <!ENTITY device.certified "Certificau">
 <!ENTITY device.allow "Permitir">
-<!ENTITY device.allowTooltip "Iste permiso s'admete en aplicacions d'ista mena.">
+<!ENTITY device.allowTooltip "Iste permiso ye guarenciau ta aplicacions d'ista mena">
 <!ENTITY device.prompt "Demandar">
-<!ENTITY device.promptTooltip "Iste permiso requiere una acceptación de l'usuario en aplicacions d'ista mena.">
+<!ENTITY device.promptTooltip "Iste permiso requiere que l'usuario lo accepte ta aplicacions d'ista mena">
 <!ENTITY device.deny "Refusar">
-<!ENTITY device.denyTooltip "Iste permiso no s'admee en aplicacions d'ista mena.">
+<!ENTITY device.denyTooltip "Iste permiso ser refusa ta aplicacions d'ista mena">
 <!ENTITY device.installedApps "Aplicacions instaladas">
 <!ENTITY device.installedAppsTooltip "Veyer una lista d'aplicacions instaladas en o dispositivo. Qualques aplicacions, tals como as aplicacions certificadas, pueden estar excluidas d'ista anvista.">
 <!ENTITY device.permissions "Permisos">
-<!ENTITY device.permissionsTooltip "Veyer una tabla d'os permisos accesibles ta las diferents menas d'aplicacions.">
+<!ENTITY device.permissionsTooltip "Amostrar una tabla d'os permisos a os quals podrán accedir os diferents tipos d'aplicacions">
 <!ENTITY device.permissionsHelpLink "https://developer.mozilla.org/docs/web/apps/app_permissions">
 <!ENTITY device.help "Aduya">
 
-<!ENTITY connection.connectTooltip "Connectar-se ta o dispositivo.">
+<!ENTITY connection.connectTooltip "Connectar a o dispositivo">
 <!ENTITY connection.disconnect "Desconnectar">
-<!ENTITY connection.disconnectTooltip "Desconnectar d'o dispositivo u simulador actuals.">
+<!ENTITY connection.disconnectTooltip "Desconnectar d'o dispositivo actual o d'o simulador">
 <!ENTITY connection.notConnected2 "No connectau.">
 <!ENTITY connection.connectTo "Connectar con:">
 <!ENTITY connection.noDeviceFound "No s'ha trobau garra dispositivo. Connecte-ne uno">
 <!ENTITY connection.changeHostAndPort "Cambiar">
-<!ENTITY connection.changeHostAndPortTooltip "Cambiar o host y o puerto usau ta connectar-se a o dispositivo (por defecto ye localhost:6000)">
+<!ENTITY connection.changeHostAndPortTooltip "Cambiar l'ordinador anfitrión y o puerto que s'emplegan ta connectar-se a o dispositivo (a valura por defecto ye localhost:6000)">
 <!ENTITY connection.startSimulator "Lanzar o simulador">
-<!ENTITY connection.startSimulatorTooltip "Lanzar una instancia d'o simulador y connectar-se a ella.">
+<!ENTITY connection.startSimulatorTooltip "Iniciar una instancia d'o simulador y connectar-se">
 <!ENTITY connection.saveConnectionInfo "Alzar">
-<!ENTITY connection.saveConnectionInfoTooltip "Alzar o host y o puerto.">
+<!ENTITY connection.saveConnectionInfoTooltip "Alzar l'ordinador anfitrión y o puerto">
 <!ENTITY connection.connecting "Connectando…">
 <!ENTITY connection.disconnecting "Desconnectando…">
 <!ENTITY connection.cancel "Cancelar">
-<!ENTITY connection.cancelConnectTooltip "Cancelar a connexión en progreso.">
-<!ENTITY connection.cancelShowSimulatorTooltip "Salir d'o modo de connexión d'o simulador y tornar a o prompt inicial.">
+<!ENTITY connection.cancelConnectTooltip "Cancelar a connexión en curso">
+<!ENTITY connection.cancelShowSimulatorTooltip "Salir d'o modo de connexión d'o simulador y tornar ta l'indicador inicial">
 <!ENTITY connection.or "u">
 <!ENTITY connection.noSimulatorInstalled "No i hai garra simulador instalau.">
 <!ENTITY connection.installOneSimulator "Instalar Simulator">
-<!ENTITY connection.installOneSimulatorTooltip "Instalar una versión d'o simulador descargando o complemento apropiau.">
+<!ENTITY connection.installOneSimulatorTooltip "Instalar una versión d'o simulador dimpués de baixar o complemento correspondient">
 <!ENTITY connection.installAnotherSimulator "Adhibir">
-<!ENTITY connection.installAnotherSimulatorTooltip "Instalar una versión adicional d'o simulador descargando o complemento apropiau.">
+<!ENTITY connection.installAnotherSimulatorTooltip "Instalar una versión adicional d'o simulador dimpués de baixar o complemento correspondient">
 <!ENTITY connection.startRegisteredSimulator "Enchegar:">
 
 <!ENTITY projects.localApps "Aplicacions locals">
 <!ENTITY projects.addApp "Adhibir">
 <!ENTITY projects.addPackaged "Adhibir una aplicación empaquetada">
-<!ENTITY projects.addPackagedTooltip "Adhibir una nueva aplicación empaquetada (un directorio) dende o suyo equipo.">
+<!ENTITY projects.addPackagedTooltip "Adhibir una aplicación empaquetada nueva (un directorio) dende l'ordinador">
 <!ENTITY projects.addHosted "Adhibir aplicación alochada">
-<!ENTITY projects.addHostedTooltip "Adhibir una nueva aplicación alochada (vinclo a un fichero manifest.webapp) dende un puesto web remoto.">
+<!ENTITY projects.addHostedTooltip "Adhibir una aplicación alochada nueva (vinclo ta un fichero manifest.webapp) dende un puesto web remoto">
 <!ENTITY projects.title "Aplicacions locals">
 <!ENTITY projects.appDetails "Detalles de l'aplicación">
 <!ENTITY projects.removeAppFromList "Eliminar ista aplicación d'a lista d'aplicacions en as qualas yes treballando. Isto no la eliminará d'un dispositivo ni d'o simulador.">
 <!ENTITY projects.updateApp "Esviellar">
 <!ENTITY projects.updateAppTooltip "Executar prebas de validación y esviellar l'aplicación en o dispositivo connectau">
 <!ENTITY projects.debugApp "Depurar">
 <!ENTITY projects.debugAppTooltip "Ubrir as ferramientas d'o desembolicador connectadas a ista aplicación">
 <!ENTITY projects.saveManifest "Alzar">
-<!ENTITY projects.saveManifestTooltip "Alzar os cambios d'o conteniu de l'editor d'archivos manifest que ye contino.">
+<!ENTITY projects.saveManifestTooltip "Alza o conteniu de l'editor de manifiesto d'abaixo">
 <!ENTITY projects.hostedManifestPlaceHolder2 "http://example.com/app/manifest.webapp">
 <!ENTITY projects.noProjects "No i hai garra prochecto. Anyada una nueva aplicación empaquetada (directorio local) mas abaixo u una aplicación alochada (vinclo a un fichero manifest).">
 <!ENTITY projects.manifestEditor "Editor de fichers manifest">
 <!ENTITY projects.manifestEditorTooltip "Edite o fichero manifest d'a suya aplicación en o panel de debaixo. O botón Esviellar alzará os suyos cambios y esviellará l'aplicación.">
 <!ENTITY projects.manifestViewer "Visor de fichers manifest">
-<!ENTITY projects.manifestViewerTooltip "Examine o fichero manifest d'a suya aplicación en o panel de debaixo.">
+<!ENTITY projects.manifestViewerTooltip "Amuestra o manifiesto de l'aplicación en a subfinestra d'abaixo">
 <!ENTITY projects.valid "Valido">
 <!ENTITY projects.error "Error">
 <!ENTITY projects.warning "Alvertencias">
 
 <!ENTITY help.title "Chestor d'aplicacions">
 <!ENTITY help.close "Zarrar">
 <!ENTITY help.intro "Ista ferramienta li aduyará a chenerar y instalar aplicacions web en dispositivos compatibles (i.e. Firefox OS). A pestanya <strong>Aplicacions</strong> li aduyará en o proceso de validación y instalación d'a suya aplicación. A pestanya <strong>Dispositivo</strong> li dará información sobre o dispositivo connectau. Faiga servir a barra de ferramientas de debaixo ta connectar-se a un dispositivo u enchegar o simulador.">
 <!ENTITY help.usefullLinks "Vinclos utils:">
--- a/browser/chrome/browser/devtools/connection-screen.dtd
+++ b/browser/chrome/browser/devtools/connection-screen.dtd
@@ -18,12 +18,12 @@
 <!ENTITY connectionError "Error:">
 <!ENTITY errorTimeout "Error: s'ha acorau o tiempo d'a connexión.">
 <!ENTITY errorRefused "Error: s'ha refusau a connexión.">
 <!ENTITY errorUnexpected "Error desconoixiu.">
 <!-- LOCALIZATION NOTE (remoteHelp, remoteDocumentation, remoteHelpSuffix):
 these strings will be concatenated in a single label, remoteDocumentation will
 be used as text for a link to MDN. -->
 
-<!ENTITY remoteHelp "As ferramientas de desembolicamiento de Firefox pueden depurar dispositivos remotos (Firefox ta Android y Firefox OS, por eixemplo). Asegure-se que ha activau a opción &quot;Depuración remota&quot; en o dispositivo remoto. Ta mas información consulte a ">
+<!ENTITY remoteHelp "As ferramientas ta desembolicadors d&apos;o Firefox pueden depurar dispositivos remotos (por eixemplo, o Firefox ta Android y o Firefox OS). Asegure-se d&apos;haber activau a opción &quot;Depuración remota&quot; en o dispositivo remoto. Ta mas información, mire-se a ">
 <!ENTITY remoteDocumentation "documentación">
 <!ENTITY remoteHelpSuffix ".">
 
--- a/browser/chrome/browser/devtools/debugger.dtd
+++ b/browser/chrome/browser/devtools/debugger.dtd
@@ -35,126 +35,156 @@
 <!-- LOCALIZATION NOTE (debuggerUI.sources.blackBoxTooltip): This is the tooltip
   -  for the button that black boxes the selected source. -->
 
 <!ENTITY debuggerUI.sources.blackBoxTooltip "Alternar o modo de caixa negra">
 <!-- LOCALIZATION NOTE (debuggerUI.sources.prettyPrint): This is the tooltip for the
   -  button that pretty prints the selected source. -->
 
 <!ENTITY debuggerUI.sources.prettyPrint "Dar formato poliu a o codigo fuent">
+<!-- LOCALIZATION NOTE (debuggerUI.autoPrettyPrint): This is the label for the
+  -  checkbox that toggles auto pretty print. -->
+
+<!ENTITY debuggerUI.autoPrettyPrint     "Formatar automaticament o codigo fuent">
+<!ENTITY debuggerUI.autoPrettyPrint.accesskey "F">
+<!-- LOCALIZATION NOTE (debuggerUI.sources.toggleBreakpoints): This is the tooltip for the
+  -  button that toggles all breakpoints for all sources. -->
+
+<!ENTITY debuggerUI.sources.toggleBreakpoints "Activar/desactivar totz os puntos de interrupción">
+<!-- LOCALIZATION NOTE (debuggerUI.startTracing): This is the text displayed in
+  - the button to start execution tracing. -->
+
+<!ENTITY debuggerUI.startTracing "Empecipiar a rechistrar as trazas">
+<!-- LOCALIZATION NOTE (debuggerUI.clearButton): This is the label for
+  -  the button that clears the collected tracing data in the tracing tab. -->
+
+<!ENTITY debuggerUI.clearButton "Vuidar">
+<!-- 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 "Vuedar as trazas replegadas">
 <!-- LOCALIZATION NOTE (debuggerUI.pauseExceptions): This is the label for the
   -  checkbox that toggles pausing on exceptions. -->
 
-<!ENTITY debuggerUI.pauseExceptions     "Pausar en as excepcions">
-<!ENTITY debuggerUI.pauseExceptions.key "E">
-<!-- LOCALIZATION NOTE (debuggerUI.pauseExceptions): This is the label for the
+<!ENTITY debuggerUI.pauseExceptions           "Aturar en as excepcions">
+<!ENTITY debuggerUI.pauseExceptions.accesskey "E">
+<!-- LOCALIZATION NOTE (debuggerUI.ignoreCaughtExceptions): This is the label for the
   -  checkbox that toggles ignoring caught exceptions. -->
 
-<!ENTITY debuggerUI.ignoreCaughtExceptions     "Ignorar as excepcions detectadas">
-<!ENTITY debuggerUI.ignoreCaughtExceptions.key "C">
+<!ENTITY debuggerUI.ignoreCaughtExceptions           "Ignorar as excepcions detectadas">
+<!ENTITY debuggerUI.ignoreCaughtExceptions.accesskey "C">
 <!-- LOCALIZATION NOTE (debuggerUI.showPanesOnInit): This is the label for the
   -  checkbox that toggles visibility of panes when opening the debugger. -->
 
-<!ENTITY debuggerUI.showPanesOnInit     "Amostrar as subfinestras en iniciar">
-<!ENTITY debuggerUI.showPanesOnInit.key "S">
+<!ENTITY debuggerUI.showPanesOnInit           "Amostrar as subfinestras en iniciar">
+<!ENTITY debuggerUI.showPanesOnInit.accesskey "S">
 <!-- LOCALIZATION NOTE (debuggerUI.showVarsFilter): This is the label for the
   -  checkbox that toggles visibility of a designated variables filter box. -->
 
-<!ENTITY debuggerUI.showVarsFilter      "Amostrar as variables d'a caixa de filtros">
-<!ENTITY debuggerUI.showVarsFilter.key  "V">
+<!ENTITY debuggerUI.showVarsFilter           "Amostrar o quadro de filtro de variables">
+<!ENTITY debuggerUI.showVarsFilter.accesskey "V">
 <!-- LOCALIZATION NOTE (debuggerUI.showOnlyEnum): This is the label for the
   -  checkbox that toggles visibility of hidden (non-enumerable) variables and
   -  properties in stack views. The "enumerable" flag is a state of a property
   -  defined in JavaScript. When in doubt, leave untranslated. -->
 
-<!ENTITY debuggerUI.showOnlyEnum        "Amostrar as propiedatz amagadas">
-<!ENTITY debuggerUI.showOnlyEnum.key    "P">
+<!ENTITY debuggerUI.showOnlyEnum           "Amostrar nomás as propiedatz enumerables">
+<!ENTITY debuggerUI.showOnlyEnum.accesskey "P">
 <!-- LOCALIZATION NOTE (debuggerUI.showOriginalSource): This is the label for
   -  the checkbox that toggles the display of original or sourcemap-derived
   -  sources. -->
 
-<!ENTITY debuggerUI.showOriginalSource      "Amostrar as fuents orichinals">
-<!ENTITY debuggerUI.showOriginalSource.key  "O">
+<!ENTITY debuggerUI.showOriginalSource           "Amostrar as fuents orichinals">
+<!ENTITY debuggerUI.showOriginalSource.accesskey "O">
 <!-- LOCALIZATION NOTE (debuggerUI.searchPanelOperators): This is the text that
   -  appears in the filter panel popup as a header for the operators part. -->
 
 <!ENTITY debuggerUI.searchPanelOperators    "Operadors:">
 <!-- LOCALIZATION NOTE (debuggerUI.searchFile): This is the text that appears
   -  in the source editor's context menu for the scripts search operation. -->
 
-<!ENTITY debuggerUI.searchFile          "Filtrar scripts">
-<!ENTITY debuggerUI.searchFile.key      "P">
-<!ENTITY debuggerUI.searchFile.altkey   "O">
+<!ENTITY debuggerUI.searchFile           "Filtrar os scripts">
+<!ENTITY debuggerUI.searchFile.key       "P">
+<!ENTITY debuggerUI.searchFile.altkey    "O">
+<!ENTITY debuggerUI.searchFile.accesskey "P">
 <!-- LOCALIZATION NOTE (debuggerUI.searchGlobal): This is the text that appears
   -  in the source editor's context menu for the global search operation. -->
 
-<!ENTITY debuggerUI.searchGlobal        "Mirar en totz os fichers">
-<!ENTITY debuggerUI.searchGlobal.key    "F">
+<!ENTITY debuggerUI.searchGlobal           "Mirar en totz os fichers">
+<!ENTITY debuggerUI.searchGlobal.key       "F">
+<!ENTITY debuggerUI.searchGlobal.accesskey "f">
 <!-- LOCALIZATION NOTE (debuggerUI.searchFunction): This is the text that appears
   -  in the source editor's context menu for the function search operation. -->
 
-<!ENTITY debuggerUI.searchFunction      "Mirar a definición d'a función">
-<!ENTITY debuggerUI.searchFunction.key  "D">
+<!ENTITY debuggerUI.searchFunction           "Mirar a definición d'a función">
+<!ENTITY debuggerUI.searchFunction.key       "D">
+<!ENTITY debuggerUI.searchFunction.accesskey "d">
 <!-- LOCALIZATION NOTE (debuggerUI.searchToken): This is the text that appears
   -  in the source editor's context menu for the token search operation. -->
 
-<!ENTITY debuggerUI.searchToken         "Buscar">
-<!ENTITY debuggerUI.searchToken.key     "F">
+<!ENTITY debuggerUI.searchToken           "Mirar">
+<!ENTITY debuggerUI.searchToken.key       "F">
+<!ENTITY debuggerUI.searchToken.accesskey "C">
 <!-- LOCALIZATION NOTE (debuggerUI.searchLine): This is the text that appears
   -  in the source editor's context menu for the line search operation. -->
 
-<!ENTITY debuggerUI.searchGoToLine      "Ir t'a linia…">
-<!ENTITY debuggerUI.searchGoToLine.key  "L">
+<!ENTITY debuggerUI.searchGoToLine           "Ir t'a ringlera...">
+<!ENTITY debuggerUI.searchGoToLine.key       "R">
+<!ENTITY debuggerUI.searchGoToLine.accesskey "r">
 <!-- LOCALIZATION NOTE (debuggerUI.searchVariable): This is the text that appears
   -  in the source editor's context menu for the variables search operation. -->
 
-<!ENTITY debuggerUI.searchVariable      "Filtrar variables">
-<!ENTITY debuggerUI.searchVariable.key  "V">
+<!ENTITY debuggerUI.searchVariable           "Filtrar as variables">
+<!ENTITY debuggerUI.searchVariable.key       "V">
+<!ENTITY debuggerUI.searchVariable.accesskey "v">
 <!-- LOCALIZATION NOTE (debuggerUI.focusVariables): This is the text that appears
   -  in the source editor's context menu for the variables focus operation. -->
 
-<!ENTITY debuggerUI.focusVariables      "Seleccionar l'arbol de variables">
-<!ENTITY debuggerUI.focusVariables.key  "V">
+<!ENTITY debuggerUI.focusVariables           "Meter o foco en l'arbol de variables">
+<!ENTITY debuggerUI.focusVariables.key       "V">
+<!ENTITY debuggerUI.focusVariables.accesskey "v">
 <!-- LOCALIZATION NOTE (debuggerUI.condBreakPanelTitle): This is the text that
   -  appears in the conditional breakpoint panel popup as a description. -->
 
 <!ENTITY debuggerUI.condBreakPanelTitle "Iste punto d'interrupción aturará a execución nomás si a siguient expresión ye verdat">
 <!-- LOCALIZATION NOTE (debuggerUI.seMenuBreak): This is the text that
   -  appears in the source editor context menu for adding a breakpoint. -->
 
-<!ENTITY debuggerUI.seMenuBreak         "Adhibir un punto d'interrupción">
-<!ENTITY debuggerUI.seMenuBreak.key     "B">
+<!ENTITY debuggerUI.seMenuBreak     "Adhibir un punto d'interrupción">
+<!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     "Adhibir un punto d'interrupción condicional">
 <!ENTITY debuggerUI.seMenuCondBreak.key "B">
 <!-- LOCALIZATION NOTE (debuggerUI.tabs.*): This is the text that
   -  appears in the debugger's side pane tabs. -->
 
 <!ENTITY debuggerUI.tabs.sources        "Fuents">
-<!ENTITY debuggerUI.tabs.callstack      "Pila de gritadas">
+<!ENTITY debuggerUI.tabs.traces         "Trazas">
+<!ENTITY debuggerUI.tabs.callstack      "Pila de clamadas">
 <!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      "Selección d'a expresión ta cosirar">
+<!ENTITY debuggerUI.seMenuAddWatch      "Selección ta expresión d'aguait">
 <!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            "Adhibir expresión ta cosirar">
-<!ENTITY debuggerUI.addWatch.key        "E">
+<!ENTITY debuggerUI.addWatch            "Adhibir una expresión d'aguait">
+<!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      "Sacar todas as expresions ta cosirar">
-<!ENTITY debuggerUI.removeAllWatch.key  "E">
+<!ENTITY debuggerUI.removeAllWatch           "Suprimir todas as expresions d'aguait">
+<!ENTITY debuggerUI.removeAllWatch.key       "E">
+<!ENTITY debuggerUI.removeAllWatch.accesskey "e">
 <!-- LOCALIZATION NOTE (debuggerUI.stepping): These are the keycodes that
   -  control the stepping commands in the debugger (continue, step over,
   -  step in and step out). -->
 
 <!ENTITY debuggerUI.stepping.resume1    "VK_F8">
 <!ENTITY debuggerUI.stepping.resume2    "VK_SLASH">
 <!ENTITY debuggerUI.stepping.stepOver1  "VK_F10">
 <!ENTITY debuggerUI.stepping.stepOver2  "VK_QUOTE">
--- a/browser/chrome/browser/devtools/debugger.properties
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -44,16 +44,24 @@ expandPanes=Desplegar as subfinestras
 # LOCALIZATION NOTE (pauseLabel): The label that is displayed on the pause
 # button when the debugger is in a running state.
 pauseButtonTooltip=Faiga-ie click ta aturar-lo (%S)
 
 # LOCALIZATION NOTE (resumeLabel): The label that is displayed on the pause
 # button when the debugger is in a paused state.
 resumeButtonTooltip=Faiga-ie click ta reprener-lo (%S)
 
+# LOCALIZATION NOTE (startTracingTooltip): The label that is displayed on the trace
+# button when execution tracing is stopped.
+startTracingTooltip=Prete ta prencipiar o rechistro d'o bayo
+
+# LOCALIZATION NOTE (stopTracingTooltip): The label that is displayed on the trace
+# button when execution tracing is started.
+stopTracingTooltip=Prete ta rematar o rechistro d'o bayo
+
 # LOCALIZATION NOTE (stepOverTooltip): The label that is displayed on the
 # button that steps over a function call.
 stepOverTooltip=Blincar-lo (%S)
 
 # LOCALIZATION NOTE (stepInTooltip): The label that is displayed on the
 # button that steps into a function call.
 stepInTooltip=Dentrar-ie (%S)
 
@@ -70,17 +78,25 @@ noGlobalsText=No i ha garra global
 noSourcesText=Ista pachina no tien fuents.
 
 # LOCALIZATION NOTE (noEventListenersText): The text to display in the events tab
 # when there are no events.
 noEventListenersText=No i ha garra receptor d'eventos que amostrar
 
 # LOCALIZATION NOTE (noStackFramesText): The text to display in the call stack tab
 # when there are no stack frames.
-noStackFramesText=No stack frames to display
+noStackFramesText=No i hai garra trama de pila t'amostrar
+
+# LOCALIZATION NOTE (noStackFramesText): The text to display in the traces tab
+# when there are no function calls.
+noFunctionCallsText=No i ha clamadas a funcions a amostrar
+
+# LOCALIZATION NOTE (tracingNotStartedText): The text to display in the traces tab
+# when when tracing hasn't started yet.
+tracingNotStartedText=No s'ha empecipiau a rechistrar o bayo
 
 # LOCALIZATION NOTE (eventCheckboxTooltip): The tooltip text to display when
 # the user hovers over the checkbox used to toggle an event breakpoint.
 eventCheckboxTooltip=Activar/desactivar un punto de ruptura en iste evento
 
 # LOCALIZATION NOTE (eventOnSelector): The text to display in the events tab
 # for every event item, between the event type and event selector.
 eventOnSelector=en
@@ -189,20 +205,24 @@ breakpointMenuItem.deleteAll=Sacar totz 
 # editor when the loading process has started but there is no file to display
 # yet.
 loadingText=Se ye cargando…
 
 # LOCALIZATION NOTE (errorLoadingText): The text that is displayed in the debugger
 # viewer when there is an error loading a file
 errorLoadingText=Error en a carga d'a fuent:\n
 
-# LOCALIZATION NOTE (emptyStackText): The text that is displayed in the watch
-# expressions list to add a new item.
+# LOCALIZATION NOTE (addWatchExpressionText): The text that is displayed in the
+# watch expressions list to add a new item.
 addWatchExpressionText=Adhibir una expresión a cosirar
 
+# LOCALIZATION NOTE (addWatchExpressionButton): The button that is displayed in the
+# variables view popup.
+addWatchExpressionButton=Alufrar
+
 # LOCALIZATION NOTE (emptyVariablesText): The text that is displayed in the
 # variables pane when there are no variables to display.
 emptyVariablesText=No i ha variables ta amostrar
 
 # LOCALIZATION NOTE (scopeLabel): The text that is displayed in the variables
 # pane as a header for each variable scope (e.g. "Global scope, "With scope",
 # etc.).
 scopeLabel=Ambito %S
@@ -212,32 +232,67 @@ scopeLabel=Ambito %S
 # the watch expressions scope.
 watchExpressionsScopeLabel=Expresions cosiradas
 
 # LOCALIZATION NOTE (globalScopeLabel): The name of the global scope. This text
 # is added to scopeLabel and displayed in the variables pane as a header for
 # the global scope.
 globalScopeLabel=Global
 
+# LOCALIZATION NOTE (variablesViewErrorStacktrace): This is the text that is
+# shown before the stack trace in an error.
+variablesViewErrorStacktrace=Bayo d'a pila:
+
+# LOCALIZATION NOTE (variablesViewMoreObjects): the text that is displayed
+# when you have an object preview that does not show all of the elements. At the end of the list
+# you see "N more..." in the web console output.
+# This is a semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 number of remaining items in the object
+# example: 3 more…
+variablesViewMoreObjects=#1 mas…;#1 mas…
+
 # LOCALIZATION NOTE (variablesEditableNameTooltip): The text that is displayed
 # in the variables list on an item with an editable name.
 variablesEditableNameTooltip=Fer dople click ta editar
 
 # LOCALIZATION NOTE (variablesEditableValueTooltip): The text that is displayed
 # in the variables list on an item with an editable value.
 variablesEditableValueTooltip=Fer clic ta cambiar a valura
 
 # LOCALIZATION NOTE (variablesCloseButtonTooltip): The text that is displayed
 # in the variables list on an item which can be removed.
 variablesCloseButtonTooltip=Fer clic ta sacar
 
 # LOCALIZATION NOTE (variablesEditButtonTooltip): The text that is displayed
 # in the variables list on a getter or setter which can be edited.
 variablesEditButtonTooltip=Fer clic ta definir a valura
 
+# LOCALIZATION NOTE (variablesEditableValueTooltip): The text that is displayed
+# in a tooltip on the "open in inspector" button in the the variables list for a
+# DOMNode item.
+variablesDomNodeValueTooltip=Prete ta seleccionar o nodo en o inspector
+
+# LOCALIZATION NOTE (configurable|...|Tooltip): The text that is displayed
+# in the variables list on certain variables or properties as tooltips.
+# Expanations of what these represent can be found at the following links:
+# https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/defineProperty
+# https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/isExtensible
+# https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/isFrozen
+# https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/isSealed
+# It's probably best to keep these in English.
+configurableTooltip=configurable
+enumerableTooltip=enumerable
+writableTooltip=escribible
+frozenTooltip=conchelau
+sealedTooltip=sellau
+extensibleTooltip=extensible
+overriddenTooltip=sobrescrito
+WebIDLTooltip=WebIDL
+
 # LOCALIZATION NOTE (variablesSeparatorLabel): The text that is displayed
 # in the variables list as a separator between the name and value.
 variablesSeparatorLabel=:
 
 # LOCALIZATION NOTE (watchExpressionsSeparatorLabel): The text that is displayed
 # in the watch expressions list as a separator between the code and evaluation.
 watchExpressionsSeparatorLabel= →
 
--- a/browser/chrome/browser/devtools/inspector.dtd
+++ b/browser/chrome/browser/devtools/inspector.dtd
@@ -12,8 +12,10 @@
 
 <!ENTITY inspectorHTMLDelete.label          "Eliminar o nodo">
 <!ENTITY inspectorHTMLDelete.accesskey      "d">
 
 <!ENTITY inspector.selectButton.tooltip     "Seleccionar un elemento con o ratet">
 
 <!ENTITY inspectorSearchHTML.label          "Mirar en l'HTML">
 <!ENTITY inspectorSearchHTML.key            "F">
+
+<!ENTITY inspectorCopyImageDataUri.label       "Copiar a Data-URL d'a imachen">
--- a/browser/chrome/browser/devtools/netmonitor.dtd
+++ b/browser/chrome/browser/devtools/netmonitor.dtd
@@ -3,22 +3,27 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <!-- LOCALIZATION NOTE : FILE This file contains the Network Monitor strings -->
 <!-- LOCALIZATION NOTE : FILE Do not translate commandkey -->
 <!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
   - keep it in English, or another language commonly spoken among web developers.
   - You want to make that choice consistent across the developer tools.
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
-<!-- LOCALIZATION NOTE (netmonitorUI.emptyNotice2): This is the label displayed
-  -  in the network table when empty. -->
+<!-- LOCALIZATION NOTE (netmonitorUI.perfNotice1/2): These are the labels displayed
+  -  in the network table when empty to start performance analysis. -->
 
 
 
-<!ENTITY netmonitorUI.emptyNotice2        "Faiga una requesta u recargue a pachina ta veyer a información detallada sobre l'actividat de ret.">
+<!ENTITY netmonitorUI.perfNotice1         "• Prete o botón">
+<!ENTITY netmonitorUI.perfNotice2         "button to start performance analysis.">
+<!-- LOCALIZATION NOTE (netmonitorUI.emptyNotice3): This is the label displayed
+  -  in the network table when empty. -->
+
+<!ENTITY netmonitorUI.emptyNotice3        "• Faiga una requesta u recargue a pachina pa veyer información detallada sobre l'actividat de ret.">
 <!-- LOCALIZATION NOTE (netmonitorUI.toolbar.status2): This is the label displayed
   -  in the network table toolbar, above the "status" column. -->
 
 <!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      "Metodo">
@@ -93,20 +98,28 @@
 <!-- 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.filterOther): This is the label displayed
+  -  in the network details footer for the "Other" filtering button. -->
+
+<!ENTITY netmonitorUI.footer.filterOther  "Other">
 <!-- 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.footer.clear): This is the label displayed
+  -  in the network details footer for the performance analysis button. -->
+
+<!ENTITY netmonitorUI.footer.perf   "Activa/desactivar analís de rendimiento...">
 <!-- 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 "Cambiar a información de ret">
 <!-- LOCALIZATION NOTE (debuggerUI.summary.url): This is the label displayed
   -  in the network details headers tab identifying the URL. -->
 
 <!ENTITY netmonitorUI.summary.url         "URL requiesta:">
@@ -167,43 +180,59 @@
   -  in a "wait" state. -->
 
 <!ENTITY netmonitorUI.timings.wait        "Aguardando:">
 <!-- LOCALIZATION NOTE (debuggerUI.timings.receive): This is the label displayed
   -  in the network details timings tab identifying the amount of time spent
   -  in a "receive" state. -->
 
 <!ENTITY netmonitorUI.timings.receive     "Recebindo">
+<!-- LOCALIZATION NOTE (netmonitorUI.context.perfTools): This is the label displayed
+  -  on the context menu that shows the performance analysis tools -->
+
+<!ENTITY netmonitorUI.context.perfTools   "Start Performance Analysis...">
+<!-- LOCALIZATION NOTE (netmonitorUI.context.perfTools.accesskey): This is the access key
+  -  for the performance analysis menu item displayed in the context menu for a request -->
+
+<!ENTITY netmonitorUI.context.perfTools.accesskey "S">
 <!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrl): This is the label displayed
   -  on the context menu that copies the selected request's url -->
 
-<!ENTITY netmonitorUI.context.copyUrl      "Copiar l'URL">
+<!ENTITY netmonitorUI.context.copyUrl     "Copiar l'URL">
 <!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrl.accesskey): This is the access key
   -  for the Copy URL menu item displayed in the context menu for a request -->
 
-<!ENTITY netmonitorUI.context.copyUrl.accesskey  "C">
+<!ENTITY netmonitorUI.context.copyUrl.accesskey "C">
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyImageAsDataUri): This is the label displayed
+  -  on the context menu that copies the selected image as data uri -->
+
+<!ENTITY netmonitorUI.context.copyImageAsDataUri "Copy Image as Data URI">
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyImageAsDataUri.accesskey): This is the access key
+  -  for the Copy Image As Data URI menu item displayed in the context menu for a request -->
+
+<!ENTITY netmonitorUI.context.copyImageAsDataUri.accesskey  "I">
 <!-- LOCALIZATION NOTE (debuggerUI.summary.editAndResend): This is the label displayed
   -  on the button in the headers tab that opens a form to edit and resend the currently
      displayed request -->
 
-<!ENTITY netmonitorUI.summary.editAndResend      "Editar y reninviar">
+<!ENTITY netmonitorUI.summary.editAndResend "Editar y reninviar">
 <!-- LOCALIZATION NOTE (debuggerUI.summary.editAndResend.accesskey): This is the access key
   -  for the "Edit and Resend" menu item displayed in the context menu for a request -->
 
-<!ENTITY netmonitorUI.summary.editAndResend.accesskey  "R">
+<!ENTITY netmonitorUI.summary.editAndResend.accesskey "R">
 <!-- LOCALIZATION NOTE (netmonitorUI.context.newTab):  This is the label
   -  for the Open in New Tab menu item displayed in the context menu of the
   -  network container  -->
 
 <!ENTITY netmonitorUI.context.newTab      "Ubrir en una pestanya nueva">
 <!-- LOCALIZATION NOTE (netmonitorUI.context.newTab.accesskey): This is the access key
   -  for the Open in New Tab menu item displayed in the context menu of the
   -  network container -->
 
-<!ENTITY netmonitorUI.context.newTab.accesskey  "O">
+<!ENTITY netmonitorUI.context.newTab.accesskey "O">
 <!-- LOCALIZATION NOTE (debuggerUI.custom.newRequest): This is the label displayed
   -  as the title of the new custom request form -->
 
 <!ENTITY netmonitorUI.custom.newRequest   "Nueva requesta">
 <!-- LOCALIZATION NOTE (debuggerUI.custom.query): This is the label displayed
   -  above the query string entry in the custom request form -->
 
 <!ENTITY netmonitorUI.custom.query        "Cadena de consulta:">
@@ -218,8 +247,12 @@
 <!-- LOCALIZATION NOTE (debuggerUI.custom.send): This is the label displayed
   -  on the button which sends the custom request -->
 
 <!ENTITY netmonitorUI.custom.send         "Ninviar">
 <!-- LOCALIZATION NOTE (debuggerUI.custom.cancel): This is the label displayed
   -  on the button which cancels and closes the custom request form -->
 
 <!ENTITY netmonitorUI.custom.cancel       "Cancelar">
+<!-- LOCALIZATION NOTE (debuggerUI.backButton): This is the label displayed
+  -  on the button which exists the performance statistics view -->
+
+<!ENTITY netmonitorUI.backButton          "Enta zaga">
--- a/browser/chrome/browser/devtools/netmonitor.properties
+++ b/browser/chrome/browser/devtools/netmonitor.properties
@@ -119,11 +119,61 @@ networkMenu.summary=Una requesta, #2 kB,
 # LOCALIZATION NOTE (networkMenu.sizeKB): This is the label displayed
 # in the network menu specifying the size of a request (in kilobytes).
 networkMenu.sizeKB=%S KB
 
 # LOCALIZATION NOTE (networkMenu.totalMS): This is the label displayed
 # in the network menu specifying the time for a request to finish (in milliseconds).
 networkMenu.totalMS=→ %S ms
 
-# LOCALIZATION NOTE (networkMenu.divisionMS): This is the label displayed
+# LOCALIZATION NOTE (networkMenu.millisecond): This is the label displayed
 # in the network menu specifying timing interval divisions (in milliseconds).
-networkMenu.divisionMS=%S ms
+networkMenu.millisecond=%S ms
+
+# LOCALIZATION NOTE (networkMenu.second): This is the label displayed
+# in the network menu specifying timing interval divisions (in seconds).
+networkMenu.second=%S s
+
+# LOCALIZATION NOTE (networkMenu.minute): This is the label displayed
+# in the network menu specifying timing interval divisions (in minutes).
+networkMenu.minute=%S min
+
+# LOCALIZATION NOTE (pieChart.empty): This is the label displayed
+# for pie charts (e.g., in the performance analysis view) when there is
+# no data available yet.
+pieChart.empty=Se ye cargando
+
+# LOCALIZATION NOTE (tableChart.empty): This is the label displayed
+# for table charts (e.g., in the performance analysis view) when there is
+# no data available yet.
+tableChart.empty=Aguarde...
+
+# LOCALIZATION NOTE (charts.sizeKB): This is the label displayed
+# in pie or table charts specifying the size of a request (in kilobytes).
+charts.sizeKB=%S KB
+
+# LOCALIZATION NOTE (charts.totalS): This is the label displayed
+# in pie or table charts specifying the time for a request to finish (in seconds).
+charts.totalS=%S s
+
+# LOCALIZATION NOTE (charts.cacheEnabled): This is the label displayed
+# in the performance analysis view for "cache enabled" charts.
+charts.cacheEnabled=Caché presto
+
+# LOCALIZATION NOTE (charts.cacheDisabled): This is the label displayed
+# in the performance analysis view for "cache disabled" charts.
+charts.cacheDisabled=Vuedar o caché
+
+# LOCALIZATION NOTE (charts.totalSize): This is the label displayed
+# in the performance analysis view for total requests size, in kilobytes.
+charts.totalSize=Grandaria %S KB
+
+# LOCALIZATION NOTE (charts.totalTime2): This is the label displayed
+# in the performance analysis view for total requests time, in seconds.
+charts.totalTime2=Duración: %S seconds
+
+# LOCALIZATION NOTE (charts.totalCached): This is the label displayed
+# in the performance analysis view for total cached responses.
+charts.totalCached=Respuestas en caché: %S
+
+# LOCALIZATION NOTE (charts.totalCount): This is the label displayed
+# in the performance analysis view for total requests.
+charts.totalCount=Requestas totals: %S
--- a/browser/chrome/browser/devtools/styleeditor.properties
+++ b/browser/chrome/browser/devtools/styleeditor.properties
@@ -59,16 +59,32 @@ open.commandkey=VK_F7
 # LOCALIZATION NOTE (open.accesskey): The access key used to open the style
 # editor.
 open.accesskey=e
 
 # LOCALIZATION NOTE  (saveStyleSheet.commandkey): This the key to use in
 # conjunction with accel (Command on Mac or Ctrl on other platforms) to Save
 saveStyleSheet.commandkey=S
 
+# LOCALIZATION NOTE  (showOriginalSources.label): This is the label on the context
+# menu item to toggle showing original sources in the editor.
+showOriginalSources.label=Amostrar as fuents orichinals
+
+# LOCALIZATION NOTE  (showOriginalSources.accesskey): This is the access key for
+# the menu item to toggle showing original sources in the editor.
+showOriginalSources.accesskey=M
+
+# LOCALIZATION NOTE  (showCSSSources.label): This is the label on the context
+# menu item to toggle back to showing only CSS sources in the editor.
+showCSSSources.label=Amostrar as fuents CSS
+
+# LOCALIZATION NOTE  (showCSSSources.accesskey): This is the access key for the
+# menu item to toggle back to showing only CSS sources in the editor.
+showCSSSources.accesskey=C
+
 # LOCALIZATION NOTE (ToolboxStyleEditor.label):
 # This string is displayed in the title of the tab when the style editor is
 # displayed inside the developer tools window and in the Developer Tools Menu.
 ToolboxStyleEditor.label=Editor d'estilo
 
 # 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.
--- a/browser/chrome/browser/devtools/toolbox.dtd
+++ b/browser/chrome/browser/devtools/toolbox.dtd
@@ -47,39 +47,45 @@
   -  '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 colors">
-<!-- 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. -->
+<!-- LOCALIZATION NOTE (options.context.triggersPageRefresh): This is the
+  -  triggers page refresh footnote under the advanced settings group in the
+  -  options panel and is used for settings that trigger page reload. -->
 
-<!ENTITY options.context.triggersPageRefresh2  "Sesión actual unicament, recarga a pachina">
+<!ENTITY options.context.triggersPageRefresh  "* esviella a pachina nomás ta ista sesión">
 <!-- LOCALIZATION NOTE (options.enableChrome.label3): This is the label for the
   -  checkbox that toggles chrome debugging, i.e. devtools.chrome.enabled
   -  boolean preference in about:config, in the options panel. -->
 
 <!ENTITY options.enableChrome.label3    "Activar a depuración chrome">
 <!ENTITY options.enableChrome.tooltip   "Activar ista opción le permitirá de fer servir quantas ferramientas de desembolicador en o contexto d'o navegador">
 <!-- LOCALIZATION NOTE (options.enableRemote.label3): This is the label for the
   -  checkbox that toggles remote debugging, i.e. devtools.debugger.remote-enabled
   -  boolean preference in about:config, in the options panel. -->
 
 <!ENTITY options.enableRemote.label3    "Activar a depuración remota">
 <!ENTITY options.enableRemote.tooltip   "Activar ista opción permitirá a las ferramientas de desembolicador depurar instancias remotas de Firefox, como Firefox OS">
-<!-- LOCALIZATION NOTE (options.disableJavaScript.label2,
+<!-- LOCALIZATION NOTE (options.disableJavaScript.label,
   -  options.disableJavaScript.tooltip): This is the options panel label and
   -  tooltip for the checkbox that toggles JavaScript on or off. -->
 
-<!ENTITY options.disableJavaScript.label2    "Desactivar JavaScript">
+<!ENTITY options.disableJavaScript.label     "Desactivar JavaScript *">
 <!ENTITY options.disableJavaScript.tooltip   "Activando ista opción se desactivará JavaScript en a pestanya actual. Si a pestanya u caixa de ferramientas de zarra alavez iste achuste se descartará.">
+<!-- LOCALIZATION NOTE (options.disableCache.label,
+  -  options.disableCache.tooltip): This is the options panel label and
+  -  tooltip for the checkbox that toggles the cache on or off. -->
+
+<!ENTITY options.disableCache.label     "Desactivar a memoria caché *">
+<!ENTITY options.disableCache.tooltip   "Si activa ista opción, se desactivará a caché ta ista pestanya. Iste parametro s'ixublidará en zarrar a pestanya u as ferramientas de desembolicador.">
 <!-- LOCALIZATION NOTE (options.selectDefaultTools.label): This is the label for
   -  the heading of group of checkboxes corresponding to the default developer
   -  tools. -->
 
 <!ENTITY options.selectDefaultTools.label     "Ferramientas de desembolicador de Firefox predeterminadas">
 <!-- LOCALIZATION NOTE (options.selectAdditionalTools.label): This is the label for
   -  the heading of group of checkboxes corresponding to the developer tools
   -  added by add-ons. This heading is hidden when there is no developer tool
@@ -109,16 +115,31 @@
 
 <!ENTITY options.enablePersistentLogging.label    "Activar a conservación d'o rechistro">
 <!ENTITY options.enablePersistentLogging.tooltip  "Si activa ista opción, a consola web no vuidará a salida cada vegada que navegue ta una nueva pachina">
 <!-- LOCALIZATION NOTE (options.timestampMessages.label): This is the
    - label for the checkbox that toggles timestamps in the Web Console -->
 
 <!ENTITY options.timestampMessages.label      "Activar as marcas de tiempo">
 <!ENTITY options.timestampMessages.tooltip    "Si activa ista opción as ordens y as suyas salidas amostrarán una marca de tiempo">
+<!-- LOCALIZATION NOTE (options.styleeditor.label): This is the label for the
+  -  heading of the group of Style Editor preferences in the options
+  -  panel. -->
+
+<!ENTITY options.styleeditor.label            "Editor de estilo">
+<!-- LOCALIZATION NOTE (options.stylesheetSourceMaps.label): This is the
+   - label for the checkbox that toggles showing original sources in the Style Editor -->
+
+<!ENTITY options.stylesheetSourceMaps.label      "Amostrar as fuents orichinals">
+<!ENTITY options.stylesheetSourceMaps.tooltip    "Amostrar as fuents orichinals (os fichers Sass, por eixemplo) en l'editor de estilos y l'inspector">
+<!-- LOCALIZATION NOTE (options.stylesheetAutocompletion.label): This is the
+   - label for the checkbox that toggles autocompletion of css in the Style Editor -->
+
+<!ENTITY options.stylesheetAutocompletion.label      "Completar automaticament as CSS">
+<!ENTITY options.stylesheetAutocompletion.tooltip    "Completar automaticament as propiedatz, as valuras y os selectors CSS en l'editor de estilos mientres a escritura">
 <!-- 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 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/devtools/toolbox.properties
+++ b/browser/chrome/browser/devtools/toolbox.properties
@@ -49,8 +49,12 @@ options.toolNotSupportedMarker=%1$S *
 # Used for opening scratchpad from the detached toolbox window
 # Needs to match scratchpad.keycode from browser.dtd
 scratchpad.keycode=VK_F4
 
 # LOCALIZATION NOTE (browserConsoleCmd.commandkey)
 # Used for toggling the browser console from the detached toolbox window
 # Needs to match browserConsoleCmd.commandkey from browser.dtd
 browserConsoleCmd.commandkey=j
+
+# LOCALIZATION NOTE (pickButton.tooltip)
+# This is the tooltip of the pick button in the toolbox toolbar
+pickButton.tooltip=Trigue un elemento d'a pachina
--- a/browser/chrome/browser/devtools/webconsole.properties
+++ b/browser/chrome/browser/devtools/webconsole.properties
@@ -97,25 +97,23 @@ gcliterm.instanceLabel=Instancia de %S
 # The 2nd line, from "function" to the end of the line, is a link to the
 # JavaScript debugger.
 reflow.messageWithNoLink=reachuste: %Sms
 reflow.messageWithLink=reachuste: %Sms 
 reflow.messageLinkText=función %1$S, %2$S linia %3$S
 
 # LOCALIZATION NOTE (stacktrace.anonymousFunction): this string is used to
 # display JavaScript functions that have no given name - they are said to be
-# anonymous. See also stacktrace.outputMessage.
+# anonymous. Test console.trace() in the webconsole.
 stacktrace.anonymousFunction=<anonymous>
 
-# LOCALIZATION NOTE (stacktrace.outputMessage): this string is used in the Web
-# Console output to identify a web developer call to console.trace(). The
-# stack trace of JavaScript function calls is displayed. In this minimal
-# message we only show the last call. Parameters: %1$S is the file name, %2$S
-# is the function name, %3$S is the line number.
-stacktrace.outputMessage=Traza d'a pila de %1$S, función %2$S, linia %3$S.
+# LOCALIZATION NOTE (unknownLocation): this string is used to
+# display messages with sources that have an unknown location, eg. from
+# console.trace() calls.
+unknownLocation=<unknown>
 
 # LOCALIZATION NOTE (timerStarted): this string is used to display the result
 # of the console.time() call. Parameters: %S is the name of the timer.
 timerStarted=%S: s'ha iniciau o cronometro
 
 # LOCALIZATION NOTE (timeEnd): this string is used to display the result of
 # the console.timeEnd() call. Parameters: %1$S is the name of the timer, %2$S
 # is the number of milliseconds.
--- a/browser/chrome/browser/preferences/fonts.dtd
+++ b/browser/chrome/browser/preferences/fonts.dtd
@@ -31,17 +31,16 @@
 <!ENTITY  font.langGroup.simpl-chinese            "Chinés simplificau">
 <!ENTITY  font.langGroup.trad-chinese-hk          "Chinés tradicional (Hong Kong)">
 <!ENTITY  font.langGroup.korean                   "Coreán">
 <!ENTITY  font.langGroup.cyrillic                 "Cirilico">
 <!ENTITY  font.langGroup.baltic                   "Baltico">
 <!ENTITY  font.langGroup.el                       "Griego">
 <!ENTITY  font.langGroup.turkish                  "Turco">
 <!ENTITY  font.langGroup.unicode                  "Atras luengas">
-<!ENTITY  font.langGroup.user-def                 "Definida por l'usuario">
 <!ENTITY  font.langGroup.thai                     "Tailandés">
 <!ENTITY  font.langGroup.hebrew                   "Hebreu">
 <!ENTITY  font.langGroup.arabic                   "Arabe">
 <!ENTITY  font.langGroup.devanagari               "Devanagari">
 <!ENTITY  font.langGroup.tamil                    "Tamil">
 <!ENTITY  font.langGroup.armenian                 "Armenio">
 <!ENTITY  font.langGroup.bengali                  "Bengalí">
 <!ENTITY  font.langGroup.canadian                 "Silabario canadenco unificau">
--- a/browser/chrome/browser/preferences/preferences.properties
+++ b/browser/chrome/browser/preferences/preferences.properties
@@ -130,8 +130,14 @@ updateAutoDesktop.accessKey=S
 syncUnlink.title=Quiere desvincular iste dispositivo?
 syncUnlink.label=Iste dispositivo ye estau desvinculau d'a suya cuenta Sync. Totz os suyos datos personals tanto en iste dispositivo como en a suya cuenta Sync se mantendrán intactos.
 syncUnlinkConfirm.label=Desvincular
 
 # LOCALIZATION NOTE (featureEnableRequiresRestart, featureDisableRequiresRestart, restartTitle): %S = brandShortName
 featureEnableRequiresRestart=Ha de reiniciar o %S ta activar ista caracteristica.
 featureDisableRequiresRestart=Ha de reiniciar o %S ta desactivar ista caracteristica.
 shouldRestartTitle=Reiniciar o %S
+
+###Preferences::Sync::Firefox Accounts
+firefoxAccountsVerificationSentTitle=Verificación ninviada
+# LOCALIZATION NOTE: %S = user's email address.
+firefoxAccountsVerificationSentHeading=S'ha ninviau un vinclo de verificación ta %S
+firefoxAccountVerificationSentDescription=Revise o suyo correu y prete o vinclo ta escomencipiar a sincronización.
--- a/browser/chrome/browser/preferences/privacy.dtd
+++ b/browser/chrome/browser/preferences/privacy.dtd
@@ -20,20 +20,20 @@
 <!ENTITY  locbar.pre.accessKey          "b">
 <!ENTITY  locbar.post.label             "">
 <!ENTITY  locbar.both.label             "historial y marcapachinas">
 <!ENTITY  locbar.history.label          "historial">
 <!ENTITY  locbar.bookmarks.label        "marcapachinas">
 <!ENTITY  locbar.nothing.label          "cosa">
 
 <!ENTITY  acceptCookies.label           "Acceptar cookies d'os puestos web">
-<!ENTITY  acceptCookies.accesskey       "c">
+<!ENTITY  acceptCookies.accesskey       "A">
 
 <!ENTITY  acceptThirdParty.pre.label      "Acceptar as cookies de tercers:">
-<!ENTITY  acceptThirdParty.pre.accesskey  "p">
+<!ENTITY  acceptThirdParty.pre.accesskey  "c">
 <!ENTITY  acceptThirdParty.always.label   "Siempre">
 <!ENTITY  acceptThirdParty.never.label    "Nunca">
 <!ENTITY  acceptThirdParty.visited.label  "D'as visitadas">
 
 <!ENTITY  keepUntil.label               "Conservar-las dica:">
 <!ENTITY  keepUntil.accesskey           "d">
 
 <!ENTITY  expire.label                  "que circumduzcan">
--- a/browser/chrome/browser/preferences/sync.dtd
+++ b/browser/chrome/browser/preferences/sync.dtd
@@ -40,8 +40,30 @@
 
 <!ENTITY syncDeviceName.label       "Nombre d'o dispositivo:">
 <!ENTITY syncDeviceName.accesskey   "m">
 <!ENTITY unlinkDevice.label           "Desvincular iste dispositivo">
 <!-- Footer stuff -->
 
 <!ENTITY prefs.tosLink.label        "Termins d'o Servicio">
 <!ENTITY prefs.ppLink.label         "Politica de privacidat">
+<!-- Firefox Accounts stuff -->
+
+<!ENTITY fxaPrivacyNotice.link.label "Nota sobre privacidat">
+<!ENTITY determiningAcctStatus.label     "Determinando o estau d'a suya cuenta...">
+<!ENTITY signedInUnverified.beforename.label "">
+<!ENTITY signedInUnverified.aftername.label "no ye verificau.">
+
+<!ENTITY signedInLoginFailure.beforename.label "Enciete una sesión ta reconnectar">
+<!ENTITY signedInLoginFailure.aftername.label "">
+
+<!ENTITY notSignedIn.label           "No ha encetau garra sesión.">
+<!ENTITY signIn.label                "Connectar-se">
+<!ENTITY manage.label                "Administrar">
+<!ENTITY disconnect.label            "Desconnectar...">
+<!ENTITY verify.label                "Verificar mensache">
+<!ENTITY forget.label                "Oblide iste mensache">
+
+<!ENTITY welcome.description "Acceda a las suyas pestanyas, marcapachinas, claus y mas siempre que faiga servir &brandShortName;.">
+<!ENTITY welcome.signIn.label "Connectar-se">
+<!ENTITY welcome.createAccount.label "Creyar una cuenta">
+
+<!ENTITY welcome.useOldSync.label "Fer servir una versión antiga de Sync?">
--- a/browser/chrome/browser/syncBrand.dtd
+++ b/browser/chrome/browser/syncBrand.dtd
@@ -1,6 +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 syncBrand.shortName.label  "Sync">
 <!ENTITY syncBrand.fullName.label   "Firefox Sync">
+<!ENTITY syncBrand.fxAccount.label  "Cuenta de Firefox">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/syncCustomize.dtd
@@ -0,0 +1,27 @@
+<!-- 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 syncCustomize.dialog.title       "Selección de sincronización">
+<!ENTITY syncCustomize.acceptButton.label "Empecipiar">
+
+<!ENTITY syncCustomize.title              "Qué quiere sincronizar?">
+<!ENTITY syncCustomize.description        "Puede cambiar ista selección en Opcions.">
+<!ENTITY syncCustomizeUnix.description    "Puede camibar ista selección en Preferencias.">
+<!--
+  These engine names are the same as in browser/preferences/sync.dtd except
+  for the last two that are marked as being specific to Desktop browsers.
+-->
+
+<!ENTITY engine.bookmarks.label           "Marcapachinas">
+<!ENTITY engine.bookmarks.accesskey       "M">
+<!ENTITY engine.history.label             "Historial">
+<!ENTITY engine.history.accesskey         "r">
+<!ENTITY engine.tabs.label                "Pestanyas">
+<!ENTITY engine.tabs.accesskey            "P">
+<!ENTITY engine.passwords.label           "Claus">
+<!ENTITY engine.passwords.accesskey       "C">
+<!ENTITY engine.addons.label              "Complementos d'escritorio">
+<!ENTITY engine.addons.accesskey          "e">
+<!ENTITY engine.prefs.label               "Preferencias d'escritorio">
+<!ENTITY engine.prefs.accesskey           "r">
--- a/browser/chrome/browser/syncSetup.dtd
+++ b/browser/chrome/browser/syncSetup.dtd
@@ -28,16 +28,18 @@
 
 <!ENTITY setup.newAccountDetailsPage.title.label "Detalles d'a cuenta">
 <!ENTITY setup.emailAddress.label     "Adreza de correu electronico">
 <!ENTITY setup.emailAddress.accesskey "e">
 <!ENTITY setup.choosePassword.label      "Trigar una clau">
 <!ENTITY setup.choosePassword.accesskey  "T">
 <!ENTITY setup.confirmPassword.label     "Confirmar a clau">
 <!ENTITY setup.confirmPassword.accesskey "m">
+<!ENTITY setup.setupMetro.label     "Sincronizar con &brandShortName; con o 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      "Accepto os">
 <!ENTITY setup.tosAgree1.accesskey  "A">
 <!ENTITY setup.tosLink.label        "termins d'o servicio">
 <!ENTITY setup.tosAgree2.label      "y a">
 <!ENTITY setup.ppLink.label         "politica de privacidat">
--- a/browser/chrome/browser/syncSetup.properties
+++ b/browser/chrome/browser/syncSetup.properties
@@ -44,8 +44,23 @@ newAccount.action.label = S'ha configura
 newAccount.change.label = Puede trigar qué quiere sincronizar exactament seleccionando as opcions de sincronización.
 resetClient.change2.label = Firefox Sync combinará totz os datos de navegador d'iste dispositivo en a suya cuenta de Sync.
 wipeClient.change2.label = Firefox Sync reemplazará totz os datos de navegador d'iste dispositivo en a suya cuenta de Sync.
 wipeRemote.change2.label = Firefox Sync reemplaazará totz os datos de navegador que i hai en a suya cuenta de Sync por os datos d'iste dispositivo.
 existingAccount.change.label = Puede cambiar ista preferencia seleccionando as opciones de Sync mas abaixo.
 
 # Several other strings are used (via Weave.Status.login), but they come from
 #  /services/sync
+
+# Firefox Accounts based setup.
+continue.label = Continar
+disconnect.verify.title = Desconnectar
+disconnect.verify.heading = En ye seguro?
+# LOCALIZATION NOTE (disconnect.verify.description): %S will be replaced with
+# brandShortName
+disconnect.verify.description = %S deixará de sincronizar a suya cuenta, pero no borrará garra d'os suyos datos de navegación en iste equipo.
+
+relinkVerify.title = Alvertencia de fusión
+relinkVerify.heading = Ye seguro que quiere enceetar una sesión en Sync?
+# LOCALIZATION NOTE (relinkVerify.description): Email address of a user previously signed into sync.
+relinkVerify.description = Unatro usuario encetó una sesión previament en Sync en iste equipo. Encetar sesión fusionará os marcapachinas, claus y atros achustes d'iste navegador con os de %S
+
+manage.pageTitle = Administrar Sync
--- a/browser/chrome/browser/tabbrowser.properties
+++ b/browser/chrome/browser/tabbrowser.properties
@@ -16,11 +16,16 @@ tabs.searching=Se ye mirando…
 tabs.loading=Se ye cargando…
 tabs.waiting=Se ye aguardando…
 tabs.downloading=Se ye descargando…
 
 tabs.emptyTabTitle=Nueva pestanya
 tabs.closeTab=Zarrar a pestanya
 tabs.close=Zarrar
 tabs.closeWarningTitle=Confirmar zarradura
-tabs.closeWarningMultipleTabs=Ye en momentos de zarrar %S pestanyas. Ye seguro de querer continar?
+# LOCALIZATION NOTE (tabs.closeWarningMultiple):
+# Semicolon-separated list of plural forms. See:
+# http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# The singular form is not considered since this string is used only for
+# multiple tabs.
+tabs.closeWarningMultiple=;Ye en momentos de zarrar #1 pestanyas. Ye seguro de continar?
 tabs.closeButtonMultiple=Zarrar as pestanyas
 tabs.closeWarningPromptMe=Alvertir-me quan si miro de zarrar multiples pestanyas
--- a/browser/chrome/overrides/netError.dtd
+++ b/browser/chrome/overrides/netError.dtd
@@ -67,17 +67,17 @@ que &brandShortName; tiene permiso ta ac
 </ul>">
 
 <!ENTITY netReset.title "S'ha reiniciau a connexión">
 <!ENTITY netReset.longDesc "&sharedLongDesc;">
 
 <!ENTITY netTimeout.title "S'ha acotolau o tiempo d'aspera d'a connexión">
 <!ENTITY netTimeout.longDesc "&sharedLongDesc;">
 
-<!ENTITY protocolNotFound.title "No s'ha replecau l'adreza">
+<!ENTITY protocolNotFound.title "No s'ha entendiu l'adreza">
 <!ENTITY protocolNotFound.longDesc "<ul> 
 <li>Podría estar que calese instalar unatro software ta ubrir l'adreza.</li> 
 </ul>">
 
 <!ENTITY proxyConnectFailure.title "O servidor proxy ye refusando as connexions">
 <!ENTITY proxyConnectFailure.longDesc "<ul> 
 <li>Comprebe a configuración d'o servidor proxy ta asegurar-se de que ye correcta.</li> 
 <li>Meta-se en contacto con l'administrador d'o ret ta asegurar-se de que o servidor proxy ye 
--- a/browser/metro/chrome/browser.dtd
+++ b/browser/metro/chrome/browser.dtd
@@ -4,16 +4,17 @@
 <!-- NAVBAR AND AUTOCOMPLETE -->
 
 
 <!ENTITY urlbar.emptytext      "Adreza u termen a buscar">
 
 <!ENTITY back.label            "Enta zaga">
 <!ENTITY forward.label         "Enta debant">
 <!ENTITY newtab.label          "Nueva pestanya">
+<!ENTITY newPrivateTab.label   "Nueva pestanya privada">
 <!ENTITY closetab.label        "Zarrar pestanya">
 
 <!ENTITY autocompleteResultsHeader.label  "Resultaus">
 
 <!ENTITY appbarErrorConsole.label      "Ubrir a consola d'errors">
 <!ENTITY appbarJSShell.label           "Ubrir o interprete de Javascript">
 <!ENTITY appbarFindInPage2.label       "Buscar en a pachina">
 <!ENTITY appbarRelaunchInDesktop.label "Reubrir en o escritorio">
@@ -98,35 +99,52 @@
 <!ENTITY savePage.key "s">
 <!ENTITY find.key "f">
 <!ENTITY findNext.key "g">
 <!ENTITY quit.key "q">
 <!ENTITY addBookmark.key "d">
 <!ENTITY newTab.key "t">
 <!ENTITY newTab2.key "n">
 <!ENTITY closeTab.key "w">
+<!-- Private browsing (control+shift+key) -->
+<!ENTITY newPrivateTab.key "p">
 <!-- DEVELOPER SHORTCUTS (control+shift+key) -->
 
 <!ENTITY jsConsole.key "j">
 <!ENTITY optionsFlyout.key "u">
 <!ENTITY syncFlyout.key "s">
 <!ENTITY aboutFlyout.key "a">
 <!-- FIRT RUN EXPERIENCE -->
 <!-- LOCALIZATION NOTE (firstRunTabs.label,
                         firstRunTopSites.label,
                         firstRunBookmarks.label,
                         firstRunMenu.label,
                         firstRunHistory.label )
      These strings appear on the Firefox Start page the first time
      Firefox for Windows 8 Touch (Metro) is launched.  Each one
-     has an arrow pointing toward the feature it references.  The code
-     to display these strings is not enabled yet, but will be soon.
-     For now, you can see this mockup for an example of how they are
-     used: https://bug941284.bugzilla.mozilla.org/attachment.cgi?id=8344046
+     has an arrow pointing toward the feature it references.
      -->
 
 <!ENTITY firstRunTabs.label "Busca as suyas pestanyas? Arrociegue enta abaixo u faiga clic con o botón dreito">
 <!ENTITY firstRunTopSites.label "Veiga os puestos que mas visita">
 <!ENTITY firstRunBookmarks.label "Trobe as pachinas que ha alzau ta visitar mas enta debant">
 <!ENTITY firstRunMenu.label "Accedeixca a mas caracteristicas y opcions">
 <!ENTITY firstRunHistory.label "Veiga qué ha visitau en a Web">
 <!ENTITY firstRunWelcome.label "Bienveniu ta &brandShortName;">
 <!ENTITY firstRunDifferent.label "Diferent por definición">
+<!-- LOCALIZATION NOTE (firstRunBack.label,
+                          firstRunNewTab.label,
+                          firstRunStar.label,
+                          firstRunPin.label,
+                          firstRunGotIt.label )
+       These strings appear as a content overlay the first few times a page
+       is visited. Each one has an arrow pointing toward the feature it
+       references. The code to display these strings is not enabled yet,
+       but will be soon. For now, you can see this mockup for an example
+       of how they are used:
+       https://bug949213.bugzilla.mozilla.org/attachment.cgi?id=8363973
+       -->
+
+<!ENTITY firstRunBack.label "Toque ta tornar ta la pachina anterior">
+<!ENTITY firstRunNewTab.label "Adhiba unatra pestanya ta explorar un puesto nuevo">
+<!ENTITY firstRunStar.label "Faiga servir os marcapachins pa alzar pachinas pa mas ta debant">
+<!ENTITY firstRunPin.label "Penche qualsequier puesto en a suya pantalla d'inicio de windows ta un acceso rapido">
+<!ENTITY firstRunGotIt.label "Ya lo tiengo!">
--- a/browser/metro/chrome/browser.properties
+++ b/browser/metro/chrome/browser.properties
@@ -33,18 +33,19 @@ contextAppbar2.delete=Eliminar
 # Button with this label only appears immediately after a deletion.
 contextAppbar2.restore=Desfer a eliminación
 
 # LOCALIZATION NOTE (contextAppbar2.clear): Unselects pages without modification.
 contextAppbar2.clear=Cancelar a selección
 
 # Clear private data
 clearPrivateData.clearButton=Limpiar
-clearPrivateData.title=Limpiar os datos privaus
-clearPrivateData.message=Limipiar os suyos datos privaus?
+clearPrivateData.title2=Limpiar os datos privaus
+# LOCALIZATION NOTE (clearPrivateData.message2): #1 is optionsCharm
+clearPrivateData.message2=Se borrarán pa cutio os datos privaus que ha trigau en #1
 
 # Settings Charms
 aboutCharm1=Sobre
 optionsCharm=Opcions
 searchCharm=Buscar
 helpOnlineCharm=Aduya (en linia)
 
 # General
@@ -67,17 +68,17 @@ downloadShowInFiles=Amostrar en Fichers
 alertLinkBookmarked=S'ha adhibiu o marcapachinas
 alertDownloads=Descargas
 alertDownloadsStart=Descargando: %S
 alertDownloadsDone=S'ha rematau de baixar %S
 # 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=Se ye descargando #1, #2, #3
 alertDownloadsDone2=S'ha descargau %S
-alertTapToSave=Prete ta alzar iste fichero.
+alertTapToSave=Toque ta alzar iste fichero.
 alertDownloadsSize=A descarga ye masiau gran
 alertDownloadsNoSpace=No i hai prou espacio d'almagazenache
 # LOCALIZATION NOTE (alertDownloadSave2): #1 is the file name, #2 is the file size, #3 is the file host
 alertDownloadSave2=Quiere ubrir u alzar #1 (#2) de #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=Se ye descargando un fichero, #2, #3;Se son descargando #1 fichers, #2, #3
--- a/browser/metro/chrome/config.dtd
+++ b/browser/metro/chrome/config.dtd
@@ -1,16 +1,16 @@
 <!-- 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 empty.label            "Buscar">
-<!ENTITY newpref.label          "Adhibir una nueva preferencia">
 <!ENTITY addpref.name           "Nombre">
-<!ENTITY addpref.value          "Valura">
 
 <!ENTITY cancel.label           "Cancelar">
-<!ENTITY reset.label            "Restablir">
-<!ENTITY done.label             "Feito">
+<!ENTITY toggle.label           "Commutar">
 
 <!ENTITY integer.label          "Entero">
 <!ENTITY string.label           "Cadena">
 <!ENTITY boolean.label          "Booleano">
+
+<!ENTITY string.placeholder     "Escribir una cadena">
+<!ENTITY number.placeholder     "Escribir un numero">
new file mode 100644
--- /dev/null
+++ b/browser/metro/chrome/config.properties
@@ -0,0 +1,10 @@
+# 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/.
+
+newPref.createButton=Creyar
+newPref.privateButton=Privada
+newPref.changeButton=Cambiar
+
+pref.toggleButton=Commutar
+pref.resetButton=Restablir
--- a/browser/metro/chrome/crashprompt.dtd
+++ b/browser/metro/chrome/crashprompt.dtd
@@ -3,14 +3,19 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 
 <!ENTITY crashprompt.title           "Quiere ninviar reportes de fallos a Mozilla?">
 <!ENTITY crashprompt.message         "&brandShortName; acaba de recuperar-se d'un fallo. Ninviar reportes de fallo aduyará a Mozilla a fer o &brandShortName; mas estable y seguro. Siempre puede cambiar as suyas preferencias en Configuración/Opcions.">
 <!ENTITY crashprompt.detailsLink     "Qué ye un reporte de fallo?">
 <!ENTITY crashprompt.detailedMessage.firstParagraph "Un reporte de fallo contién bells detalles sobre o fallo, a suya maquina, asinas como una instantania d'o estau d'o suyo navegador quan ha fallau.">
 <!ENTITY crashprompt.detailedMessage.secondParagraph "Isto puede incluir cosas como pachinas ubiertas, texto escrito en os formularios y o conteniu d'os mensaches ubiertos, o historial de navegación recient u a cheolocalización compartida con un puesto.">
-<!ENTITY crashprompt.detailedMessage.thirdParagraph "Femos servir reportes de fallo ta mirar d'apanyar problemas y amillorar os nuestros productos. Maniamos a suya información como se describe en a nuestra ">
+<!-- LOCALIZATION NOTE (crashprompt.detailedMessage.thirdParagraphBeforeLink, crashprompt.privacyPolicyLink, crashprompt.detailedMessage.thirdParagraphAfterLink):
+     These three entities form a single sentence. crashprompt.detailedMessage.thirdParagraphBeforeLink is the start of the sentence,
+     crashprompt.privacyPolicyLink is a clickable link the middle and crashprompt.detailedMessage.thirdParagraphAfterLink is the end of the sentence.
+     -->
+<!ENTITY crashprompt.detailedMessage.thirdParagraphBeforeLink "Femos servir reportes de fallo ta mirar d'apanyar problemas y amillorar os nuestros productos. Maniamos a suya información como se describe en a nuestra ">
 <!ENTITY crashprompt.privacyPolicyLink "politica de privadeza de &brandShortName;">
+<!ENTITY crashprompt.detailedMessage.thirdParagraphAfterLink ".">
 <!ENTITY crashprompt.includeURLLabel "Incluir l'adreza d'a pachina a on que i yera">
 <!ENTITY crashprompt.acceptbutton    "Ninviar reportes">
 <!ENTITY crashprompt.refusebutton    "No ninviar-ne">
 <!ENTITY crashprompt.privacyPolicy.title "politica de privadeza de &brandShortName;">
--- a/browser/pdfviewer/chrome.properties
+++ b/browser/pdfviewer/chrome.properties
@@ -9,10 +9,11 @@
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 # Chrome notification bar messages and buttons
 unsupported_feature=Iste documento PDF talment no s'amuestre correctament.
+unsupported_feature_forms=Iste documento PDF contién formularios. A cumplimentación d'os campos de formularios no ye encara posible.
 open_with_different_viewer=Ubrir con belatro visor diferent
 open_with_different_viewer.accessKey=o
--- a/browser/pdfviewer/viewer.properties
+++ b/browser/pdfviewer/viewer.properties
@@ -52,16 +52,41 @@ last_page.label=Ir ta la zaguera pachina
 last_page_label=Ir ta la zaguer pachina
 page_rotate_cw.title=Chirar enta la dreita
 page_rotate_cw.label=Chirar enta la dreita
 page_rotate_cw_label=Chira enta la dreita
 page_rotate_ccw.title=Chirar enta la zurda
 page_rotate_ccw.label=Chirar en sentiu antihorario
 page_rotate_ccw_label=Chirar enta la zurda
 
+hand_tool_enable.title=Activar a ferramienta man
+hand_tool_enable_label=Activar a ferramenta man
+hand_tool_disable.title=Desactivar a ferramienta man
+hand_tool_disable_label=Desactivar a ferramienta man
+
+# Document properties dialog box
+document_properties.title=Propiedatz d'o documento...
+document_properties_label=Propiedatz d'o documento...
+document_properties_file_name=Nombre de fichero:
+document_properties_file_size=Grandaria d'o fichero:
+document_properties_kb={{size_kb}} KB ({{size_b}} bytes)
+document_properties_mb={{size_mb}} MB ({{size_b}} bytes)
+document_properties_title=Titol:
+document_properties_author=Autor:
+document_properties_subject=Afer:
+document_properties_keywords=Parolas clau:
+document_properties_creation_date=Calendata de creyación:
+document_properties_modification_date=Calendata de modificación:
+document_properties_date_string={{date}}, {{time}}
+document_properties_creator=Creyador:
+document_properties_producer=Creyador de PDF:
+document_properties_version=Versión de PDF:
+document_properties_page_count=Numero de pachinas:
+document_properties_close=Close
+
 # Tooltips and alt text for side panel toolbar buttons
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Amostrar u amagar a barra lateral
 toggle_sidebar_label=Amostrar a barra lateral
 outline.title=Amostrar o esquema d'o documento
 outline_label=Esquema d'o documento
 thumbs.title=Amostrar as miniaturas
--- a/calendar/chrome/calendar/calendar-event-dialog.properties
+++ b/calendar/chrome/calendar/calendar-event-dialog.properties
@@ -317,17 +317,21 @@ specifyLinkLocation=Please specify the l
 enterLinkLocation=Enter a web page, or document location.
 
 summaryDueTaskLabel=Due:
 
 # Attach File Dialog
 attachViaFilelink=File using %1$S
 selectAFile=Please select the file(s) to attach
 removeCalendarsTitle=Remove Attachments
-removeCalendarsText=Do you really want to remove %1$S attachments?
+
+# LOCALIZATION NOTE (removeAttachmentsText): Semi-colon list of plural forms for
+# prompting attachment removal.
+# See http://developer.mozilla.org/en/Localization_and_Plurals
+removeAttachmentsText=Do you really want to remove #1 attachment?;Do you really want to remove #1 attachments?
 
 # Recurrence Dialog Widget Order
 # LOCALIZATION NOTE: You can change the order of below params
 # Edit recurrence window -> Recurrence pattern -> Repeat monthly
 # %1$S - ordinal with article, %2$S - weekday
 # e.g. "the First Saturday"
 # DONT_TRANSLATE: Make sure there are no extra words in this property, just variables.
 monthlyOrder=%1$S %2$S
new file mode 100644
--- /dev/null
+++ b/chat/contacts.properties
@@ -0,0 +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/.
+
+# LOCALIZATION NOTE (defaultGroup):
+# This is the name of the group that will automatically be created when adding a
+# buddy without specifying a group.
+defaultGroup=Contactos
--- a/chat/irc.properties
+++ b/chat/irc.properties
@@ -26,22 +26,18 @@ joinChat.password=_Clau
 #   account wizard windows.
 options.server=Servidor
 options.port=Puerto
 options.ssl=Emplegar SSL
 options.encoding=Chuego de caracaters
 options.quitMessage=Mensache de salida
 options.partMessage=Parte d'o mensache
 options.showServerTab=Amostrar os mensaches d'o servidor
+options.alternateNicks=Embotadas alternativas
 
-# LOCALIZATION NOTE (ctcp.ping): Semi-colon list of plural forms.
-#  See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-#   %1$S is the nickname of the user who was pinged.
-#   #2 is the delay (in seconds).
-ctcp.ping=Respuesta d'o Ping dende %1$S en #2 segundo.;Respuesta d'o Ping dende %1$S en #2 segundos.
 # LOCALIZATION NOTE (ctcp.version):
 #   %1$S is the nickname of the user whose version was requested.
 #   %2$S is the version response from the client.
 ctcp.version=%1$S fa servir "%2$S".
 # LOCALIZATION NOTE (ctcp.time):
 #   %1$S is the nickname of the user whose time was requested.
 #   %2$S is the time response.
 ctcp.time=O tiempo ta %1$S ye de %2$S.
@@ -50,17 +46,17 @@ ctcp.time=O tiempo ta %1$S ye de %2$S.
 #   These are the help messages for each command, the %S is the command name
 #   Each command first gives the parameter it accepts and then a description of
 #   the command.
 command.action=%S &lt;acción ta realizar&gt;: Realizar una acción.
 command.ctcp=%S &lt;embotada&gt; &lt;msg&gt;: Ninviar un mensache CTCP t'a embotada.
 command.chanserv=%S &lt;orden&gt;: Ninviar una orden t'o ChanServ.
 command.deop=%S &lt;embotada1&gt;[,&lt;embotada2&gt;]*: Suprimir o estau d'operador d'a canal de bell un. Ha de estar operador d'a canal ta fer-lo.
 command.devoice=%S &lt;embotada1&gt;[,&lt;embotada2&gt;]*: Suprimir o estau de voz de bell un, empachando que pueda charrar si a canal ye moderada (+m). Ha d'estar operador de canal ta fer-lo.
-command.invite=%S &lt;embotada&gt; [&lt;cambra&gt;]: Convidar a bell un a unir-se a la canal especificada, u a la canal actual.
+command.invite2=%S &lt;embotada&gt;[ &lt;embotada&gt;]* [&lt;canal&gt;]: Convidar a mas d'una embotada a unir-se a la canal actual, u a la canal especificada.
 command.join=%S &lt;cambra1&gt;[ &lt;clau1&gt;][,&lt;cambra2&gt;[ &lt;clau2&gt;]]*: Introducir una u mas canals, furnindo opcionalment una clau de canal ta cadaguna si calese.
 command.kick=%S &lt;embotada&gt; [&lt;mensachee&gt;]: Suprimir a bell un d'una canal. Ha d'estar operador d'a canal ta fer-lo.
 command.list=%S: Amostrar a lista de cambras de chat en o ret. Aviso: bells servidors pueden desconnectar-le en mirar de fer-lo.
 command.memoserv=%S &lt;orden&gt;: Ninviar una orden t'o MemoServ.
 command.modeUser=%S (+|-)&lt;modo nuevo&gt; [&lt;embotada&gt;]: establir u eliminar un modo d'usuario.
 command.modeChannel=%S &lt;canal&gt;[ (+|-)&lt;modo nuevo&gt; [&lt;parametro&gt;][,&lt;parametro&gt;]*]: Obtener, establir u eliminar un modo de canal.
 command.msg=%S &lt;embotada&gt; &lt;mensache&gt;: Ninviar un mensache privau ta un usuario (en cuenta de fer-lo a una canal).
 command.nick=%S &lt;nueva embotada&gt;: Cambiar a suya embotada.
@@ -116,16 +112,19 @@ message.quit=%1$S ha deixau a cambra (Qu
 #    The paramter is the quit message given by the user.
 message.quit2=: %S
 #    %1$S is the nickname of the user that invited us, %2$S is the conversation
 #    name.
 message.inviteReceived=%1$S le ha convidau a %2$S.
 #    %1$S is the nickname of the invited user, %2$S is the conversation name
 #    they were invited to.
 message.invited=%1$S estió convidau con exito a %2$S.
+#    %1$S is the nickname of the invited user, %2$S is the conversation name
+#    they were invited to but are already in
+message.alreadyInChannel=%1$S ya ye en %2$S.
 #    %S is the nickname of the user who was summoned.
 message.summoned=%S estió convocau.
 #    %S is the nickname of the user whose WHOIS information follows this message.
 message.whois=Informacióm WHOIS ta %S:
 #    %1$S is the nickname of the (offline) user whose WHOWAS information follows this message.
 message.whowas=%1$S ye desconnectau. Información WHOWAS ta %1$S:
 #    %1$S is the entry description (from tooltip.*), %2$S is its value.
 message.whoisEntry=਀a0਀a0%1$S: %2$S
@@ -135,16 +134,22 @@ message.unknownNick=No s'ha trobau a emb
 #    channel key (password).
 message.channelKeyAdded=%1$S ha cambiau a clau d'a canal ta %2$S.
 message.channelKeyRemoved=%S ha suprimiu a clau d'a canal.
 #    This will be followed by a list of ban masks.
 message.banMasks=Os usuarios connectaus dende as siguients ubicacions tienen viedau %S:
 message.noBanMasks=No i ha ubicacions viedadas ta %S.
 message.banMaskAdded=Os usuarios connectaus dende as ubicacions que coincidan con %1$S son estaus viedaus por %2$S.
 message.banMaskRemoved=Os usuarios connectaus dende ubicacions que coincidan con %1$S ya no son viedaus por %2$S.
+# LOCALIZATION NOTE (message.ping): Semi-colon list of plural forms.
+#  See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+#   %1$S is the nickname of the user or the server that was pinged.
+#   #2 is the delay (in milliseconds).
+message.ping=Respuesta a o ping dende %1$S en #2 milisegundo.;Respuesta a o ping dende %1$S en #2 milisegundos.
+
 
 # LOCALIZATION NOTE (error.*):
 #    These are shown as error messages in the server tab.
 #    %S is the channel name.
 error.noChannel=A canal %S no existe.
 error.tooManyChannels=No puede unir-se a %S; s'ha uniu a masiadas canals.
 #    %1$S is your new nick, %2$S is the kill message from the server.
 error.nickCollision=A embotada ya ye en uso. Se cambia la embotada ta %1$S [%2$S].
@@ -157,16 +162,17 @@ error.noSuchNick=%S no ye connectau.
 error.wasNoSuchNick=A embotada %S no existe
 error.noSuchChannel=A canal %S no existe.
 #    %S is the channel name.
 error.cannotSendToChannel=No puede ninviar garra mensache a %S.
 error.nonUniqueTarget=%S no ye un unico usuari@servidor u embotada, u talment ha mirau d'accedir ta masiadas canals a la vegada.
 error.notChannelOp=No ye un operador d'a canal %S.
 error.notChannelOwner=No ye propietario d'a canal %S.
 error.wrongKey=No puede unir-se a %S, a clau de canal no ye valida.
+error.sendMessageFailed=Ha ocorriu una error entre que se ninviaba o suyo zaguer mensache. Torne-lo a intentar atra vegada malas que a connexión s'haiga restabliu.
 
 # LOCALIZATION NOTE (tooltip.*):
 #    These are the descriptions given in a tooltip with information received
 #    from a whois response.
 #    The human readable ("realname") description of the user.
 tooltip.realname=Nombre
 tooltip.server=Connectau a
 #    The username and hostname that the user connects from (usually based on the
new file mode 100644
--- /dev/null
+++ b/chat/logger.properties
@@ -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/.
+
+# LOCALIZATION NOTE (badLogfile):
+#  %S is the filename of the log file.
+badLogfile=Fichero de rechistro vuedo u corrompiu: %S
--- a/chat/twitter.properties
+++ b/chat/twitter.properties
@@ -1,12 +1,16 @@
 # 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 (twitter.protocolName)
+#  This name is used whenever the name of the protocol is shown.
+twitter.protocolName=Twitter
+
 # LOCALIZATION NOTE (error.*):
 #   These are errors that will be shown to the user in conversation.
 error.tooLong=L'estau tien mas de 140 caracters.
 # LOCALIZATION NOTE (error.general, error.retweet, error.delete):
 #   %1$S will be either the error string returned by the twitter server,
 #   in English, inside parenthesis, or the empty string if we have no specific
 #   message for the error.
 #   %2$S is the message that caused the error.
@@ -102,8 +106,11 @@ tooltip.friends_count=Seguindo
 tooltip.statuses_count=Tuitz
 tooltip.followers_count=Seguidors
 tooltip.listed_count=Listau
 
 # LOCALIZATION NOTE (yes, no):
 #  These are used to turn true/false values into a yes/no response.
 yes=Sí
 no=No
+
+command.follow=%S &lt;nombreusuario&gt;[ &lt;nombreusuario&gt;]*: empecipia a seguir a uno u quantos usuarios.
+command.unfollow=%S &lt;nombreusuario&gt;[ &lt;nombreusuario&gt;]*: deixar de seguir a uno u quantos usuarios.
--- a/chat/xmpp.properties
+++ b/chat/xmpp.properties
@@ -56,42 +56,36 @@ tooltip.subscription=Conduta
 #   The _ character won't be displayed; it indicates the next
 #   character of the string should be used as the access key for this
 #   field.
 chatRoomField.room=_Cambra
 chatRoomField.server=_Servidor
 chatRoomField.nick=_Embotada
 chatRoomField.password=C_lau
 
-# LOCALIZATION NOTE
-#  Buddies that aren't in any group on the server will appear in this group.
-#  Try to use the same translation as for defaultGroup in instantbird.properties
-defaultGroup=Contactos
-
 # LOCALIZATION NOTE (options.*):
 #   These are the protocol specific options shown in the account manager and
 #   account wizard windows.
 options.resource=Recursos
 options.priority=Prioridat
 options.connectionSecurity=Seguranza d'a connexión
 options.connectionSecurity.requireEncryption=Requiere zifrache
 options.connectionSecurity.opportunisticTLS=Emplegar zifrache si ye disponible
 options.connectionSecurity.allowUnencryptedAuth=Permitir ninviar a clau sin zifrar
 options.connectServer=Servidor
 options.connectPort=Puerto
 
+# LOCALIZATION NOTE (*.protocolName)
+#  This name is used whenever the name of the protocol is shown.
+gtalk.protocolName=Google Talk
+odnoklassniki.protocolName=Odnoklassniki
+
 # LOCALIZATION NOTE (gtalk.usernameHint):
 #  This is displayed inside the accountUsernameInfoWithDescription
 #  string defined in imAccounts.properties when the user is
 #  configuring a Google Talk account.
 gtalk.usernameHint=adreza electronica
 
-# LOCALIZATION NOTE (vkontakte.usernameHint):
-#  This is displayed inside the accountUsernameInfoWithDescription
-#  string defined in imAccounts.properties when the user is
-#  configuring a Vkontakte account.
-vkontakte.usernameHint=ID de perfil
-
 # LOCALIZATION NOTE (odnoklassniki.usernameHint):
 #  This is displayed inside the accountUsernameInfoWithDescription
 #  string defined in imAccounts.properties when the user is
 #  configuring a Odnoklassniki account.
 odnoklassniki.usernameHint=ID de perfil
new file mode 100644
--- /dev/null
+++ b/chat/yahoo.properties
@@ -0,0 +1,31 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+login.error.badCredentials=O nombre d'usuario u a clau son incorrectos.
+login.error.accountLockedFailed=Cuenta trancada por haber fallau masiadas vegadas l'inicio d'a sesión.
+login.error.accountLockedGeneral=Cuenta trancada por haber fallau masiadas vegadas o inicio d'a sesión.
+login.error.accountDeactivated=A cuenta s'ha desactivau.
+login.error.usernameNotExist=O nombre d'usuario no existe.
+# The %S will be an error code returned by the server.
+login.error.unknown=Error desconoixida: %S
+network.error.http=Error de connexión HTTP.
+
+conference.invite.message=Une-te a la mía conferencia.
+
+# Some options are commented out because they aren't used. We do the same thing
+# to their description strings.
+options.pagerPort=Puerto
+options.transferHost=Servidor de transferencia de fichers
+options.transferPort=Puerto de transferencia de fichers
+options.chatEncoding=Codificación
+options.ignoreInvites=Ignorar as invitacions a conferencias
+
+# In this message, %S is replaced with the username of the user who left.
+system.message.conferenceLogoff=%S ha abandonau a conferencia.
+system.message.conferenceLogon=%S s'ha uniu a la conferencia.
+
+command.help.invite=/invite &lt;usuario1&gt;[,&lt;usuario2&gt;,...] [&lt;mensache d'invitación&gt;]: convida a uno u mas usuarios a ista conversa de conferencia.
+# LOCALIZATION NOTE (command.feedback.invite):
+#   %S is the user, or comma separated list of users, invited to the conference.
+command.feedback.invite=Has convidau a %S ta la conferencia.
--- a/dom/chrome/accessibility/AccessFu.properties
+++ b/dom/chrome/accessibility/AccessFu.properties
@@ -16,43 +16,43 @@ statusbar      =       barra d'estau
 table          =       tabla
 columnheader   =       capitero d'a columna
 rowheader      =       capitero d'a ringlera
 column         =       columna
 row            =       ringlera
 cell           =       celda
 link           =       vinclo
 list           =       lista
-listitem       =       lista d'bchectos
+listitem       =       lista d'obchectos
 outline        =       contorno
 outlineitem    =       elemento de contorno
-pagetab        =       pestanya de pachina
+pagetab        =       pestanya
 propertypage   =       pachina de propiedatz
 graphic        =       grafico
 pushbutton     =       botón
 checkbutton    =       caixeta seleccionable
 radiobutton    =       botón de radio
 combobox       =       quadro desplegable
 progressbar    =       barra de progreso
 slider         =       eslizador
-spinbutton     =       botón d'incremento
+spinbutton     =       botón d'incremento/decremento
 diagram        =       diagrama
 animation      =       animación
 equation       =       equación
 buttonmenu     =       menú de botón
 whitespace     =       espacio blanco
-pagetablist    =       lista de pestanyas de pachina
+pagetablist    =       lista de pestanyas
 canvas         =       canvas
 checkmenuitem  =       elemento de menú seleccionable
 label          =       etiqueta
 passwordtext   =       texto de contrasenya
 radiomenuitem  =       elemento de menú de radio
 textcontainer  =       contenedor de texto
 togglebutton   =       botón d'alternancia
-treetable      =       mesad arbol
+treetable      =       tabla arbol
 header         =       capitero
 footer         =       piet de pachina
 paragraph      =       paragrafo
 entry          =       dentrada
 caption        =       lechenda
 heading        =       capitero
 section        =       sección
 form           =       formulario
@@ -68,45 +68,45 @@ figure         =       figura
 definitionlist =       lista de definición
 term           =       termin
 definition     =       definición
 
 # More sophisticated roles which are not actual numeric roles
 textarea       =       aria de texto
 
 # Text input types
-textInputType_date   =       date
-textInputType_email  =       e-mail
-textInputType_search =       search
-textInputType_tel    =       telephone
+textInputType_date   =       calendata
+textInputType_email  =       correu-e
+textInputType_search =       buscar
+textInputType_tel    =       telefono
 textInputType_url    =       URL
 
 # More sophisticated object descriptions
 headingLevel   =       libel d'encabezau %S
 
 # more sophisticated list announcement
 listStart      =       Primer elemento
 listEnd        =       Zaguer elemento
 # LOCALIZATION NOTE (listItemsCount): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 listItemsCount =       1 elemento;#1 elementos
 
 # LOCALIZATION NOTE: %1$S is the item's role name (e.g. "tab"),
 # %2$S is the position of the item n the set.
 # %3$S is the total number of such items in the set.
 # An expanded example would read "tab 2 of 5".
-objItemOf      =       %1$S %2$S of %3$S
+objItemOf      =       %1$S %2$S de %3$S
 
 # Landmark announcements
 banner         =       baner
 complementary  =       complementario
 contentinfo    =       info conteniu
 main           =       principal
 navigation     =       navegación
-search         =       busca
+search         =       buscar
 
 # Description of a table or grid:
 # 1 is a dynamically retrieved localized role of either 'table' or 'grid'.
 # 2 is the number of columns within the table.
 # 3 is the number of rows within the table or grid.
 tableInfo = %S con %S y %S
 # LOCALIZATION NOTE (tableColumnInfo): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
@@ -120,31 +120,31 @@ columnInfo = Columna %S
 rowInfo = Ringlera %S
 spansColumns = s'estendilla dica %S columnas
 spansRows = s'estendilla dica %S ringleras
 
 # Invoked actions
 jumpAction     =      blincau
 pressAction    =      presionau
 checkAction    =      activau
-uncheckAction  =      no seleccionau
+uncheckAction  =      desactivau
 selectAction   =      seleccionau
-unselectAction =      unselected
+unselectAction =      no seleccionau
 openAction     =      ubierto
 closeAction    =      zarrau
 switchAction   =      cambiau
 clickAction    =      clicau
 collapseAction =      reduciu
 expandAction   =      expandiu
 activateAction =      activau
 cycleAction    =      chirau
 
 # Live regions
 # 'hidden' will be spoken when something disappears in a live region.
-hidden         =      hidden
+hidden         =      amagau
 
 # Tab states
 tabLoading     =      se ye cargando
 tabLoaded      =      s'ha cargau
 tabNew         =      pestanya nueva
 tabLoadStopped =      s'ha aturau a carga
 tabReload      =      se ye tornando a cargar...
 
@@ -152,17 +152,17 @@ tabReload      =      se ye tornando a c
 stateChecked     =    verificau
 stateNotChecked  =    no verificau
 stateExpanded    =    expandiu
 stateCollapsed   =    reduciu
 stateUnavailable =    no disponible
 stateRequired    =    requiesto
 stateTraversed   =    visitau
 stateHasPopup    =    tien una finestra emerchent
-stateSelected    =    selected
+stateSelected    =    seleccionau
 
 # App modes
 editingMode    =      editando
 navigationMode =      navegando
 
 # Quick navigation modes
 quicknav_Simple      = Por defecto
 quicknav_Anchor      = Ancoras
--- a/dom/chrome/charsetTitles.properties
+++ b/dom/chrome/charsetTitles.properties
@@ -80,24 +80,21 @@ x-user-defined.title = Definida por l'us
 ibm866.title = Cirilico/Ruso (CP-866)
 ibm850.title = Occidental (IBM-850)
 ibm852.title = Centroeuropeu (IBM-852)
 ibm855.title = Cirilico (IBM-855)
 ibm857.title = Turco (IBM-857)
 ibm862.title = Hebreu (IBM-862)
 gb18030.title = Chinés simplificau (GB18030)
 x-mac-arabic.title = Arabe (MacArabic)
-x-iso-8859-6-8-x.title = Arabe (Langbox ISO-8859-6.8x)
-x-iso-8859-6-16.title = Arabe (Langbox ISO-8859-6.16)
 x-mac-farsi.title = Farsi (MacFarsi)
 x-mac-hebrew.title = Hebreu (MacHebrew)
 x-mac-devanagari.title = Hindi (MacDevanagari)
 x-mac-gujarati.title = Gucharatí (MacGujarati)
 x-mac-gurmukhi.title = Gurmukhi (MacGurmukhi)
-x-sun-unicode-india-0.title = Hindi (SunDevanagari)
 
 
 chardet.off.title                           = (Desactivada)
 chardet.universal_charset_detector.title    = Universal
 chardet.ja_parallel_state_machine.title     = Chaponés
 chardet.ko_parallel_state_machine.title     = Coreán
 chardet.zhtw_parallel_state_machine.title   = Chinés tradicional
 chardet.zhcn_parallel_state_machine.title   = Chinés simplificau
--- a/dom/chrome/dom/dom.properties
+++ b/dom/chrome/dom/dom.properties
@@ -36,25 +36,25 @@ FormValidationPatternMismatchWithTitle=M
 # LOCALIZATION NOTE (FormValidationRangeOverflow): %S can be a number, a date or a time.
 FormValidationRangeOverflow=Seleccione una valura que siga menor que %S.
 # LOCALIZATION NOTE (FormValidationRangeUnderflow): %S can be a number, a date or a time.
 FormValidationRangeUnderflow=Seleccione una valura que siga mayor que %S.
 # LOCALIZATION NOTE (FormValidationStepMismatch): both %S can be a number, a date or a time.
 FormValidationStepMismatch=Seleccione una valura valida. As dos valuras validas mas amanadas son %S y %S.
 # LOCALIZATION NOTE (FormValidationStepMismatchOneValue): %S can be a number, a date or a time. This is called instead of FormValidationStepMismatch when the second value is the same as the first.
 FormValidationStepMismatchOneValue=Seleccione una valura valida. A valura valida mas amanda ye %S.
+FormValidationBadInputNumber=Introduzca un numero.
 GetAttributeNodeWarning=L'uso de getAttributeNode() ya no se consella. Faiga servir en cuenta getAttribute().
 SetAttributeNodeWarning=L'uso de setAttributeNode() ya no se consella. Faiga servir en cuenta setAttribute().
 GetAttributeNodeNSWarning=L'uso de getAttributeNodeNS() ya no se consella. Faiga servir en cuenta getAttributeNS().
 SetAttributeNodeNSWarning=L'uso de setAttributeNodeNS() ya no se consella. Faiga servir en cuenta setAttributeNS().
 RemoveAttributeNodeWarning=L'uso de removeAttributeNode() ya no se consella. Faiga servir en cuenta removeAttribute().
 CreateAttributeWarning=L'uso de document.createAttribute() ya no se consella. Faiga servir en cuenta element.setAttribute().
 CreateAttributeNSWarning=L'uso de document.createAttributeNS() ya no se consella. Faiga servir en cuenta element.setAttributeNS().
 SpecifiedWarning=L'uso de l'atributo especificau en atributos ye obsoleto. Siempre torna a valura "verdadero".
-OwnerElementWarning=L'uso d'ownerElement en atributos ya no se consella.
 NodeValueWarning=L'uso de nodeValue en atributos ya no se consella. Faiga servir en cuenta "value".
 TextContentWarning=L'uso de textContext en atributos ya no se consella. Faiga servir en cuenta value.
 EnablePrivilegeWarning=L'uso d'enablePrivilege ya no se consella.  Faiga servir en cuenta codigo que s'execute con o prencipal d'o sistema (por eixemplo una extensión).
 nsIJSONDecodeDeprecatedWarning=nsIJSON.decode ya no se consella.  Faiga servir en cuenta JSON.parse.
 nsIJSONEncodeDeprecatedWarning=nsIJSON.encode ya no se consella. Faiga servir en cuenta JSON.stringify.
 nsIDOMWindowInternalWarning=L'uso de nsIDOMWindowInternal ya no se consella. Faiga servir en cuenta nsIDOMWindow.
 InputEncodingWarning=L'uso d'inputEncoding ye obsoleto.
 # LOCALIZATION NOTE: Do not translate "MozBeforePaint" and "mozRequestAnimationFrame"
@@ -137,12 +137,10 @@ MozGetAsFileWarning=O metodo no standard mozGetAsFile ye obsoleto y luego s'eliminará. Faiga servir en cuenta o metodo standard toBlob.
 # LOCALIZATION NOTE: Do not translate "captureEvents()" or "addEventListener()"
 UseOfCaptureEventsWarning=L'uso de captureEvents() ya no se consella. Ta esviellar o suyo codigo, faiga servir o metodo DOM 2 addEventListener(). Ta mas aduya, http://developer.mozilla.org/en/docs/DOM:element.addEventListener
 # LOCALIZATION NOTE: Do not translate "releaseEvents()" or "removeEventListener()"
 UseOfReleaseEventsWarning=L'uso de releaseEvents() ya no se consella. Ta esviellar o suyo codigo, faiga servir o metodo DOM 2 removeEventListener(). Ta mas aduya, http://developer.mozilla.org/en/docs/DOM:element.removeEventListener
 # LOCALIZATION NOTE: Do not translate "document.load()" or "XMLHttpRequest"
 UseOfDOM3LoadMethodWarning=L'uso de document.load() ye obsoleto. Ta esviellar o suyo codigo, faiga servir l'obchecto DOM XMLHttpRequest. Ta saber-ne mas, consulte https://developer.mozilla.org/en/XMLHttpRequest.
 # LOCALIZATION NOTE: Do not translate "window.showModalDialog()" or "window.open()" 
 ShowModalDialogWarning=L'uso de window.showModalDialog() ye obsoleto. Faiga servir en cuenta window.open(). Ta saber-ne mas, consulte https://developer.mozilla.org/en-US/docs/Web/API/Window.open .
-# LOCALIZATION NOTE: Do not translate "cloneNode()"
-UnsafeCloneNodeWarning=O comportamiento de cloneNode() sin argumentos booleanos va a cambiar de fer un clonación completa (incluindo-ie os obchectos referenciaus) a una superficie. Asegure-se de pasar explicitament un argumento de tipo lochico ta conservar o comportamiento actual.
-# LOCALIZATION NOTE: Do not translate "importNode()"
-UnsafeImportNodeWarning=O comportamiento de importNode() sin argumentos booleanos va a cambiar de fer un clonación completa (incluindo-ie os obchectos referenciaus) a una superficial.  Asegure-se de pasar explicitament un argumento de tipo lochico ta conservar o comportamiento actual.
+# LOCALIZATION NOTE: Do not translate "window._content" or "window.content"
+Window_ContentWarning=window._content ye obsoleto. Faiga servir en cuenta window.content.
--- a/dom/chrome/layout/css.properties
+++ b/dom/chrome/layout/css.properties
@@ -21,17 +21,17 @@ PEGatherMediaEOF=fin d'a lista de meyos 
 PEGatherMediaNotComma=S'asperaba ',' en a lista de meyos, pero s'ha trobau  '%1$S'.
 PEGatherMediaNotIdent=S'asperaba un identificador en a lista de meyos, pero s'ha trobau '%1$S'.
 PEGatherMediaReservedMediaType=S'ha trobau a parola clau reservada «%1$S» buscando o fichero multimedia.
 PEImportNotURI=S'asperaba una URI en o regle @import, pero s'ha trobau '%1$S'.
 PEImportBadURI=URI no valida en regle @import: '%1$S'.
 PEImportUnexpected=S'ha trobau un inasperau '%1$S' adintro de @import.
 PEGroupRuleEOF2=final d'o regle @media, @suport u @-moz-document
 PEGroupRuleNestedAtRule=No se permite o regle %1$S adintro d'un regle @media u @-moz-document.
-PEMozDocRuleBadFunc=S'asperaba url(), url-prefix() u domain() en o regle @-moz-document, pero s'ha trobau '%1$S'.
+PEMozDocRuleBadFunc2=S'asperaba url(), url-prefix(), domain() o regexp() en a regla @-moz-document, pero s'ha trobau '%1$S'.
 PEMozDocRuleNotURI=S'asperaba URI en o regle @-moz-document, pero s'ha trobau '%1$S'.
 PEMozDocRuleNotString=S'asperaba una cadena en a función regexp() d'un regle @-moz-document, pero s'ha trobau '%1$S'.
 PEMozDocRuleEOF=o siguient URI d'o regle @-moz-document
 PEAtNSPrefixEOF=prefixo d'espacio de nombres en o regle @namespace
 PEAtNSURIEOF=URI d'espacio de nombres en o regle @namespace
 PEAtNSUnexpected=Token inasperau endentro de @namespace: '%1$S'.
 PEKeyframeNameEOF=nombre d'o regle @keyframes.
 PEKeyframeBadName=Identificador asperau ta lo nombre d'un regle @keyframes.
@@ -139,8 +139,19 @@ PESupportsConditionExpectedCloseParen=S'asperaba ')' entre l'analís d'a condición supports, pero s'ha trobau '%1$S'.
 PESupportsConditionExpectedStart2=S'asperaba «no», «(» u bella función entre l'analís d'a condición supports, pero s'ha trobau «%1$S».
 PESupportsConditionExpectedNot=S'asperaba 'not' entre l'analís d'a condicioin supports, pero s'ha trobau '%1$S'.
 PESupportsGroupRuleStart=S'asperaba '{' ta encomenzar o regle @supports pero s'ha trobau '%1$S'.
 PEFilterEOF=filtro
 PEExpectedNoneOrURL=S'asperaba "none" u URL, pero s'ha trobau '%1$S'.
 PEExpectedNoneOrURLOrFilterFunction=S'asperaba "none", URL u una función filtro, pero s'ha trobau '%1$S'.
 PEExpectedNonnegativeNP=S'asperaba un numero no negativo u un porcentache.
 PEFilterFunctionArgumentsParsingError=I ha habiu una error en analisar os argumentos d'a función filtro
+PEVariableEOF=variable
+PEVariableEmpty=S'asperaba una valura de variable, pero s'ha trobau '%1$S'.
+PEValueWithVariablesParsingError=Error en interpetar a valura de '%1$S' dimpués de substituir as variables.
+PEValueWithVariablesFallbackInherit=Recorrendo a la valura 'inherit'.
+PEValueWithVariablesFallbackInitial=Recorrendo a la valura 'initial'.
+PEInvalidVariableReference=A propiedat conteneba una referencia ta una variable no valida.
+PEInvalidVariableTokenFallback=S'ha trobau o token on valido '%1$S' en o libel superior de l'alternativa a la variable de referencia.
+PEExpectedVariableNameEOF=identificador de nombre de variable
+PEExpectedVariableName=S'asperaba un identificador ta o nombre d'una variable, pero s'ha trobau '%1$S'.
+PEExpectedVariableFallback=S'asperaba una alternativa a referencia de variable dimpués de ','.
+PEExpectedVariableCommaOrCloseParen=S'asperaba ',' u ')' dimpués d'o nombre de variable en a referencia de variable, pero s'ha trobau '%1$S'.
--- a/dom/chrome/layout/htmlparser.properties
+++ b/dom/chrome/layout/htmlparser.properties
@@ -9,16 +9,17 @@ EncNoDeclaration=No s'ha declarau a codificación de caracters d'o documento HTML. O documento s'amostrará con texto no reconoixible en bellas configuracions de navegador si contién caracters que no perteneixcan a o rango US-ASCII. Cal declarar a codificación de caracters d'a pachina en o documento u en o protocolo de transferencia.
 EncLateMetaFrame=No s'ha trobau a declaración de codificación de caracters d'o documento HTML que va una bastida en preanalizar o sprimers 1024 bytes d'o fichero. En visualizar-lo sin o documento que en fa de bastida, a pachina se recargará automaticament. Cal mover a declaración de codificación ta os primers 1024 bytes d'o fichero.
 EncLateMeta=No s'ha trobau a declaración de codificación de caracters d'o documento HTML en preanalizar os primers 1024 bytes d'o fichero. En visualizar-lo en un navegador configurau de traza diferent, a pachina se recarga automaticament. Call mover a declaración de codificación ta os primers 1024 bytes d'o fichero.
 EncLateMetaReload=S'ha recargau a pachina porque no s'ha trobau a declaración de codificación de caracters d'o documento HTML en preanalizar os primers 1024 bytes d'o fichero. Cal tresladar a declaración de codificación ta os primers 1024 bytes d'o fichero.
 EncLateMetaTooLate=S'ha trobau masiau tarde a declaración de codificación de caracters d'o documento ta que podese tener garra efecto. Cal tresladar a declaración de codificación ta os primers 1024 bytes d'o fichero.
 EncMetaUnsupported=S'ha declarau una codificación de caracters no permesa en o documento HTML fendo servir a etiqueta meta. S'ha descartau a declaración.
 EncProtocolUnsupported=S'ha declarau una codificación de caracters no permesa a ran de protocolo. S'ha ignorau a declaración.
 EncBomlessUtf16=S'ha detectau un texto nomás Basic Latin codificau con UTF-16 sin marca d'orden de byts y sin garra mena de declaración a ran de protocolo de transferencia. Codificar en UTF-16 ye ineficient y, en tot caso, caldría haber declarau a codificación de caracters.
 EncMetaUtf16=S'ha feito servir una etiqueta meta ta declarar a codificación de caracters como UTF-16. Manimenos, s'ha interpretau en cuenta como una declaración UTF-8.
+EncMetaUserDefined=S'ha feito servir una etiqueta meta ta declarar a codificación de caracters como x-user-defined. Manimenos, ha estau interpretada como una declaración windows-1252 por compatibilidat con tipografías antigas intencionadament codificadas de traza incorrecta. Iste puesto habría de migrar a Unicode.
 
 # The bulk of the messages below are derived from 
 # http://hg.mozilla.org/projects/htmlparser/file/1f633cef7de7/src/nu/validator/htmlparser/impl/ErrorReportingTokenizer.java
 # which is available under the MIT license.
 
 # Tokenizer errors
 errGarbageAfterLtSlash=Vasuera dimpués de “</”.
 errLtSlashGt=S'ha trobau “</>”. Posiblement porque no s'ha protechiu “<” (cal protecher-lo escribindo “&lt;”) u bien porque no s'ha puesto bien a etiqueta final.
--- a/dom/chrome/layout/printing.properties
+++ b/dom/chrome/layout/printing.properties
@@ -53,9 +53,8 @@ PERR_GFX_PRINTER_NO_PRINTER_AVAILABLE=No
 PERR_GFX_PRINTER_NO_PRINTER_AVAILABLE_PP=No i ha imprentadoras disponibles, no se puet amostrar l'eixemplo d'impresión.
 PERR_GFX_PRINTER_NAME_NOT_FOUND=No se puet trobar a imprentadora seleccionada.
 PERR_GFX_PRINTER_COULD_NOT_OPEN_FILE=No s'ha puesto ubrir o fichero de salida ta imprimir en fichero.
 PERR_GFX_PRINTER_STARTDOC=A impresión ha fallau en escomenzar o treballo d'impresión.
 PERR_GFX_PRINTER_ENDDOC=A impresión ha fallau en completar o treballo d'impresión.
 PERR_GFX_PRINTER_STARTPAGE=A impresión ha fallau en escomenzar una pachina nueva.
 PERR_GFX_PRINTER_DOC_IS_BUSY=No se puet imprentar o documento porque encara ye cargando-se.
 PERR_GFX_PRINTER_DOC_IS_BUSY_PP=No se puet veyer l'eixemplo d'impresión porque encara ye cargando-se. 
-PERR_GFX_PRINTER_NO_XUL=No se puet imprentar documentos XUL.
--- a/dom/chrome/security/csp.properties
+++ b/dom/chrome/security/csp.properties
@@ -20,23 +20,19 @@ errorWas = a error yera: "%1$S"
 # %1$S is the report URI that could not be parsed
 couldNotParseReportURI = No s'ha puesto parsiar a URI: %1$S
 # LOCALIZATION NOTE (couldNotProcessUnknownDirective):
 # %1$S is the unknown directive
 couldNotProcessUnknownDirective = No s'ha puesto procesar a directiva desconoixida '%1$S'
 # LOCALIZATION NOTE (ignoringUnknownOption):
 # %1$S is the option that could not be understood
 ignoringUnknownOption = S'ha ignorau a opción desconoixida %1$S
-# LOCALIZATION NOTE (reportURInotETLDPlus1):
-# %1$S is the ETLD of the report URI that could not be used
-reportURInotETLDPlus1 = A URI d'o reporte (%1$S) ha d'estar d'o mesmo eTLD+1.
-# LOCALIZATION NOTE (reportURInotSameSchemeAsSelf, reportURInotSamePortAsSelf):
-# %1$S is the report URI that could not be used
-reportURInotSameSchemeAsSelf = A URI d'o reporte (%1$S) ha de fer servir o mesmo esquema que o documento orichinal.
-reportURInotSamePortAsSelf = A URI d'o reporte (%1$S) ha de fer servir o mesmo puerto que o documento orichinal.
+# LOCALIZATION NOTE (reportURInotHttpsOrHttp2):
+# %1$S is the ETLD of the report URI that is not HTTP or HTTPS
+reportURInotHttpsOrHttp2 = A URI d'informe (%1$S) ha d'estar una URI HTTP u HTTPS.
 # LOCALIZATION NOTE (pageCannotSendReportsTo):
 # %1$S is the URI of the page with the policy
 # %2$S is the report URI that could not be used
 pageCannotSendReportsTo = a pachina en %1$S no puet ninviar informes enta %2$S
 allowOrDefaultSrcRequired = ye precisa una directiva 'allow' u 'default-src', pero no i ye.  Se ferá servir "default-src 'none'"
 # LOCALIZATION NOTE (failedToParseUnrecognizedSource):
 # %1$S is the CSP Source that could not be parsed
 failedToParseUnrecognizedSource = No s'ha puesto analizar a fuent %1$S
@@ -51,16 +47,19 @@ allowDirectiveIsDeprecated = a directiva
 # inline script refers to JavaScript code that is embedded into the HTML document.
 inlineScriptBlocked = S'ha blocau un intento d'executar scripts inline
 # LOCALIZATION NOTE (inlineStyleBlocked):
 # inline style refers to CSS code that is embedded into the HTML document.
 inlineStyleBlocked = S'ha blocau un intento d'aplicar fuellas d'estilo inline
 # LOCALIZATION NOTE (scriptFromStringBlocked):
 # eval is a name and should not be localized.
 scriptFromStringBlocked = S'ha blocau un intento d'invocar JavaScript dende una cadena (gritando a una función como eval)
+# LOCALIZATION NOTE (hostNameMightBeKeyword):
+# %1$S is the hostname in question and %2$S is the keyword
+hostNameMightBeKeyword = Interpretando %1$S como un nombre de servidor, no pas como una parola clau. Si quereba que fuese una parola clau, faiga servir '%2$S' (rodiau de cometas simplas).
 
 # CSP Errors:
 policyURINotAlone = a directiva policy-uri nomás puede amaneixer soleta
 noParentRequest = O policy-uri no se puet recuperar sin una demanda pai y un CSP.
 # LOCALIZATION NOTE (policyURIParseError):
 # %1$S is the URI that could not be parsed
 policyURIParseError = no s'ha puesto parsiar a URI en a URI de politica: %1$S
 # LOCALIZATION NOTE (nonMatchingHost):
--- a/dom/chrome/security/security.properties
+++ b/dom/chrome/security/security.properties
@@ -4,15 +4,19 @@ BlockMixedDisplayContent = S'ha blocau a
 BlockMixedActiveContent = S'ha blocau a carga d'o conteniu activo mixto "%1$S"
 
 # CSP
 ReportOnlyCSPIgnored=A politica CSP "nomás-informar" s'ignorará porque s'aplican atras politicas CSP "no-nomás-informar"
 # LOCALIZATION NOTE: Do not translate "X-Content-Security-Policy", "X-Content-Security-Policy-Report-Only",  "Content-Security-Policy" or "Content-Security-Policy-Report-Only"
 OldCSPHeaderDeprecated=Os capiters X-Content-Security-Policy y X-Content-Security-Report-Only se declararán obsoletas luego. Por favor, faiga servir en cuenta as cabeceras Content-Security-Policy y Content-Security-Report-Only con sintaxi conforme a la especificación CSP.
 # LOCALIZATION NOTE: Do not translate "X-Content-Security-Policy/Report-Only" or "Content-Security-Policy/Report-Only"
 BothCSPHeadersPresent=Iste puesto ha especificau de vez un capitero X-Content-Security-Policy/Report-Only y un capitero Content-Security-Policy/Report-Only. O(s) capitero/s X-Content-Security-Policy/Report-Only s'ignorarán.
+
+# CORS
+CrossSiteRequestBlocked=S'ha blocau una requesta dende un orichen distinto: a politica d'o mesmo orichen priva de leyer o recurso remoto en %1$S. Isto se puede apanyar movendo o recurso a o mesmo dominio u activando CORS.
+
 # LOCALIZATION NOTE: Do not translate "Strict-Transport-Security" or "HSTS"
 InvalidSTSHeaders=O puesto ha especificau un capitero Strict-Transport-Security no valido.
 InsecurePasswordsPresentOnPage=Campos de clau presents en una pachina insegura (http://): Isto ye un risgo de seguranza que premite que se furten as credencials d'inicio de sesión d'os usuarios.
 InsecureFormActionPasswordsPresent=Campos de clau presents en un formulario con una acción de formulario insegura (http://). Isto ye un risgo de seguranza que premite que se furten as credencials d'inicio de sesión d'os usuarios.
 InsecurePasswordsPresentOnIframe=Campos de clau presents en un iframe inseguro (http://). Isto ye un risgo de seguranza que premite que se furten as credencials d'inicio de sesión d'os usuarios.
 LoadingMixedActiveContent=Cargando conteniu activo mixto (inseguro) en una pachina segura "%1$S"
 LoadingMixedDisplayContent=Cargando conteniu estatico mixto (inseguro) en una pachina segura "%1$S"
--- a/mail/chrome/messenger/FilterListDialog.dtd
+++ b/mail/chrome/messenger/FilterListDialog.dtd
@@ -27,15 +27,13 @@
 <!ENTITY viewLogButton.label "Filter Log">
 <!ENTITY viewLogButton.accesskey "L">
 <!ENTITY runFilters.label "Run Now">
 <!ENTITY runFilters.accesskey "R">
 <!ENTITY stopFilters.label "Stop">
 <!ENTITY stopFilters.accesskey "S">
 <!ENTITY folderPickerPrefix.label "Run selected filter(s) on:">
 <!ENTITY folderPickerPrefix.accesskey "c">
-<!ENTITY choosethis.label "choose this folder">
-<!ENTITY choosethisnewsserver.label "choose this news server">
 <!ENTITY helpButton.label "Help">
 <!ENTITY helpButton.accesskey "H">
 <!ENTITY closeCmd.key "W"> 
 <!ENTITY searchBox.emptyText "Search filters by name…">
 
--- a/mail/chrome/messenger/SearchDialog.dtd
+++ b/mail/chrome/messenger/SearchDialog.dtd
@@ -12,18 +12,16 @@
 <!ENTITY resetButton.label           "Clear">
 <!ENTITY resetButton.accesskey       "C">
 <!ENTITY openButton.label            "Open">
 <!ENTITY openButton.accesskey        "n">
 <!ENTITY deleteButton.label          "Delete">
 <!ENTITY deleteButton.accesskey      "D">
 <!ENTITY searchDialogTitle.label     "Search Messages">
 <!ENTITY results.label               "Results">
-<!ENTITY moveHereMenu.label          "Move Here">
-<!ENTITY moveHereMenu.accesskey      "H">
 <!ENTITY moveButton.label            "Move To">
 <!ENTITY moveButton.accesskey        "T">
 <!ENTITY closeCmd.key                "W"> 
 <!ENTITY openInFolder.label          "Open in Folder">
 <!ENTITY openInFolder.accesskey      "r">
 <!ENTITY saveAsVFButton.label        "Save as Search Folder">
 <!ENTITY saveAsVFButton.accesskey    "v">
 <!-- for ABSearchDialog.xul -->
@@ -54,27 +52,27 @@
 <!ENTITY totalColumn.label "Total">
 <!ENTITY readColumn.label "Read">
 <!ENTITY receivedColumn.label "Received">
 <!ENTITY starredColumn.label "Starred">
 <!ENTITY locationColumn.label "Location">
 <!ENTITY idColumn.label "Order Received">
 <!-- Thread Pane Tooltips -->
 
-<!ENTITY columnChooser.tooltip "Click to select columns to display">
-<!ENTITY threadColumn.tooltip "Click to display message threads"> 
-<!ENTITY fromColumn.tooltip "Click to sort by from">
-<!ENTITY recipientColumn.tooltip "Click to sort by recipient">
-<!ENTITY subjectColumn.tooltip "Click to sort by subject">
-<!ENTITY dateColumn.tooltip "Click to sort by date">
-<!ENTITY priorityColumn.tooltip "Click to sort by priority">
-<!ENTITY tagsColumn.tooltip "Click to sort by tags">
-<!ENTITY accountColumn.tooltip "Click to sort by account">
-<!ENTITY statusColumn.tooltip "Click to sort by status">
-<!ENTITY sizeColumn.tooltip "Click to sort by size">
-<!ENTITY junkStatusColumn.tooltip "Click to sort by junk status">
-<!ENTITY unreadColumn.tooltip "Number of unread messages in thread">
-<!ENTITY totalColumn.tooltip "Total number of messages in thread">
-<!ENTITY readColumn.tooltip "Click to sort by read">
-<!ENTITY receivedColumn.tooltip "Click to sort by date received">
-<!ENTITY starredColumn.tooltip "Click to sort by star">
-<!ENTITY locationColumn.tooltip "Click to sort by location">
-<!ENTITY idColumn.tooltip "Click to sort by order received">
+<!ENTITY columnChooser2.tooltip "Select columns to display">
+<!ENTITY threadColumn2.tooltip "Display message threads">
+<!ENTITY fromColumn2.tooltip "Sort by from">
+<!ENTITY recipientColumn2.tooltip "Sort by recipient">
+<!ENTITY subjectColumn2.tooltip "Sort by subject">
+<!ENTITY dateColumn2.tooltip "Sort by date">
+<!ENTITY priorityColumn2.tooltip "Sort by priority">
+<!ENTITY tagsColumn2.tooltip "Sort by tags">
+<!ENTITY accountColumn2.tooltip "Sort by account">
+<!ENTITY statusColumn2.tooltip "Sort by status">
+<!ENTITY sizeColumn2.tooltip "Sort by size">
+<!ENTITY junkStatusColumn2.tooltip "Sort by junk status">
+<!ENTITY unreadColumn2.tooltip "Number of unread messages in thread">
+<!ENTITY totalColumn2.tooltip "Total number of messages in thread">
+<!ENTITY readColumn2.tooltip "Sort by read">
+<!ENTITY receivedColumn2.tooltip "Sort by date received">
+<!ENTITY starredColumn2.tooltip "Sort by star">
+<!ENTITY locationColumn2.tooltip "Sort by location">
+<!ENTITY idColumn2.tooltip "Sort by order received">
--- a/mail/chrome/messenger/aboutDialog.dtd
+++ b/mail/chrome/messenger/aboutDialog.dtd
@@ -1,9 +1,22 @@
 <!ENTITY aboutDialog.title          "About &brandFullName;">
+<!-- LOCALIZATION NOTE (update.checkForUpdatesButton.*, update.updateButton.*, update.applyButtonBillboard.*):
+# Only one button is present at a time.
+# The button when displayed is located directly under the Thunderbird version in
+# the about dialog.
+-->
+
+
+<!ENTITY update.checkForUpdatesButton.label       "Check for Updates">
+<!ENTITY update.checkForUpdatesButton.accesskey   "C">
+<!ENTITY update.updateButton.label                "Restart to Update">
+<!ENTITY update.updateButton.accesskey            "R">
+<!ENTITY update.applyButtonBillboard.label        "Apply Update…">
+<!ENTITY update.applyButtonBillboard.accesskey    "A">
 
 <!ENTITY community.start2           "&brandShortName; is designed by ">
 <!-- LOCALIZATION NOTE (community.mozillaLink): This is a link title that links to http://www.mozilla.org/. -->
 <!ENTITY community.mozillaLink      "&vendorShortName;">
 <!ENTITY community.middle2          ", a ">
 <!-- LOCALIZATION NOTE (community.creditsLink): This is a link title that links to about:credits. -->
 <!ENTITY community.creditsLink      "global community">
 <!ENTITY community.end2             " working together to make the Internet better. We believe that the Internet should be open, public, and accessible to everyone without any restrictions.">
@@ -19,18 +32,16 @@
 
 <!ENTITY bottomLinks.rights         "End-User Rights">
 <!-- LOCALIZATION NOTE (bottomLinks.privacy): This is a link title that links to https://www.mozilla.org/legal/privacy/. -->
 
 <!ENTITY bottomLinks.privacy        "Privacy Policy">
 <!-- LOCALIZATION NOTE (update.checkingForUpdates): try to make the localized text short (see bug 596813 for screenshots). -->
 
 <!ENTITY update.checkingForUpdates  "Checking for updates…">
-<!-- LOCALIZATION NOTE (update.checkingAddonCompat): try to make the localized text short (see bug 596813 for screenshots). -->
-<!ENTITY update.checkingAddonCompat "Checking Add-on compatibility…">
 <!-- LOCALIZATION NOTE (update.noUpdatesFound): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.noUpdatesFound      "&brandShortName; is up to date">
 <!-- LOCALIZATION NOTE (update.adminDisabled): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.adminDisabled       "Updates disabled by your system administrator">
 <!-- LOCALIZATION NOTE (update.failed.start,update.failed.linkText,update.failed.end):
      update.failed.start, update.failed.linkText, and update.failed.end all go into
      one line with linkText being wrapped in an anchor that links to a site to download
      the latest version of Firefox (e.g. http://www.firefox.com). As this is all in
--- a/mail/chrome/messenger/addressbook/addressBook.properties
+++ b/mail/chrome/messenger/addressbook/addressBook.properties
@@ -62,22 +62,23 @@ propertyAIM=AIM
 propertyYahoo=Yahoo!
 propertySkype=Skype
 propertyQQ=QQ
 propertyMSN=MSN
 propertyICQ=ICQ
 propertyXMPP=Jabber ID
 propertyIRC=IRC Nick
 
-## LOCALIZATION NOTE (dateformat)
-## Only used if the year isn't present and should be in the format used by Date.toLocaleFormat
-## see http://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Global_Objects/Date/toLocaleFormat
-## %B is the month's localized name and %e is the day of the month [1-31]
+## LOCALIZATION NOTE (dateFormatMonthDay)
+## Only used if the year isn't present and should be in the format used by
+## Date.toLocaleFormat see http://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Global_Objects/Date/toLocaleFormat
+## %B is the month's localized name and %d is the day of the month [01-31].
+## Don't go using %e here, since it breaks things on Windows!
 ## Separators (a space, dash, etc.) can be used
-dateformat=%B %e
+dateFormatMonthDay=%B %d
 
 ## LOCALIZATION NOTE (cityAndStateAndZip): 
 ## %1$S is city, %2$S is state, %3$S is zip
 cityAndStateAndZip=%1$S, %2$S %3$S
 ## LOCALIZATION NOTE (cityAndStateNoZip): 
 ## %1$S is city, %2$S is state
 cityAndStateNoZip=%1$S, %2$S
 ## LOCALIZATION NOTE (cityOrStateAndZip): 
--- a/mail/chrome/messenger/folderWidgets.properties
+++ b/mail/chrome/messenger/folderWidgets.properties
@@ -1,7 +1,11 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # LOCALIZATION NOTE(globalInbox)
 # %S=name of the Local folders account
 globalInbox=Global Inbox (%S)
+# LOCALIZATION NOTE(verboseFolderFormat): %1$S is folder name, %2$S is server name
+verboseFolderFormat=%1$S on %2$S
+chooseFolder=Choose Folder…
+noFolders=No available folders
--- a/mail/chrome/messenger/imAccounts.dtd
+++ b/mail/chrome/messenger/imAccounts.dtd
@@ -20,11 +20,13 @@
 <!ENTITY account.disconnect.label     "Disconnect">
 <!ENTITY account.disconnect.accesskey "i">
 <!ENTITY account.edit.label           "Properties">
 <!ENTITY account.edit.accesskey       "P">
 <!ENTITY account.moveup.label         "Move up">
 <!ENTITY account.movedown.label       "Move down">
 <!ENTITY account.cancelReconnection.label         "Cancel reconnection">
 <!ENTITY account.cancelReconnection.accesskey     "a">
+<!ENTITY account.copyDebugLog.label     "Copy Debug Log">
+<!ENTITY account.copyDebugLog.accesskey "C">
 <!ENTITY account.connecting           "Connecting…">
 <!ENTITY account.disconnecting        "Disconnecting…">
 <!ENTITY account.disconnected         "Not Connected">
--- a/mail/chrome/messenger/messenger.dtd
+++ b/mail/chrome/messenger/messenger.dtd
@@ -308,18 +308,16 @@
 <!ENTITY goBackCmd.commandKey "[">
 <!ENTITY goChatCmd.label "Chat">
 <!ENTITY goChatCmd.accesskey "c">
 <!ENTITY goChatCmd.key "I">
 <!ENTITY prevStarredMsgCmd.label "Starred Message">
 <!ENTITY prevStarredMsgCmd.accesskey "S">
 <!ENTITY folderMenu.label "Folder">
 <!ENTITY folderMenu.accesskey "O">
-<!ENTITY thisFolder.label "This Folder">
-<!ENTITY thisFolder.accesskey "F">
 <!ENTITY goRecentlyClosedTabs.label "Recently Closed Tabs">
 <!ENTITY goRecentlyClosedTabs.accesskey "R">
 <!ENTITY startPageCmd.label "Mail Start Page">
 <!ENTITY startPageCmd.accesskey "S">
 <!-- Message Menu -->
 
 <!ENTITY msgMenu.label "Message">
 <!ENTITY msgMenu.accesskey "M">
@@ -349,19 +347,19 @@
 <!ENTITY forwardMsgCmd.accesskey "F">
 <!ENTITY forwardMsgCmd.key  "l">
 <!ENTITY forwardAsMenu.label "Forward As">
 <!ENTITY forwardAsMenu.accesskey "w">
 <!ENTITY forwardAsInline.label "Inline">
 <!ENTITY forwardAsInline.accesskey "I">
 <!ENTITY forwardAsAttachmentCmd.label "Attachment">
 <!ENTITY forwardAsAttachmentCmd.accesskey "A">
-<!ENTITY editMsgAsNewCmd.label "Edit Message As New">
-<!ENTITY editMsgAsNewCmd.accesskey "E">
-<!ENTITY editMsgAsNewCmd.key "e">
+<!ENTITY editAsNewMsgCmd.label "Edit As New Message">
+<!ENTITY editAsNewMsgCmd.accesskey "E">
+<!ENTITY editAsNewMsgCmd.key "e">
 <!ENTITY createFilter.label "Create Filter From Message…">
 <!ENTITY createFilter.accesskey "a">
 <!ENTITY moveMsgToMenu.label "Move To">
 <!ENTITY moveMsgToMenu.accesskey "M">
 <!ENTITY moveCopyMsgRecentMenu.label "Recent">
 <!ENTITY moveCopyMsgRecentMenu.accesskey "R">
 <!ENTITY copyMessageLocation.label "Copy Message Location">
 <!ENTITY copyMessageLocation.accesskey "M">
@@ -374,20 +372,16 @@
 <!ENTITY killThreadMenu.accesskey "I">
 <!ENTITY killThreadMenu.key "k">
 <!ENTITY killSubthreadMenu.label "Ignore Subthread">
 <!ENTITY killSubthreadMenu.accesskey "S">
 <!ENTITY killSubthreadMenu.key "k">
 <!ENTITY watchThreadMenu.label "Watch Thread">
 <!ENTITY watchThreadMenu.accesskey "W">
 <!ENTITY watchThreadMenu.key "w">
-<!ENTITY fileHereMenu.label "File Here">
-<!ENTITY fileHereMenu.accesskey "F">
-<!ENTITY copyHereMenu.label "Copy Here">
-<!ENTITY copyHereMenu.accesskey "C">
 <!ENTITY tagMenu.label "Tag">
 <!ENTITY tagMenu.accesskey "g">
 <!ENTITY tagCmd0.key "0">
 <!ENTITY tagCmd1.key "1">
 <!ENTITY tagCmd2.key "2">
 <!ENTITY tagCmd3.key "3">
 <!ENTITY tagCmd4.key "4">
 <!ENTITY tagCmd5.key "5">
@@ -570,18 +564,20 @@
 <!ENTITY remoteContentOptionsAllowForMsg.label "Show remote content in this message">
 <!ENTITY remoteContentOptionsAllowForMsg.accesskey "S">
 <!ENTITY remoteContentOptionAllowForAddress.label "Show remote content from this sender">
 <!ENTITY remoteContentOptionAllowForAddress.accesskey "f">
 <!-- Phishing Button Popup -->
 
 <!ENTITY phishingOptionIgnore.label "Ignore warning for this message">
 <!ENTITY phishingOptionIgnore.accesskey "n">
-<!ENTITY phishingOptionDisableDetection.label "Disable scam detection for all messages">
-<!ENTITY phishingOptionDisableDetection.accesskey "D">
+<!ENTITY phishingOptionSettings.label "Edit scam detection options…">
+<!ENTITY phishingOptionSettings.accesskey "d">
+<!ENTITY phishingOptionSettingsUnix.label "Edit scam detection preferences…">
+<!ENTITY phishingOptionSettingsUnix.accesskey "d">
 <!-- AppMenu Popup -->
 
 <!ENTITY appmenuNewMsgCmd.label "New Message">
 <!ENTITY appmenuNewContactCmd.label "Address Book Contact…">
 <!ENTITY appmenuEditMenu.label "Edit">
 <!ENTITY appmenuToolbarLayout.label "Toolbar Layout…">
 <!ENTITY appmenuSelectThread.label "Select Thread">
 <!ENTITY appmenuSelectFlagged.label "Select Starred Messages">
@@ -667,50 +663,50 @@
 <!ENTITY readColumn.label "Read">
 <!ENTITY receivedColumn.label "Received">
 <!ENTITY starredColumn.label "Starred">
 <!ENTITY locationColumn.label "Location">
 <!ENTITY idColumn.label "Order Received">
 <!ENTITY attachmentColumn.label "Attachments">
 <!-- Thread Pane Tooltips -->
 
-<!ENTITY columnChooser.tooltip "Click to select columns to display">
-<!ENTITY threadColumn.tooltip "Click to display message threads">
-<!ENTITY fromColumn.tooltip "Click to sort by from">
-<!ENTITY recipientColumn.tooltip "Click to sort by recipient">
-<!ENTITY subjectColumn.tooltip "Click to sort by subject">
-<!ENTITY dateColumn.tooltip "Click to sort by date">
-<!ENTITY priorityColumn.tooltip "Click to sort by priority">
-<!ENTITY tagsColumn.tooltip "Click to sort by tags">
-<!ENTITY accountColumn.tooltip "Click to sort by account">
-<!ENTITY statusColumn.tooltip "Click to sort by status">
-<!ENTITY sizeColumn.tooltip "Click to sort by size">
-<!ENTITY junkStatusColumn.tooltip "Click to sort by junk status">
-<!ENTITY unreadColumn.tooltip "Number of unread messages in thread">
-<!ENTITY totalColumn.tooltip "Total number of messages in thread">
-<!ENTITY readColumn.tooltip "Click to sort by read">
-<!ENTITY receivedColumn.tooltip "Click to sort by date received">
-<!ENTITY starredColumn.tooltip "Click to sort by star">
-<!ENTITY locationColumn.tooltip "Click to sort by location">
-<!ENTITY idColumn.tooltip "Click to sort by order received">
-<!ENTITY attachmentColumn.tooltip "Click to sort by attachments">
+<!ENTITY columnChooser2.tooltip "Select columns to display">
+<!ENTITY threadColumn2.tooltip "Display message threads">
+<!ENTITY fromColumn2.tooltip "Sort by from">
+<!ENTITY recipientColumn2.tooltip "Sort by recipient">
+<!ENTITY subjectColumn2.tooltip "Sort by subject">
+<!ENTITY dateColumn2.tooltip "Sort by date">
+<!ENTITY priorityColumn2.tooltip "Sort by priority">
+<!ENTITY tagsColumn2.tooltip "Sort by tags">
+<!ENTITY accountColumn2.tooltip "Sort by account">
+<!ENTITY statusColumn2.tooltip "Sort by status">
+<!ENTITY sizeColumn2.tooltip "Sort by size">
+<!ENTITY junkStatusColumn2.tooltip "Sort by junk status">
+<!ENTITY unreadColumn2.tooltip "Number of unread messages in thread">
+<!ENTITY totalColumn2.tooltip "Total number of messages in thread">
+<!ENTITY readColumn2.tooltip "Sort by read">
+<!ENTITY receivedColumn2.tooltip "Sort by date received">
+<!ENTITY starredColumn2.tooltip "Sort by star">
+<!ENTITY locationColumn2.tooltip "Sort by location">
+<!ENTITY idColumn2.tooltip "Sort by order received">
+<!ENTITY attachmentColumn2.tooltip "Sort by attachments">
 <!-- Thread Pane Context Menu -->
 
 <!ENTITY contextOpenNewWindow.label "Open Message in New Window">
 <!ENTITY contextOpenNewWindow.accesskey "W">
 <!-- The key potentially conflicts with cutCmd.accessKey which is defined in
      textcontext.dtd from toolkit. Right now, both menu items can't be visible
      at the same time, but should someone enable copy/paste of message, this key
      would probably need to be changed. -->
 <!ENTITY contextOpenNewTab.label "Ubrir o mensache en una pestanya nueva">
 <!ENTITY contextOpenNewTab.accesskey "b">
 <!ENTITY contextOpenConversation.label "Open Message in Conversation">
 <!ENTITY contextOpenConversation.accesskey "n">
-<!ENTITY contextEditAsNew.label "Edit As New…">
-<!ENTITY contextEditAsNew.accesskey "E">
+<!ENTITY contextEditMsgAsNew.label "Edit As New Message">
+<!ENTITY contextEditMsgAsNew.accesskey "E">
 <!ENTITY contextArchive.label "Archive">
 <!ENTITY contextArchive.accesskey "h">
 <!ENTITY contextReplySender.label "Reply to Sender Only">
 <!ENTITY contextReplySender.accesskey "R">
 <!ENTITY contextReplyNewsgroup2.label "Followup to Newsgroup">
 <!ENTITY contextReplyNewsgroup2.accesskey "u">
 <!ENTITY contextReplyAll.label "Reply to All">
 <!ENTITY contextReplyAll.accesskey "A">
@@ -829,18 +825,18 @@
      -->
 <!ENTITY search.keyLabel.mac "&lt;&#x2318;K&gt;">
 <!-- Message Header Context Menu -->
 
 <!ENTITY AddToAddressBook.label "Add to Address Book…">
 <!ENTITY AddToAddressBook.accesskey "B">
 <!ENTITY AddDirectlyToAddressBook.label "Add to Address Book">
 <!ENTITY AddDirectlyToAddressBook.accesskey "B">
-<!ENTITY EditContact.label "Edit Contact…">
-<!ENTITY EditContact.accesskey "E">
+<!ENTITY EditContact1.label "Edit Contact">
+<!ENTITY EditContact1.accesskey "E">
 <!ENTITY ViewContact.label "View Contact">
 <!ENTITY ViewContact.accesskey "V">
 <!ENTITY SubscribeToNewsgroup.label "Subscribe to Newsgroup">
 <!ENTITY SubscribeToNewsgroup.accesskey "N">
 <!ENTITY SendMessageTo.label "Compose Message To">
 <!ENTITY SendMessageTo.accesskey "s">
 <!ENTITY CopyEmailAddress.label "Copy Email Address">
 <!ENTITY CopyEmailAddress.accesskey "C">
--- a/mail/chrome/messenger/messengercompose/composeMsgs.properties
+++ b/mail/chrome/messenger/messengercompose/composeMsgs.properties
@@ -309,19 +309,23 @@ sendMessageCheckLabel=Are you sure you a
 sendMessageCheckSendButtonLabel=Send
 
 ## reply header in composeMsg
 ## <author> wrote:
 mailnews.reply_header_authorwrote=%s wrote
 mailnews.reply_header_ondate=On %s
 
 ## reply header in composeMsg
-## user specified 
+## user specified
 mailnews.reply_header_originalmessage=-------- Original Message --------
 
+## forwarded header in composeMsg
+## user specified
+mailnews.forward_header_originalmessage=-------- Forwarded Message --------
+
 ## Strings used by the rename attachment dialog
 renameAttachmentTitle=Rename Attachment
 renameAttachmentMessage=New attachment name:
 
 ## Attachment Reminder
 ## LOCALIZATION NOTE (mail.compose.attachment_reminder_keywords): comma separated
 ##   words that that should trigger an attachment reminder.
 mail.compose.attachment_reminder_keywords=.doc,.pdf,.xls,.ppt,.rtf,.pps,attachment,attach,attached,attaching,enclosed,CV,cover letter
--- a/mail/chrome/messenger/messengercompose/messengercompose.dtd
+++ b/mail/chrome/messenger/messengercompose/messengercompose.dtd
@@ -12,17 +12,17 @@
 <!ENTITY newMenu.accesskey "N">
 <!ENTITY newMessage.label "Message">
 <!ENTITY newMessage.key "M">
 <!ENTITY newMessageCmd2.key "N">
 <!ENTITY newMessage.accesskey "M">
 <!ENTITY newContact.label "Address Book Contact…">
 <!ENTITY newContact.accesskey "C">
 <!ENTITY attachMenu.label "Attach">
-<!ENTITY attachMenu.accesskey "t">
+<!ENTITY attachMenu.accesskey "h">
 <!ENTITY attachFileCmd.label "File(s)…">
 <!ENTITY attachFileCmd.accesskey "F">
 <!ENTITY attachFileCmd.key "A">
 <!ENTITY attachCloudCmd.label "Filelink">
 <!ENTITY attachCloudCmd.accesskey "i">
 <!ENTITY attachPageCmd.label "Web Page…">
 <!ENTITY attachPageCmd.accesskey "W">
 <!--LOCALIZATION NOTE attachVCardCmd.label Don't translate the term 'vCard' -->
@@ -197,28 +197,30 @@
 <!-- Mail Toolbar -->
 
 <!ENTITY sendButton.label "Send">
 <!ENTITY quoteButton.label "Quote">
 <!ENTITY addressButton.label "Contacts">
 <!ENTITY attachButton.label "Attach">
 <!ENTITY spellingButton.label "Spelling">
 <!ENTITY saveButton.label "Save">
+<!ENTITY printButton.label "Print">
 <!-- Mail Toolbar Tooltips -->
 
 <!ENTITY sendButton.tooltip "Send this message now">
 <!ENTITY sendlaterButton.tooltip "Send this message later">
 <!ENTITY quoteButton.tooltip "Quote the previous message">
 <!ENTITY addressButton.tooltip "Select a recipient from an Address Book">
 <!ENTITY attachButton.tooltip "Include an attachment">
 <!ENTITY spellingButton.tooltip "Check spelling of selection or entire message">
 <!ENTITY saveButton.tooltip "Save this message">
 <!ENTITY cutButton.tooltip              "Retallar">
 <!ENTITY copyButton.tooltip             "Copy">
 <!ENTITY pasteButton.tooltip            "Paste">
+<!ENTITY printButton.tooltip "Print this message">
 <!-- Headers -->
 <!--LOCALIZATION NOTE headersSpace.style is for aligning  the From:, To: and
     Subject: rows. It should be larger than the largest Header label  -->
 
 <!ENTITY headersSpace.style "width: 9em;">
 <!ENTITY fromAddr.label "From:">
 <!ENTITY fromAddr.accesskey "r">
 <!ENTITY toAddr.label "To:">
--- a/mail/chrome/messenger/msgFolderPickerOverlay.dtd
+++ b/mail/chrome/messenger/msgFolderPickerOverlay.dtd
@@ -1,8 +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/. -->
 <!-- Labels -->
 
-<!ENTITY newfolderchoosethis.label      "choose this for the parent">
 <!ENTITY filemessageschoosethis.label   "choose this folder">
 <!ENTITY recentfolders.label            "Recent">
--- a/mail/chrome/messenger/preferences/advanced.dtd
+++ b/mail/chrome/messenger/preferences/advanced.dtd
@@ -58,30 +58,30 @@
 <!ENTITY reuseExpRadio0.label          "A new message window">
 <!ENTITY reuseExpRadio0.accesskey      "n">
 <!ENTITY reuseExpRadio1.label          "An existing message window">
 <!ENTITY reuseExpRadio1.accesskey      "e">
 <!ENTITY closeMsgOnMoveOrDelete.label  "Close message window/tab on move or delete">
 <!ENTITY closeMsgOnMoveOrDelete.accesskey "C">
 <!-- Update -->
 
-<!ENTITY autoCheck.label                "Automatically check for updates to:">
-<!ENTITY enableAppUpdate.label          "&brandShortName;">
-<!ENTITY enableAppUpdate.accesskey      "h">
-<!ENTITY enableAddonsUpdate.label       "Installed Add-ons">
-<!ENTITY enableAddonsUpdate.accesskey   "A">
-<!ENTITY whenUpdatesFound.label         "When updates to &brandShortName; are found,">
-<!ENTITY modeAskMe.label                "Ask me what I want to do">
-<!ENTITY modeAskMe.accesskey            "m">
-<!ENTITY modeAutomatic.label            "Automatically download and install the update">
-<!ENTITY modeAutomatic.accesskey        "d">
-<!ENTITY modeAutoAddonWarn.label        "Warn me if this will disable any of my add-ons">
-<!ENTITY modeAutoAddonWarn.accesskey    "W">
-<!ENTITY showUpdates.label              "Show Update History">
-<!ENTITY showUpdates.accesskey          "S">
+<!ENTITY updateApp.label                 "&brandShortName; updates:">
+<!ENTITY updateAuto.label                "Automatically install updates (recommended: improved security)">
+<!ENTITY updateAuto.accesskey            "A">
+<!ENTITY updateCheck.label               "Check for updates, but let me choose whether to install them">
+<!ENTITY updateCheck.accesskey           "C">
+<!ENTITY updateManual.label              "Never check for updates (not recommended: security risk)">
+<!ENTITY updateManual.accesskey          "N">
+<!ENTITY updateAutoAddonWarn.label       "Warn me if this will disable any of my add-ons">
+<!ENTITY updateAutoAddonWarn.accesskey   "W">
+<!ENTITY updateHistory.label             "Show Update History">
+<!ENTITY updateHistory.accesskey         "p">
+<!ENTITY updateOthers.label              "Automatically update:">
+<!ENTITY enableAddonsUpdate3.label       "Add-ons">
+<!ENTITY enableAddonsUpdate3.accesskey   "o">
 
 <!ENTITY useService.label                "Use a background service to install updates">
 <!ENTITY useService.accesskey            "b">
 <!-- Networking and Disk Space -->
 
 <!ENTITY showSettings.label            "Settings…">
 <!ENTITY showSettings.accesskey        "S">
 <!ENTITY proxiesConfigure.label        "Configure how &brandShortName; connects to the Internet">
--- a/mobile/android/base/android_strings.dtd
+++ b/mobile/android/base/android_strings.dtd
@@ -42,17 +42,17 @@
 <!ENTITY bookmark_options "Opcions">
 
 <!ENTITY history_today_section "Hue">
 <!ENTITY history_yesterday_section "Ahiere">
 <!ENTITY history_week_section "Fa 7 días">
 <!ENTITY history_older_section "Fa mas de 7 días">
 
 <!ENTITY go "Ir-ie">
-<!ENTITY search "Mirar-lo">
+<!ENTITY search "Buscar">
 <!ENTITY reload "Esviellar">
 <!ENTITY forward "Entabant">
 <!ENTITY menu "Menú">
 <!ENTITY back "Enta zaga">
 <!ENTITY stop "Aturar">
 <!ENTITY site_security "Seguridat d\u0027o puesto">
 
 <!ENTITY close_tab "Zarrar a pestanya">
@@ -61,31 +61,37 @@
      We can't use android plural forms, sadly. See bug #753859. -->
 <!ENTITY num_tabs2 "&formatD; pestanyas">
 <!ENTITY new_tab_opened "S\u0027ha ubierto una pestanya nueva">
 
 <!ENTITY settings "Opcions">
 <!ENTITY settings_title "Opcions">
 <!ENTITY pref_category_advanced "Abanzau">
 <!ENTITY pref_category_customize "Personalización">
-<!ENTITY pref_category_search2 "Parametros de busca">
+<!ENTITY pref_category_search3 "Buscar">
 <!ENTITY pref_category_display "Amostrar">
 <!ENTITY pref_category_privacy_short "Privacidat">
 <!ENTITY pref_category_vendor "&vendorShortName;">
 <!ENTITY pref_category_datareporting "Elección de datos">
 <!ENTITY pref_category_installed_search_engines "Motors de busca instalaus">
 <!ENTITY pref_category_add_search_providers "Adhibir mas proveyedors de buscas">
+<!ENTITY pref_category_search_restore_defaults "Restablir os motors de busca">
+<!ENTITY pref_search_restore_defaults "Restablir os predefinius">
+<!ENTITY pref_search_restore_defaults_summary "Restablir os predefinius">
 <!-- Localization note (pref_search_tip) : "TIP" as in "hint", "clue" etc. Displayed as an
      advisory message on the customise search providers settings page explaining how to add new
      search providers.-->
 <!ENTITY pref_search_tip "CONSELLO: adhiba un puesto web a la suya lista de proveyedors de buscas fendo una pretada larga en o suyo campo de busca.">
 <!ENTITY pref_category_devtools "Ferramientas ta desembolicadors">
 <!ENTITY pref_developer_remotedebugging "Debug remoto">
 <!ENTITY pref_developer_remotedebugging_docs "Aprender-ne mas">
 <!ENTITY pref_remember_signons "Recordar as claus">
+
+<!ENTITY pref_category_home "Inicio">
+<!ENTITY pref_category_home_panels "Panels">
 <!-- Localization note: These are shown in the left sidebar on tablets -->
 
 <!ENTITY pref_header_customize "Personalización">
 <!ENTITY pref_header_display "Visualización">
 <!ENTITY pref_header_privacy_short "Privacidat">
 <!ENTITY pref_header_help "Aduya">
 <!ENTITY pref_header_vendor "&vendorShortName;">
 <!ENTITY pref_header_devtools "Ferramientas ta desembolicadors">
@@ -143,21 +149,26 @@ size. -->
 <!ENTITY pref_private_data_offlineApps "Datos offline d\u0027o puesto web">
 <!ENTITY pref_private_data_siteSettings2 "Preferencias d\u0027o puesto">
 <!ENTITY pref_private_data_downloadFiles "Fichers descargaus">
 
 
 <!ENTITY pref_about_firefox "Quanto a &brandShortName;">
 <!ENTITY pref_vendor_faqs "FAQ">
 <!ENTITY pref_vendor_feedback "Ninviar comentarios">
-<!ENTITY pref_search_set_default "Fer servir como predeterminau">
-<!ENTITY pref_search_default "Predeterminau">
-<!ENTITY pref_search_remove "Eliminar">
+
+<!ENTITY pref_dialog_set_default "Fer servir como predeterminau">
+<!ENTITY pref_dialog_default "Predeterminau">
+<!ENTITY pref_dialog_remove "Eliminar">
+
 <!ENTITY pref_search_last_toast "No puede elminar ni desactivar o suyo zaguero buscador.">
 
+<!ENTITY pref_panels_show "Amostrar">
+<!ENTITY pref_panels_hide "Amagar">
+
 <!ENTITY datareporting_notification_title "Estatisticas y datos de &brandShortName;">
 <!ENTITY datareporting_notification_action_long "Trigue qué información quiere compartir">
 <!ENTITY datareporting_notification_action "Trigar qué compartir">
 <!ENTITY datareporting_notification_summary "Ta amillorar a suya experiencia, &brandShortName; ninvia automaticament quanta información arredol de &vendorShortName;.">
 <!ENTITY datareporting_notification_summary_short "Ta amillorar a suya experiencia, &brandShortName;…">
 <!ENTITY datareporting_notification_ticker_text "datareporting_notification_title;: datareporting_notification_action_long;">
 <!-- Localization note (datareporting_fhr_title, datareporting_fhr_summary2,
      reporting_telemetry_title, datareporting_telemetry_summary,
@@ -210,16 +221,23 @@ size. -->
 <!ENTITY set_image_chooser_title "Establir imachen como">
 <!-- Localization note (find_text, find_prev, find_next, find_close) : These strings are used
      as alternate text for accessibility. They are not visible in the UI. -->
 
 <!ENTITY find_text "Trobar en a pachina">
 <!ENTITY find_prev "Anterior">
 <!ENTITY find_next "Siguient">
 <!ENTITY find_close "Zarrar">
+<!-- Localization note (media_casting_to, media_play, media_pause, media_stop) : These strings are used
+     as alternate text for accessibility. They are not visible in the UI. -->
+
+<!ENTITY media_casting_to "Transmitir t\u0027o dispositivo">
+<!ENTITY media_play "Reproducir">
+<!ENTITY media_pause "Pausa">
+<!ENTITY media_stop "Aturar">
 
 <!ENTITY contextmenu_open_new_tab "Ubrir en una pestanya nueva">
 <!ENTITY contextmenu_open_private_tab "Ubrir en una pestanya privada">
 <!ENTITY contextmenu_open_in_reader "Ubrir en o Lector">
 <!ENTITY contextmenu_remove "Eliminar">
 <!ENTITY contextmenu_add_to_launcher "Adhibir-lo a la pantalla inicial">
 <!ENTITY contextmenu_share "Compartir">
 <!ENTITY contextmenu_pasteandgo "Apegar &amp; Ir">
@@ -231,18 +249,20 @@ size. -->
 <!ENTITY contextmenu_top_sites_edit "Editar">
 <!ENTITY contextmenu_top_sites_pin "Clavar o puesto">
 <!ENTITY contextmenu_top_sites_unpin "Desclavar o puesto">
 <!ENTITY contextmenu_add_search_engine "Adhibir un motor de busca">
 
 <!ENTITY pref_titlebar_mode "Barra de titol">
 <!ENTITY pref_titlebar_mode_title "Amostrar o titol d\u0027a pachina">
 <!ENTITY pref_titlebar_mode_url "Amostrar l\u0027adreza d\u0027a pachina">
+<!-- Localization note (pref_scroll_title_bar): Label for setting that controls
+     whether or not the dynamic toolbar is enabled. -->
 
-<!ENTITY pref_dynamic_toolbar "Amagar a barra de titol mientres se desplaza">
+<!ENTITY pref_scroll_title_bar "Barra de titol dinamica">
 
 <!ENTITY history_removed "S\u0027ha eliminau a pachina">
 
 <!ENTITY bookmark_edit_title "Editar o marcapachinas">
 <!ENTITY bookmark_edit_name "Nombre">
 <!ENTITY bookmark_edit_location "Ubicación">
 <!ENTITY bookmark_edit_keyword "Parola clau">
 <!-- Localization note (site_settings_*) : These strings are used in the "Site Settings"
--- a/mobile/android/base/sync_strings.dtd
+++ b/mobile/android/base/sync_strings.dtd
@@ -66,20 +66,20 @@
 <!ENTITY sync.configure.engines.title.history "Historial">
 <!ENTITY sync.configure.engines.title.tabs "Pestanyas">
 <!-- Common text -->
 
 <!ENTITY sync.button.cancel.label "Cancelar">
 <!ENTITY sync.button.connect.label "Connectar">
 <!ENTITY sync.button.ok.label "D\u0027alcuerdo">
 <!-- Account strings -->
-  
-<!ENTITY sync.account.label.label "&syncBrand.fullName.label;">
+
+<!ENTITY sync.account.label "&syncBrand.fullName.label; (obsoleto)">
 <!-- Bookmark folder strings -->
-  
+
 <!ENTITY bookmarks.folder.menu.label "Menú d\u0027os marcapachinas">
 <!ENTITY bookmarks.folder.places.label ''>
 <!ENTITY bookmarks.folder.tags.label "Etiquetas">
 <!ENTITY bookmarks.folder.toolbar.label "Barra de ferramientas d\u0027os marcapachinas">
 <!ENTITY bookmarks.folder.unfiled.label "Marcapachinas desordenaus">
 <!ENTITY bookmarks.folder.desktop.label "Marcapachinas d\u0027escritorio">
 <!ENTITY bookmarks.folder.mobile.label "Marcapachinas d\u0027o mobil">
 <!ENTITY bookmarks.folder.readinglist.label "Lista de lectura">
@@ -99,8 +99,120 @@
 
 <!ENTITY sync.title.send.tab.label "Ninviar a pestanya ta o dispositivo">
 <!ENTITY sync.button.send.label "Ninviar">
 <!ENTITY sync.button.set.up.sync.label "Configurar o &syncBrand.shortName.label;">
 <!ENTITY sync.title.redirect.to.set.up.sync.label "Configurar o &syncBrand.shortName.label; ta ninviar pestanyas">
 <!ENTITY sync.text.redirect.to.set.up.sync.label "Configurar o &syncBrand.fullName.label; en o suyo dispositivo ta ninviar pestanyas enta atros equipos.">
 <!ENTITY sync.text.tab.sent.label "S\u0027ha ninviau a pestanya!">
 <!ENTITY sync.text.tab.not.sent.label "I ha habiu bell problema en ninviar a suya pestanya.">
+<!-- Firefox account strings. -->
+<!-- Localization note: these describe icons and graphics, and are
+     consumed by assistive devices. -->
+
+
+<!ENTITY fxaccount_checkbox_contentDescription2 "Grafico de caixeta de verificación de cuenta de Firefox">
+<!ENTITY fxaccount_icon_contentDescription2 "Icono de cuentas de Firefox">
+<!ENTITY fxaccount_intro_contentDescription2 "Grafico d\u0027introducción a las cuentas de Firefox">
+<!ENTITY fxaccount_mail_contentDescription2 "Grafico de sobre de cuentas de Firefox">
+<!-- Localization note: these are shown in all screens that query the
+     user for an email address and password. Hide and show are button
+     labels. -->
+
+<!ENTITY fxaccount_email_hint "Correu">
+<!ENTITY fxaccount_password_hint "Clau">
+<!ENTITY fxaccount_password_hide "Amagar">
+<!ENTITY fxaccount_password_show "Amostrar">
+<!-- Localization note: these are shown in screens after the user has
+     created or signed in to an account, and take the user back to
+     Firefox. -->
+
+<!ENTITY fxaccount_back_to_browsing "Tornar a navegar">
+
+<!ENTITY fxaccount_policy_linktos "Termens d\u0027o Servicio">
+<!ENTITY fxaccount_policy_linkprivacy "Nota sobre privacidat">
+
+<!ENTITY fxaccount_getting_started_welcome_to_sync "Bienveniu ta &syncBrand.shortName.label;">
+<!ENTITY fxaccount_getting_started_description "Enciete una sesión ta sincronizar as suyas pestanyas, marcapachinas, claus y mas.">
+<!ENTITY fxaccount_getting_started_get_started "Empecipiar">
+<!ENTITY fxaccount_getting_started_old_firefox "Fa servir una versión antiga de &syncBrand.shortName.label;?">
+<!-- Localization note: the Firefox below should not change with the
+     particular version of Firefox installed (Release, Beta, Aurora,
+     etc).  The account remains a "Firefox" account. -->
+
+<!ENTITY fxaccount_create_account_header "Creyar una cuenta de Firefox">
+<!ENTITY fxaccount_create_account_password_length_restriction "Ha de tener a lo menos 8 caracters">
+<!ENTITY fxaccount_create_account_year_of_birth "Anyo de naixencia">
+<!-- Localization note: &formatS1; is fxaccount_policy_linktos, &formatS2; is fxaccount_policy_linkprivacy, both hyperlinked. -->
+<!ENTITY fxaccount_create_account_policy_text "En continar, accepto o &formatS1; y &formatS2; d\u0027os servicios en linia de Firefox.">
+<!ENTITY fxaccount_create_account_button "Siguient">
+<!ENTITY fxaccount_create_account_choose_what_to_sync "Trigue qué cosas sincronizar">
+<!ENTITY fxaccount_create_account_sign_in_instead "Ya tien bella cuenta? Connecte-se">
+<!ENTITY fxaccount_create_account_1990_or_earlier "1990 u anterior">
+<!ENTITY fxaccount_create_account_unknown_error "No s\u0027ha puesto creyar a cuenta">
+
+<!ENTITY fxaccount_account_create_not_allowed "No se puede creyar a cuenta">
+<!ENTITY fxaccount_account_create_not_allowed_you_must_meet_certain_age_requirements "Ha de complir bells requisitos d\u0027edat ta creyar una cuenta.">
+<!ENTITY fxaccount_account_create_not_allowed_learn_more "Saber-ne mas">
+
+<!ENTITY fxaccount_confirm_account_header "Confirme a suya cuenta">
+<!-- Localization note: &formatS; is the Firefox account's email address. -->
+<!ENTITY fxaccount_confirm_account_verification_link "S\u0027ha ninviau un vinclo de verificación ta &formatS;">
+<!ENTITY fxaccount_confirm_account_resend_email "Tornar a ninviar o mensache">
+<!ENTITY fxaccount_confirm_account_verification_link_sent2 "Mensache de verificación ninviau">
+<!ENTITY fxaccount_confirm_account_verification_link_not_sent2 "No s\u0027ha puesto ninviar o mensache de verificación">
+
+<!ENTITY fxaccount_sign_in_sub_header "Connectar-se">
+<!ENTITY fxaccount_sign_in_button_label "Connectar-se">
+<!ENTITY fxaccount_sign_in_forgot_password "Ha oblidau a contrasenya?">
+<!ENTITY fxaccount_sign_in_create_account_instead "Creyar una cuenta">
+<!ENTITY fxaccount_sign_in_unknown_error "No s\u0027ha puesto connectar">
+
+<!ENTITY fxaccount_account_verified_sub_header "Cuenta verificada">
+<!ENTITY fxaccount_account_verified_description2 "A sincronización d\u0027os suyos datos empecipiará de camín.">
+
+<!ENTITY fxaccount_update_credentials_header "Connectar-se">
+<!ENTITY fxaccount_update_credentials_button_label "Connectar-se">
+<!ENTITY fxaccount_update_credentials_unknown_error "No s\u0027ha puesto encetar a sesión">
+
+<!ENTITY fxaccount_status_header "Cuenta de Firefox">
+<!ENTITY fxaccount_status_sync "&syncBrand.shortName.label;">
+<!ENTITY fxaccount_status_sync_enabled "&syncBrand.shortName.label;: activada">
+<!ENTITY fxaccount_status_needs_verification2 "A suya cuenta ha de verificar-se. Toque ta tornar a ninviar o mensache de verificación.">
+<!ENTITY fxaccount_status_needs_credentials "No s\u0027ha puesto connectar. Toque ta encetar a sesión.">
+<!ENTITY fxaccount_status_needs_upgrade "Ha d\u0027esviellar o &brandShortName; ta encetar a sesión.">
+<!ENTITY fxaccount_status_bookmarks "Marcapachinas">
+<!ENTITY fxaccount_status_history "Historial">
+<!ENTITY fxaccount_status_passwords "Claus">
+<!ENTITY fxaccount_status_tabs "Ubrir pestanyas">
+<!ENTITY fxaccount_status_legal "Aspectos legals" >
+<!-- Localization note: this is the name shown by the Android system
+     itself for a Firefox account. Don't localize this. -->
+
+<!ENTITY fxaccount_account_type_label "Firefox">
+<!-- Localization note: these are shown by the Android system itself,
+     when the user navigates to the Android > Accounts > [Firefox
+     Account] Screen. The link takes the user to the Firefox account
+     status activity, which lets them manage their Firefox
+     account. -->
+
+<!ENTITY fxaccount_options_title "Opcions de &syncBrand.shortName.label;">
+<!ENTITY fxaccount_options_configure_title "Configurar &syncBrand.shortName.label;">
+<!-- Localization note: these error messages are shown after a request
+     has been made to the remote server, and an error of some type has
+     been returned. -->
+
+<!ENTITY fxaccount_remote_error_UPGRADE_REQUIRED "Ha d\u0027esviellar o Firefox">
+<!-- Localization note: the format string will be fxaccount_sign_in_button_label, linkified. -->
+
+<!ENTITY fxaccount_remote_error_ATTEMPT_TO_CREATE_AN_ACCOUNT_THAT_ALREADY_EXISTS_2 "A cuenta ya existe. &formatS1;">
+<!ENTITY fxaccount_remote_error_ATTEMPT_TO_ACCESS_AN_ACCOUNT_THAT_DOES_NOT_EXIST "Adreza de correu u clau no validos">
+<!ENTITY fxaccount_remote_error_INCORRECT_PASSWORD "Adreza de correu u clau no validos">
+<!ENTITY fxaccount_remote_error_ATTEMPT_TO_OPERATE_ON_AN_UNVERIFIED_ACCOUNT "A cuenta no ye verificada">
+<!ENTITY fxaccount_remote_error_CLIENT_HAS_SENT_TOO_MANY_REQUESTS "Servidor ocupau, torne-lo a intentar d\u0027aquí a un ratet">
+<!ENTITY fxaccount_remote_error_SERVICE_TEMPORARILY_UNAVAILABLE_TO_DUE_HIGH_LOAD "Servidor ocupau, torne-lo a intentar d\u0027aquí a un ratet">
+<!ENTITY fxaccount_remote_error_UNKNOWN_ERROR "I ha habiu un problema">
+<!ENTITY fxaccount_remote_error_COULD_NOT_CONNECT "No se puede connectar a o ret">
+
+<!ENTITY fxaccount_sync_sign_in_error_notification_title2 "&syncBrand.shortName.label; no ye connectau">
+<!-- Note to translators: the format string below will be replaced
+     with the Firefox account's email address. -->
+<!ENTITY fxaccount_sync_sign_in_error_notification_text2 "Toque ta encetar sesión como &formatS;">
--- a/mobile/android/chrome/sync.properties
+++ b/mobile/android/chrome/sync.properties
@@ -26,8 +26,15 @@ sync.update.button=Saber-ne mas
 sync.update.close=Zarrar
 sync.setup.error.title=No se puede configurar o Sync
 sync.setup.error.network=No i hai garra connexión a internet disponible
 sync.setup.error.nodata=%S no se puede connectar a Sync. Quiere tornar a prebar-lo?
 sync.setup.tryagain=Tornar a prebar-lo
 sync.setup.manual=Configuración manual
 
 sync.message.notabs=No i hai pestanyas d'os suyos atros ordinadors.
+
+# LOCALIZATION NOTE (promoBanner.message.text): First part of the message displayed in a
+# banner on about:home. The final space separates this text from the link.
+promoBanner.message.text=Sync ye completament nuevo y mas sencillo que no nunca. 
+
+# LOCALIZATION NOTE (promoBanner.message.link): Second part of the message, styled as a link.
+promoBanner.message.link=Toque aquí ta saber-ne mas
new file mode 100644
--- /dev/null
+++ b/mobile/android/chrome/webapp.properties
@@ -0,0 +1,53 @@
+# 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/.
+
+checkingForUpdatesTitle=Se ye mirando si i hai actualizacions...
+checkingForUpdatesMessage=Mirando actualizacions d'as suyas aplicacions
+
+noUpdatesTitle=No i hai garra actualización disponible
+noUpdatesMessage=No i hai garra actualización d'as suyas aplicacions
+
+# LOCALIZATION NOTE (downloadUpdateTitle): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of updates.
+# example: 3 new updates
+downloadUpdateTitle=#1 nueva actualización;#1 nuevas actualizacions
+
+# LOCALIZATION NOTE (downloadUpdateMessage):
+# %S is a comma-separated list of apps for which to download an update.
+# example: Touch to download Foo, Bar, Baz.
+downloadUpdateMessage=Prete ta descargar %S
+
+# LOCALIZATION NOTE (downloadingUpdateTitle): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of updates.
+# example: Downloading 3 updates…
+downloadingUpdateTitle=Descargando #1 actualización…;Descargando #1 actualizacions…;
+
+# LOCALIZATION NOTE (downloadingUpdateMessage):
+# %S is a comma-separated list of apps for which we're downloading updates.
+# example: Downloading Foo, Bar, Baz.
+downloadingUpdateMessage=Descargando %S
+
+# LOCALIZATION NOTE (installUpdateTitle): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of updates.
+# example: 3 updates downloaded
+installUpdateTitle=#1 actualización descargada;#1 actualizacions descargadas
+
+# LOCALIZATION NOTE (installUpdateMessage):
+# %S is a comma-separated list of apps for which to install an update.
+# example: Touch to install Foo, Bar, Baz.
+installUpdateMessage=Toque ta instalar %S
+
+# LOCALIZATION NOTE (downloadFailedTitle): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of updates.
+# example: 3 downloads failed
+downloadFailedTitle=#1 descarga ha fallau;#1 descargas han fallau
+
+# LOCALIZATION NOTE (downloadFailedMessage):
+# %S is a comma-separated list of apps for which a download failed.
+# example: Failed to download Foo, Bar, Baz.
+downloadFailedMessage=No s'ha puesto descargar %S
--- a/mobile/overrides/netError.dtd
+++ b/mobile/overrides/netError.dtd
@@ -64,17 +64,17 @@
 </ul>">
 
 <!ENTITY netReset.title "S'ha reiniciau a connexión">
 <!ENTITY netReset.longDesc "&sharedLongDesc2;">
 
 <!ENTITY netTimeout.title "S'ha acotolau o tiempo d'aspera d'a connexión">
 <!ENTITY netTimeout.longDesc "&sharedLongDesc2;">
 
-<!ENTITY protocolNotFound.title "No s'ha replecau l'adreza">
+<!ENTITY protocolNotFound.title "No s'ha entendiu l'adreza">
 <!ENTITY protocolNotFound.longDesc "<ul> 
 <li>Podría estar que calese instalar unatro software ta ubrir l'adreza.</li>  </ul>">
 
 <!ENTITY proxyConnectFailure.title "O servidor proxy ye refusando as connexions">
 <!ENTITY proxyConnectFailure.longDesc "<ul> 
 <li>Comprebe a configuración d'o servidor proxy ta asegurar-se de que ye correcta.</li> 
 <li>Meta-se en contacto con l'administrador d'o ret ta asegurar-se de que o servidor proxy 
 ye funcionando.</li> 
--- a/mobile/profile/bookmarks.inc
+++ b/mobile/profile/bookmarks.inc
@@ -60,9 +60,21 @@
 # link title for https://support.mozilla.org/mobile
 
 
 
 #define bookmarks_support Firefox: Asistencia
 
 
 
+# LOCALIZATION NOTE (bookmarks_marketplace):
+
+
+
+# link title for https://marketplace.firefox.com
+
+
+
+#define bookmarks_marketplace Firefox Marketplace
+
+
+
 #unfilter emptyLines
--- a/suite/chrome/common/help/shortcuts_mailnews.xhtml
+++ b/suite/chrome/common/help/shortcuts_mailnews.xhtml
@@ -65,17 +65,17 @@
     <td>Toggle Message Pane Visibility</td>
     <td>F8</td>
     <td>F8</td>
     <td>F8</td>
   </tr>
   <tr>
     <td>Toggle Folder Pane Visibility</td>
     <td>F9</td>
-    <td/>
+    <td>Cmd+Opt+S</td>
     <td>F9</td>
   </tr>
   <tr>
     <td>New Message</td>
     <td>Ctrl+M</td>
     <td>Cmd+Shift+M</td>
     <td>Ctrl+M</td>
   </tr>
--- a/suite/chrome/common/help/shortcuts_navigator.xhtml
+++ b/suite/chrome/common/help/shortcuts_navigator.xhtml
@@ -457,17 +457,17 @@
     <th>Mac OS</th>
     <th>Linux or Unix</th>
   </tr>
 </thead>
 <tbody class="tbody-default">
   <tr>
     <td>Open/Close Sidebar (toggle)</td>
     <td>F9</td>
-    <td/>
+    <td>Cmd+Opt+S</td>
     <td>F9</td>
   </tr>
   <tr>
     <td>Switch to Next Sidebar Panel</td>
     <td>Alt+Page Down</td>
     <td>Opt+Page Down</td>
     <td>Alt+Page Down</td>
   </tr>
@@ -494,17 +494,17 @@
     <th>Command</th>
     <th>Windows</th>
     <th>Mac OS</th>
     <th>Linux or Unix</th>
   </tr>
 </thead>
 <tbody class="tbody-default">
   <tr>
-    <td> Move to Next/Previous Item in Form</td>
+    <td>Move to Next/Previous Item in Form</td>
     <td>Tab/Shift+Tab</td>
     <td>Tab/Shift+Tab</td>
     <td>Tab/Shift+Tab</td>
   </tr>
   <tr>
     <td>Submit Form</td>
     <td>Enter</td>
     <td>Return</td>
--- a/suite/chrome/common/mac/platformCommunicatorOverlay.dtd
+++ b/suite/chrome/common/mac/platformCommunicatorOverlay.dtd
@@ -26,17 +26,23 @@
 <!-- End of Application menu -->
 
 <!ENTITY closeCmd.label                 "Close">  
 <!ENTITY closeCmd.key                   "W">  
 
 <!ENTITY printSetupCmd.label            "Page Setup…">
 <!ENTITY printSetupCmd.accesskey        "u">
 
-<!ENTITY redoCmd.key                    "Z">  
+<!ENTITY redoCmd.key                    "Z">
+<!-- Keys for toggling Sidebar, Folder Pane in mailNews and Directory Pane in
+  Address Book -->
+
+<!ENTITY showHideSidebarCmd.key         "S">
+<!ENTITY toggleFolderPaneCmd.key        "S">
+<!ENTITY toggleDirectoryPaneCmd.key     "S">
 
 <!ENTITY historyCmd.key                 "H">  
 
 <!ENTITY findTypeTextCmd.key            "">
 <!ENTITY findTypeLinksCmd.key           "">
 
 <!ENTITY accel.emacs_conflict           "accel">
 
--- a/suite/chrome/mailnews/compose/composeMsgs.properties
+++ b/suite/chrome/mailnews/compose/composeMsgs.properties
@@ -289,19 +289,23 @@ sendMessageCheckLabel=Are you sure you a
 sendMessageCheckSendButtonLabel=Send
 
 ## reply header in composeMsg
 ## <author> wrote:
 mailnews.reply_header_authorwrote=%s wrote
 mailnews.reply_header_ondate=On %s
 
 ## reply header in composeMsg
-## user specified 
+## user specified
 mailnews.reply_header_originalmessage=-------- Original Message --------
 
+## forwarded header in composeMsg
+## user specified
+mailnews.forward_header_originalmessage=-------- Forwarded Message --------
+
 ## Strings used by the rename attachment dialog
 renameAttachmentTitle=Rename Attachment
 renameAttachmentMessage=New attachment name:
 
 ## LOCALIZATION NOTE(smtpEnterPasswordPrompt): Do not translate the
 ## word $S. Place the word $S where the host name should appear.
 smtpEnterPasswordPrompt=Enter your password for %S:
 ## LOCALIZATION NOTE(smtpEnterPasswordPromptWithUsername): Do not translate the
--- a/suite/chrome/mailnews/folderWidgets.properties
+++ b/suite/chrome/mailnews/folderWidgets.properties
@@ -1,7 +1,11 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # LOCALIZATION NOTE(globalInbox)
 # %S=name of the Local folders account
 globalInbox=Global Inbox (%S)
+# LOCALIZATION NOTE(verboseFolderFormat): %1$S is folder name, %2$S is server name
+verboseFolderFormat=%1$S on %2$S
+chooseFolder=Choose Folder…
+noFolders=No available folders
--- a/suite/chrome/mailnews/messenger.properties
+++ b/suite/chrome/mailnews/messenger.properties
@@ -1,461 +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/.
-
-# The following are used by the messenger application
-
-#LOCALIZATION NOTE(statusMessage): Do not translate the words
-# $1S and $2S below. Place the word $1S where account name should appear and $2S
-# where the status message should appear.
-statusMessage=%1$S: %2$S
-
-renameFolder=Rename Folder…
-compactFolder=Compact This Folder
-removeAccount=Delete Account…
-removeFolder=Delete Folder
-newFolderMenuItem=Folder…
-newSubfolderMenuItem=Subfolder…
-newFolder=New Folder…
-newSubfolder=New Subfolder…
-folderProperties=Folder Properties
-getMessages=Get Messages
-getMessagesFor=Get Messages For Account
-# LOCALIZATION NOTE (getNextNewsMessages): Semi-colon list of plural forms.
-# #1 is the number of news messages to get.
-getNextNewsMessages=Get Next #1 News Message;Get Next #1 News Messages
-advanceNextPrompt=Advance to next unread message in %S?
-titleNewsPreHost=on
-titleMailPreHost=for
-replyToSender=Reply to Sender
-reply=Reply
-EMLFiles=Mail Files
-OpenEMLFiles=Open Message
-# LOCALIZATION NOTE(defaultSaveMessageAsFileName): Do not translate ".eml"
-# in the line below. Also, the complete file name should be 8.3.
-defaultSaveMessageAsFileName=message.eml
-SaveMailAs=Save Message As
-SaveAttachment=Save Attachment
-SaveAllAttachments=Save All Attachments
-ChooseFolder=Choose Folder
-LoadingMessageToPrint=Loading message to print…
-MessageLoaded=Message loaded…
-PrintingMessage=Printing message…
-PrintPreviewMessage=Print Previewing message…
-PrintingContact=Printing contact…
-PrintPreviewContact=Print Previewing contact…
-PrintingAddrBook=Printing AddressBook…
-PrintPreviewAddrBook=Print Previewing AddressBook…
-PrintingComplete=Done.
-PreviewTitle=%S - %S
-LoadingMailMsgForPrint=(Loading content for Printing)
-LoadingMailMsgForPrintPreview=(Loading content for Print Preview)
-saveAttachmentFailed=Unable to save the attachment. Please check your file name and try again later.
-saveMessageFailed=Unable to save the message. Please check your file name and try again later.
-fileExists=%S already exists. Do you want to replace it?
-
-downloadingNewsgroups=Downloading Newsgroups for Offline Use
-downloadingMail=Downloading Mail for Offline Use
-sendingUnsent=Sending Unsent Messages
-
-folderExists=A folder with that name already exists. Please enter a different name.
-folderCreationFailed=The folder could not be created because the folder name you specified contains an unrecognized character. Please enter a different name and try again.
-
-compactingFolder=Compacting folder %S…
-doneCompacting=Done compacting
-autoCompactAllFoldersTitle=Compact Folders
-autoCompactAllFolders=Do you wish to compact all local and offline folders to save disk space?
-autoCompactAlwaysAskCheckbox=Always ask me before compacting folders automatically
-compactNowButton=Co&mpact Now
-
-confirmFolderDeletionForFilter=Deleting the folder '%S' will disable its associated filter(s). Are you sure you want to delete the folder?
-alertFilterChanged=Filters associated with this folder will be updated.
-filterDisabled=The folder '%S' could not be found, so filter(s) associated with this folder will be disabled. Verify that the folder exists, and that filters point to a valid destination folder.
-filterFolderDeniedLocked=The messages could not be filtered to folder '%S' because another operation is in progress.
-parsingFolderFailed=Unable to open the folder %S because it is in use by some other operation. Please wait for that operation to finish and then select the folder again. 
-deletingMsgsFailed=Unable to delete messages in folder %S because it is in use by some other operation. Please wait for that operation to finish and then try again.
-alertFilterCheckbox=Do not warn me again.
-compactFolderDeniedLock=The folder '%S' cannot be compacted because another operation is in progress. Please try again later.
-compactFolderWriteFailed=The folder '%S' could not be compacted because writing to folder failed. Verify that you have enough disk space, and that you have write privileges to the file system, then try again.
-filterFolderWriteFailed=The messages could not be filtered to folder '%S' because writing to folder failed. Verify that you have enough disk space, and that you have write privileges to the file system, then try again.
-copyMsgWriteFailed=The messages could not be moved or copied to folder '%S' because writing to folder failed. To gain disk space, from the File menu, first choose Empty Trash, and then choose Compact Folders, and then try again.
-cantMoveMsgWOBodyOffline=While working offline, you cannot move or copy messages that were not downloaded for offline use. From the Mail window, open the File menu, choose Offline, then uncheck Work Offline, and then try again.
-operationFailedFolderBusy=The operation failed because another operation is using the folder. Please wait for that operation to finish and then try again.
-folderRenameFailed=The folder could not be renamed. Perhaps the folder is being reparsed, or the new name is not a valid folder name.
-# LOCALIZATION NOTE(verboseFolderFormat): %1$S is folder name, %2$S is server name
-verboseFolderFormat=%1$S on %2$S
-# LOCALIZATION NOTE(filterFolderTruncateFailed): %1$S is replaced by the folder name, %2$S is replaced by the brandShortName
-filterFolderTruncateFailed=There was an error truncating the Inbox after filtering a message to folder '%1$S'. You may need to shutdown %2$S and delete INBOX.msf.
-
-mailboxTooLarge=The folder %S is full, and can't hold any more messages. To make room for more messages, delete any old or unwanted mail and compact the folder.
-errorGettingDB=Unable to open the summary file for '%S'. Perhaps there was an error on disk, or the full path is too long.
-
-defaultServerTag=(Default)
-
-# Used in message database list view to provide a text value for graphic based cells.
-messageUnread=Unread
-messageHasFlag=Flagged
-messageHasAttachment=Has Attachment
-messageJunk=Junk
-messageExpanded=Expanded
-messageCollapsed=Collapsed
-
-# Used in the SMTP Account Settings panel when a server value has no properties
-smtpServerList-NotSpecified=<not specified>
-smtpServer-ConnectionSecurityType-0=None
-smtpServer-ConnectionSecurityType-1=STARTTLS, if available
-smtpServer-ConnectionSecurityType-2=STARTTLS
-smtpServer-ConnectionSecurityType-3=SSL/TLS
-smtpServer-SecureAuthentication-Type-false=No
-smtpServer-SecureAuthentication-Type-true=Yes
-smtpServers-confirmServerDeletionTitle=Delete Server
-smtpServers-confirmServerDeletion=Are you sure you want to delete the server: \n %S?
-
-# Account Settings - Both Incoming and SMTP server
-authNo=No authentication
-authOld=Clau d'acceso, metodo orichinal (inseguro)
-authPasswordCleartextInsecurely=Clau d'acceso, transmitida de traza insegura
-authPasswordCleartextViaSSL=Clau normal
-authPasswordEncrypted=Clau zifrada
-authKerberos=Kerberos / GSSAPI
-authExternal=TLS Certificate
-authNTLM=NTLM
-authAnySecure=Any secure method (deprecated)
-authAny=Any method (insecure)
-
-# LOCALIZATION NOTE(serverType-nntp): Do not translate "NNTP" in the line below
-serverType-nntp=News Server (NNTP)
-# LOCALIZATION NOTE(serverType-pop3): Do not translate "POP" in the line below
-serverType-pop3=POP Mail Server
-# LOCALIZATION NOTE(serverType-imap): Do not translate "IMAP" in the line below
-serverType-imap=IMAP Mail Server
-serverType-none=Local Mail Store
-# LOCALIZATION NOTE(serverType-movemail): DONT_TRANSLATE
-serverType-movemail=Unix Movemail
-
-sizeColumnTooltip=Click to sort by size
-sizeColumnHeader=Size
-linesColumnTooltip=Click to sort by lines
-linesColumnHeader=Lines
-
-# status feedback stuff
-documentDone=
-documentLoading=Loading Message…
-
-unreadMsgStatus=Unread: %S
-selectedMsgStatus=Selected: %S
-totalMsgStatus=Total: %S
-
-# localized folder names
-
-localFolders=Local Folders
-
-# LOCALIZATION NOTE (inboxFolderName): OK to translate all foldernames, bugzilla #57440 & bugzilla #23625 fixed
-inboxFolderName=Inbox
-trashFolderName=Trash
-sentFolderName=Sent
-draftsFolderName=Drafts
-templatesFolderName=Templates
-outboxFolderName=Outbox
-junkFolderName=Junk
-archivesFolderName=Archives
-
-# "Normal" priority is often blank,
-# depending on the consumers of these strings
-priorityLowest=Lowest
-priorityLow=Low
-priorityNormal=Normal
-priorityHigh=High
-priorityHighest=Highest
-
-#Group by date thread pane titles
-today=Today
-yesterday=Yesterday
-lastWeek=Last Week
-twoWeeksAgo=Two Weeks Ago
-older=Old Mail
-
-#Grouped By Tags
-untaggedMessages=Untagged Messages
-
-# Grouped by status
-messagesWithNoStatus=No Status
-
-#Grouped by priority
-noPriority=No Priority
-
-#Grouped by has attachments
-noAttachments=No Attachments
-attachments=Attachments
-
-#Grouped by flagged
-notFlagged=Not Flagged
-groupFlagged=Flagged
-
-# defaults descriptions for tag prefs listed in mailnews.js
-# (we keep the .labels. names for backwards compatibility)
-mailnews.tags.remove=Remove All Tags
-mailnews.labels.description.1=Important
-mailnews.labels.description.2=Work
-mailnews.labels.description.3=Personal
-mailnews.labels.description.4=To Do
-mailnews.labels.description.5=Later
-
-# Format definition tag menu texts.
-# This is necessary in order to get the accesskeys to be the on the first
-# character of the menu text instead of after the menu text.
-# If a key definition exists for the tag at index n, that key's key will be
-# taken as the accesskey, eg.
-#   <key id="key_tag3" key="&tagCmd3.key;" oncommand="ToggleMessageTagKey(3);"/>
-# makes the third tag have the accesskey &tagCmd3.key;.
-# In the menuitem's label, this accesskey appears at %1$S below; %2$S will be
-# replaced by the tag label.
-mailnews.tags.format=%1$S %2$S
-
-replied=Replied
-forwarded=Forwarded
-new=New
-read=Read
-flagged=Flagged
-
-# for junk status picker in search and mail views
-junk=Junk
-
-# for junk score origin picker in search and mail views
-junkScoreOriginPlugin=Plugin
-junkScoreOriginFilter=Filter
-junkScoreOriginWhitelist=Whitelist
-junkScoreOriginUser=User
-junkScoreOriginImapFlag=IMAP Flag
-
-# for the has attachment picker in search and mail views
-hasAttachments=Has Attachments
-
-# for the Tag picker in search and mail views.
-tag=Tag
-
-# mailnews.js
-mailnews.send_default_charset=ISO-8859-1
-mailnews.view_default_charset=ISO-8859-1
-
-# generate display names in last first order
-# valid mail.addr_book.displayName.lastnamefirst are: true or false
-mail.addr_book.displayName.lastnamefirst=false
-
-# the format for "mail.addr_book.quicksearchquery.format" is:
-# @V == the escaped value typed in the quick search bar in the addressbook
-#
-# note, changing this might require a change to SearchNameOrEmail.label
-# in messenger.dtd
-#
-# LOCALIZATION NOTE - please add phonetic names as below when "mail.addr_book.show_phonetic_fields" is true
-# "?(or(PrimaryEmail,c,@V)(DisplayName,c,@V)(FirstName,c,@V)(LastName,c,@V)(PhoneticFirstName,c,@V)(PhoneticLastName,c,@V))"
-#
-mail.addr_book.quicksearchquery.format=?(or(PrimaryEmail,c,@V)(DisplayName,c,@V)(FirstName,c,@V)(LastName,c,@V))
-
-# valid mail.addr_book.show_phonetic_fields are: true or false
-mail.addr_book.show_phonetic_fields=false
-
-# valid format options are:
-# 1: yyyy/mm/dd
-# 2: yyyy/dd/mm
-# 3: mm/dd/yyyy
-# 4: mm/yyyy/dd
-# 5: dd/mm/yyyy
-# 6: dd/yyyy/mm
-#
-# 0: auto-detect the current locale format
-#    a separator has to be either '/', '-', '.' and the year in Chistian year
-#    otherwise mm/dd/yyyy (option 3) is used
-#
-mailnews.search_date_format=0
-# separator for search date (e.g. "/", "-"), or empty when search_date_format is zero
-mailnews.search_date_separator=
-# leading zeros for day and month values, not used if mailnews.search_date_format is not zero
-mailnews.search_date_leading_zeros=true
-
-# offline msg 
-nocachedbodybody=The body of this message has not been downloaded from the server for reading offline. To read this message, you must reconnect to the network, choose Offline from the File menu and then uncheck Work Offline.In the future, you can select which messages or folders to read offline. To do this, choose Offline from the file menu and then select Synchronize. You can adjust the Disk Space preference to prevent the downloading of large messages.
-
-# accountCentral
-mailnews.account_central_page.url=chrome://messenger/content/msgAccountCentral.xul
-# LOCALIZATION NOTE(acctCentralTitleFormat): %1$S is brand, %2$S is account type, %3$S is account name
-acctCentralTitleFormat=%1$S %2$S - %3$S
-mailAcctType=Mail
-newsAcctType=News
-feedsAcctType=Feeds
-
-# LOCALIZATION NOTE(nocachedbodytitle): Do not translate "<TITLE>" or "</TITLE>" in the line below
-nocachedbodytitle=<TITLE>Go Online to View This Message</TITLE>\n
-
-# mailWindowOverlay.js
-confirmUnsubscribeTitle=Confirm Unsubscribe
-confirmUnsubscribeText=Are you sure you want to unsubscribe from %S?
-
-# msgHdrViewOverlay.js
-deleteAttachments=The following attachments will be permanently deleted from this message:\n%S\nThis action cannot be undone. Do you wish to continue?
-detachAttachments=The following attachments have been successfully saved and will now be permanently deleted from this message:\n%S\nThis action cannot be undone. Do you wish to continue?
-deleteAttachmentFailure=Failed to delete the selected attachments.
-
-# This is the format for prepending accesskeys to the
-# each of the attachments in the file|attachments menu:
-#   ie: 1 file.txt
-#       2 another file.txt
-attachmentDisplayNameFormat=%S %S
-
-# This is the heading for the attachment summary when printing an email
-attachmentsPrintHeader=Attachments:
-
-# Connection Error Messages
-101=Unknown Error 
-102=Failed to connect to server %S.
-103=Could not connect to server %S; the connection was refused.
-104=Connection to server %S timed out.
-
-# LOCALIZATION NOTE(biffNotification): %1$S is the number of new messages  
-biffNotification_message=has %1$S new message
-biffNotification_messages=has %1$S new messages
-
-# LOCALIZATION NOTE(macBiffNotification is Mac only):
-#  %1$S is the number of new messages
-#  %2$S is a list of names and/or email addresses separated by biffNotification_separator
-#  %3$S is the number of new messages not displayed in the biff alert
-macBiffNotification_message=%1$S new message from %2$S.
-macBiffNotification_messages=%1$S new messages from %2$S.
-macBiffNotification_messages_extra=%1$S new messages from %2$S and %3$S more.
-# Used to separate names/email addresses in a list.  Note the trailing space ', '
-macBiffNotification_separator=, 
-
-# LOCALIZATION NOTE(newMailNotification_message): %1$S is the name of the account %2$S is the number of new messages  
-newMailNotification_message=%1$S received %2$S new message
-
-# LOCALIZATION NOTE(newMailNotification_messages): %1$S is the name of the account %2$S is the number of new messages  
-newMailNotification_messages=%1$S received %2$S new messages
-
-# For the Quota tab in the mail folder properties dialog
-quotaUsedFree=%S of %S KB used
-quotaPercentUsed=%S%% full
-
-# for message views
-confirmViewDeleteTitle=Confirm
-confirmViewDeleteMessage=Are you sure you want to delete this view?
-
-# for virtual folders
-confirmSavedSearchDeleteTitle=Delete Saved Search
-confirmSavedSearchDeleteMessage=Are you sure you want to delete this saved search?
-confirmSavedSearchDeleteButton=&Delete Saved Search
-
-## @name ENTER_PASSWORD_PROMPT
-## @loc None
-# LOCALIZATION NOTE (passwordPrompt): Do not translate the word %S below.
-# Place the word "%S" in your translation where the email address
-# or the username should appear
-passwordPrompt=Enter your password for %1$S on %2$S:
-
-## @name ENTER_PASSWORD_PROMPT_TITLE
-## @loc None
-passwordTitle=Mail Server Password Required
-
-# for checking if the user really wants to open lots of messages in separate windows.
-openWindowWarningTitle=Confirm
-# LOCALIZATION NOTE (openWindowWarningConfirmation): Semi-colon list of plural forms.
-# #1 is the number of messages the user is attempting to open.
-openWindowWarningConfirmation=Opening #1 message may be slow.  Continue?;Opening #1 messages may be slow.  Continue?
-
-# for warning the user that a tag he's trying to create already exists
-tagExists=A tag with that name already exists!
-
-# for checking if the user really wants to delete the adaptive filter training set
-confirmResetJunkTrainingTitle=Confirm
-confirmResetJunkTrainingText=Are you sure you want to reset the adaptive filter training data?
-
-# for the virtual folder list dialog title
-# %S is the name of the saved search folder
-editVirtualFolderPropertiesTitle=Edit Saved Search Properties for %S
-
-#alert to inform the user to choose one or more folders to search for a saved search folder
-alertNoSearchFoldersSelected=You must choose at least one folder to search for the saved search folder.
-
-# These are displayed in the message and folder pane windows
-# LOCALIZATION NOTE %.*f is the abbreviated size in the appropriate units
-byteAbbreviation2=%.*f bytes
-kiloByteAbbreviation2=%.*f KB
-megaByteAbbreviation2=%.*f MB
-gigaByteAbbreviation2=%.*f GB
-
-# Error message if message for a message id wasn't found
-errorOpenMessageForMessageIdTitle=Error opening message-id
-errorOpenMessageForMessageIdMessage=Message for message-id %S not found
-
-# Warnings to alert users about phishing urls
-confirmPhishingTitle=Email Scam Alert
-#LOCALIZATION NOTE %1$S is the brand name, %2$S is the host name of the url being visited
-confirmPhishingUrl1=%1$S thinks this website is suspicious! It may be trying to impersonate the web page you want to visit. Most legitimate websites use names instead of numbers. Are you sure you want to visit %2$S?
-confirmPhishingUrl2=%1$S thinks this website is suspicious! It may be trying to impersonate the web page you want to visit. Are you sure you want to visit %2$S?
-
-#LOCALIZATION NOTE %1$S is the e-mail address of the person we will allow remote content for
-alwaysLoadRemoteContentForSender=Click here to always load remote content from %1$S.
-
-#LOCALIZATION NOTE(mdnBarMessageNormal) %1$S is the name of the sender
-mdnBarMessageNormal=%1$S has asked to be notified when you read this message.
-#LOCALIZATION NOTE(mdnBarMessageAddressDiffers) %1$S is the name of the sender, %2$S is the address(es) to send return receipt to
-mdnBarMessageAddressDiffers=%1$S has asked to be notified at %2$S when you read this message.
-
-# mailCommands.js
-emptyJunkTitle=Confirm
-emptyJunkMessage=Are you sure you want to permanently delete all messages and subfolders in the Junk folder?
-emptyJunkDontAsk=Don't ask me again.
-emptyTrashTitle=Confirm
-emptyTrashMessage=Are you sure you want to permanently delete all messages and subfolders in the Trash folder?
-emptyTrashDontAsk=Don't ask me again.
-
-# junkCommands.js
-junkAnalysisPercentComplete=Junk analysis %S complete
-processingJunkMessages=Processing Junk Messages
-
-# tabmail: warning when closing multiple tabs (as in browser)
-tabs.closeWarningTitle=Confirm close
-tabs.closeWarning=This messenger window has %S tabs open. Do you want to close it and all its tabs?
-tabs.closeButton=Close all tabs
-tabs.closeWarningPromptMe=Warn me when closing multiple messenger tabs.
-
-# Messenger bootstrapping messages
-fileNotFoundTitle = File Not Found
-#LOCALIZATION NOTE(fileNotFoundMsg): %S is the filename
-fileNotFoundMsg = The file %S does not exist.
-
-confirmMsgDelete.title=Confirm Deletion
-confirmMsgDelete.collapsed.desc=This will delete messages in collapsed threads. Are you sure you want to continue?
-confirmMsgDelete.deleteNoTrash.desc=This will delete messages immediately, without saving a copy to Trash. Are you sure you want to continue?
-confirmMsgDelete.dontAsk.label=Don't ask me again.
-confirmMsgDelete.delete.label=Delete
-
-mailServerLoginFailedTitle=Login Failed
-# LOCALIZATION NOTE (mailServerLoginFailedTitle): Insert "%S" in your
-# translation where you wish to display the hostname of the server to which
-# login failed.
-mailServerLoginFailed=Login to server %S failed.
-mailServerLoginFailedRetryButton=&Retry
-mailServerLoginFailedEnterNewPasswordButton=&Enter New Password
-
-# LOCALIZATION NOTE (junkBarMessage): %S is the brandname
-junkBarMessage=%S regards this message as junk.
-junkBarButton=Not Junk
-junkBarButtonKey=N
-junkBarInfoButton=?
-junkBarInfoButtonKey=?
-# LOCALIZATION NOTE (remoteContentBarMessage): %S is the brandname
-remoteContentBarMessage=To protect your privacy, %S has blocked remote content in this message.
-remoteContentBarButton=Show Remote Content
-remoteContentBarButtonKey=S
-# LOCALIZATION NOTE (phishingBarMessage): %S is the brandname
-phishingBarMessage=%S regards this message as an e-mail scam.
-phishingBarIgnoreButton=Ignore Warning
-phishingBarIgnoreButtonKey=I
-mdnBarMessage=The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?
-mdnBarIgnoreButton=Ignore Request
-mdnBarIgnoreButtonKey=I
-mdnBarSendReqButton=Send Receipt
-mdnBarSendReqButtonKey=S
-draftMessageMsg=This is a draft message
-draftMessageButton=Edit...
-draftMessageButtonKey=E
--- a/suite/chrome/mailnews/threadpane.dtd
+++ b/suite/chrome/mailnews/threadpane.dtd
@@ -18,28 +18,28 @@
 <!ENTITY totalColumn.label "Total in Thread">
 <!ENTITY readColumn.label "Read">
 <!ENTITY receivedColumn.label "Received">
 <!ENTITY flagColumn.label "Flag">
 <!ENTITY locationColumn.label "Location">
 <!ENTITY idColumn.label "Order Received">
 <!--Tooltips-->
 
-<!ENTITY columnChooser.tooltip "Click to select columns to display">
-<!ENTITY threadColumn.tooltip "Click to display message threads"> 
-<!ENTITY fromColumn.tooltip "Click to sort by from">
-<!ENTITY recipientColumn.tooltip "Click to sort by recipient">
-<!ENTITY attachmentColumn.tooltip "Click to sort by attachments">
-<!ENTITY subjectColumn.tooltip "Click to sort by subject">
-<!ENTITY dateColumn.tooltip "Click to sort by date">
-<!ENTITY priorityColumn.tooltip "Click to sort by priority">
-<!ENTITY tagsColumn.tooltip "Click to sort by tags">
-<!ENTITY accountColumn.tooltip "Click to sort by account">
-<!ENTITY statusColumn.tooltip "Click to sort by status">
-<!ENTITY sizeColumn.tooltip "Click to sort by size">
-<!ENTITY junkStatusColumn.tooltip "Click to sort by junk status">
-<!ENTITY unreadColumn.tooltip "Number of unread messages in thread">
-<!ENTITY totalColumn.tooltip "Total number of messages in thread">
-<!ENTITY readColumn.tooltip "Click to sort by read">
-<!ENTITY receivedColumn.tooltip "Click to sort by date received">
-<!ENTITY flagColumn.tooltip "Click to sort by flag">
-<!ENTITY locationColumn.tooltip "Click to sort by location">
-<!ENTITY idColumn.tooltip "Click to sort by order received">
+<!ENTITY columnChooser2.tooltip "Select columns to display">
+<!ENTITY threadColumn2.tooltip "Display message threads">
+<!ENTITY fromColumn2.tooltip "Sort by from">
+<!ENTITY recipientColumn2.tooltip "Sort by recipient">
+<!ENTITY attachmentColumn2.tooltip "Sort by attachments">
+<!ENTITY subjectColumn2.tooltip "Sort by subject">
+<!ENTITY dateColumn2.tooltip "Sort by date">
+<!ENTITY priorityColumn2.tooltip "Sort by priority">
+<!ENTITY tagsColumn2.tooltip "Sort by tags">
+<!ENTITY accountColumn2.tooltip "Sort by account">
+<!ENTITY statusColumn2.tooltip "Sort by status">
+<!ENTITY sizeColumn2.tooltip "Sort by size">
+<!ENTITY junkStatusColumn2.tooltip "Sort by junk status">
+<!ENTITY unreadColumn2.tooltip "Number of unread messages in thread">
+<!ENTITY totalColumn2.tooltip "Total number of messages in thread">
+<!ENTITY readColumn2.tooltip "Sort by read">
+<!ENTITY receivedColumn2.tooltip "Sort by date received">
+<!ENTITY flagColumn2.tooltip "Sort by flag">
+<!ENTITY locationColumn2.tooltip "Sort by location">
+<!ENTITY idColumn2.tooltip "Sort by order received">
--- a/toolkit/chrome/global/aboutTelemetry.dtd
+++ b/toolkit/chrome/global/aboutTelemetry.dtd
@@ -7,31 +7,33 @@
 <!ENTITY aboutTelemetry.telemetryEnabled "  A telemetría ye <span>activada</span>.">
 
 <!ENTITY aboutTelemetry.telemetryDisabled "  A telemetría ye <span>desactivada</span>.">
 
 <!ENTITY aboutTelemetry.slowSqlSection "  Consultas SQL lentas">
 
 <!ENTITY aboutTelemetry.chromeHangsSection "  Penchadas d'o navegador">
 
+<!ENTITY aboutTelemetry.threadHangStatsSection "  Penchadas de filos">
+
 <!ENTITY aboutTelemetry.histogramsSection "  Histogramas">
 
 <!ENTITY aboutTelemetry.simpleMeasurementsSection "  Midas simples">
 
 <!ENTITY aboutTelemetry.addonDetailsSection "  Detalles d'o complemento">
 
 <!ENTITY aboutTelemetry.lateWritesSection "  Escrituras rezagadas">
 
 <!ENTITY aboutTelemetry.systemInfoSection "  Información d'o sistema">
 
 <!ENTITY aboutTelemetry.addonHistogramsSection "  Histogramas replegaus por complementos">
 
-<!ENTITY aboutTelemetry.toggleOn "  Punchar ta desplegar a sección">
-
-<!ENTITY aboutTelemetry.toggleOff "  Punchar ta plegar a sección">
+<!ENTITY aboutTelemetry.toggle "  Faiga clic ta desenrollar/reducir a sección">
 
 <!ENTITY aboutTelemetry.emptySection "  (No s'ha replegau garra dato)">
 
 <!ENTITY aboutTelemetry.fullSqlWarning "  AVISO: A depuración de consultas SQL lentas ye activada. Talment as cadenas SQL completas se amuestren abaixo, pero no se ninviarán ta Telemetría.">
 
 <!ENTITY aboutTelemetry.fetchSymbols "  Recullir os nombres d'as funcions d'as pilas que se penchen">
 
 <!ENTITY aboutTelemetry.hideSymbols "  Amostrar os datos zanceros d'as penchadas">
+
+<!ENTITY aboutTelemetry.filterText "  Filtrar (cadenas u /regexp/)">
new file mode 100644
--- /dev/null
+++ b/toolkit/chrome/global/charsetMenu.dtd
@@ -0,0 +1,22 @@
+<!-- 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 caracters">
+<!ENTITY charsetMenu.accesskey         "C">
+<!-- The strings below are unused on m-c. They will be removed post-Australis -->
+
+
+<!ENTITY charsetMenuAutodet.label      "Autodetectar">
+<!-- A reserved for Arabic -->
+<!ENTITY charsetMenuAutodet.accesskey  "A">
+
+<!ENTITY charsetMenuAutodet.off.label     "(desactivau)">
+<!ENTITY charsetMenuAutodet.off.accesskey "d">
+<!ENTITY charsetMenuAutodet.ja.label      "Chaponés">
+<!ENTITY charsetMenuAutodet.ja.accesskey  "C">
+<!ENTITY charsetMenuAutodet.ru.label      "Ruso">
+<!ENTITY charsetMenuAutodet.ru.accesskey  "R">
+<!ENTITY charsetMenuAutodet.uk.label      "Ucrainiano">
+<!ENTITY charsetMenuAutodet.uk.accesskey  "U">
+
new file mode 100644
--- /dev/null
+++ b/toolkit/chrome/global/charsetMenu.properties
@@ -0,0 +1,126 @@
+# 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.
+#
+# For gbk, gbk.bis and gbk.bis.key are used to trigger string changes in
+# localizations.
+# 
+# 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.)
+
+# Auto-Detect (sub)menu
+charsetMenuCharsets = Codificación de caracters
+charsetMenuAutodet = Autodetectar
+# 'A' is reserved for Arabic:
+charsetMenuAutodet.key = D
+charsetMenuAutodet.off = (desactivau)
+charsetMenuAutodet.off.key = d
+charsetMenuAutodet.ja = Chaponés
+charsetMenuAutodet.ja.key = C
+charsetMenuAutodet.ru = Ruso
+charsetMenuAutodet.ru.key = R
+charsetMenuAutodet.uk = Ucrainiano
+charsetMenuAutodet.uk.key = U
+
+# Globally-relevant
+UTF-8.key        = U
+UTF-8            = Unicode
+windows-1252.key = O
+windows-1252     = Occidental
+
+# Arabic
+windows-1256.key = A
+windows-1256     = Arabe (Windows)
+ISO-8859-6       = Arabe (ISO)
+
+# Baltic
+windows-1257.key = B
+windows-1257     = Baltico (Windows)
+ISO-8859-4       = Baltico (ISO)
+
+# Central European
+windows-1250.key =         E
+windows-1250     = Centroeuropeu (Windows)
+ISO-8859-2.key   =       I
+ISO-8859-2       = Centroeuropeu (ISO)
+
+# Chinese, Simplified
+# LOCALIZATION NOTE (gbk.bis.key):
+# gbk.bis.key never appears together with gbk.key and, hence, can be the same.
+gbk.bis.key      =          S
+gbk.bis          = Chinés, simplificau
+# The strings gbk.key, gbk and gb18030 are no longer used but are retained
+# in order to enable backout after string freeze, just in case.
+gbk.key          =          S
+gbk              = Chinés, simplificau (GBK)
+gb18030          = Chinés, simplificau (GB18030)
+
+# Chinese, Traditional
+Big5.key         =          T
+Big5             = Chinés, tradicional
+
+# Cyrillic
+windows-1251.key = C
+windows-1251     = Cirilico (Windows)
+ISO-8859-5       = Cirilico (ISO)
+KOI8-R           = Cirilico (KOI8-R)
+KOI8-U           = Cirilico (KOI8-U)
+IBM866           = Cirilico (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     = Hebreu
+# LOCALIZATION NOTE (ISO-8859-8): The value for this item should begin with
+# the same word for Hebrew as the value for windows-1255 so that this item 
+# sorts right after that one in the collation order for your locale.
+ISO-8859-8       = Hebreu, visual
+
+# Japanese
+Shift_JIS.key    = C
+Shift_JIS        = Chaponés (Shift_JIS)
+EUC-JP.key       =   p
+EUC-JP           = Chaponés (EUC-JP)
+ISO-2022-JP.key  =     n
+ISO-2022-JP      = Chaponés (ISO-2022-JP)
+
+# Korean
+EUC-KR.key       = K
+EUC-KR           = Coreano
+
+# Thai
+windows-874.key  =    i
+windows-874      = Tai
+
+# Turkish
+windows-1254.key =   r
+windows-1254     = Turco
+
+# Vietnamese
+windows-1258.key = V
+windows-1258     = Vietnamés
+
--- a/toolkit/chrome/global/devtools/styleinspector.properties
+++ b/toolkit/chrome/global/devtools/styleinspector.properties
@@ -69,16 +69,32 @@ ruleView.contextmenu.selectAll.accessKey
 # 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 (ruleView.contextmenu.showOrigSources): Text displayed in the rule view
+# context menu.
+ruleView.contextmenu.showOrigSources=Amostrar as fuents orichinals
+
+# LOCALIZATION NOTE (ruleView.contextmenu.showOrigSources.accessKey): Access key for
+# the rule view context menu "Show original sources" entry.
+ruleView.contextmenu.showOrigSources.accessKey=M
+
+# LOCALIZATION NOTE (ruleView.contextmenu.showCSSSources): Text displayed in the rule view
+# context menu.
+ruleView.contextmenu.showCSSSources=Amostrar as fuents CSS
+
+# LOCALIZATION NOTE (ruleView.contextmenu.showCSSSources.accessKey): Access key for
+# the rule view context menu "Show CSS sources" entry.
+ruleView.contextmenu.showCSSSources.accessKey=A
+
 # LOCALIZATION NOTE (computedView.contextmenu.selectAll): Text displayed in the
 # computed view context menu.
 computedView.contextmenu.selectAll=Seleccionar tot
 
 # LOCALIZATION NOTE (computedView.contextmenu.selectAll.accessKey): Access key for
 # the computed view context menu "Select all" entry.
 computedView.contextmenu.selectAll.accessKey=T
 
--- a/webapprt/webapprt/overrides/appstrings.properties
+++ b/webapprt/webapprt/overrides/appstrings.properties
@@ -6,13 +6,13 @@ netReset=A connexión a o servidor s'ha reiniciau entre que se cargaba l'aplicación.
 redirectLoop=Un servidor ye reendrezando una solicitut de traza que nunca no se completará.
 confirmRepostPrompt=Ta continar, l'aplicación ha de ninviar información que repetirá una acción (como una busca u una confirmación de pediu) que ya s'executó previament.
 unknownSocketType=Ista aplicación no sabe cómo comunicar-se con o servidor.
 notCached=L'aplicación ha demandau un documento que ya no ye disponible.
 netOffline=L'aplicación ye actualment en modo sin connexión y no puede accedir ta o ret.
 deniedPortAccess=L'aplicación ha mirau d'accedir ta un puerto de ret a o que no habría de tener acceso. L'aplicación ha cancelau a solicitut ta preotegerle.
 proxyResolveFailure=L'aplicación ye configurada ta usar un servidor proxy que no se puede trobar.
 proxyConnectFailure=L'aplicación ye configurada ta usar un servidor proxy que ye refusando as connexions.
-contentEncodingError=L'aplicación ha recibiu una respuesta d'un servidor que ha feito servir una forma de compresión no valida u no admitida.
+contentEncodingError=L'aplicación ha recebiu una respuesta dende un servidor que feba servir una forma de compresión invalida u no suportada.
 unsafeContentType=L'aplicación no puede continar porque ha accediu a un tipo de fichero que puede no estar seguro ubrir. Contacte con os autors de l'aplicación ta informar-les d'iste problema.
 cspFrameAncestorBlocked=Ista aplicación ha mirau d'accedir ta un recurso que tiene una politica de seguranza de conteniu que le impide estar incrustado d'ista forma.
 corruptedContentError=L'aplicación no puede continar cargando-se porque s'ha detectau una error en a transmisión de datos.
 remoteXUL=Ista aplicación ha mirau d'usar una tecnolochía no admitida que ya no ye disponible.
--- a/webapprt/webapprt/overrides/dom.properties
+++ b/webapprt/webapprt/overrides/dom.properties
@@ -36,34 +36,34 @@ FormValidationPatternMismatchWithTitle=S
 # LOCALIZATION NOTE (FormValidationRangeOverflow): %S can be a number, a date or a time.
 FormValidationRangeOverflow=Seleccione una valura que sía menor que %S.
 # LOCALIZATION NOTE (FormValidationRangeUnderflow): %S can be a number, a date or a time.
 FormValidationRangeUnderflow=Seleccione una valura que sía mayor que %S.
 # LOCALIZATION NOTE (FormValidationStepMismatch): both %S can be a number, a date or a time.
 FormValidationStepMismatch=Seleccione una valura valida. As dos valuras validas mas amanadas son %S y %S.
 # LOCALIZATION NOTE (FormValidationStepMismatchOneValue): %S can be a number, a date or a time. This is called instead of FormValidationStepMismatch when the second value is the same as the first.
 FormValidationStepMismatchOneValue=Seleccione una valura valida. A valura valida mas amanada ye %S.
+FormValidationBadInputNumber=Introduzca un numero
 GetAttributeNodeWarning=L'uso de getAttributeNode() ye obsoleto. Faiga servir en cuenta getAttribute().
 SetAttributeNodeWarning=L'uso de setAttributeNode() ye obsoleto. Faiga servir en cuenta setAttribute().
 GetAttributeNodeNSWarning=L'uso de getAttributeNodeNS() ye obsoleto. Faiga servir en cuenta getAttributeNS().
 SetAttributeNodeNSWarning=L'uso de setAttributeNodeNS() ye obsoleto. Faiga servir en cuenta setAttributeNS().
 RemoveAttributeNodeWarning=L'uso de removeAttributeNode() ye obsoleto. Faiga servir en cuenta removeAttribute().
 CreateAttributeWarning=L'uso de document.createAttribute() ye obsoleto. Faiga servir en cuenta element.setAttribute().
 CreateAttributeNSWarning=L'uso de document.createAttributeNS() ye obsoleto. Faiga servir en cuenta element.setAttributeNS().
 SpecifiedWarning=L'uso de l'atributo especificau en atributos ye obsoleto. Siempre torna verdadero.
-OwnerElementWarning=L'uso d'ownerElement en atributos ye obsoleto.
 NodeValueWarning=L'uso de nodeValue en atributos ye obsoleto. Faiga servir en cuenta value.
 TextContentWarning=L'uso de textContext en atributos ye obsoleto. Faiga servir en cuenta value.
-EnablePrivilegeWarning=L'uso d'enablePrivilege ye obsoleto. Faiga servir en cuenta codigo que s'execute con o prencipal d'o sistema (p.eix. una extensión).
-nsIJSONDecodeDeprecatedWarning=nsIJSON.decode ye obsoleto. Faiga servir en cuenta JSON.
+EnablePrivilegeWarning=L'uso de enablePrivilege ye obsoleto. Faiga servir en cuenta un codigo que pueda correr con o sistema prencipal (e.g. una extensión).
+nsIJSONDecodeDeprecatedWarning=nsIJSON.decode ye obsoleto. Faiga servir en cuenta JSON.parse.
 nsIJSONEncodeDeprecatedWarning=nsIJSON.encode ye obsoleto. Faiga servir en cuenta JSON.stringify.
 nsIDOMWindowInternalWarning=L'uso de nsIDOMWindowInternal ye obsoleto. Faiga servir en cuenta nsIDOMWindow.
 InputEncodingWarning=L'uso d'inputEncoding ye obsoleto.
 # LOCALIZATION NOTE: Do not translate "MozBeforePaint" and "mozRequestAnimationFrame"
-MozBeforePaintWarning=Os eventos MozBeforePaint ya no s'admiten. Ha de pasar-se un argumento no nulo de "callback" a mozRequestAnimationFrame.
+MozBeforePaintWarning=Os eventos MozBeforePaint ya no s'admeten. S'ha de pasar un argumento no nulo de "callback" ta mozRequestAnimationFrame.
 FullScreenDeniedBlocked=A solicitut de pantalla completa s'ha denegau porque iste dominio tiene blocau l'acceso a la pantalla completa por l'usuario.
 FullScreenDeniedDisabled=A solicitut de pantalla completa s'ha denegau porque l'API de pantalla completa ye desactivada en as preferencias d'usuario.
 FullScreenDeniedFocusedPlugin=A solicitut de pantalla completa s'ha denegau porque o foco ye en un plugin con finestra.
 FullScreenDeniedHidden=A solicitut de pantalla completa s'ha denegau porque o documento ya no ye visible.
 FullScreenDeniedIframeNotAllowed=A solicitut de pantalla completa s'ha denegau porque a lo menos un d'os iframes contenius en o documento no tiene un atributo "allowfullscreen".
 FullScreenDeniedNotInputDriven=A solicitut de pantalla completa s'ha denegau porque Element.mozRequestFullScreen() no ha estau clamada dende dentro d'un maniador d'eventos chenerau por l'usuario d'execución breu.
 FullScreenDeniedNotInDocument=A solicitut de pantalla completa s'ha denegau porque l'elemento que la demandaba ya no ye en o documento.
 FullScreenDeniedMovedDocument=A solicitut de pantalla completa s'ha denegau porque l'elemento que la solicitaba ha moviu o documento.
@@ -106,17 +106,17 @@ MediaLoadUnsupportedMimeType=O "Content-
 MediaLoadDecodeError=O recurso multimedia %S no se puede decodificar.
 # LOCALIZATION NOTE: Do not translate "DOMException", "code" and "name"
 DOMExceptionCodeWarning=L'uso de l'atributo code de DOMException ye obsoleto. Faiga servir en cuenta name.
 # LOCALIZATION NOTE: Do not translate "__exposedProps__"
 NoExposedPropsWarning=Exposar obchectos JS chrome a o conteniu sin __exposedProps__ ye inseguro y obsoleto. Mire-se http://developer.mozilla.org/en/xpconnect_wrappers ta mas información.
 # LOCALIZATION NOTE: Do not translate "Mutation Event" and "MutationObserver"
 MutationEventWarning=L'uso d'eventos Mutation ye obsoleto. Faiga servir en cuenta MutationObserver.
 # LOCALIZATION NOTE: Do not translate "Blob", "mozSlice", or "slice"
-MozSliceWarning=L'uso de mozSlice en l'obchecto Blob ye obsoleto. Faiga servir en cuenta slice.
+MozSliceWarning=L'uso de mozSlice en l'obchecto Blob ye obsoleto. Faiga servir en cuenta "slice".
 # LOCALIZATION NOTE: Do not translate "Components"
 ComponentsWarning=L'obchecto Components ye obsoleto. Será eliminau luego.
 PluginHangUITitle=Aviso: plugin sin respuesta
 PluginHangUIMessage=%S puede estar ocupau u talment haiga deixau de responder. Puede aturar o plugin agora u puede continar ta veyer si o plugin acaba o suyo quefer.
 PluginHangUIWaitButton=Continar
 PluginHangUIStopButton=Aturar plugin
 # LOCALIZATION NOTE: Do not translate "mozHidden", "mozVisibilityState", "hidden", or "visibilityState"
 PrefixedVisibilityApiWarning='mozHidden' y 'mozVisibilityState' son obsoletos. Faiga servir en cuenta as versions sin prefixo 'hidden' y 'visibilityState'.
@@ -124,25 +124,23 @@ PrefixedVisibilityApiWarning='mozHidden'
 NodeIteratorDetachWarning=Invocar detach() en un NodeIterator ya no tiene garra efecto.
 # LOCALIZATION NOTE: Do not translate "Mozilla Audio Data API" and "Web Audio API".
 MozAudioDataWarning=L'API Mozilla Audio Data ye obsoleta. Faiga servir en cuenta l'API Web Audio.
 # LOCALIZATION NOTE: Do not translate "LenientThis" and "this"
 LenientThisWarning=S'ignora a recuperación (get) u asignación (set) d'una propiedat que tien [LenientThis] porque l'obchecto "this" ye incorrecto.
 # LOCALIZATION NOTE: Do not translate "nsIDOMWindowUtils", "getWindowWithOuterId", or "nsIWindowMediator"
 GetWindowWithOuterIdWarning=L'uso de nsIDOMWindowUtils.getOuterWindowWithId() ye obsoleto. Faiga servir en cuenta o metodo d'o mesmo nombre de nsIWindowMediator.
 # LOCALIZATION NOTE: Do not translate "getPreventDefault" or "defaultPrevented".
-GetPreventDefaultWarning=L'uso de getPreventDefault() ye obsoleto.  Faiga servir en cuenta defaultPrevented.
+GetPreventDefaultWarning=L'uso de getPreventDefault() ye obsoleto. Faiga servir en cuenta defaultPrevented.
 # LOCALIZATION NOTE: Do not translate "getUserData", "setUserData", "WeakMap", or "element.dataset".
-GetSetUserDataWarning=L'uso de getUserData() u setUserData() ye obsoleto.  Faiga servir en cuenta WeakMap u element.dataset.
+GetSetUserDataWarning=L'uso de getUserData() u setUserData() ye obsoleto. Faiga servir en cuenta WeakMap u element.dataset.
 # LOCALIZATION NOTE: Do not translate "mozGetAsFile" or "toBlob"
-MozGetAsFileWarning=O metodo no estandar mozGetAsFile ye obsoleto y luego será eliminau.  Faiga servir en cuenta o metodo estandar toBlob.
+MozGetAsFileWarning=O metodo no-standard mozGetAsFile ye obsoleto y luego se sacará. Faiga servir en cuenta o metodo estandard toBlob.
 # LOCALIZATION NOTE: Do not translate "captureEvents()" or "addEventListener()"
-UseOfCaptureEventsWarning=L'uso de captureEvents() ye obsoleto. Ta esviellar o suyo codigo, faiga servir o metodo addEventListener() de DOM2. Ta mas información visite  http://developer.mozilla.org/en/docs/dom:element.addEventListener
+UseOfCaptureEventsWarning=L'uso de captureEvents() ye obsoleto. Ta esviellar o suyo codigo, faiga servir o metodo addEventListener() de DOM2. Ta mas información visite http://developer.mozilla.org/en/docs/DOM:element.addEventListener
 # LOCALIZATION NOTE: Do not translate "releaseEvents()" or "removeEventListener()"
-UseOfReleaseEventsWarning=L'uso de releaseEvents() ye obsoleto. Ta esviellar o suyo codigo, faiga servir o metodo removeEventListener() de DOM2. Ta mas información visite  http://developer.mozilla.org/en/docs/dom:element.removeEventListener
+UseOfReleaseEventsWarning=L'uso de releaseEvents() ye obsoleto. Ta esviellar o suyo codigo, faiga servir o metodo removeEventListener() de DOM2. Ta mas información visite http://developer.mozilla.org/en/docs/DOM:element.removeEventListener
 # LOCALIZATION NOTE: Do not translate "document.load()" or "XMLHttpRequest"
-UseOfDOM3LoadMethodWarning=L'uso de Document.lobat() ye obsoleto. Ta esviellar o suyo codigo, faiga servir l'obchecto DOM XMLHttpRequest. Ta mas aduya, https://developer.mozilla.org/en/xmlhttprequest
+UseOfDOM3LoadMethodWarning=L'uso de Document.lobat() ye obsoleto. Ta esviellar o suyo codigo, faiga servir l'obchecto DOM XMLHttpRequest. Ta mas aduya, https://developer.mozilla.org/en/XMLHttpRequest
 # LOCALIZATION NOTE: Do not translate "window.showModalDialog()" or "window.open()" 
-ShowModalDialogWarning=L'uso de window.showModalDialog() ye obsoleto. Faiga servir en cuenta window.open(). Ta mas aduya, https://developer.mozilla.org/en-us/docs/web/api/window.open
-# LOCALIZATION NOTE: Do not translate "cloneNode()"
-UnsafeCloneNodeWarning=O comportamiento de cloneNode() sin argumento de tipo lochico va a cambiar de fer una clonación completa (incluindo os obchectos referenciados) ta una superficial.  S'asegure de pasar explicitament un argumento de tipo lochico ta conservar o comportamiento actual.
-# LOCALIZATION NOTE: Do not translate "importNode()"
-UnsafeImportNodeWarning=O comportamiento d'importNode() sin argumento de tipo lochico va a cambiar de fer una clonación completa (incluindo os obchectos referenciados) ta una superficial.  S'asegure de pasar explicitament un argumento de tipo lochico ta conservar o comportamiento actual.
+ShowModalDialogWarning=L'uso de window.showModalDialog() ye obsoleto. Faiga servir en cuenta window.open(). Ta mas aduya, https://developer.mozilla.org/en-US/docs/Web/API/Window.open
+# LOCALIZATION NOTE: Do not translate "window._content" or "window.content"
+Window_ContentWarning=window._content ye obsoleto. Faiga servir en cuenta window.content.