diff --git a/bin/locale/fr_FR.qm b/bin/locale/fr_FR.qm
index 4fd2c8a56..6af252370 100644
Binary files a/bin/locale/fr_FR.qm and b/bin/locale/fr_FR.qm differ
diff --git a/translations/fr_FR.ts b/translations/fr_FR.ts
index d694effdc..1f0cbfd1a 100644
--- a/translations/fr_FR.ts
+++ b/translations/fr_FR.ts
@@ -183,17 +183,17 @@
     <message>
         <location filename="../src/adblock/adblockicon.cpp" line="50"/>
         <source>Blocked popup window</source>
-        <translation type="unfinished"></translation>
+        <translation>Pop-up bloqué</translation>
     </message>
     <message>
         <location filename="../src/adblock/adblockicon.cpp" line="50"/>
         <source>AdBlock blocked unwanted popup window.</source>
-        <translation type="unfinished"></translation>
+        <translation>AdBlock a bloqué un pop-up non souhaité.</translation>
     </message>
     <message>
         <location filename="../src/adblock/adblockicon.cpp" line="69"/>
         <source>AdBlock</source>
-        <translation type="unfinished">AdBlock</translation>
+        <translation>AdBlock</translation>
     </message>
     <message>
         <location filename="../src/adblock/adblockicon.cpp" line="92"/>
@@ -204,7 +204,7 @@
     <message>
         <location filename="../src/adblock/adblockicon.cpp" line="95"/>
         <source>Blocked Popup Windows</source>
-        <translation type="unfinished"></translation>
+        <translation>Pop-up bloqués</translation>
     </message>
     <message>
         <location filename="../src/adblock/adblockicon.cpp" line="106"/>
@@ -294,7 +294,7 @@
     <message>
         <location filename="../src/preferences/autofillmanager.ui" line="104"/>
         <source>Import/Export</source>
-        <translation type="unfinished"></translation>
+        <translation>Importer/Exporter</translation>
     </message>
     <message>
         <location filename="../src/preferences/autofillmanager.ui" line="131"/>
@@ -311,12 +311,12 @@
     <message>
         <location filename="../src/preferences/autofillmanager.cpp" line="38"/>
         <source>Import Passwords from File...</source>
-        <translation type="unfinished"></translation>
+        <translation>Importer les mots de passe...</translation>
     </message>
     <message>
         <location filename="../src/preferences/autofillmanager.cpp" line="39"/>
         <source>Export Passwords to File...</source>
-        <translation type="unfinished"></translation>
+        <translation>Exporter les mots de passe...</translation>
     </message>
     <message>
         <location filename="../src/preferences/autofillmanager.cpp" line="90"/>
@@ -352,32 +352,32 @@
         <location filename="../src/preferences/autofillmanager.cpp" line="195"/>
         <location filename="../src/preferences/autofillmanager.cpp" line="215"/>
         <source>Choose file...</source>
-        <translation type="unfinished">Choisir un fichier...</translation>
+        <translation>Choisir un fichier...</translation>
     </message>
     <message>
         <location filename="../src/preferences/autofillmanager.cpp" line="202"/>
         <source>Cannot read file!</source>
-        <translation type="unfinished"></translation>
+        <translation>Lecture du fichier impossible!</translation>
     </message>
     <message>
         <location filename="../src/preferences/autofillmanager.cpp" line="229"/>
         <source>Successfully exported</source>
-        <translation type="unfinished"></translation>
+        <translation>Exportation réussie</translation>
     </message>
     <message>
         <location filename="../src/preferences/autofillmanager.cpp" line="209"/>
         <source>Error while importing!</source>
-        <translation type="unfinished"></translation>
+        <translation>Erreur dans l&apos;importation!</translation>
     </message>
     <message>
         <location filename="../src/preferences/autofillmanager.cpp" line="209"/>
         <source>Successfully imported</source>
-        <translation type="unfinished"></translation>
+        <translation>Importation réussie</translation>
     </message>
     <message>
         <location filename="../src/preferences/autofillmanager.cpp" line="222"/>
         <source>Cannot write to file!</source>
-        <translation type="unfinished"></translation>
+        <translation>Ecriture du fichier impossible!</translation>
     </message>
 </context>
 <context>
@@ -896,39 +896,39 @@
     <message>
         <location filename="../src/bookmarks/bookmarkswidget.ui" line="160"/>
         <source>Add into Bookmarks</source>
