diff --git a/src/data/kmail_config_composer.desktop b/src/data/kmail_config_composer.desktop
index 19265f09e..2d0cd38fb 100644
--- a/src/data/kmail_config_composer.desktop
+++ b/src/data/kmail_config_composer.desktop
@@ -1,174 +1,174 @@
 [Desktop Entry]
 Icon=accessories-text-editor
 Type=Service
 X-KDE-ServiceTypes=KCModule
 
 X-KDE-ModuleType=Library
 X-KDE-Library=kcm_kmail
 X-KDE-FactoryName=kmail_config_composer
 X-KDE-HasReadOnlyMode=false
 X-KDE-ParentApp=kmail
 X-KDE-ParentComponents=kmail,kontact_kmailplugin
 X-KDE-CfgDlgHierarchy=KMail
 X-KDE-Weight=400
 X-DocPath=kmail2/index.html#configure-composer
 
 Name=Composer
 Name[af]=Composer
 Name[ar]=المؤلّف
 Name[bg]=Редактор
 Name[br]=Skridaozer
 Name[bs]=Composer
 Name[ca]=Editor
 Name[ca@valencia]=Editor
 Name[cs]=Editor
 Name[cy]=Cyfansoddydd
 Name[da]=Brevskriver
 Name[de]=E-Mail-Editor
 Name[el]=Σύνταξη μηνυμάτων
 Name[en_GB]=Composer
 Name[es]=Editor
 Name[et]=Koostaja
 Name[eu]=Editorea
 Name[fa]=مؤلف
 Name[fi]=Kirjoittaminen
 Name[fr]=Éditeur
 Name[fy]=Opsteller
 Name[ga]=Cumadóir
 Name[gl]=Compositor
 Name[he]=עורך
 Name[hu]=Szerkesztő
 Name[ia]=Compositor
 Name[is]=Composer
 Name[it]=Compositore
 Name[ja]=メール作成
 Name[ka]=წერილების რედაქტორი
 Name[kk]=Құрастарғыш
 Name[km]=កម្មវិធី​តែង
 Name[ko]=작성기
 Name[lt]=Redaktorius
 Name[lv]=Ziņu rakstītājs
 Name[mk]=Составувач
 Name[mr]=संपादक
 Name[ms]=Penggubah
 Name[nb]=Komposer
 Name[nds]=Nettbreef-Editor
 Name[ne]=कम्पोजर
 Name[nl]=Opsteller
 Name[nn]=Skrivevindauge
 Name[pa]=ਕੰਪੋਜ਼ਰ
 Name[pl]=Edytor
 Name[pt]=Compositor
 Name[pt_BR]=Compositor
 Name[ro]=Compozitor
 Name[ru]=Редактор писем
 Name[se]=Čállinprográmma
 Name[sk]=Editor správ
 Name[sl]=Sestavljalnik
 Name[sr]=Састављач
 Name[sr@ijekavian]=Састављач
 Name[sr@ijekavianlatin]=Sastavljač
 Name[sr@latin]=Sastavljač
 Name[sv]=Brevfönster
 Name[ta]=கம்போசர்
 Name[tg]=Муҳаррири мактубҳо
 Name[th]=เขียนจดหมาย
 Name[tr]=Düzenleyici
 Name[ug]=مۇزىكىسىنى ئىشلىگۈچى
 Name[uk]=Редактор листів
 Name[wa]=Finiesse po scrire
 Name[x-test]=xxComposerxx
