diff --git a/src/data/kmail_config_plugins.desktop b/src/data/kmail_config_plugins.desktop
index fb7fcc9c4..45a343b4f 100644
--- a/src/data/kmail_config_plugins.desktop
+++ b/src/data/kmail_config_plugins.desktop
@@ -1,136 +1,138 @@
 [Desktop Entry]
 Icon=preferences-plugin
 Type=Service
 X-KDE-ServiceTypes=KCModule
 
 X-KDE-ModuleType=Library
 X-KDE-Library=kcm_kmail
 X-KDE-FactoryName=kmail_config_plugins
 X-KDE-HasReadOnlyMode=false
 X-KDE-ParentApp=kmail
 X-KDE-ParentComponents=kmail,kontact_kmailplugin
 X-KDE-CfgDlgHierarchy=KMail
 X-KDE-Weight=600
 X-DocPath=kmail/index.html
 
 Name=Plugins
 Name[af]=Inprop modules
 Name[ar]=الملحقات
 Name[bg]=Приставки
 Name[br]=Lugantoù
 Name[bs]=Dodaci
 Name[ca]=Connectors
 Name[ca@valencia]=Connectors
 Name[cs]=Moduly
 Name[cy]=Ategion
 Name[da]=Plugin
 Name[de]=Module
 Name[el]=Πρόσθετα
 Name[en_GB]=Plugins
 Name[eo]=Kromaĵoj
 Name[es]=Complementos
 Name[et]=Pluginad
 Name[eu]=Plugin-ak
 Name[fa]=وصله‌ها
 Name[fi]=Liitännäiset
 Name[fr]=Modules externes
 Name[fy]=Plugins
 Name[ga]=Breiseáin
 Name[gl]=Engadidos
 Name[he]=תוספים
 Name[hu]=Bővítőmodulok
 Name[ia]=Plug-ins
 Name[is]=Íforrit
 Name[it]=Estensioni
 Name[ja]=プラグイン
 Name[ka]=მოდულები
 Name[kk]=Плагин модульдері
 Name[km]=កម្មវិធី​ជំនួយ
 Name[ko]=플러그인
 Name[lt]=Papildiniai
 Name[lv]=Spraudņi
 Name[mai]=प्लगिन
 Name[mk]=Приклучоци
 Name[mr]=प्लगइन्स
 Name[ms]=Plugin
 Name[nb]=Programtillegg
 Name[nds]=Modulen
 Name[ne]=प्लगइन
 Name[nl]=Plug-ins
 Name[nn]=Programtillegg
 Name[pa]=ਪਲੱਗਇਨਾਂ
 Name[pl]=Wtyczki
 Name[pt]='Plugins'
 Name[pt_BR]=Plugins
 Name[ro]=Extensii
 Name[ru]=Модули
 Name[se]=Lassemoduvllat
 Name[sk]=Moduly
 Name[sl]=Vstavki
 Name[sr]=Прикључци
 Name[sr@ijekavian]=Прикључци
 Name[sr@ijekavianlatin]=Priključci
 Name[sr@latin]=Priključci
 Name[sv]=Insticksprogram
 Name[ta]=சொருகுப்பொருள்கள்
 Name[th]=โปรแกรมเสริม
 Name[tr]=Eklentiler
 Name[ug]=قىستۇرما
 Name[uk]=Додатки
 Name[uz]=Plaginlar
 Name[uz@cyrillic]=Плагинлар
 Name[wa]=Tchôkes-divins
 Name[x-test]=xxPluginsxx
 Name[zh_CN]=插件
 Name[zh_TW]=外掛程式
 Comment=Settings Plugins
 Comment[ca]=Arranjament dels connectors
 Comment[ca@valencia]=Arranjament dels connectors
 Comment[cs]=Moduly Nastavení
 Comment[da]=Plugins til indstillinger
 Comment[de]=Einstellungsmodul
 Comment[en_GB]=Settings Plugins
 Comment[es]=Preferencias de complementos
 Comment[et]=Seadistusplugin
 Comment[fi]=Asetusliitännäiset