-        <translation type="unfinished"></translation>
+        <translation>Ajouter aux marque-pages</translation>
     </message>
     <message>
         <location filename="../src/bookmarks/bookmarkswidget.ui" line="167"/>
         <source>Add into Speed Dial</source>
-        <translation type="unfinished"></translation>
+        <translation>Ajouter à Speed Dial</translation>
     </message>
     <message>
         <location filename="../src/bookmarks/bookmarkswidget.ui" line="196"/>
         <source>&lt;b&gt;Add Bookmark&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Ajouter un marque-page&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="../src/bookmarks/bookmarkswidget.cpp" line="44"/>
         <source>Edit Bookmark</source>
-        <translation type="unfinished">Modifier le marque-page</translation>
+        <translation>Modifier le marque-page</translation>
     </message>
     <message>
         <location filename="../src/bookmarks/bookmarkswidget.cpp" line="45"/>
         <source>&lt;b&gt;Edit Bookmark&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Modifier le marque-page&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="../src/bookmarks/bookmarkswidget.cpp" line="49"/>
         <location filename="../src/bookmarks/bookmarkswidget.cpp" line="113"/>
         <source>Remove from Speed Dial</source>
-        <translation type="unfinished"></translation>
+        <translation>Supprimer de Speed Dial</translation>
     </message>
     <message>
         <location filename="../src/bookmarks/bookmarkswidget.cpp" line="49"/>
         <location filename="../src/bookmarks/bookmarkswidget.cpp" line="118"/>
         <source>Add to Speed Dial</source>
-        <translation type="unfinished"></translation>
+        <translation>Ajouter à Speed Dial</translation>
     </message>
 </context>
 <context>
@@ -1425,7 +1425,9 @@
         <source>Sorry, the file 
  %1 
  was not found!</source>
-        <translation type="unfinished"></translation>
+        <translation>Désolé, le fichier 
+%1 
+n&apos;a pas été trouvé!</translation>
     </message>
     <message>
         <source>New tab</source>
@@ -1436,14 +1438,6 @@
         <source>Not found</source>
         <translation>Non trouvé</translation>
     </message>
-    <message>
-        <source>Sorry, the file 
- %1 
- was not found!</source>
-        <translation type="obsolete">Désolé, le fichier 
-%1 
-n&apos;a pas été trouvé!</translation>
-    </message>
     <message>
         <location filename="../src/downloads/downloaditem.cpp" line="378"/>
         <source>Error: Cannot write to file!</source>
@@ -2679,7 +2673,7 @@ n&apos;a pas été trouvé!</translation>
     <message>
         <location filename="../src/preferences/preferences.ui" line="1573"/>
         <source>Executable:</source>
-        <translation type="unfinished">Application:</translation>
+        <translation>Application:</translation>
     </message>
     <message>
         <location filename="../src/preferences/preferences.ui" line="1580"/>
@@ -2699,7 +2693,7 @@ n&apos;a pas été trouvé!</translation>
     <message>
         <location filename="../src/preferences/preferences.ui" line="2141"/>
         <source>Change browser identification:</source>
-        <translation type="unfinished"></translation>
+        <translation>Changer l&apos;identité du navigateur:</translation>
     </message>
     <message>
         <source>Default Font</source>
@@ -3251,7 +3245,7 @@ n&apos;a pas été trouvé!</translation>
     <message>
         <location filename="../src/app/qupzilla.cpp" line="292"/>
         <source>&amp;Print...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Imprimer...</translation>
     </message>
     <message>
         <location filename="../src/app/qupzilla.cpp" line="327"/>
@@ -3356,7 +3350,7 @@ n&apos;a pas été trouvé!</translation>
     <message>
         <location filename="../src/app/qupzilla.cpp" line="441"/>
         <source>Web In&amp;spector</source>
-        <translation type="unfinished"></translation>
+        <translation>Web In&amp;spector</translation>
     </message>
     <message>
         <location filename="../src/app/qupzilla.cpp" line="490"/>
@@ -4991,7 +4985,7 @@ Après avoir ajouté ou retiré un certificat, il est nécessaire de redémarrer
     <message>
         <location filename="../src/webview/webpage.cpp" line="410"/>
         <source>Proxy server not found</source>
-        <translation type="unfinished"></translation>
+        <translation>Le serveur proxy n&apos;a pas été trouvé</translation>
     </message>
     <message>
         <location filename="../src/webview/webpage.cpp" line="413"/>
