--- a/browser/chrome/browser/downloads/downloads.dtd
+++ b/browser/chrome/browser/downloads/downloads.dtd
@@ -62,30 +62,37 @@
 <!ENTITY cmd.copyDownloadLink.accesskey   "d">
 <!ENTITY cmd.removeFromHistory.label      "Retirer de l’historique">
 <!ENTITY cmd.removeFromHistory.accesskey  "e">
 <!ENTITY cmd.clearList.label              "Effacer la liste">
 <!ENTITY cmd.clearList.accesskey          "l">
 <!ENTITY cmd.clearDownloads.label         "Vider la liste des téléchargements">
 <!ENTITY cmd.clearDownloads.accesskey     "V">
 
-<!-- LOCALIZATION NOTE (cmd.unblock.label):
-     This command may be shown in the context menu, as a menu button item, or as
-     a text link when malware or potentially unwanted downloads are blocked.
-     Note: This string doesn't exist in the UI yet.  See bug 1053890.
+<!-- LOCALIZATION NOTE (cmd.unblock2.label):
+     This command is shown in the context menu when downloads are blocked.
      -->
-<!ENTITY cmd.unblock.label                "Débloquer">
-<!ENTITY cmd.unblock.accesskey            "b">
+<!ENTITY cmd.unblock2.label               "Autoriser le téléchargement">
+<!ENTITY cmd.unblock2.accesskey           "o">
 <!-- LOCALIZATION NOTE (cmd.removeFile.label):
-     This command may be shown in the context menu or as a menu button label
-     when malware or potentially unwanted downloads are blocked.
-     Note: This string doesn't exist in the UI yet.  See bug 1053890.
+     This is the tooltip of the action button shown when malware is blocked.
      -->
 <!ENTITY cmd.removeFile.label             "Supprimer le fichier">
-<!ENTITY cmd.removeFile.accesskey         "m">
+<!-- LOCALIZATION NOTE (cmd.chooseUnblock.tooltip):
+     This is the tooltip of the action button shown when potentially unwanted
+     downloads are blocked. This opens a dialog where the user can choose
+     whether to unblock or remove the download. Removing is the default option.
+     -->
+<!ENTITY cmd.chooseUnblock.label          "Supprimer le fichier ou autoriser le téléchargement">
+<!-- LOCALIZATION NOTE (cmd.chooseOpen.tooltip):
+     This is the tooltip of the action button shown when uncommon downloads are
+     blocked.This opens a dialog where the user can choose whether to open the
+     file or remove the download. Opening is the default option.
+     -->
+<!ENTITY cmd.chooseOpen.label             "Ouvrir ou supprimer le fichier">
 
 <!-- LOCALIZATION NOTE (blocked.label):
      Shown as a tag before the file name for some types of blocked downloads.
      Note: This string doesn't exist in the UI yet.  See bug 1053890.
      -->
 <!ENTITY blocked.label                    "BLOQUÉ">
 
 <!-- LOCALIZATION NOTE (learnMore.label):

--- a/browser/chrome/browser/downloads/downloads.properties
+++ b/browser/chrome/browser/downloads/downloads.properties
@@ -42,33 +42,35 @@ stateDirty=Bloqué : ce fichier semble contenir un virus ou un logiciel malveillant
 #                    blockedUncommon):
 # These strings are shown in the panel for some types of blocked downloads, and
 # are immediately followed by the "Learn More" link, thus they must end with a
 # period.  You may need to adjust "downloadDetails.width" in "downloads.dtd" if
 # this turns out to be longer than the other existing status strings.
 # Note: These strings don't exist in the UI yet.  See bug 1053890.
 blockedMalware=Ce fichier contient un virus ou un logiciel malveillant.
 blockedPotentiallyUnwanted=Ce fichier peut endommager votre ordinateur.
-blockedUncommon=Ouvrir ce fichier peut présenter un risque.
+blockedUncommon2=Ce fichier est rarement téléchargé.
 
-# LOCALIZATION NOTE (unblockHeader, unblockTypeMalware,
-#                    unblockTypePotentiallyUnwanted, unblockTypeUncommon,
-#                    unblockTip, unblockButtonContinue, unblockButtonCancel):
+# LOCALIZATION NOTE (unblockHeaderUnblock, unblockHeaderOpen,
+#                    unblockTypeMalware, unblockTypePotentiallyUnwanted,
+#                    unblockTypeUncommon, unblockTip, unblockButtonOpen,
+#                    unblockButtonUnblock, unblockButtonConfirmBlock):
 # These strings are displayed in the dialog shown when the user asks a blocked
 # download to be unblocked.  The severity of the threat is expressed in
 # descending order by the unblockType strings, it is higher for files detected
 # as malware and lower for uncommon downloads.