-Name[zh_CN]=作曲家
+Name[zh_CN]=撰写器
 Name[zh_TW]=編寫器
 Comment=Message Composer Settings
 Comment[ar]=إعدادات مؤلّف الرّسائل
 Comment[bs]=Postvake pisača poruka
 Comment[ca]=Arranjament de l'editor de missatges
 Comment[ca@valencia]=Arranjament de l'editor de missatges
 Comment[cs]=Nastavení editoru zpráv
 Comment[da]=Indstiling af brevskriver
 Comment[de]=Einstellungen für den E-Mail-Editor
 Comment[el]=Ρυθμίσεις σύνθεσης μηνύματος
 Comment[en_GB]=Message Composer Settings
 Comment[es]=Preferencias del editor de mensajes
 Comment[et]=Kirjakoostaja seadistused
 Comment[fi]=Viestimuokkaimen asetukset
 Comment[fr]=Configuration de l'éditeur de messages
 Comment[gl]=Configuracións do compositor de mensaxes
 Comment[hu]=Az üzenetszerkesztő beállításai
 Comment[ia]=Preferentias de compositor de messages
 Comment[it]=Impostazioni compositore messaggi
 Comment[ja]=メール作成の設定
 Comment[kk]=Хат құрастарғышын баптау
 Comment[km]=ការ​កំណត់​កម្មវិធី​តែង​សារ
 Comment[ko]=메시지 작성기 설정
 Comment[lt]=Laiškų rengyklės nustatymai
 Comment[lv]=Vēstuļu rastītāja iestatījumi
 Comment[mr]=संदेश संपादक संयोजना
 Comment[nb]=Innstillinger for meldingskomposer
 Comment[nds]=Narichteneditor instellen
 Comment[nl]=Berichtenopsteller-instellingen
 Comment[nn]=Innstillingar for skrivevindauge
 Comment[pa]=ਸੁਨੇਹਾ ਕੰਪੋਜ਼ਰ ਸੈਟਿੰਗ
 Comment[pl]=Ustawienia kompozytora wiadomości
 Comment[pt]=Configuração do Compositor de Mensagens
 Comment[pt_BR]=Configurações do compositor de mensagens
 Comment[ro]=Configurări compunere mesaj
 Comment[ru]=Настройка редактора писем
 Comment[sk]=Nastavenia editora správ
 Comment[sl]=Nastavitve sestavljalnika sporočil
 Comment[sr]=Поставке састављача порука
 Comment[sr@ijekavian]=Поставке састављача порука
 Comment[sr@ijekavianlatin]=Postavke sastavljača poruka
 Comment[sr@latin]=Postavke sastavljača poruka
 Comment[sv]=Inställningar av brevfönster
 Comment[tr]=İleti Oluşturucu Ayarları
 Comment[uk]=Параметри засобу створення повідомлень
 Comment[wa]=Apontiaedjes del finiesse po scrire
 Comment[x-test]=xxMessage Composer Settingsxx
 Comment[zh_CN]=信件撰写器设置
 Comment[zh_TW]=訊息編寫器設定
 X-KDE-Keywords=kmail,composer
 X-KDE-Keywords[ar]=kmail,composer,بريدك,بريد,مؤلف,تأليف,كتابة
 X-KDE-Keywords[bs]=kmail, composer
 X-KDE-Keywords[ca]=kmail,editor
 X-KDE-Keywords[ca@valencia]=kmail,editor
 X-KDE-Keywords[da]=kmail,brevskriver
 X-KDE-Keywords[de]=KMail,Komposer,Editor
 X-KDE-Keywords[el]=kmail,σύνταξη
 X-KDE-Keywords[en_GB]=kmail,composer
 X-KDE-Keywords[es]=kmail,editor
 X-KDE-Keywords[et]=kmail,koostaja
 X-KDE-Keywords[fi]=kmail,composer, kirjoittaminen
 X-KDE-Keywords[fr]=kmail,éditeur
 X-KDE-Keywords[ga]=kmail,cumadóir
 X-KDE-Keywords[gl]=kmail,compositor
 X-KDE-Keywords[hu]=kmail,szerkesztő
 X-KDE-Keywords[ia]=kmail,compositor
 X-KDE-Keywords[it]=kmail,compositore
 X-KDE-Keywords[kk]=kmail,composer
 X-KDE-Keywords[km]=kmail កម្មវិធី​តែង
 X-KDE-Keywords[ko]=kmail,composer,작성기
 X-KDE-Keywords[lt]=kmail,redaktorius
 X-KDE-Keywords[mr]=के-मेल,संपादक
 X-KDE-Keywords[nb]=kmail,komposer
 X-KDE-Keywords[nds]=KMail,Nettbreef-Editor
 X-KDE-Keywords[nl]=kmail,opsteller
 X-KDE-Keywords[pl]=kmail,edytor,kompozytor
 X-KDE-Keywords[pt]=kmail,compositor
 X-KDE-Keywords[pt_BR]=kmail,compositor
 X-KDE-Keywords[ro]=komposer,compunere
 X-KDE-Keywords[ru]=kmail,composer,письмо,создать
 X-KDE-Keywords[sk]=kmail,editor
 X-KDE-Keywords[sl]=kmail,sestavljalnik,sestavljanje
 X-KDE-Keywords[sr]=kmail,composer,К‑пошта,састављач
 X-KDE-Keywords[sr@ijekavian]=kmail,composer,К‑пошта,састављач
 X-KDE-Keywords[sr@ijekavianlatin]=kmail,composer,K‑pošta,sastavljač
 X-KDE-Keywords[sr@latin]=kmail,composer,K‑pošta,sastavljač
 X-KDE-Keywords[sv]=kmail,brevfönster
 X-KDE-Keywords[tr]=kmail,yeni e-posta yaz
 X-KDE-Keywords[uk]=kmail,composer,редактор,лист,повідомлення
 X-KDE-Keywords[wa]=kmail,compôzeu,finiesse po scrire,purnea po scrire,aspougneu des messaedjes
 X-KDE-Keywords[x-test]=xxkmailxx,xxcomposerxx
 X-KDE-Keywords[zh_CN]=kmail,composer,撰写器
 X-KDE-Keywords[zh_TW]=kmail,composer
