diff --git a/linux/appdata/org.kde.falkon.appdata.xml b/linux/appdata/org.kde.falkon.appdata.xml
index 83670b215..689b381de 100644
--- a/linux/appdata/org.kde.falkon.appdata.xml
+++ b/linux/appdata/org.kde.falkon.appdata.xml
@@ -69,6 +69,7 @@
     <p xml:lang="sv">Falkon är en ny och mycket snabb Qt webbläsare. Den har som mål att vara en lättviktig webbläsare tillgänglig på alla större plattformar. Projektet startades ursprungligen bara i utbildningssyfte, men från starten har Falkon växt till en funktionsrik webbläsare.</p>
     <p xml:lang="uk">Falkon — нова і дуже швидка програма для перегляду інтернету на основі навігатора Qt. Метою проекту є створення невибагливого до ресурсів переглядача інтернету для усіх основних програмних платформ. Реалізацію проекту було розпочато з навчальною метою. Втім, з того часу Falkon стала повноцінним переглядачем.</p>
     <p xml:lang="x-test">xxFalkon is a new and very fast Qt web browser. It aims to be a lightweight web browser available through all major platforms. This project has been originally started only for educational purposes. But from its start, Falkon has grown into a feature-rich browser.xx</p>
+    <p xml:lang="zh-CN">Falkon 是一款全新的超快速 Qt 网络浏览器。它将是一款轻量级的跨平台浏览器。这个项目当初仅仅作为教育项目。但是从一开始，Falkon 就成长为一款功能丰富的浏览器。</p>
     <p>
     Falkon has all standard functions you expect from a web browser. It includes bookmarks, history (both also in sidebar) and tabs. Above that, you can manage RSS feeds with an included RSS reader, block ads with a built-in AdBlock plugin, block Flash content with Click2Flash and edit the local CA Certificates database with an SSL manager.
   </p>
diff --git a/src/lib/adblock/metadata.desktop b/src/lib/adblock/metadata.desktop
index 6d8967639..0169709ac 100644
--- a/src/lib/adblock/metadata.desktop
+++ b/src/lib/adblock/metadata.desktop
@@ -7,6 +7,7 @@ Name[da]=AdBlock
 Name[de]=AdBlock
 Name[en_GB]=AdBlock
 Name[es]=AdBlock
+Name[fr]=AdBlock
 Name[gl]=Bloqueador de publicidade
 Name[id]=AdBlock
 Name[it]=Adblock
@@ -26,6 +27,7 @@ Comment[da]=Blokerer uønskede webindhold
 Comment[de]=Blockiert unerwünschte Web-Inhalte
 Comment[en_GB]=Blocks unwanted web content
 Comment[es]=Bloquea contenido web no deseado
+Comment[fr]=Blocage des contenus Web indésirables
 Comment[gl]=Bloquea contenido web non desexado
 Comment[id]=Memblokir konten web yang tak diinginkan
 Comment[it]=Blocca i contenuti web non desiderati
diff --git a/src/lib/webengine/webview.cpp b/src/lib/webengine/webview.cpp
index 1b763b78c..a94b5268b 100644
--- a/src/lib/webengine/webview.cpp
+++ b/src/lib/webengine/webview.cpp
@@ -35,7 +35,6 @@
 #include "scripts.h"
 #include "webhittestresult.h"
 #include "webscrollbarmanager.h"
-#include "../config.h"
 
 #include <iostream>
 
diff --git a/src/plugins/AutoScroll/metadata.desktop b/src/plugins/AutoScroll/metadata.desktop
index 478fec1b7..3201c8870 100644
--- a/src/plugins/AutoScroll/metadata.desktop
+++ b/src/plugins/AutoScroll/metadata.desktop
@@ -8,6 +8,7 @@ Name[de]=Automatischer Bildlauf
 Name[en_GB]=AutoScroll
 Name[es]=Desplazamiento automático
 Name[fi]=Automaattivieritys
+Name[fr]=AutoScroll
 Name[gl]=Desprazamento automático
 Name[id]=AutoScroll
 Name[it]=Scorrimento automatico
@@ -26,6 +27,7 @@ Comment[da]=Giver understøttelse af autorul med den midterste museknap
 Comment[en_GB]=Provides support for autoscroll with middle mouse button
 Comment[es]=Implementa ell desplazamiento automático con el botón medio del ratón
 Comment[fi]=Tarjoaa automaattivieritystuen hiiren keskipainikkeelle
+Comment[fr]=Prise en charge du défilement automatique à l'aide du bouton central de la souris
 Comment[gl]=Fornece a funcionalidade de desprazamento automático co botón central
 Comment[id]=Menyediakan dukungan untuk gulir otomatis dengan tombol tengah mouse
 Comment[it]=Fornisce il supporto allo scorrimento automatico con il pulsante centrale del mouse
diff --git a/src/plugins/FlashCookieManager/metadata.desktop b/src/plugins/FlashCookieManager/metadata.desktop
index 511afe4ce..609516f15 100644
--- a/src/plugins/FlashCookieManager/metadata.desktop
+++ b/src/plugins/FlashCookieManager/metadata.desktop
@@ -8,6 +8,7 @@ Name[de]=Flash-Cookie-Verwaltung
 Name[en_GB]=Flash Cookie Manager
 Name[es]=Gestor de cookies de Flash
 Name[fi]=Flash-evästeiden hallinta
