Updated strings
authorDaniel Martinez <entaltoaragon@gmail.com>
Thu, 07 Mar 2013 23:52:16 +0100
changeset 25 e2734a8dfc7e961674cf31b048a5f11eb4c51f23
parent 23 b8abf6df74e8a05b1ab4763e7ef7c12bd67cce58
child 26 4e87db6f62e1c11f80d5ef139ccad26c8b6331de
push id4
push useraxel@mozilla.com
push dateTue, 24 Sep 2013 12:38:52 +0000
Updated strings
browser/chrome/browser/aboutHealthReport.dtd
browser/chrome/browser/aboutPrivateBrowsing.dtd
browser/chrome/browser/baseMenuOverlay.dtd
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/devtools/debugger.dtd
browser/chrome/browser/devtools/debugger.properties
browser/chrome/browser/devtools/gclicommands.properties
browser/chrome/browser/devtools/inspector.dtd
browser/chrome/browser/devtools/inspector.properties
browser/chrome/browser/devtools/profiler.dtd
browser/chrome/browser/devtools/profiler.properties
browser/chrome/browser/devtools/styleinspector.dtd
browser/chrome/browser/devtools/styleinspector.properties
browser/chrome/browser/devtools/toolbox.properties
browser/chrome/browser/newTab.dtd
browser/chrome/browser/preferences/advanced.dtd
browser/chrome/browser/preferences/privacy.dtd
browser/chrome/browser/taskbar.properties
browser/defines.inc
browser/pdfviewer/viewer.properties
browser/profile/bookmarks.inc
calendar/chrome/calendar/calendar-event-dialog.dtd
calendar/chrome/calendar/calendar-event-dialog.properties
calendar/defines.inc
chat/irc.properties
dom/chrome/dom/dom.properties
dom/chrome/layout/css.properties
dom/chrome/plugins.properties
editor/ui/chrome/region/region.properties
embedding/android/android_strings.dtd
mail/chrome/messenger-region/region.properties
mail/chrome/messenger/FilterEditor.dtd
mail/chrome/messenger/addressbook/abCardOverlay.dtd
mail/chrome/messenger/addressbook/abCardViewOverlay.dtd
mail/chrome/messenger/addressbook/addressBook.properties
mail/chrome/messenger/chat.properties
mail/chrome/messenger/cloudfile/Dropbox/management.dtd
mail/chrome/messenger/cloudfile/Dropbox/settings.dtd
mail/chrome/messenger/featureConfigurator.dtd
mail/chrome/messenger/filter.properties
mail/chrome/messenger/messenger.dtd
mail/chrome/messenger/messenger.properties
mail/chrome/messenger/msgPrintEngine.dtd
mail/chrome/messenger/preferences/junkLog.dtd
mail/chrome/messenger/prefs.properties
mail/defines.inc
mobile/android/base/android_strings.dtd
mobile/android/base/sync_strings.dtd
mobile/android/chrome/aboutApps.dtd
mobile/android/chrome/aboutApps.properties
mobile/android/chrome/aboutDownloads.dtd
mobile/android/chrome/aboutDownloads.properties
mobile/android/chrome/aboutHome.dtd
mobile/android/chrome/browser.properties
mobile/android/chrome/pippki.properties
mobile/android/defines.inc
mobile/chrome/region.properties
mobile/overrides/passwordmgr.properties
mobile/profile/bookmarks.inc
mobile/searchplugins/amazondotcom.xml
mobile/searchplugins/google.xml
mobile/searchplugins/list.txt
mobile/searchplugins/twitter.xml
mobile/searchplugins/wikipedia.xml
mobile/searchplugins/yahoo.xml
mobile/xul/defines.inc
suite/chrome/browser/navigator.dtd
suite/chrome/browser/region.properties
suite/chrome/browser/taskbar.properties
suite/chrome/common/aboutPrivateBrowsing.dtd
suite/chrome/common/contentAreaCommands.dtd
suite/chrome/common/dataman/dataman.properties
suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
suite/chrome/common/help/cs_nav_prefs_appearance.xhtml
suite/chrome/common/help/customize_help.xhtml
suite/chrome/common/help/help-index1.rdf
suite/chrome/common/help/nav_help.xhtml
suite/chrome/common/help/shortcuts.xhtml
suite/chrome/common/help/suite-toc.rdf
suite/chrome/common/notification.properties
suite/chrome/common/openLocation.dtd
suite/chrome/common/pref/pref-content.dtd
suite/chrome/common/pref/pref-download.dtd
suite/chrome/common/pref/pref-privatedata.dtd
suite/chrome/common/pref/pref-security.dtd
suite/chrome/common/pref/preferences.dtd
suite/chrome/common/region.properties
suite/chrome/common/safeBrowsing.dtd
suite/chrome/common/utilityOverlay.dtd
suite/chrome/mailnews/FilterEditor.dtd
suite/chrome/mailnews/addressbook/abCardViewOverlay.dtd
suite/chrome/mailnews/filter.properties
suite/chrome/mailnews/messenger.properties
suite/chrome/mailnews/pref/prefs.properties
suite/chrome/mailnews/region.properties
suite/defines.inc
suite/profile/bookmarks.inc
toolkit/chrome/global/aboutTelemetry.dtd
toolkit/chrome/global/aboutTelemetry.properties
toolkit/chrome/global/downloadProgress.properties
toolkit/chrome/global/mozilla.dtd
toolkit/chrome/global/resetProfile.dtd
toolkit/chrome/global/videocontrols.dtd
toolkit/chrome/mozapps/downloads/downloads.properties
toolkit/chrome/mozapps/plugins/plugins.dtd
--- a/browser/chrome/browser/aboutHealthReport.dtd
+++ b/browser/chrome/browser/aboutHealthReport.dtd
@@ -1,31 +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/. -->
 <!-- metrics.locale-direction instead of the usual local.dir entity, so RTL can skip translating page. -->
 
 <!ENTITY abouthealth.locale-direction "ltr">
 <!-- LOCALIZATION NOTE (abouthealth.pagetitle): Firefox Health Report is a proper noun in en-US, please keep this in mind. -->
 
-<!ENTITY abouthealth.pagetitle "&brandShortName; Health Report">
-<!ENTITY abouthealth.header "&brandFullName; Health Report">
+<!ENTITY abouthealth.pagetitle "Informe de salut de &brandShortName;">
+<!ENTITY abouthealth.header "Informe de salut de &brandFullName;">
 
-<!ENTITY abouthealth.intro.title "What is &brandShortName; Health Report?">
+<!ENTITY abouthealth.intro.title "¿Qué ye l'informe de salut de &brandShortName;?">
 
-<!ENTITY abouthealth.intro-enabled "&brandFullName; collects some data about your computer and usage in order to provide you with a better browser experience.">
-<!ENTITY abouthealth.intro-disabled "You are currently not submitting usage data to &vendorShortName;. You can help us make &brandShortName; better by clicking the &quot;&abouthealth.optin;&quot; button.">
+<!ENTITY abouthealth.intro-enabled "&brandFullName; replega bells datos sobre o suyo ordinador y lo suyo uso, ta furnir-le una millor experiencia de navegación.">
+<!ENTITY abouthealth.intro-disabled "Actualment no ye ninviando garra informe de datos ta &vendorShortName;. Puet aduyar-nos a amillorar &brandShortName; fendo clic en o botón de &quot;&abouthealth.optin;&quot;.">
 
-<!ENTITY abouthealth.optin "Help make &brandShortName; better">
-<!ENTITY abouthealth.optout "Turn Off Reporting">
+<!ENTITY abouthealth.optin "Aduyar a amillorar o &brandShortName;.">
+<!ENTITY abouthealth.optout "Desactivar os informes">
 
-<!ENTITY abouthealth.optout.confirmationPrompt.title "Stop data submission?">
-<!ENTITY abouthealth.optout.confirmationPrompt.message "Are you sure you want to opt out and delete all your anonymous product data stored on &vendorShortName; servers?">
+<!ENTITY abouthealth.optout.confirmationPrompt.title "Quiere aturar o ninviamiento de datos?">
+<!ENTITY abouthealth.optout.confirmationPrompt.message "Ye seguro que quiere desactivar ista caracteristica y eliminar totz os datos de producto anonimos alzaus en os servidors de &vendorShortName;?">
 
-<!ENTITY abouthealth.show-raw-data "Show Details">
-<!ENTITY abouthealth.hide-raw-data "Hide Details">
+<!ENTITY abouthealth.show-raw-data "Amostrar detalles">
+<!ENTITY abouthealth.hide-raw-data "Amagar detalles">
 
-<!ENTITY abouthealth.show-report "Show &brandShortName; Report">
+<!ENTITY abouthealth.show-report "Amostrar l'informe de &brandShortName;">
 
-<!ENTITY abouthealth.details.description-start "This is the data &brandFullName; is submitting in order for &brandShortName; Health Report to function.   You can ">
-<!ENTITY abouthealth.details-link "learn more">
-<!ENTITY abouthealth.details.description-end " about what we collect and submit.">
-<!ENTITY abouthealth.no-data-available "There is no previous submission to display. Please check back later.">
+<!ENTITY abouthealth.details.description-start "Istos son os datos que &brandFullName; ye ninviando ta que l'informe de salut de &brandShortName; funcione.    Puet ">
+<!ENTITY abouthealth.details-link "saber-ne mas">
+<!ENTITY abouthealth.details.description-end " sobre o que podemos rechistrar y ninviar.">
+<!ENTITY abouthealth.no-data-available "Encara no s'ha ninviau datos que se puedan amostrar. Prebe de nuevas dimpués.">
--- a/browser/chrome/browser/aboutPrivateBrowsing.dtd
+++ b/browser/chrome/browser/aboutPrivateBrowsing.dtd
@@ -1,34 +1,21 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY privatebrowsingpage.title                 "Navegación privada">
 <!ENTITY privatebrowsingpage.title.normal          "Le fería goyo d'empecipiar a navegar de traza privada?">
 
-<!ENTITY privatebrowsingpage.issueDesc                 "&brandShortName; no remerará brenca de l'historial d'ista sesión.">
-<!ENTITY privatebrowsingpage.issueDesc.normal          "&brandShortName; no ye agora en o modo de navegación privada.">
-
 <!ENTITY privatebrowsingpage.perwindow.issueDesc        "O &brandShortName; no recordará gara cosa de l'historial d'ista finestra.">
 <!ENTITY privatebrowsingpage.perwindow.issueDesc.normal "No ye en una finestra de navegación privada.">
 
-<!ENTITY privatebrowsingpage.description               "En una sesión de navegación privada, &brandShortName; no alzará garra información relacionada con l'historial de navegación, as buscas, l'historial de descargas, cookies u fichers temporals d'Internet.   Manimenos, os fichers que alce u os marcadors que haiga creyau sí se conservarán.">
-
 <!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.startPrivateBrowsing.label "Empecipiar a navegación privada">
-<!ENTITY privatebrowsingpage.startPrivateBrowsing.accesskey "p">
-
 <!ENTITY privatebrowsingpage.openPrivateWindow.label "Ubrir una finestra privada">
 <!ENTITY privatebrowsingpage.openPrivateWindow.accesskey "p">
-<!-- LOCALIZATION NOTE (privatebrowsingpage.howToStop2): please leave &basePBMenu.label; intact in the translation -->
-<!-- LOCALIZATION NOTE (privatebrowsingpage.howToStart2): please leave &basePBMenu.label; intact in the translation -->
-
-<!ENTITY privatebrowsingpage.howToStop2                "Ta salir d'a navegación privada, trigue &basePBMenu.label; &gt; &privateBrowsingCmd.stop.label;, u zarre &brandShortName;.">
-<!ENTITY privatebrowsingpage.howToStart2               "Ta empecipiar a navegación privada, puede tamién seleccionar &basePBMenu.label; &gt; &privateBrowsingCmd.start.label;.">
 <!-- 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;.">
 <!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">
--- a/browser/chrome/browser/baseMenuOverlay.dtd
+++ b/browser/chrome/browser/baseMenuOverlay.dtd
@@ -17,16 +17,19 @@
 <!ENTITY aboutProduct.label       "Arredol d'o &brandShortName;">
 <!ENTITY aboutProduct.accesskey   "d">
 <!ENTITY productHelp.label        "Aduya d'o &brandShortName;">
 <!ENTITY productHelp.accesskey    "A">
 <!ENTITY helpMac.commandkey       "?">
 <!ENTITY helpSafeMode.label       "Reiniciar con os complementos desactivaus…">
 <!ENTITY helpSafeMode.accesskey   "R">
 
+<!ENTITY healthReport.label       "Informe de salut de &brandShortName;">
+<!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 preferencesCmdMac.label        "Preferencias…">
 <!ENTITY preferencesCmdMac.commandkey   ",">
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -274,24 +274,18 @@ 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               "Porgar l'historial recient…">
-<!ENTITY clearRecentHistory.accesskey           "h">
-<!-- LOCALIZATION NOTE : These two strings can share an access key because they never appear together on the menu -->
+<!ENTITY clearRecentHistory.label               "Borrar l'historial recient…">
 
-<!ENTITY privateBrowsingCmd.start.label         "Empecipiar a navegación privada">
-<!ENTITY privateBrowsingCmd.start.accesskey     "v">
-<!ENTITY privateBrowsingCmd.stop.label          "Aturar a navegación privada">
-<!ENTITY privateBrowsingCmd.stop.accesskey      "v">
 <!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"> 
 <!ENTITY viewToolbarsMenu.accesskey     "t"> 
@@ -320,17 +314,17 @@ These should match what Safari and other
 <!ENTITY appMenuFind.label "Trobar…">
 <!ENTITY appMenuUnsorted.label "Marcadors sin ordenar">
 <!ENTITY appMenuWebDeveloper.label "Desembolicador web">
 <!ENTITY appMenuGettingStarted.label "Primers trangos">
 <!ENTITY appMenuSafeMode.label "Reiniciar con os complementos desactivaus…">
 <!ENTITY appMenuSafeMode.accesskey "R">
 
 <!ENTITY openCmd.commandkey           "I">
-<!ENTITY urlbar.placeholder           "Ir ta un puesto web">
+<!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:
 
   Search Command Key Logic works like this:
 
   Unix: Ctrl+J (0.8, 0.9 support)
@@ -423,16 +417,20 @@ These should match what Safari and other
 <!ENTITY saveAudioCmd.label           "Alzar l'audio como…">
 <!ENTITY saveAudioCmd.accesskey       "a">
 <!ENTITY emailImageCmd.label          "Ninvía la imachen por correu…">
 <!ENTITY emailImageCmd.accesskey      "a">
 <!ENTITY emailVideoCmd.label          "Ninviar o video por correu…">
 <!ENTITY emailVideoCmd.accesskey      "a">
 <!ENTITY emailAudioCmd.label          "Ninviar l'audio por correu…">
 <!ENTITY emailAudioCmd.accesskey      "a">
+<!ENTITY playPluginCmd.label          "Activar iste plugin">
+<!ENTITY playPluginCmd.accesskey      "c">
+<!ENTITY hidePluginCmd.label          "Amagar iste plugin">
+<!ENTITY hidePluginCmd.accesskey      "g">
 <!ENTITY copyLinkCmd.label            "Copiar l'adreza d'o vinclo">
 <!ENTITY copyLinkCmd.accesskey        "a">
 <!ENTITY copyImageCmd.label           "Copiar l'adreza d'a imachen">
 <!ENTITY copyImageCmd.accesskey       "o">
 <!ENTITY copyImageContentsCmd.label   "Copiar a imachen">
 <!ENTITY copyImageContentsCmd.accesskey  "C"> 
 <!ENTITY copyVideoURLCmd.label        "Copiar l'adreza d'o vídeo">
 <!ENTITY copyVideoURLCmd.accesskey    "o">
@@ -582,20 +580,19 @@ Example Enterprises, Inc.
 
 The layout of the identity dialog prevents combining this into a single string with
 substitution variables.  If it is difficult to translate the sense of the string
 with that structure, consider a translation which ignores the preceding domain and
 just addresses the organization to follow, e.g. "This site is run by " -->
 <!ENTITY identity.runBy "que perteneixe a">
 
 <!ENTITY identity.moreInfoLinkText "Mas información…">
-
-<!ENTITY allTabs.filter.emptyText "Mirar pestanyas">
 <!-- Name for the tabs toolbar as spoken by screen readers.
      The word "toolbar" is appended automatically and should not be contained below! -->
+
 <!ENTITY tabsToolbar.label "Pestanyas d'o navegador">
 <!-- LOCALIZATION NOTE (syncTabsMenu2.label): This appears in the history menu -->
 
 <!ENTITY syncTabsMenu2.label     "Pestanyas dende atros dispositivos">
 
 <!ENTITY syncBrand.shortName.label    "Sync">
 
 <!ENTITY syncSetup.label              "Configurar o &syncBrand.shortName.label;…">
@@ -628,8 +625,11 @@ just addresses the organization to follo
 
 <!ENTITY getUserMedia.selectCamera.label "Camara ta compartir:">
 <!ENTITY getUserMedia.selectCamera.accesskey "C">
 <!ENTITY getUserMedia.selectMicrophone.label "Microfono ta compartir:">
 <!ENTITY getUserMedia.selectMicrophone.accesskey "M">
 
 <!ENTITY webrtcIndicatorButton.label "Acceso ta o microfono/camara">
 <!ENTITY webrtcIndicatorButton.tooltip "Amuestra os puestos a on se ye compartindo a camara u o microfono">
+
+<!ENTITY mixedContentBlocked.helplink "Saber-ne mas">
+<!ENTITY mixedContentBlocked.moreinfo "A mas gran parte d'os puestos web funcionarán bien mesmo con iste conteniu blocau.">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -1,458 +1,455 @@
 # 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/.
 
-nv_timeout=Tiempo excediu
-openFile=Ubrir fichero
+nv_timeout=Timed Out
+openFile=Open File
 
-droponhometitle=Definir a pachina d'inicio
-droponhomemsg=Deseya que iste documento sía a suya nueva pachina d'inicio?
+droponhometitle=Set Home Page
+droponhomemsg=Do you want this document to be your new home page?
 
 # context menu strings
 
 # LOCALIZATION NOTE (contextMenuSearch): %1$S is the search engine,
 # %2$S is the selection string.
-contextMenuSearch=Mirar "%2$S" en %1$S
+contextMenuSearch=Search %1$S for "%2$S"
 contextMenuSearch.accesskey=S
 
 # bookmark dialog strings
 