+Comment[fr]=Modules de paramètres
 Comment[it]=Estensioni per le impostazioni
 Comment[nl]=Plug-ins voor instellingen
 Comment[pl]=Wtyczki ustawień
 Comment[pt]='Plugins' de Configuração
 Comment[sk]=Pluginy nastavení
 Comment[sl]=Nastavi vstavke
 Comment[sr]=Прикључци за поставке
 Comment[sr@ijekavian]=Прикључци за поставке
 Comment[sr@ijekavianlatin]=Priključci za postavke
 Comment[sr@latin]=Priključci za postavke
 Comment[sv]=Inställningsinsticksprogram
 Comment[tr]=Ayarlar Eklentisi
 Comment[uk]=Додатки параметрів
 Comment[x-test]=xxSettings Pluginsxx
 Comment[zh_CN]=设置插件
 X-KDE-Keywords=kmail,plugins
 X-KDE-Keywords[ca]=kmail,connectors
 X-KDE-Keywords[ca@valencia]=kmail,connectors
 X-KDE-Keywords[cs]=kmail,moduly
 X-KDE-Keywords[da]=kmail,plugins
 X-KDE-Keywords[de]=KMail,Module
 X-KDE-Keywords[en_GB]=kmail,plugins
 X-KDE-Keywords[es]=kmail,complementos
 X-KDE-Keywords[et]=kmail,pluginad
 X-KDE-Keywords[fi]=kmail,liitännäiset
+X-KDE-Keywords[fr]=kmail,modules
 X-KDE-Keywords[it]=kmail,estensioni
 X-KDE-Keywords[nl]=kmail,plug-ins
 X-KDE-Keywords[pl]=kmail,wtyczki
 X-KDE-Keywords[pt]=kmail,plugins
 X-KDE-Keywords[ru]=kmail,plugins,модули,расширения
 X-KDE-Keywords[sk]=kmail,pluginy
 X-KDE-Keywords[sl]=kmail,vstavki
 X-KDE-Keywords[sr]=kmail,plugins,К‑пошта,прикључци
 X-KDE-Keywords[sr@ijekavian]=kmail,plugins,К‑пошта,прикључци
 X-KDE-Keywords[sr@ijekavianlatin]=kmail,plugins,K‑pošta,priključci
 X-KDE-Keywords[sr@latin]=kmail,plugins,K‑pošta,priključci
 X-KDE-Keywords[sv]=kmail,insticksprogram
 X-KDE-Keywords[tr]=kmail,eklentiler
 X-KDE-Keywords[uk]=kmail,plugins,додатки,кмейл
 X-KDE-Keywords[x-test]=xxkmailxx,xxpluginsxx
 X-KDE-Keywords[zh_CN]=kmail,plugins,插件