@@ -5270,7 +5264,7 @@ Après avoir ajouté ou retiré un certificat, il est nécessaire de redémarrer
     <message>
         <location filename="../src/webview/webview.cpp" line="686"/>
         <source>Go to &amp;web address</source>
-        <translation type="unfinished">Suivre le &amp;lien</translation>
+        <translation>Suivre le &amp;lien</translation>
     </message>
     <message>
         <location filename="../src/webview/webview.cpp" line="712"/>
diff --git a/windows/languages.nsh b/windows/languages.nsh
index 7f572dc0f..e51bfc0d0 100644
--- a/windows/languages.nsh
+++ b/windows/languages.nsh
@@ -138,19 +138,37 @@ LangString DESC_SecDesktop ${LANG_GREEK} "Προσθήκη εκκινητή στ
 LangString DESC_SecExtensions ${LANG_GREEK} "Συσχέτιση του QupZilla με αρχεία .htm και .html"
 LangString DESC_SecThemes ${LANG_GREEK} "Πρόσθετα θέματα για το QupZilla"
 
+;;;;French
+LangString TITLE_SecMain ${LANG_FRENCH} "Composants principaux"
+LangString TITLE_SecTranslations ${LANG_FRENCH} "Langues"
+LangString TITLE_SecPlugins ${LANG_FRENCH} "Plugins"
+LangString TITLE_SecExamplePlugin ${LANG_FRENCH} "Exemple de Plugin"
+LangString TITLE_SecDesktop ${LANG_FRENCH} "Icône de Bureau"
+LangString TITLE_SecExtensions ${LANG_FRENCH} "Associations de fichiers"
+LangString TITLE_SecThemes ${LANG_FRENCH} "Thèmes"
+
+LangString FILE_Htm ${LANG_FRENCH} "Fichiers HTM "
+LangString FILE_Html ${LANG_FRENCH} "Fichiers HTML"
+
+LangString DESC_SecMain ${LANG_FRENCH} "Composants principaux de l'application."
+LangString DESC_SecTranslations ${LANG_FRENCH} "Autres langues disponibles à l'installation. La langue par défaut est l'anglais."
+LangString DESC_SecPlugins ${LANG_FRENCH} "Autres plugins disponibles pour l'installation."
+LangString DESC_SecExamplePlugin ${LANG_FRENCH} "Exemple de plugin."
+LangString DESC_SecDesktop ${LANG_FRENCH} "Ajouter une icône sur le bureau."
+LangString DESC_SecExtensions ${LANG_FRENCH} "Associer QupZilla aux fichiers .htm et .html"
+LangString DESC_SecThemes ${LANG_FRENCH} "Thèmes supplémentaires pour QupZilla"
+
 ;;;;;;;;;
 ;;;;;;;;;
 ; Unfinished translations
 ;;;;;;;;;
 ;;;;;;;;;
-LangString TITLE_SecMain ${LANG_FRENCH} "Main Components"
 LangString TITLE_SecMain ${LANG_KOREAN} "Main Components"
 LangString TITLE_SecMain ${LANG_RUSSIAN} "Main Components"
 LangString TITLE_SecMain ${LANG_SPANISH} "Main Components"
 LangString TITLE_SecMain ${LANG_SWEDISH} "Main Components"
 LangString TITLE_SecMain ${LANG_TRADCHINESE} "Main Components"
 LangString TITLE_SecMain ${LANG_SIMPCHINESE} "Main Components"
-LangString DESC_SecMain ${LANG_FRENCH} "Main components of application."
 LangString DESC_SecMain ${LANG_KOREAN} "Main components of application."
 LangString DESC_SecMain ${LANG_RUSSIAN} "Main components of application."
 LangString DESC_SecMain ${LANG_SPANISH} "Main components of application."
@@ -158,14 +176,12 @@ LangString DESC_SecMain ${LANG_SWEDISH} "Main components of application."
 LangString DESC_SecMain ${LANG_TRADCHINESE} "Main components of application."
 LangString DESC_SecMain ${LANG_SIMPCHINESE} "Main components of application."
 
-LangString TITLE_SecTranslations ${LANG_FRENCH} "Translations"
 LangString TITLE_SecTranslations ${LANG_KOREAN} "Translations"
 LangString TITLE_SecTranslations ${LANG_RUSSIAN} "Translations"
 LangString TITLE_SecTranslations ${LANG_SPANISH} "Translations"
 LangString TITLE_SecTranslations ${LANG_SWEDISH} "Translations"
 LangString TITLE_SecTranslations ${LANG_TRADCHINESE} "Translations"
 LangString TITLE_SecTranslations ${LANG_SIMPCHINESE} "Translations"