diff --git a/src/data/kmail_config_security.desktop b/src/data/kmail_config_security.desktop
index 99576d975..6413a1622 100644
--- a/src/data/kmail_config_security.desktop
+++ b/src/data/kmail_config_security.desktop
@@ -1,199 +1,199 @@
 [Desktop Entry]
 Icon=security-high
 Type=Service
 X-KDE-ServiceTypes=KCModule
 
 X-KDE-ModuleType=Library
 X-KDE-Library=kcm_kmail
 X-KDE-FactoryName=kmail_config_security
 X-KDE-HasReadOnlyMode=false
 X-KDE-ParentApp=kmail
 X-KDE-ParentComponents=kmail,kontact_kmailplugin
 X-KDE-CfgDlgHierarchy=KMail
 X-KDE-Weight=500
 X-DocPath=kmail2/index.html#configure-security
 
 Name=Security
 Name[af]=Sekuriteit
 Name[ar]=الأمن
 Name[be]=Бяспека
 Name[bg]=Сигурност
 Name[br]=Surentez
 Name[bs]=Sigurnost
 Name[ca]=Seguretat
 Name[ca@valencia]=Seguretat
 Name[cs]=Bezpečnost
 Name[cy]=Diogelwch
 Name[da]=Sikkerhed
 Name[de]=Sicherheit
 Name[el]=Ασφάλεια
 Name[en_GB]=Security
 Name[eo]=Sekureco
 Name[es]=Seguridad
 Name[et]=Turvalisus
 Name[eu]=Sekuritatea
 Name[fa]=امنیت
 Name[fi]=Turvallisuus
 Name[fr]=Sécurité
 Name[fy]=Feiligens
 Name[ga]=Slándáil
 Name[gl]=Seguranza
 Name[he]=אבטחה
 Name[hu]=Biztonság
 Name[ia]=Securitate
 Name[is]=Öryggi
 Name[it]=Sicurezza
 Name[ja]=セキュリティ
 Name[ka]=უსაფრთხოება
 Name[kk]=Қауіпсіздік
 Name[km]=សុវត្ថិភាព
 Name[ko]=보안
 Name[lt]=Saugumas
 Name[lv]=Drošība
 Name[mai]=सुरक्षा
 Name[mk]=Безбедност
 Name[mr]=सुरक्षा
 Name[ms]=Keselamatan
 Name[nb]=Sikkerhet
 Name[nds]=Sekerheit
 Name[ne]=सुरक्षा
 Name[nl]=Beveiliging
 Name[nn]=Tryggleik
 Name[pa]=ਸੁਰੱਖਿਆ
 Name[pl]=Bezpieczeństwo
 Name[pt]=Segurança
 Name[pt_BR]=Segurança
 Name[ro]=Securitate
 Name[ru]=Безопасность
 Name[se]=Sihkarvuohta
 Name[sk]=Zabezpečenie
 Name[sl]=Varnost
 Name[sr]=Безбедност
 Name[sr@ijekavian]=Безбедност
 Name[sr@ijekavianlatin]=Bezbednost
 Name[sr@latin]=Bezbednost
 Name[sv]=Säkerhet
 Name[ta]=பாதுகாப்பு
 Name[tg]=Амният
 Name[th]=ความปลอดภัย
 Name[tr]=Güvenlik
 Name[ug]=بىخەتەرلىك
 Name[uk]=Безпека
 Name[uz]=Xavfsizlik
 Name[uz@cyrillic]=Хавфсизлик
 Name[wa]=Såvrité
 Name[x-test]=xxSecurityxx