+Name[fr]=Gestionnaire de cookies Flash
 Name[gl]=Xestor de cookies flash
 Name[id]=Flash Cookie Manager
 Name[it]=Gestore dei cookie in flash
@@ -26,6 +27,7 @@ Comment[da]=Du kan let vise/slette flash-cookies som er lagret på din computer.
 Comment[en_GB]=You can easily view/delete flash cookies stored on your computer. This is a solution for having more privacy.
 Comment[es]=Usted puede ver/borrar fácilmente las cookies de flash guardadas en su equipo. Esta es una solución para disponer de más confidencialidad.
 Comment[fi]=Voit helposti tarkastella ja poistaa tietokoneelle tallennettuja Flash-evästeitä. Ratkaisu parantaa yksityisyytesi suojaa.
+Comment[fr]=Affichage et suppression facile des cookies stockés sur votre ordinateur. Une solution idéale pour gérer votre confidentialité.
 Comment[gl]=Pode ver e eliminar facilmente cookies flash almacenadas no seu computador. Isto é unha solución para ter máis intimidade.
 Comment[id]=Kamu bisa menampilkan/menghapus cookies flash yang tersimpan pada komputermu. Ini adalah sebuah solusi untuk membuat lebih privasi.
 Comment[it]=Puoi vedere o cancellare in maniera semplice i cookie in flash immagazzinati nel tuo computer. È una soluzione per avere una maggior privacy.
@@ -35,7 +37,7 @@ Comment[pt]=Poderá ver/apagar facilmente os 'cookies' do Flash gravados no seu
 Comment[sv]=Det går enkelt att titta på eller ta bort Flash kakor lagrade på datorn. Det är en lösning på integritetsproblem.
 Comment[uk]=Спрощує перегляд і вилучення кук flash, які зберігаються на вашому комп'ютері. Це засіб для поліпшення захисту системи.
 Comment[x-test]=xxYou can easily view/delete flash cookies stored on your computer. This is a solution for having more privacy.xx
-Comment[zh_CN]=您可以轻松地查看/删除存储在您的计算机上的 Flash cookie。这是一个更注重隐私的解决方案。
+Comment[zh_CN]=您可以轻松地查看/删除存储在您的计算机上的 Flash Cookie。这是一个更注重隐私的解决方案。
 
 Icon=:flashcookiemanager/data/flash-cookie-manager.png
 Type=Service
diff --git a/src/plugins/GnomeKeyringPasswords/metadata.desktop b/src/plugins/GnomeKeyringPasswords/metadata.desktop
index 236834d69..72224436f 100644
--- a/src/plugins/GnomeKeyringPasswords/metadata.desktop
+++ b/src/plugins/GnomeKeyringPasswords/metadata.desktop
@@ -7,6 +7,7 @@ Name[da]=Adgangskoder til Gnome-nøglering
 Name[en_GB]=Gnome Keyring Passwords
 Name[es]=Anillo de contraseñas de Gnome
 Name[fi]=Gnomen avainrenkaan salasankaat
+Name[fr]=Trousseau de clés de GNOME
 Name[gl]=Contrasinais do chaveiro de Gnome
 Name[id]=Gnome Keyring Passwords
 Name[it]=Portachiavi per le chiavi di Gnome
@@ -25,6 +26,7 @@ Comment[da]=Giver understøttelse af lagring af adgangskoder i gnome-nøglring
 Comment[en_GB]=Provides support for storing passwords in gnome-keyring
 Comment[es]=Implementa el almacenamiento de contraseñas en el anillo de claves de Gnome
 Comment[fi]=Tarjoaa tuen salasanojen tallentamiseksi Gnomen avainrenkaaseen
+Comment[fr]=Prise en charge de l'enregistrement de mots de passe au sein de gnome-keyring
 Comment[gl]=Permite almacenar contrasinais en gnome-keyring
 Comment[id]=Menyediakan dukungan untuk menyimpan sandi dalam gnome-keyring
 Comment[it]=Fornisce un supporto all'immagazzinamento delle password nel portachiavi di Gnome