-bookmarkAllTabsDefault=[Nombre d'a carpeta]
+bookmarkAllTabsDefault=[Folder Name]
 
-xpinstallPromptWarning=%S ha privau que iste puesto web (%S) le demande d'instalar bell software en o suyo ordinador.
-xpinstallPromptAllowButton=Permitir
+xpinstallPromptWarning=%S prevented this site (%S) from asking you to install software on your computer.
+xpinstallPromptAllowButton=Allow
 # Accessibility Note:
 # Be sure you do not choose an accesskey that is used elsewhere in the active context (e.g. main menu bar, submenu of the warning popup button)
 # See http://www.mozilla.org/access/keyboard/accesskey for details
-xpinstallPromptAllowButton.accesskey=P
-xpinstallDisabledMessageLocked=A instalación de software ha estau desactivada por l'administrador d'o suyo sistema.
-xpinstallDisabledMessage=A instalación de software ye actualment desactivada. Prete Activar y torne-lo a prebar.
-xpinstallDisabledButton=Activar
-xpinstallDisabledButton.accesskey=t
+xpinstallPromptAllowButton.accesskey=A
+xpinstallDisabledMessageLocked=Software installation has been disabled by your system administrator.
+xpinstallDisabledMessage=Software installation is currently disabled. Click Enable and try again.
+xpinstallDisabledButton=Enable
+xpinstallDisabledButton.accesskey=n
 
 # LOCALIZATION NOTE (addonDownloading, addonDownloadCancelled, addonDownloadRestart):
 # Semi-colon list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # Also see https://bugzilla.mozilla.org/show_bug.cgi?id=570012 for mockups
-addonDownloading=Se ye descargando o complemento;Se son descargando os complementos
-addonDownloadCancelled=S'ha cancelau a descarga d'o complemento.;S'ha cancelau as descargas d'os complementos.
-addonDownloadRestart=Reiniciar a descarga;Reiniciar as descargas
+addonDownloading=Add-on downloading;Add-ons downloading
+addonDownloadCancelled=Add-on download cancelled.;Add-on downloads cancelled.
+addonDownloadRestart=Restart Download;Restart Downloads
 addonDownloadRestart.accessKey=R
-addonDownloadCancelTooltip=Cancelar
+addonDownloadCancelTooltip=Cancel
 
 # LOCALIZATION NOTE (addonsInstalled, addonsInstalledNeedsRestart):
 # Semi-colon list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 first add-on's name, #2 number of add-ons, #3 application name
-addonsInstalled=#1 s'ha instalau con exito.;#2 complementos s'han instalau con exito.
-addonsInstalledNeedsRestart=S'intalará #1 dimpués de reiniciar #3.;S'instalará #2 complementos dimpués de reiniciar #3.
-addonInstallRestartButton=Reiniciar agora
+addonsInstalled=#1 has been installed successfully.;#2 add-ons have been installed successfully.
+addonsInstalledNeedsRestart=#1 will be installed after you restart #3.;#2 add-ons will be installed after you restart #3.
+addonInstallRestartButton=Restart Now
 addonInstallRestartButton.accesskey=R
 
 # LOCALIZATION NOTE (addonError-1, addonError-2, addonError-3, addonError-4):
 # #1 is the add-on name, #2 is the host name, #3 is the application name
 # #4 is the application version
-addonError-1=No s'ha puesto descargar o complemento por una error con a connexión en #2.
-addonError-2=No s'ha puesto instalar o complemento de #2 porque no concuerda con o complemento #3 asperau.
-addonError-3=No s'ha puesto instalar o complemento descargau dende #2 porque pareixe que ye corrompiu.
-addonError-4=No s'ha puesto instalar #1 porque #3 no podeba modificar o fichero preciso.
+addonError-1=The add-on could not be downloaded because of a connection failure on #2.
+addonError-2=The add-on from #2 could not be installed because it does not match the add-on #3 expected.
+addonError-3=The add-on downloaded from #2 could not be installed because it appears to be corrupt.
+addonError-4=#1 could not be installed because #3 cannot modify the needed file.
 
 # LOCALIZATION NOTE (addonLocalError-1, addonLocalError-2, addonLocalError-3, addonLocalError-4, addonErrorIncompatible, addonErrorBlocklisted):
 # #1 is the add-on name, #3 is the application name, #4 is the application version
-addonLocalError-1=No s'ha puesto instalar iste complemento por un error en o sistema de fichers.
-addonLocalError-2=No s'ha puesto instalar iste complemento porque no concuerda con a extensión que #3 asperaba.
-addonLocalError-3=No s'ha puesto instalar iste complemento porque pareixe que ye corrompiu.
-addonLocalError-4=No s'ha puesto instalar o #1 porque o #3 no puede modificar o fichero preciso.
-addonErrorIncompatible=No s'ha puesto instalar #1 porque no ye compatible con #3 #4.
-addonErrorBlocklisted=No s'ha puesto instalar #1 porque i ha un alto risgo que pueda causar problemas d'estabilidat u seguranza.
+addonLocalError-1=This add-on could not be installed because of a filesystem error.
+addonLocalError-2=This add-on could not be installed because it does not match the add-on #3 expected.
+addonLocalError-3=This add-on could not be installed because it appears to be corrupt.
+addonLocalError-4=#1 could not be installed because #3 cannot modify the needed file.
+addonErrorIncompatible=#1 could not be installed because it is not compatible with #3 #4.
+addonErrorBlocklisted=#1 could not be installed because it has a high risk of causing stability or security problems.
 
 # 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
+lwthemeInstallRequest.message=This site (%S) attempted to install a theme.
+lwthemeInstallRequest.allowButton=Allow
+lwthemeInstallRequest.allowButton.accesskey=a
 
-lwthemePostInstallNotification.message=S'ha instalau un nuevo tema.
-lwthemePostInstallNotification.undoButton=Desfer
-lwthemePostInstallNotification.undoButton.accesskey=D
-lwthemePostInstallNotification.manageButton=Administrar os temas…
-lwthemePostInstallNotification.manageButton.accesskey=n
+lwthemePostInstallNotification.message=A new theme has been installed.
+lwthemePostInstallNotification.undoButton=Undo
+lwthemePostInstallNotification.undoButton.accesskey=U
+lwthemePostInstallNotification.manageButton=Manage Themes…
+lwthemePostInstallNotification.manageButton.accesskey=M
 
 # 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.message=%S will be installed after you restart.
+lwthemeNeedsRestart.button=Restart Now
 lwthemeNeedsRestart.accesskey=R
 
-popupWarning=%S privó que iste puesto web ubrise una finestra emerchent.
-popupWarningMultiple=%S privó que iste puesto web ubrise %S finestras emerchents.
-popupWarningButton=Opcions
+popupWarning=%S prevented this site from opening a pop-up window.
+popupWarningMultiple=%S prevented this site from opening %S pop-up windows.
+popupWarningButton=Options
 popupWarningButton.accesskey=O
-popupWarningButtonUnix=Preferencias
+popupWarningButtonUnix=Preferences
 popupWarningButtonUnix.accesskey=P
-popupAllow=Permitir as finestras emerchents ta %S
-popupBlock=Bloqueyar as finestras emerchents ta %S
-popupWarningDontShowFromMessage=No amostrar iste mensache quan se bloqueyen as finestras emerchents
-popupWarningDontShowFromLocationbar=No amostrar a barra d'información quan se bloqueyen finestras emerchents
-popupShowPopupPrefix=Amostrar '%S'
+popupAllow=Allow pop-ups for %S
+popupBlock=Block pop-ups for %S
+popupWarningDontShowFromMessage=Don't show this message when pop-ups are blocked
+popupWarningDontShowFromLocationbar=Don't show info bar when pop-ups are blocked
+popupShowPopupPrefix=Show '%S'
 
 # missing plugin installer
-missingpluginsMessage.title=S'amenistan plugins adicionals ta amostrar tot o conteniu d'ista pachina.
-missingpluginsMessage.button.label=Instalar os plugins que faltan…
+missingpluginsMessage.title=Additional plugins are required to display all the media on this page.
+missingpluginsMessage.button.label=Install Missing Plugins…
 missingpluginsMessage.button.accesskey=I
-outdatedpluginsMessage.title=Qualques plugins emplegaus por ista pachina son circumducius.
-outdatedpluginsMessage.updateButton.label=Esviellar os plugins…
-outdatedpluginsMessage.updateButton.accesskey=I
-blockedpluginsMessage.title=Ta la suya protección, s'ha bloqueyau qualques plugins necesarios ta ista pachina.
-blockedpluginsMessage.infoButton.label=Detalles…
+outdatedpluginsMessage.title=Some plugins used by this page are out of date.
+outdatedpluginsMessage.updateButton.label=Update Plugins…
+outdatedpluginsMessage.updateButton.accesskey=U
+blockedpluginsMessage.title=Some plugins required by this page have been blocked for your protection.
+blockedpluginsMessage.infoButton.label=Details…
 blockedpluginsMessage.infoButton.accesskey=D
-blockedpluginsMessage.searchButton.label=Esviellar os plugins…
-blockedpluginsMessage.searchButton.accesskey=l
-crashedpluginsMessage.title=O plugin %S ha fallau.
-crashedpluginsMessage.reloadButton.label=Esviellar a pachina
-crashedpluginsMessage.reloadButton.accesskey=E
-crashedpluginsMessage.submitButton.label=Ninviar un informe d'error
-crashedpluginsMessage.submitButton.accesskey=v
-crashedpluginsMessage.learnMore=Ta saber-ne mas…
-carbonFailurePluginsMessage.message=Ista pachina aprecisa fer servir un plugin que no funciona que en o modo 32-bit
-carbonFailurePluginsMessage.restartButton.label=Reiniciar en modo 32-bit
+blockedpluginsMessage.searchButton.label=Update Plugins…
+blockedpluginsMessage.searchButton.accesskey=U
+crashedpluginsMessage.title=The %S plugin has crashed.
+crashedpluginsMessage.reloadButton.label=Reload page
+crashedpluginsMessage.reloadButton.accesskey=R
+crashedpluginsMessage.submitButton.label=Submit a crash report
+crashedpluginsMessage.submitButton.accesskey=S
+crashedpluginsMessage.learnMore=Learn More…
+carbonFailurePluginsMessage.message=This page asks to use a plugin that can only run in 32-bit mode
+carbonFailurePluginsMessage.restartButton.label=Restart in 32-bit mode
 carbonFailurePluginsMessage.restartButton.accesskey=R
-activatePluginsMessage.message=Querría activar os plugins en ista pachina?
-activateAllPluginsMessage.label=Activar totz os plugins
+activatePluginsMessage.message=Would you like to activate the plugins on this page?
+activateAllPluginsMessage.label=Activate All Plugins
 activatePluginsMessage.accesskey=A
-activatePluginsMessage.always=Activar siempre os plugins ta iste puesto
-activatePluginsMessage.always.accesskey=s
-activatePluginsMessage.never=No activar nunca os plugins ta iste puesto
+activatePluginsMessage.always=Always activate plugins for this site
+activatePluginsMessage.always.accesskey=c
+activatePluginsMessage.never=Never activate plugins for this site
 activatePluginsMessage.never.accesskey=N
-activateSinglePlugin=Activar
-PluginClickToPlay=Faiga click aquí ta activar o plugin %S.
+activateSinglePlugin=Activate
+PluginClickToActivate=Activate %S.
 # LOCALIZATION NOTE - "vulnerable" indicates there is a security bug in the
 # plugin that is being exploited by attackers.
-PluginVulnerableUpdatable=Iste plugin ye vulnerable y ha de ser esviellau.
-PluginVulnerableNoUpdate=Iste plugin tiene vulnerabilidatz de seguranza.
-vulnerableUpdatablePluginWarning=Ista version ye obsoleta!
-vulnerableNoUpdatePluginWarning=Iste plugin ye vulnerable!
-vulnerablePluginsMessage=Bells plugins s'han desactivau por a suya seguranza.
-pluginInfo.unknownPlugin=Desconoixiu
+PluginVulnerableUpdatable=This plugin is vulnerable and should be updated.
+PluginVulnerableNoUpdate=This plugin has security vulnerabilities.
+vulnerableUpdatablePluginWarning=Outdated Version!
+vulnerableNoUpdatePluginWarning=Vulnerable Plugin!
+vulnerablePluginsMessage=Some plugins have been deactivated for your safety.
+pluginInfo.unknownPlugin=Unknown
 
 # Sanitize
 # LOCALIZATION NOTE (sanitizeDialog2.everything.title): When "Time range to
 # clear" is set to "Everything", the Clear Recent History dialog's title is
 # changed to this.  See UI mockup and comment 11 at bug 480169 -->
-sanitizeDialog2.everything.title=Limpiar tot l'historial
-sanitizeButtonOK=Limpiar-lo agora
+sanitizeDialog2.everything.title=Clear All History
+sanitizeButtonOK=Clear Now
 # LOCALIZATION NOTE (sanitizeEverythingWarning2): Warning that appears when
 # "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.
+sanitizeEverythingWarning2=All history will be cleared.
 # 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.
+sanitizeSelectedWarning=All selected items will be cleared.
 
 # 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.label=Check for Updates
 update.checkInsideButton.accesskey=C
-update.resumeButton.label=Continar descargando %S…
+update.resumeButton.label=Resume Downloading %S…
 update.resumeButton.accesskey=D
-update.openUpdateUI.applyButton.label=Aplicar actualización…
+update.openUpdateUI.applyButton.label=Apply Update…
 update.openUpdateUI.applyButton.accesskey=A
-update.restart.updateButton.label=Reiniciar ta esviellar
+update.restart.updateButton.label=Restart to Update
 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
+update.openUpdateUI.upgradeButton.label=Upgrade Now…
+update.openUpdateUI.upgradeButton.accesskey=U
+update.restart.upgradeButton.label=Upgrade Now
+update.restart.upgradeButton.accesskey=U
 
 # RSS Pretty Print
-feedShowFeedNew=Conducir-se a '%S'…
+feedShowFeedNew=Subscribe to '%S'…
 
-menuOpenAllInTabs.label=Ubrir tot en pestanyas
+menuOpenAllInTabs.label=Open All in Tabs
 
 # History menu
-menuRestoreAllTabs.label=Restaurar todas as pestanyas
+menuRestoreAllTabs.label=Restore All Tabs
 # LOCALIZATION NOTE (menuRestoreAllWindows, menuUndoCloseWindowLabel, menuUndoCloseWindowSingleTabLabel):
 # see bug 394759
-menuRestoreAllWindows.label=Restaurar todas as finestras
+menuRestoreAllWindows.label=Restore All Windows
 # LOCALIZATION NOTE (menuUndoCloseWindowLabel): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 Window Title, #2 Number of tabs
-menuUndoCloseWindowLabel=#1 (y #2 unatra pestanya);#1 (y #2 atras pestanyas)
+menuUndoCloseWindowLabel=#1 (and #2 other tab);#1 (and #2 other tabs)
 menuUndoCloseWindowSingleTabLabel=#1
 
 # Unified Back-/Forward Popup
-tabHistory.current=Quedar-se en ista pachina
-tabHistory.goBack=Tornar ta ista pachina
-tabHistory.goForward=Abanzar a ista pachina
+tabHistory.current=Stay on this page
+tabHistory.goBack=Go back to this page
+tabHistory.goForward=Go forward to this page
 
 # URL Bar
-pasteAndGo.label=Apegar-lo y ir-ie
+pasteAndGo.label=Paste & Go
 
 # 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.
+refreshBlocked.goButton=Allow
+refreshBlocked.goButton.accesskey=A
+refreshBlocked.refreshLabel=%S prevented this page from automatically reloading.
+refreshBlocked.redirectLabel=%S prevented this page from automatically redirecting to another page.
 
 # Star button
-starButtonOn.tooltip=Editar iste marcapachinas
-starButtonOff.tooltip=Adhibir ista pachina a marcadors
+starButtonOn.tooltip=Edit this bookmark
+starButtonOff.tooltip=Bookmark this page
 
 # 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
+offlineApps.available=This website (%S) is asking to store data on your computer for offline use.
+offlineApps.allow=Allow
+offlineApps.allowAccessKey=A
+offlineApps.never=Never for This Site
+offlineApps.neverAccessKey=e
+offlineApps.notNow=Not Now
 offlineApps.notNowAccessKey=N
 
-offlineApps.usage=O puesto web (%S) ye almagazenando mas de %SMB en datos en o suyo ordinador ta usar-los en modo sin connexión.
-offlineApps.manageUsage=Amostrar preferencias
-offlineApps.manageUsageAccessKey=f
+offlineApps.usage=This website (%S) is now storing more than %SMB of data on your computer for offline use.
+offlineApps.manageUsage=Show settings
+offlineApps.manageUsageAccessKey=S
 
 # LOCALIZATION NOTE (indexedDB.usage): %1$S is the website host name
 # %2$S a number of megabytes.
-indexedDB.usage=Iste puesto web (%1$S) ye prebando d'alzar mas de %2$S MB de datos en o suyo ordinador ta usar-los en modo sin connexión.
+indexedDB.usage=This website (%1$S) is attempting to store more than %2$S MB of data on your computer for offline use.
 
-identity.identified.verifier=Verificau por: %S
-identity.identified.verified_by_you=Ha adhibiu una excepción de seguranza ta iste puesto.
+identity.identified.verifier=Verified by: %S
+identity.identified.verified_by_you=You have added a security exception for this site.
 identity.identified.state_and_country=%S, %S
 
-identity.encrypted=A suya connexión ta ista pachina web ha estau zifrada ta privar que dengún la pueda escuitar.
-identity.unencrypted=A connexión ta iste puesto web no ye zifrada.
-identity.mixed_content=A connexión ta iste puesto web ye parcialment zifrada, y no podría privar posibles ataques d'intercepción.
+identity.encrypted=Your connection to this website is encrypted to prevent eavesdropping.
+identity.unencrypted=Your connection to this website is not encrypted.
+identity.mixed_content=Your connection to this site is only partially encrypted, and does not prevent eavesdropping.
 
-identity.unknown.tooltip=Iste puesto web no proporciona garra información d'identidat.
+identity.unknown.tooltip=This website does not supply identity information.
 
-identity.ownerUnknown2=(desconoixiu)
+identity.ownerUnknown2=(unknown)
 
 # 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.pageBookmarkedTitle=Page Bookmarked
+editBookmarkPanel.pageBookmarkedDescription=%S will always remember this page for you.
+editBookmarkPanel.bookmarkedRemovedTitle=Bookmark Removed
+editBookmarkPanel.editBookmarkTitle=Edit This Bookmark
 
 # LOCALIZATION NOTE (editBookmark.removeBookmarks.label)
 # Semi-colon list of plural forms. 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
+editBookmark.removeBookmarks.label=Remove Bookmark;Remove #1 Bookmarks
 
 # Post Update Notifications
-pu.notifyButton.label=Detalles…
+pu.notifyButton.label=Details…
 pu.notifyButton.accesskey=D
 # LOCALIZATION NOTE %S will be replaced by the short name of the application.
-puNotifyText=S'ha esviellau o %S
-puAlertTitle=S'ha esviellau o %S
-puAlertText=Faiga clic aquí ta mas detalles
+puNotifyText=%S has been updated
+puAlertTitle=%S Updated
+puAlertText=Click here for details
 
 # Geolocation UI
 
 # LOCALIZATION NOTE (geolocation.shareLocation geolocation.alwaysShareLocation geolocation.neverShareLocation):
 #If you're having trouble with the word Share, please use Allow and Block in your language.
-geolocation.shareLocation=Compartir a ubicación
-geolocation.shareLocation.accesskey=b
-geolocation.alwaysShareLocation=Compartir a ubicación siempre
-geolocation.alwaysShareLocation.accesskey=a
-geolocation.neverShareLocation=No compartir a ubicación nunca
+geolocation.shareLocation=Share Location
+geolocation.shareLocation.accesskey=a
+geolocation.alwaysShareLocation=Always Share Location
+geolocation.alwaysShareLocation.accesskey=A
+geolocation.neverShareLocation=Never Share Location
 geolocation.neverShareLocation.accesskey=N
-geolocation.shareWithSite=Quiere compartir a suya ubicación con %S?
-geolocation.shareWithFile=Quiere compartir a suya ubicación con o fichero %S?
+geolocation.shareWithSite=Would you like to share your location with %S?
+geolocation.shareWithFile=Would you like to share your location with the file %S?
 # LOCALIZATION NOTE (geolocation.learnMore): Use the unicode ellipsis char, \u2026,
 # or use "..." if \u2026 doesn't suit traditions in your locale.
-geolocation.learnMore=Ta saber-ne mas…
+geolocation.learnMore=Learn More…
 
 # Phishing/Malware Notification Bar.
 # LOCALIZATION NOTE (notAForgery, notAnAttack)
 # The two button strings will never be shown at the same time, so
 # it's okay for them to have the same access key
-safebrowsing.getMeOutOfHereButton.label=Quitar-me d'aquí!
-safebrowsing.getMeOutOfHereButton.accessKey=S
-safebrowsing.reportedWebForgery=S'ha informau que iste puesto web ye una falsificación!
-safebrowsing.notAForgeryButton.label=No ye garra falsificación web…
+safebrowsing.getMeOutOfHereButton.label=Get me out of here!
+safebrowsing.getMeOutOfHereButton.accessKey=G
+safebrowsing.reportedWebForgery=Reported Web Forgery!
+safebrowsing.notAForgeryButton.label=This isn't a web forgery…
 safebrowsing.notAForgeryButton.accessKey=F
-safebrowsing.reportedAttackSite=S'ha informau que iste ye un puesto web atacant!
-safebrowsing.notAnAttackButton.label=No ye garra puesto atacant…
+safebrowsing.reportedAttackSite=Reported Attack Site!
+safebrowsing.notAnAttackButton.label=This isn't an attack site…
 safebrowsing.notAnAttackButton.accessKey=A
 
-# Private Browsing Confirmation dialog
-# LOCALIZATION NOTE (privateBrowsingMessage): %S will be replaced
-# by the name of the application.
-# LOCALIZATION NOTE (privateBrowsingYesTitle, privateBrowsingNoTitle, privateBrowsingNeverAsk):
-# Access keys are specified by prefixing the desired letter with an ampersand.
-privateBrowsingDialogTitle=Empecipiar a navegación privada
-privateBrowsingMessageHeader=Le fería goyo d'empecipiar a navegar de forma privada?
-privateBrowsingMessage=O %S alzará as suyas pestanyas actuals ta restaurar-las quan rematará con a sesión de navegación privada.
-privateBrowsingYesTitle=&Empecipiar a navegación privada
-privateBrowsingNoTitle=&Cancelar
-privateBrowsingNeverAsk=&No tornar a amostrar iste mensache
-
 # Ctrl-Tab
 # LOCALIZATION NOTE (ctrlTab.showAll.label): #1 represents the number
 # of tabs in the current browser window. It will always be 2 at least.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-ctrlTab.showAll.label=;Amostrar as #1 pestanyas
+ctrlTab.showAll.label=;Show all #1 tabs
 
 # LOCALIZATION NOTE (addKeywordTitleAutoFill): %S will be replaced by the page's title
 # Used as the bookmark name when saving a keyword for a search field.
-addKeywordTitleAutoFill=Mirar %S
+addKeywordTitleAutoFill=Search %S
 
 # TabView
 # LOCALIZATION NOTE (tabview.title): %S is the application name.
-tabview.title=%S - Agrupar as suyas pestanyas
+tabview.title=%S - Group Your Tabs
 # LOCALIZATION NOTE (tabview.moveToUnnamedGroup.label): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the page title of the first tab in the unnamed group, 
 # #2 is the number of remaining tabs.
-tabview.moveToUnnamedGroup.label=#1 y 1 mas;#1 y #2 mas
+tabview.moveToUnnamedGroup.label=#1 and 1 more;#1 and #2 more
 
-extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name=Predeterminau
-extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description=O tema predeterminau.
+extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name=Default
+extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description=The default theme.
 
 # safeModeRestart
-safeModeRestartPromptTitle=Reiniciar con os complementos desactivaus
-safeModeRestartPromptMessage=Ye seguro de querer desactivar totz os complementos y reiniciar?
-safeModeRestartButton=Reiniciar
+safeModeRestartPromptTitle=Restart with Add-ons Disabled
+safeModeRestartPromptMessage=Are you sure you want to disable all add-ons and restart?
+safeModeRestartButton=Restart
 
 # LOCALIZATION NOTE (browser.menu.showCharacterEncoding): Set to the string
 # "true" (spelled and capitalized exactly that way) to show the "Character
 # Encoding" menu in the main Firefox button on Windows. Any other value will
 # hide it. Regardless of the value of this setting, the "Character Encoding"
 # menu will always be accessible via the "Web Developer" menu.
 # This is not a string to translate; it just controls whether the menu shows
 # up in the Firefox button. If users frequently use the "Character Encoding"
 # menu, set this to "true". Otherwise, you can leave it as "false".
 browser.menu.showCharacterEncoding=false
 
 # LOCALIZATION NOTE (syncPromoNotification.bookmarks.label): This appears in
 # the add bookmark star panel.  %S will be replaced by syncBrandShortName.
 # The final space separates this text from the Learn More link.
-syncPromoNotification.bookmarks.description=Puede accedir ta os suyos marcapachinas en totz os suyos dispositivos con o %S. 
+syncPromoNotification.bookmarks.description=You can access your bookmarks on all your devices with %S. 
 # LOCALIZATION NOTE (syncPromoNotification.passwords.label): This appears in
 # the remember password panel.  %S will be replaced by syncBrandShortName.
 # The final space separates this text from the Learn More link.
-syncPromoNotification.passwords.description=Puede accedir t'as suyas claus en totz os suyos dispositivos con o %S. 
-syncPromoNotification.learnMoreLinkText=Ta saber-ne mas
+syncPromoNotification.passwords.description=You can access your passwords on all your devices with %S. 
+syncPromoNotification.learnMoreLinkText=Learn More
 # LOCALIZATION NOTE (syncPromoNotification.addons.label): This appears in
 # the add-on install complete panel when Sync isn't set.
 # %S will be replaced by syncBrandShortName.
 # The final space separates this text from the Learn More link.
-syncPromoNotification.addons.description=Puet accedir a os suyos complementos en totz os suyos dispositivos con %S. 
+syncPromoNotification.addons.description=You can access your add-ons on all your devices with %S. 
 # LOCALIZATION NOTE (syncPromoNotification.addons-sync-disabled.label):
 # This appears in the add-on install complete panel when Sync is set
 # but addons sync is not. %S will be replaced by syncBrandShortName.
 # The final space separates this text from the Learn More link.
-syncPromoNotification.addons-sync-disabled.description=Puet emplegar a suya cuenta de %S ta sincronizar os complementos en multiples dispositivos. 
+syncPromoNotification.addons-sync-disabled.description=You can use your %S account to synchronize add-ons across multiple devices. 
 
-# Telemetry prompt
-# LOCALIZATION NOTE (telemetryOptInPrompt): %1$S will be replaced by
-# brandFullName, and %2$S by the value of the toolkit.telemetry.server_owner
-# preference.
-telemetryOptInPrompt = Le fería goyo d'aduyar-nos a amillorar o %1$S ninviando información respective a o rendimiento, hardware, uso y personalizacions d'o %2$S?
-telemetryLinkLabel = Ta saber-ne mas
-telemetryYesButtonLabel2 = Sí, quiero aduyar
-telemetryYesButtonAccessKey = S
-telemetryNoButtonLabel = No
-telemetryNoButtonAccessKey = N
+# Mozilla data reporting notification (Telemetry, Firefox Health Report, etc)
+dataReportingNotification.message       = %1$S automatically sends some data to %2$S so that we can improve your experience.
+dataReportingNotification.button.label  = Choose What I Share
+dataReportingNotification.button.accessKey  = C
 
 # Keyword.URL reset prompt
 # LOCALIZATION NOTE (keywordPrompt.message):
 #  - %1$S is brandShortName
 #  - %2$S is a host name (e.g. "somewebsearch.com") from the current value of keyword.URL
 #  - %3$S is the name of the default search engine (e.g. "Google")
-keywordPrompt.message = %1$S ye emplegando '%2$S' ta mirar dende a barra de localización. Quiere restaurar o motor de busca por defecto (%3$S)?
+keywordPrompt.message = %1$S is using '%2$S' for searches from the location bar. Would you like to restore the default search (%3$S)?
 
 # LOCALIZATION NOTE (keywordPrompt.yesButton): %1$S is the name of the default search engine
-keywordPrompt.yesButton = Sí, fer servir %1$S
-keywordPrompt.yesButton.accessKey = S
+keywordPrompt.yesButton = Yes, use %1$S
+keywordPrompt.yesButton.accessKey = Y
 
 # LOCALIZATION NOTE (keywordPrompt.noButton): %1$S is a host name (e.g. "somewebsearch.com") from the current value of keyword.URL
-keywordPrompt.noButton = No, continar fendo servir '%1$S'
+keywordPrompt.noButton = No, continue using '%1$S'
 keywordPrompt.noButton.accessKey  = N
 
 # Webapps notification popup
-webapps.install = Instalar
+webapps.install = Install
 webapps.install.accesskey = I
 #LOCALIZATION NOTE (webapps.requestInstall) %1$S is the web app name, %2$S is the site from which the web app is installed
-webapps.requestInstall = Quiere instalar "%1$S" dende iste puesto (%2$S)?
-webapps.install.success = Aplicación instalada
-
-# Telemetry opt-out prompt for Aurora and Nightly
-# LOCALIZATION NOTE (telemetryOptOutPrompt): %1$S and %3$S will be replaced by
-# brandShortName, and %2$S by the value of the toolkit.telemetry.server_owner preference.
-telemetryOptOutPrompt = L'%1$S ninvia información de rendimiento, hardware, uso u personalizacions a %2$S ta aduyar a amillorar o %3$S.
+webapps.requestInstall = Do you want to install "%1$S" from this site (%2$S)?
+webapps.install.success = Application Installed
 
 # 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.
+fullscreen.entered=%S is now fullscreen.
 # 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
+fullscreen.rememberDecision=Remember decision for %S
 
 # LOCALIZATION NOTE (social.activated.description): %1$S is the name of the social provider, %2$S is brandShortName (e.g. Firefox)
-social.activated.description=Ha activau %1$S ta %2$S.
+social.activated.description=You've turned on %1$S for %2$S.
 
-# LOCALIZATION NOTE (social.remove.label): %S = brandShortName
-social.remove.label=Eliminar d'o %S
-social.remove.accesskey=E
+# LOCALIZATION NOTE (social.removeProvider.label): %S is the name of the social provider
+social.removeProvider.label=Remove %S
+social.removeProvider.accesskey=R
 # LOCALIZATION NOTE (social.remove.confirmationLabel): %1$S is the name of the social provider, %2$S is brandShortName (e.g. Firefox)
-social.remove.confirmationLabel=Ye seguro que quiere eliminar o %1$S d'o %2$S?
+social.remove.confirmationLabel=Are you sure you want to remove %1$S for %2$S?
 # LOCALIZATION NOTE (social.remove.confirmationOK): %S is the name of the social provider
-social.remove.confirmationOK=Eliminar o %S
+social.remove.confirmationOK=Remove %S
 
 
 # LOCALIZATION NOTE (social.turnOff.label): %S is the name of the social provider
-social.turnOff.label=Amortar o %S
-social.turnOff.accesskey=A
+social.turnOff.label=Turn off %S
+social.turnOff.accesskey=T
 # LOCALIZATION NOTE (social.turnOn.label): %S is the name of the social provider
-social.turnOn.label=Enchegar o %S
-social.turnOn.accesskey=E
+social.turnOn.label=Turn on %S
+social.turnOn.accesskey=T
 
 # LOCALIZATION NOTE (social.error.message): %1$S is brandShortName (e.g. Firefox), %2$S is the name of the social provider
-social.error.message=%1$S no s'ha puesto connectar con %2$S agora.
-social.error.tryAgain.label=Tornar-lo a prebar
+social.error.message=%1$S is unable to connect with %2$S right now.
+social.error.tryAgain.label=Try Again
 social.error.tryAgain.accesskey=T
 social.error.ok.label=OK
 social.error.ok.accesskey=O
-social.error.closeSidebar.label=Zarrar ista barra lateral
-social.error.closeSidebar.accesskey=Z
+social.error.closeSidebar.label=Close This Sidebar
+social.error.closeSidebar.accesskey=C
+
+# LOCALIZATION NOTE: %1$S is the label for the toolbar button, %2$S is the associated badge numbering that the social provider may provide.
+social.aria.toolbarButtonBadgeText=%1$S (%2$S)
 
 # Identity notifications popups
-identity.termsOfService = Condicions d'o Servicio
-identity.privacyPolicy = Politica de privacidat
+identity.termsOfService = Terms of Service
+identity.privacyPolicy = Privacy Policy
 # LOCALIZATION NOTE (identity.chooseIdentity.description): %S is the website origin (e.g. https://www.mozilla.org) shown in popup notifications.
-identity.chooseIdentity.description = Dentrar en %S
-identity.chooseIdentity.label = Fer servir un correu existent
-identity.newIdentity.label = Fer servir un correu diferent
+identity.chooseIdentity.description = Sign in to %S
+identity.chooseIdentity.label = Use an existing email
+identity.newIdentity.label = Use a different email
 identity.newIdentity.accessKey = e
-identity.newIdentity.email.placeholder = Correu electronico
+identity.newIdentity.email.placeholder = Email
 # LOCALIZATION NOTE (identity.newIdentity.description): %S is the website origin (e.g. https://www.mozilla.org) shown in popup notifications.
-identity.newIdentity.description = Escriba a suya adreza de correu ta dentrar en %S
-identity.next.label = Siguient
+identity.newIdentity.description = Enter your email address to sign in to %S
+identity.next.label = Next
 identity.next.accessKey = n
 # LOCALIZATION NOTE: shown in the popup notification when a user successfully logs into a website
 # LOCALIZATION NOTE (identity.loggedIn.description): %S is the user's identity (e.g. user@example.com)
-identity.loggedIn.description = Ha dentrau como: %S
-identity.loggedIn.signOut.label = Salir-ne
-identity.loggedIn.signOut.accessKey = l
+identity.loggedIn.description = Signed in as: %S
+identity.loggedIn.signOut.label = Sign Out
+identity.loggedIn.signOut.accessKey = O
 
 # LOCALIZATION NOTE (getUserMedia.shareCamera.message, getUserMedia.shareMicrophone.message, getUserMedia.shareCameraAndMicrophone.message, getUserMedia.sharingCamera.message, getUserMedia.sharingMicrophone.message, getUserMedia.sharingCameraAndMicrophone.message): %S is the website origin (e.g. www.mozilla.org)
 # LOCALIZATION NOTE (getUserMedia.shareSelectedDevices.label):
 # Semi-colon list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # The number of devices can be either one or two.
-getUserMedia.shareCamera.message = Le fería goyo de compartir a suya camara con %S?
-getUserMedia.shareMicrophone.message = Le fería goyo de compartir o suyo microfono con %S?
-getUserMedia.shareCameraAndMicrophone.message = Le fería goyo de compartir a suya camara y o suyo microfono con %S?
-getUserMedia.shareSelectedDevices.label = Comparte o dispositivo seleccionau;Comparte os dispositivos seleccionaus
+getUserMedia.shareCamera.message = Would you like to share your camera with %S?
+getUserMedia.shareMicrophone.message = Would you like to share your microphone with %S?
+getUserMedia.shareCameraAndMicrophone.message = Would you like to share your camera and microphone with %S?
+getUserMedia.noVideo.label = No Video
+getUserMedia.noAudio.label = No Audio
+getUserMedia.shareSelectedDevices.label = Share Selected Device;Share Selected Devices
 getUserMedia.shareSelectedDevices.accesskey = S
-getUserMedia.denyRequest.label = No compartir
-getUserMedia.denyRequest.accesskey = N
-getUserMedia.sharingCamera.message = Ye compartindo a camara con %S.
-getUserMedia.sharingMicrophone.message = Ye compartindo o microfono con %S.
-getUserMedia.sharingCameraAndMicrophone.message = Ye compartindo a camara y microfono con %S.
+getUserMedia.denyRequest.label = Don't Share
+getUserMedia.denyRequest.accesskey = D
+getUserMedia.sharingCamera.message = You are currently sharing your camera with %S.
+getUserMedia.sharingMicrophone.message = You are currently sharing your microphone with %S.
+getUserMedia.sharingCameraAndMicrophone.message = You are currently sharing your camera and microphone with %S.
+
+# Mixed Content Blocker Doorhanger Notification
+# LOCALIZATION NOTE - %S is brandShortName
+mixedContentBlocked.message = %S has blocked content that isn't secure.
+mixedContentBlocked.keepBlockingButton.label = Keep Blocking
+mixedContentBlocked.keepBlockingButton.accesskey = B
+mixedContentBlocked.unblock.label = Disable Protection on This Page
+mixedContentBlocked.unblock.accesskey = D
+
+# LOCALIZATION NOTE - %S is brandShortName
+slowStartup.message = %S seems slow… to… start.
+slowStartup.helpButton.label = Learn How to Speed It Up
+slowStartup.helpButton.accesskey = L
+slowStartup.disableNotificationButton.label = Don't Tell Me Again
+slowStartup.disableNotificationButton.accesskey = A
--- a/browser/chrome/browser/devtools/debugger.dtd
+++ b/browser/chrome/browser/devtools/debugger.dtd
@@ -81,23 +81,28 @@
 <!-- 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">
 <!-- LOCALIZATION NOTE (debuggerUI.searchLine): This is the text that appears
   -  in the source editor's context menu for the line search operation. -->
 
-<!ENTITY debuggerUI.searchLine          "Blincar ta la linia...">
+<!ENTITY debuggerUI.searchLine          "Blincar ta la linia…">
 <!ENTITY debuggerUI.searchLine.key      "J">
 <!-- 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">
+<!-- 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">
 <!-- 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">
--- a/browser/chrome/browser/devtools/debugger.properties
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -191,22 +191,26 @@ ToolboxDebugger.label=Depurador
 # displayed inside the developer tools window..
 ToolboxDebugger.tooltip=Depurador d'o JavaScript
 
 # 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 name.
+# 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 with which can be removed.
+# 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 (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/gclicommands.properties
+++ b/browser/chrome/browser/devtools/gclicommands.properties
@@ -142,17 +142,17 @@ restartFirefoxDesc=Reiniciar o Firefox
 restartFirefoxNocacheDesc=Desactivar a carga de conteniu dende a caché dimpués de reiniciar o Firefox
 
 # LOCALIZATION NOTE (restartFirefoxRequestCancelled) A string displayed to the
 # user when a scheduled restart has been aborted by the user.
 restartFirefoxRequestCancelled=A demanda de reinicio l'ha cancelau l'usuario.
 
 # LOCALIZATION NOTE (restartFirefoxRestarting) A string displayed to the
 # user when a restart has been initiated without a delay.
-restartFirefoxRestarting=Reiniciando o Firefox...
+restartFirefoxRestarting=Reiniciando Firefox…
 
 # LOCALIZATION NOTE (inspectDesc) A very short description of the 'inspect'
 # command. See inspectManual for a fuller description of what it does. This
 # string is designed to be shown in a menu alongside the command name, which
 # is why it should be as short as possible.
 inspectDesc=Inspeccionar un nodo
 
 # LOCALIZATION NOTE (inspectManual) A fuller description of the 'inspect'
@@ -298,18 +298,22 @@ tiltResetManual=Reinicia todas as transf
 # string is designed to be shown in a menu alongside the command name, which
 # is why it should be as short as possible.
 tiltCloseDesc=Zarrar a visualización si ye ubierta
 
 # LOCALIZATION NOTE (tiltCloseManual) A fuller description of the 'tilt close'
 # command, displayed when the user asks for help on what it does.
 tiltCloseManual=Zarrar a visualización y tornar ta o modo de resaltau por defecto de l'Inspector
 
+# LOCALIZATION NOTE (debuggerClosed) Used in the output of several commands
+# to explain that the debugger must be opened first.
+debuggerClosed=O depurador ha d'estar ubierto antes de fer servir iste comando
+
 # LOCALIZATION NOTE (debuggerStopped) Used in the output of several commands
-# to explain that the debugger must be opened first.
+# to explain that the debugger must be opened first before setting breakpoints.
 debuggerStopped=Cal ubrir o depurador antes de definir puntos d'aturada
 
 # LOCALIZATION NOTE (breakDesc) A very short string used to describe the
 # function of the break command.
 breakDesc=Chestionar os puntos d'aturada
 
 # LOCALIZATION NOTE (breakManual) A longer description describing the
 # set of commands that control breakpoints.
@@ -415,16 +419,20 @@ dbgStepOverDesc=Executa a linia actual y dimpués atura en a siguient. Si a linia actual ye una gritada ta una función, alavez o debugger executa a función completa, y atura en a linia de dimpués d'a gritada ta la función
 # LOCALIZATION NOTE (dbgStepInDesc) A very short string used to describe the
 # function of the dbg step in command.
 dbgStepInDesc=Executa a linia actual y dimpués atura en a siguient. Si a linia actual ye una gritada ta una función, alavez o debugger dentra en a función, y si no, atura en a linia siguient
 
 # LOCALIZATION NOTE (dbgStepOutDesc) A very short string used to describe the
 # function of the dbg step out command.
 dbgStepOutDesc=Sale d'a función actual ta un libel superior si a función ye anidada. Si ye en o cuerpo prencipal, o script s'executa dica lo suyo cabo, u dica lo siguient punto de trencadura. As linias que se blincan s'executan, pero no se i dentra
 
+# LOCALIZATION NOTE (dbgListSourcesDesc) A very short string used to describe the
+# function of the dbg list command.
+dbgListSourcesDesc=Listar os orichens d'as URLs cargadas en o depurador
+
 # LOCALIZATION NOTE (consolecloseDesc) A very short description of the
 # 'console close' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
 consolecloseDesc=Zarrar a consola
 
 # LOCALIZATION NOTE (consoleopenDesc) A very short description of the
 # 'console open' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
--- a/browser/chrome/browser/devtools/inspector.dtd
+++ b/browser/chrome/browser/devtools/inspector.dtd
@@ -1,10 +1,16 @@
 <!ENTITY inspectorHTMLCopyInner.label       "Copiar l'HTML interno">
 <!ENTITY inspectorHTMLCopyInner.accesskey   "i">
 
 <!ENTITY inspectorHTMLCopyOuter.label       "Copiar l'HTML externo">
 <!ENTITY inspectorHTMLCopyOuter.accesskey   "o">
 
+<!ENTITY inspectorCopyUniqueSelector.label       "Copiar o selector unico">
+<!ENTITY inspectorCopyUniqueSelector.accesskey   "s">
+
 <!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">
--- a/browser/chrome/browser/devtools/inspector.properties
+++ b/browser/chrome/browser/devtools/inspector.properties
@@ -17,16 +17,20 @@
 confirmNavigationAway.message2=Si sale d'ista pachina, pederá os cambios que ha feito.
 confirmNavigationAway.buttonLeave=Salir d'a pachina
 confirmNavigationAway.buttonLeaveAccesskey=S
 confirmNavigationAway.buttonStay=Quedar-me en a pachina
 confirmNavigationAway.buttonStayAccesskey=Q
 
 breadcrumbs.siblings=Chermans
 
+# LOCALIZATION NOTE (debuggerPausedWarning): Used in the Inspector tool, when
+# the user switch to the inspector when the debugger is paused.
+debuggerPausedWarning.message=O depurador ye pausua. Bellas caracteristicas como a selección d'o ratet no funcionarán.
+
 # LOCALIZATION NOTE (nodeMenu.tooltiptext)
 # This menu appears in the Infobar (on top of the highlighted node) once
 # the node is selected.
 nodeMenu.tooltiptext=Operacions d'o nodo
 
 
 # LOCALIZATION NOTE (inspector.*)
 # Used for the menuitem in the tool menu
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/profiler.dtd
@@ -0,0 +1,15 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<!-- LOCALIZATION NOTE : FILE This file contains the Profiler strings -->
+<!-- LOCALIZATION NOTE : FILE 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 (profilerNew.label): This is the label for the
+  -  button that creates a new profile. -->
+
+
+
+<!ENTITY profilerNew.label "Nuevo">
--- a/browser/chrome/browser/devtools/profiler.properties
+++ b/browser/chrome/browser/devtools/profiler.properties
@@ -10,12 +10,75 @@
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
 # LOCALIZATION NOTE (profiler.label):
 # This string is displayed in the title of the tab when the profiler is
 # displayed inside the developer tools window and in the Developer Tools Menu.
 profiler.label=Perfilador
 
+# LOCALIZATION NOTE (profiler.commandkey, profiler.accesskey)
+# Used for the menuitem in the tool menu
+profiler.commandkey=Y
+profiler.accesskey=P
+
 # LOCALIZATION NOTE (profiler.tooltip):
 # This string is displayed in the tooltip of the tab when the profiler is
 # displayed inside the developer tools window.
 profiler.tooltip=Perfilador
+
+# LOCALIZATION NOTE (profiler.profileName):
+# This string is the default name for new profiles. Its parameter is a number.
+# For example: "Profile 1", "Profile 2", etc.
+profiler.profileName=Perfil %S
+
+# LOCALIZATION NOTE (profiler.completeProfile):
+# This string is displayed as a tab in the profiler UI. Clicking on it
+# displays everything that the profiler has generated so far.
+profiler.completeProfile=Perfil completo
+
+# LOCALIZATION NOTE (profiler.sampleRange):
+# This string is displayed as a tab in the profiler UI. Clicking on it
+# displays a sample range of data selected by user themselves.
+profiler.sampleRange=Rango d'escandallo
+
+# LOCALIZATION NOTE (profiler.runningTime):
+# This string is displayed as a table header in the profiler UI.
+profiler.runningTime=Tiempo d'execución
+
+# LOCALIZATION NOTE (profiler.self):
+# This string is displayed as a table header in the profiler UI.
+# "Self" is how much time was spent doing work directly in that function.
+# As opposed to the total time which is how much time was spent in that
+# function and in functions it called.
+profiler.self=Neto
+
+# LOCALIZATION NOTE (profiler.symbolName)
+# This string is displayed as a table header in the profiler UI.
+profiler.symbolName=Nombre d'o simbolo
+
+# LOCALIZATION NOTE (profiler.startProfiling)
+# This string is displayed around the button that starts the profiler.
+# String argument will be replaced with a Start button.
+profiler.startProfiling=Faiga clic aquí %S ta empecipiar a perfilar
+
+# LOCALIZATION NOTE (profiler.stopProfiling)
+# This string is displayed around the button that stops the profiler.
+# String argument will be replaced with a Stop button.
+profiler.stopProfiling = Fer clic aquí %S ta aturar o perfilau
+
+# LOCALIZATION NOTE (profiler.start)
+# This string is displayed on the button that starts the profiler.
+profiler.start=Empecipiar
+
+# LOCALIZATION NOTE (profiler.stop)
+# This string is displayed on the button that stops the profiler.
+profiler.stop=Aturar
+
+# LOCALIZATION NOTE (profiler.loading)
+# This string is displayed above the progress bar when the profiler
+# is busy loading and parsing the report.
+profiler.loading=Cargando o perfil…
+
+# LOCALIZATION NOTE (profiler.alreadyRunning)
+# This string is displayed in the profiler whenever there is already
+# another running profile. Users can run only one profile at a time.
+profiler.alreadyRunning=O perfilador ya se ye executando. Si quiere executar iste perfil, ature o perfil %S antes.
--- a/browser/chrome/browser/devtools/styleinspector.dtd
+++ b/browser/chrome/browser/devtools/styleinspector.dtd
@@ -1,47 +1,40 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <!-- LOCALIZATION NOTE : FILE 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 (userStylesLabel): This is the label for the checkbox
+<!-- LOCALIZATION NOTE (browserStylesLabel): This is the label for the checkbox
   -  that specifies whether the styles that are not from the user's stylesheet
   -  should be displayed or not. -->
 
 
-<!ENTITY userStylesLabel    "Nomás os estilos de l'usuario">
+<!ENTITY browserStylesLabel    "Estilos d'o navegador">
 <!-- LOCALIZATION NOTE (userStylesSearch): This is the placeholder that goes in
   -  the search box when no search term has been entered. -->
 
 <!ENTITY userStylesSearch      "Mirar">
 <!-- LOCALIZATION NOTE (selectedElementLabel): This is the label for the path of
   -  the highlighted element in the web page. This path is based on the document
   -  tree. -->
 
 <!ENTITY selectedElementLabel  "Elemento seleccionau:">
 <!-- LOCALIZATION NOTE (noPropertiesFound): In the case where there are no CSS
   -  properties to display e.g. due to search criteria this message is
   -  displayed. -->
 
 <!ENTITY noPropertiesFound     "No s'ha trobau garra propiedat CSS.">
-<!-- LOCALIZATION NOTE (unmatchedSelectors): For each style property
-  -  the panel shows whether there are any selectors that do not match the
-  -  currently selected element. -->
-
-<!ENTITY unmatchedSelectors    "Selectors que no i coinciden">
-<!-- LOCALIZATION NOTE (bestMatch, matched, parentMatch & unmatched): For each
-  -  style property the panel shows the rules which hold that specific property.
-  -  For every rule, the rule status is also displayed: a rule can be the best
-  -  match, a match, a parent match, or a rule did not match the element the
-  -  user has highlighted. -->
+<!-- LOCALIZATION NOTE (bestMatch, matched, parentMatch): For each style
+  -  property the panel shows the rules containing that property. For every
+  -  rule, the rule status is also displayed: a rule can be the best match, a
+  -  match or a parent match. -->
 
 <!ENTITY bestMatch             "Coincidencia mas gran">
 <!ENTITY matched               "Coincide">
 <!ENTITY parentMatch           "Coincide o pai">
-<!ENTITY unmatched             "No coincide">
 <!-- FIXME: notes -->
 
 <!ENTITY computedViewTitle     "Calculada">
 <!ENTITY ruleViewTitle         "Regles">
--- a/browser/chrome/browser/devtools/styleinspector.properties
+++ b/browser/chrome/browser/devtools/styleinspector.properties
@@ -16,17 +16,16 @@ panelTitle=Inspecto d'estilo
 
 # LOCALIZATION NOTE (rule.status): For each style property the panel shows
 # the rules which hold that specific property. For every rule, the rule status
 # is also displayed: a rule can be the best match, a match, a parent match, or a
 # rule did not match the element the user has highlighted.
 rule.status.BEST=A coincidencia mas gran
 rule.status.MATCHED=Coincide
 rule.status.PARENT_MATCH=Coincidencia con o pai
-rule.status.UNMATCHED=No coincide
 
 # LOCALIZATION NOTE (rule.sourceElement, rule.sourceInline): For each
 # style property the panel shows the rules which hold that specific property.
 # For every rule, the rule source is also displayed: a rule can come from a
 # file, from the same page (inline), or from the element itself (element).
 rule.sourceInline=en linia
 rule.sourceElement=elemento
 
--- a/browser/chrome/browser/devtools/toolbox.properties
+++ b/browser/chrome/browser/devtools/toolbox.properties
@@ -1,3 +1,22 @@
 toolboxDockButtons.bottom.tooltip=Fixar o cobaixo d'o navegador
 toolboxDockButtons.side.tooltip=Fixar o costau d'o navegador
 toolboxDockButtons.window.tooltip=Amostrar en unatra finestra
+
+# LOCALIZATION NOTE (toolboxToggleButton.errors): Semi-colon list of plural
+# forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 number of errors in the current web page
+toolboxToggleButton.errors=#1 error;#1 errors
+
+# LOCALIZATION NOTE (toolboxToggleButton.warnings): Semi-colon list of plural
+# forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 number of warnings in the current web page
+toolboxToggleButton.warnings=#1 alvertencia;#1 alvertencias
+
+# LOCALIZATION NOTE (toolboxToggleButton.tooltip): This string is shown
+# as tooltip in the developer toolbar to open/close the developer tools.
+# It's using toolboxToggleButton.errors as first and
+# toolboxToggleButton.warnings as second argument to show the number of errors
+# and warnings.
+toolboxToggleButton.tooltip=%1$S, %2$S\nFaiga clic ta cambiar as ferramientas de desembolicadors.
--- a/browser/chrome/browser/newTab.dtd
+++ b/browser/chrome/browser/newTab.dtd
@@ -1,6 +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/. -->
 <!-- These strings are used in the about:newtab page -->
 
 <!ENTITY newtab.pageTitle "Nueva pestanya">
+<!ENTITY newtab.undo.removedLabel "Miniatura eliminada.">
+<!ENTITY newtab.undo.undoButton "Desfer.">
+<!ENTITY newtab.undo.restoreButton "Restaurar-las todas.">
+<!ENTITY newtab.undo.closeTooltip "Amagar">
--- a/browser/chrome/browser/preferences/advanced.dtd
+++ b/browser/chrome/browser/preferences/advanced.dtd
@@ -28,20 +28,36 @@
 
 <!ENTITY systemDefaults.label            "Parametros por defecto d'o sistema">
 <!--XXX-->
 <!ENTITY alwaysCheckDefault.label        "A l'empecipio, comprebar siempre si o &brandShortName; ye o navegador por defecto">
 <!ENTITY alwaysCheckDefault.accesskey    "s">
 <!ENTITY setDefault.label                "Fer que &brandShortName; siga o navegador predeterminau">
 <!ENTITY setDefault.accesskey            "d">
 <!ENTITY isDefault.label                 "&brandShortName; ye agora o suyo su navegador predeterminau">
-<!ENTITY submitCrashes.label             "Ninviar informes de fallos">
-<!ENTITY submitCrashes.accesskey         "f">
-<!ENTITY submitTelemetry.label           "Ninviar información d'o rendimiento">
-<!ENTITY submitTelemetry.accesskey       "n">
+
+<!ENTITY dataChoicesTab.label            "Triga de datos">
+
+<!ENTITY healthReportSection.label       "Informe de salut de &brandShortName;">
+<!ENTITY healthReportDesc.label          "Li aduya a entender o rendimiento d'o suyo navegador y comparte datos con &vendorShortName; sobre a salut d'o suyo navegador">
+<!ENTITY enableHealthReport.label        "Activar l'informe de salut de &brandShortName;">
+<!ENTITY enableHealthReport.accesskey    "r">
+<!ENTITY healthReportLearnMore.label     "Ta saber-ne mas">
+
+<!ENTITY telemetrySection.label          "Telemetría">
+<!ENTITY telemetryDesc.label             "Comparte datos de rendimiento, uso, hardware y personalizacions sobre o suyo navegador con &vendorShortName; ta aduyar a amillorar  o &brandShortName;.">
+<!ENTITY enableTelemetry.label           "Activar a Telemetría">
+<!ENTITY enableTelemetry.accesskey       "T">
+<!ENTITY telemetryLearnMore.label        "Saber-ne mas">
+
+<!ENTITY crashReporterSection.label      "Informe de fallos">
+<!ENTITY crashReporterDesc.label         "&brandShortName; ninvia informe de fallos ta aduyar a &vendorShortName; a fer o navegador mas estable y seguro">
+<!ENTITY enableCrashReporter.label       "Activar os informes de fallos">
+<!ENTITY enableCrashReporter.accesskey   "c">
+<!ENTITY crashReporterLearnMore.label    "Saber-ne mas">
 
 <!ENTITY networkTab.label                "Ret">
 
 <!ENTITY connection.label                "Connexión">
 
 <!ENTITY connectionDesc.label            "Configurar cómo o &brandShortName; se connecta ta Internet">
 <!ENTITY connectionSettings.label        "Configuración…">
 <!ENTITY connectionSettings.accesskey    "o">
--- a/browser/chrome/browser/preferences/privacy.dtd
+++ b/browser/chrome/browser/preferences/privacy.dtd
@@ -1,16 +1,21 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY tracking.label                 "Seguimiento">
 
-<!ENTITY doNotTrack.label               "Decir a os puestos web que no quiero que me sigan o bayo">
-<!ENTITY doNotTrack.accesskey           "D">
+<!ENTITY dntTrackingNopref.label        "No decir brenca a los puestos sobre as mías preferencias de seguimiento.">
+<!ENTITY dntTrackingNopref.accesskey    "o">
+<!ENTITY dntTrackingNotOkay.label       "Decir a los puestos que no quiero que me sigan o bayo.">
+<!ENTITY dntTrackingNotOkay.accesskey   "n">
+<!ENTITY dntTrackingOkay.label          "Decir a os puestos que quiero que me sigan o bayo.">
+<!ENTITY dntTrackingOkay.accesskey      "t">
+<!ENTITY doNotTrackInfo.label           "Saber-ne mas">
 
 <!ENTITY  history.label                 "Historial">
 
 <!ENTITY  locationBar.label             "Barra d'adrezas">
 
 <!ENTITY  locbar.pre.label              "Quan se faiga servir a barra d'adrezas, sucherir:">
 <!ENTITY  locbar.pre.accessKey          "b">
 <!ENTITY  locbar.post.label             "">
--- a/browser/chrome/browser/taskbar.properties
+++ b/browser/chrome/browser/taskbar.properties
@@ -1,16 +1,12 @@
 # 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/.
 
 taskbar.tasks.newTab.label=Ubrir una pestanya nueva
 taskbar.tasks.newTab.description=Ubrir una pestanya nueva d'o navegador.
 taskbar.tasks.newWindow.label=Ubrir una nueva finestra
 taskbar.tasks.newWindow.description=Ubrir una finestra nueva d'o navegador.
-taskbar.tasks.enterPrivacyMode.label=Dentrar en modo de navegación privada
-taskbar.tasks.enterPrivacyMode.description=Empecipiar a navegación privada. A sesión actual s'alzará.
-taskbar.tasks.exitPrivacyMode.label=Salir d'a navegación privada
-taskbar.tasks.exitPrivacyMode.description=Salir d'a navegación privada y restaurar a sesión previa.
 taskbar.tasks.newPrivateWindow.label=Nueva finestra de navegación privada
 taskbar.tasks.newPrivateWindow.description=Ubre una nueva finestra en modo de navegación privada.
 taskbar.frequent.label=Freqüent
 taskbar.recent.label=Recient
--- a/browser/defines.inc
+++ b/browser/defines.inc
@@ -1,14 +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/.
-#filter emptyLines
-
+# 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/.#filter emptyLines
 #define MOZ_LANGPACK_CREATOR mozilla.org / Softaragonés
 
 # If non-English locales wish to credit multiple contributors, uncomment this
-
 # variable definition and use the format specified.
-
 #define MOZ_LANGPACK_CONTRIBUTORS <em:contributor>Softaragones</em:contributor><em:contributor>Softcatala</em:contributor><em:contributor>Juan Pablo Martínez Cortés</em:contributor><em:contributor>Chesús Daniel Trigo</em:contributor><em:contributor>Daniel Martínez Cucalón</em:contributor>
 
-#unfilter emptyLines
+#unfilter emptyLines
\ No newline at end of file
--- a/browser/pdfviewer/viewer.properties
+++ b/browser/pdfviewer/viewer.properties
@@ -39,18 +39,18 @@ open_file_label=Ubrir
 download.title=Descargar
 download_label=Descargar
 bookmark.title=Vista actual (copiar u ubrir en una nueva finestra)
 bookmark_label=Anvista actual
 
 # Tooltips and alt text for side panel toolbar buttons
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
-toggle_slider.title=Cambiar o control eslizant
-toggle_slider_label=Cambiar o control eslizant
+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
 thumbs_label=Miniaturas
 findbar.title=Trobar en o documento
 findbar_label=Trobar
 
 # Document outline messages
@@ -81,19 +81,19 @@ find_match_case_label=Coincidencia de ma
 find_reached_top=S'ha plegau a l'inicio d'o documento, se contina dende baixo
 find_reached_bottom=S'ha plegau a la fin d'o documento, se contina dende alto
 find_not_found=No s'ha trobau a frase
 
 # Error panel labels
 error_more_info=Mas información
 error_less_info=Menos información
 error_close=Zarrar
-# LOCALIZATION NOTE (error_build): "{{build}}" will be replaced by the PDF.JS
-# build ID.
-error_build=Build PDF.JS: {{Build}}
+# LOCALIZATION NOTE (error_version_info): "{{version}}" and "{{build}}" will be
+# replaced by the PDF.JS version and build ID.
+error_version_info=PDF.js v{{version}} (build: {{build}})
 # LOCALIZATION NOTE (error_message): "{{message}}" will be replaced by an
 # english string describing the error.
 error_message=Mensache: {{message}}
 # LOCALIZATION NOTE (error_stack): "{{stack}}" will be replaced with a stack
 # trace.
 error_stack=Pila: {{stack}}
 # LOCALIZATION NOTE (error_file): "{{file}}" will be replaced with a filename
 error_file=Fichero: {{file}}
@@ -106,18 +106,19 @@ page_scale_width=Amplaria d'a pachina
 page_scale_fit=Achuste d'a pachina
 page_scale_auto=Grandaria automatica
 page_scale_actual=Grandaria actual
 
 # Loading indicator messages
 loading_error_indicator=Error
 loading_error=S'ha produciu una error en cargar o PDF.
 invalid_file_error=O PDF no ye valido u ye estorbau.
+missing_file_error=No i ha fichero PDF.
 
 # LOCALIZATION NOTE (text_annotation_type): This is used as a tooltip.
 # "{{type}}" will be replaced with an annotation type from a list defined in
 # the PDF spec (32000-1:2008 Table 169 – Annotation types).
 # Some common types are e.g.: "Check", "Text", "Comment", "Note"
-text_annotation_type=[{{type}} anotación]
+text_annotation_type=[Anotación {{type}}]
 request_password=O PDF ye protechiu por una clau:
 
 printing_not_supported=Pare cuenta: Iste navegador no maneya totalment as impresions.
 web_fonts_disabled=As fuents web son desactivadas: no se puet incrustar fichers PDF.
--- a/browser/profile/bookmarks.inc
+++ b/browser/profile/bookmarks.inc
@@ -1,79 +1,60 @@
-# 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/.
-#filter emptyLines
-
+# 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/.#filter emptyLines
 # LOCALIZATION NOTE: The 'en-US' strings in the URLs will be replaced with
-
 # your locale code, and link to your translated pages as soon as they're 
-
 # live.
 
-
 #define bookmarks_title Marcapachinas
 
 
 #define bookmarks_heading Marcapachinas
 
 
 #define bookmarks_toolbarfolder Carpeta d'a barra de marcapachinas
 
 
 #define bookmarks_toolbarfolder_description Adhiba marcadors a ista carpeta ta veyer-los en a barra de ferramientas de marcapachinas
 
 
 # LOCALIZATION NOTE (getting_started):
 
-
 # link title for http://en-US.www.mozilla.com/en-US/firefox/central/
 
-
 #define getting_started Primers trangos
 
 
 # LOCALIZATION NOTE (firefox_heading):
 
-
 # Firefox links folder name
 
-
 #define firefox_heading Mozilla Firefox
 
 
 # LOCALIZATION NOTE (firefox_help):
 
-
 # link title for http://en-US.www.mozilla.com/en-US/firefox/help/
 
-
 #define firefox_help Aduya y guidas
 
 
 # LOCALIZATION NOTE (firefox_customize):
 
-
 # link title for http://en-US.www.mozilla.com/en-US/firefox/customize/
 
-
 #define firefox_customize Personalice o Firefox
 
 
 # LOCALIZATION NOTE (firefox_community):
 
-
 # link title for http://en-US.www.mozilla.com/en-US/firefox/community/
 
-
 #define firefox_community Embreque-se-ie!
 
 
 # LOCALIZATION NOTE (firefox_about):
 
-
 # link title for http://en-US.www.mozilla.com/en-US/about/
 
-
 #define firefox_about Arredol de nusatros
 
 
-#unfilter emptyLines
+#unfilter emptyLines
\ No newline at end of file
--- a/calendar/chrome/calendar/calendar-event-dialog.dtd
+++ b/calendar/chrome/calendar/calendar-event-dialog.dtd
@@ -166,16 +166,18 @@
 <!ENTITY event.to.label                                   "End:" >
 <!ENTITY event.to.accesskey                               "n">
 <!ENTITY task.to.label                                    "Due Date:" >
 <!ENTITY task.to.accesskey                                "u">
 <!ENTITY task.status.label                                "Status:" >
 <!ENTITY task.status.accesskey                            "a">
 <!ENTITY event.repeat.label                               "Repeat:" >
 <!ENTITY event.repeat.accesskey                           "R">
+<!ENTITY event.until.label                                "Until:">
+<!ENTITY event.until.accesskey                            "i">
 <!ENTITY event.reminder.label                             "Reminder:" >
 <!ENTITY event.reminder.accesskey                         "m">
 <!ENTITY event.description.label                          "Description:" >
 <!ENTITY event.description.accesskey                      "p">
 <!ENTITY event.attachments.label                          "Attachments:" >
 <!ENTITY event.attachments.accesskey                      "h" >
 <!ENTITY event.attachments.menubutton.label               "Attach">
 <!ENTITY event.attachments.menubutton.accesskey           "A">
--- a/calendar/chrome/calendar/calendar-event-dialog.properties
+++ b/calendar/chrome/calendar/calendar-event-dialog.properties
@@ -280,16 +280,23 @@ repeatDetailsInfinite=Occurs %1$S\neffec
 # Edit recurrence window -> Recurrence details link on Event/Task dialog window
 # %1%$ - A rule string (see above). This is the first line of the link
 # %2%$ - event start date (e.g. mm/gg/yyyy)
 # e.g. with monthlyDayOfNth and all day event:
 # "Occurs day 3 of every 5 month
 #  effective 1/1/2009"
 repeatDetailsInfiniteAllDay=Occurs %1$S\neffective %2$S.
 
+# LOCALIZATION NOTE (monthlyLastDay):
+# Edit recurrence window -> Recurrence details link on Event/Task dialog window
+# A monthly rule with one or more days of the month (monthlyDayOfNth) and the
+# string "the last day" of the month.
+# e.g.: "Occurs day 15, 20, 25 and the last day of every 3 months"
+monthlyLastDay=the last day
+
 # LOCALIZATION NOTE (ruleTooComplex):
 # This string is shown in the repeat details area if our code can't handle the
 # complexity of the recurrence rule yet.
 ruleTooComplex=Click here for details
 
 # LOCALIZATION NOTE (ruleTooComplexSummary):
 # This string is shown in the event summary dialog if our code can't handle the
 # complexity of the recurrence rule yet.
@@ -367,8 +374,20 @@ pluralForWeekdays=false
 #     e.g. "every Friday of March;every 2 years on every Friday of March"
 repeatDetailsDay1Plural=Sunday
 repeatDetailsDay2Plural=Monday
 repeatDetailsDay3Plural=Tuesday
 repeatDetailsDay4Plural=Wednesday
 repeatDetailsDay5Plural=Thursday
 repeatDetailsDay6Plural=Friday
 repeatDetailsDay7Plural=Saturday
+
+# LOCALIZATION NOTE (eventRecurrenceForeverLabel):
+# Edit/New Event dialog -> datepicker that sets the until date.
+# For recurring rules that repeat forever, this labels appears in the
+# datepicker, below the minimonth, as an option for the until date.
+eventRecurrenceForeverLabel=Forever
+
+# LOCALIZATION NOTE (eventRecurrenceMonthlyLastDayLabel):
+# Edit dialog recurrence -> Monthly Recurrence pattern -> Monthly daypicker
+# The label on the monthly daypicker's last button that allows to select
+# the last day of the month inside a BYMONTHDAY rule.
+eventRecurrenceMonthlyLastDayLabel=Last day
--- a/calendar/defines.inc
+++ b/calendar/defines.inc
@@ -1,11 +1,8 @@
 #filter emptyLines
-
 #define MOZ_LANGPACK_CREATOR Mozilla.org / Softaragonés
 
 # If non-English locales wish to credit multiple contributors, uncomment this
-
 # variable definition and use the format specified.
-
 #define MOZ_LANGPACK_CONTRIBUTORS <em:contributor>Softaragones</em:contributor><em:contributor>Juan Pablo Martínez Cortés</em:contributor><em:contributor>Chesús Daniel Trigo</em:contributor><em:contributor>Daniel Martínez Cucalón</em:contributor>
 
-#unfilter emptyLines
+#unfilter emptyLines
\ No newline at end of file
--- a/chat/irc.properties
+++ b/chat/irc.properties
@@ -2,16 +2,18 @@
 # 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 (connection.error.*):
 #   These will show in the account manager if the account is
 #   disconnected because of an error.
 connection.error.lost=S'ha perdiu a connexión con o servidor
 connection.error.timeOut=O tiempo d'aspera d'a connexión s'ha acotolau
+connection.error.invalidPassword=Clau de servidor incorrecta
+connection.error.passwordRequired=Se requiere clau
 
 # LOCALIZATION NOTE (joinChat.*):
 #   These show up on the join chat menu. An underscore is for the access key.
 joinChat.channel=_Canal
 joinChat.password=_Clau
 
 # LOCALIZATION NOTE (options.*):
 #   These are the protocol specific options shown in the account manager and
@@ -64,17 +66,17 @@ command.part=%S [mensache]: Deixar a can
 command.ping=%S [&lt;embotada&gt;]: Demandar quánto tiempo de retardo tien un usuario (u o servidor, si no s'especifica garra usuario).
 command.quit=%S &lt;mensache&gt;: Desconnectar d'o servidor, con un mensache opcional.
 command.quote=%S &lt;orden&gt;: Ninviar una orden zancera ta o servidor.
 command.time=%S: Amostrar a hora local actual a o servidor IRC.
 command.topic=%S [&lt;tema nuevo&gt;]: Amostrar o cambiar o tema d'a canal.
 command.umode=%S (+|-)&lt;modo nuevo&gt;: Configurar u desconfigurar un modo d'usuario.
 command.version=%S &lt;embotada&gt;: Sollicitar a versión d'o client d'un usuario.
 command.voice=%S &lt;embotada1&gt;[,&lt;embotada2&gt;]*: Dar o estau de voz d'a canal ta bell un. Ha d'estar un operador d'a canal ta fer-lo.
-command.whois=%S &lt;embotada&gt;: Ninviar información d'un usuario.
+command.whois2=%S [&lt;apodo&gt;]: Obtener información d'un usuario.
 
 # LOCALIZATION NOTE (message.*):
 #    These are shown as system messages in the conversation.
 #    %1$S is the nick and %2$S is the nick and host of the user who joined.
 message.join=%1$S [%2$S] ha dentrau en a cambra.
 message.rejoined=Ha tornau a dentrar en a cambra.
 #    %1$S is the nick of who kicked you.
 #    %2$S is message.kicked.reason, if a kick message was given.
@@ -84,16 +86,18 @@ message.kicked.you=Ha estau forachitau p
 message.kicked=%1$S ha estau forachitau por %2$S%3$S.
 #    %S is the kick message
 message.kicked.reason=: %S
 #    %1$S is the new mode, %2$S is the nickname of the user whose mode
 #    was changed, and %3$S is who set the mode.
 message.usermode=Modo %1$S ta %2$S establiu por %3$S.
 #    %1$S is the new channel mode and %2$S is who set the mode.
 message.channelmode=Modo de canal %1$S establiu por %2$S.
+#    %S is the user's mode.
+message.yourmode=O suyo modo ye %S.
 #    %1$S is the old nick and %2$S is the new nick.
 message.nick=%1$S se conoixe agora como %2$S.
 #    %S is your new nick.
 message.nick.you=Soi conoixiu agora como %S.
 #    Could not change the nickname. %S is the user's nick.
 message.nick.fail=No s'ha puesto fer servir a embotada espedificada. A suya embotada contina estando %S.
 #    The parameter is the message.parted.reason, if a part message is given.
 message.parted.you=Ha deixau a cambra (Part%1$S).
@@ -145,16 +149,17 @@ error.mode.wrongUser=No puede cambiar os
 #    %S is the nickname or channel name that isn't available.
 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.
 
 # 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
@@ -163,16 +168,17 @@ tooltip.server=Connectau a
 #    protect users).
 tooltip.connectedFrom=Connectau dende
 tooltip.registered=Rechistrau
 tooltip.registeredAs=Rechistrau como
 tooltip.secure=Ye emplegando una connexión segura
 # The away message of the user
 tooltip.away=Ausent
 tooltip.ircOp=Operador IRC
+tooltip.bot=Bot
 tooltip.idleTime=Inactivo por
 tooltip.channels=Actualment en
 
 #    %1$S is the server name, %2$S is some generic server information (usually a
 #    location or the date the user was last seen).
 tooltip.serverValue=%1$S (%2$S)
 
 # LOCALIZATION NOTE (yes, no):
--- a/dom/chrome/dom/dom.properties
+++ b/dom/chrome/dom/dom.properties
@@ -35,24 +35,24 @@ FormValidationCheckboxMissing=Marque ist
 FormValidationRadioMissing=Trigue una d'istas opciones.
 FormValidationFileMissing=Trigue un fichero.
 FormValidationSelectMissing=Trigue un elemento d'a lista.
 FormValidationInvalidEmail=Introduzca una adreza de correu.
 FormValidationInvalidURL=Introduzca una URL.
 FormValidationPatternMismatch=Mire que coincida con o formato solicitau.
 # LOCALIZATION NOTE (FormValidationPatternMismatchWithTitle): %S is the (possibly truncated) title attribute value.
 FormValidationPatternMismatchWithTitle=Mire que coincida con o formato solicitau: %S.
-# LOCALIZATION NOTE (FormValidationRangeOverflow): %S can be a number or a date.
+# 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 or a date.
+# 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 or a date.
+# 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 (FormValidationStepMismatchWitoutMax): %S can be a number or a date. This is called instead of FormValidationStepMismatch when the second value isn't valid because it's higher than the maximum allowed value.
-FormValidationStepMismatchWithoutMax=Seleccione una valura valida. A valura valida mas amanda ye %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.
 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".
@@ -85,16 +85,24 @@ FocusedWindowedPluginWhileFullScreen=S'h
 HTMLMultipartXHRWarning=No se permite l'analís d'HTML con a función XMLHttpRequest quan se faigan servir respuestas multiparte.
 HTMLSyncXHRWarning=No se permite l'analís d'HTML con a función XMLHttpRequest en modo sincrono.
 InvalidRedirectChannelWarning=No s'ha puesto reendrezar enta %S porque o canal no implementa nsIWritablePropertyBag2.
 ReportOnlyCSPIgnored=A politica CSP de nomás informar s'ignorará porque se i aplican atras politicas CSP de no nomás reportar.
 ResponseTypeSyncXHRWarning=Ya no se permite l'emplego de l'atributo responseType de XMLHttpRequest quan o contexto d'a finestra ye en modo sincrono.
 WithCredentialsSyncXHRWarning=Ya no se permite l'emplego de l'atributo withCredentials de XMLHttpRequest quan o contexto d'a finestra ye en modo sincrono.
 TimeoutSyncXHRWarning=Ya no se permite emplegar l'atributo timeout de XMLHttpRequest quan se ye en o contexto de finestra en modo sincrono.
 JSONCharsetWarning=S'ha mirau de declarar un caracter codificau con una codificación no UTF-8 emplegando JSON con XMLHttpRequest. JSON nomás permite decodificar caracters UTF-8.
+# LOCALIZATION NOTE: Do not translate decodeAudioData.
+MediaDecodeAudioDataUnknownContentType=Os datos que s'han pasau ta decodeAudioData tienen un tipo de conteniu desconoixiu.
+# LOCALIZATION NOTE: Do not translate decodeAudioData.
+MediaDecodeAudioDataUnknownError=Ha ocorriu una error desconoixida en procesar decodeAudioData.
+# LOCALIZATION NOTE: Do not translate decodeAudioData.
+MediaDecodeAudioDataInvalidContent=Os datos que s'han pasau ta decodeAudioData tienen un conteniu invalido que no se puet descodificar.
+# LOCALIZATION NOTE: Do not translate decodeAudioData.
+MediaDecodeAudioDataNoAudio=Os datos que s'han pasau ta decodeAudioData no contienen audio.
 MediaLoadExhaustedCandidates=Ha fallau a carga de toz os recursos posibles. S'ha aturau a carga.
 MediaLoadSourceMissingSrc=O elemento <source> no tien l'atributo «src». No s'ha puesto cargar o suporte.
 # LOCALIZATION NOTE: %1$S is the Http error code the server returned (e.g. 404, 500, etc), %2$S is the URL of the media resource which failed to load.
 MediaLoadHttpError=Ha fallau a carga HTTP con codigo d'estau %1$S.  Ha fallau a carga d'o recurso multimedia %2$S.
 # LOCALIZATION NOTE: %S is the URL of the media resource which failed to load.
 MediaLoadInvalidURI=A URI no ye correcta. Ha fallau a carga d'o recurso multimedia %S.
 # LOCALIZATION NOTE: %1$S is the media resource's format/codec type (basically equivalent to the file type, e.g. MP4,AVI,WMV,MOV etc), %2$S is the URL of the media resource which failed to load.
 MediaLoadUnsupportedTypeAttribute=Ha fallau a carga d'o recurso %2$S porque l'atributo "tipo" especificau ta "%1$S" no ye soportau.
@@ -115,8 +123,12 @@ MozSliceWarning=L'uso de "mozSlice" en l
 # LOCALIZATION NOTE: Do not translate "Components"
 ComponentsWarning=L'obchecto Components ye obsoleto. Será eliminau luego.
 PluginHangUITitle=Atención: o complemento no responde
 PluginHangUIMessage=%S ye ocupau, u talment ha deixau de responder. Puet aturar-lo agora, u continar ta veyer si remata a fayena.
 PluginHangUIWaitButton=Continar
 PluginHangUIStopButton=Aturar o complemento
 # LOCALIZATION NOTE: Do not translate "mozHidden", "mozVisibilityState", "hidden", or "visibilityState"
 PrefixedVisibilityApiWarning='mozHidden' y 'mozVisibilityState' ya no se consellan. Faiga servir en cuenta as versions sin prefixo 'hidden' y 'visibilityState'.
+# 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 serán luego obsoletas. Por favor, faiga servir en o suyo puesto os capiters Content-Security-Policy y Content-Security-Report-Only con sintaxi conforme con a especificación CSP.
+# LOCALIZATION NOTE: Do not translate "X-Content-Security-Policy/Report-Only" or "Content-Security-Policy/Report-Only"
+BothCSPHeadersPresent=Iste pueto ha especificau de vez os capiters X-Content-Security-Policy/Report-Only y Content-Security-Policy/Report-Only. O capitero X-Content-Security-Policy/ReportOnly no se considerará.
--- a/dom/chrome/layout/css.properties
+++ b/dom/chrome/layout/css.properties
@@ -7,16 +7,17 @@ MimeNotCssWarn=A fuella d'estilos %1$S s
 
 PEUnexpEOF2=Fin de fichero inasperau mientres se miraba %1$S.
 PEParseRuleWSOnly=S'ha pasau una cadena d'espacios en blanco como regle.
 PEDeclDropped=Declaración refusada.
 PEDeclSkipped=S'ha saltau dica a siguient declaración.
 PEUnknownProperty=Propiedat desconoixida '%1$S'.
 PEValueParsingError=Error en analisar a valura de '%1$S'.
 PEExpectEndValue=S'asperaba a fin d'a valura pero s'ha trobau '%1$S'.
+PERuleTrailing=S'ha trobau '%1$S' en cuenta que a fin d'a regla.
 PESkipAtRuleEOF2=Fin de at-rule
 PEUnknownAtRule=No s'ha reconoixiu o regle "at" u s'ha produciu una error en analisar o regle at '%1$S'.
 PECharsetRuleEOF=cadena de chuego de caracters en o regle @charset
 PECharsetRuleNotString=S'asperaba cadena de caracters, pero s'ha trobau '%1$S'.
 PEGatherMediaEOF=fin d'a lista de meyos en un regle @import u @meya
 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'.
 PEImportNotURI=S'asperaba una URI en o regle @import, pero s'ha trobau '%1$S'.
@@ -113,13 +114,14 @@ PEMQNoMinMaxWithoutValue=As caracteristi
 PEMQExpectedFeatureValue=No s'ha trobau una valura correcta ta la caracteristica multimedia.
 PEBadFontBlockStart=S'asperaba '{' ta prencipiar o regle @font-face pero s'ha trobau '%1$S'.
 PEBadFontBlockEnd=S'asperaba '}' ta finalizar o regle @font-face pero s'ha trobau '%1$S'.
 PEAnonBoxNotAlone=No s'asperaba una caixa anonima.
 PEBadDirValue=S'asperaba 'ltr' u 'rtl' en o selector de dirección, pero s'ha trobau '%1$S'.
 PESupportsConditionStartEOF2=«no», «(», u función
 PESupportsConditionInParensEOF=«)»
 PESupportsConditionNotEOF='not'
+PESupportsWhitespaceRequired=S'asperaba un espacio en blanco dimpués de 'not', 'and' u 'or'.
 PESupportsConditionExpectedOpenParenOrFunction=S'asperaba «(» u bella función entre que l'analís d'a condición supports, pero s'ha trobau «%1$S».
 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'.
--- a/dom/chrome/plugins.properties
+++ b/dom/chrome/plugins.properties
@@ -9,11 +9,12 @@
 title_label=Arredol d'os plugins
 enabledplugins_label=Plugins activaus
 nopluginsareenabled_label=No s'ha trobau plugins activaus
 findmore_label=Puede trobar mas información sobre os plugins d'o navegador en
 findpluginupdates_label=Mirar actualizacions d'os plugins instalaus en
 installhelp_label=L'aduya ta instalar os plugins ye disponible en
 file_label=Fichero:
 version_label=Versión:
+state_label=Estau:
 mimetype_label=Tipo MIME
 description_label=Descripción
 suffixes_label=Sufixos
new file mode 100644
--- /dev/null
+++ b/editor/ui/chrome/region/region.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/.
+
+#
+# editor.js
+# editor.properties
+editor.throbber.url=http://www.seamonkey-project.org/
--- a/embedding/android/android_strings.dtd
+++ b/embedding/android/android_strings.dtd
@@ -3,23 +3,23 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 
 <!ENTITY  splash_firstrun "Se ye configurando o &brandShortName;\u2026">
 
 <!ENTITY  no_space_to_start_error "No i hai pro espacio ta que &brandShortName; pueda iniciar-se.">
 <!ENTITY  error_loading_file "Ha ocurriu una error entre que se prebaba de cargar os fichers ta usar o &brandShortName;">
 
-<!ENTITY  crash_reporter_title "Chenerador d\'informes de fallos de &brandShortName;">
-<!ENTITY  crash_message "&brandShortName; ha fallau. As suyas pestanyas habrían d\'estar listadas en a pachina d\'inicio de &brandShortName; en reiniciar.">
+<!ENTITY  crash_reporter_title "Chenerador d'informes de fallos de &brandShortName;">
+<!ENTITY  crash_message "&brandShortName; ha fallau. As suyas pestanyas habrían d'estar listadas en a pachina d'inicio de &brandShortName; en reiniciar.">
 <!ENTITY  crash_help_message "Aduye-nos a correchir iste problema!">
 <!ENTITY  crash_send_report_message "Ninviar ta Mozilla un informe de fallo">
-<!ENTITY  crash_include_url "Incluir l\'adreza d\'a pachina">
+<!ENTITY  crash_include_url "Incluir l'adreza d'a pachina">
 <!ENTITY  crash_close_label "Zarrar">
 <!ENTITY  crash_restart_label "Reiniciar o &brandShortName;">
 <!ENTITY  sending_crash_report "Se ye ninviando un reporte de fallo\u2026">
 <!ENTITY  exit_label "Salir">
 <!ENTITY  continue_label "Continar">
 
 <!ENTITY  launcher_shortcuts_title "Aplicacions web de &brandShortName;">
-<!ENTITY  launcher_shortcuts_empty "No s\'ha trobau aplicacions web">
+<!ENTITY  launcher_shortcuts_empty "No s'ha trobau aplicacions web">
 
 <!ENTITY choose_file "Trigar un fichero">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger-region/region.properties
@@ -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/.
+
+# Default search engine
+browser.search.defaultenginename=Bing
+
+# Search engine order (order displayed in the search bar dropdown)s
+browser.search.order.1=Bing
+browser.search.order.2=Yahoo
+browser.search.order.3=
+
+# To make mapit buttons to disappear in the addressbook, specify empty string.  For example:
+# mail.addr_book.mapit_url.format=
+# The format for "mail.addr_book.mapit_url.format" is:
+# @A1 == address, part 1
+# @A2 == address, part 2
+# @CI == city
+# @ST == state
+# @ZI == zip code
+# @CO == country
+mail.addr_book.mapit_url.format=http://maps.google.com/maps?q=@A1%20@A2%20@CI%20@ST%20@ZI%20@CO
+mailnews.messageid_browser.url=http://groups.google.com/search?as_umsgid=%mid
+
+# Recognize non-standard versions of "Re:" in subjects from localized versions of MS Outlook et al.
+# Specify a comma-separated list without spaces. For example: mailnews.localizedRe=AW,SV
+mailnews.localizedRe=
--- a/mail/chrome/messenger/FilterEditor.dtd
+++ b/mail/chrome/messenger/FilterEditor.dtd
@@ -21,16 +21,19 @@
 <!ENTITY contextIncomingMail.accesskey "G">
 <!ENTITY contextManual.label "Manually Run">
 <!ENTITY contextManual.accesskey "R">
 <!ENTITY contextBeforeCls.label "Filter before Junk Classification">
 <!ENTITY contextAfterCls.label "Filter after Junk Classification">
 
 <!ENTITY filterActionDesc.label "Perform these actions:">
 <!ENTITY filterActionDesc.accesskey "P">
+
+<!ENTITY filterActionOrderWarning.label "Note: Filter actions will be run in a different order.">
+<!ENTITY filterActionOrder.label "See execution order">
 <!-- New Style Filter Rule Actions -->
 
 <!ENTITY moveMessage.label "Move Message to">
 <!ENTITY copyMessage.label "Copy Message to">
 <!ENTITY forwardTo.label "Forward Message to">
 <!ENTITY replyWithTemplate.label "Reply with Template">
 <!ENTITY markMessageRead.label "Mark As Read">
 <!ENTITY markMessageUnread.label "Mark As Unread">
--- a/mail/chrome/messenger/addressbook/abCardOverlay.dtd
+++ b/mail/chrome/messenger/addressbook/abCardOverlay.dtd
@@ -139,16 +139,18 @@ content in HTML messages from this conta
 <!ENTITY QQ.label                       "QQ:">
 <!ENTITY QQ.accesskey                   "Q">
 <!ENTITY MSN.label                      "MSN:">
 <!ENTITY MSN.accesskey                  "M">
 <!ENTITY ICQ.label                      "ICQ:">
 <!ENTITY ICQ.accesskey                  "I">
 <!ENTITY XMPP.label                     "Jabber ID:">
 <!ENTITY XMPP.accesskey                 "J">
+<!ENTITY IRC.label                      "IRC Nick:">
+<!ENTITY IRC.accesskey                  "R">
 
 <!ENTITY Photo.tab                      "Photo">
 <!ENTITY Photo.accesskey                "o">
 <!ENTITY PhotoDesc.label                "Pick one of the following:">
 <!ENTITY GenericPhoto.label             "Generic Photo">
 <!ENTITY GenericPhoto.accesskey         "G">
 <!ENTITY DefaultPhoto.label             "Default">
 <!ENTITY PhotoFile.label                "On this Computer">
deleted file mode 100644
--- a/mail/chrome/messenger/addressbook/abCardViewOverlay.dtd
+++ /dev/null
@@ -1,17 +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/. -->
-<!-- Box Headings -->
-
-<!ENTITY contact.heading             "Contact">
-<!ENTITY home.heading                "Home">
-<!ENTITY other.heading               "Other">
-<!ENTITY phone.heading               "Phone">
-<!ENTITY work.heading                "Work">
-<!-- Special Box Headings, for mailing lists -->
-<!ENTITY description.heading         "Description">
-<!ENTITY addresses.heading           "Addresses">
-<!-- For Map It! -->
-<!ENTITY mapItButton.label           "Get Map">
-<!ENTITY mapIt.tooltip               "Display a map of this address from the Web">
-
--- a/mail/chrome/messenger/addressbook/addressBook.properties
+++ b/mail/chrome/messenger/addressbook/addressBook.properties
@@ -60,16 +60,17 @@ propertyCustom4=Custom 4
 propertyGtalk=Google Talk
 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]
 ## Separators (a space, dash, etc.) can be used
 dateformat=%B %e
 
--- a/mail/chrome/messenger/chat.properties
+++ b/mail/chrome/messenger/chat.properties
@@ -83,8 +83,12 @@ buddytooltip.account=Account
 # LOCALIZATION NOTE (today, yesterday):
 # These 3 strings are used to display when previous conversations happened.
 # In 'today' and 'yesterday', %S is replaced with the time.
 today=Today %S
 yesterday=Yesterday %S
 # LOCALIZATION NOTE (dateTime):
 # %1$S is the date, %2$S is the date.
 dateTime=%1$S %2$S
+log.today=Today
+log.yesterday=Yesterday
+log.lastWeek=Last Week
+log.twoWeeksAgo=Two Weeks Ago
deleted file mode 100644
--- a/mail/chrome/messenger/cloudfile/Dropbox/management.dtd
+++ /dev/null
@@ -1,4 +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 dropboxMgmt.viewSettings "View my account settings on dropbox.com">
deleted file mode 100644
--- a/mail/chrome/messenger/cloudfile/Dropbox/settings.dtd
+++ /dev/null
@@ -1,4 +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 dropboxSettings.learnMore "Learn more…">
deleted file mode 100644
--- a/mail/chrome/messenger/featureConfigurator.dtd
+++ /dev/null
@@ -1,95 +0,0 @@
-<!-- LOCALIZATION NOTE (featureConfigurator.title): Title for the Migration Assistant page. It should match featureConfiguratorCmd.label in baseMenuOverlay.dtd -->
-<!ENTITY featureConfigurator.title "Migration Assistant">
-<!-- LOCALIZATION NOTE (featureConfigurator.heading1): Heading for the page -->
-
-<!ENTITY featureConfigurator.heading1 "New &brandShortName; features worth knowing about">
-<!-- LOCALIZATION NOTE (featureConfigurator.para.1): The tone of this paragraph is important: we tried for a tone that promotes the new features (which we believe are good and worth users learning about), but also emphasizing that we think it's important to preserve user choice. -->
-
-<!ENTITY featureConfigurator.para.1 "This new version of &brandShortName; includes powerful new features which we're quite proud of, and think most people will love. People's tastes and needs vary, so we made it easy to control and customize &brandShortName;.">
-<!-- LOCALIZATION NOTE (featureConfigurator.para.2): This paragraph explains that this page is active (the buttons change the UI), and that they can get back to it if they change their mind later.-->
-
-<!ENTITY featureConfigurator.para.2 "Use this page to configure these new settings. You can always get back to the Migration Assistant from the Help menu.">
-
-<!ENTITY featureConfigurator.toolbar.heading "New Message Toolbar">
-<!ENTITY featureConfigurator.toolbar.new "Message Buttons Toolbar">
-<!ENTITY featureConfigurator.toolbar.new.status.explanation "A clean toolbar with all your messaging buttons at your fingertips.">
-<!-- LOCALIZATION NOTE (featureConfigurator.toolbar.original): The word 'original' is chosen deliberately to be neutral, vs. 'old' which in English at least had a negative connotation.-->
-
-<!ENTITY featureConfigurator.toolbar.original "Keep your original Toolbar buttons">
-<!ENTITY featureConfigurator.toolbar.original.status.explanation "Keep any custom toolbar buttons in addition to the new Message Buttons.">
-
-<!ENTITY featureConfigurator.toolbarBenefits.para "Message actions such as reply and forward have moved from the toolbar and onto the message header itself. This ties the action buttons directly to the message, which leaves more room in the toolbar for the richer search textbox, as well as add-ons.">
-<!-- LOCALIZATION NOTE (featureConfigurator.addOn.downloading): The text to display while downloading the addon. -->
-
-<!ENTITY featureConfigurator.addOn.downloading "Downloading…">
-<!-- LOCALIZATION NOTE (featureConfigurator.addOn.installing): The text to display while installing the addon. -->
-
-<!ENTITY featureConfigurator.addOn.installing "Installing…">
-<!-- LOCALIZATION NOTE (featureConfigurator.addOn.installed): The text to display after the user installs the addon from the configurator. -->
-
-<!ENTITY featureConfigurator.addOn.installed "Installed">
-<!-- LOCALIZATION NOTE (featureConfigurator.addOn.failure): The text to display when there is a problem installing the addon. -->
-
-<!ENTITY featureConfigurator.addOn.failure "There was a problem installing this extension!">
-<!-- LOCALIZATION NOTE (featureConfigurator.addOn.alreadyInstalled): The label to display when the addon is already installed. -->
-
-<!ENTITY featureConfigurator.addOn.alreadyInstalled "This extension is already installed.">
-<!-- LOCALIZATION NOTE (featureConfigurator.collapsedHeaders.heading): The heading for the Compact Header page. -->
-
-<!ENTITY featureConfigurator.collapsedHeaders.heading "Compact Header">
-<!-- LOCALIZATION NOTE (featureConfigurator.collapsedHeaders.para.weak): The paragraph to display if the user hadn't previously used the collapsed headers feature. -->
-
-<!ENTITY featureConfigurator.collapsedHeaders.para.weak "The compact message reader view has been moved into its own extension where it is now getting much more attention and options.">
-<!-- LOCALIZATION NOTE (featureConfigurator.collapsedHeaders.para.strong): The paragraph to display if the user had previously used the collapsed headers feature. -->
-
-<!ENTITY featureConfigurator.collapsedHeaders.para.strong "We noticed that you were using the compact message reader header.  This function has moved into its own extension and we recommend you install it here if you would like to continue using it.">
-<!-- LOCALIZATION NOTE (featureConfigurator.collapsedHeaders.install): The text for the button that will install the Compact Headers addon. -->
-
-<!ENTITY featureConfigurator.collapsedHeaders.install "Install Compact Header…">
-<!-- LOCALIZATION NOTE (featureConfigurator.folderColumns.heading): The heading for the Folder Columns page. -->
-
-<!ENTITY featureConfigurator.folderColumns.heading "Advanced Folder Columns">
-<!-- LOCALIZATION NOTE (featureConfigurator.folderColumns.para.weak): The paragraph to display if the user hadn't previously used the folder columns feature. -->
-
-<!ENTITY featureConfigurator.folderColumns.para.weak "The Extra Folder Columns extension replaces what was initially an advanced preference.  To keep tabs on the exact count of messages and disk space each folder is using you'll want to install this extension.">
-<!-- LOCALIZATION NOTE (featureConfigurator.folderColumns.para.strong): The paragraph to display if the user had previously used the folder columns feature. -->
-
-<!ENTITY featureConfigurator.folderColumns.para.strong "We noticed that you were using the Advanced Folder columns.  This feature has moved into its own extension, and we recommend you install here.">
-<!-- LOCALIZATION NOTE (featureConfigurator.folderColumns.install): The text for the button that will install the Extra Folder Columns addon. -->
-
-<!ENTITY featureConfigurator.folderColumns.install "Install Extra Columns…">
-<!-- LOCALIZATION NOTE (featureConfigurator.autoSync.heading): The heading for the Disk space page. -->
-
-<!ENTITY featureConfigurator.autoSync.heading "Disk space">
-<!-- LOCALIZATION NOTE (featureConfigurator.autoSync.para): The paragraph that explains why the user would want to turn on autosync. -->
-
-<!ENTITY featureConfigurator.autoSync.para "This new version of &brandShortName; comes with a new and better search functionality.  To experience this new search you'll need to synchronize your email messages.">
-<!-- LOCALIZATION NOTE (featureConfigurator.autoSync.on): The label for the radio button for synchronizing all the accounts. -->
-
-<!ENTITY featureConfigurator.autoSync.on "Synchronize">
-<!ENTITY featureConfigurator.autoSync.on.explanation "You'll see faster message loading and better search results.">
-<!-- LOCALIZATION NOTE (featureConfigurator.autoSync.off): The label for the radio button that will synchronize none of the accounts. -->
-
-<!ENTITY featureConfigurator.autoSync.off "Do not Synchronize">
-<!ENTITY featureConfigurator.autoSync.off.explanation "This will mean slower message loading and incomplete search results.">
-<!-- LOCALIZATION NOTE (featureConfigurator.autoSync.some): The label for the radio button that will let you customize the synchronize for each account. -->
-
-<!ENTITY featureConfigurator.autoSync.some "Per Account Synchronization">
-<!ENTITY featureConfigurator.autoSync.some.explanation "Customize your synchronization needs per account and folder.">
-<!-- LOCALIZATION NOTE (featureConfigurator.diskSpace.currentSize): The label for the current amount of disk space your accounts are consuming. -->
-
-<!ENTITY featureConfigurator.diskSpace.currentSize "Your current total email usage:">
-<!-- LOCALIZATION NOTE (featureConfigurator.diskSpace.freeSpace): The label for the current amount of free space available on your hard disk. -->
-
-<!ENTITY featureConfigurator.diskSpace.freeSpace "Free Space:">
-<!-- LOCALIZATION NOTE (featureConfigurator.diskSpace.requireSpace): The label for the required amount of free space to synchronize all of your IMAP accounts. -->
-
-<!ENTITY featureConfigurator.diskSpace.requireSpace "Required:">
-<!-- LOCALIZATION NOTE (featureConfigurator.diskSpace.warning): The label shown when your estimated available hard disk space if you chose autosync would be less than 50MB or if we estimate turning on autosync would use more than 50% of your free space. -->
-
-<!ENTITY featureConfigurator.diskSpace.warning "You're running low on space!">
-
-
-<!ENTITY featureConfigurator.previousButton "Previous">
-<!ENTITY featureConfigurator.nextButton "Next">
-<!ENTITY featureConfigurator.closeButton "Close">
--- a/mail/chrome/messenger/filter.properties
+++ b/mail/chrome/messenger/filter.properties
@@ -24,17 +24,26 @@ stopButtonLabel=Stop
 continueButtonLabel=Continue
 cannotEnableFilter=This filter was probably created by future version of mozilla/netscape. You cannot enable this filter because we don't know how to apply it.
 dontWarnAboutDeleteCheckbox=Don't ask me again
 searchTermsInvalidTitle=Search Terms Invalid
 # LOCALIZATION NOTE(searchTermsInvalidRule)
 # %1$S=search attribute name from the invalid rule
 # %2$S=search operator from the bad rule
 searchTermsInvalidRule=This filter cannot be saved because the search term "%1$S %2$S" is invalid in the current context.
+# LOCALIZATION NOTE(filterActionOrderExplanation)
+# Keep the \n\n that mean 2 linebreaks.
+filterActionOrderExplanation=When a message matches this filter the actions will be run in this order:\n\n
+filterActionOrderTitle=Real action order
+## LOCALIZATION NOTE(filterActionItem):
+# %1$S=sequence number of the action, %2$S=action text, %3$S=action argument
+filterActionItem=%1$S. %2$S %3$S\n
 
+## LOCALIZATION NOTE(filterCountVisibleOfTotal):
+# %1$S=number of matching filters, %2$S=total number of filters
 filterCountVisibleOfTotal=%1$S of %2$S
 ## LOCALIZATION NOTE(filterCountItems): Semi-colon list of plural forms.
 ## See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 ## #1 is the count of items in the list.# filterCountItems is a pluralForm - see 
 filterCountItems=#1 item; #1 items
 # for junk mail logging / mail filter logging
 # LOCALIZATION NOTE(junkLogDetectStr)
 # %1$S=author, %2$S=subject, %3$S=date
--- a/mail/chrome/messenger/messenger.dtd
+++ b/mail/chrome/messenger/messenger.dtd
@@ -557,16 +557,18 @@
 <!ENTITY appmenuButton1.tooltip "Display the &brandShortName; Menu">
 <!-- AppMenu Popup -->
 
 <!ENTITY appmenuNewMsgCmd.label "New Message">
 <!ENTITY appmenuNewContactCmd.label "Address Book Contact…">
 <!ENTITY appmenuEditMenu.label "Edit">
 <!ENTITY appmenuQFBMenu.label "Quick Filter Bar">
 <!ENTITY appmenuToolbarLayout.label "Toolbar Layout…">
+<!ENTITY appmenuSelectThread.label "Select Thread">
+<!ENTITY appmenuSelectFlagged.label "Select Starred Messages">
 <!-- Tags Menu Popup -->
 
 <!ENTITY addNewTag.label "New Tag…">
 <!ENTITY addNewTag.accesskey "N">
 <!ENTITY manageTags.label "Manage Tags…">
 <!ENTITY manageTags.accesskey "M">
 <!-- Folder Pane -->
 
--- a/mail/chrome/messenger/messenger.properties
+++ b/mail/chrome/messenger/messenger.properties
@@ -464,16 +464,19 @@ copyToFolderAgainAccessKey=t
 #LOCALIZATION NOTE %1$S is the e-mail address of the person we will allow remote content for
 alwaysLoadRemoteContentForSender2= 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 (on %2$S) when you read this message.
 
+# Strings for growl notifications on Mac OS X
+growlNotification=New Mail
+
 # 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.
 
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/msgPrintEngine.dtd
@@ -0,0 +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 (printCmd.key, closeCmd.key):
+     As defined in msgPrintEngine.xul, Ctrl plus the command keys defined here
+     will be the keyboard shortcuts effective in print preview, e.g. Ctrl+P
+     -->
+
+
+<!ENTITY printCmd.key "P">
+<!ENTITY closeCmd.key "W">
deleted file mode 100644
--- a/mail/chrome/messenger/preferences/junkLog.dtd
+++ /dev/null
@@ -1,10 +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 adaptiveJunkLog.title "Adaptive Junk Mail Log">
-<!ENTITY adaptiveJunkLogInfo.label "Log of adaptive junk mail control activity.">
-<!ENTITY clearLog.label "Clear Log">
-<!ENTITY clearLog.accesskey "C">
-<!ENTITY closeLog.label "Close">
-<!ENTITY closeLog.accesskey "o">
--- a/mail/chrome/messenger/prefs.properties
+++ b/mail/chrome/messenger/prefs.properties
@@ -10,17 +10,20 @@ modifiedAccountExists=An account with th
 userNameChanged=Your User Name has been updated. You may also need to update your Email Address and/or User Name associated with this account.
 serverNameChanged=The server name setting has changed. Please verify that any folders used by filters exist on the new server.
 # LOCALIZATION NOTE (junkSettingsBroken): %1$S is the account name
 junkSettingsBroken=The Junk settings on account "%1$S" have a possible problem. Would you like to review them before saving Account Settings?
 # LOCALIZATION NOTE (localDirectoryChanged): %1$S is program name (&brandShortName;)
 localDirectoryChanged=%1$S needs to restart now to apply the change to the Local directory setting.
 localDirectoryRestart=Restart
 userNameEmpty=The user name can not be empty.
-localDirectoryInvalid=The directory specified in the Local Directory setting is invalid. Please pick a different directory.
+# LOCALIZATION NOTE (localDirectoryInvalid): %1$S is path to folder
+localDirectoryInvalid=The Local Directory path "%1$S" is invalid. Please pick a different directory.
+# LOCALIZATION NOTE (localDirectoryNotAllowed): %1$S is path to folder
+localDirectoryNotAllowed=The Local Directory path "%1$S" is not suitable for message storage. Please choose another directory.
 # if the user chooses to cancel the wizard when no accounts are there throw a message
 # LOCALIZATION NOTE (cancelWizard)
 # do not localize "\n\n"
 cancelWizard=Are you sure you want to exit the Account Wizard?\n\nIf you exit, any information you have entered will be lost and the account will not be created.
 accountWizard=Account Wizard
 WizardExit=Exit
 WizardContinue=Cancel
 # when the wizard already has a domain (Should we say something different?)
--- a/mail/defines.inc
+++ b/mail/defines.inc
@@ -1,11 +1,8 @@
 #filter emptyLines
-
 #define MOZ_LANGPACK_CREATOR mozilla.org
 
 # If non-English locales wish to credit multiple contributors, uncomment this
-
 # variable definition and use the format specified.
-
 #define MOZ_LANGPACK_CONTRIBUTORS <em:contributor>Softaragones</em:contributor><em:contributor>Juan Pablo Martínez Cortés</em:contributor><em:contributor>Chesús Daniel Trigo</em:contributor><em:contributor>Daniel Martínez Cucalón</em:contributor>
 
-#unfilter emptyLines
+#unfilter emptyLines
\ No newline at end of file
--- a/mobile/android/base/android_strings.dtd
+++ b/mobile/android/base/android_strings.dtd
@@ -1,154 +1,155 @@
 <!-- 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  splash_settingup "Se ye configurando o suyo &brandShortName;">
-<!ENTITY  splash_bookmarks_history "Se son esviellando as adrezas d\'interés y l\'historial; podría tardar un ratet.">
+<!ENTITY  splash_bookmarks_history "Se son esviellando as adrezas d'interés y l'historial; podría tardar un ratet.">
 
 <!ENTITY  no_space_to_start_error "No i hai prou espacio disponible ta que &brandShortName; se inicie.">
-<!ENTITY  error_loading_file "S\'ha produciu una error en mirar de cargar fichers necesarios ta executar &brandShortName;">
+<!ENTITY  error_loading_file "S'ha produciu una error en mirar de cargar fichers necesarios ta executar &brandShortName;">
 
 <!ENTITY  awesomebar_all_pages_title "Habituals">
 <!ENTITY  awesomebar_bookmarks_title "Marcapachinas">
 <!ENTITY  awesomebar_history_title "Historial">
 
 <!ENTITY  crash_reporter_title "Reporte de fallas de &brandShortName;">
-<!ENTITY  crash_message "&brandShortName; ha fallau. As suyas pestanyas habrían de salir listadas en a pachina d\'inicio de &brandShortName; en reiniciar.">
+<!ENTITY  crash_message "&brandShortName; ha fallau. As suyas pestanyas habrían de salir listadas en a pachina d'inicio de &brandShortName; en reiniciar.">
 <!ENTITY  crash_help_message "Aduye-nos a solucionar iste problema!">
 <!ENTITY  crash_send_report_message "Ninviar un reporte de fallada a Mozilla">
-<!ENTITY  crash_include_url "Incluir l\'adreza d\'a pachina">
+<!ENTITY  crash_include_url "Incluir l'adreza d'a pachina">
 <!ENTITY  crash_close_label "Zarrar">
 <!ENTITY  crash_restart_label "Reiniciar &brandShortName;">
 <!ENTITY  sending_crash_report "Se ye ninviando un reporte de fallada\u2026">
 <!ENTITY  exit_label "Salir">
 <!ENTITY  continue_label "Continar">
 
 <!ENTITY  launcher_shortcuts_title "&brandShortName; Aplicacions web">
-<!ENTITY  launcher_shortcuts_empty "No s\'ha trobau garra aplicación web">
+<!ENTITY  launcher_shortcuts_empty "No s'ha trobau garra aplicación web">
 
 <!ENTITY choose_file "Trigue un fichero">
 
 <!ENTITY awesomebar_default_text "Escriba una busca u una adreza">
 
 <!ENTITY remote_tabs "Pestanyas sincronizadas">
 <!ENTITY remote_tabs_show_all "Amuestra todas as pestanyas">
 
 <!ENTITY bookmark "Marcapachinas">
-<!ENTITY bookmark_added "S\'ha adhibiu o marcapachinas">
-<!ENTITY bookmark_removed "S\'ha suprimiu o marcapachinas">
-<!ENTITY bookmark_updated "S\'ha esviellau o marcapachinas">
+<!ENTITY bookmark_added "S'ha adhibiu o marcapachinas">
+<!ENTITY bookmark_removed "S'ha suprimiu o marcapachinas">
+<!ENTITY bookmark_updated "S'ha esviellau o marcapachinas">
 
 <!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 reload "Esviellar">
 <!ENTITY forward "Entabant">
 <!ENTITY menu "Menú">
 <!ENTITY back "Enta zaga">
 <!ENTITY stop "Aturar">
-<!ENTITY site_security "Seguridat d\'o puesto">
+<!ENTITY site_security "Seguridat d'o puesto">
 
 <!ENTITY close_tab "Zarrar a pestanya">
 <!ENTITY one_tab "1 pestanya">
 <!-- Localization note (num_tabs2) : Number of tabs is always more than one.
      We can't use android plural forms, sadly. See bug #753859. -->
 <!ENTITY num_tabs2 "&formatD; pestanyas">
-<!ENTITY new_tab_opened "S\'ha ubierto una pestanya nueva">
+<!ENTITY new_tab_opened "S'ha ubierto una pestanya nueva">
 
 <!ENTITY settings "Opcions">
 <!ENTITY settings_title "Opcions">
 <!ENTITY pref_category_general "Cheneral">
 <!ENTITY pref_category_privacy "Privacidat y seguranza">
 <!ENTITY pref_category_content "Conteniu">
 <!ENTITY pref_category_importexport "Importar &amp; exportar">
 <!ENTITY pref_about_firefox "Quanto a &brandShortName;">
 <!ENTITY pref_do_not_track "Indicar que no me sigan o bayo">
-<!ENTITY pref_telemetry "Ninviar datos d\'o rendimiento">
+<!ENTITY pref_telemetry "Ninviar datos d'o rendimiento">
 <!ENTITY pref_remember_signons "Recordar as claus">
 
 <!ENTITY pref_cookies_menu "Cookies">
 <!ENTITY pref_cookies_accept_all "Activau">
-<!ENTITY pref_cookies_not_accept_foreign "Activadas, fueras d\'as de tercers">
+<!ENTITY pref_cookies_not_accept_foreign "Activadas, fueras d'as de tercers">
 <!ENTITY pref_cookies_disabled "Desactivau">
 
 <!ENTITY pref_char_encoding "Amostrar a codificación">
 <!ENTITY pref_char_encoding_on "Amostrar o menú">
 <!ENTITY pref_char_encoding_off "No amostrar o menú">
 <!ENTITY pref_clear_private_data "Limpiar os datos privaus">
 <!ENTITY pref_plugins "Connectors">
 <!ENTITY pref_plugins_enabled "Desactivaus">
 <!ENTITY pref_plugins_tap_to_play "Toque-lo ta enchegar">
 <!ENTITY pref_plugins_disabled "Desactivaus">
-<!ENTITY pref_text_size "Mida d\'a letra">
+<!ENTITY pref_text_size "Mida d'a letra">
 <!ENTITY pref_reflow_on_zoom2 "Pizcar ta reformatiar o texto">
 <!ENTITY pref_font_size_tiny "Muit chicota">
 <!ENTITY pref_font_size_small "Chicota">
 <!ENTITY pref_font_size_medium "Meyana">
 <!ENTITY pref_font_size_large "Gran">
 <!ENTITY pref_font_size_xlarge "Muit gran">
 <!ENTITY pref_font_size_set "Fixar">
 <!-- Localization note (pref_font_size_adjust_char): A button with a small version of this character
 (or combination of characters) is used to decrease the preview font size; a larger version of the
 same character/combination is used to increase the preview font size. It should be a concise
 representation of the language it is used in that will help show the text in the preview will change
 size. -->
 <!ENTITY pref_font_size_adjust_char "A">
 <!-- Localization note (pref_font_size_preview_text): This paragraph is used as an example to
     demonstrate the font size setting.  It is meant to be whimsical and fun. -->
 
-<!ENTITY pref_font_size_preview_text "A raboseta narancha blinca as suyas expectativas con mas rapideza, mas flexibilidat y mas seguranza. Como no tenemos animo de lucro, somos libres d\\'innovar sin garra presión ni compromiso. Isto significa una millor experiencia ta vusté y un millor esdevenidor ta la Web.">
+<!ENTITY pref_font_size_preview_text "A raboseta narancha blinca as suyas expectativas con mas rapideza, mas flexibilidat y mas seguranza. Como no tenemos animo de lucro, somos libres d'innovar sin garra presión ni compromiso. Isto significa una millor experiencia ta vusté y un millor esdevenidor ta la Web.">
 
 <!ENTITY pref_use_master_password "Fer servir a clau mayestra">
 <!ENTITY pref_show_product_announcements "Amostrar anuncios de productos">
 <!ENTITY pref_sync "Sincronizar">
 <!ENTITY pref_search_suggestions "Amostrar as sucherencias de busca">
 <!ENTITY pref_import_android "Importar dende Android">
 <!ENTITY pref_private_data_history "Navegación &amp; historial de descargas">
 <!ENTITY pref_private_data_formdata "Formulario &amp; historial de busca">
 <!ENTITY pref_private_data_cookies2 "Galletas &amp; dentradas activas">
 <!ENTITY pref_private_data_passwords "Claus alzadas">
 <!ENTITY pref_private_data_cache "Caché">
-<!ENTITY pref_private_data_offlineApps "Datos offline d\'o puesto web">
-<!ENTITY pref_private_data_siteSettings "Preferencias d\'o puesto">
+<!ENTITY pref_private_data_offlineApps "Datos offline d'o puesto web">
+<!ENTITY pref_private_data_siteSettings "Preferencias d'o puesto">
+<!ENTITY pref_private_data_downloadFiles "Fichers descargaus">
 
 <!ENTITY pref_update_autodownload "Actualizacions automaticas">
 <!ENTITY pref_update_autodownload_wifi "Nomás baixo Wi-Fi">
 <!ENTITY pref_update_autodownload_disabled "Desactivadas">
 <!ENTITY pref_update_autodownload_enabled "Activadas">
 
 <!ENTITY quit "Salir">
 
 <!ENTITY addons "Complementos">
 <!ENTITY downloads "Baixadas">
 <!ENTITY apps "Aplicacions">
-<!ENTITY char_encoding "Codificación d\'os caracters">
+<!ENTITY char_encoding "Codificación d'os caracters">
 
 <!ENTITY share "Compartir">
 <!ENTITY share_title "Compartir por meyo de">
 <!ENTITY share_image_failed "No se puet compartir a imachen">
 <!ENTITY save_as_pdf "Alzar como PDF">
 <!ENTITY find_in_page "Trobar en a pachina">
-<!ENTITY desktop_mode "Demandar a versión d\'escritorio d\'o puesto">
+<!ENTITY desktop_mode "Demandar a versión d'escritorio d'o puesto">
 <!ENTITY tools "Ferramientas">
 <!ENTITY new_tab "Pestanya nueva">
 <!ENTITY new_private_tab "Nueva pestanya de navegación privada">
 <!ENTITY close_all_tabs "Zarrar todas as pestanyas">
 <!ENTITY tabs_normal "Pestanyas">
 <!ENTITY tabs_private "Privadas">
 <!ENTITY tabs_synced "Sincronizadas">
 <!ENTITY wallpaper_success "Fondo de pantalla esviellau">
-<!ENTITY wallpaper_progress "Configuración d\'o fondo de pantalla">
-<!ENTITY wallpaper_fail "No s\'ha puesto establir o fondo de pantalla">
+<!ENTITY wallpaper_progress "Configuración d'o fondo de pantalla">
+<!ENTITY wallpaper_fail "No s'ha puesto establir o fondo de pantalla">
 <!-- 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">
 
@@ -156,66 +157,67 @@ size. -->
 <!ENTITY contextmenu_open_private_tab "Ubrir en una pestanya privada">
 <!ENTITY contextmenu_open_in_reader "Ubrir en o Lector">
 <!ENTITY contextmenu_remove_history "Suprimir">
 <!ENTITY contextmenu_remove_bookmark "Suprimir">
 <!ENTITY contextmenu_add_to_launcher "Adhibir-lo a la pantalla inicial">
 <!ENTITY contextmenu_share "Compartir">
 <!ENTITY contextmenu_pasteandgo "Apegar &amp; Ir">
 <!ENTITY contextmenu_paste "Apegar">
-<!ENTITY contextmenu_copyurl "Copiar l\'adreza">
+<!ENTITY contextmenu_copyurl "Copiar l'adreza">
 <!ENTITY contextmenu_edit_bookmark "Editar">
 
-<!ENTITY history_removed "S\'ha eliminau a pachina">
+<!ENTITY history_removed "S'ha 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">
 
-<!ENTITY site_settings_title2       "Achustes d\'o puesto…">
+<!ENTITY site_settings_title2       "Achustes d'o puesto…">
 <!ENTITY site_settings_cancel       "Cancelar">
 <!ENTITY site_settings_clear        "Limpiar">
 <!ENTITY site_settings_no_settings  "No i hai garra opción por limpiar.">
 
 <!ENTITY reading_list "Lista de lectura">
-<!ENTITY reading_list_added "S\'ha adhibiu a la suya pachina de lectura">
-<!ENTITY reading_list_removed "S\'ha eliminau d\'a suya pachina de lectura">
-<!ENTITY reading_list_failed "No s\'ha puesto adhibir a pachina en a suya Lista de lectura">
+<!ENTITY reading_list_added "S'ha adhibiu a la suya pachina de lectura">
+<!ENTITY reading_list_removed "S'ha eliminau d'a suya pachina de lectura">
+<!ENTITY reading_list_failed "No s'ha puesto adhibir a pachina en a suya Lista de lectura">
 <!ENTITY reader "Lector">
 
 <!ENTITY masterpassword_create_title "Creyar una clau mayestra">
 <!ENTITY masterpassword_remove_title "Suprimir a clau mayestra">
 <!ENTITY masterpassword_password "Clau">
 <!ENTITY masterpassword_confirm "Confirme a clau">
 
-<!ENTITY button_ok "D\'alcuerdo">
+<!ENTITY button_ok "D'alcuerdo">
 <!ENTITY button_cancel "Cancelar">
 <!ENTITY button_yes "Sí">
 <!ENTITY button_no "No">
 <!ENTITY button_clear_data "Borrar os datos">
 <!ENTITY button_set "Configurar">
 <!ENTITY button_clear "Limpiar">
 
 <!ENTITY abouthome_addons_title "Os complementos de &brandShortName;">
 <!ENTITY abouthome_addons_browse "Amostrar totz os complementos de &brandShortName;">
-<!ENTITY abouthome_last_tabs_title "As pestanyas d\'a zaguera vegada">
-<!ENTITY abouthome_last_tabs_open "Ubrir todas as pestanyas d\'a zaguera vegada">
-<!ENTITY abouthome_top_sites_title "Os vuestros puestos">
+<!ENTITY abouthome_last_tabs_title "As pestanyas d'a zaguer vegada">
+<!ENTITY abouthome_last_tabs_open "Ubrir todas as pestanyas d'a zaguera vegada">
+<!ENTITY abouthome_top_sites_title "Habituals">
 <!ENTITY abouthome_topsites_edit "Editar">
 <!ENTITY abouthome_topsites_pin "Clavar o puesto">
 <!ENTITY abouthome_topsites_unpin "Desclavar o puesto">
-<!ENTITY abouthome_topsites_unpinall "Desclavar-los totz">
+<!ENTITY abouthome_topsites_remove "Eliminar">
 <!-- Localization note (abouthome_about_sync3, abouthome_about_apps2): The
      chevron (ex: "»"; unicode= U+00BB) is used as an arrow to show that
      clicking this text in the promotions box will perform some action. Note
      that a non-breaking space (unicode= U+00A0) should be used between this
      character and the remainder of the string to prevent word wrap. -->
-<!ENTITY abouthome_about_sync3 "Configurar o Firefox Sync ta accedir ta os marcapachinas, l\'historial y as pestanyas d\'os suyos atros dispositivos&#x00A0;»">
-<!ENTITY abouthome_about_apps3 "Baixe-se aplicacions d\'o mercau de Firefox y descubra o millor que o ret le puede ofrir&#x00A0;»">
+
+<!ENTITY abouthome_about_sync3 "Configurar o Firefox Sync ta accedir ta os marcapachinas, l'historial y as pestanyas d'os suyos atros dispositivos&#x00A0;»">
+<!ENTITY abouthome_about_apps3 "Baixe-se aplicacions d'o mercau de Firefox y descubra o millor que o ret le puede ofrir&#x00A0;»">
 <!-- Localization note (abouthome_sync_bold_name, abouthome_apps_bold_name):
      These strings are accentuated as bold text in the "abouthome_about_..."
      strings above. These strings should be a subset of the strings above and
      generally be the name of the product the string describes. -->
 <!ENTITY abouthome_sync_bold_name "Firefox Sync">
 <!ENTITY abouthome_apps_bold_name2 "Mercau de Firefox">
 
 <!ENTITY filepicker_title "Trigue un fichero">
@@ -233,39 +235,39 @@ which is run by
 Example Enterprises, Inc.
 
 The layout of the identity dialog prevents combining this into a single string with
 substitution variables.  If it is difficult to translate the sense of the string
 with that structure, consider a translation which ignores the preceding domain and
 just addresses the organization to follow, e.g. "This site is run by " -->
 <!ENTITY identity_run_by "que perteneix a">
 
-<!ENTITY private_data_success "S\'ha borrau os datos privaus">
-<!ENTITY private_data_fail "Bells datos privaus no s\'han puesto borrar">
+<!ENTITY private_data_success "S'ha borrau os datos privaus">
+<!ENTITY private_data_fail "Bells datos privaus no s'han puesto borrar">
 
 <!ENTITY bookmarkhistory_button_import "Importar">
 <!ENTITY bookmarkhistory_import_both "Se son importando os marcapachinas y 
-l\'historial dende Android">
+l'historial dende Android">
 <!ENTITY bookmarkhistory_import_bookmarks "Se son importando os 
 marcapachinas dende Android">
-<!ENTITY bookmarkhistory_import_history "Se ye importando l\'historial 
+<!ENTITY bookmarkhistory_import_history "Se ye importando l'historial 
 dende Android">
 <!ENTITY bookmarkhistory_import_wait "Aguarde por favor...">
 <!-- Localization note (suggestions_prompt2): The placeholder &formatS; will be
      replaced with the name of the search engine. -->
 
-<!ENTITY suggestions_prompt2 "Quiere activar as sucherencias de busca d\'o &formatS;?">
+<!ENTITY suggestions_prompt2 "Quiere activar as sucherencias de busca d'o &formatS;?">
 
 <!ENTITY webapp_generic_name "Aplicacions">
 
 <!ENTITY searchable_description "Marcapachinas y historia">
 <!-- Updater notifications --> 
 
 <!ENTITY updater_start_title2 "Esvielle disponible ta &brandShortName;">
 <!ENTITY updater_start_select2 "Toque-ie ta baixar-la">
 
 <!ENTITY updater_downloading_title2 "Se ye baixando &brandShortName;">
 <!ENTITY updater_downloading_title_failed2 "A baixada ha fallau">
-<!ENTITY updater_downloading_select2 "Toque-ie ta aplicar l\'esvielle malas que se baixe">
+<!ENTITY updater_downloading_select2 "Toque-ie ta aplicar l'esvielle malas que se baixe">
 <!ENTITY updater_downloading_retry2 "Toque-ie ta tornar a prebar-lo">
 
 <!ENTITY updater_apply_title2 "Esvielle disponible ta &brandShortName;">
 <!ENTITY updater_apply_select2 "Toque-ie ta esviellar">
--- a/mobile/android/base/sync_strings.dtd
+++ b/mobile/android/base/sync_strings.dtd
@@ -9,98 +9,98 @@
 <!-- Main titles. -->
 
 <!ENTITY sync.app.name.label "&syncBrand.fullName.label;">
 <!ENTITY sync.title.connect.label "Connectar ta &syncBrand.shortName.label;">
 <!ENTITY sync.title.adddevice.label "Adhibir una cuenta de &syncBrand.fullName.label;">
 <!ENTITY sync.title.pair.label "Vincular un dispositivo">
 <!-- J-PAKE Key Screen -->
 
-<!ENTITY sync.subtitle.connect.label "Ta activar un nuevo dispositivo, seleccione \\&quot;Configurar &syncBrand.shortName.label;\\&quot; en l\'atro dispositivo.">
+<!ENTITY sync.subtitle.connect.label "Ta activar un nuevo dispositivo, seleccione “Configurar &syncBrand.shortName.label;“ en l'atro dispositivo.">
 <!ENTITY sync.subtitle.header2.label "Introduzca iste codigo en o suyo dispositivo">
-<!ENTITY sync.subtitle.connectlocation2.label "Seleccione “&sync.title.pair.label;” en a sección &syncBrand.shortName.label; d\\'as opcions de Firefox en l\\'atro dispositivo.">
-<!ENTITY sync.subtitle.pair.label "Ta activar-lo, seleccione «Vincular un dispositivo» en l\'atro dispositivo.">
+<!ENTITY sync.subtitle.connectlocation2.label "Seleccione “&sync.title.pair.label;” en a sección &syncBrand.shortName.label; d'as opcions de Firefox en l'atro dispositivo.">
+<!ENTITY sync.subtitle.pair.label "Ta activar-lo, seleccione “Vincular un dispositivo” en l'atro dispositivo.">
 <!ENTITY sync.pin.default.label "...\n...\n...\n">
 <!ENTITY sync.pin.oneline.label "...">
 <!ENTITY sync.link.show.label "Amostrar-me como.">
 <!ENTITY sync.link.advancedsetup.label "Configuración abanzada…">
 <!ENTITY sync.link.nodevice.label "No tiengo o dispositivo aquí…">
 <!-- J-PAKE Waiting Screen -->
 
-<!ENTITY sync.jpake.subtitle.waiting.label "Se ye asperando a l\'atro dispositivo…">
+<!ENTITY sync.jpake.subtitle.waiting.label "Se ye asperando a l'atro dispositivo…">
 <!-- Account Login Screen -->
 
-<!ENTITY sync.subtitle.account.label "Escriba a información d\'a suya atra cuenta de &syncBrand.fullName.label;">
-<!ENTITY sync.input.username.label "Nombre d\'a cuenta">
+<!ENTITY sync.subtitle.account.label "Escriba a información d'a suya atra cuenta de &syncBrand.fullName.label;">
+<!ENTITY sync.input.username.label "Nombre d'a cuenta">
 <!ENTITY sync.input.password.label "Clau">
 <!ENTITY sync.input.key.label "Clau de recuperación">
 <!ENTITY sync.checkbox.server.label "Emplegar un servidor personalizau">
-<!ENTITY sync.input.server.label "URL d\'o servidor">
+<!ENTITY sync.input.server.label "URL d'o servidor">
 <!-- Setup Fail -->
   
-<!ENTITY sync.title.fail.label "No s\'ha puesto configurar &syncBrand.shortName.label;">
-<!ENTITY sync.subtitle.fail.label "&syncBrand.fullName.label; no s\'ha puesto connectar t\'o servidor. Quiere mirar de connectar-se unatra vegada?">
+<!ENTITY sync.title.fail.label "No s'ha puesto configurar &syncBrand.shortName.label;">
+<!ENTITY sync.subtitle.fail.label "&syncBrand.fullName.label; no s'ha puesto connectar t'o servidor. Quiere mirar de connectar-se unatra vegada?">
 <!ENTITY sync.button.tryagain.label "Torna-lo a prebar">
 <!ENTITY sync.button.manual.label "Configuración manual">
-<!ENTITY sync.subtitle.nointernet.label "No i hai garra connexión d\'Internet disponible.">
-<!ENTITY sync.subtitle.failaccount.label "Ha fallau a creyación d\'a cuenta en o suyo dispositivo.">
-<!ENTITY sync.subtitle.failmultiple.label "Tien instalau mas d\'un Firefox? Actualment &syncBrand.fullName.label; nomás admite una instalación de Firefox de vez. Por favor, desinstale as atras instancias ta fer servir &syncBrand.shortName.label;.">
+<!ENTITY sync.subtitle.nointernet.label "No i hai garra connexión d'Internet disponible.">
+<!ENTITY sync.subtitle.failaccount.label "Ha fallau a creyación d'a cuenta en o suyo dispositivo.">
+<!ENTITY sync.subtitle.failmultiple.label "Tien instalau mas d'un Firefox? Actualment &syncBrand.fullName.label; nomás admite una instalación de Firefox de vez. Por favor, desinstale as atras instancias ta fer servir &syncBrand.shortName.label;.">
 <!-- Setup Success -->
   
-<!ENTITY sync.title.success.label "S\'ha rematau a configuración">
+<!ENTITY sync.title.success.label "S'ha rematau a configuración">
 <!ENTITY sync.subtitle.success.label1 "Os suyos datos se son descargando agora en o fondo. Puet ir ta Achustes ta administrar a suya cuenta u empecipiar a navegar con &brandShortName;.">
 <!ENTITY sync.settings.label "Opcions">
 <!ENTITY sync.subtitle.manage.label1 "A suya cuenta de &syncBrand.fullName.label; ya ye configurada. Puede ir ta os Achustes ta administrar a suya cuenta u ubrir o &brandShortName;.">
 <!-- Pair Device -->
 
 <!ENTITY sync.pair.tryagain.label "Torna-lo a prebar.">
-<!ENTITY sync.pair.connectlocation.label "Ta activar o suyo nuevo dispositivo, trigue \&quot;Configurar &syncBrand.shortName.label;“ en o dispositivo, y seleccione “Tiengo una cuenta“.">
+<!ENTITY sync.pair.connectlocation.label 'Ta activar o suyo nuevo dispositivo, trigue "Configurar &syncBrand.shortName.label;“ en o dispositivo, y seleccione “Tiengo una cuenta“.'>
 <!-- Firefox SyncAdapter Settings Screen -->
 
 <!ENTITY sync.settings.options.label "Opcions">
 <!ENTITY sync.summary.pair.label "Vincule unatro dispositivo a la suya cuenta de &syncBrand.shortName.label;">
 <!-- Configure Engines -->
 
 <!ENTITY sync.configure.engines.title.label "Qué cosas sincronizar?">
 <!ENTITY sync.configure.engines.sync.my.title.label "Sincronizar os suyos…">
 <!ENTITY sync.configure.engines.title.bookmarks "Marcapachinas">
 <!ENTITY sync.configure.engines.title.passwords "Claus">
 <!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\'alcuerdo">
+<!ENTITY sync.button.ok.label "D'alcuerdo">
 <!-- Account strings -->
   
 <!ENTITY sync.account.label.label "&syncBrand.fullName.label;">
 <!-- Bookmark folder strings -->
   
-<!ENTITY bookmarks.folder.menu.label "Menú d\'os marcapachinas">
+<!ENTITY bookmarks.folder.menu.label "Menú d'os marcapachinas">
 <!ENTITY bookmarks.folder.places.label ''>
 <!ENTITY bookmarks.folder.tags.label "Etiquetas">
-<!ENTITY bookmarks.folder.toolbar.label "Barra de ferramientas d\'os marcapachinas">
+<!ENTITY bookmarks.folder.toolbar.label "Barra de ferramientas d'os marcapachinas">
 <!ENTITY bookmarks.folder.unfiled.label "Marcapachinas desordenaus">
-<!ENTITY bookmarks.folder.desktop.label "Marcapachinas d\'escritorio">
-<!ENTITY bookmarks.folder.mobile.label "Marcapachinas d\'o mobil">
+<!ENTITY bookmarks.folder.desktop.label "Marcapachinas d'escritorio">
+<!ENTITY bookmarks.folder.mobile.label "Marcapachinas d'o mobil">
 <!ENTITY bookmarks.folder.readinglist.label "Lista de lectura">
 <!-- Pinned sites on about:home. This folder should never be shown to the user, but we have to give it a string name -->
 <!ENTITY bookmarks.folder.pinned.label "Clavadas">
 <!-- Notification strings -->
 
 <!ENTITY sync.notification.oneaccount.label "Nomás se permite una cuenta de &syncBrand.fullName.label;.">
-<!ENTITY sync.notification.configure.saved "S\'ha alzau as suyas seleccions.">
+<!ENTITY sync.notification.configure.saved "S'ha alzau as suyas seleccions.">
 <!-- Incorrect settings and changing credentials. -->
 
 <!ENTITY sync.invalidcreds.label "Nombre de cuenta u clau incorrectos.">
 <!ENTITY sync.invalidserver.label "Escriba una URL de servidor valida">
 <!ENTITY sync.verifying.label "Verificando…">
 <!ENTITY sync.new.recoverykey.status.incorrect "A clau de recuperación ye incorrecta. Torne a prebar-lo.">
 <!-- Send tab to device. -->
 
 <!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\'ha ninviau a pestanya!">
+<!ENTITY sync.text.tab.sent.label "S'ha ninviau a pestanya!">
 <!ENTITY sync.text.tab.not.sent.label "I ha habiu bell problema en ninviar a suya pestanya.">
--- a/mobile/android/chrome/aboutApps.dtd
+++ b/mobile/android/chrome/aboutApps.dtd
@@ -6,8 +6,10 @@
 <!ENTITY aboutApps.header                          "As suyas aplicacions">
 <!-- LOCALIZATION NOTE (aboutApps.noApps.pre): include a trailing space as needed -->
 <!-- LOCALIZATION NOTE (aboutApps.noApps.middle): avoid leading/trailing spaces, this text is a link -->
 <!-- LOCALIZATION NOTE (aboutApps.noApps.post): include a starting space as needed -->
 
 <!ENTITY aboutApps.noApps.pre "No s'ha instalau garra aplicación web. Aconsiga-ne beluna en ">
 <!ENTITY aboutApps.noApps.middle3 "Mercau de Firefox">
 <!ENTITY aboutApps.noApps.post ".">
+<!ENTITY aboutApps.uninstall "Desinstalar">
+<!ENTITY aboutApps.addToHomescreen "Adhibir ta la pantalla d'inicio">
deleted file mode 100644
--- a/mobile/android/chrome/aboutApps.properties
+++ /dev/null
@@ -1,6 +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/.
-
-appsContext.uninstall=Desinstalar
-appsContext.shortcut=Adhibir en a pantalla d'inicio
--- a/mobile/android/chrome/aboutDownloads.dtd
+++ b/mobile/android/chrome/aboutDownloads.dtd
@@ -1,7 +1,15 @@
 <!-- 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 aboutDownloads.title                      "Descargas">
 <!ENTITY aboutDownloads.header                     "As suyas descargas">
 <!ENTITY aboutDownloads.empty                      "Garra descarga">
+
+<!ENTITY aboutDownloads.open                       "Ubrir">
+<!ENTITY aboutDownloads.remove                     "Eliminar">
+<!ENTITY aboutDownloads.removeAll                  "Eliminar todas">
+<!ENTITY aboutDownloads.pause                      "Pausar">
+<!ENTITY aboutDownloads.resume                     "Continar">
+<!ENTITY aboutDownloads.cancel                     "Cancelar">
+<!ENTITY aboutDownloads.retry                      "Reintentar">
--- a/mobile/android/chrome/aboutDownloads.properties
+++ b/mobile/android/chrome/aboutDownloads.properties
@@ -1,23 +1,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-downloadAction.open=Ubrir
-downloadAction.remove=Eliminar
-downloadAction.deleteAll=Eliminar tot
-
 # LOCALIZATION NOTE (downloadMessage.deleteAll):
 # Semi-colon list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 downloadMessage.deleteAll=Eliminar ista baixada?;Eliminar #1 baixadas?
 
-downloadAction.pause=Pausar
-downloadAction.resume=Continar
-downloadAction.cancel=Cancelar
-downloadAction.retry=Tornar a prebar
+downloadAction.deleteAll=Eliminar-las todas
+
 downloadState.downloading=Se ye descargando…
 downloadState.canceled=Cancelau
 downloadState.failed=Ha fallau
 downloadState.paused=Pausau
 downloadState.starting=Se ye encetando…
 downloadState.unknownSize=Mida desconoixida
deleted file mode 100644
--- a/mobile/android/chrome/aboutHome.dtd
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY homepage.default                          "Pachina d'encieto de &brandShortName;">
--- a/mobile/android/chrome/browser.properties
+++ b/mobile/android/chrome/browser.properties
@@ -188,17 +188,17 @@ opensearch.searchFor=Mirar «%S»
 # Open in Another App
 # LOCALIZATION NOTE: openinapp.specific is the text displayed if there is a single external app
 # %S is the name of the app, like "YouTube" or "Picassa"
 openinapp.specific=Ubrir en l'aplicación %S
 openinapp.general=Ubrir en unatra aplicación
 
 # Clear Private Data
 clearPrivateData.title=Limpiar os datos privaus
-clearPrivateData.message=Deseya eliminar o suyo historial de navegación y preferencias, incluindo claus y cookies?
+clearPrivateData.message=Quiere eliminar o suyo historial de navegación y preferencias, incluindo claus y cookies?
 
 # LOCALIZATION NOTE (browser.menu.showCharacterEncoding): Set to the string
 # "true" (spelled and capitalized exactly that way) to show the "Character
 # Encoding" menu in the site menu. Any other value will hide it. Without this
 # setting, the "Character Encoding" menu must be enabled via Preferences.
 # This is not a string to translate. If users frequently use the "Character Encoding"
 # menu, set this to "true". Otherwise, you can leave it as "false".
 browser.menu.showCharacterEncoding=false
@@ -230,16 +230,18 @@ contextmenu.copyImageLocation=Copiar a localización d'a imachen
 contextmenu.shareImage=Compartir a imachen
 contextmenu.saveImage=Alza la imachen
 contextmenu.setWallpaper=Fixar como fondo de pantalla
 contextmenu.addSearchEngine=Adhibir un motor de busca
 contextmenu.playMedia=Reproducir
 contextmenu.pauseMedia=Pausar
 contextmenu.shareMedia=Compartir o video
 contextmenu.showControls2=Amostrar os controls
+contextmenu.saveVideo=Alzar o video
+contextmenu.saveAudio=Alzar l'audio
 
 contextmenu.copy=Copiar
 contextmenu.copyAll=Copiar-lo tot
 contextmenu.selectWord=Seleccionar a parola
 contextmenu.selectAll=Seleccionar-lo tot
 contextmenu.paste=Apegar
 
 # Select UI
@@ -313,8 +315,18 @@ helperapps.openWithList2=Obrir con una aplicación
 helperapps.always=Siempre
 helperapps.never=Nunca
 
 #Lightweight themes
 # LOCALIZATION NOTE (lwthemeInstallRequest.message): %S will be replaced with
 # the host name of the site.
 lwthemeInstallRequest.message=Iste puesto (%S) ha mirau d'instalar un tema.
 lwthemeInstallRequest.allowButton=Permitir-lo
+
+# LOCALIZATION NOTE (getUserMedia.shareCamera.message, getUserMedia.shareMicrophone.message, getUserMedia.shareCameraAndMicrophone.message, getUserMedia.sharingCamera.message, getUserMedia.sharingMicrophone.message, getUserMedia.sharingCameraAndMicrophone.message): %S is the website origin (e.g. www.mozilla.org)
+getUserMedia.shareCamera.message = Quiere compartir a suya camara con %S?
+getUserMedia.shareMicrophone.message = Quiere compartir o microfono con %S?
+getUserMedia.shareCameraAndMicrophone.message = Quiere compartir a camara y o microfono con %S?
+getUserMedia.denyRequest.label = No compartir
+getUserMedia.shareRequest.label = Compartir
+getUserMedia.sharingCamera.message = Ye compartindo a camara con %S.
+getUserMedia.sharingMicrophone.message = Ye compartindo o microfono con %S.
+getUserMedia.sharingCameraAndMicrophone.message = Ye compartindo a camara y o microfono con %S.
new file mode 100644
--- /dev/null
+++ b/mobile/android/chrome/pippki.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/.
+
+nssdialogs.ok.label=OK
+nssdialogs.cancel.label=Cancelar
+
+# These strings are stolen from security/manager/locales/en-US/chrome/pippki/pippki.dtd
+downloadCert.title=Descargando certificau
+downloadCert.message1=Se l'ha demandau que confíe en una nueva Autoridat Certificadera (CA).
+downloadCert.viewCert.label=Veyer
+downloadCert.trustSSL=Confiar en ista CA ta identificar puestos web.
+downloadCert.trustEmail=Confiar en ista CA ta identificar usuarios de correu.
+downloadCert.trustObjSign=Confiar en ista CA ta identificar desembolicadors de software.
+caCertExists.title=O certificau existe
+caCertExists.message=O certificau ya existe.
+
+certmgr.title=Detalles d'o certificau
+# These strings are stolen from security/manager/locales/en-US/chrome/pippki/certManager.dtd
+certmgr.subjectinfo.label=Emeso ta
+certmgr.issuerinfo.label=Emeso por
+certmgr.validity.label=Valideza
+certmgr.fingerprints.label=Ditaladas dichitals
+certmgr.certdetail.cn=Nombre común (CN)
+certmgr.certdetail.o=Organización (O)
+certmgr.certdetail.ou=Unidat organizativa (OU)
+certmgr.certdetail.serialnumber=Numero de serie
+certmgr.certdetail.sha1fingerprint=Ditalada dichital SHA1
+certmgr.certdetail.md5fingerprint=Ditalada dichital MD5
+certmgr.issued=Emeso lo
+certmgr.expires=Circumduz o
--- a/mobile/android/defines.inc
+++ b/mobile/android/defines.inc
@@ -1,14 +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/.
-#filter emptyLines
-
+# 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/.#filter emptyLines
 #define MOZ_LANGPACK_CREATOR Mozilla.org / Softaragonés
 
 # If non-English locales wish to credit multiple contributors, uncomment this
-
 # variable definition and use the format specified.
-
 #define MOZ_LANGPACK_CONTRIBUTORS <em:contributor>Softaragones</em:contributor><em:contributor>Juan Pablo Martínez Cortés</em:contributor><em:contributor>Chesús Daniel Trigo</em:contributor><em:contributor>Daniel Martínez Cucalón</em:contributor>
 
-#unfilter emptyLines
+#unfilter emptyLines
\ No newline at end of file
new file mode 100644
--- /dev/null
+++ b/mobile/chrome/region.properties
@@ -0,0 +1,36 @@
+# 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/.
+
+# Default search engine
+browser.search.defaultenginename=Google
+
+# Search engine order (order displayed in the search bar dropdown)s
+browser.search.order.1=Google
+
+# This is the default set of web based feed handlers shown in the reader
+# selection UI
+browser.contentHandlers.types.0.title=My Yahoo
+browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s
+browser.contentHandlers.types.1.title=Google
+browser.contentHandlers.types.1.uri=http://fusion.google.com/add?feedurl=%s
+
+# Keyword URL (for location bar searches)
+keyword.URL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
+
+# increment this number when anything gets changed in the list below.  This will
+# cause Firefox to re-read these prefs and inject any new handlers into the
+# profile database.  Note that "new" is defined as "has a different URL"; this
+# means that it's not possible to update the name of existing handler, so
+# don't make any spelling errors here.
+gecko.handlerService.defaultHandlersVersion=2
+
+# The default set of protocol handlers for webcal:
+gecko.handlerService.schemes.webcal.0.name=30 Boxes
+gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s
+
+# The default set of protocol handlers for mailto:
+gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
+gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s
+gecko.handlerService.schemes.mailto.1.name=Gmail
+gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
--- a/mobile/overrides/passwordmgr.properties
+++ b/mobile/overrides/passwordmgr.properties
@@ -27,14 +27,14 @@ notifyBarChangeButtonAccessKey =
 notifyBarDontChangeButtonText = No cambiar-la
 notifyBarDontChangeButtonAccessKey =
 userSelectText = Confirme ta qué usuario ye cambiando a clau
 hidePasswords=Amagar as claus
 hidePasswordsAccessKey=C
 showPasswords=Amostrar as claus
 showPasswordsAccessKey=S
 noMasterPasswordPrompt=Ye seguro que deseya amostrar as suyas claus?
-removeAllPasswordsPrompt=Ye seguro de querer eliminar todas as claus?
+removeAllPasswordsPrompt=Ye seguro que quiere eliminar todas as claus?
 removeAllPasswordsTitle=Eliminar todas as claus
 loginsSpielAll=As claus d'istos puestos son alzadas en o suyo dispositivo:
 loginsSpielFiltered=Istas claus concuerdan con a suya busca:
 username=Nombre d'usuario
 password=Clau
--- a/mobile/profile/bookmarks.inc
+++ b/mobile/profile/bookmarks.inc
@@ -1,80 +1,61 @@
-# 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/.
-#filter emptyLines
-
+# 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/.#filter emptyLines
 # LOCALIZATION NOTE: The 'en-US' strings in the URLs will be replaced with
-
 # your locale code, and link to your translated pages as soon as they're 
-
 # live.
 
-
 # LOCALIZATION NOTE: Some of these URLs are currently 404s, but should be coming
 
-
 # online shortly.
 
 
-
 # LOCALIZATION NOTE (bookmarks_title):
 
 
-
 # title for the folder that will contains the default bookmarks
 
 
-
 #define bookmarks_title Mobil
 
 
 
 # LOCALIZATION NOTE (bookmarks_aboutBrowser):
 
 
-
 # link title for about:fennec
 
 
-
 #define bookmarks_aboutBrowser Firefox: Tocant a o suyo navegador
 
 
 
 # LOCALIZATION NOTE (bookmarks_addons):
 
 
-
 # link title for https://addons.mozilla.org/en-US/mobile
 
 
-
 #define bookmarks_addons Firefox: Personalización con complementos
 
 
 
 # LOCALIZATION NOTE (bookmarks_support):
 
 
-
 # link title for https://support.mozilla.org/mobile
 
 
-
 #define bookmarks_support Firefox: Asistencia
 
 
 
 # LOCALIZATION NOTE (bookmarks_aboutHome):
 
 
-
 # link title for about:home
 
 
-
 #define bookmarks_aboutHome Inicio de Firefox
 
 
 
-#unfilter emptyLines
+#unfilter emptyLines
\ No newline at end of file
new file mode 100644
--- /dev/null
+++ b/mobile/searchplugins/amazondotcom.xml
@@ -0,0 +1,13 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
+<ShortName>Amazon.com</ShortName>
+<InputEncoding>ISO-8859-1</InputEncoding>
+<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2ZJREFUeNrEV01IFGEYfndXNzq0QdalJOoUbQiBUuopD2k/GFSG/Vxyq0OHbCUjwn7AEooUzUNRkdkhS1o9JBVaUDctKqhoRQi0WjtlxG6XVtfpfb6Z2caZ2ZnZXZdeeJxvx+973+f9+775XJIkkUaWMcoYG5TxfMpvxlvGMGM8+RYEFOxn/JJyLzOMiwwv7LqUCNQwHjpxIxKJ0Gg4LABZUVhIfr+f1jLSlNuMwyCwEHoZS6xmvxoZoc6Oq+JpJoVMpOncWdpcWZkOiRIQ2MKDp1az+kIhOtV40pHG6zdvpEOixc1/VtqFvKX5gmOX0pkL2yDgsZpxt+sORaPROe8Q6ncf3tPAk8eG3Ks14lA8brsZYZ2yukBAwOfzCeMHA3WGNXrCVpLnJKeqRyhAfX5RfNmILQF4urG0VIzxBBkU5aQI9agIeU4JqNLZ0UH9ob6sDWZE4MDefSn7P1txO/FcbxypQG18nhinew/u5zYC3dyG+qLL1qjjCKDg9C21q2a3oe9zRsCsn2PR2JzfKEy9PB96Nj8E0IJm54IaGZwPZsWJOU4jY1kD2OlAQhsJjKu3bSe7yPUzifpgMPsuOBY8brtR1evmyFt0IL0IzH4fJtcCH7kK1hn2/hh71G1yKKEdz/DBBIOTkUkRemzVl1uvCGKzE4OMIaFbiv1LSX51L7mXl4kxvgeO8vMaJk0PHiHvjl4DCTWs2lMOX0L6cwD/Bxlp6hNNv2gUT9MjsLiB8koaMOxJRgCMgPijWsqvaCP3qqqUZ4JVzUASYyFyL/WTqyggPxWH4qGtBlJzagCGIYjEzJv2zHe38vOUt6mNPGv20OyPMMV7yuVwL5IjBlLmRej1UX7VLdmLt+2CMVKTiSDn0wO1NPPyBOtdLL+MyzWkTbGhC5AGsBdKkEtWAjglgjUwCq/FGjhV0ZosdOhXI5FyH0DoIIK9slB0CS8UCgr8AlpvpamwqHpttcO4WtSqA57ioKENE05IqIYSY46uD4Is0qmGG2s9RYeS7adI3Paz3K6lTMmzIdFmXp/d1Gb1YvLF7i4IzxMfu1ITYWOe1VWix7U5tlKpXkzwYycONqfVLcW+cU7lQ0jePf360DqRS4zT/+Ny+ofRxPBoL6fa6zmu5uvtbkwZyE/lev6a8VV9+VeAAQADg36zc4GRNAAAAABJRU5ErkJggg==</Image>
+<Url type="text/html" method="GET" template="http://m.amazon.com/gp/aw/s">
+  <Param name="k" value="{searchTerms}"/>
+</Url>
+<SearchForm>http://m.amazon.com/</SearchForm>
+</SearchPlugin>
new file mode 100644
--- /dev/null
+++ b/mobile/searchplugins/google.xml
@@ -0,0 +1,19 @@
+<!-- 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/. -->
+
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
+<ShortName>Google</ShortName>
+<InputEncoding>UTF-8</InputEncoding>
+<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAACv0lEQVR42sWX208TURDG958x8M+It5CoDxojGn0wPvCg8UljYhRjBCpqJBQbL6lgI5JyERpFRLAiF7GiqI0QbUCIlm1pQ6XM556z7dQNbTl1l/olkzTd0zO/THe+OUfbXk8ithnhM0I3Alscusxl5tRE8gojokagzBEVubUMDUqJ4x6CNwhMfQOiCSCVRl6tpYFHY8DeGwX38mkllF1u9OwDkEwB90cIZx4SrvQSpiNgEYC218DFLsKR1k33jGuqyfcZyWeXgPQ6UOu1PtvZSBj6BJaeBI7eVttXGWDkC4REorzPq5sIS3GwQt/hHMDpdkJWd4YLr3MPEv7WibsOAfgnwbo1UHjdwWYrwLWAQwDjc2D53hQv7fwyWC2DDgGMzYI1HSkKIFqTVdftEED7KFhEwGH35gCpNWD/TfsAbDxEYAXe56/CLheJFpTyDDnchg+CsKixf+Mab2ZN11ugqt5ZALGhdL+1dM7xhj+bIK4AYWIOUq0v+DeOAnDUuEmWd3AGCIaBnytgie/kOvsA6rEYA8vzksoPoCfBWtCBQy1lBuiZgkW/EsCptq0D4Ol3zEM495ik263TxnNAXbdzANzj9X3SlqXJrBoxM29Ox9538rNFAup8p0MAtV7p8Txmz3YIIOuaHQ3SByyGlViFOEfYApBl/m32vvy/qxqKr7/UxV6R8QUbANVN/JbLft/tUvu7rj4hZW/QVDd6/hEoxTUX9OwJygZA5wRYA6oAPBXZnP4ZQHp/VstJYI9LvQI/YuYBtsZtA+DkPQIhp76Q2pS73EOAeTy334Yd47BITD0BVsigrj8lpNLSG0RrKgHoxcspp58wH4siUfMN90+a8SoM2TFLcXEpUX5X4spXswPNJHt69CvkBEymcpeQ8CLQHwIu+NmgVIKvZpX/8XJamb2eV2QqEStD4pjMZebU/gD3oidE+JhxZwAAAABJRU5ErkJggg==</Image>
+<Url type="application/x-suggestions+json" method="GET" template="https://www.google.com/complete/search?client=firefox&amp;q={searchTerms}"/>
+<Url type="text/html" method="GET" template="https://www.google.com/search">
+  <Param name="q" value="{searchTerms}"/>
+  <Param name="ie" value="utf-8"/>
+  <Param name="oe" value="utf-8"/>
+  <Param name="aq" value="t"/>
+  <!-- Dynamic parameters -->
+  <Param name="rls" value="{moz:distributionID}:{moz:locale}:{moz:official}"/>
+</Url>
+<SearchForm>https://www.google.com</SearchForm>
+</SearchPlugin>
new file mode 100644
--- /dev/null
+++ b/mobile/searchplugins/list.txt
@@ -0,0 +1,4 @@
+amazondotcom
+google
+twitter
+wikipedia
new file mode 100644
--- /dev/null
+++ b/mobile/searchplugins/twitter.xml
@@ -0,0 +1,13 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
+  <ShortName>Twitter</ShortName>
+  <Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAABZWlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iPgogICAgICAgICA8eG1wOkNyZWF0b3JUb29sPkFjb3JuIHZlcnNpb24gMy4zPC94bXA6Q3JlYXRvclRvb2w+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgqo9EsfAAAFTUlEQVRYhcWXTWxUVRTHf+e+92Y6A7TTV2gwmGBCiMagC8EFEsNEjbokDAU/CMtu/IIQE01MCmpcmRgSSaQLFyQqYWhxYXQjdogbA8WARhANoiiClE6nnzPMzLvHxZs3zJTSFsRwkpvMm/vx/5//Ofe880RVuZtm7io64N7Jw2Q3hvUNTg2h2kUw6yZVrQ9UBVVp/G8+A1VhQN0Z5w4edFA19d8DA03rJMoBAVHQyBPtwc7X62itHP6nExt/DHQpNhjDMqhbFv8CIFmcSA3J4tCFVQi9jcDl80KKVKqkaUqNG+YF3j/8Fio7iCd9HAesheJkBfQz1NuhXa15OXyxA028huVH3eRnBUxIIIeraarSn38HZa1m/KcApBdPu6nMCN6oWP/IAVLtWxgfh2rFRv5gHMOiNhjNnwVOYZzNWPubZtpXRA40K3Aof4Sl/hNczh/QTf7zAHICjy8IpoekTrpv+CXaOj5kNF8hvFVOY4qBVHE9j+RCGM//CWYrapfgmBO6IfV7mHSgksXBGTmJG1uFF4epseOg2zTT8XOkBu1YukIiCipfEWdq+EfiyZWUS1UUtybKdL0CUAE9D+Ze0I80428XQepXJoy3TuB6MDVWIrHoUZDvpT+/U7J/JbSbinYRKChZPACmRh8CWUG5BKgzMzi1OWBBagVCr2b87ZE+RkElV6sHyjG8GCCG4niA4yZIpt7HJM9I//Cb0je2ska2XD/bcQ1zV9OAZKthsrBXN7a/KiCyO8QOgYdq1CvlDxjLv0KsJUa5ZAmqymTBEkssJ9byHhOFHunLDwKDqBxHbAeBWETMzb2vmTGA/gFAL672hMntiiCqBNJ7KUlnokAQbONa6WOMeGElwaFcDCgXFePEiSfW4bjrsBbKJaiWtaaAzErAWlAT3qhLOYU0AG6dePs9VYLhb1G5gnAOx3uAal3pMIY2UIqTQZiCGAQzJ7CgKIagCugFANanrwsT3YAwruYCS/1ngftr4NMPl1rYXASDzKU7YWSMI1wrVhA5C1wPOdHbcEkNSOxeCkUAG16dOQ+f3fvQLLE4qP5Kxw8hga7rNcUAaJqqgOjGjq+5VtpLh+/ges5NDrxVs3gtgBzRdLoqOVxlugINppn2l7k68gZBZeQOgCvgMTUORj8F4GiuaYFpWKkSxdzoUdA9wCUcNzrodiwg2QpBeUA3+t8B0JNuCm2zAtnas/Icbf4uoC3M3nnFerop4FIugurbAJLLNcl/I4HTtcnh869TyJ+i3U8CAVCdV8bXTQAqtPlQqezTTYtzksXRdLo6fWUTAe3BShZHu1dXMN6TjOS/ZEGbQ6vvIo4wr1AIoGWSrTFG82eYqNX90zPvbeqI6vsHcXV1WCrl0MjjoE8j2o3jdRJUldlDUiaxMEZxfIhqsFa3dJ6LXt0zLW5KQo1axNUNTUgsOIlRDySFna00SABSYZEfozhxGSvpucDrCggI+y/6+MuK/H2iQvt9nRjzCOgG4AVa/RYmCqBWpxUfJSxaFi/mEU/A+Mg3aMuL2rXgsvSe8LR79YwdVRMBAOnLP4OwE8sahBSJhWG7UBwH1RLg1uILImDV4BhDPAmuB2MjVxHe1Yy/B653TLOBNxEAkP7CclS3AhlgFbEWD9cLAaN1IuEIAihOVEBPIXxC4O7XrtY8NHfA8ybQ2GSGilx5GNw1wCpgGSILsArCGHAR5TTCMc34P9X35HBJ17qm+dq0DwzDvkHvlj9M9g167Ao/Pm51NIWg7okgHMSwBGEI5TTKLhQFdiM8iNTnNmNVb7tUz0zgRkIikar/Bey2Cfyf9i9sYiA4e9RbHQAAAABJRU5ErkJggg==</Image>
+  <Url type="text/html" method="GET" template="https://mobile.twitter.com/search/">
+    <Param name="q" value="{searchTerms}"/>
+  </Url>
+  <InputEncoding>UTF-8</InputEncoding>
+  <SearchForm>https://mobile.twitter.com/search</SearchForm>
+</SearchPlugin>
new file mode 100644
--- /dev/null
+++ b/mobile/searchplugins/wikipedia.xml
@@ -0,0 +1,18 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
+<ShortName>Wikipedia</ShortName>
+<InputEncoding>UTF-8</InputEncoding>
+<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAQAAADZc7J/AAAACXBIWXMAAAsTAAALEwEAmpwYAAADGGlDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjaY2BgnuDo4uTKJMDAUFBUUuQe5BgZERmlwH6egY2BmYGBgYGBITG5uMAxIMCHgYGBIS8/L5UBFTAyMHy7xsDIwMDAcFnX0cXJlYE0wJpcUFTCwMBwgIGBwSgltTiZgYHhCwMDQ3p5SUEJAwNjDAMDg0hSdkEJAwNjAQMDg0h2SJAzAwNjCwMDE09JakUJAwMDg3N+QWVRZnpGiYKhpaWlgmNKflKqQnBlcUlqbrGCZ15yflFBflFiSWoKAwMD1A4GBgYGXpf8EgX3xMw8BSMDVQYqg4jIKAUICxE+CDEESC4tKoMHJQODAIMCgwGDA0MAQyJDPcMChqMMbxjFGV0YSxlXMN5jEmMKYprAdIFZmDmSeSHzGxZLlg6WW6x6rK2s99gs2aaxfWMPZ9/NocTRxfGFM5HzApcj1xZuTe4FPFI8U3mFeCfxCfNN45fhXyygI7BD0FXwilCq0A/hXhEVkb2i4aJfxCaJG4lfkaiQlJM8JpUvLS19QqZMVl32llyfvIv8H4WtioVKekpvldeqFKiaqP5UO6jepRGqqaT5QeuA9iSdVF0rPUG9V/pHDBYY1hrFGNuayJsym740u2C+02KJ5QSrOutcmzjbQDtXe2sHY0cdJzVnJRcFV3k3BXdlD3VPXS8Tbxsfd99gvwT//ID6wIlBS4N3hVwMfRnOFCEXaRUVEV0RMzN2T9yDBLZE3aSw5IaUNak30zkyLDIzs+ZmX8xlz7PPryjYVPiuWLskq3RV2ZsK/cqSql01jLVedVPrHzbqNdU0n22VaytsP9op3VXUfbpXta+x/+5Em0mzJ/+dGj/t8AyNmf2zvs9JmHt6vvmCpYtEFrcu+bYsc/m9lSGrTq9xWbtvveWGbZtMNm/ZarJt+w6rnft3u+45uy9s/4ODOYd+Hmk/Jn58xUnrU+fOJJ/9dX7SRe1LR68kXv13fc5Nm1t379TfU75/4mHeY7En+59lvhB5efB1/lv5dxc+NH0y/fzq64Lv4T8Ffp360/rP8f9/AA0ADzT6lvFdAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAAHqSURBVHjapJUxb9NQFIW/JAip2xNS1/J+goeqUqeajdGVmFgwI1OcmYEgITFG7EgJQ+b2HzgbElJF+QU2iBl7YAFRnQ5+fnFcB0J8Jp/r53vPu+f6vYEA4JBTTjhkN/zkio9kAAihpyr1v/ijN7ovEHqiffFeDHTAdx6wL46HnPX4HM6HHNEHR0NGvRKMhvRE7wT3ACYssBggpyThIRMCAFaEzHhOiQWumfGFBQGQY0kB9EKSCsVCyKpQxUMhdOEMj4Vi91wIGX2uyNJtwTDHAgbjOUBJ/T50ETDAzCn0CiRpLkSd2VW1rqZR6uOpzHoWl40EkmkIlTIhNJc0bUSlSNNtCaZCKGtpyDZimXB92uhBhTEAHzx/BuQ8Isb62Dti16c7PahrNnbovFhXLGQaau4oqDSULDx/BcCl55cEDTUdCqqagWcXbjpqWD8ZWxRUGq5ZOTYhAXLHV0DU/qCtQLJCkZuM0PHQGThvL152JJh5M61SP2CpMpmmgdsTFDJCiaaubq0haQ7Q3xLUZq4NqzS0DNzWxNq8ksgbFmGgwf95oFgijJuB6v9L3Fx2HSg3XeExZxv1xuSEXQt/o8fqg9cDHfB15zuxjRuOETrfu/5b9bhcf+mlRmLgr/cTgp1vqR9c8YlvALcDAPr5jIx+4LKcAAAAAElFTkSuQmCC</Image>
+<Url type="application/x-suggestions+json" method="GET" template="http://en.wikipedia.org/w/api.php">
+  <Param name="action" value="opensearch"/>
+  <Param name="search" value="{searchTerms}"/>
+</Url>
+<Url type="text/html" method="GET" template="http://en.wikipedia.org/wiki/Special:Search">
+  <Param name="search" value="{searchTerms}"/>
+  <Param name="sourceid" value="Mozilla-search"/>
+</Url>
+<SearchForm>http://en.wikipedia.org/wiki/Special:Search</SearchForm>
+</SearchPlugin>
new file mode 100644
--- /dev/null
+++ b/mobile/searchplugins/yahoo.xml
@@ -0,0 +1,17 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
+<ShortName>Yahoo</ShortName>
+<InputEncoding>UTF-8</InputEncoding>
+<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAgY0hSTQAAeiUAAICDAAD5/wAAgOkAAHUwAADqYAAAOpgAABdvkl/FRgAAA7xJREFUeNrs10tslFUUB/DfN9NCaUsir2JAQAQKBgQXiFEeC6JdKAQCoiERXKiJrmRhNMZH3LjQjaILIiqKCWp8BgL4IGpQWkASCY+qWHm0CFjKyz5oO9PO56LfDNNhpmXHwp7ky9w5c+49//ud//nfO0EYhq6nxVxnGwAwAOC6Ayh6IVjfX8wEzMBMlCDdt2fwM+rR1s8a03AIR3AAv+EYGov6mLQKq3FPP4s34AN8gt8LxAxBEaZHT9rq85XgiWh3H15DchiPl6JdfRQly7XLBebuyAXwBdaFwhtTQt1SmSclFOpXNVeiCVNy/Mk8sQfweTaAT7GsZxhkEnfp1qVbiFAQffZpZVEpKrJ8+absQU2aAw9hRUpK+YhSyzbOVzFjpNbGNsnWpGRnShjS3NBq85PVOiV6vY1AICZQrEhMAHFsxZwoJJEHwHdoKcJ9eDG9UKIlac+6WsMm3mDJW/My0V89+pOTv5zVrsOtd08wbu5o7Rc7BAFDRpQoLok7uOmoprpLYj3dfQfmYRdO5QGwTcTMx9LMDASSiS4Htx3XptPx7aetOfogqFw81jcb9goQL467ac4otz0wCbQ2tavffcb+9+tyebIiApBr9ehMC9G07F8CgVKDDVeu7thJG6u2g+lLJ1n+zAKdkqp31jq1r6lnG0/XeLniPeuXbHG+vkVcPHu5+QV4sjUjREjll8iYcqV27zhs5FPD3L/2LlWv3qnx4L9mrp5o1sop1s/d7EDNX8qUKjeop/q9bWgBAN9nA8grRgHiYsqV+fbNPW5eONr0JbdY9XWVjpaE1yo2aWg6a6gy8TT1rr3/f80+C+oK9VMgUCQmqcsPz+3P+Lc8vsuRpgalSsQKJ4fdeXx/RxzIAHgHfxR6CyG6hVKJ7oy//VynpJSUVF/J4bM8vkO9DiNswbBIz3tZKFQSG2TS+DEql4/L+CcvGisRT2qua3PheHME9So7nF1rjI5a88/soPgCi9OyOBuVvfUzZczM4R7+ssrY2aOc3n/OxRPNSkeWmHrveJdOtvin9mKhIsxGc9Z4MKpxIYugYfC8t3PPgmW9uiGIKR5SpP1yQjKS9Jj4Fc272lJYiJ1ZvjpMjsYfoxaz8G5uByzHGryeWS1M6bjcGdUrniFnDzuCfOr2CM5n+QZlJYdGvNLXjeiNaOVnsRfJtNbHxcQj3gdXkp/AhkhNF+UkF11ifkRr9L06l4SFbC32YWmk6eOyRCtAC2qiW9HW6A6Rz5qjs+Z2TM3tuGDgn9EAgP89gP8GAF3DLhLnfG5QAAAAAElFTkSuQmCC</Image>
+<Url type="application/x-suggestions+json" method="GET"
+     template="http://ff.search.yahoo.com/gossip?output=fxjson&amp;command={searchTerms}" />
+<Url type="text/html" method="GET" template="http://search.yahoo.com/search">
+  <Param name="p" value="{searchTerms}"/>
+  <Param name="ei" value="UTF-8"/>
+  <MozParam name="fr" condition="pref" pref="yahoo-fr" />
+</Url>
+<SearchForm>http://search.yahoo.com/</SearchForm>
+</SearchPlugin>
--- a/mobile/xul/defines.inc
+++ b/mobile/xul/defines.inc
@@ -1,14 +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/.
-#filter emptyLines
-
+# 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/.#filter emptyLines
 #define MOZ_LANGPACK_CREATOR Mozilla.org / Softaragonés
 
 # If non-English locales wish to credit multiple contributors, uncomment this
-
 # variable definition and use the format specified.
-
 #define MOZ_LANGPACK_CONTRIBUTORS <em:contributor>Softaragones</em:contributor><em:contributor>Juan Pablo Martínez Cortés</em:contributor><em:contributor>Chesús Daniel Trigo</em:contributor><em:contributor>Daniel Martínez Cucalón</em:contributor>
 
-#unfilter emptyLines
+#unfilter emptyLines
\ No newline at end of file
--- a/suite/chrome/browser/navigator.dtd
+++ b/suite/chrome/browser/navigator.dtd
@@ -9,16 +9,18 @@
 
 
 <!ENTITY mainWindow.title "&brandShortName;">
 <!-- LOCALIZATION NOTE (mainWindow.titlemodifier) : DONT_TRANSLATE --> 
 <!ENTITY mainWindow.titlemodifier "&brandShortName;">
 <!-- LOCALIZATION NOTE (mainWindow.titlemodifiermenuseparator): DONT_TRANSLATE -->
 <!ENTITY mainWindow.titlemodifiermenuseparator " - ">
 
+<!ENTITY mainWindow.titleprivate "Private Browsing">
+
 <!ENTITY editPageCmd.label "Edit Page">
 <!ENTITY editPageCmd.accesskey "E">
 <!ENTITY editPageCmd.commandkey "e">
 
 <!ENTITY navbarCmd.label "Navigation Toolbar">
 <!ENTITY navbarCmd.accesskey "N">
 <!ENTITY bookmarksToolbarCmd.label     "Bookmarks Toolbar">
 <!ENTITY bookmarksToolbarCmd.accesskey "m">
new file mode 100644
--- /dev/null
+++ b/suite/chrome/browser/region.properties
@@ -0,0 +1,25 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# navigator.properties
+#
+# all.js
+#
+browser.startup.homepage=http://www.seamonkey-project.org/start/
+browser.throbber.url=http://www.seamonkey-project.org/
+browser.search.defaulturl=http://www.google.com/search?q=
+
+browser.translation.service=http://translate.google.com/translate?prev=/language_tools&u=
+browser.translation.serviceDomain=translate.google.com
+
+#config.js
+#
+startup.homepage_override_url=http://www.seamonkey-project.org/releases/seamonkey%VERSION%/
+
+# This is the default set of web based feed handlers shown in the reader
+# selection UI
+browser.contentHandlers.types.0.title=Google
+browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s
+browser.contentHandlers.types.1.title=My Yahoo!
+browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
--- a/suite/chrome/browser/taskbar.properties
+++ b/suite/chrome/browser/taskbar.properties
@@ -1,16 +1,18 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 taskbar.tasks.newTab.label=Open new tab
 taskbar.tasks.newTab.description=Open a new browser tab.
 taskbar.tasks.newWindow.label=Open new window
 taskbar.tasks.newWindow.description=Open a new browser window.
+taskbar.tasks.newPrivate.label=Open private window
+taskbar.tasks.newPrivate.description=Open a new private browsing window.
 taskbar.tasks.mailWindow.label=Open Mail & Newsgroups
 taskbar.tasks.mailWindow.description=Open the Mail & Newsgroups window.
 taskbar.tasks.composeMessage.label=Compose new message
 taskbar.tasks.composeMessage.description=Compose a new message.
 taskbar.tasks.openAddressBook.label=Open Address Book
 taskbar.tasks.openAddressBook.description=Open your Address Book.
 taskbar.tasks.openEditor.label=Open new Composer page
 taskbar.tasks.openEditor.description=Open a new Composer page.
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/aboutPrivateBrowsing.dtd
@@ -0,0 +1,18 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY privatebrowsingpage.title        "Private Browsing">
+<!-- LOCALIZATION NOTE: The experimental title is temporary -->
+<!ENTITY privatebrowsingpage.experimental "&privatebrowsingpage.title; is currently an experimental feature.">
+<!ENTITY privatebrowsingpage.description  "In a &privatebrowsingpage.title; window, &brandShortName; won't keep any disk cache, cookies or browser, search download or web form history. However downloaded files and bookmarks will still be saved.">
+<!ENTITY privatebrowsingpage.moreinfo     "While this computer won't have a record of your browsing history, your employer or Internet service provider might still be able to track the pages you visit.">
+<!ENTITY privatebrowsingpage.learnmore.label     "Learn more">
+<!ENTITY privatebrowsingpage.learnmore.accesskey "L">
+<!ENTITY privatebrowsingpage.private      "&brandShortName; won't remember any history for this window. Close the window to stop &privatebrowsingpage.title;.">
+<!ENTITY privatebrowsingpage.switch.label        "Switch to a normal window">
+<!ENTITY privatebrowsingpage.switch.accesskey    "S">
+<!ENTITY privatebrowsingpage.normal       "You are not currently using &privatebrowsingpage.title;.">
+<!ENTITY privatebrowsingpage.private.label       "Open a new private window">
+<!ENTITY privatebrowsingpage.private.accesskey   "O">
+<!ENTITY privatebrowsingpage.info         "To start &privatebrowsingpage.title;, you can also select File ― New ― Private Window.">
--- a/suite/chrome/common/contentAreaCommands.dtd
+++ b/suite/chrome/common/contentAreaCommands.dtd
@@ -2,20 +2,22 @@
    - 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/. -->
 <!-- Context Menu -->
 
 <!ENTITY popupWindowRejectCmd.label     "Reject popup windows from this website">
 <!ENTITY popupWindowRejectCmd.accesskey "o">
 <!ENTITY popupWindowAllowCmd.label      "Allow popup windows from this website">
 <!ENTITY popupWindowAllowCmd.accesskey  "o">
+<!ENTITY openLinkCmdInTab.label       "Open Link in New Tab">
+<!ENTITY openLinkCmdInTab.accesskey   "T">
 <!ENTITY openLinkCmd.label            "Open Link in New Window">
 <!ENTITY openLinkCmd.accesskey        "W">
-<!ENTITY openLinkCmdInTab.label       "Open Link in New Tab">
-<!ENTITY openLinkCmdInTab.accesskey   "T">
+<!ENTITY openLinkCmdInPrivateWindow.label     "Open Link in Private Window">
+<!ENTITY openLinkCmdInPrivateWindow.accesskey "d">
 <!ENTITY openLinkInWindowCmd.label    "Open">
 <!ENTITY openLinkInWindowCmd.accesskey "p">
 <!ENTITY openFrameCmd.label           "Open Frame in New Window">
 <!ENTITY openFrameCmd.accesskey       "W">
 <!ENTITY openFrameCmdInTab.label      "Open Frame in New Tab">
 <!ENTITY openFrameCmdInTab.accesskey  "T">
 <!ENTITY keywordfield.label           "Add a Keyword for this Search…">
 <!ENTITY keywordfield.accesskey       "K">
--- a/suite/chrome/common/dataman/dataman.properties
+++ b/suite/chrome/common/dataman/dataman.properties
@@ -22,16 +22,18 @@ perm.image.label=Load Images
 perm.install.label=Install Add-ons
 perm.offline-app.label=Offline Web Applications
 perm.object.label=Run Plugins
 perm.password.label=Alzar as claus
 perm.plugins.label=Activate Plugins
 perm.popup.label=Open Popup Windows
 perm.script.label=Run Scripts
 perm.stylesheet.label=Load Stylesheets
+perm.sts/use.label=Use Strict Transport Security
+perm.sts/subd.label=Apply Strict Transport Security to subdomains
 
 perm.type.default=Select a type
 
 # passwords
 pwd.hidePasswords=Amagar as claus
 pwd.hidePasswords.accesskey=P
 pwd.showPasswords=Amostrar as claus
 pwd.showPasswords.accesskey=P
--- a/suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
@@ -441,17 +441,17 @@
 <ol>
   <li>Open the <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu and choose Preferences.</li>
   <li>Under the Advanced category, click Software Installation. (If no
     subcategories are visible, double-click Advanced to expand the list.)</li>
 </ol>
 
 <p>The Software Installation preferences panel is used to enable add-on
-  installation and updates. The Add-on Manager allows you to view and manage
+  installation and updates. The Add-ons Manager allows you to view and manage
   all your installed extensions and themes.</p>
 
 <ul>
   <li><strong>Add-ons</strong>:
     <ul>
       <li><strong>Allow websites to install add-ons and updates</strong>:
         Select this if you want to allow websites to install add-ons and
         updates to be used with &brandShortName;. You will be prompted before
@@ -479,17 +479,17 @@
         <ul>
           <li>Note that this function involves sending a list of your
             currently installed add-ons to the add-on web site.</li>
           <li>Disabling this option will also suppress contacting the add-on
             site periodically for any new information about installed add-ons,
             but won't affect automated updates.</li>
         </ul>
       </li>
-      <li><strong>Manage Add-ons</strong>: Click this link to open the Add-on
+      <li><strong>Manage Add-ons</strong>: Click this link to open the Add-ons
         Manager in a new browser tab.</li>
     </ul>
   </li>
   <li><strong>&brandShortName;</strong>:
     <ul>
       <li><strong>Automatically check for updates</strong>:Select this to be
         notified when a new version of &brandShortName; is available. Choose
         whether you want &brandShortName; to do a <strong>daily</strong> or
--- a/suite/chrome/common/help/cs_nav_prefs_appearance.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_appearance.xhtml
@@ -136,17 +136,17 @@
   <li><strong>Resize large images to fit in the browser window</strong>: Select
     this if you want &brandShortName; to automatically shrink large stand-alone
     images so they will fit in the browser window. Clicking on the resized
     image will make it appear at full size.</li>
   <li><strong>Zoom only text instead of full pages</strong>: Select this if you
     want &brandShortName; to only resize text of websites when using the
     &quot;Zoom&quot; function. If this is not selected, the whole page,
     including images, will be zoomed.</li>
-  <li><strong>Warn me when web sites try to redirect or reload the
+  <li><strong>Warn me when websites try to redirect or reload the
     page</strong>: Select this to let &brandShortName; block automatic meta
     redirection (HTTP-EQUIV=refresh) requests by default. When a redirect is
     supposed to be executed, a notification bar is shown instead which allows
     you to permit the redirect on a case-by-case basis.</li>
   <li><strong>Remember zoom levels on a per-site basis</strong>: Select
     this if you want the system to remember the specific zoom level for
     each website you visit.</li>
 </ul>
--- a/suite/chrome/common/help/customize_help.xhtml
+++ b/suite/chrome/common/help/customize_help.xhtml
@@ -490,35 +490,40 @@
 
 <p>[<a href="#changing_fonts_colors_and_themes">Return to beginning of
   section</a>]</p>
 
 <h3 id="changing_the_theme">Changing the Theme</h3>
 
 <p>You can change the look and feel of &brandShortName; by using a different
   theme. Changing the theme can be done either from the View menu or from the
-  Add-on Manager.</p>
+  Add-ons Manager.</p>
 
 <p>From the View menu:</p>
 
 <ol>
   <li>Open the View menu and choose Apply Theme, and then select a theme from
     the menu.</li>
   <li>Quit and restart &brandShortName;.</li>
 </ol>
 
-<p>From the Add-on Manager:</p>
+<p>From the Add-ons Manager:</p>
 
 <ol>
-  <li>Open the Tools menu and choose Add-on Manager.</li>
-  <li>Click the Themes button in the toolbar.</li>
-  <li>Select a theme from the list, and then click the Use Theme button.</li>
-  <li>Quit and restart &brandShortName;.</li>
+  <li>Open the Tools menu and choose Add-ons Manager.</li>
+  <li>Click the Appearance button in the toolbar.</li>
+  <li>Select a theme from the list, and then click the Enable button.</li>
+  <li>Restart &brandShortName; by clicking <q>Restart Now</q> in the
+    Theme&apos;s entry.</li>
 </ol>
 
+<p><strong>Note</strong>: &brandShortName; does not need to be restarted if
+  changing between light-weight themes (Personas) or between Personas and the
+  Default theme.</p>
+
 <p>[<a href="#changing_fonts_colors_and_themes">Return to beginning of
   section</a>]</p>
 
 <h2 id="toolbars">Toolbars</h2>
 
 <div class="contentsBox">In this section:
   <ul>
     <li><a href="#navigation_toolbar">Navigation Toolbar</a></li>
@@ -1018,23 +1023,23 @@
   folders from that file. It does not create two bookmarks files.</p>
 
 <p>[<a href="#bookmarks">Return to beginning of section</a>]</p>
 
 <h2 id="add-ons">Add-ons</h2>
 
 <p>One of the most exciting ways to customize &brandShortName; is through the
   addition of Add-ons. In this section, you will learn what Add-ons are, how
-  to install them, and how to use the Add-on Manager.</p>
+  to install them, and how to use the Add-ons Manager.</p>
 
 <div class="contentsBox">In this section:
   <ul>
     <li><a href="#about_add-ons">About Add-ons</a></li>
     <li><a href="#installing_add-ons">Installing Add-ons</a></li>
-    <li><a href="#using_the_add-on_manager">Using the Add-on Manager</a></li>
+    <li><a href="#using_the_add-ons_manager">Using the Add-ons Manager</a></li>
   </ul>
 </div>
 
 <h3 id="about_add-ons">About Add-ons</h3>
 
 <p>An Add-on is a piece of software that can be added to &brandShortName; to
   change its appearance, behavior, or to add new features. It can also change
   the language shown in the user interface. Add-ons can be classified in four
@@ -1044,266 +1049,323 @@
   <li><strong>Extensions</strong>: This type of Add-on either changes the way
     &brandShortName; behaves or adds new features to it. For instance, there
     are extensions that provide you with weather forecasts, that add a
     full-featured FTP client, or that block advertisements in web pages. Some
     extensions are designed to work only with specific websites.</li>
   <li><strong>Themes</strong>: Themes change the appearance and design of
     &brandShortName;, but don&apos;t add or change features. They act as a
     skin. &brandShortName; ships with two themes, Default Theme and Modern
-    Theme, but you can add more to fit your style.</li>
+    Theme, but you can add more to fit your style. <strong>Personas</strong>
+    are light-weight themes which, in contrast to the complete themes,
+    change the background of the user interface only.</li>
+  <li><strong>Plugins</strong>: Plugins act as connectors between
+    &brandShortName; and other programs. They enable you to see special
+    content (like Flash movies, or Adobe PDF documents) directly inside the
+    &brandShortName; browser window, instead of opening the target program
+    in a separate window.</li>
   <li><strong>Languages</strong>: While you can download &brandShortName; in
     a number of languages, you may add additional languages to it in the form
     of language packs. This way, different users may use &brandShortName; in
     their own language without having to install the program for everyone.
     This is specially useful if you are going to install &brandShortName; on a
     computer that is shared by different users in, for example, a computer lab.
 
     <p><strong>Note</strong>: Language packs only change the user interface
       language. Web pages, messages, newsgroup and news &amp; blog posts will
       still be shown in the original language in which they were written.</p>
   </li>
-  <li><strong>Plugins</strong>: Plugins act as connectors between
-    &brandShortName; and other programs. They enable you to see special content
-    (like Flash movies, or Adobe PDF documents) directly inside the
-    &brandShortName; browser window, instead of opening the target program in a
-    separate window.</li>
 </ul>
 
 <p>Add-ons always come as packages. Each Add-on is a single file with the XPI
   extension, except in the case of plugins which usually are binaries specific
   to the target operating system.</p>
 
 <p>[<a href="#add-ons">Return to beginning of section</a>]</p>
 
 <h3 id="installing_add-ons">Installing Add-ons</h3>
 
 <p>There are a number of ways to install Add-ons:</p>
 
 <ul>
-  <li>By clicking a link for an Add-on on a web page. This will trigger
-    a &brandShortName; dialog asking you to confirm or cancel the
+  <li>By clicking a link or a button for an Add-on on a web page. This will
+    trigger a &brandShortName; dialog asking you to confirm or cancel the
     installation, with the Install button disabled for some seconds in
-    order to avoid accidentally clicking it just as the dialog shows up.
-    
-    <p><strong>Note</strong>: As an additonal security measure,
-      &brandShortName; only allows installing Add-ons from a list of permitted
-      websites in the <a
-      href="cs_nav_prefs_advanced.xhtml#software_installation">Software
-      Installation preferences panel</a>.</p>
-  </li>
+    order to avoid accidentally clicking it just as the dialog shows up.</li>
   <li>By opening a previously saved Add-on package, just like you open a
     regular file that you previously saved on your hard drive: Select Open file
     from the File menu, or press <span class="mac"><kbd>Cmd</kbd></span><span
-    class="noMac"><kbd>Ctrl</kbd></span>+<kbd>O</kbd>.</li>
-  <li>By using the Get Add-ons panel in the Add-on Manager or clicking the
-    Install button in any of the panels in the Add-on Manager.</li>
+    class="noMac"><kbd>Ctrl</kbd></span>+<kbd>O</kbd>; you can also open the
+    Tools menu in the Add-ons Manager (next to the search box) and select
+    <q>Install Add-on from File</q>, or just drag-and-drop the installer file
+    into the Add-ons Manager tab or window.</li>
+  <li>By using the Search functionality or the Get Add-ons panel of the
+    Add-ons Manager, as described in the next section.</li>
 </ul>
 
-<p><strong>Note</strong>: Plugins are usually installed as a separate program
-  while &brandShortName; is closed so both the external program and the
-  corresponding plugin for &brandShortName; get installed correctly.</p>
+<p><strong>Notes</strong>:</p>
+<ul>
+  <li>For security, &brandShortName; only allows installing Add-ons from
+    a list of permitted websites in the
+    <a href="cs_nav_prefs_advanced.xhtml#software_installation">Software
+    Installation preferences panel</a>.</li>
+  <li>Also, if you unchecked <q>Allow websites to install add-ons and
+    updates</q> there, you will be prompted to enable that function before
+    anything else happens. This is <em>not</em> a temporary change, you would
+    have to uncheck that box again to disallow installations and updates in
+    the future.</li>
+  <li>Plugins are usually installed as a separate program while
+    &brandShortName; is closed so both the external program and the
+    corresponding plugin for &brandShortName; get installed correctly.</li>
+</ul>
 
 <p>[<a href="#add-ons">Return to beginning of section</a>]</p>
 
-<h3 id="using_the_add-on_manager">Using the Add-on Manager</h3>
+<h3 id="using_the_add-ons_manager">Using the Add-ons Manager</h3>
 
-<p>The Add-on Manager enables you to install and uninstall Add-ons, enable and
+<p>The Add-ons Manager enables you to install and uninstall Add-ons, enable and
   disable them and, in some cases, set preferences for them.</p>
   
-<p id="accessing_the_add-on_manager">To access the Add-on Manager, follow any
+<p id="accessing_the_add-ons_manager">To access the Add-ons Manager, follow any
   of these steps:</p>
 
 <ul>
-  <li>Open the Tools menu, then select Add-on Manager.</li>
+  <li>Open the Tools menu, then select Add-ons Manager.</li>
   <li>Open the <span class="mac">&brandShortName;</span><span
     class="noMac">Edit</span> menu and choose Preferences, expand the Advanced
-    category and click Software Installation.</li>
+    category, click Software Installation, then Manage Add-ons.</li>
 </ul>
 
 <div class="contentsBox">In this section:
   <ul>
+    <li><a href="#searching_for_add-ons">Searching for Add-ons</a></li>
     <li><a href="#the_get_add-ons_panel">The Get Add-ons panel</a></li>
     <li><a href="#the_extensions_panel">The Extensions panel</a></li>
-    <li><a href="#the_themes_panel">The Themes panel</a></li>
+    <li><a href="#the_appearance_panel">The Appearance panel</a></li>
+    <li><a href="#the_plugins_panel">The Plugins panel</a></li>
     <li><a href="#the_languages_panel">The Languages panel</a></li>
-    <li><a href="#the_plugins_panel">The Plugins panel</a></li>
+    <li><a href="#updating_add-ons">Updating Add-ons</a></li>
   </ul>
 </div>
 
+<h4 id="searching_for_add-ons">Searching for Add-ons</h4>
+
+<p>After <a href="#accessing_the_add-ons_manager">accessing the Add-ons
+  Manager</a>, you can search all available Mozilla Add-ons directly from
+  the Add-ons Manager and install them as desired:</p>
+
+<ul>
+  <li>To search for Add-ons based on name, description or tags, type a
+    word or phrase into the Search box and press
+    <span class="mac"><kbd>Return</kbd></span><span
+    class="noMac"><kbd>Enter</kbd></span>. The search panel will open and
+    display a list of matching Add-ons that are compatible with your current
+    version of &brandShortName;. You can sort the results by name or date of
+    the most recent release. You can also search your installed Add-ons by
+    clicking <q>My Add-ons</q>.</li>
+  <li>To get additional information about a specific Add-on in the list,
+    click <q>More</q> for that entry.</li>
+  <li>To install an Add-on in the list, click its Install button.</li>
+</ul>
+
+<p>[<a href="#using_the_add-ons_manager">Return to beginning of section</a>]</p>
+
 <h4 id="the_get_add-ons_panel">The Get Add-ons panel</h4>
 
-<p>The Get Add-ons panel in the Add-on Manager uses web services provided by
+<p>The Get Add-ons panel in the Add-ons Manager uses web services provided by
   the Mozilla Add-ons website to present a list of recommended Add-ons, as
-  well as giving you the option to search all available Mozilla Add-ons
-  directly from the Add-on Manager. After
-  <a href="#accessing_the_add-on_manager">accessing the Add-on Manager</a>,
-  click the Get Add-ons button to show the Get Add-ons panel. There, you can
-  perform the following actions:</p>
+  well as giving you the option to browse the available Mozilla Add-ons. After
+  <a href="#accessing_the_add-ons_manager">accessing the Add-ons Manager</a>,
+  click the Get Add-ons button to show the Get Add-ons panel:</p>
 
 <ul>
-  <li>To search for Add-ons based on name, description or tags, use the
-    Search box. Type a word or phrase and press <span
-    class="mac"><kbd>Return</kbd></span><span
-    class="noMac"><kbd>Enter</kbd></span>. You will get a list of matching
-    Add-ons. To clear the search box terms and the result list, click the
-    icon inside the search box.
-
-    <p><strong>Note</strong>: Add-ons that are already installed or
-      incompatible with your current version of &brandShortName; will not be
-      displayed in the list of search results.</p>
+  <li>To get more information about one of the recommended Add-ons in the list
+    displayed by default, click that entry. The entry will expand to use the
+    full tab, showing screenshots, a description of the Add-on, and reviews
+    as available. You will also be able to directly install the Add-on by
+    clicking the Add to &brandShortName; button inside the expanded entry.
+    <p><strong>Note</strong>: If you disallowed websites to install add-ons
+      and updates in the <a
+      href="cs_nav_prefs_advanced.xhtml#software_installation">Software
+      Installation preferences panel</a>, you will be prompted to enable
+      that function before anything else happens. This is <em>not</em> a
+      temporary change, you would have to uncheck that box again to
+      disallow installations and updates in the future.</p>
   </li>
-  <li>To open the Mozilla Add-ons website in a new browser window (or a new
-    browser tab, depending on your preferences), click Browse All Add-ons.</li>
-  <li>To get more information about one of the recommended Add-ons in the list
-    displayed by default, click the entry. The entry will expand, displaying
-    a larger image, a full description of the Add-on, and an indication of the
-    Add-on type (extension, theme, etc.). You will also be able to install the
-    Add-on by clicking the Add to &brandShortName; button inside the
-    expanded entry.</li>
-  <li>To display the full list of recommended Add-ons for &brandShortName; in a
-    new browser window (or a new browser tab, depending on your preferences),
-    scroll down the recommended Add-ons list until you see the See All
-    Recommended Add-ons link.</li>
+  <li>The Get Add-ons panel also allows you to open the Mozilla Add-ons website
+    in a new browser window (or a new browser tab, depending on your preference
+    settings) to browse extensions and themes.</li>
 </ul>
 
-<p>[<a href="#using_the_add-on_manager">Return to beginning of section</a>]</p>
+<p><strong>Note</strong>: Personalized Add-on recommendations require a list of
+  your currently installed Add-ons to be sent to the Mozilla Add-ons website.
+  If you have privacy concerns, this function can be switched off in the
+  <a href="cs_nav_prefs_advanced.xhtml#software_installation">Software
+  Installation preferences panel</a>.</p>
+
+<p>[<a href="#using_the_add-ons_manager">Return to beginning of section</a>]</p>
 
 <h4 id="the_extensions_panel">The Extensions panel</h4>
 
-<p>The Extensions panel in the Add-on Manager lists the installed extensions.
-  After <a href="#accessing_the_add-on_manager">accessing the Add-on
+<p>The Extensions panel in the Add-ons Manager lists the installed extensions.
+  After <a href="#accessing_the_add-ons_manager">accessing the Add-ons
   Manager</a>, click the Extensions button to show the Extensions panel. There,
   you can perform the following actions:</p>
 
 <ul>
-  <li>To get more information about any of the installed extensions, click the
-    entry in the list. The entry will expand and show the full description of
-    the extension.
+  <li>To get more information about any of the installed extensions, click
+    <q>More</q> for the entry in the list. The entry will expand into the full
+    tab and show the description of the extension along with its update
+    options.
 
     <p><strong>Note</strong>: Disabled extensions will appear greyed out.
       Incompatible extensions will appear greyed out, since they are also
       disabled, and with a forbidden sign over the extension icon (incompatible
       extensions are those which define themselves as not compatible for the
       version of &brandShortName; you are using).</p>
   </li>
-  <li>To access preferences of an extension (if the extension features a
-    preferences panel), click the entry corresponding to the desired extension,
-    then click the Preferences button.
+  <li>To access options of an extension (if the extension features a
+    preferences panel), click the Options button for the entry corresponding
+    to the desired extension.
 
     <p><strong>Note</strong>: If the extension does not feature a preferences
-      panel, the Preferences button will be disabled. You can&apos;t access
+      panel, the Options button will be hidden. You can&apos;t access
       preferences of disabled or incompatible extensions.</p>
   </li>
-  <li>To disable an extension, click the entry corresponding to the desired
-    extension, then click the Disable button. An info bar will appear to remind
-    you that changes will apply once you restart &brandShortName;. The info bar
-    features a Restart &brandShortName; button.</li>
-  <li>To enable an extension, click the entry corresponding to the desired
-    extension, then click the Enable button. An info bar will appear to remind
-    you that changes will apply once you restart &brandShortName;. The info bar
-    features a Restart &brandShortName; button.</li>
-  <li>To uninstall an extension, click the entry corresponding to the
-    desired extension, then click the Uninstall button. An info bar will
-    appear to remind you that changes will apply once you restart
-    &brandShortName;. The info bar features a Restart &brandShortName;
-    button.</li>
-  <li>To find updates for any extension in the list (including those marked as
-    incompatible), click the Find Updates button at the bottom of the
-    Add-on Manager.
-
-    <p>If updates are found, they will be displayed in a new panel. In the
-      panel, you can choose what extensions you want to update and then use the
-      Install Updates button to retrieve updated Add-ons. Once downloaded, you
-      will need to restart &brandShortName; to apply the updates.</p>
-  </li>
+  <li>To disable an extension, click the Disable button for the entry
+    corresponding to the desired extension. An info bar appears if
+    the changes will apply only once you restart &brandShortName;.
+    The info bar features a <q>Restart Now</q> option.</li>
+  <li>To enable an extension, click the Enable button for the entry
+    corresponding to the desired extension. An info bar appears if
+    the changes will apply only once you restart &brandShortName;.
+    The info bar features a <q>Restart Now</q> option.</li>
+  <li>To uninstall an extension, click the Remove button for the entry
+    corresponding to the desired extension. An info bar appears if
+    the changes will apply only once you restart &brandShortName;.
+    The info bar features a <q>Restart Now</q> option.</li>
 </ul>
 
-<p>[<a href="#using_the_add-on_manager">Return to beginning of section</a>]</p>
+<p>[<a href="#using_the_add-ons_manager">Return to beginning of section</a>]</p>
 
-<h4 id="the_themes_panel">The Themes panel</h4>
+<h4 id="the_appearance_panel">The Appearance panel</h4>
 
-<p>The Themes panel in the Add-on Manager lists the installed themes. After
-  <a href="#accessing_the_add-on_manager">accessing the Add-on Manager</a>,
-  click the Themes button to show the Themes panel. There, you can perform the
-  following actions:</p>
+<p>The Appearance panel in the Add-ons Manager lists the installed themes. After
+  <a href="#accessing_the_add-ons_manager">accessing the Add-ons Manager</a>,
+  click the Appearance button to show the Appearance panel. There, you can
+  perform the following actions:</p>
 
 <ul>
-  <li>To get more information and a preview on any of the installed themes,
-    click an entry in the list. The entry will expand and show the full
-    description of the theme, along with a preview in the right side of the
-    Add-on Manager dialog (you may need to resize the dialog to properly see
-    the preview pane).</li>
-  <li>To use a theme, click the entry corresponding to the desired theme, then
-    click the Use Theme button. An info bar will appear to remind you that
-    changes will apply once you restart &brandShortName;. The info bar features
-    a Restart &brandShortName; button.
+  <li>To get more information about any of the installed themes, click
+    <q>More</q> for the entry in the list. The entry will expand into the
+    full tab and show the description of the theme along with its version
+    information.</li>
+  <li>To use a theme, click the Enable button for the entry corresponding
+    to the desired theme. An info bar appears if the changes will apply only
+    once you restart &brandShortName;. The info bar features a <q>Restart
+    Now</q> option.
     
-    <p><strong>Note</strong>: Contrary to extensions, you only can use one
+    <p><strong>Note</strong>: Contrary to extensions, you can use only one
     theme at a time.</p>
   </li>
-  <li>To uninstall a theme, click the entry corresponding to the desired theme,
-    then click the Uninstall button. An info bar will appear to remind
-    you that changes will apply once you restart &brandShortName;. The info bar
-    features a Restart &brandShortName; button.</li>
+  <li>To uninstall a theme, click the Remove button for the entry corresponding
+    to the desired theme. An info bar appears if the changes will apply only
+    once you restart &brandShortName;. The info bar features a <q>Restart
+    Now</q> option.</li>
 </ul>
 
-<p>[<a href="#using_the_add-on_manager">Return to beginning of section</a>]</p>
+<p>[<a href="#using_the_add-ons_manager">Return to beginning of section</a>]</p>
+
+<h4 id="the_plugins_panel">The Plugins panel</h4>
+
+<p>The Plugins panel in the Add-ons Manager lists the plugins found. After
+  <a href="#accessing_the_add-ons_manager">accessing the Add-ons Manager</a>,
+  click the Plugins button to show the Plugins panel. There, you can perform
+  the following actions:</p>
+
+<ul>
+  <li>To get more information about any of the plugins found, click <q>More</q>
+    for the entry in the list. The entry will expand into the full tab and show
+    the description of the plugin along with its version information.</li>
+  <li>Click <q>Check to see if your plugins are up to date</q> to open a new
+    tab or window connecting to a Mozilla website to check for status and
+    update information on all of your enabled plugins.</li>
+  <li>To disable a plugin, click the Disable button for the entry corresponding
+    to the desired plugin.</li>
+  <li>To enable a plugin, click the Enable button for the entry corresponding
+    to the desired plugin.</li>
+</ul>
+
+<p><strong>Notes</strong>:</p>
+
+<ul>
+  <li>Contrary to other types of Add-ons, enabling and disabling plugins
+    doesn&apos;t require restarting &brandShortName;.</li>
+  <li>Info bars may appear for any plugins which are determined to be outdated,
+    incompatible, or blocked for security reasons.</li>
+</ul>
+
+<p>[<a href="#using_the_add-ons_manager">Return to beginning of section</a>]</p>
 
 <h4 id="the_languages_panel">The Languages panel</h4>
 
-<p>The Languages panel in the Add-on Manager lists the installed Language
-  Packs. This panel only appears if you have installed a Language Pack.</p>
+<p>The Languages panel in the Add-ons Manager lists the installed language
+  packs. This panel only appears if you have installed a language pack.</p>
 
-<p>After <a href="#accessing_the_add-on_manager">accessing the Add-on
+<p>After <a href="#accessing_the_add-ons_manager">accessing the Add-ons
   Manager</a>, click the Languages button to show the Languages panel. There,
   you can perform the following actions:</p>
 
 <ul>
-  <li>To disable a language pack, click the entry corresponding to the desired
-    language pack, then click the Disable button. An info bar will appear to
-    remind you that changes will apply once you restart &brandShortName;. The
-    info bar features a Restart &brandShortName; button.</li>
-  <li>To enable a language pack, click the entry corresponding to the desired
-    language pack, then click the Enable button. An info bar will appear to
-    remind you that changes will apply once you restart &brandShortName;. The
-    info bar features a Restart &brandShortName; button.</li>
-  <li>To uninstall a language pack, click the entry corresponding to the
-    desired language pack, then click the Uninstall button. An info bar will
-    appear to remind you that changes will apply once you restart
-    &brandShortName;. The info bar features a Restart &brandShortName;
-    button.</li>
+  <li>To get more information about any of the language packs, click <q>More</q>
+    for the entry in the list. The entry will expand into the full tab and show
+    the description of the language pack along with its update options.</li>
+  <li>To disable a language pack, click the Disable button for the entry
+    corresponding to the desired language pack.</li>
+  <li>To enable a language pack, click the Enable button for the entry
+    corresponding to the desired language pack.</li>
+  <li>To uninstall a language pack, click the Remove button for the entry
+    corresponding to the desired language pack.</li>
 </ul>
 
 <p><strong>Note</strong>: Enabling a language pack in the Language panel
   doesn&apos;t change the language shown in &brandShortName;&apos;s user
   interface, it only makes the language available for selection in the
   <a href="cs_nav_prefs_appearance.xhtml#appearance">Appearance Preferences
   panel</a>.</p>
 
-<p>[<a href="#using_the_add-on_manager">Return to beginning of section</a>]</p>
+<p>[<a href="#using_the_add-ons_manager">Return to beginning of section</a>]</p>
 
-<h4 id="the_plugins_panel">The Plugins panel</h4>
+<h4 id="updating_add-ons">Updating Add-ons</h4>
 
-<p>The Plugins panel in the Add-on Manager lists the installed Add-ons of type
-  Plugin. After <a href="#accessing_the_add-on_manager">accessing the Add-on
-  Manager</a>, click the Plugins button to show the Plugins panel. There, you
-  can perform the following actions:</p>
+<p>Updates are by default performed automatically for any Add-ons installed
+  through the Search or Get Add-ons panels if such updates are offered through
+  the Mozilla Add-ons website. The global settings can be found in the
+  <a href="cs_nav_prefs_advanced.xhtml#software_installation">Software
+  Installation preferences panel</a>. You can override those for individual
+  Add-ons by clicking <q>More</q> and then selecting the desired option.
+</p>
+
+<p>Update functions are also offered in the Add-ons Manager&apos;s Tools menu,
+  found next to the search box:</p>
 
 <ul>
-  <li>To disable a plugin, click the entry corresponding to the desired plugin,
-    then click the Disable button.</li>
-  <li>To enable a plugin, click the entry corresponding to the desired plugin,
-    then click the Enable button.</li>
+  <li>You can check for updates for all installed Add-ons manually and set or
+    reset automated updates for all Add-ons.</li>
+  <li>If new updates are found for one or more Add-ons, an Update Now button
+    appears for each Add-on. They are also listed in a new Available Updates
+    panel. Rather than updating each Add-on separately, the Include in Update
+    checkbox can be used to select the updates to be performed, then click the
+    Install Updates button.</li>
+  <li>View Recent Updates opens a Recent Updates panel which lists Add-ons of
+    all types for which updates have been performed, along with the date of
+    that update.</li>
 </ul>
 
-<p><strong>Note</strong>: Contrary to other types of Add-ons, enabling and
-  disabling plugins doesn&apos;t require restarting &brandShortName;.</p>
-
-<p>[<a href="#using_the_add-on_manager">Return to beginning of section</a>]</p>
+<p>[<a href="#using_the_add-ons_manager">Return to beginning of section</a>]</p>
 
 <h2 id="specifying_how_mozilla_starts_up">Specifying How &brandShortName;
   Starts Up</h2>
 
 <div class="contentsBox">In this section:
   <ul>
     <li><a href="#specifying_a_starting_page">Specifying a Starting Page</a></li>
     <li><a href="#session_restore">Session Restore</a></li>
--- a/suite/chrome/common/help/help-index1.rdf
+++ b/suite/chrome/common/help/help-index1.rdf
@@ -23,16 +23,21 @@
          nc:link="customize_help.xhtml#add-ons"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="address_books"
          nc:name="address books"
          nc:link="mailnews_addressbooks.xhtml#about_address_books"/>
      </rdf:li>
      <rdf:li>
+       <rdf:Description ID="appearance_panel"
+         nc:name="appearance panel"
+         nc:link="customize_help.xhtml#the_appearance_panel"/>
+     </rdf:li>
+     <rdf:li>
        <rdf:Description ID="attaching_files_to_messages"
          nc:name="attaching files to messages"
          nc:link="mailnews_using_mail.xhtml#attaching_a_file_or_web_page"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="#adding">
@@ -115,47 +120,57 @@
      <rdf:li>
        <rdf:Description ID="add-ons:installing"
          nc:name="installing"
          nc:link="customize_help.xhtml#installing_add-ons"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="add-ons:manager"
          nc:name="Add-ons Manager"
-         nc:link="customize_help.xhtml#using_the_add-on_manager"/>
+         nc:link="customize_help.xhtml#using_the_add-ons_manager"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="#add-ons:manager">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
+       <rdf:Description ID="add-ons:searching_for_add-ons"
+         nc:name="Searching for Add-ons"
+         nc:link="customize_help.xhtml#searching_for_add-ons"/>
+     </rdf:li>
+     <rdf:li>
        <rdf:Description ID="add-ons:get_add-ons"
          nc:name="Get Add-ons Panel"
          nc:link="customize_help.xhtml#the_get_add-ons_panel"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="add-ons:extensions_panel"
          nc:name="Extensions Panel"
          nc:link="customize_help.xhtml#the_extensions_panel"/>
      </rdf:li>
      <rdf:li>
-       <rdf:Description ID="add-ons:themes_panel"
-         nc:name="Themes Panel"
-         nc:link="customize_help.xhtml#the_themes_panel"/>
+       <rdf:Description ID="add-ons:appearance_panel"
+         nc:name="Appearance Panel"
+         nc:link="customize_help.xhtml#the_appearance_panel"/>
+     </rdf:li>
+     <rdf:li>
+       <rdf:Description ID="add-ons:plugins_panel"
+         nc:name="Plugins Panel"
+         nc:link="customize_help.xhtml#the_plugins_panel"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="add-ons:languages_panel"
          nc:name="Languages Panel"
          nc:link="customize_help.xhtml#the_languages_panel"/>
      </rdf:li>
      <rdf:li>
-       <rdf:Description ID="add-ons:plugins_panel"
-         nc:name="Plugins Panel"
-         nc:link="customize_help.xhtml#the_plugins_panel"/>
+       <rdf:Description ID="add-ons:updating_add-ons"
+         nc:name="Updating Add-ons"
+         nc:link="customize_help.xhtml#updating_add-ons"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="help-indexAZ.rdf#b">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="backing_up_certificates"
@@ -1843,16 +1858,21 @@
          nc:link="using_certs_help.xhtml#about_security_devices_and_modules"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="search"
          nc:name="search"
          nc:link="nav_help.xhtml#searching_the_web"/>
      </rdf:li>
      <rdf:li>
+       <rdf:Description ID="searching_for_add-ons"
+         nc:name="searching for add-ons"
+         nc:link="customize_help.xhtml#searching_for_add-ons"/>
+     </rdf:li>
+     <rdf:li>
        <rdf:Description ID="Sidebar"
          nc:name="Sidebar"
          nc:link="customize_help.xhtml#what_is_sidebar"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="signing_email_messages"
          nc:name="signing e-mail messages"
          nc:link="mailnews_security.xhtml#signing_and_encrypting_messages"/>
@@ -2083,21 +2103,16 @@
          nc:link="mailnews_organizing.xhtml#tagging_messages"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="themes"
          nc:name="themes"
          nc:link="customize_help.xhtml#changing_the_theme"/>
      </rdf:li>
      <rdf:li>
-       <rdf:Description ID="themes_panel"
-         nc:name="themes panel"
-         nc:link="customize_help.xhtml#the_themes_panel"/>
-     </rdf:li>
-     <rdf:li>
        <rdf:Description ID="toolbar"
          nc:name="toolbar"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="#Tabbed_Browsing">
    <nc:subheadings>
@@ -2167,16 +2182,21 @@
          nc:link="customize_help.xhtml#personal_toolbar"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="help-indexAZ.rdf#u">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
+       <rdf:Description ID="updating_add-ons"
+         nc:name="updating add-ons"
+         nc:link="customize_help.xhtml#updating_add-ons"/>
+     </rdf:li>
+     <rdf:li>
        <rdf:Description ID="uploading_pages"
          nc:name="uploading pages"
          nc:link="composer_help.xhtml#publishing_your_pages_on_the_web"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="help-indexAZ.rdf#v">
--- a/suite/chrome/common/help/nav_help.xhtml
+++ b/suite/chrome/common/help/nav_help.xhtml
@@ -1187,22 +1187,22 @@
 <p>To see a full list of &brandShortName; plugins you can install, see the
   <a href="http://plugindoc.mozdev.org/">PluginDoc</a> page on MozDev.org.</p>
 
 <p>To see what plugins you currently have installed, do any of the following:
 </p>
 
 <ul>
   <li>Open the Help menu and choose About Plugins.</li>
-  <li>Open the Tools menu, choose Add-on Manager, and select the Plugins
+  <li>Open the Tools menu, choose Add-ons Manager, and select the Plugins
     panel.
     
-    <p><strong>Tip</strong>: To learn more about the Add-on Manager and its
+    <p><strong>Tip</strong>: To learn more about the Add-ons Manager and its
       features, see the section
-      <a href="customize_help.xhtml#using_the_add-on_manager">Using the Add-on
+      <a href="customize_help.xhtml#using_the_add-ons_manager">Using the Add-ons
       Manager</a>.</p>
   </li>
   <li>Click in the Location Bar, type <kbd>about:plugins</kbd> and press
     <kbd class="mac">Return</kbd><kbd class="noMac">Enter</kbd>.</li>
 </ul>
 
 <p>[<a href="#plugins_and_downloads">Return to beginning of
   section</a>]</p>
--- a/suite/chrome/common/help/shortcuts.xhtml
+++ b/suite/chrome/common/help/shortcuts.xhtml
@@ -253,17 +253,17 @@
   </tr>
   <tr>
     <td>Start IRC Chat</td>
     <td>Ctrl+6</td>
     <td>Cmd+6</td>
     <td>Ctrl+6</td>
   </tr>
   <tr>
-    <td>Open Add-on Manager</td>
+    <td>Open Add-ons Manager</td>
     <td>Ctrl+Shift+A</td>
     <td>Cmd+Shift+A</td>
     <td>Ctrl+Shift+A</td>
   </tr>
   <tr>
     <td>Open Download Manager</td>
     <td>Ctrl+J</td>
     <td>Cmd+J</td>
--- a/suite/chrome/common/help/suite-toc.rdf
+++ b/suite/chrome/common/help/suite-toc.rdf
@@ -758,17 +758,17 @@
     </nc:subheadings>
   </rdf:Description>
 
 <rdf:Description about="#cust-addons">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li> <rdf:Description ID="cust-addons-about" nc:name="About Add-ons"  nc:link="customize_help.xhtml#about_add-ons"/> </rdf:li>
         <rdf:li> <rdf:Description ID="cust-addons-installing" nc:name="Installing Add-ons"  nc:link="customize_help.xhtml#installing_add-ons"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="cust-addons-manager" nc:name="Using the Add-on Manager"  nc:link="customize_help.xhtml#using_the_add-on_manager"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="cust-addons-manager" nc:name="Using the Add-ons Manager"  nc:link="customize_help.xhtml#using_the_add-ons_manager"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 <rdf:Description about="#cust-page">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li> <rdf:Description ID="cust-startpage" nc:name="Specifying a Starting Page"  nc:link="customize_help.xhtml#specifying_a_starting_page"/> </rdf:li>
--- a/suite/chrome/common/notification.properties
+++ b/suite/chrome/common/notification.properties
@@ -158,8 +158,21 @@ SecurityTitle=Security Warning
 MixedContentMessage=You have requested an encrypted page that contains some unencrypted information. Information that you see or enter on this page could easily be read by a third party.
 EnterInsecureMessage=You have left an encrypted page. Information you send or receive from now on could easily be read by a third party.
 EnterSecureMessage=You have requested an encrypted page. The website has identified itself correctly, and information you see or enter on this page can't easily be read by a third party.
 SecurityPreferences.label=Preferences
 SecurityPreferences.accesskey=P
 PostToInsecureFromInsecureMessage=The information you have entered is to be sent over an unencrypted connection and could easily be read by a third party.\nAre you sure you want to continue sending this information?
 PostToInsecureFromInsecureShowAgain=Alert me whenever I submit information that's not encrypted.
 PostToInsecureContinue=Continue
+
+# Phishing/Malware Notification Bar.
+# LOCALIZATION NOTE (notAForgery, notAnAttack)
+# The two button strings will never be shown at the same time, so
+# it's okay for them to have the same access key.
+safebrowsing.getMeOutOfHereButton.label=Get me out of here!
+safebrowsing.getMeOutOfHereButton.accessKey=G
+safebrowsing.reportedWebForgery=Reported Web Forgery!
+safebrowsing.notAForgeryButton.label=This isn't a web forgery…
+safebrowsing.notAForgeryButton.accessKey=s
+safebrowsing.reportedAttackSite=Reported Attack Site!
+safebrowsing.notAnAttackButton.label=This isn't an attack site…
+safebrowsing.notAnAttackButton.accessKey=a
--- a/suite/chrome/common/openLocation.dtd
+++ b/suite/chrome/common/openLocation.dtd
@@ -6,16 +6,17 @@
 
 <!ENTITY enter.label "Enter the web location (URL), or specify the local file you would like to open:">
 <!-- LOCALIZATION NOTE (enter.accesskey): should be present in both enter.label
      as defined above and attachEnterLabel as defined in
      openLocation.properties -->
 <!ENTITY enter.accesskey "E">
 <!ENTITY chooseFile.label "Choose File…">
 <!ENTITY chooseFile.accesskey "C">
+<!ENTITY newPrivate.label "New private window">
 <!ENTITY newWindow.label "New browser window">
 <!ENTITY newTab.label "New browser tab">
 <!ENTITY currentTab.label "Current browser tab">
 <!ENTITY editNewWindow.label "New Composer window">
 <!ENTITY open.label "Open">
 <!ENTITY caption.label "Open Web Location">
 <!ENTITY openWhere.label "Open in:">
 <!ENTITY openWhere.accesskey "O">
--- a/suite/chrome/common/pref/pref-content.dtd
+++ b/suite/chrome/common/pref/pref-content.dtd
@@ -14,12 +14,12 @@
 <!ENTITY enableAutomaticImageResizing.label     "Resize large images to fit in the browser window">
 <!ENTITY enableAutomaticImageResizing.accesskey "R">
 <!ENTITY useSmoothScroll.label                  "Use smooth scrolling">
 <!ENTITY useSmoothScroll.accesskey              "U">
 <!ENTITY allowHWAccel.label                     "Use hardware acceleration when available">
 <!ENTITY allowHWAccel.accesskey                 "e">
 <!ENTITY textZoomOnly.label                     "Zoom only text instead of full pages">
 <!ENTITY textZoomOnly.accesskey                 "Z">
-<!ENTITY blockAutoRefresh.label                 "Warn me when web sites try to redirect or reload the page">
+<!ENTITY blockAutoRefresh.label                 "Warn me when websites try to redirect or reload the page">
 <!ENTITY blockAutoRefresh.accesskey             "W">
 <!ENTITY siteSpecific.label                     "Remember zoom levels on per-site basis">
 <!ENTITY siteSpecific.accesskey                 "m">
--- a/suite/chrome/common/pref/pref-download.dtd
+++ b/suite/chrome/common/pref/pref-download.dtd
@@ -1,23 +1,23 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY pref.download.title            "Downloads">
 
 <!ENTITY downloadBehavior.label         "When starting a download">
-<!ENTITY focusWhenStarting.label        "Flash the download manager if it is already open, otherwise:">
-<!ENTITY focusWhenStarting.accesskey    "F">
+<!ENTITY doNothing.label                "Don't open anything">
+<!ENTITY doNothing.accesskey            "D">
+<!ENTITY openProgressDialog.label       "Open a progress dialog">
+<!ENTITY openProgressDialog.accesskey   "O">
 <!ENTITY openDM.label                   "Open the download manager">
 <!ENTITY openDM.accesskey               "m">
-<!ENTITY openProgressDialog.label       "Open a progress dialog">
-<!ENTITY openProgressDialog.accesskey   "O">
-<!ENTITY doNothing.label                "Don't open anything">
-<!ENTITY doNothing.accesskey            "D">
+<!ENTITY flashWhenOpen.label            "Just flash the download manager if it is already open">
+<!ENTITY flashWhenOpen.accesskey        "f">
 
 <!ENTITY downloadLocation.label         "When saving a file">
 <!ENTITY saveTo.label                   "Save files to">
 <!ENTITY saveTo.accesskey               "v">
 <!ENTITY chooseDownloadFolder.label     "Choose Folder…">
 <!ENTITY chooseDownloadFolder.accesskey "C">
 <!ENTITY alwaysAsk.label                "Always ask me where to save files">
 <!ENTITY alwaysAsk.accesskey            "A">
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/pref/pref-privatedata.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/. -->
+<!--LOCALIZATION NOTE : FILE 'Private Data' prefs settings
+    These entities go on top of the sanitize.dtd definitions
+-->
+
+<!ENTITY pref.privatedata.title           "Private Data">
+
+
+<!ENTITY clearPrivateData.label           "Clear Private Data">
+
+<!ENTITY alwaysClear.label                "Always clear my private data when I close &brandShortName;">
+<!ENTITY alwaysClear.accesskey            "w">
+
+<!ENTITY askBeforeClear.label             "Ask me before clearing private data">
+<!ENTITY askBeforeClear.accesskey         "k">
+
+<!ENTITY clearDataSettings.label          "When I ask &brandShortName; to clear my private data, it should erase:">
+<!--LOCALIZATION NOTE (clearDataDialog.label, clearDataSilent.label, clearDataDialog.accesskey):
+  The only difference bettween the two labels is that one calls a dialog, the other doesn't.
+  The same accesskey is used for both labels.
+-->
+
+<!ENTITY clearDataDialog.label            "Clear Now…">
+<!ENTITY clearDataSilent.label            "Clear Now">
+<!ENTITY clearDataDialog.accesskey        "N">
--- a/suite/chrome/common/pref/pref-security.dtd
+++ b/suite/chrome/common/pref/pref-security.dtd
@@ -1,28 +1,32 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <!--LOCALIZATION NOTE : FILE 'Privacy and Security' prefs settings -->
 
 <!ENTITY pref.security.title              "Privacy &amp; Security">
 
 <!ENTITY tracking.label                   "User Tracking">
-<!ENTITY doNotTrack.label                 "Tell web sites I do not want to be tracked">
-<!ENTITY doNotTrack.accesskey             "T">
-
-<!ENTITY privateData.label                "Private Data">
-
-<!ENTITY alwaysClear.label                "Always clear my private data when I close &brandShortName;">
-<!ENTITY alwaysClear.accesskey            "w">
+<!ENTITY trackingIntro.label              "Websites may track how you use them, thus affecting your privacy.">
 
-<!ENTITY askBeforeClear.label             "Ask me before clearing private data">
-<!ENTITY askBeforeClear.accesskey         "A">
-
-<!ENTITY clearDataSettings.label          "When I ask &brandShortName; to clear my private data, it should erase:">
-<!--LOCALIZATION NOTE (clearDataDialog.label, clearDataSilent.label, clearDataDialog.accesskey):
-  The only difference bettween the two labels is that one calls a dialog, the other doesn't.
-  The same accesskey is used for both labels.
+<!ENTITY dntTellSites.label               "Tell websites about my tracking preference">
+<!ENTITY dntTellSites.accesskey           "T">
+<!ENTITY dntTrackingNotOkay.label         "I do not want to be tracked">
+<!ENTITY dntTrackingNotOkay.accesskey     "n">
+<!ENTITY dntTrackingOkay.label            "I consent to being tracked">
+<!ENTITY dntTrackingOkay.accesskey        "c">
+<!-- LOCALIZATION NOTE (safeBrowsing.label, blockWebForgeries.label, blockAttackSites.label):
+  The methods by which forged (phished) and attack sites will be detected by
+  phishing providers will vary from human review to machine-based heuristics
+  to a combination of both, so it's important that these strings convey the
+  meaning "reported" (and not something like "known").
 -->
 
-<!ENTITY clearDataDialog.label            "Clear Now…">
-<!ENTITY clearDataSilent.label            "Clear Now">
-<!ENTITY clearDataDialog.accesskey        "N">
+
+<!ENTITY safeBrowsing.label               "Safe Browsing">
+<!ENTITY safeBrowsingIntro.label          "&brandShortName; can block websites reported to contain malicious content.">
+
+<!ENTITY blockAttackSites.label           "Block reported attack sites (malware, viruses)">
+<!ENTITY blockAttackSites.accesskey       "B">
+
+<!ENTITY blockWebForgeries.label          "Block reported web forgeries (Phishing)">
+<!ENTITY blockWebForgeries.accesskey      "P">
--- a/suite/chrome/common/pref/preferences.dtd
+++ b/suite/chrome/common/pref/preferences.dtd
@@ -13,16 +13,17 @@
 <!ENTITY history.label "History">
 <!ENTITY languages.label "Languages">
 <!ENTITY applications.label "Helper Applications">
 <!ENTITY locationBar.label "Location Bar">
 <!ENTITY tabWindows.label "Tabbed Browsing">
 <!ENTITY links.label "Link Behavior">
 <!ENTITY offline.label "Offline">
 <!ENTITY security.label "Privacy &amp; Security">
+<!ENTITY privatedata.label "Private Data">
 <!ENTITY cookies.label "Cookies">
 <!ENTITY images.label "Images">
 <!ENTITY popups.label "Popup Windows">
 <!ENTITY passwords.label "Passwords">
 <!ENTITY masterpass.label "Master Passwords">
 <!ENTITY ssl.label "SSL">
 <!ENTITY certs.label "Certificates">
 <!ENTITY validation.label "Validation">
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/region.properties
@@ -0,0 +1,14 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Default search engine
+browser.search.defaultenginename=Google
+
+# Search engine order (order displayed in the search bar dropdown)
+browser.search.order.1=Google
+browser.search.order.2=Yahoo
+
+# More information about this update link available in the update wizard.
+# Only change this if you are providing localized release notes.
+app.update.url.details=http://www.seamonkey-project.org/releases/
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/safeBrowsing.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 safeb.palm.accept.label "Get me out of here!">
+<!ENTITY safeb.palm.decline.label "Ignore this warning">
+<!ENTITY safeb.palm.reportPage.label "Why was this page blocked?">
+
+<!ENTITY safeb.blocked.malwarePage.title "Reported Attack Page!">
+<!-- Localization note (safeb.blocked.malware.shortDesc) - Please don't translate the contents of the <span id="malware_sitename"/> tag.  It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
+<!ENTITY safeb.blocked.malwarePage.shortDesc "This web page at <span id='malware_sitename'/> has been reported as an attack page and has been blocked based on your security preferences.">
+<!ENTITY safeb.blocked.malwarePage.longDesc "<p>Attack pages try to install programs that steal private information, use your computer to attack others, or damage your system.</p><p>Some attack pages intentionally distribute harmful software, but many are compromised without the knowledge or permission of their owners.</p>">
+
+<!ENTITY safeb.blocked.phishingPage.title "Reported Web Forgery!">
+<!-- Localization note (safeb.blocked.phishing.shortDesc) - Please don't translate the contents of the <span id="phishing_sitename"/> tag. It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
+<!ENTITY safeb.blocked.phishingPage.shortDesc "This web page at <span id='phishing_sitename'/> has been reported as a web forgery and has been blocked based on your security preferences.">
+<!ENTITY safeb.blocked.phishingPage.longDesc "<p>Web forgeries are designed to trick you into revealing personal or financial information by imitating sources you may trust.</p><p>Entering any information on this web page may result in identity theft or other fraud.</p>">
+
+<!ENTITY reportPhishSite.label         "Report Web Forgery…">
+<!ENTITY reportPhishSite.accesskey     "F">
+<!ENTITY notAForgery.label             "This isn't a web forgery…">
+<!ENTITY notAForgery.accesskey         "f">
--- a/suite/chrome/common/utilityOverlay.dtd
+++ b/suite/chrome/common/utilityOverlay.dtd
@@ -17,16 +17,19 @@
 <!ENTITY newBlankPageCmd.key              "n">
 <!ENTITY newPageFromTemplateCmd.label "Page Using Template">
 <!ENTITY newPageFromTemplateCmd.accesskey "t">
 <!ENTITY newPageFromDraftCmd.label "Page Using Draft">
 <!ENTITY newPageFromDraftCmd.accesskey "d">
 <!ENTITY newNavigatorCmd.label "Browser Window">
 <!ENTITY newNavigatorCmd.key "N">
 <!ENTITY newNavigatorCmd.accesskey "B">
+<!ENTITY newPrivateWindowCmd.label "Private Window">
+<!ENTITY newPrivateWindowCmd.key "P">
+<!ENTITY newPrivateWindowCmd.accesskey "W">
 <!ENTITY printSetupCmd.label "Page Setup…">
 <!ENTITY printSetupCmd.accesskey "u">
 <!ENTITY printPreviewCmd.label "Print Preview">
 <!ENTITY printPreviewCmd.accesskey "v">
 <!ENTITY printCmd.label "Print…">
 <!ENTITY printCmd.accesskey "P">
 <!ENTITY printCmd.key "P">
 
--- a/suite/chrome/mailnews/FilterEditor.dtd
+++ b/suite/chrome/mailnews/FilterEditor.dtd
@@ -21,16 +21,19 @@
 <!ENTITY contextIncomingMail.accesskey "G">
 <!ENTITY contextManual.label "Manually Run">
 <!ENTITY contextManual.accesskey "R">
 <!ENTITY contextBeforeCls.label "Filter before Junk Classification">
 <!ENTITY contextAfterCls.label "Filter after Junk Classification">
 
 <!ENTITY filterActionDesc.label "Perform these actions:">
 <!ENTITY filterActionDesc.accesskey "P">
+
+<!ENTITY filterActionOrderWarning.label "Note: Filter actions will be run in a different order.">
+<!ENTITY filterActionOrder.label "See execution order">
 <!-- New Style Filter Rule Actions -->
 
 <!ENTITY moveMessage.label "Move Message to">
 <!ENTITY copyMessage.label "Copy Message to">
 <!ENTITY forwardTo.label "Forward Message to">
 <!ENTITY replyWithTemplate.label "Reply with Template">
 <!ENTITY markMessageRead.label "Mark As Read">
 <!ENTITY markMessageUnread.label "Mark As Unread">
deleted file mode 100644
--- a/suite/chrome/mailnews/addressbook/abCardViewOverlay.dtd
+++ /dev/null
@@ -1,17 +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/. -->
-<!-- Box Headings -->
-
-<!ENTITY contact.heading             "Contact">
-<!ENTITY home.heading                "Home">
-<!ENTITY other.heading               "Other">
-<!ENTITY phone.heading               "Phone">
-<!ENTITY work.heading                "Work">
-<!-- Special Box Headings, for mailing lists -->
-<!ENTITY description.heading         "Description">
-<!ENTITY addresses.heading           "Addresses">
-<!-- For Map It! -->
-<!ENTITY mapItButton.label           "Get Map">
-<!ENTITY mapIt.tooltip               "Display a map of this address from the Web">
-
--- a/suite/chrome/mailnews/filter.properties
+++ b/suite/chrome/mailnews/filter.properties
@@ -23,16 +23,23 @@ promptMsg=You are currently in the proce
 stopButtonLabel=Stop
 continueButtonLabel=Continue
 cannotEnableFilter=This filter was probably created by a future version of this software. You cannot enable this filter because we don't know how to apply it.
 searchTermsInvalidTitle=Search Terms Invalid
 # LOCALIZATION NOTE(searchTermsInvalidRule)
 # %1$S=search attribute name from the invalid rule
 # %2$S=search operator from the bad rule
 searchTermsInvalidRule=This filter cannot be saved because the search term "%1$S %2$S" is invalid in the current context.
+# LOCALIZATION NOTE(filterActionOrderExplanation)
+# Keep the \n\n that mean 2 linebreaks.
+filterActionOrderExplanation=When a message matches this filter the actions will be run in this order:\n\n
+filterActionOrderTitle=Real action order
+## LOCALIZATION NOTE(filterActionItem):
+# %1$S=sequence number of the action, %2$S=action text, %3$S=action argument
+filterActionItem=%1$S. %2$S %3$S\n
 
 # for junk mail logging / mail filter logging
 # LOCALIZATION NOTE(junkLogDetectStr)
 # %1$S=author, %2$S=subject, %3$S=date
 junkLogDetectStr=Detected junk message from %1$S - %2$S at %3$S
 # LOCALIZATION NOTE(logMoveStr)
 # %1$S=message id, %2$S=folder URI
 logMoveStr=moved message id = %1$S to %2$S
--- a/suite/chrome/mailnews/messenger.properties
+++ b/suite/chrome/mailnews/messenger.properties
@@ -312,16 +312,22 @@ biffNotification_messages=has %1$S new m
 #  %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?
 
@@ -379,16 +385,19 @@ confirmPhishingUrl2=%1$S thinks this web
 #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.
 
+# Strings for growl notifications on Mac OS X
+growlNotification=New Mail
+
 # 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.
 
--- a/suite/chrome/mailnews/pref/prefs.properties
+++ b/suite/chrome/mailnews/pref/prefs.properties
@@ -11,17 +11,20 @@ modifiedAccountExists=An account with th
 userNameChanged=Your User Name has been updated. You may also need to update your Email Address and/or User Name associated with this account.
 serverNameChanged=The server name setting has changed. Please verify that any folders used by filters exist on the new server.
 # LOCALIZATION NOTE (junkSettingsBroken): %1$S is the account name
 junkSettingsBroken=The Junk settings on account "%1$S" have a possible problem. Would you like to review them before saving Account Settings?
 # LOCALIZATION NOTE (localDirectoryChanged): %1$S is program name (&brandShortName;)
 localDirectoryChanged=%1$S needs to restart now to apply the change to the Local directory setting.
 localDirectoryRestart=Restart
 userNameEmpty=The user name can not be empty.
-localDirectoryInvalid=The directory specified in the Local Directory setting is invalid. Please pick a different directory.
+# LOCALIZATION NOTE (localDirectoryInvalid): %1$S is path to folder
+localDirectoryInvalid=The Local Directory path "%1$S" is invalid. Please pick a different directory.
+# LOCALIZATION NOTE (localDirectoryNotAllowed): %1$S is path to folder
+localDirectoryNotAllowed=The Local Directory path "%1$S" is not suitable for message storage. Please choose another directory.
 # if the user chooses to cancel the wizard when no accounts are there throw a message
 # LOCALIZATION NOTE (cancelWizard)
 # do not localize "\n\n"
 cancelWizard=Are you sure you want to exit the Account Wizard?\n\nIf you exit, any information you have entered will be lost and the account will not be created.
 accountWizard=Account Wizard
 WizardExit=Exit
 WizardContinue=Cancel
 # when the wizard already has a domain (Should we say something different?)
new file mode 100644
--- /dev/null
+++ b/suite/chrome/mailnews/region.properties
@@ -0,0 +1,25 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+#
+# messenger.properties
+# mailnews.js
+mailnews.start_page.url=chrome://messenger/content/start.xhtml
+messenger.throbber.url=http://www.seamonkey-project.org/
+compose.throbber.url=http://www.seamonkey-project.org/
+addressbook.throbber.url=http://www.seamonkey-project.org/
+# To make mapit buttons to disappear in the addressbook, specify empty string.  For example:
+# mail.addr_book.mapit_url.format=
+# The format for "mail.addr_book.mapit_url.format" is:
+# @A1 == address, part 1
+# @A2 == address, part 2
+# @CI == city
+# @ST == state
+# @ZI == zip code
+# @CO == country
+mail.addr_book.mapit_url.format=http://maps.google.com/maps?q=@A1%20@A2%20@CI%20@ST%20@ZI%20@CO
+mailnews.messageid_browser.url=http://groups.google.com/search?as_umsgid=%mid
+# Recognize non-standard versions of "Re:" in subjects from localized versions of MS Outlook et al.
+# Specify a comma-separated list without spaces. For example: mailnews.localizedRe=AW,SV
+mailnews.localizedRe=
--- a/suite/defines.inc
+++ b/suite/defines.inc
@@ -1,11 +1,8 @@
 #filter emptyLines
-
 #define MOZ_LANGPACK_CREATOR mozilla.org
 
 # If non-English locales wish to credit multiple contributors, uncomment this
-
 # variable definition and use the format specified.
-
 #define MOZ_LANGPACK_CONTRIBUTORS <em:contributor>Softaragones</em:contributor><em:contributor>Juan Pablo Martínez Cortés</em:contributor><em:contributor>Chesús Daniel Trigo</em:contributor><em:contributor>Daniel Martínez Cucalón</em:contributor>
 
-#unfilter emptyLines
+#unfilter emptyLines
\ No newline at end of file
--- a/suite/profile/bookmarks.inc
+++ b/suite/profile/bookmarks.inc
@@ -1,185 +1,146 @@
 #filter emptyLines
-
 # LOCALIZATION NOTE: The 'en-US' strings in some URLs will be replaced with
-
 # your locale code, and link to your translated pages as soon as they're live.
 
-
 #define bookmarks_title Bookmarks
 
 
 #define bookmarks_heading Bookmarks
 
 
 #define personal_toolbarfolder Personal Toolbar Folder
 
 
 #define seamonkey_and_mozilla SeaMonkey and Mozilla
 
 
 # LOCALIZATION NOTE (seamonkey):
 
-
 # link title for http://www.seamonkey-project.org/ (in the personal toolbar)
 
-
 #define seamonkey SeaMonkey
 
 
 # LOCALIZATION NOTE (seamonkey_long):
 
-
 # link title for http://www.seamonkey-project.org/ (in normal bookmarks)
 
-
 #define seamonkey_long The SeaMonkey Project
 
 
 # LOCALIZATION NOTE (mozilla_org):
 
-
 # link title for http://www.mozilla.org/ (in the personal toolbar)
 
-
 #define mozilla_org mozilla.org
 
 
 # LOCALIZATION NOTE (mozilla_org_long):
 
-
 # link title for http://www.mozilla.org/ (in normal bookmarks)
 
-
 #define mozilla_org_long The Mozilla Organization
 
 
 # LOCALIZATION NOTE (mozilla_projects):
 
-
 # link title for http://www.mozilla.org/projects/
 
-
 #define mozilla_projects Mozilla Projects
 
 
 # LOCALIZATION NOTE (mozilla_about):
 
-
 # link title for http://www.mozilla.org/about/
 
-
 #define mozilla_about About Mozilla
 
 
 #define extend_seamonkey Extending SeaMonkey
 
 
 # LOCALIZATION NOTE (seamonkey_addons):
 
-
 # link title for https://addons.mozilla.org/en-US/seamonkey/
 
-
 #define seamonkey_addons SeaMonkey Add-ons
 
 
 # LOCALIZATION NOTE (seamonkey_themes):
 
-
 # link title for https://addons.mozilla.org/en-US/seamonkey/themes
 
-
 #define seamonkey_themes SeaMonkey Themes
 
 
 # LOCALIZATION NOTE (seamonkey_dictionaries):
 
-
 # link title for https://addons.mozilla.org/en-US/seamonkey/dictionaries
 
-
 #define seamonkey_dictionaries Spell Checking Dictionaries
 
 
 # LOCALIZATION NOTE (seamonkey_plugins):
 
-
 # link title for https://addons.mozilla.org/en-US/seamonkey/plugins
 
-
 #define seamonkey_plugins Plugins for SeaMonkey
 
 
 # LOCALIZATION NOTE (mozdev):
 
-
 # link title for http://www.mozdev.org/
 
-
 #define mozdev mozdev.org
 
 
 # LOCALIZATION NOTE (mozdev_seamonkey):
 
-
 # link title for http://www.mozdev.org/projects/applications/SeaMonkey.html
 
-
 #define mozdev_seamonkey SeaMonkey Extensions from mozdev.org
 
 
 #define community_support Community &amp; Support
 
 
 # LOCALIZATION NOTE (seamonkey_community):
 
-
 # link title for http://www.seamonkey-project.org/community
 
-
 #define seamonkey_community SeaMonkey Community
 
 
 # LOCALIZATION NOTE (mozillazine):
 
-
 # link title for http://www.mozillazine.org/
 
-
 #define mozillazine mozillaZine
 
 
 # LOCALIZATION NOTE (seamonkey_support):
 
-
 # link title for the mozillaZine SeaMonkey Support forum
 
-
 #define seamonkey_support SeaMonkey Support Forum (mozillaZine)
 
 
 # LOCALIZATION NOTE (seamonkey_l10n):
 
-
 # insert full bookmark line for localized SeaMonkey page (personal toolbar)
 
-
 # e.g. #define seamonkey_l10n <DT><A HREF="http://www.seamonkey.tlh/">SeaMonkey tlhIngan</a>
 
-
 #define seamonkey_l10n 
 
 
 # LOCALIZATION NOTE (seamonkey_l10n_long):
 
-
 # insert full bookmark line for localized SeaMonkey page (normal bookmark)
 
-
 # e.g. #define seamonkey_l10n_long <DT><A HREF="http://www.seamonkey.tld/">tlhIngan Hol SeaMonkey</a>
 
-
 #define seamonkey_l10n_long 
 
 
-#unfilter emptyLines
+#unfilter emptyLines
\ No newline at end of file
--- a/toolkit/chrome/global/aboutTelemetry.dtd
+++ b/toolkit/chrome/global/aboutTelemetry.dtd
@@ -11,16 +11,18 @@
 <!ENTITY aboutTelemetry.slowSqlSection "  Consultas SQL lentas">
 
 <!ENTITY aboutTelemetry.chromeHangsSection "  Penchadas d'o navegador">
 
 <!ENTITY aboutTelemetry.histogramsSection "  Histogramas">
 
 <!ENTITY aboutTelemetry.simpleMeasurementsSection "  Midas simples">
 
+<!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">
 
--- a/toolkit/chrome/global/aboutTelemetry.properties
+++ b/toolkit/chrome/global/aboutTelemetry.properties
@@ -15,17 +15,21 @@ slowSqlHits = Coincidencias
 
 slowSqlAverage = Tiempo meyo (ms)
 
 slowSqlStatement = Consulta
 
 # Note to translators:
 # - The %1$S will be replaced with the number of the hang
 # - The %2$S will be replaced with the duration of the hang
-hangTitle = Informe d'a penchada #%1$S (%2$S segundos)
+chrome-hangs-title = Informe d'a penchada #%1$S (%2$S segundos)
+
+# Note to translators:
+# - The %1$S will be replaced with the number of the late write
+late-writes-title = Escritura rezagada nº%1$S
 
 stackTitle = Pila:
 
 memoryMapTitle = Mapa de memoria:
 
 errorFetchingSymbols = Ha ocurriu una error en recullir os simbolos. Comprebe que ye connectau a internet y prebe-lo de nuevas.
 
 histogramSamples = muestras
deleted file mode 100644
--- a/toolkit/chrome/global/downloadProgress.properties
+++ /dev/null
@@ -1,21 +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 (BadPluginTitle): 
-#
-#    This dialog is displayed when plugin throws unhandled exception
-#
-BadPluginTitle=Operación ilegal en o plugin
-# LOCALIZATION NOTE (BadPluginMessage): 
-#
-#    This is the message for the BadPlugin dialog.
-#    %S will be replaced by brandShortName.
-#
-BadPluginMessage=O plugin ha feito una operación ilegal. Se recomienda reiniciar o %S.
-# LOCALIZATION NOTE (BadPluginCheckboxMessage): 
-#
-#    This message tells the user that if they check this checkbox, they
-#    will never see this dialog again.
-#
-BadPluginCheckboxMessage=No tornar a amostrar iste mensache entre ista sesión.
--- a/toolkit/chrome/global/mozilla.dtd
+++ b/toolkit/chrome/global/mozilla.dtd
@@ -1,15 +1,9 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY mozilla.title "O Libro de Mozilla, 11:9">
+<!ENTITY mozilla.title.15.1 "Lo Libro de Mozilla, 15:1">
 
-<!ENTITY mozilla.quote 'Mammon s&apos;adurmió. Y la <em>bestia renaixió</em>, propagando-se por toda la Tierra, 
-y los suyos seguidors estioron lechión. Y proclamoron os nuevos tiempos y <em>sacrificoron</em> 
-cullitas con fuego, con a <em>estucia d&apos;as rabosas</em>. Y construyoron un nuevo mundo 
-a la suya propia imachen como prometeban las <em><a href="http://www.mozilla.org/about/mozilla-manifesto.html"> 
-parolas sagradas</a></em>, y <em><a href="http://wiki.mozilla.org/About:mozilla">la parola 
-</a></em> de la bestia y las suyas crías. Mammon se dispertó, y de sopetón 
-no yera que un <em>seguidor</em>.'>
+<!ENTITY mozilla.quote.15.1 "Los <em>bezons</em> de Mammon luitoron. La suya baralla sumió lo mundo en una <em>nueva escureldat</em> y la bestia detestaba la foscor. Asinas que empecipió a mover-se <em>habilment</em> y se fizo mas poderosa y fue dillá y se multiplicó. Y las bestias trayioron <em>fuego</em> y luz ta la escureldat.">
 
-<!ENTITY mozilla.from "d'o <strong>Libro de Mozilla,</strong> 11:9<br/><small>(10ª edición)</small>">
+<!ENTITY mozilla.from.15.1 "de <strong>Lo Libro de Mozilla,</strong> 15:1">
--- a/toolkit/chrome/global/resetProfile.dtd
+++ b/toolkit/chrome/global/resetProfile.dtd
@@ -5,11 +5,11 @@
 <!ENTITY resetProfile.dialog.title        "Reiniciar o &brandShortName;">
 <!ENTITY resetProfile.dialog.description  "Ye seguro que quiere reiniciar o &brandShortName; ta la configuración de fabrica?">
 <!ENTITY resetProfile.dialog.items2.label "&brandShortName; mirará de preservar:">
 <!ENTITY resetProfile.dialog.footer.label "O &brandShortName; se reiniciará y a resta de contenius s'eliminarán.">
 <!ENTITY resetProfile.dialog.button.label "Reiniciar o &brandShortName;">
 
 <!ENTITY resetProfile.title               "Reiniciar o &brandShortName; ta la suya configuración de fabrica">
 <!ENTITY resetProfile.description         "Si experimenta garra problema grieu que pueda resolver, reinicie nomás con a información esencial.">
-<!ENTITY resetProfile.button.label        "Reiniciar o &brandShortName;">
+<!ENTITY resetProfile.button.label2       "Reiniciar o <strong>The Book of Mozilla,</strong> 15:1">
 
 <!ENTITY resetProfile.cleaning.description "Espere entre que o &brandShortName; escosca a información obsoleta…">
--- a/toolkit/chrome/global/videocontrols.dtd
+++ b/toolkit/chrome/global/videocontrols.dtd
@@ -13,17 +13,17 @@
 <!ENTITY stats.size "Mida">
 <!ENTITY stats.activity "Actividat">
 <!ENTITY stats.activityPaused "En pausa">
 <!ENTITY stats.activityPlaying "En reproducción">
 <!ENTITY stats.activityEnded "Rematau">
 <!ENTITY stats.activitySeeking "(se ye posicionando)">
 <!ENTITY stats.volume "Volumen">
 <!ENTITY stats.channels "Canals">
-<!ENTITY stats.sampleRate "Freqüencia de muestreyo">
+<!ENTITY stats.sampleRate "Freqüencia d'escandallo">
 <!ENTITY stats.framesParsed "Fotogramas analisaus">
 <!ENTITY stats.framesDecoded "Fotogramas descodificaus">
 <!ENTITY stats.framesPresented "Fotogramas presentaus">
 <!ENTITY stats.framesPainted "Fotogramas pintaus">
 
 <!ENTITY error.aborted "S'ha aturau a descarga d'o video.">
 <!ENTITY error.network "S'ha abortau a reproducción d'o video por un problema con o ret.">
 <!ENTITY error.decode "O video no se puede reproducir porque o fichero ye corrompiu.">
--- a/toolkit/chrome/mozapps/downloads/downloads.properties
+++ b/toolkit/chrome/mozapps/downloads/downloads.properties
@@ -26,22 +26,17 @@ downloadErrorGeneric=No se puede alzar a
 quitCancelDownloadsAlertTitle=Quiere cancelar todas as descargas?
 quitCancelDownloadsAlertMsg=Si sale agora, se cancelará una descarga. Ye seguro que quiere salir?
 quitCancelDownloadsAlertMsgMultiple=Si sale agora, se cancelarán %S descargas. Ye seguro que quiere salir?
 quitCancelDownloadsAlertMsgMac=Si sale agora, se cancelará una descarga. Ye seguro que quiere salir?
 quitCancelDownloadsAlertMsgMacMultiple=Si sale agora, se cancelarán %S descargas. Ye seguro que quiere salir?
 offlineCancelDownloadsAlertTitle=Cancelar todas as descargas?
 offlineCancelDownloadsAlertMsg=Si pasa agora ta o modo sin connexión, se cancelará una descarga. Ye seguro que quiere pasar ta o modo sin connexión?
 offlineCancelDownloadsAlertMsgMultiple=Si pasa agora ta o modo sin connexión, se cancelarán %S descargas. Ye seguro que quiere pasar ta o modo sin connexión?
-enterPrivateBrowsingCancelDownloadsAlertTitle=Quiere cancelar todas as descargas?
-enterPrivateBrowsingCancelDownloadsAlertMsg=Si dentra agora en o modo de navegación privada, se cancelará una descarga. Ye seguro que quiere dentrar en o modo de navegación privada?
-enterPrivateBrowsingCancelDownloadsAlertMsgMultiple=Si dentra agora en o modo de navegación privada, se cancelarán %S descargas. Ye seguro que quiere dentrar en o modo de navegación privada?
 leavePrivateBrowsingCancelDownloadsAlertTitle=Cancelar todas as descargas?
-leavePrivateBrowsingCancelDownloadsAlertMsg=Si sale agora d'o modo de navegación privada, se cancelará 1 descarga. Ye seguro que quiere salir d'o modo de navegación privada?
-leavePrivateBrowsingCancelDownloadsAlertMsgMultiple=Si sale agora d'o modo de navegación privada, se cancelarán %S descargas. Ye seguro que quiere salir d'o modo de navegación privada?
 leavePrivateBrowsingWindowsCancelDownloadsAlertMsg=Si zarra agora todas as finestras de navegación privada, se cancelará a descarga. Ye seguro que quiere salir d'o modo de navegación privada?
 leavePrivateBrowsingWindowsCancelDownloadsAlertMsgMultiple=Si zarra agora todas as finestras de navegación privada, se cancelarán %S descargas. Ye seguro que quiere salir d'o modo de navegación privada?
 cancelDownloadsOKText=Cancelar una descarga
 cancelDownloadsOKTextMultiple=Cancelar %S descargas
 dontQuitButtonWin=No salir
 dontQuitButtonMac=No salir
 dontGoOfflineButton=Remanir connectau
 dontEnterPrivateBrowsingButton=No dentrar en o modo de navegación privada
--- a/toolkit/chrome/mozapps/plugins/plugins.dtd
+++ b/toolkit/chrome/mozapps/plugins/plugins.dtd
@@ -30,17 +30,17 @@
      supported on this device. Use the unicode ellipsis char, \u2026, or use "..." if \u2026 doesn't suit traditions in your locale. -->
 <!ENTITY unsupportedPlatform.learnMore                       "Saber-ne mas…">
 <!-- LOCALIZATION NOTE (unsupportedPlatform.post): Mobile only. Include text here if needed for your locale. -->
 <!ENTITY unsupportedPlatform.post                            "">
 
 <!ENTITY missingPlugin                                       "S'amenista un plugin ta amostrar iste conteniu.">
 <!-- LOCALIZATION NOTE (tapToPlayPlugin): Mobile (used for touch interfaces) only has one type of plugin possible. -->
 <!ENTITY tapToPlayPlugin                                     "Toca aquí ta activar o connector.">
-<!ENTITY clickToPlayPlugin                                   "Faiga click aquí ta activar o complemento.">
+<!ENTITY clickToActivatePlugin                               "Activar o plugin.">
 <!ENTITY checkForUpdates                                     "Mirar actualizacions…">
 <!ENTITY disabledPlugin                                      "S'ha desactivau iste plugin.">
 <!ENTITY blockedPlugin.label                                 "S'ha bloquiau iste plugin t'a suya protección.">
 
 <!ENTITY installPlugin                                       "Instalar un plugin…">
 <!ENTITY managePlugins                                       "Chestionar os plugins…">
 <!-- LOCALIZATION NOTE (reloadPlugin.pre): include a trailing space as needed -->
 <!-- LOCALIZATION NOTE (reloadPlugin.middle): avoid leading/trailing spaces, this text is a link -->
@@ -51,11 +51,13 @@
 <!ENTITY reloadPlugin.post                                   " ta tornar a prebar-lo.">
 <!-- LOCALIZATION NOTE (report.please): This and the other report.* strings should be as short as possible, ideally 2-3 words. -->
 <!ENTITY report.please                                       "Ninviar un informe de l'error">
 <!ENTITY report.submitting                                   "Se ye ninviando un informe…">
 <!ENTITY report.submitted                                    "S'ha ninviau l'informe de fallo.">
 <!ENTITY report.disabled                                     "S'han desactivau os informes de fallo.">
 <!ENTITY report.failed                                       "O ninviamiento ha fallau.">
 <!ENTITY report.unavailable                                  "No i hai garra informe disponible.">
+<!ENTITY report.comment                                      "Adhibir un comentario (os comentario son visibles)">
+<!ENTITY report.pageURL                                      "Incluiga a URL d'a pachina">
 
 <!ENTITY plugin.file                                         "Fichero">
 <!ENTITY plugin.mimeTypes                                    "Tipos MIME">