-Name[zh_CN]=证券
+Name[zh_CN]=安全
 Name[zh_TW]=安全性
 Comment=Security & Privacy Settings
 Comment[af]=Sekuriteit en provaatheid opstelling
 Comment[ar]=إعدادات الأمن والخصوصيّة
 Comment[be]=Настаўленні бяспекі і прыватнасці
 Comment[bg]=Настройки на сигурността
 Comment[br]=Kefluniadur surentez ar buhez prevez
 Comment[bs]=Postavke sigurnosti i privatnosti
 Comment[ca]=Arranjament de seguretat i privadesa
 Comment[ca@valencia]=Arranjament de seguretat i privadesa
 Comment[cs]=Nastavení soukromí a zabezpečení
 Comment[da]=Sikkerheds- & Privathedsindstillinger
 Comment[de]=Sicherheit und Privatsphäre
 Comment[el]=Ρυθμίσεις Ασφάλειας & Προσωπικού απόρρητου
 Comment[en_GB]=Security & Privacy Settings
 Comment[eo]=Agordoj pri Sekureco kaj Privateco
 Comment[es]=Preferencias de seguridad y privacidad
 Comment[et]=Turva- ja privaatsusseadistused
 Comment[eu]=Sekuritate & pribakortasun ezarpenak
 Comment[fa]=امنیت و تنظیمات محرمانگی
 Comment[fi]=Turvallisuus- ja yksityisyysasetukset
 Comment[fr]=Paramètres de sécurité et de confidentialité
 Comment[fy]=Feiligens- en privacy-ynstellings
 Comment[ga]=Socruithe Slándála agus Príobháideachta
 Comment[gl]=Opcións de seguranza e privacidade
 Comment[he]=הגדרות אבטחה ופרטיות
 Comment[hu]=Biztonsági és adatvédelmi beállítások
 Comment[ia]=Preferentias de securitate & confidentialitate
 Comment[is]=Öryggis & einkalífsstillingar
 Comment[it]=Impostazioni sicurezza e privacy
 Comment[ja]=セキュリティとプライバシーの設定
 Comment[ka]=უსაფრთხოებისა და პირადულობის პარამეტრები
 Comment[kk]=Қауіпсіздігі пен Дербестік параметрлері
 Comment[km]=ការ​កំណត់​សុវត្ថិភាព & ភាព​ឯកជន
 Comment[ko]=보안과 개인 정보 설정
 Comment[lt]=Saugumo ir privatumo nustatymai
 Comment[lv]=Drošības un privātuma iestatījumi
 Comment[mk]=Поставувања за безбедност и приватност
 Comment[mr]=सुरक्षा व गुप्तता संयोजना
 Comment[ms]=Seting Keselamatan & Peribadi
 Comment[nb]=Sikkerhet og personvern-innstillinger
 Comment[nds]=Sekerheit- un Privaatrebeet-Instellen
 Comment[ne]=सुरक्षा र गोपनियता सेटिङ
 Comment[nl]=Beveiligings- en privacy-instellingen
 Comment[nn]=Tryggleik og personvern
 Comment[pa]=ਸੁਰੱਖਿਆ ਅਤੇ ਪ੍ਰਾਈਵੇਸੀ ਸੈਟਿੰਗ
 Comment[pl]=Ustawienia bezpieczeństwa i prywatności
 Comment[pt]=Configuração de Segurança e Privacidade
 Comment[pt_BR]=Configurações de segurança e privacidade
 Comment[ro]=Configurări de securitate și intimitate
 Comment[ru]=Настройка безопасности
 Comment[se]=Sihkarvuohta- ja iežas suodjalan heivehusat
 Comment[sk]=Nastavenie zabezpečenia a súkromia
 Comment[sl]=Nastavitve varnosti in zasebnosti
 Comment[sr]=Поставке безбедности и приватности
 Comment[sr@ijekavian]=Поставке безбедности и приватности
 Comment[sr@ijekavianlatin]=Postavke bezbednosti i privatnosti
 Comment[sr@latin]=Postavke bezbednosti i privatnosti
 Comment[sv]=Inställningar för säkerhet och integritet
 Comment[ta]=பாதுகாப்பு & தனிப்பட்ட அமைவுகள்
 Comment[tg]=Танзимоти амният
 Comment[th]=ตั้งค่าความปลอดภัยและความเป็นส่วนตัว
 Comment[tr]=Güvenlik ve Gizlilik Ayarlar
 Comment[uk]=Параметри безпеки і конфіденційності
 Comment[wa]=Apontiaedjes di såvrité eyet d' privaceye
 Comment[x-test]=xxSecurity & Privacy Settingsxx
 Comment[zh_CN]=安全和隐私设置
 Comment[zh_TW]=安全性與隱私設定
 X-KDE-Keywords=kmail,security
 X-KDE-Keywords[ar]=kmail,security,بريدك,بريد,أمن
 X-KDE-Keywords[bs]=kmail, sigurnost
 X-KDE-Keywords[ca]=kmail,seguretat
 X-KDE-Keywords[ca@valencia]=kmail,seguretat
 X-KDE-Keywords[cs]=kmail,bezpečnost
 X-KDE-Keywords[da]=kmail,sikkerhed
 X-KDE-Keywords[de]=KMail,Sicherheit
 X-KDE-Keywords[el]=kmail,ασφάλεια
 X-KDE-Keywords[en_GB]=kmail,security
 X-KDE-Keywords[es]=kmail,seguridad
 X-KDE-Keywords[et]=kmail,turvalisus
 X-KDE-Keywords[fi]=kmail,security,turvallisuus
 X-KDE-Keywords[fr]=kmail,sécurité
 X-KDE-Keywords[ga]=kmail,slándáil
 X-KDE-Keywords[gl]=kmail,seguranza
 X-KDE-Keywords[hu]=kmail,biztonság
 X-KDE-Keywords[ia]=kmail,securitate
 X-KDE-Keywords[it]=kmail,sicurezza
 X-KDE-Keywords[kk]=kmail,security
 X-KDE-Keywords[km]=kmail សុវត្ថិភាព
 X-KDE-Keywords[ko]=kmail,security,보안
 X-KDE-Keywords[lt]=kmail,saugumas
 X-KDE-Keywords[mr]=के-मेल,सुरक्षा
 X-KDE-Keywords[nb]=kmail,sikkerhet
 X-KDE-Keywords[nds]=KMail,Sekerheit
 X-KDE-Keywords[nl]=kmail,beveiliging
 X-KDE-Keywords[pl]=kmail,bezpieczeństwo
 X-KDE-Keywords[pt]=kmail,segurança
 X-KDE-Keywords[pt_BR]=kmail,segurança
 X-KDE-Keywords[ro]=kmail,securitate
 X-KDE-Keywords[ru]=kmail,security,безопасность
 X-KDE-Keywords[sk]=kmail,bezpečnosť
 X-KDE-Keywords[sl]=kmail,varnost
 X-KDE-Keywords[sr]=kmail,security,К‑пошта,безбедност
 X-KDE-Keywords[sr@ijekavian]=kmail,security,К‑пошта,безбедност
 X-KDE-Keywords[sr@ijekavianlatin]=kmail,security,K‑pošta,bezbednost
 X-KDE-Keywords[sr@latin]=kmail,security,K‑pošta,bezbednost
 X-KDE-Keywords[sv]=kmail,säkerhet
 X-KDE-Keywords[tr]=kmail,güvenlik
 X-KDE-Keywords[uk]=kmail,security,безпека,захист
 X-KDE-Keywords[wa]=kmail,såvrité
 X-KDE-Keywords[x-test]=xxkmailxx,xxsecurityxx
 X-KDE-Keywords[zh_CN]=kmail,security,安全
 X-KDE-Keywords[zh_TW]=kmail,security