-# Note: These strings don't exist in the UI yet.  See bug 1053890.
-unblockHeader=Voulez-vous vraiment débloquer ce fichier ?
+unblockHeaderUnblock=Voulez-vous vraiment autoriser ce téléchargement ?
+unblockHeaderOpen=Voulez-vous vraiment ouvrir ce fichier ?
 unblockTypeMalware=Ce fichier contient un virus ou un logiciel malveillant qui peut endommager votre ordinateur.
 unblockTypePotentiallyUnwanted=Ce fichier, présenté comme un téléchargement légitime, pourrait modifier vos programmes et paramètres.
 unblockTypeUncommon=Ce fichier a été téléchargé depuis un site web peu connu et potentiellement dangereux et l’ouvrir peut présenter un risque.
 unblockTip=Vous pouvez rechercher une source alternative de téléchargement ou essayer de télécharger ce fichier à nouveau plus tard.
-unblockButtonContinue=Débloquer quand même
-unblockButtonCancel=Maintenir le blocage
+unblockButtonOpen=Ouvrir
+unblockButtonUnblock=Autoriser le téléchargement
+unblockButtonConfirmBlock=Supprimer le fichier
 
 # LOCALIZATION NOTE (sizeWithUnits):
 # %1$S is replaced with the size number, and %2$S with the measurement unit.
 sizeWithUnits=%1$S %2$S
 sizeUnknown=Taille inconnue
 
 # LOCALIZATION NOTE (shortTimeLeftSeconds, shortTimeLeftMinutes,
 # shortTimeLeftHours, shortTimeLeftDays):

--- a/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
+++ b/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.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 safeb.palm.accept.label "Sortir d’ici !">
 <!ENTITY safeb.palm.decline.label "Ignorer cet avertissement">
 <!-- Localization note (safeb.palm.notdeceptive.label) - Label of the Help menu item. -->
 <!ENTITY safeb.palm.notdeceptive.label "Ce site n’est pas trompeur…">
+<!-- Localization note (safeb.palm.notdeceptive.accesskey) - Because
+  safeb.palm.notdeceptive.label and reportDeceptiveSiteMenu.title from
+  report-phishing.dtd are never shown at the same time, the same accesskey can
+  be used for them. -->
+<!ENTITY safeb.palm.notdeceptive.accesskey "C">
 <!ENTITY safeb.palm.reportPage.label "Pourquoi cette page a-t-elle été bloquée ?">
 <!ENTITY safeb.palm.whyForbidden.label "Pourquoi cette page a-t-elle été bloquée ?">
 
 <!ENTITY safeb.blocked.malwarePage.title "Page malveillante !">
 <!-- 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 "La page web sur <span id='malware_sitename'/> a été signalée comme étant une page malveillante et a été bloquée sur la base de vos préférences de sécurité.">
 <!ENTITY safeb.blocked.malwarePage.longDesc "<p>Les pages malveillantes essaient d’installer des programmes qui volent des informations personnelles, qui utilisent votre ordinateur pour en attaquer d’autres ou qui endommagent votre système.</p><p>Certaines pages distribuent intentionnellement des logiciels malfaisants, mais beaucoup sont compromises sans la permission de leurs propriétaires ou sans qu’ils en aient connaissance.</p>">
 

--- a/devtools/client/responsive.properties
+++ b/devtools/client/responsive.properties
@@ -6,23 +6,30 @@
 # available from the Web Developer sub-menu -> 'Responsive Design Mode'.
 #
 # 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 (responsive.editDeviceList): option displayed in the device
+# selector
+responsive.editDeviceList=Modifier la liste…
+
 # LOCALIZATION NOTE  (responsive.title): the title displayed in the global
 # toolbar
 responsive.title=Vue adaptative
 
 # LOCALIZATION NOTE (responsive.exit): tooltip text of the exit button.
 responsive.exit=Fermer la vue adaptative
 
+# LOCALIZATION NOTE (responsive.done): button text in the device list modal
+responsive.done=Terminé
+
 # LOCALIZATION NOTE (responsive.noDeviceSelected): placeholder text for the
 # device selector
 responsive.noDeviceSelected=Aucun appareil sélectionné
 
 # LOCALIZATION NOTE  (responsive.screenshot): tooltip of the screenshot button.
 responsive.screenshot=Prendre une capture de la partie visible de l’écran
 
 # LOCALIZATION NOTE (responsive.screenshotGeneratedFilename): The auto generated