-LangString DESC_SecTranslations ${LANG_FRENCH} "Other translations available to install. Default is English."
 LangString DESC_SecTranslations ${LANG_KOREAN} "Other translations available to install. Default is English."
 LangString DESC_SecTranslations ${LANG_RUSSIAN} "Other translations available to install. Default is English."
 LangString DESC_SecTranslations ${LANG_SPANISH} "Other translations available to install. Default is English."
@@ -173,14 +189,12 @@ LangString DESC_SecTranslations ${LANG_SWEDISH} "Other translations available to
 LangString DESC_SecTranslations ${LANG_TRADCHINESE} "Other translations available to install. Default is English."
 LangString DESC_SecTranslations ${LANG_SIMPCHINESE} "Other translations available to install. Default is English."
 
-LangString TITLE_SecPlugins ${LANG_FRENCH} "Plugins"
 LangString TITLE_SecPlugins ${LANG_KOREAN} "Plugins"
 LangString TITLE_SecPlugins ${LANG_RUSSIAN} "Plugins"
 LangString TITLE_SecPlugins ${LANG_SPANISH} "Plugins"
 LangString TITLE_SecPlugins ${LANG_SWEDISH} "Plugins"
 LangString TITLE_SecPlugins ${LANG_TRADCHINESE} "Plugins"
 LangString TITLE_SecPlugins ${LANG_SIMPCHINESE} "Plugins"
-LangString DESC_SecPlugins ${LANG_FRENCH} "Other plugins available to install."
 LangString DESC_SecPlugins ${LANG_KOREAN} "Other plugins available to install."
 LangString DESC_SecPlugins ${LANG_RUSSIAN} "Other plugins available to install."
 LangString DESC_SecPlugins ${LANG_SPANISH} "Other plugins available to install."
@@ -188,14 +202,12 @@ LangString DESC_SecPlugins ${LANG_SWEDISH} "Other plugins available to install."
 LangString DESC_SecPlugins ${LANG_TRADCHINESE} "Other plugins available to install."
 LangString DESC_SecPlugins ${LANG_SIMPCHINESE} "Other plugins available to install."
 
-LangString TITLE_SecExamplePlugin ${LANG_FRENCH} "Example Plugin"
 LangString TITLE_SecExamplePlugin ${LANG_KOREAN} "Example Plugin"
 LangString TITLE_SecExamplePlugin ${LANG_RUSSIAN} "Example Plugin"
 LangString TITLE_SecExamplePlugin ${LANG_SPANISH} "Example Plugin"
 LangString TITLE_SecExamplePlugin ${LANG_SWEDISH} "Example Plugin"
 LangString TITLE_SecExamplePlugin ${LANG_TRADCHINESE} "Example Plugin"
 LangString TITLE_SecExamplePlugin ${LANG_SIMPCHINESE} "Example Plugin"
-LangString DESC_SecExamplePlugin ${LANG_FRENCH} "Useless example plugin."
 LangString DESC_SecExamplePlugin ${LANG_KOREAN} "Useless example plugin."
 LangString DESC_SecExamplePlugin ${LANG_RUSSIAN} "Useless example plugin."
 LangString DESC_SecExamplePlugin ${LANG_SPANISH} "Useless example plugin."
@@ -203,14 +215,12 @@ LangString DESC_SecExamplePlugin ${LANG_SWEDISH} "Useless example plugin."
 LangString DESC_SecExamplePlugin ${LANG_TRADCHINESE} "Useless example plugin."
 LangString DESC_SecExamplePlugin ${LANG_SIMPCHINESE} "Useless example plugin."
 
-LangString TITLE_SecDesktop ${LANG_FRENCH} "Desktop Icon"
 LangString TITLE_SecDesktop ${LANG_KOREAN} "Desktop Icon"
 LangString TITLE_SecDesktop ${LANG_RUSSIAN} "Desktop Icon"
 LangString TITLE_SecDesktop ${LANG_SPANISH} "Desktop Icon"
 LangString TITLE_SecDesktop ${LANG_SWEDISH} "Desktop Icon"
 LangString TITLE_SecDesktop ${LANG_TRADCHINESE} "Desktop Icon"
 LangString TITLE_SecDesktop ${LANG_SIMPCHINESE} "Desktop Icon"