diff --git a/src/data/org.kde.kmail.desktop b/src/data/org.kde.kmail.desktop
index da91e5c50..74d0d2e81 100755
--- a/src/data/org.kde.kmail.desktop
+++ b/src/data/org.kde.kmail.desktop
@@ -1,253 +1,255 @@
 [Desktop Entry]
 Name=KMail
 Name[af]=KMail
 Name[ar]=برنامج البريد KMail
 Name[be]=KMail
 Name[bg]=KMail
 Name[br]=KMail
 Name[bs]=KMail
 Name[ca]=KMail
 Name[ca@valencia]=KMail
 Name[cs]=KMail
 Name[cy]=KMail
 Name[da]=KMail
 Name[de]=KMail
 Name[el]=KMail
 Name[en_GB]=KMail
 Name[eo]=Retpoŝto
 Name[es]=KMail
 Name[et]=KMail
 Name[eu]=KMail
 Name[fi]=KMail
 Name[fr]=KMail
 Name[fy]=KMail
 Name[ga]=KMail
 Name[gl]=KMail
 Name[he]=KMail
 Name[hr]=KMail
 Name[hu]=KMail
 Name[ia]=KMail
 Name[is]=KMail
 Name[it]=KMail
 Name[ja]=KMail
 Name[ka]=KMail
 Name[kk]=KMail
 Name[km]=KMail
 Name[ko]=KMail
 Name[lt]=KMail
 Name[lv]=KMail
 Name[mai]=KMail
 Name[mk]=КПошта
 Name[mr]=के-मेल
 Name[ms]=KMail
 Name[nb]=KMail
 Name[nds]=KMail
 Name[ne]=केडीई पत्र
 Name[nl]=KMail
 Name[nn]=KMail
 Name[pa]=ਕੇ-ਮੇਲ
 Name[pl]=KMail
 Name[pt]=KMail
 Name[pt_BR]=KMail
 Name[ro]=KMail
 Name[ru]=KMail
 Name[se]=KMail
 Name[sk]=KMail
 Name[sl]=KMail
 Name[sr]=К‑пошта
 Name[sr@ijekavian]=К‑пошта
 Name[sr@ijekavianlatin]=K‑pošta
 Name[sr@latin]=K‑pošta
 Name[sv]=Kmail
 Name[ta]=Kஅஞ்சல்
 Name[tg]=KMail
 Name[th]=จัดการจดหมาย K
 Name[tr]=KMail
 Name[ug]=KMail
 Name[uk]=KMail
 Name[uz]=KMail
 Name[uz@cyrillic]=KMail
 Name[vi]=KMail
 Name[wa]=KMail
 Name[xh]=KMail
 Name[x-test]=xxKMailxx
 Name[zh_CN]=KMail
 Name[zh_TW]=郵件管理_KMail
 Type=Application
 Exec=kmail -qwindowtitle %c %u
 Icon=kmail
 X-DocPath=kmail2/index.html
 GenericName=Mail Client
 GenericName[af]=E-pos kliënt
 GenericName[ar]=عميل البريد
 GenericName[be]=Паштовы кліент
 GenericName[bg]=Пощенски клиент
 GenericName[br]=Kliant postel
 GenericName[bs]=Klijent pošte
 GenericName[ca]=Client de correu
 GenericName[ca@valencia]=Client de correu
 GenericName[cs]=Klient pro čtení elektronické pošty
 GenericName[cy]=Dibynnydd Ebost
 GenericName[da]=E-mail-klient
 GenericName[de]=E-Mail-Programm
 GenericName[el]=Πελάτης αλληλογραφίας
 GenericName[en_GB]=Mail Client
 GenericName[eo]=Legi kaj sendi retpoŝton
 GenericName[es]=Cliente de correo
 GenericName[et]=E-posti klient
 GenericName[eu]=Posta bezeroa
 GenericName[fa]=کارخواه‌نامه
 GenericName[fi]=Sähköpostiohjelma
 GenericName[fr]=Logiciel de courriel
 GenericName[fy]=E-portclient
 GenericName[ga]=Cliant Ríomhphoist
 GenericName[gl]=Cliente de correo
 GenericName[he]=לקוח דוא"ל
 GenericName[hr]=Program za elektronsku poštu
 GenericName[hu]=Levelezőprogram
 GenericName[ia]=Cliente de e-posta
 GenericName[is]=Póstforrit
 GenericName[it]=Programma di posta elettronica
 GenericName[ja]=メールクライアント
 GenericName[ka]=ფოსტის კლიენტი
 GenericName[kk]=Эл.пошта клиенті
 GenericName[km]=កម្មវិធី​អ៊ីមែល
 GenericName[ko]=이메일 클라이언트
 GenericName[lt]=Pašto klientas
 GenericName[lv]=Pasta klients
 GenericName[mai]=डाकिया
 GenericName[mk]=Клиент за електронска пошта
 GenericName[mr]=मेल ग्राहक
 GenericName[ms]=Pelanggan Mel
 GenericName[nb]=E-postklient
 GenericName[nds]=Nettpostprogramm
 GenericName[ne]=पत्र क्लाइन्ट
 GenericName[nl]=E-mailclient
 GenericName[nn]=E-postprogram
 GenericName[pa]=ਮੇਲ ਕਲਾਇਟ
 GenericName[pl]=Program pocztowy
 GenericName[pt]=Cliente de E-mail
 GenericName[pt_BR]=Cliente de e-mail
 GenericName[ro]=Client de poștă
 GenericName[ru]=Почтовый клиент
 GenericName[se]=E-boastaprográmma
 GenericName[sk]=Poštový klient
 GenericName[sl]=Poštni odjemalec
 GenericName[sr]=Поштански клијент
 GenericName[sr@ijekavian]=Поштански клијент
 GenericName[sr@ijekavianlatin]=Poštanski klijent
 GenericName[sr@latin]=Poštanski klijent
 GenericName[sv]=E-postklient
 GenericName[ta]=அஞ்சல் பயனர்
 GenericName[tg]=Клиенти почтавӣ
 GenericName[th]=ไคลเอนต์จัดการจดหมาย
 GenericName[tr]=E-Posta İstemcisi
 GenericName[ug]=خەت خېرىدارى
 GenericName[uk]=Поштовий клієнт
 GenericName[uz]=Xat-xabar klienti
 GenericName[uz@cyrillic]=Хат-хабар клиенти
 GenericName[vi]=Mail Client
 GenericName[wa]=Cliyint d' emilaedje
 GenericName[xh]=Umxhasi Weposi
 GenericName[x-test]=xxMail Clientxx
 GenericName[zh_CN]=邮件客户程序
 GenericName[zh_TW]=收發信軟體
 Comment=Send, receive and manage your mail with KMail
 Comment[ca]=Envia, rep i administra el vostre correu amb el KMail
 Comment[ca@valencia]=Envia, rep i administra el vostre correu amb el KMail
 Comment[da]=Send, modtag og håndtér din e-mail med KMail
 Comment[de]=Senden, empfangen und verwalten Ihrer E-Mails mit KMail
 Comment[en_GB]=Send, receive and manage your mail with KMail
 Comment[es]=Enviar, recibir y gestionar su correo con KMail
 Comment[et]=Kirjade saatmine, saamine ja haldamine KMailiga
 Comment[fi]=Lähetä, vastaanota ja hallitse postiasi KMaililla
 Comment[fr]=Envoyez, recevez et gérez vos courriels avec KMail
 Comment[gl]=Enviar, recibir e xestionar o correo con KMail.
 Comment[ia]=Invia, recipe e gere tu e-posta con KMail
 Comment[it]=Invia, ricevi e gestisci la tua posta con KMail
 Comment[nb]=Send. motta og hold styr på e-posten din med KMail
 Comment[nl]=Verzend, ontvang en beheer uw e-mail met KMail
 Comment[nn]=Send, ta imot og organiser dine e-postar med KMail 
 Comment[pl]=Wysyłaj, odbieraj i zarządzaj swoją pocztą z KMaila
 Comment[pt]=Envie, receba e faça a gestão do seu correio com o KMail
 Comment[pt_BR]=Envie, receba e gerencie seus e-mails com o KMail
 Comment[ru]=Отправка, получение и упорядочивание электронных писем
 Comment[sk]=Poslať, prijať a spravovať vašu poštu s KMail
 Comment[sl]=Pošiljajte, prejemajte in upravljajte z e-pošto s pomočjo KMaila
 Comment[sr]=Шаљите, примајте и управљајте поштом помоћу К‑поште
 Comment[sr@ijekavian]=Шаљите, примајте и управљајте поштом помоћу К‑поште
 Comment[sr@ijekavianlatin]=Šaljite, primajte i upravljajte poštom pomoću K‑pošte
 Comment[sr@latin]=Šaljite, primajte i upravljajte poštom pomoću K‑pošte
 Comment[sv]=Skicka, ta emot och hantera e-post med Kmail
 Comment[tr]=E-postanızı KMail ile gönderin, alın ve yönetin
 Comment[uk]=Надсилайте і отримуйте пошту та керуйте вашими поштовими повідомленнями за допомогою KMail
 Comment[x-test]=xxSend, receive and manage your mail with KMailxx
 Comment[zh_CN]=使用 KMail 发送，接收和管理您的邮件
 Comment[zh_TW]=用 KMail 傳送、接收與管理您的郵件
 Terminal=false
 StartupNotify=true
 X-DBUS-StartupType=Unique
 X-DBUS-ServiceName=org.kde.kmail
 X-KDE-ServiceTypes=DBUS/Mailer
 Categories=Qt;KDE;Office;Network;Email;
 MimeType=x-scheme-handler/mailto;
 InitialPreference=10
 Actions=Composer;CheckMail;
 
 [Desktop Action Composer]
 Name=New Message
 Name[ca]=Missatge nou
 Name[ca@valencia]=Missatge nou
 Name[cs]=Nová zpráva
 Name[da]=Nyt brev
 Name[de]=Neue Nachricht
 Name[en_GB]=New Message
 Name[es]=Mensaje nuevo
 Name[et]=Uus kiri
 Name[fi]=Uusi viesti