diff --git a/src/plugins/GreaseMonkey/data/values.js b/src/plugins/GreaseMonkey/data/values.js
index e7a6756fe..f035a062a 100644
--- a/src/plugins/GreaseMonkey/data/values.js
+++ b/src/plugins/GreaseMonkey/data/values.js
@@ -8,7 +8,7 @@ function GM_deleteValue(aKey) {
 
 function GM_getValue(aKey, aDefault) {
     var val = localStorage.getItem("%1" + aKey)
-    if (null === val && 'undefined' != typeof aDefault) return aDefault;
+    if (null === val) return aDefault;
     return val;
 }
 
diff --git a/src/plugins/GreaseMonkey/data/values.min.js b/src/plugins/GreaseMonkey/data/values.min.js
index a26504911..a69b4c7db 100644
--- a/src/plugins/GreaseMonkey/data/values.min.js
+++ b/src/plugins/GreaseMonkey/data/values.min.js
@@ -1,4 +1,4 @@
-function GM_deleteValue(a){localStorage.removeItem("%1"+a)}function GM_getValue(a,b){var c=localStorage.getItem("%1"+a);return null===c&&"undefined"!=typeof b?b:c}function GM_listValues(){for(var a=[],b=0;b<localStorage.length;b++){var c=localStorage.key(b);0===c.indexOf("%1")&&a.push(c.replace("%1",""))}return a}function GM_setValue(a,b){localStorage.setItem("%1"+a,b)}
+function GM_deleteValue(a){localStorage.removeItem("%1"+a)}function GM_getValue(a,b){var c=localStorage.getItem("%1"+a);return null===c?b:c}function GM_listValues(){for(var a=[],b=0;b<localStorage.length;b++){var c=localStorage.key(b);0===c.indexOf("%1")&&a.push(c.replace("%1",""))}return a}function GM_setValue(a,b){localStorage.setItem("%1"+a,b)}
 var asyncCall=function(a){window._falkon_external?a():document.addEventListener("_falkon_external_created",a)},decode=function(a){a=String(a);if(!a.length)return a;var b=a.substr(1);if("b"==a[0])return"true"==b?!0:!1;if("i"==a[0])return Number(b);if("s"==a[0])return b},encode=function(a){return"boolean"==typeof a?"b"+(a?"true":"false"):"number"==typeof a?"i"+String(a):"string"==typeof a?"s"+a:""};
 GM.deleteValue=function(a){return new Promise(function(b,c){asyncCall(function(){external.extra.greasemonkey.deleteValue("%1",a,function(a){a?b():c()})})})};GM.getValue=function(a,b){return new Promise(function(c){asyncCall(function(){external.extra.greasemonkey.getValue("%1",a,encode(b),function(a){c(decode(a))})})})};GM.setValue=function(a,b){return new Promise(function(c,d){asyncCall(function(){external.extra.greasemonkey.setValue("%1",a,encode(b),function(a){a?c():d()})})})};
 GM.listValues=function(){return new Promise(function(a){asyncCall(function(){external.extra.greasemonkey.listValues("%1",a)})})};
diff --git a/src/plugins/GreaseMonkey/metadata.desktop b/src/plugins/GreaseMonkey/metadata.desktop
index 94f9f0b8e..248043615 100644
--- a/src/plugins/GreaseMonkey/metadata.desktop
+++ b/src/plugins/GreaseMonkey/metadata.desktop
@@ -27,7 +27,7 @@ Comment[da]=Giver understøttelse af brugerscripts
 Comment[en_GB]=Provides support for userscripts
 Comment[es]=Implementa guiones de usuario
 Comment[fi]=Tarjoaa käyttäjäskriptien tuen
-Comment[fr]=Prend en charge les scripts utilisateur.
+Comment[fr]=Prise en charge des scripts utilisateur.
 Comment[gl]=Permite scripts de usuario
 Comment[id]=Menyediakan dukungan untuk skrip pengguna
 Comment[it]=Fornisce un supporto agli script utente
diff --git a/src/plugins/KDEFrameworksIntegration/metadata.desktop b/src/plugins/KDEFrameworksIntegration/metadata.desktop
index b31f55ae4..e34356f65 100644
--- a/src/plugins/KDEFrameworksIntegration/metadata.desktop
+++ b/src/plugins/KDEFrameworksIntegration/metadata.desktop
@@ -6,6 +6,7 @@ Name[cs]=Integrace KDE Frameworks
 Name[da]=KDE Frameworks integration
 Name[en_GB]=KDE Frameworks Integration
 Name[es]=Integración con la infraestructura de KDE
+Name[fr]=Intégration à KDE Frameworks
 Name[gl]=Integración coas infraestruturas de KDE
 Name[id]=KDE Frameworks Integration
 Name[it]=Integrazione con KDE Frameworks
@@ -14,6 +15,7 @@ Name[pt]=Integração com as Plataformas do KDE
 Name[sv]=Integration med KDE Ramverk
 Name[uk]=Інтерграція із KDE Frameworks
 Name[x-test]=xxKDE Frameworks Integrationxx
+Name[zh_CN]=KDE 框架集成
 Comment=Provides support for KIO and storing passwords in KWallet
 Comment[ca]=Proporciona suport pel KIO i per emmagatzemar contrasenyes al KWallet
 Comment[ca@valencia]=Proporciona suport pel KIO i per emmagatzemar contrasenyes al KWallet
@@ -21,6 +23,7 @@ Comment[cs]=Poskytuje podporu pro KIO a ukládání hesel v Kwallet
 Comment[da]=Giver understøttelse af KIO og lagring af adgangskoder i KWallet
 Comment[en_GB]=Provides support for KIO and storing passwords in KWallet
 Comment[es]=Implementa KIO y almacenamiento de contraseñas en KWallet
+Comment[fr]=Prise en charge de KIO et de l'enregistrement de mots de passe dans KWallet
 Comment[gl]=Fornece compatibilidade con KIO e permite almacenar contrasinais en KWallet
 Comment[id]=Menyediakan dukungan untuk KIO dan menyimpan sandi dalam KWallet
 Comment[it]=Fornisce un supporto per KIO e per l'immagazzinamento delle password in KWallet
diff --git a/src/plugins/MouseGestures/metadata.desktop b/src/plugins/MouseGestures/metadata.desktop
index b594c468e..fe1ef9069 100644
--- a/src/plugins/MouseGestures/metadata.desktop
+++ b/src/plugins/MouseGestures/metadata.desktop
@@ -4,10 +4,11 @@ Name[ca]=Gestos del ratolí
 Name[ca@valencia]=Gestos del ratolí
 Name[cs]=Gesta myší
 Name[da]=Musebevægelser
-Name[de]=Maus-Gesten
+Name[de]=Mausgesten
 Name[en_GB]=Mouse Gestures
 Name[es]=Gestos de ratón
 Name[fi]=Hiirieleet
+Name[fr]=Mouvements de souris
 Name[gl]=Xestos do rato
 Name[id]=Mouse Gestures
 Name[it]=Gesti del mouse
@@ -17,14 +18,17 @@ Name[pt]=Gestos do Rato
 Name[sv]=Musgester
 Name[uk]=Керування мишею
 Name[x-test]=xxMouse Gesturesxx
+Name[zh_CN]=鼠标手势
 Comment=Provides support for navigating in webpages by mouse gestures
 Comment[ca]=Proporciona suport per navegar per les pàgines web amb gestos del ratolí
 Comment[ca@valencia]=Proporciona suport per navegar per les pàgines web amb gestos del ratolí
 Comment[cs]=Poskytuje podporu pro procházení webových stránek pomocí gest myší
 Comment[da]=Giver understøttelse af navigering på websider med musebevægelser
+Comment[de]=Unterstützung für die Navigation auf Webseiten durch Mausgesten
 Comment[en_GB]=Provides support for navigating in webpages by mouse gestures
 Comment[es]=Implementa la navegación en páginas web mediante gestos de ratón
 Comment[fi]=Tarjoaa tuen verkkosivujen selaamiseksi hiirielein
+Comment[fr]=Prise en charge de la navigation Internet à l'aide de mouvements de la souris
 Comment[gl]=Permite navegar por páxinas web con acenos co rato
 Comment[id]=Menyediakan dukungan untuk menavigasi dalam halaman web dengan pergerakan mouse
 Comment[it]=Fornisce un supporto alla navigazione nelle pagine web per mezzo di gesti del mouse
diff --git a/src/plugins/PIM/metadata.desktop b/src/plugins/PIM/metadata.desktop
index c8cfd4198..3b95d0d67 100644
--- a/src/plugins/PIM/metadata.desktop
+++ b/src/plugins/PIM/metadata.desktop
@@ -27,6 +27,7 @@ Comment[da]=Tilføjer mulighed for at Falkon kan lagre nogle personlige data
 Comment[en_GB]=Adds ability for Falkon to store some personal data
 Comment[es]=Añade a Falkon la facultad de guardar datos personales
 Comment[fi]=Lisää Falkoniin kyvyn tallentaa henkilökohtaista tietoa
+Comment[fr]=Ajout d'une capacité de stockage de certaines données personnelles par Falkon
 Comment[gl]=Permite a Falkon almacenar algúns datos persoais
 Comment[id]=Menambah kemampuan terhadap Falkon untuk menyimpan beberapa data pribadi
 Comment[it]=Aggiunge a Falkon la capacità di immagazzinare alcuni dati personali
diff --git a/src/plugins/StatusBarIcons/metadata.desktop b/src/plugins/StatusBarIcons/metadata.desktop
index c02acd1a2..4a93c4512 100644
--- a/src/plugins/StatusBarIcons/metadata.desktop
+++ b/src/plugins/StatusBarIcons/metadata.desktop
@@ -8,6 +8,7 @@ Name[de]=Statusleisten-Symbole
 Name[en_GB]=StatusBar Icons
 Name[es]=Iconos de la barra de tareas
 Name[fi]=Tilarivin kuvakkeet
+Name[fr]=Icônes de la barre d'état
 Name[gl]=Iconas da barra de estado
 Name[id]=Ikon BilahStatus
 Name[it]=Icone della barra di stato
@@ -26,6 +27,7 @@ Comment[da]=Tilføjer yderligere ikoner og zoomwidget til statuslinje
 Comment[en_GB]=Adds additional icons and zoom widget to statusbar
 Comment[es]=Añade iconos adicionales y control de zum a la barra de estado
 Comment[fi]=Lisää tilariville kuvakkeita ja lähennyssovelman
+Comment[fr]=Ajout d'icônes supplémentaires et d'un composant graphique de zoom à la barre d'état
 Comment[gl]=Engade iconas adicionais e un trebello de ampliación á barra de estado
 Comment[id]=Menambah tambahan ikon dan perbesaran widget untuk bilah status
 Comment[it]=Aggiunge alla barra di stato alcune icone aggiuntive ed uno strumento di ingrandimento
diff --git a/src/plugins/TabManager/metadata.desktop b/src/plugins/TabManager/metadata.desktop
index a45b05f5f..c23d0e8c2 100644
--- a/src/plugins/TabManager/metadata.desktop
+++ b/src/plugins/TabManager/metadata.desktop
@@ -8,6 +8,7 @@ Name[de]=Unterfensterverwaltung
 Name[en_GB]=Tab Manager
 Name[es]=Gestor de pestañas
 Name[fi]=Välilehtien hallinta
+Name[fr]=Gestionnaire d'onglets
 Name[gl]=Xestor de lapelas
 Name[id]=Pengelola Tab
 Name[it]=Gestore delle schede
@@ -23,9 +24,11 @@ Comment[ca]=Afegeix la possibilitat de gestionar pestanyes i finestres
 Comment[ca@valencia]=Afig la possibilitat de gestionar pestanyes i finestres
 Comment[cs]=Přidává schopnost správy karet a oken
 Comment[da]=Tilføjer mulighed for at håndtere faneblade og vinduer
+Comment[de]=Verwaltung von Unterfenstern und Fenstern
 Comment[en_GB]=Adds ability to managing tabs and windows
 Comment[es]=Añade la posibilidad de gestionar pestañas y ventanas
 Comment[fi]=Lisää kyvyn hallita välilehtiä ja ikkunoita
+Comment[fr]=Ajout d'une capacité de gestion des onglets et des fenêtres
 Comment[gl]=Permite xestionar lapelas e xanelas
 Comment[id]=Menambah kemampuan untuk mengelola tab dan jendela
 Comment[it]=Aggiunge la capacità di gestione delle schede e delle finestre
diff --git a/src/plugins/TestPlugin/metadata.desktop b/src/plugins/TestPlugin/metadata.desktop
index 53c967ec2..bd0c790ea 100644
--- a/src/plugins/TestPlugin/metadata.desktop
+++ b/src/plugins/TestPlugin/metadata.desktop
@@ -8,6 +8,7 @@ Name[de]=Beispielmodul
 Name[en_GB]=Example Plugin
 Name[es]=Complemento de ejemplo
 Name[fi]=Esimerkkiliitännäinen
+Name[fr]=Module externe d'exemple
 Name[gl]=Complemento de exemplo
 Name[id]=Contoh Plugin
 Name[it]=Estensione di esempio
@@ -23,9 +24,11 @@ Comment[ca]=Exemple molt senzill de connector mínim
 Comment[ca@valencia]=Exemple molt senzill de connector mínim
 Comment[cs]=Jednoduchá ukázka modulu
 Comment[da]=Meget simpelt minimalt plugin eksempel
+Comment[de]=Einfaches minimales Beispielmodul
 Comment[en_GB]=Very simple minimal plugin example
 Comment[es]=Complemento de ejemplo mínimo, muy sencillo
 Comment[fi]=Hyvin yksinkertainen esimerkki minimaalisesta liitännäisestä
+Comment[fr]=Exemple de module externe minimaliste très simple
 Comment[gl]=Exemplo de complemento mínimo moi simple
 Comment[id]=Contoh plugin minimal yang sangat sederhana
 Comment[it]=Estensione di esempio molto semplice e minimale
diff --git a/src/plugins/VerticalTabs/metadata.desktop b/src/plugins/VerticalTabs/metadata.desktop
index ac0ec2a0f..1f85bb375 100644
--- a/src/plugins/VerticalTabs/metadata.desktop
+++ b/src/plugins/VerticalTabs/metadata.desktop
@@ -8,6 +8,7 @@ Name[de]=Senkrechte Unterfenster
 Name[en_GB]=Vertical Tabs
 Name[es]=Pestañas verticales
 Name[fi]=Pystyvälilehdet
+Name[fr]=Onglets verticaux
 Name[gl]=Lapelas verticais
 Name[id]=Tab Tegak
 Name[it]=Schede verticali
@@ -26,6 +27,7 @@ Comment[da]=Tilføjer mulighed for at vise faneblade i sidepanel
 Comment[en_GB]=Adds ability to show tabs in sidebar
 Comment[es]=Añade la posibilidad de mostrar pestañas en la barra lateral
 Comment[fi]=Lisää kyvyn näyttää välilehdet sivupalkissa
+Comment[fr]=Prise en charge de l'affichage des onglets dans le panneau latéral
 Comment[gl]=Permite mostrar lapelas na barra lateral
 Comment[id]=Menambah kemampuan untuk menampilkan tab dalam bilah sisi
 Comment[it]=Aggiunge la capacità di mostrare le schede nella barra laterale
diff --git a/src/scripts/hellopython/metadata.desktop b/src/scripts/hellopython/metadata.desktop
index 70c2007e1..f0ea1c8e2 100644
--- a/src/scripts/hellopython/metadata.desktop
+++ b/src/scripts/hellopython/metadata.desktop
@@ -4,8 +4,10 @@ Name[ca]=Hola Python
 Name[ca@valencia]=Hola Python
 Name[cs]=Hello Python
 Name[da]=Hallo Python
+Name[de]=Hallo-Python
 Name[en_GB]=Hello Python
 Name[es]=Hola Python
+Name[fr]=Hello Python
 Name[gl]=Ola, Python!
 Name[id]=Hello Python
 Name[it]=Hello Python
@@ -21,8 +23,10 @@ Comment[ca]=Exemple d'una extensió en Python
 Comment[ca@valencia]=Exemple d'una extensió en Python
 Comment[cs]=Ukázkové rozšíření v Pythonu
 Comment[da]=Eksempel Python-udvidelse
+Comment[de]=Beispiel eines Python-Moduls
 Comment[en_GB]=Example Python extension
 Comment[es]=Ejemplo de extensión de Python
+Comment[fr]=Exemple d'extension Python
 Comment[gl]=Extensión de Python de exemplo
 Comment[id]=Contoh ekstensi Python
 Comment[it]=Estensione di esempio in Python
diff --git a/src/scripts/runaction/actions/googleimagesearch.desktop b/src/scripts/runaction/actions/googleimagesearch.desktop
index 3e27d5b87..3c0893e17 100644
--- a/src/scripts/runaction/actions/googleimagesearch.desktop
+++ b/src/scripts/runaction/actions/googleimagesearch.desktop
@@ -25,6 +25,7 @@ Comment[da]=Søg med...
 Comment[de]=Suchen mit ...
 Comment[en_GB]=Search with...
 Comment[es]=Buscar con...
+Comment[fr]=Chercher avec…
 Comment[gl]=Buscar con…
 Comment[id]=Cari dengan...
 Comment[it]=Cerca con...
@@ -33,6 +34,7 @@ Comment[pt]=Procurar com...
 Comment[sv]=Sök med...
 Comment[uk]=Шукати за допомогою…
 Comment[x-test]=xxSearch with...xx
+Comment[zh_CN]=使用搜索引擎搜索...
 
 Icon=google.png
 Type=Service
diff --git a/src/scripts/runaction/actions/mpv.desktop b/src/scripts/runaction/actions/mpv.desktop
index b53ea97ce..045e3da51 100644
--- a/src/scripts/runaction/actions/mpv.desktop
+++ b/src/scripts/runaction/actions/mpv.desktop
@@ -6,6 +6,7 @@ Name[cs]=Otevřít pomocí mpv
 Name[da]=Åbn med mpv
 Name[en_GB]=Open with mpv
 Name[es]=Abrir con mpv
+Name[fr]=Ouvrir avec mpv
 Name[gl]=Abrir con mpv
 Name[id]=Buka dengan mpv
 Name[it]=Apri con mpv
diff --git a/src/scripts/runaction/actions/tineyeimagesearch.desktop b/src/scripts/runaction/actions/tineyeimagesearch.desktop
index bf2938a7c..2c6d07d0e 100644
--- a/src/scripts/runaction/actions/tineyeimagesearch.desktop
+++ b/src/scripts/runaction/actions/tineyeimagesearch.desktop
@@ -7,6 +7,7 @@ Name[da]=TinEye
 Name[de]=TinEye
 Name[en_GB]=TinEye
 Name[es]=TinEye
+Name[fr]=TinEye
 Name[gl]=TinEye
 Name[id]=TinEye
 Name[it]=TinEye
@@ -24,6 +25,7 @@ Comment[da]=Søg med...
 Comment[de]=Suchen mit ...
 Comment[en_GB]=Search with...
 Comment[es]=Buscar con...
+Comment[fr]=Chercher avec…
 Comment[gl]=Buscar con…
 Comment[id]=Cari dengan...
 Comment[it]=Cerca con...
@@ -32,6 +34,7 @@ Comment[pt]=Procurar com...
 Comment[sv]=Sök med...
 Comment[uk]=Шукати за допомогою…
 Comment[x-test]=xxSearch with...xx
+Comment[zh_CN]=使用搜索引擎搜索...
 
 Icon=tineye.png
 Type=Service
diff --git a/src/scripts/runaction/actions/translate.desktop b/src/scripts/runaction/actions/translate.desktop
index ae87961c1..5b2bc1886 100644
--- a/src/scripts/runaction/actions/translate.desktop
+++ b/src/scripts/runaction/actions/translate.desktop
@@ -7,6 +7,7 @@ Name[da]=Oversæt side
 Name[de]=Seite übersetzen
 Name[en_GB]=Translate page
 Name[es]=Traducir página
+Name[fr]=Traduire la page Web
 Name[gl]=Traducir a páxina
 Name[id]=Terjemahkan halaman
 Name[it]=Traduci la pagina
diff --git a/src/scripts/runaction/actions/w3.desktop b/src/scripts/runaction/actions/w3.desktop
index c67cbfb51..09fc962c6 100644
--- a/src/scripts/runaction/actions/w3.desktop
+++ b/src/scripts/runaction/actions/w3.desktop
@@ -7,6 +7,7 @@ Name[da]=Valider side
 Name[de]=Seite überprüfen
 Name[en_GB]=Validate page
 Name[es]=Validar página
+Name[fr]=Valider la page
 Name[gl]=Validar a páxina
 Name[id]=Validasi halaman
 Name[it]=Convalida la pagina
diff --git a/src/scripts/runaction/actions/yandeximagesearch.desktop b/src/scripts/runaction/actions/yandeximagesearch.desktop
index c2f8ea7f4..bdfdc6bdc 100644
--- a/src/scripts/runaction/actions/yandeximagesearch.desktop
+++ b/src/scripts/runaction/actions/yandeximagesearch.desktop
@@ -7,6 +7,7 @@ Name[da]=Yandex
 Name[de]=Yandex
 Name[en_GB]=Yandex
 Name[es]=Yandex
+Name[fr]=Yandex
 Name[gl]=Yandex
 Name[id]=Yandex
 Name[it]=Yandex
@@ -24,6 +25,7 @@ Comment[da]=Søg med...
 Comment[de]=Suchen mit ...
 Comment[en_GB]=Search with...
 Comment[es]=Buscar con...
+Comment[fr]=Chercher avec…
 Comment[gl]=Buscar con…
 Comment[id]=Cari dengan...
 Comment[it]=Cerca con...
@@ -32,6 +34,7 @@ Comment[pt]=Procurar com...
 Comment[sv]=Sök med...
 Comment[uk]=Шукати за допомогою…
 Comment[x-test]=xxSearch with...xx
+Comment[zh_CN]=使用搜索引擎搜索...
 
 Icon=yandex.png
 Type=Service
diff --git a/src/scripts/runaction/metadata.desktop b/src/scripts/runaction/metadata.desktop
index 8f621cae0..606f19c7b 100644
--- a/src/scripts/runaction/metadata.desktop
+++ b/src/scripts/runaction/metadata.desktop
@@ -6,6 +6,7 @@ Name[cs]=Spustit činnost
 Name[da]=Kør handling
 Name[en_GB]=Run Action
 Name[es]=Ejecutar acción
+Name[fr]=Lancer une action
 Name[gl]=Executar a acción
 Name[id]=Run Action
 Name[it]=Esegui azione
@@ -22,6 +23,7 @@ Comment[cs]=Spouštět různé činnosti na stránkách
 Comment[da]=Kør diverse handlinger på steder
 Comment[en_GB]=Run various actions on sites
 Comment[es]=Ejecutar varias acciones en sitios
+Comment[fr]=Lancement d'actions diverses sur des sites Web
 Comment[gl]=Executar varias accións en sitios
 Comment[id]=Jalankan beberapa aksi pada situs
 Comment[it]=Esegue numerose azioni nei siti
diff --git a/themes/chrome/metadata.desktop b/themes/chrome/metadata.desktop
index 002191aae..b57fb8608 100644
--- a/themes/chrome/metadata.desktop
+++ b/themes/chrome/metadata.desktop
@@ -8,6 +8,7 @@ Name[de]=Chrome
 Name[en_GB]=Chrome
 Name[es]=Chrome
 Name[fi]=Chrome
+Name[fr]=Chrome
 Name[gl]=Chrome
 Name[id]=Chrome
 Name[it]=Chrome
@@ -23,9 +24,11 @@ Comment[ca]=Tema semblant al Chrome pel Falkon basat en el tema Chromifox del Fi
 Comment[ca@valencia]=Tema semblant al Chrome pel Falkon basat en el tema Chromifox del Firefox
 Comment[cs]=Motiv pro Falkon podobný Chrome založený na motivu Firefox Chromifox
 Comment[da]=Chrome-lignende tema til Falkon baseret på Firefox Chromifox-tema
+Comment[de]=Chrome ähnliches Design für Falkon auf der Basis des Chromifox-Designs von Firefox
 Comment[en_GB]=Chrome like theme for Falkon based on Firefox Chromifox theme
 Comment[es]=Tema estilo Chrome para Falkon basado en el tema Firefox Chromifox
 Comment[fi]=Firefoxin Chromifox-teemaan pohjautuva Chromen kaltainen Falkon-teema
+Comment[fr]=Thème Chrome pour Falkon inspiré du thème Chromifox de Firefox
 Comment[gl]=Tema parecido a Chrome para Falkon baseado no tema Chromifox de Firefox
 Comment[id]=Tema seperti Chrome untuk Falkon berdasarkan pada tema Firefox Chromifox
 Comment[it]=Tema di tipo Chrome per Falkon, basato sul tema Chromifox di Firefox
diff --git a/themes/linux/metadata.desktop b/themes/linux/metadata.desktop
index 3f01a9d34..465eca18e 100644
--- a/themes/linux/metadata.desktop
+++ b/themes/linux/metadata.desktop
@@ -8,6 +8,7 @@ Name[de]=Linux
 Name[en_GB]=Linux
 Name[es]=Linux
 Name[fi]=Linux
+Name[fr]=Linux
 Name[gl]=Linux
 Name[id]=Linux
 Name[it]=Linux
@@ -26,6 +27,7 @@ Comment[da]=Standard simpelt tema til Linux som bruger systemets widgetstil og n
 Comment[en_GB]=Default simple theme for Linux using native widget style and some basic icons from desktop icon set
 Comment[es]=Tema sencillo predeterminado para Linux usando un estilo de controles nativo y algunos iconos básicos desde el conjunto de iconos de escritorio
 Comment[fi]=Yksinkertainen natiivia elementtityyliä käyttävä Linux-teema sekä joitakin kuvakkeita työpöytäkuvakejoukosta
+Comment[fr]=Thème simple par défaut pour Linux utilisant les styles de composants graphiques natifs et quelques icônes simples du jeu d'icônes du bureau
 Comment[gl]=Tema predeterminado simple para Linux que usa o estilo de trebellos nativo e algunhas iconas básicas do grupo de iconas do escritorio
 Comment[id]=Tema sederhana baku untuk Linux menggunakan gaya widget bawaan dan beberapa ikon dasar dari set ikon desktop
 Comment[it]=Semplice tema predefinito per Linux, che usa lo stile nativo degli oggetti ed alcune icone di base dall'insieme di icone del desktop
diff --git a/themes/mac/metadata.desktop b/themes/mac/metadata.desktop
index a74a81e6a..492697939 100644
--- a/themes/mac/metadata.desktop
+++ b/themes/mac/metadata.desktop
@@ -8,6 +8,7 @@ Name[de]=Mac
 Name[en_GB]=Mac
 Name[es]=Mac
 Name[fi]=Mac
+Name[fr]=Mac
 Name[gl]=Mac
 Name[id]=Mac
 Name[it]=Mac
@@ -23,9 +24,11 @@ Comment[ca]=Tema semblant al Mac pel Falkon basat en el tema Mac OS X del Firefo
 Comment[ca@valencia]=Tema semblant al Mac pel Falkon basat en el tema Mac OS X del Firefox
 Comment[cs]=Motiv pro Falkon podobný Macu založený na motivu Firefox Mac OS X
 Comment[da]=Mac-lignende tema til Falkon baseret på Firefox Mac OS X-tema
+Comment[de]=Mac ähnliches Design für Falkon auf der Basis des „Mac OS X“-Designs von Firefox
 Comment[en_GB]=Mac like theme for Falkon based on Firefox Mac OS X theme
 Comment[es]=Tema estilo Mac para Falkon basado en el tema Firefox Mac OS X
 Comment[fi]=Firefoxin Mac OS X -teemaan pohjautuva Macin kaltainen Falkon-teema
+Comment[fr]=Thème Mac pour Falkon inspiré du thème Mac OS X de Firefox
 Comment[gl]=Tema parecido a Mac para Falkon baseado no tema de Mac OS X de Firefox
 Comment[id]=Tema seperti Mac untuk Falkon berdasarkan pada tema Firefox Mac OS X
 Comment[it]=Tema di tipo Mac per Falkon, basato sul tema Mac OS X di Firefox
diff --git a/themes/windows/metadata.desktop b/themes/windows/metadata.desktop
index dcb7e3b0e..c0095511a 100644
--- a/themes/windows/metadata.desktop
+++ b/themes/windows/metadata.desktop
@@ -8,6 +8,7 @@ Name[de]=Windows
 Name[en_GB]=Windows
 Name[es]=Windows
 Name[fi]=Windows
+Name[fr]=Windows
 Name[gl]=Xanelas
 Name[id]=Windows
 Name[it]=Windows
@@ -23,9 +24,11 @@ Comment[ca]=Tema semblant al Windows basat en el «Material design»
 Comment[ca@valencia]=Tema semblant al Windows basat en el «Material design»
 Comment[cs]=Motiv podobný Windows založený na designu Material
 Comment[da]=Windows-lignende tema baseret på Material design
+Comment[de]=Windows ähnliches Design auf der Basis des Designs Material
 Comment[en_GB]=Windows like theme based on Material design
 Comment[es]=Tema estilo Windows basado en el diseño Material
 Comment[fi]=Material-designiin pohjautuva Windowsin kaltainen teema
+Comment[fr]=Thème Windows inspiré par Material
 Comment[gl]=Tema parecido a Windows baseado no deseño material
 Comment[id]=Tema seperti Windows berdasarkan pada desain Material
 Comment[it]=Tema di tipo Windows, basato sul design Material
diff --git a/windows/installer.nsi b/windows/installer.nsi
index 3a13f802c..2d67bf07a 100644
--- a/windows/installer.nsi
+++ b/windows/installer.nsi
@@ -402,6 +402,7 @@ Function .onInit
         doAbort:
             Abort
     skip:
+        call notifyUserIfHotfixNeeded
 FunctionEnd
 
 Function RegisterCapabilities
@@ -491,3 +492,20 @@ Function SkipComponentsIfPortableInstalltion
 StrCmp $installAsPortable "YES" 0 +2
     Abort
 FunctionEnd
+
+Function notifyUserIfHotfixNeeded
+    ; check if Windows 10 family. Taken from: http://nsis.sourceforge.net/Get_Windows_version
+    ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentMajorVersionNumber
+    StrCmp $R0 '' 0 skiphotfixwarn
+
+    ClearErrors
+    nsExec::ExecToStack 'cmd /Q /C "%SYSTEMROOT%\System32\wbem\wmic.exe qfe get hotfixid | %SYSTEMROOT%\System32\findstr.exe "^KB2999226""'
+    Pop $0 ; return value (it always 0 even if an error occured)
+    Pop $1 ; command output KB2999226
+
+    StrCmp $1 "" 0 skiphotfixwarn
+      MessageBox MB_YESNO|MB_ICONQUESTION "${MSG_HotfixNeeded}" IDNO +2
+        ExecShell open "https://support.microsoft.com/en-us/help/2999226/update-for-universal-c-runtime-in-windows"
+
+    skiphotfixwarn:
+FunctionEnd
diff --git a/windows/strings.nsh b/windows/strings.nsh
index b33597e9f..1da4a42a3 100644
--- a/windows/strings.nsh
+++ b/windows/strings.nsh
@@ -37,3 +37,5 @@
 !define MSG_InvalidInstallPath "Install path invalid!"
 
 !define MSG_PortableWriteError "Error occurred when creating 'falkon.conf' in installation folder. Create it manually."
+
+!define MSG_HotfixNeeded "To run Falkon you have to install hotfix 'KB2999226'. Proceed to Windows update website?"