-LangString DESC_SecDesktop ${LANG_FRENCH} "Add launcher to desktop."
 LangString DESC_SecDesktop ${LANG_KOREAN} "Add launcher to desktop."
 LangString DESC_SecDesktop ${LANG_RUSSIAN} "Add launcher to desktop."
 LangString DESC_SecDesktop ${LANG_SPANISH} "Add launcher to desktop."
@@ -218,14 +228,12 @@ LangString DESC_SecDesktop ${LANG_SWEDISH} "Add launcher to desktop."
 LangString DESC_SecDesktop ${LANG_TRADCHINESE} "Add launcher to desktop."
 LangString DESC_SecDesktop ${LANG_SIMPCHINESE} "Add launcher to desktop."
 
-LangString TITLE_SecExtensions ${LANG_FRENCH} "File Associations"
 LangString TITLE_SecExtensions ${LANG_KOREAN} "File Associations"
 LangString TITLE_SecExtensions ${LANG_RUSSIAN} "File Associations"
 LangString TITLE_SecExtensions ${LANG_SPANISH} "File Associations"
 LangString TITLE_SecExtensions ${LANG_SWEDISH} "File Associations"
 LangString TITLE_SecExtensions ${LANG_TRADCHINESE} "File Associations"
 LangString TITLE_SecExtensions ${LANG_SIMPCHINESE} "File Associations"
-LangString DESC_SecExtensions ${LANG_FRENCH} "Associate QupZilla with .htm and .html files"
 LangString DESC_SecExtensions ${LANG_KOREAN} "Associate QupZilla with .htm and .html files"
 LangString DESC_SecExtensions ${LANG_RUSSIAN} "Associate QupZilla with .htm and .html files"
 LangString DESC_SecExtensions ${LANG_SPANISH} "Associate QupZilla with .htm and .html files"
@@ -233,14 +241,12 @@ LangString DESC_SecExtensions ${LANG_SWEDISH} "Associate QupZilla with .htm and
 LangString DESC_SecExtensions ${LANG_TRADCHINESE} "Associate QupZilla with .htm and .html files"
 LangString DESC_SecExtensions ${LANG_SIMPCHINESE} "Associate QupZilla with .htm and .html files"
 
-LangString FILE_Htm ${LANG_FRENCH} "HTM File"
 LangString FILE_Htm ${LANG_KOREAN} "HTM File"
 LangString FILE_Htm ${LANG_RUSSIAN} "HTM File"
 LangString FILE_Htm ${LANG_SPANISH} "HTM File"
 LangString FILE_Htm ${LANG_SWEDISH} "HTM File"
 LangString FILE_Htm ${LANG_TRADCHINESE} "HTM File"
 LangString FILE_Htm ${LANG_SIMPCHINESE} "HTM File"
-LangString FILE_Html ${LANG_FRENCH} "HTML File"
 LangString FILE_Html ${LANG_KOREAN} "HTML File"
 LangString FILE_Html ${LANG_RUSSIAN} "HTML File"
 LangString FILE_Html ${LANG_SPANISH} "HTML File"
@@ -248,14 +254,12 @@ LangString FILE_Html ${LANG_SWEDISH} "HTML File"
 LangString FILE_Html ${LANG_TRADCHINESE} "HTML File"
 LangString FILE_Html ${LANG_SIMPCHINESE} "HTML File"
 
-LangString TITLE_SecThemes ${LANG_FRENCH} "Themes"
 LangString TITLE_SecThemes ${LANG_KOREAN} "Themes"
 LangString TITLE_SecThemes ${LANG_RUSSIAN} "Themes"
 LangString TITLE_SecThemes ${LANG_SPANISH} "Themes"
 LangString TITLE_SecThemes ${LANG_SWEDISH} "Themes"
 LangString TITLE_SecThemes ${LANG_TRADCHINESE} "Themes"
 LangString TITLE_SecThemes ${LANG_SIMPCHINESE} "Themes"
-LangString DESC_SecThemes ${LANG_FRENCH} "Additional themes for QupZilla"
 LangString DESC_SecThemes ${LANG_KOREAN} "Additional themes for QupZilla"
 LangString DESC_SecThemes ${LANG_RUSSIAN} "Additional themes for QupZilla"
 LangString DESC_SecThemes ${LANG_SPANISH} "Additional themes for QupZilla"