+Name[fr]=Nouveau message
 Name[it]=Nuovo messaggio
 Name[nl]=Nieuw bericht
 Name[pl]=Nowa wiadomość
 Name[pt]=Nova Mensagem
 Name[sk]=Nová správa
 Name[sl]=Novo sporočilo
 Name[sr]=Нова порука
 Name[sr@ijekavian]=Нова порука
 Name[sr@ijekavianlatin]=Nova poruka
 Name[sr@latin]=Nova poruka
 Name[sv]=Nytt brev
 Name[tr]=Yeni İleti
 Name[uk]=Нове повідомлення
 Name[x-test]=xxNew Messagexx
 Name[zh_CN]=新信件
 Icon=mail-message-new
 Exec=kmail --composer
 
 [Desktop Action CheckMail]
 Name=Check Mail
 Name[ca]=Comprova el correu
 Name[ca@valencia]=Comprova el correu
 Name[cs]=Zkontrolovat poštu
 Name[da]=Tjek e-mail
 Name[de]=Nach E-Mail sehen
 Name[en_GB]=Check Mail
 Name[es]=Comprobar correo
 Name[et]=E-posti kontrollimine
 Name[fi]=Tarkista posti
+Name[fr]=Relever le courriel
 Name[it]=Controlla posta
 Name[nl]=E-mail controleren
 Name[pl]=Sprawdź pocztę
 Name[pt]=Verificar o Correio
 Name[sk]=S&kontrolovať poštu
 Name[sl]=Preveri pošto
 Name[sr]=Провери пошту
 Name[sr@ijekavian]=Провери пошту
 Name[sr@ijekavianlatin]=Proveri poštu
 Name[sr@latin]=Proveri poštu
 Name[sv]=Kontrollera brev
 Name[tr]=Posyayı Kontrol Et
 Name[uk]=Перевірити пошту
 Name[x-test]=xxCheck Mailxx
 Name[zh_CN]=检查邮件
 Icon=mail-receive
 Exec=kmail --check