Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: tdepim/kmailcvt
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/tdepim/kmailcvt/

61 files changed, 5673 insertions, 5673 deletions

diff --git a/tde-i18n-af/messages/tdepim/kmailcvt.po b/tde-i18n-af/messages/tdepim/kmailcvt.po
index 593a3fc7e0d..1655dfebea7 100644
--- a/tde-i18n-af/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-af/messages/tdepim/kmailcvt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt VERSION\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2002-11-07 11:35+0200\n"
 "Last-Translator: WEB-Translator <http://kde.af.org.za>\n"
 "Language-Team: AFRIKAANS <AF@lia.org.za>\n"
@@ -26,11 +26,11 @@ msgid ""
 "Your emails"
 msgstr "frix@expertron.co.za"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -38,60 +38,60 @@ msgid ""
 "Import\".</p>"
 msgstr ""
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 #, fuzzy
 msgid "No directory selected."
 msgstr "Nee gids gekose"
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr ""
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr ""
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 #, fuzzy
 msgid "Unable to open %1, skipping"
 msgstr "Nie moontlik na open lêer '%1'"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 #, fuzzy
 msgid "Importing emails from %1..."
 msgstr "Met die invoering van pos gidse ('.pmm')..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, fuzzy, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
 "%n duplicate messages not imported"
 msgstr "Kan nie voeg by boodskap na kabinet %1 in Kpos"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -101,34 +101,34 @@ msgid ""
 "be stored under: \"Evolution-Import\".</p>"
 msgstr ""
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr ""
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr ""
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -139,24 +139,24 @@ msgid ""
 "\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 #, fuzzy
 msgid "Import folder %1..."
 msgstr "Met die invoering van pos gidse ('.pmm')..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr ""
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 #, fuzzy
 msgid "Import Lotus Notes Emails"
 msgstr "In voer Outlook Express 4"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -167,42 +167,42 @@ msgid ""
 "named using the names of the files the messages came from.</p>"
 msgstr ""
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr ""
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, fuzzy, c-format
 msgid "Importing emails from %1"
 msgstr "Met die invoering van pos gidse ('.pmm')..."
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr ""
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr ""
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
 msgstr ""
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 #, fuzzy
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "Kan nie voeg by boodskap na kabinet %1 in Kpos"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr ""
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -211,16 +211,16 @@ msgid ""
 "prefixed with MBOX-</p>"
 msgstr ""
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr ""
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 #, fuzzy
 msgid "Import Outlook Express Emails"
 msgstr "In voer Outlook Express 4"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -231,47 +231,47 @@ msgid ""
 "your local folder.</p>"
 msgstr ""
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, fuzzy, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "Soek vir Outlook Express 4 '.mbx' gidse in gids %1"
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 #, fuzzy
 msgid "Import folder structure..."
 msgstr "Met die invoering van pos gidse ('.pmm')..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 #, fuzzy
 msgid "Finished importing Outlook Express emails"
 msgstr "%1 is nie 'n Outlook Express 5 posbus"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, fuzzy, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Nie moontlik na open lêer '%1'"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr ""
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr ""
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, fuzzy, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "Met die invoering van pos gidse ('.pmm')..."
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 #, fuzzy
 msgid "Import Opera Emails"
 msgstr "In voer Outlook Express 4"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -281,22 +281,22 @@ msgid ""
 "OPERA-</p>"
 msgstr ""
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Tel lêers..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 #, fuzzy
 msgid "Importing new mail files..."
 msgstr "Met die invoering van nuwe pos lêers ('.txt')..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 #, fuzzy
 msgid "Import Outlook Emails"
 msgstr "In voer Outlook Express 4"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -306,26 +306,26 @@ msgid ""
 "OUTLOOK-</p>"
 msgstr ""
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 #, fuzzy
 msgid "Counting mail..."
 msgstr "Tel lêers..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 #, fuzzy
 msgid "Counting directories..."
 msgstr "Tel lêers..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 #, fuzzy
 msgid "Counting folders..."
 msgstr "Tel lêers..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "In voer Eenvoudig Teks Epos adresse"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -333,12 +333,12 @@ msgid ""
 "emails.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 #, fuzzy
 msgid "Import Folders From Pegasus-Mail"
 msgstr "In voer Pegasus-Mail"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -347,38 +347,38 @@ msgid ""
 "p>"
 msgstr ""
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
 msgstr ""
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Met die invoering van nuwe pos lêers ('.cnm')..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Met die invoering van pos gidse ('.pmm')..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "Met die invoering van 'UNIX' pos gidse ('.mbx')..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr ""
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr ""
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -387,11 +387,11 @@ msgid ""
 "the status of message, e.g. new or forwarded."
 msgstr ""
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr ""
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -401,11 +401,11 @@ msgid ""
 "Import\" in your local account.</p>"
 msgstr ""
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -415,7 +415,7 @@ msgid ""
 "the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 #, fuzzy
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
@@ -424,15 +424,15 @@ msgstr ""
 "Fatale: Nie moontlik na begin Kpos vir Dcop kommunikasie.\n"
 "       Maak seker 'Kpos' is in jou gids soeklys."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "Kan nie maak kabinet %1 in Kpos"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Kan nie voeg by boodskap na kabinet %1 in Kpos"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Fout terwyl bygesit boodskap na kabinet %1 in Kpos"
 
diff --git a/tde-i18n-ar/messages/tdepim/kmailcvt.po b/tde-i18n-ar/messages/tdepim/kmailcvt.po
index 7e95cc9c45a..e8c333852db 100644
--- a/tde-i18n-ar/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-ar/messages/tdepim/kmailcvt.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2005-12-30 03:18+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -25,11 +25,11 @@ msgid ""
 "Your emails"
 msgstr ""
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -37,57 +37,57 @@ msgid ""
 "Import\".</p>"
 msgstr ""
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr ""
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr ""
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr ""
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr ""
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr ""
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
 "%n duplicate messages not imported"
 msgstr ""
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -97,34 +97,34 @@ msgid ""
 "be stored under: \"Evolution-Import\".</p>"
 msgstr ""
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr ""
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr ""
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -135,22 +135,22 @@ msgid ""
 "\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr ""
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr ""
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr ""
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -161,41 +161,41 @@ msgid ""
 "named using the names of the files the messages came from.</p>"
 msgstr ""
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr ""
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr ""
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr ""
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr ""
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
 msgstr ""
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr ""
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr ""
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -204,15 +204,15 @@ msgid ""
 "prefixed with MBOX-</p>"
 msgstr ""
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr ""
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr ""
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -223,44 +223,44 @@ msgid ""
 "your local folder.</p>"
 msgstr ""
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr ""
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr ""
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr ""
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr ""
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr ""
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr ""
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr ""
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr ""
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -270,20 +270,20 @@ msgid ""
 "OPERA-</p>"
 msgstr ""
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr ""
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr ""
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr ""
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -293,23 +293,23 @@ msgid ""
 "OUTLOOK-</p>"
 msgstr ""
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr ""
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr ""
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr ""
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr ""
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -317,11 +317,11 @@ msgid ""
 "emails.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr ""
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -330,38 +330,38 @@ msgid ""
 "p>"
 msgstr ""
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
 msgstr ""
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr ""
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr ""
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr ""
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr ""
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr ""
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -370,11 +370,11 @@ msgid ""
 "the status of message, e.g. new or forwarded."
 msgstr ""
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr ""
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -384,11 +384,11 @@ msgid ""
 "Import\" in your local account.</p>"
 msgstr ""
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -398,21 +398,21 @@ msgid ""
 "the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
 msgstr ""
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr ""
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr ""
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr ""
 
diff --git a/tde-i18n-az/messages/tdepim/kmailcvt.po b/tde-i18n-az/messages/tdepim/kmailcvt.po
index 18c0b6b1425..487461638f5 100644
--- a/tde-i18n-az/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-az/messages/tdepim/kmailcvt.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2004-03-18 00:19+0200\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -25,11 +25,11 @@ msgid ""
 "Your emails"
 msgstr "metin@karegen.com"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -37,57 +37,57 @@ msgid ""
 "Import\".</p>"
 msgstr ""
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr ""
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr ""
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr ""
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr ""
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr ""
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
 "%n duplicate messages not imported"
 msgstr ""
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -97,34 +97,34 @@ msgid ""
 "be stored under: \"Evolution-Import\".</p>"
 msgstr ""
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr ""
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr ""
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -135,22 +135,22 @@ msgid ""
 "\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr ""
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr ""
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr ""
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -161,41 +161,41 @@ msgid ""
 "named using the names of the files the messages came from.</p>"
 msgstr ""
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr ""
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr ""
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr ""
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr ""
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
 msgstr ""
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr ""
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr ""
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -204,15 +204,15 @@ msgid ""
 "prefixed with MBOX-</p>"
 msgstr ""
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr ""
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr ""
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -223,44 +223,44 @@ msgid ""
 "your local folder.</p>"
 msgstr ""
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr ""
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr ""
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr ""
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr ""
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr ""
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr ""
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr ""
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr ""
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -270,20 +270,20 @@ msgid ""
 "OPERA-</p>"
 msgstr ""
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr ""
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr ""
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr ""
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -293,23 +293,23 @@ msgid ""
 "OUTLOOK-</p>"
 msgstr ""
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr ""
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr ""
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr ""
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr ""
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -317,11 +317,11 @@ msgid ""
 "emails.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr ""
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -330,38 +330,38 @@ msgid ""
 "p>"
 msgstr ""
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
 msgstr ""
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr ""
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr ""
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr ""
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr ""
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr ""
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -370,11 +370,11 @@ msgid ""
 "the status of message, e.g. new or forwarded."
 msgstr ""
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr ""
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -384,11 +384,11 @@ msgid ""
 "Import\" in your local account.</p>"
 msgstr ""
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -398,21 +398,21 @@ msgid ""
 "the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
 msgstr ""
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr ""
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr ""
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr ""
 
diff --git a/tde-i18n-bg/messages/tdepim/kmailcvt.po b/tde-i18n-bg/messages/tdepim/kmailcvt.po
index 635c4fcdfab..7da4001fd55 100644
--- a/tde-i18n-bg/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-bg/messages/tdepim/kmailcvt.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2007-10-06 20:05+0000\n"
 "Last-Translator: Zlatko Popov <zlatkopopov@fsa-bg.org>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -30,11 +30,11 @@ msgid ""
 "Your emails"
 msgstr "radnev@yahoo.com"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Импортиране на писмата и структурата на папките от Evolution 1.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -46,46 +46,46 @@ msgstr ""
 "p><p>Структурата на папките може да се пресъздаде и тя ще бъде записана в "
 "папката \"Evolution-Import\".</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "Не е избрана директория."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "Не са намерени файлове за импортиране."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "Импортирането на писмата от %1 завърши"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "Невъзможно отваряне на %1, игнориране"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "Импортиране на писмата от %1..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
@@ -94,11 +94,11 @@ msgstr ""
 "1 дублирано съобщение не бе добавено\n"
 "%n дублирани съобщения не бяха добавени"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Импортиране на писмата и структурата на папките от Evolution 2.x"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -114,34 +114,34 @@ msgstr ""
 "папки.</p><p>Структурата на папките може да се пресъздаде и тя ще бъде "
 "записана в папката \"Evolution-Import\".</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "Импортирането е прекъснато от потребителя."
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "Начало на импортирането на файла %1..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Импортиране на писмата и структурата на папките от KMail"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -158,22 +158,22 @@ msgstr ""
 "файлове mbox.</p><p>Структурата на папките може да се пресъздаде и тя ще "
 "бъде записана в папката \"KMail-Import\".</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "Импортиране на папка %1..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "Грешка при импортиране от %1"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "Импортиране на писмата от Lotus Notes"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -192,25 +192,25 @@ msgstr ""
 "името на файла, от който идват, и ще бъдат записани във папката \"LNotes-"
 "Import\" във вашата локална папка.</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "Всички файлове (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "Импортиране на писмата от %1"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Съобщение %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "Импортиране на папките от OS X Mail"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -218,7 +218,7 @@ msgstr ""
 "<p><b>Импортиране на папките от OS X Mail</b></p><p>Импортиране на папките с "
 "писма от пощенския клиент на Apple Mac OS X.</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
@@ -226,11 +226,11 @@ msgstr ""
 "1 дублирано съобщение не бе добавено в папката %1 на KMail\n"
 "%n дублирани съобщения не бяха добавени в папката %1 на KMail"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Импортиране на файлове mbox (UNIX, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -244,15 +244,15 @@ msgstr ""
 "формат на UNIX.</p><p><b>Забележка:</b> писмата ще бъдат импортирани в папка "
 "с името на файла от който идват и ще имат представка \"MBOX-\".</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "Файлове mbox (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Импортиране на писмата от Outlook Express"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -270,44 +270,44 @@ msgstr ""
 "li></ul></p><p>Структурата на папките може да се пресъздаде и тя ще бъде "
 "записана в папката \"OE-Import\".</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "Не са намерени файлове с данни за Outlook Express в директорията %1."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "Импортиране на структурата на папките..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Импортирането на писмата от Outlook Express завърши"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Грешка при отваряне на пощенска кутия %1"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "Импортиране на пощенска кутия %1 на OE4"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "Импортиране на пощенска кутия %1 на OE5+"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "Импортиране на файл с папки %1 на OE5+"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Импортиране на писмата от Opera"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -322,20 +322,20 @@ msgstr ""
 "ще бъдат импортирани в папка с името на сметката от която идват и с "
 "представка \"OPERA-\".</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Преброяване на файловете..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Импортиране на нови пощенски файлове..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Импортиране на писмата от Outlook"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -351,23 +351,23 @@ msgstr ""
 "p><p><b>Забележка:</b> писмата ще бъдат импортирани в папка с името на "
 "файла, от който идват, и ще имат представка \"OUTLOOK-\".</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "Преброяване на писмата..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "Преброяване на директориите..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "Преброяване на папките..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Импортиране на писма в текстов формат"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -379,11 +379,11 @@ msgstr ""
 "p><p><b>Забележка:</b> писмата ще бъдат импортирани в папка с името на "
 "директорията, от която идват и ще имат представка \"PLAIN-\".</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Импортирането на папките от Pegasus-Mail"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -396,7 +396,7 @@ msgstr ""
 "това е C:\\PMail\\mail</p><p>Структурата на папките може да се пресъздаде и "
 "тя ще бъде записана в папката \"PegasusMail-Import\".</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
@@ -404,32 +404,32 @@ msgstr ""
 "Грешка при анализа структурата на папките. Импортирането ще бъде продължено "
 "без подпапките."
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Импортиране на файловете за нова е-поща (.cnm)..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Импортирането на папките (.pmm)..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "Импортирането на папките на UNIX (.mbx)..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "Импортиране на %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "Анализ на структурата на папките..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Импортиране на писмата и структурата на папките от Sylpheed"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -443,11 +443,11 @@ msgstr ""
 "p><p>Също така, филтърът импортира и състоянието на съобщенията - ново, "
 "препратено, отговорено и пр.</p>"
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Импортиране на писмата и структурата на папките от Bat"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -463,11 +463,11 @@ msgstr ""
 "момента.</p><p>Структурата на папките може да се пресъздаде и тя ще бъде "
 "записана в папката \"TheBat-Import\".</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "Импортиране на писмата и структурата на папките от Thunderbird/Mozilla"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -483,7 +483,7 @@ msgstr ""
 "получите много нови папки.</p><p>Структурата на папките може да се "
 "пресъздаде и тя ще бъде записана в папката \"Thunderbird-Import\".</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -491,15 +491,15 @@ msgstr ""
 "<b>Фатална грешка:</b> Програмата KMail не може да бъде стартирана за "
 "комуникация с DCOP. Моля, проверете дали програмата е инсталирана."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "Грешка при създаване на папката %1 в KMail"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Добавянето на съобщения в папката %1 в KMail беше неуспешно"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Грешка при добавяне на съобщение в папката %1 в KMail"
 
diff --git a/tde-i18n-br/messages/tdepim/kmailcvt.po b/tde-i18n-br/messages/tdepim/kmailcvt.po
index 7d2b371e1f0..ad1feed0fca 100644
--- a/tde-i18n-br/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-br/messages/tdepim/kmailcvt.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdepim/kmailcvt.po\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n"
 "Language-Team: Breton <LL@li.org>\n"
@@ -24,11 +24,11 @@ msgid ""
 "Your emails"
 msgstr "tvignaud@mandriva.com, jdrapier@club-internet.fr"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -36,57 +36,57 @@ msgid ""
 "Import\".</p>"
 msgstr ""
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "N'eus renkell dibabet ebet."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "N'eus restr da enporzh ebet."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr ""
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr ""
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "Emaon oc'h enporzh al lizhiri eus %1 ..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
 "%n duplicate messages not imported"
 msgstr ""
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -96,34 +96,34 @@ msgid ""
 "be stored under: \"Evolution-Import\".</p>"
 msgstr ""
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr ""
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr ""
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -134,22 +134,22 @@ msgid ""
 "\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "Enporzhañ ar renkell %1à..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "Ne m'eus ket enporzh %1"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "Enporzh ar posteloù eus Lotus Notes"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -160,41 +160,41 @@ msgid ""
 "named using the names of the files the messages came from.</p>"
 msgstr ""
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "Pep restr (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "Emaon oc'h enporzh al lizhiri eus %1"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Kemennad %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "Enporzh eus OS X Mail"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
 msgstr ""
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr ""
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr ""
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -203,15 +203,15 @@ msgid ""
 "prefixed with MBOX-</p>"
 msgstr ""
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "Restroù mbox (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Enporzh ar posteloù eus Outlook Express"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -222,44 +222,44 @@ msgid ""
 "your local folder.</p>"
 msgstr ""
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr ""
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "Enporzhañ skeledenn ar renkellà..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr ""
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "N'hellan ket digeriñ ar voest postel %1"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "Emaon oc'h enporzh ar voest-lizheroù OE4 %1"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "Emaon oc'h enporzh ar voest-lizheroù OE5+ %1"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "Emaon oc'h enporzh ar restr renkell OE5+ %1"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Enporzh ar posteloù eus Opera"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -269,20 +269,20 @@ msgid ""
 "OPERA-</p>"
 msgstr ""
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Emaon o niveriñ ar restroù ..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Emaon oc'h enporzh ar restroùà..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Enporzh ar posteloù eus Outlook"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -292,23 +292,23 @@ msgid ""
 "OUTLOOK-</p>"
 msgstr ""
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "Emaon o niveriñ ar posteloù ..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "Emaon o niveriñ ar renkelloù ..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "Emaon o niveriñ ar renkelloù ..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Enporzhañ ar postelloù skrid leun"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -316,11 +316,11 @@ msgid ""
 "emails.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr ""
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -329,38 +329,38 @@ msgid ""
 "p>"
 msgstr ""
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
 msgstr ""
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Emaon oc'h enporzh ar restroù ('.cnm')à..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Emaon oc'h enporzh ar renkelloù ('.pmm')à..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr ""
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "Emaon oc'h enporzh %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "O lenn skeledenn ar renkellà..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -369,11 +369,11 @@ msgid ""
 "the status of message, e.g. new or forwarded."
 msgstr ""
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr ""
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -383,11 +383,11 @@ msgid ""
 "Import\" in your local account.</p>"
 msgstr ""
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -397,21 +397,21 @@ msgid ""
 "the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
 msgstr ""
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr ""
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr ""
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Fazi en ur ouzhpennañ ar c'hemennad d'ar renkell %1 e KMail"
 
diff --git a/tde-i18n-bs/messages/tdepim/kmailcvt.po b/tde-i18n-bs/messages/tdepim/kmailcvt.po
index 040a7bfe9ac..b10db1fd9bd 100644
--- a/tde-i18n-bs/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-bs/messages/tdepim/kmailcvt.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2005-03-22 12:50+0100\n"
 "Last-Translator: Amila Akagić <bono@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -33,12 +33,12 @@ msgid ""
 "Your emails"
 msgstr "bono@linux.org.ba"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 #, fuzzy
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Uvezi poštu i strukturu direktorija iz lokalnog Evolution 2.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -46,57 +46,57 @@ msgid ""
 "Import\".</p>"
 msgstr ""
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "Nije odabran nijedan direktorij."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "Nisu pronađene datoteke za uvoz."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "Uvoz poruka iz %1 je završen"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "Ne mogu da otvorim %1, preskačem"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "Uvozim e-mailove iz %1..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, fuzzy, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
 "%n duplicate messages not imported"
 msgstr "%n dvostrukih datoteka nije uvezeno"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Uvezi poštu i strukturu direktorija iz lokalnog Evolution 2.x"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -106,35 +106,35 @@ msgid ""
 "be stored under: \"Evolution-Import\".</p>"
 msgstr ""
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr ""
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "Počni uvoz datoteke %1..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 #, fuzzy
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Uvezi mailove i strukturu direktorija iz Evolution"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -145,24 +145,24 @@ msgid ""
 "\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 #, fuzzy
 msgid "Import folder %1..."
 msgstr "Počni uvoz datoteke %1..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "Ne mogu uvesti %1"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 #, fuzzy
 msgid "Import Lotus Notes Emails"
 msgstr "Uvoz poštu iz Outlook-a"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 #, fuzzy
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
@@ -179,26 +179,26 @@ msgstr ""
 "</p> <p><b>Napomena:</b> Poruke će biti uvezene u direktorije sa istim "
 "imenom kao što se zove datoteka iz koga su uvezene sa prefiksom 'MBOX-'</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 #, fuzzy
 msgid "All Files (*)"
 msgstr "mbox datoteke (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, fuzzy, c-format
 msgid "Importing emails from %1"
 msgstr "Uvozim e-mailove iz %1..."
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Poruka %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "Uvoz direktorija iz OS X pošte"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -206,18 +206,18 @@ msgstr ""
 "<p><b>Filter za uvoz pošte sa OS X-a</b></p><p>Ovaj filter uvozi el. poštu "
 "iz poštanskog klijenta sa Apple Mac OS X-a.</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 #, fuzzy
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "%n dvostrukih poruka nije uvezeno u direktorij %1 u KMail"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Uvoz mbox datoteka (Unix, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -231,15 +231,15 @@ msgstr ""
 "</p> <p><b>Napomena:</b> Poruke će biti uvezene u direktorije sa istim "
 "imenom kao što se zove datoteka iz koga su uvezene sa prefiksom 'MBOX-'</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "mbox datoteke (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Uvoz poruka iz Outlook Express-a"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 #, fuzzy
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
@@ -258,46 +258,46 @@ msgstr ""
 "uvezene u direktorije sa imenom istim kao što se zove datoteka iz koje su "
 "uvezene, sa prefiksom 'OE-'</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr ""
 "Nisu pronađeni Outlook Express-ovi poštanski sandučići u direktoriju %1."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 #, fuzzy
 msgid "Import folder structure..."
 msgstr "Uvezi mailove i strukturu direktorija iz Evolution"
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Uvoz poruka iz Outlook Express-a je završen"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Ne mogu da otvorim poštansko sanduče %1"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "Uvozim OE4 poštansko sanduče %1"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "Uvozim OE5+ poštansko sanduče %1"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, fuzzy, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "Ignorišem OE5+ direktorij sa datotekama %1"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Uvoz poruka iz Opera pošte"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 #, fuzzy
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
@@ -313,20 +313,20 @@ msgstr ""
 "</p> <p><b>Napomena:</b> Poruke će biti uvezene u direktorije sa istim "
 "imenom kao što se zove datoteka iz koga su uvezene sa prefiksom 'MBOX-'</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Brojim datoteke..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Uvozim nove poštanske datoteke..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Uvoz poštu iz Outlook-a"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 #, fuzzy
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
@@ -344,23 +344,23 @@ msgstr ""
 "uvezene u direktorije sa imenom istim kao što se zove datoteka iz koje su "
 "uvezene, sa prefiksom 'OE-'</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "Brojim poštu..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "Brojim direktorije..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "Brojim direktorije..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Uvoz običnih tekstualnih e-mailova"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -372,11 +372,11 @@ msgstr ""
 "prefiksom 'PLAIN-'</p><p>Ovaj filter će uvesti sve .msg, .eml i .txt poruke."
 "</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Uvoz direktorija iz Pegasus-Mail-a"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 #, fuzzy
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
@@ -392,39 +392,39 @@ msgstr ""
 "p><p><b>Napomena:</b> Poruke će biti uvezene u direktorij sa prefiksom "
 "'pmail-'</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
 msgstr ""
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Uvozim nove poštanske datoteke ('.cnm')..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Uvozim poštanske direktorije ('.pmm')..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "Uvozim 'UNIX' poštanske direktorije ('.mbx')..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "Uvozim %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr ""
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 #, fuzzy
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Uvezi mailove i strukturu direktorija iz Evolution"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -433,12 +433,12 @@ msgid ""
 "the status of message, e.g. new or forwarded."
 msgstr ""
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 #, fuzzy
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Uvezi poštu i strukturu direktorija iz lokalnog Thunderbird-a"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -448,12 +448,12 @@ msgid ""
 "Import\" in your local account.</p>"
 msgstr ""
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 #, fuzzy
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "Uvezi poštu i strukturu direktorija iz lokalnog Thunderbird-a"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -463,7 +463,7 @@ msgid ""
 "the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -471,15 +471,15 @@ msgstr ""
 "<b>Fatalna greška:</b> Ne mogu da pokrenem KMail za DCOP komunikaciju. "
 "Uvjerite se da je <i>kmail</i> instaliran."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "Ne mogu da napravim direktorij %1 u KMail-u"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Ne mogu da dodam poruku u direktorij %1 u KMail-u"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Greška prilikom dodavanja poruke u direktorij %1 u KMail-u"
 
diff --git a/tde-i18n-ca/messages/tdepim/kmailcvt.po b/tde-i18n-ca/messages/tdepim/kmailcvt.po
index 1dffe8432bd..4c6b01290b5 100644
--- a/tde-i18n-ca/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-ca/messages/tdepim/kmailcvt.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2006-02-19 01:57+0100\n"
 "Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -30,12 +30,12 @@ msgid ""
 "Your emails"
 msgstr "bella5@teleline.es"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr ""
 "Importa els correus locals i l'estructura de carpetes de l'Evolution 1.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -47,46 +47,46 @@ msgstr ""
 "p><p>Com que és possible recrear l'estructura de carpetes, aquestes "
 "s'emmagatzemaran sota de: \"Evolution-Import\".</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "No hi ha cap directori seleccionat."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "No s'ha trobat cap fitxer a importar."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "S'ha finalitzat la importació de missatges des de %1"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "No es pot obrir %1, s'omet"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "S'estan important correus des de %1..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
@@ -95,12 +95,12 @@ msgstr ""
 "1 missatge duplicat no s'ha importat\n"
 "%n missatges duplicats no s'han importat"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr ""
 "Importa els correus locals i l'estructura de carpetes de l'Evolution 2.x"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -117,34 +117,34 @@ msgstr ""
 "l'estructura de carpetes, aquestes s'emmagatzemen sota de: \"Evolution-Import"
 "\".</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "Ha acabat la importació, cancel·lada per l'usuari."
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "Comença la importació del fitxer %1..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Importa els directoris de correu i l'estructura de carpetes del KMail"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -163,22 +163,22 @@ msgstr ""
 "possible recrear l'estructura de carpetes, aquestes s'emmagatzemaran sota "
 "de: \"KMail-Import\" de la vostra carpeta local.</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "S'està important la carpeta %1..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "No s'ha pogut importar %1"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "Importa correus del Lotus Notes"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -198,25 +198,25 @@ msgstr ""
 "carpeta local, anomenades a partir del nom del fitxer del que prové el "
 "missatge.</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "Tots els fitxers (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "S'estan important correus des de %1"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Missatge %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "Importa des del Mail del OS X"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -225,7 +225,7 @@ msgstr ""
 "importa els correus electrònics del client de correu del Mac OS X d'Apple.</"
 "p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
@@ -233,11 +233,11 @@ msgstr ""
 "1 missatge duplicat no ha estat importat a la carpeta %1 del KMail\n"
 "%n missatges duplicats no han estat importats a la carpeta %1 del KMail"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Importa fitxers mbox (UNIX, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -252,15 +252,15 @@ msgstr ""
 "importats cap a carpetes amb un nom que mostrarà el seu origen, prefixades "
 "amb MBOX-</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "fitxers mbox (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Importa els correus de l'Outlook Express"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -278,44 +278,44 @@ msgstr ""
 "carpetes de l'Outlook Express 5 i 6 s'emmagatzemaran sota de: \"OE-Import\" "
 "de la vostra carpeta local.</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "No s'han trobat bústies de l'Outlook Express en el directori %1."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "Importa l'estructura de carpetes..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "S'ha finalitzat la importació de correus de l'Outlook Express"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "No es pot obrir la bústia %1"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "S'està important la bústia %1 de OE4"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "S'està important la bústia %1 de OE5+"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "S'està important el fitxer de carpeta %1 del OE5+"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Importa els correus de l'Opera"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -331,20 +331,20 @@ msgstr ""
 "store/account*).</p><p><b>Nota:</b> Els correus seran importats cap a "
 "carpetes amb el nom del compte origen, prefixades amb OPERA-</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "S'estan comptant els fitxers..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "S'estan important els nous fitxers de correu..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Importa correus de l'Outlook"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -360,23 +360,23 @@ msgstr ""
 "importats a carpetes amb el nom del compte del que vénen, prefixades amb "
 "OUTLOOK-</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "S'estan comptant els correus..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "S'estan comptant els directoris..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "S'estan comptant les carpetes..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Importa els missatges de text pla"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -388,11 +388,11 @@ msgstr ""
 "el directori en què són, prefixades amb PLAIN-</p><p>Aquest filtre importarà "
 "tots els correus electrònics .msg, .eml i .txt.</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Importa les carpetes des del Pegasus-Mail"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -406,7 +406,7 @@ msgstr ""
 "possible recrear l'estructura de carpetes, aquestes semmagatzemaran sota de: "
 "\"PegasusMail-Import\".</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
@@ -414,33 +414,33 @@ msgstr ""
 "No s'ha pogut analitzar l'estructura de carpetes, la importació continua "
 "sense poder treballar amb subcarpetes."
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "S'estan important els nous fitxers de correu ('.cnm')..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "S'estan important les carpetes de correu ('.pmm') ..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "S'estan important les carpetes de correu 'UNIX' ('.mbx')..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "S'està important %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "S'està analitzant l'estructura de carpetes..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr ""
 "Importa els directoris de correu i l'estructura de carpetes del Sylpheed"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -455,11 +455,11 @@ msgstr ""
 "local.</p><p>Aquest filtre també recrea l'estat del missatge, p.ex. nou o "
 "reenviat."
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Importa els correus i l'estructura de carpetesdel The Bat!"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -476,12 +476,12 @@ msgstr ""
 "aquestes s'emmagatzemaran sota de: \"TheBat-Import\" del vostre compte local."
 "</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr ""
 "Importa els correus locals i l'estructura de carpetes del Thunderbird/Mozilla"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -498,7 +498,7 @@ msgstr ""
 "que és possible recrear l'estructura de carpetes, aquestes s'emmagatzemaran "
 "sota de: \"Thunderbird-Import\".</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -506,15 +506,15 @@ msgstr ""
 "<b>Fatal:</b> No es pot engegar el KMail per a la comunicació DCOP. "
 "Assegureu-vos que el <i>KMail</i> està instal·lat."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "No es pot crear la carpeta %1 en el KMail"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "No es pot afegir el missatge a la carpeta %1 en el KMail"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr ""
 "S'ha produït un error en afegir el missatge a la carpeta %1 en el KMail"
diff --git a/tde-i18n-cs/messages/tdepim/kmailcvt.po b/tde-i18n-cs/messages/tdepim/kmailcvt.po
index 99e74434fee..b3dc7b71a43 100644
--- a/tde-i18n-cs/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-cs/messages/tdepim/kmailcvt.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2006-01-16 13:33+0100\n"
 "Last-Translator: Jakub Friedl <jfriedl@suse.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -36,11 +36,11 @@ msgid ""
 "Your emails"
 msgstr "mhejpetr@iss.cz,Ivo.Jansky@seznam.cz"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Importovat zprávy a strukturu složek z Evolution 1.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -52,46 +52,46 @@ msgstr ""
 "současnosti možné znovu vytvořit strukturu složek, bude tato uložena pod "
 "\"Evolution-Import\".</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "Žádný adresář není vybrán."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "Nenalezeny žádné soubory pro import."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "Dokončeno importování emailů z %1"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "Nelze otevřít %1, přeskakuji"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "Importování souborů z %1..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
@@ -101,11 +101,11 @@ msgstr ""
 "%n duplikované zprávy nebyly importovány.\n"
 "%n duplikovaných zpráv nebylo importováno."
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Importovat zprávy a strukturu složek z Evolution 2.x"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -121,34 +121,34 @@ msgstr ""
 "<p>Protože je v současnosti možné znovu vytvořit strukturu složek, bude tato "
 "uložena pod \"Evolution-Import\".</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "Import dokončen, přerušeno uživatelem."
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "Spustit importní soubor %1..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Importovat zprávy a strukturu složek z KMail"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -165,22 +165,22 @@ msgstr ""
 "neslouží k importu mbox souborů.</p><p>Emaily budou importovány do podsložek "
 "ve složce \"KMail-Import\".</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "Importovat složku %1..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "Nelze importovat %1"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "Importovat emaily z Lotus Notes"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -198,25 +198,25 @@ msgstr ""
 "pošta uložena do podsložek ve složce \"LNotes-Import\" ve vaší lokální "
 "složce. Budou použita jména souborů, ze kterých pošta pochází.</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "Všechny soubory (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "Importování emailů z %1"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Zpráva %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "Importovat z aplikace OS X Mail"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -224,7 +224,7 @@ msgstr ""
 "<p><b>Importní filtr pro OS X Mail</b></p> <p>Tento filtr importuje emaily z "
 "poštovního klienta Apple Mac OS X.</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
@@ -233,11 +233,11 @@ msgstr ""
 "%n duplikované zprávy nebyly importovány do složky '%1' v KMailu.\n"
 "%n duplikovaných zpráv nebylo importováno do složky '%1' v KMailu."
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Importovat soubory mbox (Unix, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -251,15 +251,15 @@ msgstr ""
 "Unixový formát.</p><p><b>Poznámka:</b> Emaily budou importovány do složek "
 "pojmenovaných po souboru, ze kterého vzešly a s MBOX na začátku.</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "Soubory mbox (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Importovat emaily z Outlook Expressu"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -276,44 +276,44 @@ msgstr ""
 "současnosti možné znovu vytvořit strukturu složek, bude tato uložena pod "
 "\"OE-Import\".</p></p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "Žádné složky Outlook Expressu nenalezeny v adresáři %1."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "Importovat strukturu složek..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Dokončeno importování emailů z Outlook Expressu"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Nelze otevřít schránku %1"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "Importování OE4 složky %1"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "Importování OE5+ složky %1"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "Importuji OE5+soubor složky %1"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Importovat emaily z Opery"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -328,20 +328,20 @@ msgstr ""
 "account*).</p><p><b>Poznámka:</b> Emaily budou importovány do složek "
 "pojmenovaných po složce, ze které vzešly a s OPERA- na začátku.</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Jsou počítány soubory ..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Importují se nové emailové soubory..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Importovat emaily z Outlooku"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -356,23 +356,23 @@ msgstr ""
 "nebo novějších.</p><p><b>Poznámka:</b> Emaily budou importovány do složek "
 "pojmenovaných po souboru, ze kterého vzešly; s OUTLOOK na začátku.</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "Jsou počítány emaily..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "Jsou počítány adresáře..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "Jsou počítány složky..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Importovat prosté textové emaily"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -383,11 +383,11 @@ msgstr ""
 "se stejným jménem jako adresář ve kterém byly, ale před názvem je PLAIN-</"
 "p><p>Tento filtr importuje všechny .msg, .eml a .txt emaily.</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Importovat složky z Pegasus-Mailu"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -400,7 +400,7 @@ msgstr ""
 "\\admin.</p><p><b>Poznámka:</b> Protože je v současnosti možné znovu "
 "vytvořit strukturu složek, bude tato uložena pod \"PegasusMail-Import\".</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
@@ -408,32 +408,32 @@ msgstr ""
 "Nelze analyzovat strukturu složek; pokračuje import bez podpory podřízených "
 "složek."
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Importují se nové soubory s poštou ('.cnm')..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Importují se složky pošty ('.pmm')"
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "Importují se unixové složky pošty ('.mbx') ..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "Importování %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "Analyzuje se struktura složek..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Importovat zprávy a strukturu složek ze Sylpheed"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -447,11 +447,11 @@ msgstr ""
 "názvu složky.</p> <p>Tento filtr rovněž obnovuje stav zprávy, např. \"nová\" "
 "nebo \"přeposlaná\""
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Importovat zprávy a strukturu složek z The Bat!"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -466,11 +466,11 @@ msgstr ""
 "DIMAP účtů.</p><p>Emaily budou importovány do podsložek ve složce \"TheBat-"
 "Import\".</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "Importovat zprávy a strukturu složek z Mozilla/Thunderbird"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -486,7 +486,7 @@ msgstr ""
 "spoustu nových složek.<p>Protože je v současnosti nemožné znovu vytvořit "
 "strukturu složek, bude tato \"obsažena\" ve vygenerovaném názvu složky.</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -494,15 +494,15 @@ msgstr ""
 "<b>VÁŽNÉ:</b> Nelze spustit KMail pro komunikaci DCOP.\n"
 "Ujistěte se, zda máte <i>kmail</i> v cestě."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "Nelze vytvořit složku %1 v KMailu"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Nelze přidat zprávu do složky %1 v KMailu"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Chyba při přidávání zprávy do složky %1 v KMailu"
 
diff --git a/tde-i18n-cy/messages/tdepim/kmailcvt.po b/tde-i18n-cy/messages/tdepim/kmailcvt.po
index d8584015e4c..a3bd1cc340f 100644
--- a/tde-i18n-cy/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-cy/messages/tdepim/kmailcvt.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2004-01-08 21:25+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -30,11 +30,11 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -42,57 +42,57 @@ msgid ""
 "Import\".</p>"
 msgstr ""
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "Dim cyfeiriadur wedi'i ddewis."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr ""
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "Gorffennwyd mewnforio ebostau o %1"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "Methwyd agor %1, yn hepgor"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "Yn mewnforio ebostau o %1"
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, fuzzy, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
 "%n duplicate messages not imported"
 msgstr "Gwall tra'n ychwanegu neges at blygell %1 yng KMail."
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -102,34 +102,34 @@ msgid ""
 "be stored under: \"Evolution-Import\".</p>"
 msgstr ""
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr ""
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr ""
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -140,24 +140,24 @@ msgid ""
 "\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 #, fuzzy
 msgid "Import folder %1..."
 msgstr "Yn mewnforio ebostau o %1"
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr ""
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 #, fuzzy
 msgid "Import Lotus Notes Emails"
 msgstr "Mewnforio Ebostau Outlook Express"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 #, fuzzy
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
@@ -174,44 +174,44 @@ msgstr ""
 "traddodiadaol UNIX yma.</p><p><b>Noder:</b> Mewnforir ebostau i blygelli "
 "wedi'u henwi ar ôl y ffeil y daethont ohoni, â'r rhagddodiad MBOX.</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 #, fuzzy
 msgid "All Files (*)"
 msgstr "ffeiliau mbox (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "Yn mewnforio ebostau o %1"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Neges %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 #, fuzzy
 msgid "Import From OS X Mail"
 msgstr "Mewnforio Plygelli o Pegasus-Mail"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
 msgstr ""
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 #, fuzzy
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "Gwall tra'n ychwanegu neges at blygell %1 yng KMail."
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Mewnforio Ffeiliau mbox (UNIX, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -225,16 +225,16 @@ msgstr ""
 "traddodiadaol UNIX yma.</p><p><b>Noder:</b> Mewnforir ebostau i blygelli "
 "wedi'u henwi ar ôl y ffeil y daethont ohoni, â'r rhagddodiad MBOX.</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 #, fuzzy
 msgid "mbox Files (*)"
 msgstr "ffeiliau mbox (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Mewnforio Ebostau Outlook Express"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 #, fuzzy
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
@@ -252,46 +252,46 @@ msgstr ""
 "p><p><b>Noder:</b>Mewnforir ebostau i blygelli wedi'u henwi ar ôl y ffeil y "
 "daethont ohoni, â'r rhagddodiad OE-</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "Ni ganfuwyd blychau ebost Outlook Express yn y cyfeiriadur %1"
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 #, fuzzy
 msgid "Import folder structure..."
 msgstr "Yn mewnforio ebostau o %1"
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Gorffennwyd mewnforio ebostau Outlook Express"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Methwyd agor y blwch ebost %1"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "Yn mewnforio blwch ebost OE4 %1"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "Yn mewnforio blwch ebost OE5+ %1"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, fuzzy, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "Yn anwybyddu ffeil Blygelli OE5+ %1"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 #, fuzzy
 msgid "Import Opera Emails"
 msgstr "Mewnforio Ebostau Outlook Express"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 #, fuzzy
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
@@ -307,21 +307,21 @@ msgstr ""
 "traddodiadaol UNIX yma.</p><p><b>Noder:</b> Mewnforir ebostau i blygelli "
 "wedi'u henwi ar ôl y ffeil y daethont ohoni, â'r rhagddodiad MBOX.</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Yn cyfri ffeiliau..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Yn mewnforio ffeiliau ebost newydd..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 #, fuzzy
 msgid "Import Outlook Emails"
 msgstr "Mewnforio Ebostau Outlook Express"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 #, fuzzy
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
@@ -338,26 +338,26 @@ msgstr ""
 "p><p><b>Noder:</b>Mewnforir ebostau i blygelli wedi'u henwi ar ôl y ffeil y "
 "daethont ohoni, â'r rhagddodiad OE-</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 #, fuzzy
 msgid "Counting mail..."
 msgstr "Yn cyfri ffeiliau..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 #, fuzzy
 msgid "Counting directories..."
 msgstr "Yn cyfri ffeiliau..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 #, fuzzy
 msgid "Counting folders..."
 msgstr "Yn cyfri ffeiliau..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Mewnforio Ebostau Testun Plaen"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -369,11 +369,11 @@ msgstr ""
 "rhagddodiad PLAIN-</p><p>Bydd yr hidlen hon yn mewnforio pob ebost .msg, ."
 "eml, a .txt.</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Mewnforio Plygelli o Pegasus-Mail"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 #, fuzzy
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
@@ -388,38 +388,38 @@ msgstr ""
 "nid yr adeiledd plygelli. Ond mae'n debyg taw dim ond unwaith y gwnewch hyn."
 "</p><p><b>Noder:</b> Mewnforir ebostau i blygell â'r rhagddodiad pmail-</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
 msgstr ""
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Yn mewnforio ffeiliau ebost newydd ('.cnm')..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Yn mewnforio plygelli ebost ('.pmm')..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "Yn mewnforio plygelli ebost 'UNIX' ('.mbx')..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "Yn mewnforio %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr ""
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -428,11 +428,11 @@ msgid ""
 "the status of message, e.g. new or forwarded."
 msgstr ""
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr ""
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -442,11 +442,11 @@ msgid ""
 "Import\" in your local account.</p>"
 msgstr ""
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -456,7 +456,7 @@ msgid ""
 "the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -464,15 +464,15 @@ msgstr ""
 "<b>Marwol:</b> Methu cychwyn KMail ar gyfer cyfathrebu DCOP. Sicrhewch bod "
 "<i>kmail</i> wedi'i sefydlu."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "Methu creu plygell %1 yng KMail"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Methu ychwanegu neges at blygell %1 yng KMail"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Gwall tra'n ychwanegu neges at blygell %1 yng KMail."
 
diff --git a/tde-i18n-da/messages/tdepim/kmailcvt.po b/tde-i18n-da/messages/tdepim/kmailcvt.po
index 0dd7accd801..b2ac0b98715 100644
--- a/tde-i18n-da/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-da/messages/tdepim/kmailcvt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2005-12-30 09:24-0500\n"
 "Last-Translator: Erik Kjær Pedersen <erik@binghamton.edu>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -27,11 +27,11 @@ msgid ""
 "Your emails"
 msgstr "erik@binghamton.edu"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Importér Evolution1.x lokal post- og mappestruktur"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -43,46 +43,46 @@ msgstr ""
 "at genoprette mappestrukturen, opbevares alle mapper under: \"Evolution "
 "import\".</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "Ingen mappe valgt."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "Ingen filer fundet at importere."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "Færdig med at importere e-mail fra %1"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "Kan ikke åbne %1, skipper"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "Importerer e-mail fra %1..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
@@ -91,11 +91,11 @@ msgstr ""
 "1 dobbelt brev ikke importeret\n"
 "%n dobbelte breve ikke importeret"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Importér Evolution 2.x lokal post- og mappestruktur"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -111,34 +111,34 @@ msgstr ""
 "nye mapper.</p> <p>Eftersom det for muligt at genoprette mappestrukturen, "
 "opbevares alle mapper under: \"Evolution-Import\".</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "Afsluttede import, annulleret af brugeren."
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "Starte import af filen %1..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Importér Kmails brevmapper og mappestruktur"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -156,22 +156,22 @@ msgstr ""
 "p><p>Eftersom det er muligt at genoprette mappestrukturen, opbevares alle "
 "mapper under: \"KMail-Import\" i din lokale mappe.</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "Importér mappe %1..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "Kunne ikke importere %1"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "Importér e-mail fra Outlook"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -189,25 +189,25 @@ msgstr ""
 "mappestrukturen, opbevares importerede breve i undermapper som navngives af "
 "filerne de kom fra under \"Sylpheed-Import\" i din lokale mappe.</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "Alle filer (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "Importerer e-mail fra %1"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Brev %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "Importér OS X post"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -215,7 +215,7 @@ msgstr ""
 "<p><b>OS X Mail Importfilter</b></p><p>Dette filter importerer e-mail fra e-"
 "mail-klienten i Apple Mac OS X.</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
@@ -223,11 +223,11 @@ msgstr ""
 "1 dobbelt brev ikke importeret til mappen %1 i KMail\n"
 "%n dobbelte breve ikke importeret til mappen %1 i KMail"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Importér mbox-filer (UNIX, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -241,15 +241,15 @@ msgstr ""
 "format.</p><p><b>Bemærk:</b> E-mail vil blive importeret til mapper opkaldt "
 "efter filen de kom fra, med præfiks MBOX-</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "mbox-filer (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Import Outlook Express e-mail"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -267,44 +267,44 @@ msgstr ""
 "opbevares alle mapper fra Outlook Express 5 0g 6 under: \"OE-Import\" i din "
 "lokale mappe.</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "Ingen Outlook Express postkasser fundet i mappen %1."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "Importér mappestruktur..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Færdig med at importere Outlook Express e-mail"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Kan ikke åbne fil '%1'"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "Importerer OE4-postkasse %1"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "Importerer OE5+ postkasse %1"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "Importerer OE5+ mappefil %1"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Import Opera e-mail"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -319,20 +319,20 @@ msgstr ""
 "opera/mail/store/account*).</p><p><b>Bemærk:</b> E-mail importeres til en "
 "mappe som får navn efter kontoen de kom fra, med præfikset OPERA-.</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Tæller filer..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Importerer nye post-filer..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Import Outlook e-mail"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -347,23 +347,23 @@ msgstr ""
 "i> i Windows 2000 eller senere</p><p><b>Bemærk:</b> E-mail importeres til en "
 "mappe som får navn efter kontoen de kom fra, med præfikset OUTLOOK-.</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "Tæller posten..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "Tæller mapper..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "Tæller mapper..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Importér almindelig tekst e-mail"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -374,11 +374,11 @@ msgstr ""
 "mappe med samme navn som den mappe de var i, med præfiks PLAIN-</p><p>Dette "
 "filter vil importere alle .msg, .eml og .txt e-mail.</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Importér mapper fra Pegasus-Mail"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -392,7 +392,7 @@ msgstr ""
 "genoprette mappestrukturen, opbevares alle mapper under \"PegasusMail-Import"
 "\".</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
@@ -400,32 +400,32 @@ msgstr ""
 "Kan ikke tolke mappestrukturen. Fortsætter import uden understøttelse for "
 "undermapper."
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Importerer nye post filer ('.cnm')..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Importerer postmapper ('.pmm')..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "Importerer 'UNIX' postmapper ('.mbx')..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "Importerer %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "Tolker mappestrukturen..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Importér brevmapper og mappestruktur fra Sylpheed"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -439,11 +439,11 @@ msgstr ""
 "\" i din lokale mappe.</p> <p>Dette filter genopretter også status på et "
 "brev, f.eks. nyt eller videresendt."
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Importér Bat!-post mappestruktur"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -458,11 +458,11 @@ msgstr ""
 "DIMAP-konti.</p><p>Eftersom det er muligt at genoprette mappestrukturen, "
 "opbevares alle mapper under: \"TheBat-Import\" i din lokale mappe.</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "Importér Thunderbird/Mozilla lokale post og -mappestruktur"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -479,7 +479,7 @@ msgstr ""
 "genoprette mappestrukturen, opbevares alle mapper under \"Thunderbird-Import"
 "\".</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -487,15 +487,15 @@ msgstr ""
 "<b>FATALT:</b> Kan ikke starte KMail for DCOP-kommunikation. Sørg for "
 "<i>kmail</i> er i installeret."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "Kan ikke lave mappe %1 i KMail"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Kan ikke tilføje brev til mappe %1 i KMail"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Fejl ved tilføjelse af brev til mappe %1 i KMail"
 
diff --git a/tde-i18n-de/messages/tdepim/kmailcvt.po b/tde-i18n-de/messages/tdepim/kmailcvt.po
index 8e51b6cbc16..8d7df417e76 100644
--- a/tde-i18n-de/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-de/messages/tdepim/kmailcvt.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2019-11-23 19:56+0000\n"
 "Last-Translator: Chris <xchrisx@uber.space>\n"
 "Language-Team: German <https://mirror.git.trinitydesktop.org/weblate/"
@@ -34,11 +34,11 @@ msgid ""
 "Your emails"
 msgstr "kiefer@kde.org, F.Schuette@t-online.de"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Importieren von Evolution 1.x E-Mails und Ordnerlisten"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -50,46 +50,46 @@ msgstr ""
 "die Ordnerstruktur rekonstruiert werden kann, erscheinen die importierten "
 "Ordner unterhalb von \"Evolution-Import\".</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "Kein Ordner ausgewählt."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "Keine Dateien zum Importieren gefunden."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "Der Import von E-Mails aus %1 ist abgeschlossen"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "%1 lässt sich nicht zum Lesen öffnen, Datei wird übergangen"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "Mailordner von %1 werden importiert ..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
@@ -98,11 +98,11 @@ msgstr ""
 "1 doppelte Nachricht wurde nicht importiert\n"
 "%n doppelte Nachrichten wurden nicht importiert"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Importieren von E-Mails und Ordnerlisten aus Evolution 2.x"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -119,23 +119,23 @@ msgstr ""
 "erscheinen die importierten Ordner unterhalb des Basisordners \"Evolution-"
 "Import\".</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "Import abgeschlossen, Abbruch durch Benutzer."
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "Import von Datei %1 wird gestartet ..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr "KMail-Archivdatei importieren"
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
@@ -146,11 +146,11 @@ msgstr ""
 "wurden.</p><p>Archivdateien enthalten einen vollständigen Ordner-Teilbaum, "
 "der in eine einzelne Datei komprimiert wurde.</p>"
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Importieren von E-Mails und Ordnerlisten aus KMail"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -169,22 +169,22 @@ msgstr ""
 "kann, erscheinen diese unterhalb des Basisordners \"KMail-Import\" in Ihren "
 "lokalen Ordnern.</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "Import von Ordner %1 ..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "%1 kann nicht importiert werden"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "E-Mails von Lotus Notes importieren"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -203,25 +203,25 @@ msgstr ""
 "Ordner unterhalb des Hauptordners \"LNotes-Import\" in Unterordnern, die die "
 "Namen der zugrundeliegenden Notesdateien tragen.</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "Alle Dateien (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "E-Mails von %1 werden importiert"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Nachricht %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "Von OS X Mail importieren"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -229,7 +229,7 @@ msgstr ""
 "<p><b>OS X Mail-Importfilter</b></p> <p>Dieser Filter importiert E-Mails des "
 "in Apple Mac OS X mitgelieferten Mail-Programms.</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
@@ -237,11 +237,11 @@ msgstr ""
 "1 doppelte Nachricht wurde nicht in den Ordner %1 von KMail importiert\n"
 "%n doppelte Nachrichten wurden nicht in den Ordner %1 von KMail importiert"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Importieren von mbox-Dateien (UNIX, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -256,15 +256,15 @@ msgstr ""
 "befinden sich hinterher in Ordnern mit dem ursprünglichen Dateinamen und dem "
 "Präfix MBOX-</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "mbox-Dateien (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "E-Mails von Outlook Express importieren"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -282,44 +282,44 @@ msgstr ""
 "Ordnerstruktur rekonstruiert werden kann, erscheinen die Ordner von Outlook "
 "Express 5 und 6 unter dem Basisordner \"OE-Import\".</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "Im Ordner %1 wurden keine Outlook Express-Postfächer gefunden."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "Importieren der Ordnerlisten ..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Import von Outlook Express E-Mails abgeschlossen"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Postfach %1 kann nicht geöffnet werden"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "OE4-Postfach %1 wird importiert"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "OE5+-Postfach %1 wird importiert"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "OE5+-Postfach %1 wird importiert"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Import von Opera E-Mails"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -335,20 +335,20 @@ msgstr ""
 "account*).</p> <p><b>Hinweis:</b>Die E-Mails werden in einen Ordner mit dem "
 "Kontonamen und dem Präfix OPERA- importiert.</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Dateien werden gezählt ..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Neue Maildateien werden importiert ..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "E-Mails von Outlook importieren"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -363,23 +363,23 @@ msgstr ""
 "Dateien enthält.</p> <p><b>Hinweis:</b> E-Mails werden in einen Ordner mit "
 "dem Kontonamen und dem Präfix OUTLOOK- importiert.</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "Nachrichten werden gezählt ..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "Ordner werden gezählt ..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "Ordner werden gezählt ..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Einfache Text-E-Mail importieren"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -391,11 +391,11 @@ msgstr ""
 "Präfix \"PLAIN-\" importiert.</p> <p>Dieser Filter importiert alle \".msg"
 "\"-, \".eml\"- und \".txt\"-E-Mails.</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Ordner von Pegasus-Mail importieren"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -409,7 +409,7 @@ msgstr ""
 "rekonstruiert werden kann, erscheinen die importierten Ordner unterhalb von "
 "\"PegasusMail-Import\".</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
@@ -417,32 +417,32 @@ msgstr ""
 "Die Ordnerstruktur kann nicht untersucht werden; der Import wird ohne die "
 "Unterstützung von Unterordnern fortgesetzt."
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Neue Maildateien werden importiert ('.cnm') ..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Mailordner ('.pmm') werden importiert ..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "'UNIX'-Mailordner ('.mbx') werden importiert ..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "%1 wird importiert"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "Untersuchen der Ordnerstruktur ..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Importieren von E-Mails und Ordnerlisten aus Sylpheed"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -457,11 +457,11 @@ msgstr ""
 "</p><p>Dieser Importfilter erkennt auch den Status der Nachrichten, z. B. "
 "Neu oder Weitergeleitet."
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Importieren von The Bat! E-Mails und Ordnern"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -478,12 +478,12 @@ msgstr ""
 "rekonstruiert werden kann, erscheinen die importierten Nachrichten in Lokale "
 "Ordner unterhalb des Hauptordners \"TheBat-Import\".</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr ""
 "Importieren der lokalen Mails und der Ordnerstruktur von Thunderbird/Mozilla"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -500,7 +500,7 @@ msgstr ""
 "Ordnerstruktur rekonstruiert werden kann, erscheinen die Ordner unter unter "
 "\"Thunderbird-Import\".</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -508,15 +508,15 @@ msgstr ""
 "<b>Kritisch:</b> KMail kann nicht zur DCOP-Kommunikation gestartet werden. "
 "Vergewissern Sie sich, dass <i>kmail</i> installiert ist."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "Ordner %1 kann in KMail nicht erstellt werden"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Nachricht kann nicht zu Ordner %1 in KMail hinzugefügt werden"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Fehler beim Hinzufügen der Nachricht zu Ordner %1 in KMail"
 
diff --git a/tde-i18n-el/messages/tdepim/kmailcvt.po b/tde-i18n-el/messages/tdepim/kmailcvt.po
index a2a84118b4e..58f0026aa8f 100644
--- a/tde-i18n-el/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-el/messages/tdepim/kmailcvt.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2007-01-09 18:52+0200\n"
 "Last-Translator: Spiros Georgaras <sng@hellug.gr>\n"
 "Language-Team: Greek <i18ngr@lists.hellug.gr>\n"
@@ -26,11 +26,11 @@ msgid ""
 "Your emails"
 msgstr "sng@hellug.gr"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Εισαγωγή τοπικής αλληλογραφίας και δομής φακέλων του Evolution 1.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -42,46 +42,46 @@ msgstr ""
 "evolution/local).</p> <p>Εφόσον είναι δυνατή η αντιγραφή της δομής των "
 "φακέλων, αυτοί θα αποθηκευτούν στο : \"Evolution-Import\".</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "Δεν επιλέχθηκε κατάλογος."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "Δε βρέθηκαν αρχεία για εισαγωγή."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "Η εισαγωγή μηνυμάτων αλληλογραφίας από το %1 ολοκληρώθηκε"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "Αδύνατο το άνοιγμα του %1, παράβλεψη"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "Εισαγωγή μηνυμάτων αλληλογραφίας από το %1..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
@@ -90,11 +90,11 @@ msgstr ""
 "1 διπλό μήνυμα δεν εισήχθη\n"
 "%n διπλά μηνύματα δεν εισήχθησαν"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Εισαγωγή τοπικής αλληλογραφίας και δομής φακέλων του Evolution 2.x"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -110,34 +110,34 @@ msgstr ""
 "θα πάρετε πολλούς νέους φακέλους.</p><p>Εφόσον είναι δυνατή η αντιγραφή της "
 "δομής των φακέλων, αυτοί θα αποθηκευτούν στο : \"Evolution-Import\".</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "Η εισαγωγή ακυρώθηκε από το χρήστη."
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "Έναρξη της εισαγωγής του αρχείου %1..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Εισαγωγή maildirs και δομή φακέλων του KMail"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -155,22 +155,22 @@ msgstr ""
 "του KMail με αρχεία mbox.</p><p>Εφόσον είναι δυνατή η αντιγραφή της δομής "
 "των φακέλων, αυτοί θα αποθηκευτούν στο : \"KMail-Import\".</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "Εισαγωγή του φακέλου %1..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "Αδύνατη η εισαγωγή του %1"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "Εισαγωγή μηνυμάτων αλληλογραφίας του Lotus Notes"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -189,25 +189,25 @@ msgstr ""
 "υποφακέλους με όνομα αντίστοιχο με τα αρχεία από τα οποία προήλθαν στο : "
 "\"LNotes-Import\" στον τοπικό  σας φάκελο.</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "Όλα τα αρχεία (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "Εισαγωγή μηνυμάτων από το %1"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Μήνυμα %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "Εισαγωγή από το OS X Mail"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -216,7 +216,7 @@ msgstr ""
 "φίλτρο εισάγει μηνύματα από τον πελάτη ηλ. ταχυδρομείου του Apple Mac OS X.</"
 "p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
@@ -224,11 +224,11 @@ msgstr ""
 "1 διπλό μήνυμα δεν εισήχθη από το φάκελο %1 στο KMail\n"
 "%n διπλά μηνύματα δεν εισήχθησαν από το φάκελο %1 στο KMail"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Εισαγωγή αρχείων mbox (UNIX, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -243,15 +243,15 @@ msgstr ""
 "Τα μηνύματα θα εισαχθούν σε φακέλους με όνομα αντίστοιχο των αρχείων από τα "
 "οποία προήλθαν, με πρόθεμα MBOX-</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "Αρχεία mbox (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Εισαγωγή αλληλογραφίας του Outlook"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -268,44 +268,44 @@ msgstr ""
 "p><p><b>Σημείωση:</b> Εφόσον είναι δυνατή η αντιγραφή της δομής των φακέλων, "
 "αυτοί θα αποθηκευτούν στο : \"OE-Import\" στον τοπικό  σας φάκελο.</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "Δε βρέθηκαν mailboxes του Outlook Express στον κατάλογο %1."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "Εισαγωγή δομής φακέλων..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Η εισαγωγή των μηνυμάτων του Outlook Express ολοκληρώθηκε"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Αδύνατο το άνοιγμα του mailbox %1"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "Εισαγωγή του mailbox του OE4 %1"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "Εισαγωγή του mailbox του OE5+ %1"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "Εισαγωγή του φακέλου αρχείων του OE5+ %1"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Εισαγωγή αλληλογραφίας του Opera"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -322,20 +322,20 @@ msgstr ""
 "σε ένα φάκελο με το όνομα του λογαριασμού από τον οποίο προήλθαν, και με "
 "πρόθεμα OPERA-</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Μέτρηση αρχείων..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Εισαγωγή νέων αρχείων μηνυμάτων..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Εισαγωγή μηνυμάτων αλληλογραφίας του Outlook"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -351,23 +351,23 @@ msgstr ""
 "p><p><b>Σημείωση:</b> Τα μηνύματα θα εισαχθούν σε ένα φάκελο με όνομα "
 "αντίστοιχο του λογαριασμού από τον οποίο προήλθαν, με πρόθεμα OUTLOOK-</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "Μέτρηση μηνυμάτων..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "Μέτρηση καταλόγων..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "Μέτρηση φακέλων..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Εισαγωγή μηνυμάτων αλληλογραφίας Απλού Κειμένου"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -379,11 +379,11 @@ msgstr ""
 "τον οποίο προήλθαν, με πρόθεμα PLAIN-</p><p>Αυτό το φίλτρο θα εισάγει όλα τα "
 "μηνύματα .msg, .eml και .txt.</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Εισαγωγή φακέλων από το Pegasus-Mail"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -397,7 +397,7 @@ msgstr ""
 "δυνατή η αντιγραφή της δομής των φακέλων, αυτοί θα αποθηκευτούν στο : "
 "\"PegasusMail-Import\".</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
@@ -405,32 +405,32 @@ msgstr ""
 "Αδύνατη η ανάλυση της δομής φακέλων. Η εισαγωγή θα συνεχιστεί χωρίς "
 "υποστήριξη υποφακέλων."
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Εισαγωγή νέων αρχείων αλληλογραφίας ('.cnm')..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Εισαγωγή φακέλων αλληλογραφίας ('.pmm')..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "Εισαγωγή φακέλων αλληλογραφίας 'UNIX' ('.mbx')..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "Εισαγωγή του %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "Ανάλυση της δομής φακέλων..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Εισαγωγή Maildir και δομής φακέλων του Sylpheed"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -445,11 +445,11 @@ msgstr ""
 "φίλτρο αντιγράφει επίσης και την κατάσταση των μηνυμάτων. π.χ. νέο η "
 "προωθημένο."
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Εισαγωγή μηνυμάτων αλληλογραφίας και δομής φακέλων του The Bat!"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -467,13 +467,13 @@ msgstr ""
 "αρχεία από τα οποία προήλθαν στο : \"TheBat-Import\" στον τοπικό σας "
 "λογαριασμό.</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr ""
 "Εισαγωγή τοπικών μηνυμάτων αλληλογραφίας και δομής φακέλων από το "
 "Thunderbird/Mozilla"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -490,7 +490,7 @@ msgstr ""
 "p><p>Εφόσον είναι δυνατή η αντιγραφή της δομής των φακέλων, αυτοί θα "
 "αποθηκευτούν στο : \"Thunderbird-Import\".</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -498,15 +498,15 @@ msgstr ""
 "<b>Κρίσιμο:</b> Αδύνατη η εκκίνηση της επικοινωνίας DCOP του KMail. "
 "Επιβεβαιώστε ότι το <i>kmail</i> είναι εγκατεστημένο."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "Αδύνατη η δημιουργία του φακέλου %1 στο KMail"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Αδύνατη η προσθήκη μηνυμάτων στο φάκελο %1 του KMail"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Σφάλμα κατά την προσθήκη μηνυμάτων στο φάκελο %1 του KMail"
 
diff --git a/tde-i18n-en_GB/messages/tdepim/kmailcvt.po b/tde-i18n-en_GB/messages/tdepim/kmailcvt.po
index 7615876c63f..e17dbfb7485 100644
--- a/tde-i18n-en_GB/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-en_GB/messages/tdepim/kmailcvt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2005-12-30 13:44+0000\n"
 "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
@@ -28,11 +28,11 @@ msgid ""
 "Your emails"
 msgstr "malcolm.hunter@gmx.co.uk"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Import Evolution 1.x Local Mails and Folder Structure"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -44,46 +44,46 @@ msgstr ""
 "recreate the folder structure, the folders will be stored under: \"Evolution-"
 "Import\".</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "No directory selected."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "No files found for import."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "Finished importing emails from %1"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "Unable to open %1, skipping"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "Importing emails from %1..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
@@ -92,11 +92,11 @@ msgstr ""
 "1 duplicate message not imported\n"
 "%n duplicate messages not imported"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Import Evolution 2.x Local Mails and Folder Structure"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -112,34 +112,34 @@ msgstr ""
 "p><p>Since it is possible to recreate the folder structure, the folders will "
 "be stored under: \"Evolution-Import\".</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "Finished import, cancelled by user."
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "Start import file %1..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Import KMail Maildirs and Folder Structure"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -157,22 +157,22 @@ msgstr ""
 "possible to recreate the folder structure, the folders will be stored under: "
 "\"KMail-Import\" in your local folder.</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "Import folder %1..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "Could not import %1"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "Import Lotus Notes Emails"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -190,25 +190,25 @@ msgstr ""
 "will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
 "named using the names of the files the messages came from.</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "All Files (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "Importing emails from %1"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Message %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "Import From OS X Mail"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -216,7 +216,7 @@ msgstr ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
@@ -224,11 +224,11 @@ msgstr ""
 "1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Import mbox Files (UNIX, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -242,15 +242,15 @@ msgstr ""
 "Emails will be imported into folders named after the file they came from, "
 "prefixed with MBOX-</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "mbox Files (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Import Outlook Express Emails"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -268,44 +268,44 @@ msgstr ""
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "No Outlook Express mailboxes found in directory %1."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "Import folder structure..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Finished importing Outlook Express emails"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Unable to open mailbox %1"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "Importing OE4 Mailbox %1"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "Importing OE5+ Mailbox %1"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "Importing OE5+ Folder file %1"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Import Opera Emails"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -321,20 +321,20 @@ msgstr ""
 "imported into a folder named after the account they came from, prefixed with "
 "OPERA-</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Counting files..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Importing new mail files..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Import Outlook Emails"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -350,23 +350,23 @@ msgstr ""
 "imported into a folder named after the account they came from, prefixed with "
 "OUTLOOK-</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "Counting mail..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "Counting directories..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "Counting folders..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Import Plain Text Emails"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -378,11 +378,11 @@ msgstr ""
 "prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
 "emails.</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Import Folders From Pegasus-Mail"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -396,7 +396,7 @@ msgstr ""
 "folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
 "p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
@@ -404,32 +404,32 @@ msgstr ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Importing new mail files ('.cnm')..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Importing mail folders ('.pmm')..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "Importing 'UNIX' mail folders ('.mbx')..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "Importing %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "Parsing the folder structure..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Import Sylpheed Maildirs and Folder Structure"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -443,11 +443,11 @@ msgstr ""
 "\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
 "the status of message, e.g. new or forwarded."
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Import The Bat! Mails and Folder Structure"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -463,11 +463,11 @@ msgstr ""
 "recreate the folder structure, the folders will be stored under: \"TheBat-"
 "Import\" in your local account.</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -483,7 +483,7 @@ msgstr ""
 "new folders.</p><p>Since it is possible to recreate the folder structure, "
 "the folders will be stored under: \"Thunderbird-Import\".</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -491,15 +491,15 @@ msgstr ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "Cannot make folder %1 in KMail"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Cannot add message to folder %1 in KMail"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Error while adding message to folder %1 in KMail"
 
diff --git a/tde-i18n-eo/messages/tdepim/kmailcvt.po b/tde-i18n-eo/messages/tdepim/kmailcvt.po
index 3af8eab7c7b..97ce130f1d9 100644
--- a/tde-i18n-eo/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-eo/messages/tdepim/kmailcvt.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2020-11-01 17:48+0000\n"
 "Last-Translator: Thomas CORDONNIER <t_cordonnier@yahoo.fr>\n"
 "Language-Team: Esperanto <https://mirror.git.trinitydesktop.org/weblate/"
@@ -28,11 +28,11 @@ msgid ""
 "Your emails"
 msgstr "wolfram@steloj.de Steffen.Pietsch@BerlinOnline.de"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -40,59 +40,59 @@ msgid ""
 "Import\".</p>"
 msgstr ""
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr ""
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr ""
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr ""
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 #, fuzzy
 msgid "Unable to open %1, skipping"
 msgstr "Ne eblis malfermi %1 por legado"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 #, fuzzy
 msgid "Importing emails from %1..."
 msgstr "Importante mesaĝujojn ('.pmm')..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, fuzzy, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
 "%n duplicate messages not imported"
 msgstr "Eraro dum aldono de mesaĝo al mesaĝujo %1 en Retpoŝtilo"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -102,34 +102,34 @@ msgid ""
 "be stored under: \"Evolution-Import\".</p>"
 msgstr ""
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr ""
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr ""
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -140,24 +140,24 @@ msgid ""
 "\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 #, fuzzy
 msgid "Import folder %1..."
 msgstr "Importante mesaĝujojn ('.pmm')..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, fuzzy, c-format
 msgid "Could not import %1"
 msgstr "Ne eblas legi poŝtkeston %1"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 #, fuzzy
 msgid "Import Lotus Notes Emails"
 msgstr "Importo de Aŭtluko Ekspresa 4"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -168,43 +168,43 @@ msgid ""
 "named using the names of the files the messages came from.</p>"
 msgstr ""
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr ""
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, fuzzy, c-format
 msgid "Importing emails from %1"
 msgstr "Importante mesaĝujojn ('.pmm')..."
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr ""
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 #, fuzzy
 msgid "Import From OS X Mail"
 msgstr "IMporto de Pegasus-Mail"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
 msgstr ""
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 #, fuzzy
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "Eraro dum aldono de mesaĝo al mesaĝujo %1 en Retpoŝtilo"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr ""
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -213,16 +213,16 @@ msgid ""
 "prefixed with MBOX-</p>"
 msgstr ""
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr ""
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 #, fuzzy
 msgid "Import Outlook Express Emails"
 msgstr "Importo de Aŭtluko Ekspresa 4"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -233,47 +233,47 @@ msgid ""
 "your local folder.</p>"
 msgstr ""
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, fuzzy, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "Serĉante '.mbx'-dosieroj de Aŭtluko Ekspresa en dosierujo %1"
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 #, fuzzy
 msgid "Import folder structure..."
 msgstr "Importante mesaĝujojn ('.pmm')..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 #, fuzzy
 msgid "Finished importing Outlook Express emails"
 msgstr "%1 ne estas OE5-poŝtkesto"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, fuzzy, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Ne eblis malfermi dosieron '%1'"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr ""
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr ""
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, fuzzy, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "Importante mesaĝujojn ('.pmm')..."
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 #, fuzzy
 msgid "Import Opera Emails"
 msgstr "Importo de Aŭtluko Ekspresa 4"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -283,22 +283,22 @@ msgid ""
 "OPERA-</p>"
 msgstr ""
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Nombrante dosierojn..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 #, fuzzy
 msgid "Importing new mail files..."
 msgstr "Importante novajn retpoŝtdosierojn ('.cnm')..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 #, fuzzy
 msgid "Import Outlook Emails"
 msgstr "Importo de Aŭtluko Ekspresa 4"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -308,26 +308,26 @@ msgid ""
 "OUTLOOK-</p>"
 msgstr ""
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 #, fuzzy
 msgid "Counting mail..."
 msgstr "Nombrante dosierojn..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 #, fuzzy
 msgid "Counting directories..."
 msgstr "Nombrante dosierojn..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 #, fuzzy
 msgid "Counting folders..."
 msgstr "Nombrante dosierojn..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr ""
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -335,12 +335,12 @@ msgid ""
 "emails.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 #, fuzzy
 msgid "Import Folders From Pegasus-Mail"
 msgstr "IMporto de Pegasus-Mail"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -349,38 +349,38 @@ msgid ""
 "p>"
 msgstr ""
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
 msgstr ""
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Importante novajn retpoŝtdosierojn ('.cnm')..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Importante mesaĝujojn ('.pmm')..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "Importante 'unix'-mesaĝujojn ('.mbx')..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr ""
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr ""
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -389,11 +389,11 @@ msgid ""
 "the status of message, e.g. new or forwarded."
 msgstr ""
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr ""
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -403,11 +403,11 @@ msgid ""
 "Import\" in your local account.</p>"
 msgstr ""
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -417,7 +417,7 @@ msgid ""
 "the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 #, fuzzy
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
@@ -426,17 +426,17 @@ msgstr ""
 "GRAVA ERARO: Ne eblis lanĉi Retpoŝtilon cele al DCOP-komunikado\n"
 "             certigu, ke Retpoŝtilo 'KMail' estas trovebla en via pado."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 #, fuzzy
 msgid "Cannot make folder %1 in KMail"
 msgstr "Ne eblas krei mesaĝujon %1 en Retpoŝtilo"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 #, fuzzy
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Ne eblas aldoni mesaĝon al mesaĝujo %1 en Retpoŝtilo"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 #, fuzzy
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Eraro dum aldono de mesaĝo al mesaĝujo %1 en Retpoŝtilo"
diff --git a/tde-i18n-es/messages/tdepim/kmailcvt.po b/tde-i18n-es/messages/tdepim/kmailcvt.po
index 1d76ab74a5c..1867ba22c45 100644
--- a/tde-i18n-es/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-es/messages/tdepim/kmailcvt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
 "Report-Msgid-Bugs-To: http://bugs.trinitydesktop.org\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2007-10-03 13:05+0200\n"
 "Last-Translator: Enrique Matias Sanchez (aka Quique) <cronopios@gmail.com>\n"
 "Language-Team: Spanish <kde-es@kybs.de>\n"
@@ -31,12 +31,12 @@ msgid ""
 "Your emails"
 msgstr "juanma@superiodico.net,jaime@kde.org"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr ""
 "Importar los correos y la estructura local de carpetas de Evolution 1.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -48,46 +48,46 @@ msgstr ""
 "</p><p>Dado que es posible recrear la estructura de carpetas, dichas "
 "carpetas se almacenarán en «Evolution-Import».</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "No hay ningún directorio seleccionado."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "No se encontró ningún archivo para importar."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "Terminó la importación de mensajes de %1"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "No se puede abrir %1, se ignora"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "Importando mensajes de %1..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
@@ -96,12 +96,12 @@ msgstr ""
 "1 mensaje duplicado no importado\n"
 "%n mensajes duplicados no importados"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr ""
 "Importar los correos y la estructura local de carpetas de Evolution 2.x"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -118,34 +118,34 @@ msgstr ""
 "posible recrear la estructura de carpetas, dichas carpetas se almacenarán en "
 "«Evolution-Import».</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "Importación finalizada, cancelada por el usuario."
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "Iniciar la importación del archivo %1..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Importar carpetas de correo y estructura de carpetas de KMail"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -164,22 +164,22 @@ msgstr ""
 "carpetas, dichas carpetas se almacenan en «KMail-Import», en su carpeta "
 "local.</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "Importar la carpeta %1..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "No se pudo importar %1"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "Importar correos de Lotus Notes"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -198,25 +198,25 @@ msgstr ""
 "almacenarán en subcarpetas de la carpeta local «LNotes-Import», con los "
 "nombres de los archivos de los que provienen.</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "Todos los archivos (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "Importando mensajes de %1"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Mensaje %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "Importar de OS X Mail"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -224,7 +224,7 @@ msgstr ""
 "<p><b>Filtro de importación de OS X Mail</b></p><p>Este filtro importa los "
 "correos electrónicos del cliente de correo de Apple Mac OS X.</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
@@ -232,11 +232,11 @@ msgstr ""
 "1 mensaje duplicado no importado a la carpeta %1 de KMail\n"
 "%n mensajes duplicados no importados a la carpeta %1 de KMail"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Importar archivos mbox (UNIX, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -250,15 +250,15 @@ msgstr ""
 "Unix.</p><p><b>Nota:</b> Los correos electrónicos se importarán en carpetas "
 "con un nombre que muestre su origen, con el prefijo MBOX-</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "Archivos mbox (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Importar correos de Outlook Express"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -276,45 +276,45 @@ msgstr ""
 "carpetas de Outlook Express 5 y 6, dichas carpetas se almacenarán en «OE-"
 "Import», en su carpeta local.</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr ""
 "No se encontraron buzones de correo de Outlook Express en el directorio %1."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "Importar la estructura de carpetas..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Terminó la importación de los mensajes de Outlook Express"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "No es posible abrir el buzón de correo %1"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "Importando el buzón de OE4 %1"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "Importando el buzón de OE5+ %1"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "Importando el archivo %1 de la carpeta de OE5+"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Importar correos de Opera"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -331,20 +331,20 @@ msgstr ""
 "carpeta con el mismo nombre de cuenta del que procedan, con el prefijo "
 "«OPERA-».</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Contando archivos..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Importando nuevos archivos de correo..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Importar correos de Outlook"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -360,23 +360,23 @@ msgstr ""
 "p><p><b>Aviso:</b> los correos se importarán a una carpeta con el mismo "
 "nombre que la cuenta de la que provienen, con el prefijo «OUTLOOK-».</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "Contando los mensajes..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "Contando los directorios..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "Contando las carpetas..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Importar mensajes de texto plano"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -388,11 +388,11 @@ msgstr ""
 "directorio en el que están, poniendo como prefijo PLAIN-</p> <p>Este filtro "
 "importará todos los correos electrónicos .msg, .eml y .txt.</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Importar las carpetas de Pegasus-Mail"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -406,7 +406,7 @@ msgstr ""
 "posible recrear la estructura de carpetas, dichas carpetas se almacenarán en "
 "«PegasusMail-Import».</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
@@ -414,32 +414,32 @@ msgstr ""
 "No se puede analizar la estructura de carpetas. Se continúa la importación "
 "sin soporte para subcarpetas."
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Importando nuevos archivos de correo ('.cnm')..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Importando carpetas de correo ('.pmm') ..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "Importando carpetas de correo 'UNIX' ('.mbx') ..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "Importando %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "Analizando la estructura de carpetas..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Importar los correos y la estructura de carpetas de Sylpheed"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -454,11 +454,11 @@ msgstr ""
 "p><p>Este filtro también recrea el estado del mensaje, por ejemplo nuevo o "
 "reenviado."
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Importar los correos y la estructura de carpetas de The Bat!"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -474,12 +474,12 @@ msgstr ""
 "IMAP/DIMAP.</p><p>Dado que es posible recrear la estructura de carpetas, "
 "dichas carpetas se almacenarán en «TheBat-Import», en su cuenta local.</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr ""
 "Importar los correos y la estructura de carpetas de Thunderbird/Mozilla"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -496,7 +496,7 @@ msgstr ""
 "la estructura de carpetas, dichas carpetas se almacenarán en «Thunderbird-"
 "Import».</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -504,15 +504,15 @@ msgstr ""
 "<b>Fatal:</b> No se puede comenzar KMail para una comunicación DCOP. "
 "Asegúrese de que <i>kmail</i> está instalado."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "No es posible crear la carpeta %1 en KMail"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "No es posible añadir el mensaje a la carpeta %1 en KMail"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Error al añadir el mensaje a la carpeta %1 en KMail"
 
diff --git a/tde-i18n-et/messages/tdepim/kmailcvt.po b/tde-i18n-et/messages/tdepim/kmailcvt.po
index 63a54815304..d77bb66c7dd 100644
--- a/tde-i18n-et/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-et/messages/tdepim/kmailcvt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2005-12-30 11:39+0300\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <kde-et@linux.ee>\n"
@@ -27,11 +27,11 @@ msgid ""
 "Your emails"
 msgstr "pezz@tkwcy.ee"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Evolution 1.x kohalike kirjade ja kaustastruktuuri import"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -42,46 +42,46 @@ msgstr ""
 "baaskaust (tavaliselt ~/evolution/local).</p><p>Kaustastruktuuri taasloomise "
 "huvides salvestatakse kaustad kausta \"Evolution-Import\".</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "Kataloogi pole valitud."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "Importimiseks ei leitud ühtki faili."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "Kirjade import %1-st lõpetatud"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "%1 avamine ebaõnnestus, jäetakse vahele"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "Kirjade importimine: %1 ..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
@@ -90,11 +90,11 @@ msgstr ""
 "1 topeltkiri jäi importimata\n"
 "%n topeltkirja jäi importimata"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Evolution 2.x kohalike kirjade ja kaustastruktuuri import"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -109,34 +109,34 @@ msgstr ""
 "sa seda siiski teed, saad õige palju uusi kaustu.</p><p>Kaustastruktuuri "
 "taasloomise huvides salvestatakse kaustad kausta \"Evolution-Import\".</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "Import lõpetatud - kasutaja katkestas."
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "Faili %1 impordi alustamine..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "KMaili kirjakaustade ja kaustastruktuuri import"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -154,22 +154,22 @@ msgstr ""
 "p><p>Kaustastruktuuri taasloomise huvides salvestatakse kaustad kausta "
 "\"KMail-Import\".</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "Kausta %1 import..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "%1 import ebaõnnestus"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "Lotus Notesi kirjade import"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -188,25 +188,25 @@ msgstr ""
 "mis saavad nime faili järgi, millest nad imporditi, ning lisaks prefiksi "
 "\"LNotes-Import\".</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "Kõik failid (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "Kirjade importimine: %1"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Kiri %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "OS X kirjakaustade import"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -214,7 +214,7 @@ msgstr ""
 "<p><b>OS X kirjade impordifilter</b></p><p>See filter impordib e-kirju Apple "
 "Mac OS X e-posti kliendilt.</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
@@ -222,11 +222,11 @@ msgstr ""
 "1 topeltkiri jäi KMaili kausta %1 importimata.\n"
 "%n topeltkirja jäi KMaili kausta %1 importimata"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Mbox failide import (UNIX, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -240,15 +240,15 @@ msgstr ""
 "p><p><b>Märkus:</b> kirjad imporditakse kaustadesse, mis saavad nime faili "
 "järgi, millest nad imporditi, ning lisaks prefiksi 'MBOX-'.</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "mbox failid (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Outlook Expressi kirjade import"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -265,44 +265,44 @@ msgstr ""
 "p><p><b>Märkus:</b> kaustastruktuuri taasloomise huvides salvestatakse "
 "Outlook Express 5 ja 6 kaustad kausta \"OE-Import\".</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "Kataloogist %1 ei leitud Outlook Expressi postkaste."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "Kaustastruktuuri import..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Outlook Expressi kirjade import lõpetatud"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Postkasti %1 avamine ebaõnnestus"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "OE4 postkasti %1 importimine"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "OE5+ postkasti %1 importimine"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "OE5+ kaustafaili %1 importimine"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Opera kirjade import"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -318,20 +318,20 @@ msgstr ""
 "mis saavad nime faili järgi, millest nad imporditi, ning lisaks prefiksi "
 "OPERA-.</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Failide loendamine..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Uute kirjafailide importimine..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Outlooki kirjade import"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -347,23 +347,23 @@ msgstr ""
 "kaustadesse, mis saavad nime faili järgi, millest nad imporditi, ning lisaks "
 "prefiksi OUTLOOK-.</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "Kirjade loendamine..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "Kataloogide loendamine..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "Kaustade loendamine..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Lihttekstikirjade importimine"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -374,11 +374,11 @@ msgstr ""
 "mis kataloogil, kust nad imporditi, ainult et prefiksiga 'PLAIN-'.</p><p>See "
 "filter impordib kõik .msg, .eml ja .txt kirjad.</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Pegasus-Maili kaustade import"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -391,7 +391,7 @@ msgstr ""
 "\\admin</p><p><b>Märkus:</b> kaustastruktuuri taasloomise huvides "
 "salvestatakse kaustad kausta \"PegasusMail-Import\".</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
@@ -399,32 +399,32 @@ msgstr ""
 "Kaustastruktuuri parsimine ebaõnnestus. Importi jätkatakse ilma alamkaustade "
 "toetuseta."
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Uute kirjade ('.cnm') importimine..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Kaustade importimine ('.pmm') ..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "'unix' kaustade importimine ('.mbx') ..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "%1 import"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "Kaustastruktuuri parsimine..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Sylpheedi kirjakaustade ja kaustastruktuuri import"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -437,11 +437,11 @@ msgstr ""
 "\"Sylpheed-Import\".</p><p>Filter kannab üle ka kirjade oleku (näiteks uus "
 "või edastatud).</p>"
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "The Bat! kirjade ja kaustastruktuuri import"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -456,11 +456,11 @@ msgstr ""
 "p><p>Kaustastruktuuri taasloomise huvides salvestatakse kaustad kausta "
 "\"TheBat-Import\".</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "Thunderbirdi/Mozilla kohalike kirjade ja kaustastruktuuri import"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -476,7 +476,7 @@ msgstr ""
 "p><p>Kaustastruktuuri taasloomise huvides luuakse kaustad kausta "
 "\"Thunderbird-Import\".</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -484,15 +484,15 @@ msgstr ""
 "<b>Saatuslik viga:</b> KMaili käivitamine DCOP kommunikatsiooniks "
 "ebaõnnestus. Palun kontrolli, et <i>kmail</i> on ikka paigaldatud."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "KMaili kausta %1 loomine ebaõnnestus"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Kirja lisamine KMaili kausta %1 ebaõnnestus"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Kirja lisamisel KMaili kausta '%1' tekkis viga."
 
diff --git a/tde-i18n-eu/messages/tdepim/kmailcvt.po b/tde-i18n-eu/messages/tdepim/kmailcvt.po
index 69f0680699e..7f1a727e2d8 100644
--- a/tde-i18n-eu/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-eu/messages/tdepim/kmailcvt.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2007-01-07 20:15+0100\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>\n"
 "Language-Team: Basque <itzulpena@euskalgnu.org>\n"
@@ -37,11 +37,11 @@ msgstr ""
 "igaztanaga@gmail.com\n"
 "dooteo@euskalgnu.org"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Inportatu Evolution 1.x bertsioko posta eta karpeta-egitura"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -53,46 +53,46 @@ msgstr ""
 "local/).</p><p>Karpeten egitura berriro sor daitekeenez, karpetak "
 "\"Evolution-Import\"-en gordeko dira.</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "Ez da direktoriorik hautatu."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "Ez da inportatzeko fitxategirik aurkitu."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "%1(e)tik posta inportatzea burututa"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "Ezin da %1 ireki, sahiesten"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "%1(e)tik posta inportatzen..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
@@ -101,11 +101,11 @@ msgstr ""
 "Bikoiztutako mezu 1 ez da inportatu\n"
 "Bikoiztutako %n mezu ez dira inportatu"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Inportatu Evolution 2.x bertsiotik posta eta karpeta-egitura"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -121,34 +121,34 @@ msgstr ""
 "asko izango dituzu.</p><p>Karpeta-egitura berregin daitekeenez, karpetak "
 "\"Evolution-Import\"-en gordeko dira.</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "Inportazioa amaitu da, erabiltzaileak ezeztatuta."
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "Hasi %1 fitxategia inportatzen..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Inportatu KMail-en posta-direktorioak eta karpeta-egitura"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -166,22 +166,22 @@ msgstr ""
 "posta-karpetak inportatzen.</p><p>Karpeta-egitura berregin daitekeenez, "
 "karpetak \"KMail-Import\"-en gordeko dira.</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "Inportatu %1 karpeta..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "Ezin izan da %1 inportatu"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "Inportatu Lotus Notes postak"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -199,25 +199,25 @@ msgstr ""
 "mezuak datozen fitxategien izenak dituzte \"LNotes-Import\"direktoriopean "
 "gordeko dira, eta hauen izenak mezuak datozen fitxategienak izango dira.</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "Fitxategi guztiak (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "%1(e)tik postak inportatzen..."
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "%1 mezua"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "Inportatu OS X Mail-etik"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -225,7 +225,7 @@ msgstr ""
 "<p><b>OS X Mail-etik inportatzeko iragazkia</b></p><p>Iragazki honek Apple "
 "Mac OS X-en posta bezereko e-postak inportatzen ditu.</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
@@ -233,11 +233,11 @@ msgstr ""
 "Bikoiztutako mezu 1 ez da KMail-en %1 karpetara inportatu\n"
 "Bikoiztutako %n mezu ez da KMail-en %1 karpetara inportatu"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Inportatu mbox fitxategiak (UNIX, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -251,15 +251,15 @@ msgstr ""
 "p><p><b>Oharra:</b> postak dagokien fitxategiaren izen bera duten, \"MBOX-\" "
 "aurrizkidun karpetetara inportatuko dira.</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "mbox fitxategiak (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Inportatu Outlook Express postak"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -277,44 +277,44 @@ msgstr ""
 "Express 5 eta 6-ko karpetak zure karpeta lokaleko \"OE-Import\"-en sortuko "
 "dira.</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "Ez da Outlook Express postontzirik aurkitu %1 direktorioan"
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "Inportatu karpeta-egitura..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Outlook Express posta inportatzea burututa"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Ezin da %1 postontzia ireki"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "OE4 %1 postontzia inportatzen"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "OE5+ %1 postontzia inportatzen"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "OE5+ %1 karpeta fitxategia inportatzen"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Inportatu Opera-ko postak"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -329,20 +329,20 @@ msgstr ""
 "opera/mail/store/account*).</p><p><b>Oharra:</b> postak kontuaren izen bera "
 "duen \"OPERA-\" aurrizkidun karpeta batera inportatuko dira</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Fitxategiak zenbatzen..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Posta berriaren fitxategiak inportatzen..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Inportatu Outlook postak"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -359,23 +359,23 @@ msgstr ""
 "p><p><b>Oharra:</b> postak dagokien fitxategiaren izen bera duten, \"OUTLOOK-"
 "\" aurrizkidun karpetetara inportatuko dira.</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "Mezuak zenbatzen..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "Direktorioak zenbatzen..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "Karpetak zenbatzen..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Inportatu testu arrunteko postak"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -386,11 +386,11 @@ msgstr ""
 "berbera duen, \"PLAIN-\" aurrizkidun karpeta batean jarriko dira.</"
 "p><p>Iragazki honek .msg, .eml and .txt mezuak inportatuko ditu.</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Inportatu karpetak 'Pegasus-Mail'etik"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -403,7 +403,7 @@ msgstr ""
 "direktorioetan egon ohi dira</p><p><b>Oharra:</b> karpeta-egitura berregin "
 "daitekenez karpetak \"PegasusMail-Import\"-en gordeko dira.</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
@@ -411,32 +411,32 @@ msgstr ""
 "Ezin da karpeta-egitura prozesatu, inportazioak azpi-karpeten euskarririk "
 "gabe jarraituko du."
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Posta-fitxategi berriak ('.cnm') inportatzen..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Posta-karpetak ('.pnm') inportatzen..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "'UNIX' posta-karpetak ('.mbx') inportatzen..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "%1 inportatzen"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "Karpeta-egitura prozesatzen..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Inportatu Sylpheed-en posta-direktorioak eta karpeta-egitura"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -450,11 +450,11 @@ msgstr ""
 "p> <p>Iragazki honek mezuaren egoera berregiten du, adibidez, berria edo "
 "birbidalia."
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Inportatu The Bat! postak eta karpeta-egitura"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -470,11 +470,11 @@ msgstr ""
 "p><p>Karpeta-egitura berregin daitekeenez, karpetak zure kontu lokaleko "
 "\"TheBat-Import\" gordeko dira.</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "Inportatu Thunderbird/Mozilla-ren posta lokala eta karpeta egitura"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -491,7 +491,7 @@ msgstr ""
 "berriro sortu daitekeenez karpetak \"Thunderbird-Import\"-en barruan gordeko "
 "dira.</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -499,15 +499,15 @@ msgstr ""
 "<b>Larria:</b> ezin da KMail-ekin DCOP komunikazioa abiatu. Ziurtatu "
 "<i>KMail</i> instalatuta dagoela."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "Ezin da %1 karpeta KMail-en sortu"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Ezin da mezua KMail-eko %1 karpetan gehitu"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Errorea KMail-eko %1 karpetan mezua gehitzean"
 
diff --git a/tde-i18n-fa/messages/tdepim/kmailcvt.po b/tde-i18n-fa/messages/tdepim/kmailcvt.po
index 867e0d49cda..972f37329d2 100644
--- a/tde-i18n-fa/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-fa/messages/tdepim/kmailcvt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2007-01-01 09:06+0330\n"
 "Last-Translator: Nasim Daniarzadeh <daniarzadeh@itland.ir>\n"
 "Language-Team: Persian <kde-i18n-fa@kde.org>\n"
@@ -29,11 +29,11 @@ msgid ""
 "Your emails"
 msgstr "razavi@itland.ir"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "واردات نامه‌های محلی اوولوشن ۱.x و ساختار پوشه"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -44,57 +44,57 @@ msgstr ""
 "اوولوشن )معمولاً ~/evolution/local(. </p><p>از زمانی که ایجاد مجدد ساختار "
 "پوشه ممکن است، پوشه‌ها تحت: »اوولوشن-واردات« ذخیره می‌شوند.</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "فهرست راهنمایی برگزیده نشد."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "برای واردات، پرونده‌ای یافت نشد."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "واردات تمام‌شده رایانامه‌ها از %1"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "قادر به باز کردن %1 نیست، در حال پرش"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "در حال واردات رایانامه‌ها از %1..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
 "%n duplicate messages not imported"
 msgstr "%n پیام دو نسخه‌ای وارد نشد"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "واردات نامه‌های محلی اوولوشن ۲.x و ساختار پوشه"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -110,34 +110,34 @@ msgstr ""
 "می‌کنید.</p><p>هنگامی که ایجاد مجدد ساختار پوشه ممکن شد، پوشه تحت: »اوولوشن-"
 "واردات« ذخیره می‌شود.</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "واردات تمام شد، توسط کاربر لغو گردید."
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "آغاز واردات پروندۀ %1..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "واردات فهرستهای راهنمای KMail و ساختار پوشه"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -155,22 +155,22 @@ msgstr ""
 "p><p>هنگامی که ایجاد مجدد ساختار پوشه ممکن باشد، پوشه‌ها تحت: »KMail-"
 "واردات«به پوشۀ محلی شما ذخیره می‌شوند.</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "واردات پوشۀ %1..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "%1 را نتوانست وارد کند"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "واردات  رایانامه‌های لوتوس نوتز"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -188,25 +188,25 @@ msgstr ""
 "پیامهای واردشده تحت: »واردات LNotes« در پوشۀ محلی شما، که با استفاده از "
 "نامهای پرونده‌هایی که پیامها از آنجا می‌آیند، ذخیره می‌شوند.</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "همۀ پرونده‌ها )*("
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "واردات رایانامه‌ها از %1"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "پیام %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "واردات از نامۀ سیستم عامل X"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -214,17 +214,17 @@ msgstr ""
 "<p><b>پالایۀ واردات نامۀ سیستم عامل X</b></p><p>این پالایه، رایانامه‌ها را از "
 "کارخواه‌نامه به برنامک سیستم عامل مکینتاش X  وارد می‌کند.</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "%n پیام دو نسخه‌ای به پوشۀ %1 در KMail وارد نشد"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "واردات پرونده‌های mbox )یونیکس، اوولوشن("
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -238,15 +238,15 @@ msgstr ""
 "</p><p><b>نکته:</b> رایانامه‌ها به پوشه‌هایی وارد می‌شوند که پس از پرونده‌هایی "
 "که از آنجا می‌آیند نام‌دار شده و پیشوند MBOX- دارند.</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "پرونده‌های mbox )*("
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "واردات رایانامه‌های اوت‌لوک اکسپرس"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -263,44 +263,44 @@ msgstr ""
 "که ایجاد مجدد ساختار پوشه ممکن شد، پوشه‌های اوت‌لوک اکسپرس ۵ و ۶ تحت: »واردات "
 "OE« در پوشۀ محلی شما ذخیره می‌شوند.</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "در فهرست راهنمای %1، نامه‌دانهای اوت‌لوک اکسپرس یافت نشد."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "واردات ساختار پوشه..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "واردات رایانامه‌های اوت‌لوک اکسپرس تمام شد"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "قادر به باز کردن نامه‌دان %1 نیست"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "واردات نامه‌دان  %1اوت‌لوک اکسپرس ۴"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "واردات اوت‌لوک اکسپرس ۵+ نامه‌دان %1"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "واردات اوت‌لوک اکسپرس ۵+ پرونده پوشۀ %1"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "واردات رایانامه‌های اُپرا"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -316,20 +316,20 @@ msgstr ""
 "رایانامه‌ها به پوشه‌ای وارد می‌شوند که پس از حسابی که از آن می‌آیند نامیده شده و "
 "پیشوند OPERA- به آنها اضافه می‌شود.</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "در حال شمارش پرونده‌ها..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "واردات پروندۀ نامه‌های جدید..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "واردات رایانامه‌های اوت‌لوک‌"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -345,23 +345,23 @@ msgstr ""
 "از حسابی که از آن می‌آیند و نام‌دار شده و پیشوند OUTLOOK- دارند، وارد می‌شوند.</"
 "p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "در حال شمارش نامه..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "در حال شمارش فهرستهای راهنما..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "در حال شمارش پوشه‌ها..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "واردات رایانامه‌های متن ساده"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -373,11 +373,11 @@ msgstr ""
 "پیشوند PLAIN- قرار می‌گیرند.</p><p>این پالایه همۀ رایانامه‌های .msg، .eml و ."
 "txt  را وارد می‌کند.</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "واردات پوشه‌ها از Pegasus-Mail"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -390,38 +390,38 @@ msgstr ""
 "\\pmail\\mail\\admin ذخیره می‌شود.</p><p><b>نکته:</b> از زمانی که ایجاد مجدد "
 "ساختار پوشه ممکن باشد، پوشه‌ها تحت: »PegasusMail-واردات« ذخیره می‌شوند.</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
 msgstr "ساختار پوشه را نمی‌توان تجزیه کرد؛ ادامۀ واردات بدون پشتیبانی زیرپوشه."
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "واردات پروندۀ نامه‌های جدید )».cnm«(..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "واردات پوشۀ نامه‌ها )».pmm«(..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "واردات پوشۀ نامه‌ها »یونیکس« )».mbx«(..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "واردات %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "در حال تجزیۀ ساختار پوشه..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "واردات فهرستهای راهنمای نامۀ Sylpheed و ساختار پوشه"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -435,11 +435,11 @@ msgstr ""
 "شما ذخیره می‌شوند.</p><p>همچنین، این پالایه وضعیت پیام، مثلاً جدید یا "
 "forwarded را مجدداً ایجاد می‌کند."
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "واردات نامه‌های Bat! و ساختار پوشه"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -455,11 +455,11 @@ msgstr ""
 "ساختار پوشه ممکن شد، پوشه‌ها تحت: »TheBat-واردات« در حساب محلی شما ذخیره "
 "می‌شوند.</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "واردات نامه‌های محلی تاندربرد/موزیلا و ساختار پوشه"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -475,7 +475,7 @@ msgstr ""
 "می‌کنید.</p><p>هنگامی که ایجاد مجدد ساختار پوشه ممکن شد، پوشه‌ها تحت: "
 "»تاندربرد-واردات« ذخیره می‌شوند.</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -483,15 +483,15 @@ msgstr ""
 "<b>مهلک:</b> قادر به آغاز  KMail برای ارتباط DCOP نیست. از نصب <i>kmail</i> "
 "مطمئن شوید."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "پوشۀ %1 را نمی‌توان در KMail ساخت"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "به پوشۀ %1 در KMail نمی‌توان پیام اضافه کرد"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "خطا هنگام افزودن پیام به پوشۀ %1 در KMail"
 
diff --git a/tde-i18n-fi/messages/tdepim/kmailcvt.po b/tde-i18n-fi/messages/tdepim/kmailcvt.po
index 48457c7a1f3..6cb91a8606e 100644
--- a/tde-i18n-fi/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-fi/messages/tdepim/kmailcvt.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2006-09-15 00:59+0300\n"
 "Last-Translator: Ilpo Kantonen <ilpo@iki.fi>\n"
 "Language-Team: finnish <fi@li.org>\n"
@@ -33,11 +33,11 @@ msgid ""
 "Your emails"
 msgstr "teemu.rytilahti@kde-fi.org,kim.enkovaara@iki.fi,ikola@iki.fi"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Tuo Evolution 1.x paikalliset sähköpostit ja kansiorakenne."
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -49,46 +49,46 @@ msgstr ""
 "uudelleenluominen on mahdollista, kansiot säilytetään kohteessa \"Evolution-"
 "Import\".</p> "
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "Kansioita ei ole valittuna."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "Tuotavia tiedostoja ei löytynyt."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "Sähköpostien tuonti kohteesta %1 valmistui"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "Ei voitu avata tiedostoa %1, ohitetaan tiedosto"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "Tuodaan sähköposteja kohteesta %1..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
@@ -97,11 +97,11 @@ msgstr ""
 "Yhtä kaksoiskappaleviestiä ei tuotu kansioon\n"
 "%n kaksoiskappaleviestiä ei tuotu kansioon"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Tuo Evolution 2.x paikalliset sähköpostit ja kansiorakenne"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -117,34 +117,34 @@ msgstr ""
 "uudelleenluominen on mahdollista, kansiot säilytetään kohteessa \"Evolution-"
 "Import\".</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "Tuonti valmistui, käyttäjä keskeytti tuonnin."
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "Aloita tiedoston %1 vienti..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Tuo KMailin sähköpostikansiot ja kansiorakenne"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -162,22 +162,22 @@ msgstr ""
 "uudelleenluominen on mahdollista, kansiot säilytetään paikallisen kansion "
 "kohteessa \"KMail-Import\".</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "Tuo kansio %1..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "Ei voitu tuoda %1"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "Tuo sähköposteja Lotus Notesista"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -195,25 +195,25 @@ msgstr ""
 "will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
 "named using the names of the files the messages came from.</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "Kaikki tiedostot (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "Tuodaan sähköposteja kohteesta %1..."
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Viesti %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "Tuo kansioita OS X Mailista"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -221,7 +221,7 @@ msgstr ""
 "<p><b>OS X Mail -tuontisuodin</b></p><p>Tämä suodin tuo Apple Mac OS X "
 "sähköpostiohjelman kansioita.</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
@@ -229,11 +229,11 @@ msgstr ""
 "Yhtä kaksoiskappaleviestiä ei tuotu kansioon %1 Kmailissa\n"
 "%n kaksoiskappaleviestiä ei tuotu kansioon %1 Kmailissa"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Tuo mbox-tiedostoja (Unix, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -247,15 +247,15 @@ msgstr ""
 "b> Sähköpostit tuodaan kansioon, jonka nimi muodostuu tilin nimestä ja "
 "\"MBOX-\"-etuliitteestä.</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "Mbox-tiedostot (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Tuo sähköposteja Outlook Expressistä"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -273,44 +273,44 @@ msgstr ""
 "on mahdollista, Outlook Express 5:n ja 6:n kansiot säilytetään paikallisen "
 "kansion kohteessa \"OE-Import\".</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "Outlook Express -postilaatikoita ei löytynyt kansiosta %1."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "Tuodaan kansiorakennetta..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Outlook Expressin sähköpostien tuonti on valmis"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Ei voitu avata postilaatikkoa %1"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "Tuodaan OE4-postilaatikkoa %1"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "Tuodaan OE5+-postilaatikkoa %1"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "Tuodaan OE5+-kansion tiedostoa %1"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Tuo sähköposteja Operasta"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -326,20 +326,20 @@ msgstr ""
 "tuodaan kansioon, jonka nimi muodostuu tilin nimestä ja \"OPERA-\"-"
 "etuliitteestä.</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Lasketaan tiedostoja..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Tuodaan uusia posteja..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Tuo sähköposteja Outlookista"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -354,23 +354,23 @@ msgstr ""
 "uudemmassa.</p><p><b>Huom:</b>Sähköpostit tuodaan kansioon, jonka nimi "
 "muodostuu tilin nimestä ja \"OUTLOOK-\"-etuliitteestä.</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "Lasketaan posteja..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "Lasketaan kansioita..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "Lasketaan kansioita..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Tuo puhdastekstisiä sähköposteja"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -381,11 +381,11 @@ msgstr ""
 "sijoitettu kansioon samalla nimellä kuin kansio, jossa ne ovat prefiksoituna "
 "PLAIN-</p><p>Tämä suodin tuo kaikki .msg, .eml ja .txt sähköpostit.</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Tuo kansioita Pegasus Mailista"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -398,7 +398,7 @@ msgstr ""
 "\\mail\\admin</p> <p><b>Huom:</b> Koska kansiorakenteen uudelleenluominen on "
 "mahdollista, kansiot säilytetään kohteessa \"PegasusMail-Import\".</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
@@ -406,32 +406,32 @@ msgstr ""
 "Kansiorakennetta ei voida jäsentää, jatketaan tuomista ilman alikansioiden "
 "tukea"
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Tuodaan uusia posteja ('.cnm')..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Tuodaan postikansioita ('.pmm')..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "Tuodaan Unix-postikansioita (\".mbx\")..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "Tuodaan %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "Jäsennetään kansiorakennetta..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Tuo Sylpheedin sähköpostihakemistot ja kansiorakenteet"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -445,11 +445,11 @@ msgstr ""
 "kohteessa \"Sylpheed-Import\" kotikansioissasi.</p> <p>Tämä suodin luo myös "
 "viestin tilan uudelleen, esim. uusi tai vastattu."
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Tuo The Bat! -sähköpostit ja kansiorakenne"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -465,11 +465,11 @@ msgstr ""
 "uudelleenluominen on mahdollista, kansiot säilytetään kohteessa\"TheBat-"
 "Import\" omalla tililläsi.</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "Tuo Thunderbirdin/Mozillan paikalliset sähköpostit ja kansiorakenne"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -485,7 +485,7 @@ msgstr ""
 "p><p>Koska kansiorakenteen uudelleenluominen on mahdollista, kansioita "
 "asäilytetään kohteessa: \"Thunderbird-Import\".</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -493,15 +493,15 @@ msgstr ""
 "<b>Kohtalokas virhe</b> Ei voitu käynnistää KMailia DCOP-viestintää varten.\n"
 "Varmista, että <i>KMail</i> on asennettuna."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "Ei voida tehdä kansiota %1 KMailissa"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Ei voida lisätä viestejä kansioon %1 KMailissa"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Virhe lisättäessä viestiä kansioon %1 KMailissa"
 
diff --git a/tde-i18n-fr/messages/tdepim/kmailcvt.po b/tde-i18n-fr/messages/tdepim/kmailcvt.po
index e5bfc4bdc06..6076165dffe 100644
--- a/tde-i18n-fr/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-fr/messages/tdepim/kmailcvt.po
@@ -16,7 +16,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2008-08-12 16:17+0200\n"
 "Last-Translator: Pierre Buard <pierre.buard@gmail.com>\n"
 "Language-Team: Français <kde-francophone@kde.org>\n"
@@ -40,11 +40,11 @@ msgstr ""
 "caulier.gilles@free.fr,gerard@delafond.org,2df@tuxfamily.org,nicolas."
 "ternisien@gmail.com"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Importer les messages et la structure des dossiers d'Evolution 1.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -56,46 +56,46 @@ msgstr ""
 "p><p>La structure des dossiers est en mesure d'être recréée, et sera "
 "contenue dans « Evolution-Import ».</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "Aucun dossier sélectionné."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "Aucun fichier trouvé pour l'importation."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "Importation des courriers électroniques de « %1 » terminée"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "Impossible d'ouvrir « %1 ». Il sera ignoré."
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "Importation des courriers électroniques de « %1 »..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
@@ -104,11 +104,11 @@ msgstr ""
 "%n message en double non importé\n"
 "%n messages en double non importés"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Importer les messages et la structure des dossiers d'Evolution 2.x"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -125,34 +125,34 @@ msgstr ""
 "nombreux nouveaux dossiers.</p><p>La structure des dossiers est en mesure "
 "d'être recréée, et sera contenue dans le dossier « Evolution-Import ».</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "Importation terminée, annulation par l'utilisateur."
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "Démarrer l'importation du fichier « %1 »..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Importer les messages et la structure des dossiers de KMail"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -170,22 +170,22 @@ msgstr ""
 "d'être recréée, et sera contenue dans « KMail-Import » de votre dossier "
 "local.</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "Importation du dossier « %1 »..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "Impossible d'importer %1"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "Importer les courriers électroniques de Lotus Notes"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -204,25 +204,25 @@ msgstr ""
 "Import » de votre compte local. Les messages seront nommés selon les "
 "fichiers dont ils proviennent.</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "Tous les fichiers (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "Importation des courriers électroniques de « %1 »"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Message %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "Importer du courriel OS X"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -230,7 +230,7 @@ msgstr ""
 "<p><b>Filtre d'importation du courrier OS X</b></p> <p>Ce filtre importe les "
 "courriers électroniques du client mail du Mac OS X d'Apple.</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
@@ -238,11 +238,11 @@ msgstr ""
 "1 message en double non importé vers le dossier « %1 » de KMail\n"
 "%n messages en double non importés vers le dossier « %1 » de KMail"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Importer des fichiers « mbox » (Unix, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -258,15 +258,15 @@ msgstr ""
 "courriers électroniques seront importés dans des dossiers nommés selon leur "
 "fichier de provenance, mais précédés du préfixe « MBOX- »</p>."
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "Fichiers mbox (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Importer des courriers électroniques de Outlook Express"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -284,46 +284,46 @@ msgstr ""
 "structure des dossiers est en mesure d'être recréée pour Outlook Express 5 "
 "et 6, et sera contenue dans « OE-Import » de votre dossier local.</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr ""
 "Aucune boîte aux lettres Outlook Express n'a été trouvée dans le dossier "
 "« %1 »."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "Importer la structure des dossiers..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Importation des courriers électroniques d'Outlook Express terminée"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Impossible d'ouvrir la boîte aux lettres « %1 »"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "Importation des boîtes aux lettres Outlook Express 4 « %1 »"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "Importation des boîtes aux lettres Outlook Express 5+ « %1 »"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "Importation du fichier de dossiers Outlook Express 5+ « %1 »"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Importer les courriers électroniques d'Opera"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -340,20 +340,20 @@ msgstr ""
 "importés dans un dossier du nom du compte de provenance, mais précédé du "
 "préfixe « OPERA- ».</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Décompte des fichiers..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Importation des fichiers au format « new mail »..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Importer les courriers électroniques d'Outlook Express"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -369,23 +369,23 @@ msgstr ""
 "supérieur.</p><p><b>Remarque :</b> les courriels seront importés dans des "
 "dossiers du même nom, mais néanmoins préfixés par « OUTLOOK- »</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "Décompte du courrier électronique..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "Décompte des répertoires..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "Décompte des dossiers..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Importation des courriers électroniques au format texte"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -397,11 +397,11 @@ msgstr ""
 "le préfixe « PLAIN- »</p><p>Ce filtre importera tous les fichiers avec les "
 "extensions « .msg », « .eml » et « .txt ».</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Importation des dossiers de Pegasus-Mail"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -415,7 +415,7 @@ msgstr ""
 "\\mail\\admin »</p><p><b>Remarque : </b>La structure des dossiers est en "
 "mesure d'être recréée, et sera contenue dans « PegasusMail-Import ».</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
@@ -423,33 +423,33 @@ msgstr ""
 "Impossible d'analyser la structure des dossiers, poursuite de l'importation "
 "en ignorant les sous-dossiers."
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Importation des nouveaux fichiers de courriels au format « .cnm »..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Importation des dossiers de courriels au format « .pmm » en cours..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr ""
 "Importer des dossiers de courriers au format UNIX (« .mbx ») en cours..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "Importation de « %1 »"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "Analyse de la structure des dossiers..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Importer les messages et la structure des dossiers de Sylpheed"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -463,11 +463,11 @@ msgstr ""
 "contenue dans « Sylpheed-Import » dans votre dossier local.</p> <p>Ce filtre "
 "recrée également l'état des messages, par exemple nouveau ou transmis."
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Importer les messages et la structure des dossiers de The Bat!"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -483,12 +483,12 @@ msgstr ""
 "inclus.</p><p>La structure des dossiers est en mesure d'être recréée, et "
 "sera contenue dans « TheBat-Import » de votre compte local.</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr ""
 "Importer les messages et la structure des dossiers de Thunderbird / Mozilla"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -506,7 +506,7 @@ msgstr ""
 "dossiers est en mesure d'être recréée, et sera contenue dans « Thunderbird-"
 "Import ».</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -514,15 +514,15 @@ msgstr ""
 "<b>Erreur fatale :</b> impossible de démarrer KMail pour la communication "
 "DCOP. Assurez-vous que le programme « KMail » est installé."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "Impossible de créer le dossier « %1 » dans KMail"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Impossible d'ajouter le message au dossier « %1 » dans KMail"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Problème en ajoutant le message au dossier « %1 » dans KMail"
 
diff --git a/tde-i18n-fy/messages/tdepim/kmailcvt.po b/tde-i18n-fy/messages/tdepim/kmailcvt.po
index 13052a3be1a..77a41094186 100644
--- a/tde-i18n-fy/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-fy/messages/tdepim/kmailcvt.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2007-03-16 19:45+0100\n"
 "Last-Translator: Rinse de Vries <rinsedevries@home.nl>\n"
 "Language-Team:  <nl@li.org>\n"
@@ -34,11 +34,11 @@ msgid ""
 "Your emails"
 msgstr ","
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Berjochten en mappestruktuer fan Evolution 1.x ymportearje"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -50,46 +50,46 @@ msgstr ""
 "it mooglik is om in nije mappestruktuer oan te meitsjen wurde alle mappen "
 "ûnder \"Evolution-Import\" setten.</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "Gjin map selektearre."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "Gjin triemmen fûn om te ymportearjen."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "Ymport fan e-mailberjochten út %1 is klear"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "%1 kin net iepene wurde en wurdt dêrom oerslein"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "E-mailberjochten fan %1 wurde ymportearre..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
@@ -98,12 +98,12 @@ msgstr ""
 "1 dûbel berjocht net ymportearre\n"
 "%n dûbele berjochten net ymportearre"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Berjochten en mappestruktuer fan Evolution 2.x ymportearje"
 
 # Import feroare yn Ymport, mar der steane wol " "" omhinne..
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -119,23 +119,23 @@ msgstr ""
 "</p> <p>Omdat de mappestruktuer opnij oanmakke wurde kin, sille de mappen "
 "opslein wurde ûnder: \"Evolution-Import\".</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "Ymportearjen is klear, annulearre troch brûker."
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "Begûn mei triem%1 te ymportearjen..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
@@ -143,11 +143,11 @@ msgid ""
 msgstr ""
 
 # maildir=?
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Maildirs en mappestruktuer fan KMail ymportearje"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -165,22 +165,22 @@ msgstr ""
 "mappestruktuer opnij oanmakke wurde kin, sille de mappen opslein wurde yn jo "
 "lokale map ûnder: \"KMail-Import\".</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "Map %1 ymportearje..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "Koe %1 net ymportearje"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "E-mailberjochten fan Lotus Notes ymportearje"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -198,25 +198,25 @@ msgstr ""
 "is om de mappestruktuer opnij oan te meitsjen sille de ymportearre "
 "berjochten yn submappen setten wurde ûnder: \"LNotes-Import\".</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "Alle triemmen (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "E-mailberjochten fan %1 wurde ymportearre"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Berjocht %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "Fan OS X Mail ymportearje"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -224,7 +224,7 @@ msgstr ""
 "<p><b>Ymportfilter foar OS X Mail</b></p><p> Dit filter ymportearret e-"
 "mailberjochten fan it e-mailprogramma fan Apple Mac OS X.</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
@@ -232,11 +232,11 @@ msgstr ""
 "1 dûbel berjocht waard net ymportearre yn de map %1 fan KMail.\n"
 "%n dûbele berjochten waarden net ymportearre yn de map %1 fan KMail."
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "mbox-triemmen ymportearje (UNIX, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -251,15 +251,15 @@ msgstr ""
 "wurde nei mappen dy't neamd wurde nei de triem dêr't de berjochten úthelle "
 "wurde, mei as foarheaksel MBOX-.</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "mbox Triemmen (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Berjochten fan Outlook Express ymportearje"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -277,45 +277,45 @@ msgstr ""
 "meitsjen, sille de mappen fan Outlook Express 5 en 6 setten wurde ûnder \"OE-"
 "Import\" yn jo lokale map.</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "Der binne gjin postbustriemmen fan Outlook Express fûn yn de map %1."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "Mappestruktuer ymportearje..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "De ymport fan Outlook Expres-berjochten is klear."
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Postbus %1 koe net iepene wurde."
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "OE4-postbus %1 wurdt ymportearre"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "OE5-postfak %1 wurdt ymportearre"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "OE5 wurdt ymportearre mei  maptriem %1"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Berjochten fan Opera ymportearje"
 
 # account=?
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -332,20 +332,20 @@ msgstr ""
 "setten mei in namme oan de hân fan it account dêr't se by hearre, foarôfgien "
 "troch OPERA-</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Triemmen wurde teld..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Nije e-mailtriemmen wurde ymportearre..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Bejochten fan Outlook ymportearje"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -360,23 +360,23 @@ msgstr ""
 "<p><b>Opmerking:</b> E-mailberjochten wurde yn in map dien dy't nei it "
 "account ferneamd wurdt, foarôfgien mei OUTLOOK-.</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "Berjochten wurde teld..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "Mappen wurde teld..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "Mappen wurde teld..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "E-mailberjochten yn platte-tekst ymportearje"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -388,11 +388,11 @@ msgstr ""
 "dêr't se útkomme, mei as foarheaksel PLAIN-</p> <p>Dit filter ymportearret "
 "alle .msg .eml en .txt-e-mailberjochten.</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Mappen fan Pegasus Mail ymportearje"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -406,7 +406,7 @@ msgstr ""
 "oanmakke wurde kin, sille de mappen ûnderbrocht wurde yn: \"PegasusMail-"
 "Import\".</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
@@ -414,32 +414,32 @@ msgstr ""
 "Koe de mappestruktuer net ûntlede, de ymport wurdt fuortset sûnder stypjen "
 "foar submappen."
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Nije e-mailbestannen wurde ymportearre ('.cnm') ..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "E-mailmappen wurde ymportearre ( '.pmm') ..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "UNIX e-mailmappen wurden ymportearre ('.mbx') ..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "Dwaande mei it ymportearjen fan %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "De mappestruktuer wurdt ûntlede..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Berjochten en mappestruktuer fan Sylpheed ymportearje"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -453,12 +453,12 @@ msgstr ""
 "\"Sylpheed-Import\" in jo lokale map.</p> <p>Dizze map makket ek in nije "
 "status oan foar berjochten, bygelyks 'nij' of 'trochstjoerd'."
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Berjochten en mappestruktuer fan The Bat! ymportearje"
 
 # is der in Frysk alternatyf foar account?
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -475,11 +475,11 @@ msgstr ""
 "mappestruktuer oan te meitsjen wurde de mappen yn de map \"TheBat-Ymport\" "
 "yn jo lokale akkount setten.</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "Berjochten en mappestruktuer fan Thunderbird/Mozilla ymportearje"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -495,7 +495,7 @@ msgstr ""
 "krije jo in soad nije mappen.</p> <p>It is mooglik om in nije mappestruktuer "
 "oan te meitsjen, de mappen sille yn \"Thunderbird-Import\" setten wurde.</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -503,15 +503,15 @@ msgstr ""
 "<b>Fataal:</b> Kmail kin net opstarten wurde foar DCOP-kommunikaasje. "
 "Kontrolearje oft <i>kmail</i>ynstallearre is."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "Map %1 kin net yn KMail oanmakke wurde"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "It berjocht kin net oan de map %1 yn KMail tafoege wurde"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Fout by it tafoegjen fan berjocht oan de map %1 yn KMail"
 
diff --git a/tde-i18n-ga/messages/tdepim/kmailcvt.po b/tde-i18n-ga/messages/tdepim/kmailcvt.po
index feb5dedea2e..a29b20f7474 100644
--- a/tde-i18n-ga/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-ga/messages/tdepim/kmailcvt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdepim/kmailcvt.po\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2004-12-03 14:52-0500\n"
 "Last-Translator: Kevin Patrick Scannell <scannell@SLU.EDU>\n"
 "Language-Team: ga <LL@li.org>\n"
@@ -22,11 +22,11 @@ msgid ""
 "Your emails"
 msgstr "seoc at iolfree dot ie,scannell at slu dot edu"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -34,57 +34,57 @@ msgid ""
 "Import\".</p>"
 msgstr ""
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr ""
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr ""
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr ""
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr ""
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "Ríomhphost á iompórtáil ó %1..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
 "%n duplicate messages not imported"
 msgstr ""
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -94,34 +94,34 @@ msgid ""
 "be stored under: \"Evolution-Import\".</p>"
 msgstr ""
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr ""
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr ""
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -132,22 +132,22 @@ msgid ""
 "\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr ""
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "Ní féidir %1 a iompórtáil"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "Iompórtáil Ríomhphost ó Lotus Notes"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -158,41 +158,41 @@ msgid ""
 "named using the names of the files the messages came from.</p>"
 msgstr ""
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "Gach Comhad (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "Ríomhphost á iompórtáil ó %1"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Teachtaireacht %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "Iompórtáil Ó Phost OS X"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
 msgstr ""
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr ""
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Iompórtáil Comhaid mbox (UNIX, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -201,15 +201,15 @@ msgid ""
 "prefixed with MBOX-</p>"
 msgstr ""
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "Comhaid mbox (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Iompórtáil Ríomhphost ó Outlook Express"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -220,44 +220,44 @@ msgid ""
 "your local folder.</p>"
 msgstr ""
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr ""
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr ""
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr ""
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Ní féidir an bosca poist %1 a oscailt"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "Bosca Poist OE4 %1 á iompórtáil"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "Bosca poist OE5+ %1 á iompórtáil"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "Comhad fillteáin OE5+ %1 á iompórtáil"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Iompórtáil Ríomhphost ó Opera"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -267,20 +267,20 @@ msgid ""
 "OPERA-</p>"
 msgstr ""
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr ""
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Comhaid nua ríomhphoist á n-iompórtáil..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Iompórtáil Ríomhphost ó Outlook"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -290,23 +290,23 @@ msgid ""
 "OUTLOOK-</p>"
 msgstr ""
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr ""
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr ""
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr ""
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Iompórtáil Ríomhphost Gnáth-Théacs"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -314,11 +314,11 @@ msgid ""
 "emails.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Iompórtáil Fillteáin ó Pegasus-Mail"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -327,38 +327,38 @@ msgid ""
 "p>"
 msgstr ""
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
 msgstr ""
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Comhaid nua poist á n-iompórtáil ('.cnm')..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Fillteáin phoist á n-iompórtáil ('.pmm')..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "Fillteáin phoist 'UNIX' á n-iompórtáil ('.mbx')..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "%1 á iompórtáil"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "Struchtúr an fhillteáin á pharsáil..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -367,11 +367,11 @@ msgid ""
 "the status of message, e.g. new or forwarded."
 msgstr ""
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr ""
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -381,11 +381,11 @@ msgid ""
 "Import\" in your local account.</p>"
 msgstr ""
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -395,21 +395,21 @@ msgid ""
 "the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
 msgstr ""
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "Ní féidir an fillteán %1 a chruthú i KMail"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Ní féidir teachtaireacht a chur leis an fhillteán %1 i KMail"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr ""
 
diff --git a/tde-i18n-gl/messages/tdepim/kmailcvt.po b/tde-i18n-gl/messages/tdepim/kmailcvt.po
index a1820f95c81..87e3822ac01 100644
--- a/tde-i18n-gl/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-gl/messages/tdepim/kmailcvt.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2006-12-30 13:50+0100\n"
 "Last-Translator: Xabi G. Feal <xabigf@gmx.net>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -26,11 +26,11 @@ msgid ""
 "Your emails"
 msgstr "xabigf@gmx.net"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Importar correos-e e estructura de cartafoles de Evolution 1.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -42,46 +42,46 @@ msgstr ""
 "é posíbel recrear a estructura de cartafoles, os cartafoles gardaranse "
 "baixo: \"Evolution-Import\".</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "Non se seleccionou un directorio."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "Non se atoparon ficheiros para se importar."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "Rematou a importación de correos-e dende %1"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "Imposíbel abrir %1, omitindo"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "Importando correos-e dende %1..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
@@ -90,11 +90,11 @@ msgstr ""
 "1 mensaxe duplicada non importada\n"
 "%n mensaxe duplicadas non importadas"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Importar esctructura de cartafoles e correos dende Evolution 2.x"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -110,34 +110,34 @@ msgstr ""
 "cartafoles.</p> <p>Xa que é posíbel recrear a estructura de cartafoles, os "
 "cartafoles gravaranse baixo:  \"Evolution-Import\".</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "Rematou a importación, cancelada polo usuario"
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "Inicar a importación do ficheiro %1..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Importar estructura de cartafoles e maildirs de KMail"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -156,22 +156,22 @@ msgstr ""
 "cartafoles, os cartafoles gravaranse baixo: \"KMail-Import\" no seu cartafol "
 "local.</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "Importar cartafol %1..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "Non se puido importar %1"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "Importando correos-e de Lotus Notes"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -190,25 +190,25 @@ msgstr ""
 "\"LNotes-Import\", no seu cartafol persoal, nomeado usando os nomes dos "
 "ficheiros dos que proveñan as mensaxes.</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "Todos os ficheiros (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "Importando correos-e dende %1"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Mensaxe %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "Importar dende OS X Mail"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -216,7 +216,7 @@ msgstr ""
 "<p><b>Filtro de importación de OS X Mail</b></p><p>Este filtro importa os "
 "correos-e dende o cliente de correo de Apple MacOS X.</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
@@ -224,11 +224,11 @@ msgstr ""
 "1 mensaxe duplicada non importada ao cartafol %1 en KMail\n"
 "%n mensaxes duplicadas non importadas ao cartafol %1 en KMail"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Importar ficheiros mbox (UNIX, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -242,15 +242,15 @@ msgstr ""
 "tradicional de UNIX.</p> <p><b>Nota:</b> Os corrreos-e importaranse en "
 "cartafoles nomeados con MBOX- e mail ficheiro do que proveñan.</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "Ficheiros mbox (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Importar correos de Outlook Express"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -268,44 +268,44 @@ msgstr ""
 "cartafoles de Outlook Express 5 e 6 gravaranse baixo: \"OE-Import\" no seu "
 "cartafol local.</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "Non se atoparon bucións de correo Outlook Express no directorio %1."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "Importar esctructura de cartafoles..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Rematou a importación de correos-e de Outlook Express"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Imposíbel abrir o bución de correo %1"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "Importando bución de correo QE4 %1"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "Importando bución de correo de OE5 %1"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "Importando o ficheiro de cartafol OE5+ %1"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Importar correos-e de Opera"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -321,20 +321,20 @@ msgstr ""
 "</p> <p><b>Nota:</b> Os correos-e importaranse nun cartafol de nome OPERA- e "
 "mailo nome da conta da que proveñene.</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Contando ficheiros..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Importando novos ficheiros de correo..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Importar Correos-e de Outlook"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -350,23 +350,23 @@ msgstr ""
 "Os correos-e importaranse nun cartafol de nome a conta da que proveñan e "
 "precedido de OUTLOOK-</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "Contando o correo..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "Contando os directorios..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "Contando os cartafoles..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Importar Correos-e de Texto Plano"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -378,11 +378,11 @@ msgstr ""
 "de PLAIN-</p><p>Este filtro importará todos os correos-e .msg, .eml e .txt.</"
 "p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Importar cartafoles de Pegasus-Mail"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -396,7 +396,7 @@ msgstr ""
 "estructura de cartafoles, os cartafoles grávanse baixo: \"PegasusMail-Import"
 "\".</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
@@ -404,32 +404,32 @@ msgstr ""
 "Non se pode interpretar a estructura de cartafoles; cotinuar a importación "
 "sen o soporte de subcartafoles."
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Importando novos ficheiros de correo ('.cnm')..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Importando cartafoles de correo ('.pmm')..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "Importando cartafoles de correo UNIX ('.mbx')..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "Importando %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "Interpretando a estructura de cartafoles..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Importar estructura de cartafoles e maildirs de Sylpheed"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -443,11 +443,11 @@ msgstr ""
 "gardaranse baixo: \"Sylpheed-Import\" no seu cartafol local.</p><p>Este "
 "filtro tamén recrea o estado da mensaxe, e.g. nova ou reenviada."
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Importando a estructura de cartafoles e correos-e de The Bat!"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -463,12 +463,12 @@ msgstr ""
 "que é posíbel recrear a estructura de cartafoles, os cartafoles gardaranse "
 "baixo \"TheBat-Import\" na súa conta local.</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr ""
 "Importar correos locais e estructura de cartafoles de Thunderbird/Mozilla"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -485,7 +485,7 @@ msgstr ""
 "estructura de cartafoles, os cartafoles almacenaranse baixo: \"Thunderbird-"
 "Import\".</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -493,15 +493,15 @@ msgstr ""
 "<b>Fatal:</b> Imposíbel iniciar KMail para comunicación DCOP. Cerciórese de "
 "que <i>kmail</i> está instalado."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "Non se pode crear o cartafol %1 en KMail"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Non se pode engadir a mensaxe ao cartafol %1 en KMail"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Erro ao engadir a mensaxe ao cartafol %1 en KMail"
 
diff --git a/tde-i18n-he/messages/tdepim/kmailcvt.po b/tde-i18n-he/messages/tdepim/kmailcvt.po
index 360fee38eb5..817dcb2e9f7 100644
--- a/tde-i18n-he/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-he/messages/tdepim/kmailcvt.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2003-11-15 19:45+0200\n"
 "Last-Translator: Shlomi Loubaton <shlomil@hotmail.com>\n"
 "Language-Team: hebrew <en@li.org>\n"
@@ -35,11 +35,11 @@ msgid ""
 "Your emails"
 msgstr "kde-il@yahoogroups.com"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -47,60 +47,60 @@ msgid ""
 "Import\".</p>"
 msgstr ""
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 #, fuzzy
 msgid "No directory selected."
 msgstr "לא נבחרה אף ספריה"
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr ""
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr ""
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 #, fuzzy
 msgid "Unable to open %1, skipping"
 msgstr "אין אפשרות לפתוח את הקובץ \"%1\""
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 #, fuzzy
 msgid "Importing emails from %1..."
 msgstr "מייבא תיקיות דואר (\"pmm.\")..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, fuzzy, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
 "%n duplicate messages not imported"
 msgstr "שגיאה בהוספת הודעה לתיקיה %1 ב-KMail"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -110,34 +110,34 @@ msgid ""
 "be stored under: \"Evolution-Import\".</p>"
 msgstr ""
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr ""
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr ""
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -148,24 +148,24 @@ msgid ""
 "\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 #, fuzzy
 msgid "Import folder %1..."
 msgstr "מייבא תיקיות דואר (\"pmm.\")..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr ""
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 #, fuzzy
 msgid "Import Lotus Notes Emails"
 msgstr "ייבוא מ-Outlook Express 4"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -176,43 +176,43 @@ msgid ""
 "named using the names of the files the messages came from.</p>"
 msgstr ""
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr ""
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, fuzzy, c-format
 msgid "Importing emails from %1"
 msgstr "מייבא תיקיות דואר (\"pmm.\")..."
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr ""
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 #, fuzzy
 msgid "Import From OS X Mail"
 msgstr "ייבוא מ-Pegasus-Mail"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
 msgstr ""
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 #, fuzzy
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "שגיאה בהוספת הודעה לתיקיה %1 ב-KMail"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr ""
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -221,16 +221,16 @@ msgid ""
 "prefixed with MBOX-</p>"
 msgstr ""
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr ""
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 #, fuzzy
 msgid "Import Outlook Express Emails"
 msgstr "ייבוא מ-Outlook Express 4"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -241,47 +241,47 @@ msgid ""
 "your local folder.</p>"
 msgstr ""
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, fuzzy, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "מחפש תיקיות \"mbx.\" של Outlook Express 4 בספריה %1"
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 #, fuzzy
 msgid "Import folder structure..."
 msgstr "מייבא תיקיות דואר (\"pmm.\")..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 #, fuzzy
 msgid "Finished importing Outlook Express emails"
 msgstr "%1 איננה תיבת דואר של Outlook Express 5"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, fuzzy, c-format
 msgid "Unable to open mailbox %1"
 msgstr "אין אפשרות לפתוח את הקובץ \"%1\""
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr ""
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr ""
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, fuzzy, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "מייבא תיקיות דואר (\"pmm.\")..."
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 #, fuzzy
 msgid "Import Opera Emails"
 msgstr "ייבוא מ-Outlook Express 4"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -291,22 +291,22 @@ msgid ""
 "OPERA-</p>"
 msgstr ""
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "סופר קבצים..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 #, fuzzy
 msgid "Importing new mail files..."
 msgstr "מייבא קבצי דואר חדשים (\"txt.\")..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 #, fuzzy
 msgid "Import Outlook Emails"
 msgstr "ייבוא מ-Outlook Express 4"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -316,26 +316,26 @@ msgid ""
 "OUTLOOK-</p>"
 msgstr ""
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 #, fuzzy
 msgid "Counting mail..."
 msgstr "סופר קבצים..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 #, fuzzy
 msgid "Counting directories..."
 msgstr "סופר קבצים..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 #, fuzzy
 msgid "Counting folders..."
 msgstr "סופר קבצים..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "ייבא הודעות טקסט רגיל"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -343,12 +343,12 @@ msgid ""
 "emails.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 #, fuzzy
 msgid "Import Folders From Pegasus-Mail"
 msgstr "ייבוא מ-Pegasus-Mail"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -357,38 +357,38 @@ msgid ""
 "p>"
 msgstr ""
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
 msgstr ""
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "מייבא קבצי דואר חדשים (\"cnm.\")..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "מייבא תיקיות דואר (\"pmm.\")..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "מייבא תיקיות דואר \"יוניקס\" (\"mbx.\")..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr ""
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr ""
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -397,11 +397,11 @@ msgid ""
 "the status of message, e.g. new or forwarded."
 msgstr ""
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr ""
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -411,11 +411,11 @@ msgid ""
 "Import\" in your local account.</p>"
 msgstr ""
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -425,7 +425,7 @@ msgid ""
 "the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 #, fuzzy
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
@@ -434,15 +434,15 @@ msgstr ""
 "שגיאה: אין אפשרות להפעיל את KMail לצורך התקשרות DCOP.\n"
 "       ודא ש-\"kmail\" נמצא בנתיב שלך."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "אין אפשרות ליצור את התיקיה %1 ב-KMail"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "אין אפשרות להוסיף הודעה לתיקיה %1 ב-KMail"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "שגיאה בהוספת הודעה לתיקיה %1 ב-KMail"
 
diff --git a/tde-i18n-hi/messages/tdepim/kmailcvt.po b/tde-i18n-hi/messages/tdepim/kmailcvt.po
index a390257a1d2..41fe3f7d9b3 100644
--- a/tde-i18n-hi/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-hi/messages/tdepim/kmailcvt.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2004-08-24 10:24+0530\n"
 "Last-Translator: Ravishankar Shrivastava <raviratlami@yahoo.com>\n"
 "Language-Team: Hindi <indlinux-hindi@lists.sourceforge.net>\n"
@@ -25,11 +25,11 @@ msgid ""
 "Your emails"
 msgstr "raviratlami@yahoo.com , http://www.geocities.com/raviratlami/"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -37,57 +37,57 @@ msgid ""
 "Import\".</p>"
 msgstr ""
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "कोई डिरेक्ट्री चुना नहीं गया."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr ""
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "%1 से ई-मेल आयात करना सम्पन्न"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "%1 खोलने में अक्षम, छोड़ रहे"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "%1 से ई-मेल आयात किया जा रहा है..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, fuzzy, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
 "%n duplicate messages not imported"
 msgstr "फ़ोल्डर %1 में के-मेल में संदेश जोड़ने में त्रुटि"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -97,34 +97,34 @@ msgid ""
 "be stored under: \"Evolution-Import\".</p>"
 msgstr ""
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr ""
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr ""
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -135,24 +135,24 @@ msgid ""
 "\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 #, fuzzy
 msgid "Import folder %1..."
 msgstr "%1 से ई-मेल आयात किया जा रहा है..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr ""
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 #, fuzzy
 msgid "Import Lotus Notes Emails"
 msgstr "आउटलुक एक्सप्रेस ई-मेल आयात करें"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -163,44 +163,44 @@ msgid ""
 "named using the names of the files the messages came from.</p>"
 msgstr ""
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 #, fuzzy
 msgid "All Files (*)"
 msgstr "एम-बॉक्स फ़ाइलें (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, fuzzy, c-format
 msgid "Importing emails from %1"
 msgstr "%1 से ई-मेल आयात किया जा रहा है..."
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "संदेश %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 #, fuzzy
 msgid "Import From OS X Mail"
 msgstr "पीगासस-मेल से फ़ोल्डर आयात करें"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
 msgstr ""
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 #, fuzzy
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "फ़ोल्डर %1 में के-मेल में संदेश जोड़ने में त्रुटि"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "एम-बॉक्स फ़ाइलें आयात करें (यूनिक्स, एवॉल्यूशन)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -209,16 +209,16 @@ msgid ""
 "prefixed with MBOX-</p>"
 msgstr ""
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 #, fuzzy
 msgid "mbox Files (*)"
 msgstr "एम-बॉक्स फ़ाइलें (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "आउटलुक एक्सप्रेस ई-मेल आयात करें"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -229,46 +229,46 @@ msgid ""
 "your local folder.</p>"
 msgstr ""
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "डिरेक्ट्री %1 में कोई आउटलुक एक्सप्रेस डाक-डब्बे नहीं मिले."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 #, fuzzy
 msgid "Import folder structure..."
 msgstr "%1 से ई-मेल आयात किया जा रहा है..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "आउटलुक एक्सप्रेस ई-मेल आयात सम्पन्न"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "मेलबाक्स %1 खोलने में अक्षम"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "ओई4 मेलबॉक्स %1 आयात किया जा रहा है"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "ओई5+ मेलबॉक्स %1 आयात किया जा रहा है"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, fuzzy, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "ओई5+ फ़ोल्डर फ़ाइल %1 आयात किया जा रहा है"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 #, fuzzy
 msgid "Import Opera Emails"
 msgstr "आउटलुक एक्सप्रेस ई-मेल आयात करें"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -278,21 +278,21 @@ msgid ""
 "OPERA-</p>"
 msgstr ""
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "फ़ाइलें गिन रहे"
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "नई डाक फ़ाइलों का आयात किया जा रहा है..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 #, fuzzy
 msgid "Import Outlook Emails"
 msgstr "आउटलुक एक्सप्रेस ई-मेल आयात करें"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -302,26 +302,26 @@ msgid ""
 "OUTLOOK-</p>"
 msgstr ""
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 #, fuzzy
 msgid "Counting mail..."
 msgstr "फ़ाइलें गिन रहे"
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 #, fuzzy
 msgid "Counting directories..."
 msgstr "फ़ाइलें गिन रहे"
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 #, fuzzy
 msgid "Counting folders..."
 msgstr "फ़ाइलें गिन रहे"
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "सादा पाठ ई-मेल आयात करें"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -329,11 +329,11 @@ msgid ""
 "emails.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "पीगासस-मेल से फ़ोल्डर आयात करें"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -342,38 +342,38 @@ msgid ""
 "p>"
 msgstr ""
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
 msgstr ""
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "नई डाक फ़ाइलें आयात किया जा रहा है ('.cnm')..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "डाक फ़ाइलें आयात किया जा रहा है ('.pmm')..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "यूनिक्स डाक फ़ाइलें आयात किया जा रहा है ('.mbx')..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "%1 आयात किया जा रहा है"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr ""
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -382,11 +382,11 @@ msgid ""
 "the status of message, e.g. new or forwarded."
 msgstr ""
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr ""
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -396,11 +396,11 @@ msgid ""
 "Import\" in your local account.</p>"
 msgstr ""
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -410,21 +410,21 @@ msgid ""
 "the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
 msgstr ""
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "फ़ोल्डर %1 के-मेल में नहीं बना सकता"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "फ़ोल्डर %1 में के-मेल में संदेश जोड़ नहीं सका"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "फ़ोल्डर %1 में के-मेल में संदेश जोड़ने में त्रुटि"
 
diff --git a/tde-i18n-hr/messages/tdepim/kmailcvt.po b/tde-i18n-hr/messages/tdepim/kmailcvt.po
index be89e0a7c7a..20a38ad626d 100644
--- a/tde-i18n-hr/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-hr/messages/tdepim/kmailcvt.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt 0\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2004-04-20 13:26+CEST\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -28,11 +28,11 @@ msgid ""
 "Your emails"
 msgstr "lokalizacija@linux.hr"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -40,60 +40,60 @@ msgid ""
 "Import\".</p>"
 msgstr ""
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 #, fuzzy
 msgid "No directory selected."
 msgstr "Nije odabran nijedan direktorij."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr ""
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, fuzzy, c-format
 msgid "Finished importing emails from %1"
 msgstr "Uvoz poruka iz %1 je završen"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 #, fuzzy
 msgid "Unable to open %1, skipping"
 msgstr "Ne mogu otvoriti %1, preskačem"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 #, fuzzy
 msgid "Importing emails from %1..."
 msgstr "Uvozim e-poruke iz %1..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, fuzzy, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
 "%n duplicate messages not imported"
 msgstr "Greška prilikom dodavanja poruke u mapu %1 u KMail-u"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -103,34 +103,34 @@ msgid ""
 "be stored under: \"Evolution-Import\".</p>"
 msgstr ""
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr ""
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr ""
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -141,24 +141,24 @@ msgid ""
 "\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 #, fuzzy
 msgid "Import folder %1..."
 msgstr "Uvozim e-poruke iz %1..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr ""
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 #, fuzzy
 msgid "Import Lotus Notes Emails"
 msgstr "Uvoz poruka iz Outlook Express-a"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -169,45 +169,45 @@ msgid ""
 "named using the names of the files the messages came from.</p>"
 msgstr ""
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 #, fuzzy
 msgid "All Files (*)"
 msgstr "mbox datoteke (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, fuzzy, c-format
 msgid "Importing emails from %1"
 msgstr "Uvozim e-poruke iz %1..."
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, fuzzy, c-format
 msgid "Message %1"
 msgstr "Poruka %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 #, fuzzy
 msgid "Import From OS X Mail"
 msgstr "Uvoz mapi iz Pegasus-Mail-a"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
 msgstr ""
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 #, fuzzy
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "Greška prilikom dodavanja poruke u mapu %1 u KMail-u"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 #, fuzzy
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Uvoz mbox datotekaova (Unix, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -216,17 +216,17 @@ msgid ""
 "prefixed with MBOX-</p>"
 msgstr ""
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 #, fuzzy
 msgid "mbox Files (*)"
 msgstr "mbox datoteke (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 #, fuzzy
 msgid "Import Outlook Express Emails"
 msgstr "Uvoz poruka iz Outlook Express-a"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -237,48 +237,48 @@ msgid ""
 "your local folder.</p>"
 msgstr ""
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, fuzzy, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr ""
 "Nisu pronađeni Outlook Express-ovi poštanski sandučići u direktoriju %1."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 #, fuzzy
 msgid "Import folder structure..."
 msgstr "Uvozim e-poruke iz %1..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 #, fuzzy
 msgid "Finished importing Outlook Express emails"
 msgstr "Uvoz poruka iz Outlook Express-a je završen"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, fuzzy, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Ne mogu otvoriti poštansko sanduče %1"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, fuzzy, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "Uvozim OE4 poštansko sanduče %1"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, fuzzy, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "Uvozim OE5+ poštansko sanduče %1"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, fuzzy, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "Ignorišem OE5+ datoteka sa mapama %1"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 #, fuzzy
 msgid "Import Opera Emails"
 msgstr "Uvoz poruka iz Outlook Express-a"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -288,23 +288,23 @@ msgid ""
 "OPERA-</p>"
 msgstr ""
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 #, fuzzy
 msgid "Counting files..."
 msgstr "Brojim datotekaove..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 #, fuzzy
 msgid "Importing new mail files..."
 msgstr "Uvozim nove poštanske datotekaove..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 #, fuzzy
 msgid "Import Outlook Emails"
 msgstr "Uvoz poruka iz Outlook Express-a"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -314,27 +314,27 @@ msgid ""
 "OUTLOOK-</p>"
 msgstr ""
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 #, fuzzy
 msgid "Counting mail..."
 msgstr "Brojim datotekaove..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 #, fuzzy
 msgid "Counting directories..."
 msgstr "Brojim datotekaove..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 #, fuzzy
 msgid "Counting folders..."
 msgstr "Brojim datotekaove..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 #, fuzzy
 msgid "Import Plain Text Emails"
 msgstr "Uvoz običnih tekstualnih e-poruka"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -342,12 +342,12 @@ msgid ""
 "emails.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 #, fuzzy
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Uvoz mapi iz Pegasus-Mail-a"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -356,41 +356,41 @@ msgid ""
 "p>"
 msgstr ""
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
 msgstr ""
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 #, fuzzy
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Uvozim nove poštanske datotekaove („.cnm“)..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 #, fuzzy
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Uvozim poštanske mape („.pmm“)..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 #, fuzzy
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "Uvozim „UNIX“ poštanske mape („.mbx“)..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, fuzzy, c-format
 msgid "Importing %1"
 msgstr "Uvozim %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr ""
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -399,11 +399,11 @@ msgid ""
 "the status of message, e.g. new or forwarded."
 msgstr ""
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr ""
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -413,11 +413,11 @@ msgid ""
 "Import\" in your local account.</p>"
 msgstr ""
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -427,7 +427,7 @@ msgid ""
 "the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 #, fuzzy
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
@@ -436,17 +436,17 @@ msgstr ""
 "<b>Fatalna greška:</b> Ne mogu pokrenuti KMail za DCOP komunikaciju. "
 "Uvjerite se da je <i>kmail</i> instaliran."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 #, fuzzy
 msgid "Cannot make folder %1 in KMail"
 msgstr "Ne mogu napraviti mapu %1 u KMail-u"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 #, fuzzy
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Ne mogu dodati poruku u mapu %1 u KMail-u"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 #, fuzzy
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Greška prilikom dodavanja poruke u mapu %1 u KMail-u"
diff --git a/tde-i18n-hu/messages/tdepim/kmailcvt.po b/tde-i18n-hu/messages/tdepim/kmailcvt.po
index d242cc46ca9..ef741b3f4bd 100644
--- a/tde-i18n-hu/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-hu/messages/tdepim/kmailcvt.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: TDE 3.5\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2008-01-02 11:11+0100\n"
 "Last-Translator: Tamas Szanto <tszanto@interware.hu>\n"
 "Language-Team: Hungarian <kde-lista@sophia.jpte.hu>\n"
@@ -24,11 +24,11 @@ msgid ""
 "Your emails"
 msgstr "tszanto@mol.hu"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Üzenetek és mappastruktúra importálása az Evolution 1.x-ből"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -39,57 +39,57 @@ msgstr ""
 "könyvtárát (általában ~/.evolution/local).</p><p>Az importáló le tudja "
 "kérdezni a mappastruktúrát, a mappák ide kerülnek: \"Evolution-Import\".</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "Nincs kijelölve egy könyvtár sem."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "Nem található importálandó fájl."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "Befejeződött az üzenetek importálása innen: %1"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "%1 megnyitása nem sikerült, ki lesz hagyva"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "Üzenetek importálása innen: %1..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
 "%n duplicate messages not imported"
 msgstr "%n duplikált üzenet importálása nem történt meg"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Helyi levelek és a mappastruktúra importálása az Evolution 2.x-ből"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -105,34 +105,34 @@ msgstr ""
 "jöhet létre.</p><p>Az importáló le tudja kérdezni a mappastruktúrát, a "
 "mappák ide kerülnek: \"Evolution-Import\".</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "Az importálás befejeződött, a felhasználó megszakította a műveletet."
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "A(z) %1 fájl importálásának megkezdése..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "KMailes üzenetek és mappastruktúra importálása"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -150,22 +150,22 @@ msgstr ""
 "mappastruktúrát is át tudja venni, a mappák ide kerülnek: \"KMail-Import"
 "\" (a helyi mappában).</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "Mappa importálása: %1..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "Nem sikerült importálni: %1"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "Üzenetek importálása Lotus Notesból"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -183,25 +183,25 @@ msgstr ""
 "venni, az importált mappák ez alá kerülnek: \"LNotes-Import\" (a helyi "
 "mappában). A mappanév az eredeti mappa fájlnevével fog megegyezni.</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "Minden fájl (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "Üzenetek importálása innen: %1"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "%1. üzenet"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "Importálás az OS X Mail programból"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -209,17 +209,17 @@ msgstr ""
 "<p><b>Importszűrő az OS X Mailhez</b></p><p>Ez az importszűrő az Apple Mac "
 "OS X-ben található Mail programból tud üzeneteket importálni.</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "%n duplikált üzenet importálása nem történt meg a KMail %1 mappájába"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Mbox fájlok importálása (UNIX, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -233,15 +233,15 @@ msgstr ""
 "p><p><b>Megjegyzés:</b> az üzenetek a fájllal megegyező nevű mappába "
 "kerülnek, kiegészítve az MBOX előtaggal.</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "Mbox-fájlok (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Importálás Outlook Expressből"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -259,44 +259,44 @@ msgstr ""
 "az Outlook Express 5 és 6 mappái ide kerülnek: \"OE-Import\" (a helyi mappán "
 "belül).</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "Nem található Outlook Express postafiók a(z) %1 könyvtárban."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "Mappastruktúra importálása..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Befejeződött az Outlook Express üzeneteinek importálása"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "A(z) %1 postafiókot nem sikerült megnyitni"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "OE4 postafiók importálása: %1"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "OE5+ postafiók importálása: %1"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "OE5+ mappafájl importálása: %1"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Importálás Operából"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -313,20 +313,20 @@ msgstr ""
 "üzenetek az azonosítóval megegyező nevű mappába kerülnek, kiegészítve az "
 "OPERA- előtaggal.</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "A fájlok számolása folyik..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Új üzenetfájlok importálása..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Importálás az Outlookból"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -342,23 +342,23 @@ msgstr ""
 "létrehozott könyvtárak neve meg fog egyezni az eredeti azonosító nevével, "
 "kiegészítve az OUTLOOK- előtaggal.</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "Az üzenetek számolása folyik..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "A könyvtárak számolása folyik..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "A mappák számolása folyik..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Egyszerű szöveges üzenetek importálása"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -370,11 +370,11 @@ msgstr ""
 "előtaggal</p><p>A szűrő alkalmas .msg, .eml és .txt üzenetek beolvasására.</"
 "p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Pegasus Mail mappák importálása"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -388,7 +388,7 @@ msgstr ""
 "mappastruktúrát is átemeli, a mappák ide kerülnek: \"PegasusMail-Import\".</"
 "p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
@@ -396,32 +396,32 @@ msgstr ""
 "Nem sikerült feldolgozni a mappastruktúrát. Folytatódik az importálás az "
 "almappák feldolgozása nélkül."
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Az új üzenetek fájljainak ('.cnm') importálása..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Üzenetmappák ('.pmm') importálása..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "'UNIX' üzenetmappák ('.mbx') importálása..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "%1 importálása"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "A mappastruktúra feldolgozása..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Sylpheed-adatok (üzenetek és mappastruktúra) importálása"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -435,11 +435,11 @@ msgstr ""
 "mappában).</p><p>A szűrő az üzenetállapotokat is újragenerálja (pl. új, "
 "továbbított)."
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Üzenetek és mappastruktúra importálása a Bat! levelezőprogramból"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -455,11 +455,11 @@ msgstr ""
 "mappastruktúrát is át tudja venni, a mappák ide kerülnek: \"TheBat-Import"
 "\" (a helyi mappába).</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "Thunderbird/Mozilla-adatok (üzenetek és mappastruktúra) importálása"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -475,7 +475,7 @@ msgstr ""
 "az esetben sok új mappa jöhet létre.</p><p>A mappastruktúrát is le tudja "
 "kérdezni az importáló, a mappák ide kerülnek: \"Thunderbird-Import\".</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -483,15 +483,15 @@ msgstr ""
 "<b>Végzetes hiba:</b> nem sikerült elindítani a KMailt a DCOP "
 "kommunikációhoz. Ellenőrizze, hogy a <i>kmail</i> program telepítve van-e."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "A(z) %1 mappa nem hozható létre a KMailben"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Nem sikerült hozzáadni egy üzenetet a KMail %1 nevű mappájához"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Nem sikerült hozzáadni egy üzenetet a KMail %1 mappájához."
 
diff --git a/tde-i18n-is/messages/tdepim/kmailcvt.po b/tde-i18n-is/messages/tdepim/kmailcvt.po
index 4bac0fc5ddc..84dbebc1907 100644
--- a/tde-i18n-is/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-is/messages/tdepim/kmailcvt.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2006-03-04 12:25+0100\n"
 "Last-Translator: Arnar Leósson <leosson@frisurf.no>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -35,11 +35,11 @@ msgstr ""
 "thori@mindspring.com, pjetur@pjetur.net, svanurpalsson@hotmail.com, "
 "leosson@frisurf.no"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Flytja inn Evolution 1.x bréf og möppuskipulag"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -50,46 +50,46 @@ msgstr ""
 "póstsins þín (vanalega ~/evolution/local).</p> <p>Þar sem það er mögulegt að "
 "halda möppuskipulaginu, verður það sett undir: \"Evolution-Import\".</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "Engin mappa valin."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "Engar skrár fundust til innflutnings."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "Innflutningi pósts frá %1 lokið"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "Get ekki opnað %1, sleppi"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "Flyt inn póst frá %1..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
@@ -98,11 +98,11 @@ msgstr ""
 "Eitt endurtekið bréf ekki flutt inn\n"
 "%n endurtekin bréf ekki flutt inn"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Flytja inn Evolution 2.x bréf og möppuskipulag"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -118,34 +118,34 @@ msgstr ""
 "mögulegt að halda möppuskipulaginu, verður það sett undir: \"Evolution-Import"
 "\".</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "Innflutningi lokið, notandi hætti við."
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "Hef innflutning á %1..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Flytja inn KMail bréf og möppuskipulag"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -162,22 +162,22 @@ msgstr ""
 "KMail póstmöppur sem innihalda mbox skrár.</p><p>Þar sem það er mögulegt að "
 "halda möppuskipulaginu, verður það sett undir: \"KMail-Import\".</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "Flytja inn möppu %1..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "Gat ekki flutt inn %1"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "Flytja inn Lotus Notes póst"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -194,25 +194,25 @@ msgstr ""
 "möppuskipulaginu, verður innflutti pósturinn settur í undirmöppur undir: "
 "\"LNotes-Import\", nefndar eftir heiti á skránum þær koma úr.</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "Allar skrár (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "Flyt inn póst frá %1"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Bréf %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "Flytja inn OS X póst"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -220,7 +220,7 @@ msgstr ""
 "<p><b>OS X póst innflutningssía</b></p><p>Þessi sía flytur inn póst frá "
 "Apple Mac OS X póstforritinu.</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
@@ -228,11 +228,11 @@ msgstr ""
 "Eitt endurtekið bréf ekki flutt inn í möppuna %1 í KMail\n"
 "%n endurtekin bréf ekki flutt inn í möppuna %1 í KMail"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Flytja inn mbox skrár (UNIX, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -246,15 +246,15 @@ msgstr ""
 "b> Pósturinn verðu fluttur inn í möppur sem heita eftir skránum sem þær komu "
 "úr, með forskeytinu MBOX-</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "mbox skrár (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Flytja inn Outlook Express póst"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -271,44 +271,44 @@ msgstr ""
 "p><p><b>Athugaðu:</b> Þar sem það er mögulegt að halda möppuskipulaginu, "
 "verður það sett undir: \"OE-Import\".</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "Fann engin Outlook Express pósthólf í möppunni %1."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "Flytja inn möppuskipulag..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Innflutningi á pósti úr Outlook Express lokið"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Get ekki opnað pósthólfið %1"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "Flyt inn OE4 pósthólf %1"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "Flyt inn OE5+ pósthólf %1"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "Flyt inn OE5+ möppuskrá %1"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Flytja inn Opera póst"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -323,20 +323,20 @@ msgstr ""
 "account*).</p><p><b>Athugaðu:</b> Pósturinn verðu fluttur inn í möppur sem "
 "heita eftir auðkenninu sem þær koma frá, með forskeytinu OPERA-</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Tel skrár ..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Flyt inn nýjar póstskrár..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Flytja inn Outlook póst"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -352,23 +352,23 @@ msgstr ""
 "inn í möppur nefndar eftir auðkenninu sem þær komu frá, með forskeytinu "
 "OUTLOOK-</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "Tel bréf..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "Tel möppur..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "Tel möppur..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Flytja inn einfaldan textapóst"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -379,11 +379,11 @@ msgstr ""
 "möppu með sama nafni og mappan sem hann var í, með forskeytinu PLAIN-</"
 "p><p>Þessi sía flytur inn allan .msg, .eml og .txt póst.</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Flytja inn möppur úr Pegasus-Mail"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -396,39 +396,39 @@ msgstr ""
 "\\mail\\admin</p><p><b>Athugaðu:</b> Þar sem það er mögulegt að halda "
 "möppuskipulaginu, verður það sett undir: \"PegasusMail-Import\".</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
 msgstr ""
 "Get ekki þáttað möppuskipulagið; held áfram án stuðnings við undirmöppur."
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Flyt inn nýjar póstskrár ('.cnm') ..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Flyt inn póstmöppur ('.pmm') ..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "Flyt inn 'UNIX' póstmöppur ('.mbx') ..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "Flyt inn %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "Þátta möppuskipulagið..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Flytja inn Sylpheed bréf og möppuskipulag"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -441,11 +441,11 @@ msgstr ""
 "möppuskipulaginu, verður það sett undir: \"Sylpheed-Import\".</p> <p>Sían "
 "mun einnig endurskapa stöðu bréfana, þ.e. ný eða áframsend."
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Flytja inn Bat! bréf og möppuskipulag"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -461,11 +461,11 @@ msgstr ""
 "möppuskipulaginu, verður innflutti pósturinn settur í undirmöppur undir: "
 "\"TheBat-Import\".</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "Flytja inn Thunderbird/Mozilla póst og möppuskipulag"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -481,7 +481,7 @@ msgstr ""
 "verða bætt við.</p><p>Þar sem það er mögulegt að halda möppuskipulaginu, "
 "verður það sett undir: \"Thunderbird-Import\".</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -489,15 +489,15 @@ msgstr ""
 "<b>Alvarlegt:</b> Gat ekki ræst KMail til að hefja DCOP samskipti. Gangtu úr "
 "skugga um að <i>kmail</i> sé uppsett."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "Gat ekki búið til möppuna %1 í KMail"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Get ekki sett bréf í möppuna %1 í KMail"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Villa við að bæta bréfi í möppuna %1 í KMail"
 
diff --git a/tde-i18n-it/messages/tdepim/kmailcvt.po b/tde-i18n-it/messages/tdepim/kmailcvt.po
index 691c30866a7..e01f104d038 100644
--- a/tde-i18n-it/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-it/messages/tdepim/kmailcvt.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2020-11-29 18:17+0000\n"
 "Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
 "Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
@@ -31,12 +31,12 @@ msgid ""
 "Your emails"
 msgstr "aleast@capri.it"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr ""
 "Importa i messaggi locali di Evolution 1.x e la struttura delle cartelle"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -48,46 +48,46 @@ msgstr ""
 "<p>Dato che è possibile ricreare la struttura delle cartelle, esse saranno "
 "conservate come: \"Evolution-Import\".</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "Nessuna directory selezionata."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "Nessun file trovato da importare."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "Importazione messaggi di posta da %1 conclusa"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "Impossibile aprire %1, saltato"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "Importazione messaggi di posta da %1..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
@@ -96,12 +96,12 @@ msgstr ""
 "1 messaggio duplicato non importato\n"
 "%n messaggi duplicati non importati"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr ""
 "Importa i messaggi locali di Evolution 2.x e la struttura delle cartelle"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -117,23 +117,23 @@ msgstr ""
 "cartelle.</p> <p>Dato che è possibile ricreare la struttura delle cartelle, "
 "esse saranno conservate come: \"Evolution-Import\".</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "Importazione conclusa, annullata dall'utente."
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "Avvio importazione file %1..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr "Importa file archivio di KMail"
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
@@ -144,11 +144,11 @@ msgstr ""
 "p><p>I file di archivio contengono una completa struttura di cartelle "
 "compressa in un singolo file.</p>"
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Importa i messaggi di KMail e la struttura delle cartelle"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -167,22 +167,22 @@ msgstr ""
 "che è possibile ricreare la struttura delle cartelle, esse saranno "
 "conservate come: \"KMail-Import\" nella tua cartella locale.</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "Importa cartella %1..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "Impossibile importare %1"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "Importa i messaggi di Lotus Notes"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -200,25 +200,25 @@ msgstr ""
 "cartelle, esse saranno conservate in sotto-cartelle col nome dei file di "
 "origine in: \"LNotes-Import\" della tua cartella locale.</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "Tutti i file (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "Importazione messaggi di posta da %1"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Messaggio %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "Importa da OS X Mail"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -227,7 +227,7 @@ msgstr ""
 "messaggi di posta elettronica dal programma di posta presente nel Mac OS X "
 "di Apple.</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
@@ -235,11 +235,11 @@ msgstr ""
 "1 messaggio duplicato non importato nella cartella %1 di KMail\n"
 "%n messaggi duplicati non importati nella cartella %1 di KMail"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Importa file mbox (UNIX, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -254,15 +254,15 @@ msgstr ""
 "saranno importati in cartelle col nome della cartella originaria preceduta "
 "dal prefisso 'MBOX-'</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "file mbox (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Importa messaggi di posta da Outlook Express"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -280,45 +280,45 @@ msgstr ""
 "struttura delle cartelle, quelle importate da Outlook Express 5 e 6 saranno "
 "conservate come: \"OE-Import\".</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr ""
 "Nessuna casella di posta di Outlook Express trovata nella directory %1."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "Importa la struttura delle cartelle..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Importazione messaggi di posta da Outlook Express conclusa"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Impossibile aprire la casella di posta %1"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "Importazione casella di posta OE4 %1"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "Importazione casella di posta OE5+ %1"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "Importazione file cartella OE5+ %1"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Importa messaggi di posta da Opera"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -335,20 +335,20 @@ msgstr ""
 "importati in cartelle col nome della cartella originaria preceduta dal "
 "prefisso 'OPERA-'</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Conteggio file..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Importazione nuovi file di messaggi di posta..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Importa i messaggi di Outlook"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -364,23 +364,23 @@ msgstr ""
 "i messaggi di posta elettronica saranno importati in cartelle col nome della "
 "cartella originaria preceduta dal prefisso 'OUTLOOK-'</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "Conteggio messaggi..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "Conteggio cartelle..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "Conteggio caselle..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Importa messaggi di posta in testo semplice"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -393,11 +393,11 @@ msgstr ""
 "<p>Questo filtro importerà tutti i messaggi con estensione .msg, .eml, e ."
 "txt</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Importa cartelle da Pegasus-Mail"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -410,7 +410,7 @@ msgstr ""
 "\\mail\\admin</p> <p><b>Nota:</b> Dato che è possibile ricreare la struttura "
 "delle cartelle, esse saranno conservate come: \"PegasusMail-Import\".</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
@@ -418,32 +418,32 @@ msgstr ""
 "Impossibile analizzare la struttura delle cartelle; importazione senza "
 "supporto per le sotto-cartelle."
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Importazione nuovo file di messaggi (\".cnm\")..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Importazione cartelle di messaggi (\".pmm\")..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "Importazione cartelle di messaggi \"UNIX\" (\".mbx\")..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "Importazione %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "Analisi della struttura delle cartelle..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Importa i messaggi di Sylpheed e la struttura delle cartelle"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -457,11 +457,11 @@ msgstr ""
 "saranno conservate come: \"Sylpheed-Import\" nella tua cartella locale.</p> "
 "<p>Questo filtro ricrea anche lo stato dei messaggi, es.: nuovo o inoltrato."
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Importa i messaggi locali di The Bat! e la struttura delle cartelle"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -477,13 +477,13 @@ msgstr ""
 "che è possibile ricreare la struttura delle cartelle, esse saranno "
 "conservate come: \"TheBat-Import\" nel tuo account locale.</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr ""
 "Importa i messaggi locali di Thunderbird/Mozilla e la struttura delle "
 "cartelle"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -500,7 +500,7 @@ msgstr ""
 "la struttura delle cartelle, esse saranno conservate come: \"Thunderbird-"
 "Import\".</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -508,15 +508,15 @@ msgstr ""
 "<b>Errore fatale:</b>Impossibile avviare KMail per la comunicazione DCOP. "
 "Assicurarsi che <i>KMail</i> sia installato correttamente."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "Impossibile creare la cartella %1 in KMail"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Impossibile aggiungere il messaggio alla cartella %1 in KMail"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Errore durante l'inserimento del messaggio nella cartella %1 in KMail"
 
diff --git a/tde-i18n-ja/messages/tdepim/kmailcvt.po b/tde-i18n-ja/messages/tdepim/kmailcvt.po
index 9f430feb488..a43a25f53f4 100644
--- a/tde-i18n-ja/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-ja/messages/tdepim/kmailcvt.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2007-02-21 23:00+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <Kdeveloper@kde.gr.jp>\n"
@@ -30,11 +30,11 @@ msgid ""
 "Your emails"
 msgstr "tsuno@ngy.1st.ne.jp"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Evolution 1.x のローカルメールとフォルダ構造をインポート"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -45,57 +45,57 @@ msgstr ""
 "リを選択してください (通常 ~/evolution/local)。</p><p>フォルダ構造の再現が可"
 "能なので、フォルダは \"Evolution-Import\" 以下に保存します。</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "ディレクトリが選択されていません。"
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "インポートするファイルが見つかりません。"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "%1 からのメールのインポートが完了しました"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "%1 を開けません。スキップします。"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "%1 からメールをインポート中..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
 "%n duplicate messages not imported"
 msgstr "%n 個の重複メッセージはインポートしていません"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Evolution 2.x のローカルメールとフォルダ構造をインポート"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -110,34 +110,34 @@ msgstr ""
 "い。選択すると、多数の新しいフォルダが作成されます。</p><p>フォルダ構造の再現"
 "が可能なので、フォルダは \"Evolution-Import\" 以下に保存します。</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "ユーザによってキャンセルされたため、インポートを終了しました。"
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "ファイル %1 のインポート開始..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "KMail Maildir とフォルダ構造をインポート"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -155,22 +155,22 @@ msgstr ""
 "の再現が可能なので、フォルダはローカルフォルダの \"KMail-Import\" 以下に保存"
 "します。</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "フォルダ %1 をインポート..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "%1 をインポートできませんでした"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "Lotus Notes メールをインポート"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -188,25 +188,25 @@ msgstr ""
 "メッセージはローカルフォルダの \"LNotes-Import\" 以下のサブフォルダに保存しま"
 "す。サブフォルダにはメッセージの元のファイル名を使用します。</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "すべてのファイル (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "%1 からメールをインポート"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "メッセージ %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "OS X Mail からインポート"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -214,17 +214,17 @@ msgstr ""
 "<p>OS X Mail インポートフィルタ</p><p>このフィルタは Apple Mac OS X メールク"
 "ライアントからメールをインポートします。</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "%n 個の重複メッセージは KMail のフォルダ %1 にインポートしていません"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "mbox ファイルをインポート (UNIX, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -238,15 +238,15 @@ msgstr ""
 "い。</p><p>注意: メールは元のファイル名に MBOX- というプレフィックスが付いた"
 "フォルダにインポートされます。</p> "
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "mbox ファイル (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Outlook Express メールをインポート"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -263,45 +263,45 @@ msgstr ""
 "現が可能なので、Outlook Express 5 と 6 からのフォルダはローカルフォルダの "
 "\"OE-Import\" 以下に保存します。</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr ""
 "ディレクトリ %1 に Outlook Express メールボックスが見つかりませんでした。"
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "フォルダ構造をインポート..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Outlook Express メールのインポート完了"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "メールボックス %1 を開けません"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "OE4 メールボックス %1 をインポート"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "OE5+ メールボックス %1 をインポート"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "OE5+ フォルダファイル %1 をインポート"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Opera メールをインポート"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -317,20 +317,20 @@ msgstr ""
 "opera/mail/store/account*)。</p><p>注意: メールは元のアカウント名に OPERA- と"
 "いうプレフィックスが付いたフォルダにインポートされます。</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "ファイルを数えています..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "新しいメールファイルをインポート中..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Outlook メールをインポート"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -345,23 +345,23 @@ msgstr ""
 "Settings</i> です。</p><p>注意: メールは元のアカウント名に OUTLOOK- というプ"
 "レフィックスが付いたフォルダにインポートされます。</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "メールを数えています..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "ディレクトリを数えています..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "フォルダを数えています..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "プレーンテキストのEメールをインポート"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -373,11 +373,11 @@ msgstr ""
 "</p> <p>このフィルタはすべての .msg, .eml および .txt メールをインポートしま"
 "す。</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Pegasus-Mail からフォルダをインポート"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -390,7 +390,7 @@ msgstr ""
 "\\mail\\admin にあります。</p> <p>注意: フォルダ構造の再現が可能なので、フォ"
 "ルダは \"PegasusMail-Import\" 以下に保存します。</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
@@ -398,32 +398,32 @@ msgstr ""
 "フォルダ構造を解析できません。サブフォルダのサポートなしでインポートを続けま"
 "す。"
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "新規メールファイル (.cnm) をインポート中 ..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "メールフォルダ (.pmm) をインポート中 ..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "UNIX メールフォルダ (.mbx) をインポート中..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "%1 をインポート"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "フォルダ構造を解析中..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Sylpheed メールディレクトリとフォルダ構造をインポート"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -437,11 +437,11 @@ msgstr ""
 "す。</p><p>このフィルタはメッセージのステータス (新規、転送済みなど) も再現し"
 "ます。"
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Bat! のメールとフォルダ構造をインポート"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -457,11 +457,11 @@ msgstr ""
 "ルダ構造の再現が可能なので、フォルダはローカルアカウントの \"TheBat-Import\" "
 "以下に保存します。</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "Thunderbird/Mozilla のローカルメールとフォルダ構造をインポート"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -477,7 +477,7 @@ msgstr ""
 "ルダ構造の再現が可能なので、フォルダは  \"Thunderbird-Import\" 以下に保存しま"
 "す。</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -485,15 +485,15 @@ msgstr ""
 "<b>致命的:</b> DCOP 通信用に KMail を開始できませんでした。<i>kmail</i> がイ"
 "ンストールされているか確認してください。"
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "KMail にフォルダ %1 を作成できません"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "KMail のフォルダ %1 にメッセージを追加できません"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "KMail のフォルダ %1 へのメッセージの追加中にエラー発生"
 
diff --git a/tde-i18n-kk/messages/tdepim/kmailcvt.po b/tde-i18n-kk/messages/tdepim/kmailcvt.po
index 215e55c6bc7..1af8395cee9 100644
--- a/tde-i18n-kk/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-kk/messages/tdepim/kmailcvt.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2007-04-15 16:53+0600\n"
 "Last-Translator: Sairan Kikkarin <sairan@computer.org>\n"
 "Language-Team: Kazakh\n"
@@ -27,11 +27,11 @@ msgid ""
 "Your emails"
 msgstr "sairan@computer.org"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Import Evolution 1.x поштасы мен қапшықтарын импорттау"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -43,57 +43,57 @@ msgstr ""
 "local).</p><p>Қапшықтар құрылымы қайталауға келсе, ол \"Evolution-Import\" "
 "деген қапшықта өрбіп құрылады.</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "Каталогы таңдалмаған."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "Импорттайтын файлдар табылмады."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "%1 эл.поштасын импорттау аяқталды"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "%1 ашылмай өткізіп жіберілді"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "%1 эл.поштасын импорттау..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
 "%n duplicate messages not imported"
 msgstr "%n қайталанатын хат импортталған жоқ"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Import Evolution 2.x поштасы мен қапшықтарын импорттау"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -109,34 +109,34 @@ msgstr ""
 "қапшық құрылады.</p><p>Сонымен қапшықтар жүйесі қайталауға келсе, ол "
 "\"Evolution-Import\" деген қапшықта өрбіп құрылады.</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "Пайдаланушысы айнып, импорт тоқталды."
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "%1 файлын импорттауы басталды..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "KMai поштасы мен қапшықтарын импорттау"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -154,22 +154,22 @@ msgstr ""
 "қапшықтарды импорттай алмайды.</p><p>Сонымен, қапшықтар құрылымы қайталауға "
 "келсе, ол \"KMail-Import\" деген қапшықта өрбіп құрылады.</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "%1 қапшығын импорттау..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "%1 деген импортталмады"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "Lotus Notes эл.поштасын импорттау"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -187,25 +187,25 @@ msgstr ""
 "сақталады. Әрбір ішкі қапшықтың атауы хаттар алынған файлдың атауын "
 "қайталайды.</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "Бүкіл файлдар (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "%1 дегеннен эл.поштаны импорттау"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "%1 хаты"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "OS X Mail пошта клиентінен импорттау"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -213,17 +213,17 @@ msgstr ""
 "<p><b>OS X Mail клиентінен импорттау сүзгісі</b></p><p>Бұл Apple Mac OS X "
 "Mail клиентінен импорттау сүзгісі.</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "%n қайталанатын хат KMail-дің %1 қапшығына импортталған жоқ"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Mbox файлдарын (UNIX, Evolution) импорттау"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -237,15 +237,15 @@ msgstr ""
 "p><p><b>Ескерту:</b></b> Хаттар \"MBOX-\" деген префикстен кейін алынған "
 "файлдың атын жалғап аталған қапшыққа импортталды.</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "mbox файлдары (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Outlook Express эл.поштасын импорттау"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -263,44 +263,44 @@ msgstr ""
 "қайталауға келсе, Outlook Express 5 пен 6-ның қапшықтары \"OE-Import\" деген "
 "қапшықта сақталады.</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "%1 каталогы Outlook Express пошта жәшіктері табылмады."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "Қапшықтар құрылымын импорттау..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Outlook Express эл.поштасы имортталды"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "%1 пошта жәшігінің файлы ашылмады"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "OE4 %1 пошта жәшігін импорттау"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "OE5+ %1 пошта жәшігін импорттау"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "OE5+ %1 қапшық файлын импорттау"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Opera эл.поштасын импорттау"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -315,20 +315,20 @@ msgstr ""
 "store/account*).</p><p><b>Ескерту:</b> Хаттар \"OPERA-\" деген префикстен "
 "кейін алынған тіркелгінің атын жалғап аталған қапшыққа импортталды.</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Файдарды санау..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Жаңа пошта файлдарын импорттау..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Outlook эл.поштасын импорттау"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -344,23 +344,23 @@ msgstr ""
 "p><p><b>Ескерту:</b> Хаттар \"OUTLOOK-\" деген префикстен кейін алынған "
 "тіркелгінің атын жалғап аталған қапшыққа импортталды.</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "Хаттарды санау..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "Каталогтарды санау..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "Қапшықтарды санау..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Жай мәтінді эл.поштасын импорттау"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -372,11 +372,11 @@ msgstr ""
 "орналастырылады.</p><p>Бұл сүзгі барлық .msg, .eml және .txt файлдардағы эл."
 "поштаны импорттайды.</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Pegasus-Mail қапшықтарын импорттау"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -390,7 +390,7 @@ msgstr ""
 "қайталауға келсе, ол \"PegasusMail-Import\" деген қапшықта өрбіп құрылады.</"
 "p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
@@ -398,32 +398,32 @@ msgstr ""
 "Қапшықтар құрылымы талдауға келмеді; импортта ішкі қапшықтар құрылымы "
 "қайталанбайды."
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Жаңа пошта файлдарын ('.cnm') импорттау..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Пошта қапшықтарын ('.pmm') импорттау..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "'UNIX' пошта қапшықтарын ('.mbx') импорттау..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "%1 импорт ету"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "Қапшық құрылымын талдау..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Sylpheed поштасы мен қапшықтарын импорттау"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -437,11 +437,11 @@ msgstr ""
 "құрылады.</p><p>Сонымен қатар бұл сүзгі хаттың күй-жайын да қайталап береді, "
 "мысалы, жаңа не басқаға жіберілген деп."
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Bat! поштасы мен қапшықтарын импорттау"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -456,11 +456,11 @@ msgstr ""
 "DIMAP поштасын тимей) импорттайды.</p><p>Қапшықтар құрылымы қайталауға "
 "келсе, ол \"TheBat-Import\" деген қапшықта өрбіп құрылады.</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "Thunderbird/Mozilla поштасы мен қапшықтарын импорттау"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -477,7 +477,7 @@ msgstr ""
 "p><p>Сонымен, қапшықтар құрылымы қайталауға келсе, ол \"Thunderbird-Import\" "
 "деген қапшықта өрбіп құрылады.</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -485,15 +485,15 @@ msgstr ""
 "<b>Түзелмейтін қате:</b> KMail клиенті DCOP арқылы байланыс құруға "
 "жегілмеді. <i>Kmail</i> орнатылғанын тексеріңіз."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "KMail-де %1 қапшығы құрылмады"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "KMail-дің %1 қапшығына хат қосылмады"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "KMail-дің %1 қапшығына хатты қосқанда қате орын алды"
 
diff --git a/tde-i18n-km/messages/tdepim/kmailcvt.po b/tde-i18n-km/messages/tdepim/kmailcvt.po
index 40617fc6b81..016be0f8b66 100644
--- a/tde-i18n-km/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-km/messages/tdepim/kmailcvt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2008-07-14 16:41+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <en@li.org>\n"
@@ -30,11 +30,11 @@ msgstr ""
 "khoemsokhem@khmeros.info,soursdey@khmeros.info, evannak@khmeros.info,"
 "piseth_dv@khmeros.info"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "នាំចូល​សំបុត្រ​មូលដ្ឋាន​របស់ Evolution 1.x ​និង​រចនាសម្ព័ន្ធ​ថត"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -45,57 +45,57 @@ msgstr ""
 "ធម្មតា ~/evolution/local) ។</p><p>ព្រោះ​ថា វា​អាច​បង្កើត​រចនាសម្ព័ន្ធ​ថត​ម្ដង​ទៀត ថត​នឹង​ត្រូវ​"
 "បាន​ទុក​ក្រោម ៖\"Evolution-ការ​នាំចូល\" ។</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "គ្មាន​ថត​បាន​ជ្រើស ។"
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "រក​មិន​ឃើញ​ឯកសារ​​ដើម្បី​នាំចូល ។"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "​នាំចូល​អ៊ីមែល​ពី %1 បាន​បញ្ចប់"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "មិន​អាច​បើក %1 បាន​ទេ រំលង"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "កំពុង​នាំចូល​អ៊ីមែល​ពី %1..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
 "%n duplicate messages not imported"
 msgstr "%n សារ​ស្ទួន​មិន​បាន​នាំចូល"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "នាំចូល​សំបុត្រ​មូលដ្ឋាន​របស់ Evolution 2.x និង​រចនាសម្ព័ន្ធ​ថត"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -110,34 +110,34 @@ msgstr ""
 "ថត​ថ្មី​ជា​ច្រើន ។</p><p>ព្រោះថា វា​អាច​បង្កើត​​រចនាសម្ព័ន្ធ​ថត​ម្ដង​ទៀត​ ថត​នឹង​ត្រូវ​បាន​ទុក​ក្រោម ៖ "
 "\"Evolution-កា​រ​នាំចូល\" ។</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "​ការ​នាំចូល​បាន​បញ្ចប់ ដោយ​បាន​បោះបង់​ដោយ​អ្នក​ប្រើ ។"
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "ចាប់​ផ្ដើម​នាំចូល​ឯកសារ %1..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "នាំចូល KMail Maildirs និង​រចនាម្ព័ន្ធ​ថត"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -154,22 +154,22 @@ msgstr ""
 "បង្កើត​រចនាសម្ព័ន្ធ​ម្ដង​ទៀត ថត​នឹង​ត្រូវ​បាន​ទុក​ក្រោម ៖ \"KMail-Import\" នៅ​ក្នុង​ថត​មូលដ្ឋាន​របស់​"
 "អ្នក ។</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "នាំចូល​ថត %1..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "មិន​អាច​នាំចូល %1"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "នាំចូល​អ៊ីមែល​របស់ Lotus Notes"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -186,25 +186,25 @@ msgstr ""
 "ទៀត សារ​ដែល​បាន​នាំចូល​​នឹង​ត្រូវ​បាន​ទុក​ក្នុង​ថត​រង​​ក្រោម ៖ \"LNotes-ការ​នាំចូល\" នៅ​ក្នុង​ថត​មូលដ្ឋាន​របស់​"
 "ដែល​មាន​ឈ្មោះ​របស់​ឯកសារ​ដែល​សារ​បាន​មក ។</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "ឯកសារ​ទាំង​អស់ (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "កំពុង​នាំចូល​អ៊ីមែល​ពី %1"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "សារ %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "នាំចូល​ពី​សំបុត្រ​របស់ OS X"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -212,17 +212,17 @@ msgstr ""
 "<p><b>តម្រង​នាំចូល​សំបុត្រ​របស់ OS​</b></p><p>តម្រង​នេះ​នាំចូល​អ៊ីមែល​ពី​កម្មវិធី​អ៊ីមែល​ក្នុង Apple Mac OS "
 "X ។</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "%n សារ​ស្ទួន​មិន​បាន​នាំចូល​ទៅ​ថត %1 នៅ​ក្នុង KMail"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "នាំចូល​ឯកសារ​ mbox (យូនីក, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -235,15 +235,15 @@ msgstr ""
 "យូនីក​ដើម​នេះ ។</p><p><b>ចំណាំ ៖</b> អ៊ីមែល​នឹង​ត្រូវ​បាន​នាំចូល​ទៅ​ក្នុង​ថត​ដែល​មាន​ឈ្មោះ​បន្ទាប់​ពី​ឯកសារ​"
 "ដែល​ពួក​វា​មាន ដោយ​បាន​ដាក់​បុព្វបទ​ដោយ​ MBOX-</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "ឯកសារ​ mbox (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "នាំចូល​អ៊ីមែល​​របស់ Outlook Express"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -260,44 +260,44 @@ msgstr ""
 "ដែល​បាន​មក​ពី Outlook Express ៥ និង ៦ នឹង​ត្រូវ​បាន​ទុក​ក្រោម ៖\"OE-Import\" ក្នុង​ថត​មូលដ្ឋាន​របស់​"
 "អ្នក ។</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "រក​មិន​ឃើញ​ប្រអប់​សំបុត្រ​ Outlook Express ​ក្នុង​ថត %1 ។"
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "នាំចូល​រចនាសម្ព័ន្ធ​ថត..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "ការ​នាំចូល​អ៊ីមែល​របស់ Outlook Express បាន​បញ្ចប់"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "មិន​អាច​បើក​ប្រអប់​សំបុត្រ​ %1"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "កំពុង​នាំចូល​ប្រអប់​សំបុត្រ​ OE4 %1"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "កំពុង​នាំចូល​ប្រអប់​​សំបុត្រ​ OE5+ %1"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "កំពុង​នាំចូល​ថត​​​ឯកសារ​ OE5+ %1"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "នាំចូល​អ៊ីមែល​របស់​ Opera"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -311,20 +311,20 @@ msgstr ""
 "គណនី (តាម​ធម្មតា ~/.opera/mail/store/account*) ។</p><p><b>ចំណាំ ៖</b> អ៊ីមែល​នឹង​ត្រូវ​បាន​"
 "នាំចូល​ទៅ​ក្នុង​ថត​ដែល​មាន​ឈ្មោះ​បន្ទាប់​ពី​គណនី​ដែល​ពួក​វា​មាន ដោយ​បាន​ដាក់បុព្វ​បទ​ដោយ OPERA-</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "កំពុង​រាប់​ឯកសារ..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "កំពុង​នាំចូល​​ឯកសារ​សំបុត្រ​ថ្មី​..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "នាំចូល​អ៊ីមែល​​របស់ Outlook"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -339,23 +339,23 @@ msgstr ""
 "នឹងត្រូវ​បាន​នាំចូល​ទៅ​ក្នុង​ថត​មួយ​ដែល​មាន​ឈ្មោះ បន្ទាប់​ពី​គណនី​ដែល​ពួក​វា​បាន​មក ដោយ​បាន​ដាក់បុព្វបទ​ដោយ "
 "OUTLOOK-</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "កំពុង​រាប់​សំបុត្រ..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "កំពុង​រាប់​ថត..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "កំពុង​រាប់​ថត..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "នាំចូល​អ៊ីមែល​ជា​អត្ថបទ​ធម្មតា​"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -366,11 +366,11 @@ msgstr ""
 "ឈ្មោះ​ថត​ដែល​ពួក​វា​នៅក្នុង​នោះ ដោយ​បាន​ដាក់​បុព្វបទ​ PLAIN-</p><p>​តម្រង​នេះ​នឹង​នាំចូល​អ៊ីមែល​ .msg, ."
 "eml និង .txt ទាំង​អស់ ។</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "ថត​នាំចូល​ពី​សំបុត្រ Pegasus"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -383,38 +383,38 @@ msgstr ""
 "p><p><b>ចំណាំ ៖</b> ព្រោះ​ថា វា​អាច​បង្កើត​រចនាសម្ព័ន្ធ​ថត​ម្ដង​ទៀត ថត​នឹង​ត្រូវ​បានទុក​ក្រោម ៖"
 "\"PegasusMail-ការ​នាំចូល\" ។</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
 msgstr "មិន​អាច​ញែក​រចនាសម្ព័ន្ធ​ថត បន្ត​នាំចូល​ដោយ​គ្មាន​ការ​គាំទ្រ​ថត​រង ។"
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "កំពុង​នាំចូល​ឯកសារ​សំបុត្រ​ថ្មី ('.cnm')..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "កំពុង​នាំចូល​ថត​សំបុត្រ​ ('.pmm')..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "កំពុង​នាំចូល​​ថត​សំបុត្រ​របស់ 'យូនីក' ('.mbx')..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "កំពុង​នាំចូល​ %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "កំពុង​ញែក​រចនាសម្ព័ន្ធ​ថត​..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "នាំចូល Sylpheed Maildirs និង​រចនាសម្ព័ន្ធ​ថត"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -427,11 +427,11 @@ msgstr ""
 "បាន​ទុក​ក្រោម ៖\"Sylpheed-ការ​នាំចូល\" នៅ​ក្នុង​ថត​មូលដ្ឋាន ។</p><p>តម្រង​នេះ​ក៏​បង្កើត​ស្ថានភាព​របស់​"
 "សារ​ម្ដង​ទៀត​ផងដែរ ឧ. ថ្មី ឬ​បញ្ជូន​បន្ត ។"
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "នាំចូល​ Bat ! សំបុត្រ និង​រចនាសម្ព័ន្ធ​ថត"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -445,11 +445,11 @@ msgstr ""
 "Bat!' ឧ.ពី​គណនី POP និង​មិន​បាន​មក​ពីគណនី IMAP/DIMAP ។</p><p>ព្រោះថា វា​អាច​បង្កើត​រចនាសម្ព័ន្ធ​"
 "ថត​ម្ដង​ទៀត ថត​នឹង​ត្រូវ​បាន​ទុក​ក្រោម ៖\"TheBat-ការ​នាំចូល\" នៅ​ក្នុង​គណនី​មូលដ្ឋាន​របស់​អ្នក ។</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "នាំចូល​សំបុត្រ​មូលដ្ឋាន និង​រចនាសម្ព័ន្ធ​ថត​​របស់​​​ Thunderbird/Mozilla"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -464,7 +464,7 @@ msgstr ""
 "បើ​អ្នក​ធ្វើ​ដូច្នេះ អ្នក​នឹង​ទទួល​បាន​ថត​ថ្មី​ជា​ច្រើន ។</p><p>ព្រោះថា​ វា​អាច​បង្កើត​រចនាសម្ព័ន្ធ​ថត​ម្ដ​ង​"
 "ទៀត ថត​នឹង​ត្រូវ​បាន​ទុក​ក្រោម ៖ \"Thunderbird-ការ​នាំចូល\" ។</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -472,15 +472,15 @@ msgstr ""
 "<b>កំហុស​ធ្ងន់ធ្ងរ ៖</b> មិន​អាចចាប់ផ្ដើម KMail សម្រាប់​ទំនាក់ទំនង DCOP ។ សូម​ប្រាកដ​ថា "
 "<i>kmail</i> ត្រូវ​បាន​ដំឡើង ។"
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "មិន​អាច​បង្កើត​ថត %1 ក្នុង KMail"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "មិន​អាច​បន្ថែម​សារ​ទៅ​ថត %1 ក្នុង KMail"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "កំហុស​ខណៈពេល​បន្ថែម​សារ​ទៅ​ថត %1 ក្នុង KMail"
 
diff --git a/tde-i18n-ko/messages/tdepim/kmailcvt.po b/tde-i18n-ko/messages/tdepim/kmailcvt.po
index 325e4e2e47a..f0abba4339a 100644
--- a/tde-i18n-ko/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-ko/messages/tdepim/kmailcvt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
 "Report-Msgid-Bugs-To: http://bugs.trinitydesktop.org\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2007-12-04 19:39+0900\n"
 "Last-Translator: Park Shinjo <peremen@gmail.com>\n"
 "Language-Team: Korean <cho.sungjae@gmail.com>\n"
@@ -29,11 +29,11 @@ msgid ""
 "Your emails"
 msgstr "peremen@gmail.com"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Evolution 1.x 지역 편지함과 폴더 구조 가져오기"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -44,57 +44,57 @@ msgstr ""
 "일 폴더를 선택하십시오. 대개 ~/evolution/local입니다.</p><p>폴더 구조를 다시 "
 "생성할 수 있기 때문에 \"Evolution 가져오기\" 폴더 아래에 저장됩니다.</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "디렉터리가 선택되지 않았습니다."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "가져올 파일이 없습니다."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "%1에서 메일 가져오기 완료"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "%1을(를) 열 수 없음, 건너뜀"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "%1에서 메시지 가져오는 중... "
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
 "%n duplicate messages not imported"
 msgstr "%n개의 중복된 메시지는 가지고 오지 않았습니다"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Evolution 2.x 지역 메일과 폴더 구조 가져오기"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -109,34 +109,34 @@ msgstr ""
 "약 선택했다면 매우 많은 새 폴더가 생성됩니다. </p><p>폴더 구조를 다시 생성할 "
 "수 있기 때문에 \"Evolution 가져오기\" 폴더 아래에 저장됩니다.</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "가져오기가 완료되었습니다. 사용자에 의해 취소되었습니다."
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "파일 %1 가져오기 시작..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "KMail 편지함과 폴더 구조 가져오기"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -153,22 +153,22 @@ msgstr ""
 "하는 KMail 메일 폴더를 가져올 수 없습니다.</p><p>폴더 구조를 다시 생성할 수 "
 "있기 때문에 \"KMail 가져오기\" 폴더 아래에 저장됩니다.</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "폴더 %1 가져오기... "
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "%1을(를) 가져올 수 없음"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "Lotus Notes 메시지 가져오기"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -184,25 +184,25 @@ msgstr ""
 "오.</p><p><b>메모:</b> 폴더 구조를 다시 생성할 수 있기 때문에 \"LNotus-Import"
 "\" 폴더 아래에 저장됩니다.</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "모든 파일 (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "%1에서 메시지 가져오는 중"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "메시지 %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "OS X 메일에서 가져오기"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -210,17 +210,17 @@ msgstr ""
 "<p><b>OS X 메일 가져오기 필터</b></p><p>이 필터는 애플 Mac OS X의 메일 클라이"
 "언트에서 전자 우편을 가져옵니다.</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "KMail의 폴더 %1(으)로 중복된 메시지 %n개를 가져오지 않았습니다"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "mbox 파일 가져오기 (UNIX, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -233,15 +233,15 @@ msgstr ""
 "서 메일을 가져올 경우 선택하십시오.</p><p><b>메모:</b>메시지는 원본 파일의 이"
 "름에 MBOX-가 앞에 붙은 폴더 안에 저장됩니다.</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "mbox 파일 (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Outlook Express 전자 우편 가져오기"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -257,44 +257,44 @@ msgstr ""
 "Settings</i></li></ul></p><p>폴더 구조를 다시 생성할 수 있기 때문에 Outlook "
 "Express 5나 6에서 가져온 폴더는 \"OE-Import\" 폴더 아래에 저장됩니다.</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "디렉터리 %1에 Outlook Express 편지함이 없습니다."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "폴더 구조 가져오는 중..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Outlook Express 편지함 가져오기 완료"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "편지함 %1을(를) 읽을 수 없음"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "OE4 편지함 %1 가져오는 중"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "OE5+ 편지함 %1 가져오는 중"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "OE5+ 폴더 파일 %1 가져오는 중"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Opera 메일 가져오기"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -309,20 +309,20 @@ msgstr ""
 "account*입니다.</p><p><b>메모:</b> 메시지들은 원본 계정의 이름에 OPERA-가 들"
 "어간 폴더로 모두 가져와집니다.</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "파일 개수 세는 중..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "새로운 메일 파일 가져오는 중..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Outlook 전자우편 가져오기"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -337,23 +337,23 @@ msgstr ""
 "메시지들은 원본 계정의 이름 앞에 OUTLOOK-이 붙은 이름의 폴더 아래에 저장됩니"
 "다.</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "편지 개수 세는 중..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "디렉터리 세는 중..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "폴더 세는 중..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "일반 텍스트 메일 가져오기"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -364,11 +364,11 @@ msgstr ""
 "렉토리 이름 앞에 PLAIN-이 붙은 이름의 폴더 아래 저장됩니다.</p><p>이 필터는 ."
 "msg, .eml, .txt 파일을 가져옵니다.</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Pegasus-Mail 폴더 가져오기"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -381,38 +381,38 @@ msgstr ""
 "입니다.</p><p><b>메모:</b>폴더 구조를 다시 생성할 수 있기 때문에 "
 "\"PegasusMail 가져오기\" 폴더 아래에 저장됩니다.</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
 msgstr "폴더 구조를 읽을 수 없어서 하위 폴더 지원 없이 가져옵니다."
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "새로운 편지 파일('.cnm') 가져오는 중..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "편지 폴더('.pmm') 가져오는 중... "
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "유닉스 편지함('.mbx') 가져오는 중..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "%1 가져오는 중"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "폴더 구조 처리 중..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Sylpheed 메일 디렉터리와 폴더 구조 가져오기"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -425,11 +425,11 @@ msgstr ""
 "때문에 \"Sylpheed 가져오기\" 폴더 아래에 저장됩니다.</p><p>이 필터는 새로 도"
 "착했거나 전달되었음 같은 메시지 상태도 가져옵니다.</p>"
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "The Bat! 메시지와 폴더 구조 가져오기"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -444,11 +444,11 @@ msgstr ""
 "니다.</p><p>폴더 구조를 다시 생성할 수 있기 때문에 \"TheBat-Import\" 폴더 아"
 "래에 저장됩니다.</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "Thunderbird/Mozilla Mail 지역 메시지와 폴더 구조 가져오기"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -464,7 +464,7 @@ msgstr ""
 "더 구조를 다시 생성할 수 있기 때문에 \"Thunderbird 가져오기\" 폴더 아래에 저"
 "장됩니다.</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -472,15 +472,15 @@ msgstr ""
 "<b>치명적 오류:</b> DCOP 통신을 위해서 KMail을 시작할 수 없습니다.<i>kmail</"
 "i>이 설치되어 있는지 확인하십시오."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "KMail에서 폴더 %1을(를) 만들 수 없습니다"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "KMail에서 폴더 %1에 메시지를 추가할 수 없습니다"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "KMail에서 폴더 %1에 메시지를 추가하는 중 오류 발생"
 
diff --git a/tde-i18n-lt/messages/tdepim/kmailcvt.po b/tde-i18n-lt/messages/tdepim/kmailcvt.po
index 258aabe733e..9eae525536b 100644
--- a/tde-i18n-lt/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-lt/messages/tdepim/kmailcvt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2005-09-02 17:30+0300\n"
 "Last-Translator: Donatas Glodenis <dgvirtual@akl.lt>\n"
 "Language-Team: Lithuanian <kde-i18n-lt@kde.org>\n"
@@ -31,12 +31,12 @@ msgid ""
 "Your emails"
 msgstr "eugenijus@agvila.lt,rch@richard.eu.org,dgvirtual@akl.lt"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 #, fuzzy
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Importuoti Evolution 2.x vietinį paštą ir aplankų struktūrą"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 #, fuzzy
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
@@ -51,46 +51,46 @@ msgstr ""
 "p><p>Kadangi šiuo metu nėra įmanoma atkurti aplankų struktūros, ji "
 "bus„įtraukta“ sukurtų aplankų pavadinimuose.</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "Nepasirinktas aplankas."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "Nerasta bylų importavimui."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "Baigiamas laiškų importavimas iš %1"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "Negalima atverti „%1“, ji praleidžiama"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "Importuojami laiškai iš %1..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
@@ -100,11 +100,11 @@ msgstr ""
 "Neimportuoti %n besidubliuojantys laiškai\n"
 "Neimportuota %n besidubliuojančių laiškų"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Importuoti Evolution 2.x vietinį paštą ir aplankų struktūrą"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 #, fuzzy
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
@@ -121,36 +121,36 @@ msgstr ""
 "p><p>Kadangi šiuo metu nėra įmanoma atkurti aplankų struktūros, ji "
 "bus„įtraukta“ sukurtų aplankų pavadinimuose.</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 #, fuzzy
 msgid "Finished import, canceled by user."
 msgstr "Užduoties atsisakė naudotojas."
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "Pradėti importuoti bylą %1..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 #, fuzzy
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Importuoti Evolution paštą ir aplankų struktūrą"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -161,24 +161,24 @@ msgid ""
 "\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 #, fuzzy
 msgid "Import folder %1..."
 msgstr "&Importuoti MBox aplanką..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "Nepavyko importuoti %1"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 #, fuzzy
 msgid "Import Lotus Notes Emails"
 msgstr "Importuoti Outlook paštą"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 #, fuzzy
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
@@ -195,26 +195,26 @@ msgstr ""
 "</b> laiškai bus importuoti į aplanką, pavadintą pagal bylą, iš kurios jie "
 "įkeliami, su priešdėliu MBOX-</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 #, fuzzy
 msgid "All Files (*)"
 msgstr "Visi Bylos"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, fuzzy, c-format
 msgid "Importing emails from %1"
 msgstr "Importuojami laiškai iš %1..."
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Laiškas %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "Importuoti iš OS X pašto"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -222,7 +222,7 @@ msgstr ""
 "<p><b>OS X pašto importo filtras</b></p><p>Šis filtras importuoja laiškus iš "
 "Apple Mac OS X.</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
@@ -231,11 +231,11 @@ msgstr ""
 "%n besidubliuojantys laiškai nebuvo importuoti į KMail aplanką %1\n"
 "%n besidubliuojančių laiškų nebuvo importuota į KMail aplanką %1"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Importuoti mbox bylas (UNIX, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -249,15 +249,15 @@ msgstr ""
 "</b> laiškai bus importuoti į aplanką, pavadintą pagal bylą, iš kurios jie "
 "įkeliami, su priešdėliu MBOX-</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "mbox bylos (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Importuoti Outlook Express paštą"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 #, fuzzy
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
@@ -276,45 +276,45 @@ msgstr ""
 "pavadintą pagal bylos, iš kurios jie imami, pavadinimą, pridedant priešdėlį "
 "OE-</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "Aplanke %1 nerasta Outlook Express pašto dėžučių."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 #, fuzzy
 msgid "Import folder structure..."
 msgstr "&Importuoti siuntimų sąrašą..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Outlook Express pašto importavimas baigtas"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Nepavyksta atidaryti pašto dėžutės „%1“"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "Importuojama OE4 pašto dėžutė %1"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "Importuojama OE5+ pašto dėžutė %1"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, fuzzy, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "Importuojama OE5+ pašto dėžutė %1"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Importuoti Opera paštą"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -329,20 +329,20 @@ msgstr ""
 "opera/mail/store/account*).</p><p><b>Pastaba:</b> Laiškai bus importuoti į "
 "aplanką pavadintą pagal paskyrą, su priešdėliu OPERA-</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Skaičiuojamos bylos..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Importuojami naujos pašto bylos..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Importuoti Outlook paštą"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -358,23 +358,23 @@ msgstr ""
 "b> Laiškai yra importuojami į aplanką, pavadintą pagal bylos, iš kurios jie "
 "imami, pavadinimą, pridedant priešdėlį OUTLOOK-</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "Skaičiuojami laiškai..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "Skaičiuojamos direktorijos..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "Skaičiuojami aplankai..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Importuoti paprasto teksto e. pašto laiškus"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -386,11 +386,11 @@ msgstr ""
 "buvi, su priešdėliu PLAIN-</p><p>Šis filtras importuos visus .msg, .eml and ."
 "txt bylose esančius e. pašto laiškus.</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Importuoti Pegasus-Mail aplankus"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 #, fuzzy
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
@@ -405,40 +405,40 @@ msgstr ""
 "greičiausiai toks importavimas bus vienetinis atvejis.</p><p><b>Pastaba:</b> "
 "Laiškai bus importuoti į aplanką su priešdėliu pmail-</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
 msgstr ""
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Importuoju naujas laiškų bylas („.cnm“) ..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Importuojami laiškų aplankai ('.pmm') ..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "Importuojami 'unix' pašto aplankai ('.mbx') ..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "Importuojama %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 #, fuzzy
 msgid "Parsing the folder structure..."
 msgstr "Panašių į šlamštą laiškų aplankas:"
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 #, fuzzy
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Importuoti Evolution paštą ir aplankų struktūrą"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -447,12 +447,12 @@ msgid ""
 "the status of message, e.g. new or forwarded."
 msgstr ""
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 #, fuzzy
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Importuoti Thunderbird vietinį paštą ir aplankų struktūrą"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -462,12 +462,12 @@ msgid ""
 "Import\" in your local account.</p>"
 msgstr ""
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 #, fuzzy
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "Importuoti Thunderbird vietinį paštą ir aplankų struktūrą"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 #, fuzzy
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
@@ -484,7 +484,7 @@ msgstr ""
 "sukurta daug naujų aplankų.</p><p>Kadangi šiuo metu nėra įmanoma atkurti "
 "aplankų struktūros, ji bus„įtraukta“ sukurtų aplankų pavadinimuose.</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -492,15 +492,15 @@ msgstr ""
 "<b>Lemtinga:</b> nepavyksta startuoti KMail DCOP ryšiui užmegsti. "
 "Įsitikinkite kad <i>kmail</i> yra įdiegtas."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "Negalima sukurti aplanko %1 KMail'e"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Negalima įdėti laiško į aplanką %1 KMail'e"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Klaida įdedant laišką į aplanką %1 KMail'e"
 
diff --git a/tde-i18n-lv/messages/tdepim/kmailcvt.po b/tde-i18n-lv/messages/tdepim/kmailcvt.po
index 42f12e9a386..00539ed6dfb 100644
--- a/tde-i18n-lv/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-lv/messages/tdepim/kmailcvt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2001-12-09 15:15EEST\n"
 "Last-Translator: Andris Maziks <andzha@latnet.lv>\n"
 "Language-Team: Latvian\n"
@@ -27,11 +27,11 @@ msgid ""
 "Your emails"
 msgstr "andris.m@delfi.lv"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -39,59 +39,59 @@ msgid ""
 "Import\".</p>"
 msgstr ""
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr ""
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr ""
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr ""
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 #, fuzzy
 msgid "Unable to open %1, skipping"
 msgstr "Nevar atvērt failu '%1'"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 #, fuzzy
 msgid "Importing emails from %1..."
 msgstr "Importēju pasta mapes ('.pmm') ..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, fuzzy, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
 "%n duplicate messages not imported"
 msgstr "Nevar pievienot ziņojumu mapei %1 kpastā"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -101,34 +101,34 @@ msgid ""
 "be stored under: \"Evolution-Import\".</p>"
 msgstr ""
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr ""
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr ""
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -139,24 +139,24 @@ msgid ""
 "\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 #, fuzzy
 msgid "Import folder %1..."
 msgstr "Importēju pasta mapes ('.pmm') ..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr ""
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 #, fuzzy
 msgid "Import Lotus Notes Emails"
 msgstr "Importēt Outlook Express 4"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -167,42 +167,42 @@ msgid ""
 "named using the names of the files the messages came from.</p>"
 msgstr ""
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr ""
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, fuzzy, c-format
 msgid "Importing emails from %1"
 msgstr "Importēju pasta mapes ('.pmm') ..."
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr ""
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr ""
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
 msgstr ""
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 #, fuzzy
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "Nevar pievienot ziņojumu mapei %1 kpastā"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr ""
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -211,16 +211,16 @@ msgid ""
 "prefixed with MBOX-</p>"
 msgstr ""
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr ""
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 #, fuzzy
 msgid "Import Outlook Express Emails"
 msgstr "Importēt Outlook Express 4"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -231,47 +231,47 @@ msgid ""
 "your local folder.</p>"
 msgstr ""
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, fuzzy, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "Meklēju Outlook Express 4 '.mbx' mapes direktorijā %1"
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 #, fuzzy
 msgid "Import folder structure..."
 msgstr "Importēju pasta mapes ('.pmm') ..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 #, fuzzy
 msgid "Finished importing Outlook Express emails"
 msgstr "%1 nav OE5 pastkastīte"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, fuzzy, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Nevar atvērt failu '%1'"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr ""
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr ""
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, fuzzy, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "Importēju pasta mapes ('.pmm') ..."
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 #, fuzzy
 msgid "Import Opera Emails"
 msgstr "Importēt Outlook Express 4"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -281,23 +281,23 @@ msgid ""
 "OPERA-</p>"
 msgstr ""
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 #, fuzzy
 msgid "Counting files..."
 msgstr "Skaitu failus ..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 #, fuzzy
 msgid "Importing new mail files..."
 msgstr "Importēju jaunos pasta failus ('.cnm') ..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 #, fuzzy
 msgid "Import Outlook Emails"
 msgstr "Importēt Outlook Express 4"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -307,26 +307,26 @@ msgid ""
 "OUTLOOK-</p>"
 msgstr ""
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 #, fuzzy
 msgid "Counting mail..."
 msgstr "Skaitu failus ..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 #, fuzzy
 msgid "Counting directories..."
 msgstr "Skaitu failus ..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 #, fuzzy
 msgid "Counting folders..."
 msgstr "Skaitu failus ..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr ""
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -334,12 +334,12 @@ msgid ""
 "emails.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 #, fuzzy
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Importēt Pegusus-Mail"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -348,41 +348,41 @@ msgid ""
 "p>"
 msgstr ""
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
 msgstr ""
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 #, fuzzy
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Importēju jaunos pasta failus ('.cnm') ..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 #, fuzzy
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Importēju pasta mapes ('.pmm') ..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 #, fuzzy
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "Importēju 'unix' pasta mapes ('.mbx') ..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr ""
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr ""
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -391,11 +391,11 @@ msgid ""
 "the status of message, e.g. new or forwarded."
 msgstr ""
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr ""
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -405,11 +405,11 @@ msgid ""
 "Import\" in your local account.</p>"
 msgstr ""
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -419,7 +419,7 @@ msgid ""
 "the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 #, fuzzy
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
@@ -428,17 +428,17 @@ msgstr ""
 "FATĀLI: Nevar startēt kpastu priekš dcop sakariem\n"
 "       pārliecinieties, ka 'kpasts' ir jūsu ceļā."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 #, fuzzy
 msgid "Cannot make folder %1 in KMail"
 msgstr "Nevar izveidot mapi %1 kmail"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 #, fuzzy
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Nevar pievienot ziņojumu mapei %1 kpastā"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 #, fuzzy
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Kļūda pievienojot ziņojumu mapei %1 kpastā"
diff --git a/tde-i18n-mk/messages/tdepim/kmailcvt.po b/tde-i18n-mk/messages/tdepim/kmailcvt.po
index 4c9b3718ea3..84cbb663bfe 100644
--- a/tde-i18n-mk/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-mk/messages/tdepim/kmailcvt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2007-02-28 14:27+0100\n"
 "Last-Translator: Bozidar Proevski <bobibobi@freemail.com.mk>\n"
 "Language-Team: Macedonian <mkde-l10n@lists.sourceforge.net>\n"
@@ -27,11 +27,11 @@ msgid ""
 "Your emails"
 msgstr "bobibobi@freemail.com.mk"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Внесување на локални пораки и структури на папки од Evolution 1.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -43,46 +43,46 @@ msgstr ""
 "можно да се обнови структурата на папките, тие ќе бидат внесени под "
 "„Evolution-Import“.</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "Нема избрана папка."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "Нема пронајдени папки за внесување."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "Завршив со внесување е-пораки од %1"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "Не можам да го отворам %1, прескокам"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "Внесувам е-пораки од %1..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
@@ -92,11 +92,11 @@ msgstr ""
 "Не се внесени %n пораки-дупликати\n"
 "Не се внесени %n пораки-дупликати"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Внесување на локални пораки и структури на пораки од Evolution 2.x"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -112,34 +112,34 @@ msgstr ""
 "многу нови папки.</p><p>Бидејќи е можно да се обнови структурата на папки, "
 "тие ќе бидат внесени под „Evolution-Import“.</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "Внесувањето е завршено, прекинато од корисникот."
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "Почеток на внесување на датотеката %1..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Внесување на Maildir-папки и структури на папки од КПошта"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -158,22 +158,22 @@ msgstr ""
 "датотеките, тие ќе бидат внесени под „KMail-Import“ во вашата локална папка."
 "</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "Внесување на папката %1..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "Не можев да ја внесам %1"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "Внесување на пораки од Lotus Notes"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -192,25 +192,25 @@ msgstr ""
 "Import“ во вашата локална папка, именувани според датотеките од каде што "
 "дошле.</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "Сите датотеки (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "Внесувам пораки од %1"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Порака %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "Внесување од е-поштата на OS X"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -218,7 +218,7 @@ msgstr ""
 "<p><b>Филтер за внес на е-пошта од OS X</b></p><p>Овој филтер внесува е-"
 "пошта од клиентот за е-пошта во Apple Mac OS X.</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
@@ -227,11 +227,11 @@ msgstr ""
 "Не се внесени %n пораки-дупликати во папката %1 во КПошта\n"
 "Не се внесени %n пораки-дупликати во папката %1 во КПошта"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Внесување на mbox-датотеки (UNIX, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -245,15 +245,15 @@ msgstr ""
 "традиционален UNIX-формат.</p><p><b>Забелешка:</b> Пораките ќе бидат внесени "
 "во папки именувани според датотеката од која што дошле, со префикс MBOX-</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "mbox-датотеки (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Внесување на пораки од Outlook Express"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -271,44 +271,44 @@ msgstr ""
 "истите од Outlook Express 5 и 6 ќе бидат внесени под „OE-Import“ во вашата "
 "локална папка.</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "Нема пронајдени поштенски сандачиња од Outlook Express во папката %1."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "Внесувам структура на папки..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Завршив со внесување пораки од Outlook Express"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Не можам да го отворам пошт. сандаче %1"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "Го внесувам пошт. сандаче %1 од OE4"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "Го внесувам пошт. сандаче %1 од OE5+ "
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "Ја внесувам датотеката %1 од папката на OE5+"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Внесување на пораки од Опера"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -324,20 +324,20 @@ msgstr ""
 "account*).</p><p><b>Забелешка:</b> Пораките ќе бидат внесени во папка со име "
 "како сметката од која што дошле, со префикс OPERA-</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Пребројувам датотеки..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Внесувам нови датотеки со пошта..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Внесување на пораки од Outlook"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -353,23 +353,23 @@ msgstr ""
 "b> Пораките ќе бидат внесени во папка именувана според сметката од која што "
 "дошле, со префикс OUTLOOK-</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "Пребројувам пораки..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "Пребројувам именици..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "Пребројувам папки..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Внесување на пораки како обичен текст"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -380,11 +380,11 @@ msgstr ""
 "внесени во папка со исто име како папката каде што биле, со префикс PLAIN-</"
 "p><p>Овој филтер ќе ги внесе сите датотеки со наставки .msg, .eml и .txt.</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Внесување на папки од Pegasus-Mail"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -398,7 +398,7 @@ msgstr ""
 "Бидејќи е можно да се обнови структурата на папките, тие ќе бидат зачувани "
 "под „PegasusMail-Import“.</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
@@ -406,32 +406,32 @@ msgstr ""
 "Не можам да ја анализирам структурата на папките, продолжувам со внесување "
 "без поддржка за потпапки."
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Внесувам нови пораки („.cnm“)..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Внесувам папки со пораки („.pmm“)..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "Внесувам „UNIX“ mail-папки („.mbx“)..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "Внесувам %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "Ја анализирам структурата на папките..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Внесување на Maildir-папките и структурите на папки од Sylpheed"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -445,11 +445,11 @@ msgstr ""
 "внесени под : „Sylpheed-Import“ во вашата локална папка.</p><p>Филтерот исто "
 "така го обновува и статусот на пораката како на пример нова или препратена."
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Внесување на пораки и структура на папки од The Bat!"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -465,12 +465,12 @@ msgstr ""
 "од IMAP/DIMAP-сметки.</p><p>Бидејќи е можно да се обнови структурата на "
 "папки, тие ќе бидат внесени под „TheBat-Import“ во вашата локална сметка.</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr ""
 "Внесување од локалните папки и структури на папки на Thunderbird/Mozilla"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -487,7 +487,7 @@ msgstr ""
 "да се обнови структурата на папките, тие ќе бидат внесени во „Thunderbird-"
 "Import“.</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -495,15 +495,15 @@ msgstr ""
 "<b>Фатално:</b> Не можам да ја стартувам КПошта за комуникација преку DCOP. "
 "Осигурете се дека е <i>КПошта</i> инсталирана."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "Не можам да ја направам папката %1 во КПошта"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Не можам да ја додадам пораката во папката %1 во КПошта"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Грешка при додавање на пораката во папката %1 во КПошта"
 
diff --git a/tde-i18n-ms/messages/tdepim/kmailcvt.po b/tde-i18n-ms/messages/tdepim/kmailcvt.po
index d3983ea4484..fb24facb49f 100644
--- a/tde-i18n-ms/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-ms/messages/tdepim/kmailcvt.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mimos\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2005-10-10 08:43+0800\n"
 "Last-Translator: MIMOS <opensource@mimos.my>\n"
 "Language-Team: Malay <kedidiemas@yahoogroups.com>\n"
@@ -25,11 +25,11 @@ msgid ""
 "Your emails"
 msgstr "opensource@mimos.my"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Impot Mel Setempat Evolution 1.x dan Struktur Folder"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -41,46 +41,46 @@ msgstr ""
 "boleh dicipta semula, folder akan distorkan di bawah: \"Evolution-Import\".</"
 "p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "Tiada direktori dipilih"
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "Tiada fail ditemui untuk import."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "Selesai mengimpot e-mel dari %1"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "Tidak dapat membuka %1, melangkau"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "Mengimport e-mel dari %1..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, fuzzy, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
@@ -89,11 +89,11 @@ msgstr ""
 "1 mesej duplikat tak diimport\n"
 "%n mesej duplikat tak diimport"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Import Mel Setempat  Evolution 2.x dan Struktur Folder"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -109,34 +109,34 @@ msgstr ""
 "menerima banyak folder.</p><p>Oleh sebab struktur folder boleh dicipta "
 "semula, folder akan disimpan di bawah: \"Evolution-Import\".</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "Import ditamatkan, dibatalkan oleh pengguna."
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "Mulakan import fail %1..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Import Meldir KMail dan Struktur Folder"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -154,23 +154,23 @@ msgstr ""
 "p><p>Oleh sebab struktur folder boleh dicipta semula, folder akan disimpan "
 "di bawah: \"KMail-Import\" dalam folder setempat anda.</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "Import folder %1..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "Tidak dapat mengimport %1"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 #, fuzzy
 msgid "Import Lotus Notes Emails"
 msgstr "Import e-mel Outlook"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 #, fuzzy
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
@@ -187,26 +187,26 @@ msgstr ""
 "ini.</p><p><b>Perhatian:</b> E-mel akan diimport ke dalam folder yang "
 "dinamakan berdasarkan folder asal, dengan awalan MBOX-</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 #, fuzzy
 msgid "All Files (*)"
 msgstr "Fail mbox (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, fuzzy, c-format
 msgid "Importing emails from %1"
 msgstr "Mengimport e-mel dari %1..."
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Mesej %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "Import dari Mel OS X"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -214,7 +214,7 @@ msgstr ""
 "<p><b>Penapis Import Mel OS X </b></p><p>Penapis ini mengimport e-mel dari "
 "pelanggan Apple Mac OS X.</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 #, fuzzy
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
@@ -223,11 +223,11 @@ msgstr ""
 "1 mesej duplikat yang tak diimport ke folder %1 dalam KMail\n"
 "%n mesej duplikat yang tak diimport ke folder  %1 dalam KMail"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Import Fail mbox (UNIX, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -241,15 +241,15 @@ msgstr ""
 "ini.</p><p><b>Perhatian:</b> E-mel akan diimport ke dalam folder yang "
 "dinamakan berdasarkan folder asal, dengan awalan MBOX-</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "Fail mbox (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Import Emel Outlook Express"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -267,44 +267,44 @@ msgstr ""
 "folder dari Outlook Express 5 and 6 akan disimpan di bawah: \"OE-Import\" di "
 "dalam folder setempat anda.</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "Tiada kotak mel Outlook Express ditemui dalam direktori %1."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "Import struktur folder..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Import e-mel Outlook Express tamat"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Tidak dapat membuka kotak mel %1"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "Mengimport Kotak Mel  OE4 %1"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "Mengimport Kotak Mel  OE5+ %1"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "Mengimport Fail Folder  OE5+ %1"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Import e-mel Opera"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -320,20 +320,20 @@ msgstr ""
 "diimport ke satu folder yang dinamakan berdasarkan akaun asal mereka, dengan "
 "awalan  OPERA-</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Menghitung fail..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Mengimport fail mel baru..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Import e-mel Outlook"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -349,23 +349,23 @@ msgstr ""
 "diimport ke dalam folder yang dinamakan berdasarkan akaun asal, dengan "
 "awalan  OUTLOOK-</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "Menghitung mel..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "Menghitung direktori..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "Menghitung folder..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Import e-mel teks biasa"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -377,11 +377,11 @@ msgstr ""
 "awalan PLAIN-</p><p>Penapis ini akan mengimport semua e-mel  .msg, .eml dan ."
 "txt.</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Import folder dari Mel Pegasus"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -395,7 +395,7 @@ msgstr ""
 "folder boleh dicipta, folder akan disimpan di bawah: \"PegasusMail-Import\"."
 "</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
@@ -403,32 +403,32 @@ msgstr ""
 "Tidak dapat mengkaji hurai struktur folder; import diteruskan tanpa sokongan "
 "subfolder."
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Mengimport fail mel baru ('.cnm')..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Mengimport folder mel ('.pmm')..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "Mengimport folder mel  'UNIX'  ('.mbx')..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "Mengimport %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "Mengkaji hurai struktur folder..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Import Meldir Sylpheed dan Struktur Folder"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -442,11 +442,11 @@ msgstr ""
 "\"Sylpheed-Import\" dalam folder setempat anda.</p><p>Penapis ini juga "
 "mencipta semula status mesej, misalnya baru atau diperpanjang."
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Import Mel Bat! dan Struktur Folder "
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -462,11 +462,11 @@ msgstr ""
 "boleh dicipta semula, folder akan disimpan di bawah: \"TheBat-Import\" dalam "
 "akaun setempat anda.</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "Import Mel Setempat dan Struktur FolderThunderbird/Mozilla "
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -483,7 +483,7 @@ msgstr ""
 "boleh dicipta semula, folder akan distorkan di bawah: \"Thunderbird-Import\"."
 "</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -491,15 +491,15 @@ msgstr ""
 "<b>Fatal:</b> Tidak dapat memulakan KMail untuk komunikasi  DCOP. Pastikan "
 "<i>kmail</i> telah dipasang."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "Tidak dapat membuat folder %1 dalam KMail"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Tidak dapat menambah mesej ke folder %1 dalam KMail"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Ralat semasa menambah mesej ke folder %1 dalam KMail"
 
diff --git a/tde-i18n-nb/messages/tdepim/kmailcvt.po b/tde-i18n-nb/messages/tdepim/kmailcvt.po
index 5e46a5647f1..6f0a793cd9f 100644
--- a/tde-i18n-nb/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-nb/messages/tdepim/kmailcvt.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2006-01-28 15:44+0100\n"
 "Last-Translator: Lars Risan <lrisan@tik.uio.no>\n"
 "Language-Team: Norsk bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -39,11 +39,11 @@ msgstr ""
 "knuty@skolelinux.no,bjornst@powertech.no,project@nilsk.net, axelb@skolelinux."
 "no"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Importer lokale e-poster og mappestrukturen fra Evolution 1.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -57,46 +57,46 @@ msgstr ""
 "er mulig å gjenopprette mappestrukturen, vil mappene bli lagret under "
 "«Evolution-Import».</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "Ingen mappe valgt"
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "Ingen filer funnet for import"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "Ferdig med å importere e-poster fra %1"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "Klarte ikke åpne %1, hopper over"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "Importerer e-post fra %1 …"
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
@@ -105,11 +105,11 @@ msgstr ""
 "1 duplikatmelding ble ikke importert\n"
 "%n duplikatmeldinger ble ikke importert"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Importer lokale e-poster og mappestruktur fra Evolution 2.x "
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -125,34 +125,34 @@ msgstr ""
 "mulig å gjenopprette mappestrukturen, vil mappene bli lagret under "
 "«Evolution-Import».</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "Ferdig å importere, avbrutt av brukeren."
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "Start import av fila %1 …"
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Importer e-post og mappestruktur fra Kmails «Maildir»"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -170,22 +170,22 @@ msgstr ""
 "gjenopprette mappestrukturen vil mappene bli lagret under «KMail-Import» i "
 "din lokale e-postmappe.</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "Importer mappa %1 …"
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "Kunne ikke importere %1"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "Importer e-post fra «Lotus Notes»"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -204,25 +204,25 @@ msgstr ""
 "importerte meldinger havne i mapper under «LNotes-Import» i din lokale e-"
 "postmappe. Disse mappene vil få navn etter filene som e-postene kom fra</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "Alle filer (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "Importerer e-post fra %1"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Melding %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "Importer mapper fra «OS X Mail»"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -230,7 +230,7 @@ msgstr ""
 "<p><b>Filter for import av meldinger fra OS X Mail</b></p> <p>Dette filteret "
 "importerer meldinger fra e-postklienten i Apple Max OS X.</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
@@ -238,11 +238,11 @@ msgstr ""
 "1 duplikat melding ikke importert til mappa %1 i KMail\n"
 "%n duplikatmeldinger ble ikke importert til mappa %1 i KMail"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Importer mbox-filer (Unix, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -256,15 +256,15 @@ msgstr ""
 "UNIX-formatet.</p><p><b>Merk:</b> E-poster blir importert til mapper som får "
 "navn etter den fila de kom fra og med forstavelsen «MBOX-»</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "mbox-filer (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Importer Outlook Express e-poster"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -281,44 +281,44 @@ msgstr ""
 "mulig å gjenopprette mappestrukturen vil mapper fra Outlook Express 5 og 6 "
 "bli lagret under «OE-Import» i din lokale e-postmappe.</p> "
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "Fant ingen postkasser for Outlook Express i mappa %1."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "Importer mappestrukturen …"
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Ferdig å importere e-post fra Outlook Express"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Klarer ikke åpne postboksen %1"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "Importerer OE4-postboksen %1"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "Importerer OE5+-postboksen %1"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "Importerer mappefila %1 fra OE5+"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Importer e-post fra Opera"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -333,20 +333,20 @@ msgstr ""
 "mail/store/account*).</p><p><b>Merk:</b> E-poster vil bli importert til en "
 "mappe som får navn etter kontoen de kom fra og med forstaveøsen «OPERA-»</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Teller filer …"
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Importerer nye e-postfiler …"
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Importer e-post fra Outlook"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -361,23 +361,23 @@ msgstr ""
 "i> i Windows 2000 eller senere</p><p><b>Merk:</b>E-post vil importeres til "
 "mapper som får navn fra filene de kom fra, med forstavelsen «OUTLOOK-».</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "Teller e-poster …"
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "Teller kataloger …"
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "Teller mapper …"
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Importer e-post i ren tekst"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -388,11 +388,11 @@ msgstr ""
 "i en mappe med samme navnet som mappa de var i med forstavelsen «PLAIN-»</"
 "p><p>Dette filteret importerer alle .msg, .eml og .txt e-poster.</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Importer mapper fra Pegasus-e-post"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -405,7 +405,7 @@ msgstr ""
 "\\pmail\\mail\\admin </p><p><b>Merk:</b> Siden det er mulig å importere "
 "mappestrukturen vil mappene bli lagret under «PegasusMail-Import».</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
@@ -413,32 +413,32 @@ msgstr ""
 "Klarte ikke å tolke mappestrukturen; fortsetter importeringa uten støtte for "
 "undermapper."
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Importerer filer med ny e-post («.cnm») …"
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Importerer postmapper («.pmm») …"
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "Importerer «UNIX» e-postmapper («.mbx») …"
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "Importerer %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "Tolker mappestrukturen …"
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Importer e-post og mappestruktur fra Sylpheeds «Maildir»"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -452,11 +452,11 @@ msgstr ""
 "Import» i din lokale e-postmappe.</p> <p>Dette filteret opprettholder også "
 "statusen på meldingene, f.eks. «Ny» eller «Videresendt»."
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Importer e-post-meldinger og mappestruktur fra «The Bat!»"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -472,11 +472,11 @@ msgstr ""
 "gjenopprette mappestrukturen så vil mappene bli lagret under «The Bat."
 "import» i din lokale e-postmappe.</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "Importer lokale meldinger og mappestruktur fra Thunderbird/Mozilla"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -492,7 +492,7 @@ msgstr ""
 "mapper.</p><p>Siden det er mulig å gjenopprette mappestrukturen, vil mappa "
 "bli lagret under «Thunderbird-Import»</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -500,15 +500,15 @@ msgstr ""
 "<b>Fatalt:</b> Klarte ikke starte KMail for DCOP-kommunikasjon. Sjekk at "
 "<i>kmail</i> er installert."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "Klarte ikke lage mappa %1 i KMail"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Klarte ikke legge til melding i mappa %1 i KMail"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Det oppsto en feil når meldinga ble lagt til mappa %1 i KMail"
 
diff --git a/tde-i18n-nds/messages/tdepim/kmailcvt.po b/tde-i18n-nds/messages/tdepim/kmailcvt.po
index 0ebbd3263a6..4766836bf07 100644
--- a/tde-i18n-nds/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-nds/messages/tdepim/kmailcvt.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2006-12-23 23:12+0100\n"
 "Last-Translator: Sönke Dibbern <s_dibbern@web.de>\n"
 "Language-Team: Low Saxon <kde-i18n-nds@kde.org>\n"
@@ -26,11 +26,11 @@ msgid ""
 "Your emails"
 msgstr "s_dibbern@web.de"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Lokaal Nettbreven un Ornerstruktuur ut Evolution 1.x importeren"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -42,46 +42,46 @@ msgstr ""
 "Struktuur vun de Ornern warrt övernahmen, se dukt ünner \"Evolution-Import\" "
 "op.</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "Keen Orner utsöcht."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "Keen Dateien för't Importeren funnen."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "Import vun Nettbreven vun %1 is afslaten"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "%1 lett sik nich opmaken, warrt övergahn"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "Nettbreven vun %1 warrt importeert..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
@@ -90,11 +90,11 @@ msgstr ""
 "1 dubbelt Naricht nich importeert\n"
 "%n dubbelte Narichten nich importeert"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Lokaal Nettbreven un Ornerstruktuur ut Evolution 2.x importeren"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -110,34 +110,34 @@ msgstr ""
 "kriggst Du en Barg niege Ornern.</p><p>Ok de Struktuur vun de Ornern warrt "
 "övernahmen, se dukt ünner \"Evolution-Import\" op.</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "Importeren beendt, Bruker hett afbraken"
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "Import vun Datei \"%1\" start..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Nettpostornern un Ornerstruktuur ut KMail importeren"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -154,22 +154,22 @@ msgstr ""
 "Filter importeert keen KMail-Ornern mit mbox-Dateien.</p><p>Ok de Struktuur "
 "vun de Ornern warrt övernahmen, se dukt ünner \"KMail-Import\" op.</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "Orner \"%1\" importeren..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "\"%1\" lett sik nich importeren"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "Nettbreven ut Lotus Notes importeren"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -187,25 +187,25 @@ msgstr ""
 "de Struktuur vun de Ornern warrt övernahmen, se dukt ünner \"LNotes-Import\" "
 "op un warrt na de Dateien nöömt, ut de de Narichten dor binnen kemen.</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "All Dateien (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "Nettbreven vun \"%1\" warrt importeert"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Naricht %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "Nettbreven ut OS X-Mail importeren"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -213,7 +213,7 @@ msgstr ""
 "<p><b>Importfilter för OS X-Mail </b></p><p>Disse Filter importeert "
 "Nettbreven ut dat Nettpostprogramm vun Apple MacOS X</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
@@ -221,11 +221,11 @@ msgstr ""
 "1 dubbelt Naricht nich na Orner %1 vun KMail importeert\n"
 "%n dubbelt Narichten nich na Orner %1 vun KMail importeert"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Mbox-Dateien importeren (UNIX, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -239,15 +239,15 @@ msgstr ""
 "p><p><b>Beacht bitte</b>: De Nettbreven warrt na Ornern importeert, de "
 "\"MBOX-<i>Borndateinaam</i>\" nöömt warrt.</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "Mbox-Dateien (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Nettbreven vun Outlook-Express importeren"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -265,44 +265,44 @@ msgstr ""
 "Struktuur vun de Ornern warrt vun Outlook Express 5 un 6 övernahmen, se dukt "
 "ünner \"OE-Import\" op.</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "Keen Nettpost vun Outlook Express binnen den Orner %1 funnen."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "Ornerstruktuur warrt importeert..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Nettpost-Import ut Outlook Express afslaten."
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Postfach \"%1\" lett sik nich opmaken"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "OE4-Postfach \"%1\" warrt importeert"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "OE5/6-Postfach \"%1\" warrt importeert"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "OE5/6-Ornerdatei \"%1\" warrt importeert"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Nettbreven ut Opera importeren"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -318,20 +318,20 @@ msgstr ""
 "b>: De Nettbreven warrt na en Orner importeert, de \"OPERA-<i>Kontonaam</i>"
 "\" nöömt warrt.</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Dateien warrt tellt..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Nieg Nettpostdateien warrt importeert..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Nettbreven ut Outlook importeren"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -348,23 +348,23 @@ msgstr ""
 "p><p><b>Beacht bitte</b>: De Nettbreven warrt na en Orner importeert, de "
 "\"OUTLOOK-<i>Kontonaam</i>\" nöömt warrt.</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "Nettbreven warrt tellt..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "Verteken warrt tellt..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "Ornern warrt tellt..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Eenfachtext-Nettbreven importeren"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -375,11 +375,11 @@ msgstr ""
 "Orner importeert, de \"PLAIN-<i>Bornorner</i>\" heet.</p><p>Disse Filter "
 "warrt all *.msg-, *.eml- un *.txt-Nettbreven importeren.</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Nettpostornern ut Pegasus-Mail importeren"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -393,7 +393,7 @@ msgstr ""
 "Struktuur vun de Ornern warrt övernahmen, se dukt ünner \"PegasusMail-Import"
 "\" op.</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
@@ -401,32 +401,32 @@ msgstr ""
 "Ornerstruktuur lett sik nich inlesen, Import warrt ahn Ünnerstütten för "
 "Ünnerornern wiedermaakt"
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Nieg Nettpostdateien (\"*.cnm\") warrt importeert..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Nettpostornern (\"*.pmm\") warrt importeert..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "\"UNIX\"-Nettpostornern (\"*.mbx\") warrt importeert..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "%1 warrt importeert"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "Ornerstruktuur warrt inleest..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Nettpostornern un Ornerstruktuur ut Sylpheed importeren"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -439,11 +439,11 @@ msgstr ""
 "de Ornern warrt övernahmen, se dukt ünner \"Sylpheed-Import\" op.</"
 "p><p>Disse Filter wohrt den Narichtentostand, t.B. Nieg oder Wiederleddt."
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Nettbreven un Ornerstruktuur ut The Bat! importeren"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -458,11 +458,11 @@ msgstr ""
 "vun POP-Kontos, man nich vun IMAP/DIMAP-Kontos.</p><p>Ok de Struktuur vun de "
 "Ornern warrt övernahmen, se dukt ünner \"TheBat-Import\" op.</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "Lokaal Nettbreven un Ornerstruktuur ut Thunderbird/Mozilla importeren"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -479,7 +479,7 @@ msgstr ""
 "p><p>Ok de Struktuur vun de Ornern warrt övernahmen, se dukt ünner "
 "\"Thunderbird-Import\" op.</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -487,15 +487,15 @@ msgstr ""
 "<b>Swoor Fehler</b>: KMail lett sik nich för de DCOP-Kommunikatschoon "
 "starten. Prööv bitte, wat <i>kmail</i> installeert is."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "Orner \"%1\" lett sik in KMail nich opstellen"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Naricht lett sik nich den KMail-Orner \"%1\" tofögen"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Fehler bi't Tofögen vun en Naricht na den KMail-Orner \"%1\""
 
diff --git a/tde-i18n-nl/messages/tdepim/kmailcvt.po b/tde-i18n-nl/messages/tdepim/kmailcvt.po
index e7fd7ceb343..336fba8e433 100644
--- a/tde-i18n-nl/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-nl/messages/tdepim/kmailcvt.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2005-12-31 00:45+0100\n"
 "Last-Translator: Bram Schoenmakers <bramschoenmakers@kde.nl>\n"
 "Language-Team: Nederlands <kde-i18n-nl@kde.org>\n"
@@ -34,11 +34,11 @@ msgid ""
 "Your emails"
 msgstr "h.dijkema@hum.org,rinse@kde.nl,bramschoenmakers@kde.nl"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Berichten en mappenstructuur van Evolution 1.x importeren"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -50,46 +50,46 @@ msgstr ""
 "<p>Omdat het mogelijk is om een nieuwe mappenstructuur aan te maken worden "
 "alle mappen onder \"Evolution-Import\" geplaatst.</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "Geen map geselecteerd."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "Geen bestanden gevonden om te importeren."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "Import van e-mailberichten uit %1 is voltooid"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "%1 kan niet worden geopend en wordt daarom overgeslagen"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "E-mailberichten van %1 worden geïmporteerd..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
@@ -98,11 +98,11 @@ msgstr ""
 "1 dubbel bericht niet geïmporteerd\n"
 "%n dubbele berichten niet geïmporteerd"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Berichten en mappenstructuur van Evolution 2.x importeren"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -118,34 +118,34 @@ msgstr ""
 "veel nieuwe mappen.</p> <p>Omdat de mappenstructuur opnieuw aangemaakt kan "
 "worden, zullen de mappen opgeslagen worden onder: \"Evolution-Import\".</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "Importeren voltooid, geannuleerd door gebruiker."
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "Begonnen met bestand %1 te importeren..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Maildirs en mappenstructuur van KMail importeren"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -164,22 +164,22 @@ msgstr ""
 "zullen de mappen opgeslagen worden in uw lokale map onder: \"KMail-Import\"."
 "</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "Map %1 importeren..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "Kon %1 niet importeren"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "E-mailberichten van Lotus Notes importeren"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -198,25 +198,25 @@ msgstr ""
 "te maken zullen de geïmporteerde berichten in submappen geplaatst worden "
 "onder: \"LNotes-Import\".</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "Alle bestanden (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "E-mailberichten van %1 worden geïmporteerd"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Bericht %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "Van OS X Mail importeren"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -224,7 +224,7 @@ msgstr ""
 "<p><b>Importfilter voor OS X Mail</b></p><p> Dit filter importeert e-"
 "mailberichten van het e-mailprogramma van Apple Mac OS X.</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
@@ -232,11 +232,11 @@ msgstr ""
 "1 dubbel bericht werd niet geïmporteerd in de map %1 van KMail.\n"
 "%n dubbele berichten werden niet geïmporteerd in de map %1 van KMail."
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "mbox-bestanden importeren (UNIX, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -251,15 +251,15 @@ msgstr ""
 "geïmporteerd naar mappen die vernoemd worden naar het bestand waar de "
 "berichten uit gehaald worden, met als voorvoegsel MBOX-.</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "mbox-bestanden (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Berichten van Outlook Express importeren"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -277,45 +277,45 @@ msgstr ""
 "aan te maken, zullen de mappen van Outlook Express 5 en 6 geplaatst worden "
 "onder \"OE-Import\" in uw lokale map.</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr ""
 "Er zijn geen postbusbestanden van Outlook Express gevonden in de map %1."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "Mappenstructuur importeren..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "De import van Outlook Expres-berichten is voltooid."
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Postbus %1 kon niet worden geopend."
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "OE4-postbus %1 wordt geïmporteerd"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "OE5-postvak %1 wordt geïmporteerd"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "OE5 wordt geïmporteerd met het mapbestand %1"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Berichten van Opera importeren"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -332,20 +332,20 @@ msgstr ""
 "geplaatst met een naam aan de hand van het account waar ze toe behoren, "
 "voorafgegaan aan OPERA-</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Bestanden worden geteld..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Nieuwe e-mailbestanden worden geïmporteerd..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Berichten van Outlook importeren"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -360,23 +360,23 @@ msgstr ""
 "<p><b>Opmerking:</b> E-mailberichten worden in een map geplaatst dat naar "
 "het account vernoemd wordt, voorafgegaan aan OUTLOOK-.</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "Berichten worden geteld..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "Mappen worden geteld..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "Mappen worden geteld..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "E-mailberichten in platte-tekst importeren"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -388,11 +388,11 @@ msgstr ""
 "de map waar ze uitkomen, met als voorvoegsel PLAIN-</p> <p>Dit filter "
 "importeert alle .msg .eml en .txt-e-mailberichten.</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Mappen van Pegasus Mail importeren"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -406,7 +406,7 @@ msgstr ""
 "opnieuw aangemaakt kan worden, zullen de mappen geplaatst worden onder: "
 "\"PegasusMail-Import\".</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
@@ -414,32 +414,32 @@ msgstr ""
 "Kon de mappenstructuur niet ontleden, de import wordt voortgezet zonder "
 "ondersteuning voor submappen."
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Nieuwe e-mailbestanden worden geïmporteerd ('.cnm') ..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "E-mailmappen worden geïmporteerd ( '.pmm') ..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "UNIX e-mailmappen worden geïmporteerd ('.mbx') ..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "Bezig met importeren van %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "De mappenstructuur wordt ontleed..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Berichten en mappenstructuur van Sylpheed importeren"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -453,11 +453,11 @@ msgstr ""
 "onder \"Sylpheed-Import\" in uw lokale map.</p> <p>Deze map maakt ook een "
 "nieuwe status aan voor berichten, bijvoorbeeld 'nieuw' of 'doorgestuurd'."
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Berichten en mappenstructuur van The Bat! importeren"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -474,11 +474,11 @@ msgstr ""
 "aan te maken worden de mappen geplaatst in de map \"TheBat-Import\" in uw "
 "lokale account.</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "Berichten en mappenstructuur van Thunderbird/Mozilla importeren"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -495,7 +495,7 @@ msgstr ""
 "nieuwe mappenstructuur aan te maken, de mappen zullen in \"Thunderbird-Import"
 "\" geplaatst worden.</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -503,15 +503,15 @@ msgstr ""
 "<b>Fataal:</b> Kmail kan niet worden gestart voor DCOP-communicatie. "
 "Controleer of <i>kmail</i> is geïnstalleerd."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "Map %1 kan niet in kmail worden aangemaakt"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Het bericht kan niet aan de map %1 in kmail worden toegevoegd"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Fout bij het toevoegen van bericht aan de map %1 in kmail"
 
diff --git a/tde-i18n-nn/messages/tdepim/kmailcvt.po b/tde-i18n-nn/messages/tdepim/kmailcvt.po
index b96bd843601..10f364146df 100644
--- a/tde-i18n-nn/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-nn/messages/tdepim/kmailcvt.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2005-05-12 17:57+0200\n"
 "Last-Translator: Gaute Hvoslef Kvalnes <gaute@verdsveven.com>\n"
 "Language-Team: Norwegian Nynorsk <i18n-no@lister.ping.uio.no>\n"
@@ -34,12 +34,12 @@ msgid ""
 "Your emails"
 msgstr "gaute@verdsveven.com, korsvoll@skolelinux.no"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 #, fuzzy
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Importer lokal e-post og mappestruktur frå Evolution 2.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 #, fuzzy
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
@@ -54,46 +54,46 @@ msgstr ""
 "</p> <p>Det er ikkje mogleg å gjenoppretta mappestrukturen, så mappenamna "
 "vil i staden visa strukturen.</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "Inga mappe er vald"
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "Fann ingen filer som kunne importerast."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "Ferdig med å importera e-postar frå %1"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "Klarte ikkje opna %1, hoppar over"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "Importerer e-post frå %1 …"
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
@@ -102,11 +102,11 @@ msgstr ""
 "Éi lik melding ikkje importert\n"
 "%n like meldingar ikkje importerte"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Importer lokal e-post og mappestruktur frå Evolution 2.x"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 #, fuzzy
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
@@ -123,35 +123,35 @@ msgstr ""
 "</p> <p>Det er ikkje mogleg å gjenoppretta mappestrukturen, så mappenamna "
 "vil i staden visa strukturen.</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr ""
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "Start import av fila %1 …"
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 #, fuzzy
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Importer e-post og mappestruktur frå Evolution"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -162,24 +162,24 @@ msgid ""
 "\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 #, fuzzy
 msgid "Import folder %1..."
 msgstr "Start import av fila %1 …"
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "Klarte ikkje importera %1"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 #, fuzzy
 msgid "Import Lotus Notes Emails"
 msgstr "Importer e-post frå Outlook"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 #, fuzzy
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
@@ -196,26 +196,26 @@ msgstr ""
 "UNIX-formatet.</p><p><b>Merk:</b> E-postar vil verta importerte til mapper "
 "med namn etter den fila dei kom frå og med førestavinga MBOX-</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 #, fuzzy
 msgid "All Files (*)"
 msgstr "mbox-filer (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, fuzzy, c-format
 msgid "Importing emails from %1"
 msgstr "Importerer e-post frå %1 …"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Melding %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "Importer mapper frå OS X Mail"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -223,7 +223,7 @@ msgstr ""
 "<p><b>Filter for import frå OS X Mail</b></p> <p>Dette filteret importerer "
 "meldingar frå e-postklienten i Apple Mac OS X.</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
@@ -231,11 +231,11 @@ msgstr ""
 "Éi lik melding ikkje importert til mappa %1 i KMail\n"
 "%n like meldingar ikkje importerte til mappa %1 i KMail"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Importer mbox-filer (Unix, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -249,15 +249,15 @@ msgstr ""
 "UNIX-formatet.</p><p><b>Merk:</b> E-postar vil verta importerte til mapper "
 "med namn etter den fila dei kom frå og med førestavinga MBOX-</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "mbox-filer (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Importer e-post frå Outlook Express"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 #, fuzzy
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
@@ -275,45 +275,45 @@ msgstr ""
 "vil verta importerte til mapper med namn etter den fila dei kom frå, med "
 "førestavinga OE-</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "Ingen e-postboksar for Outlook Express vart funne i mappa %1."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 #, fuzzy
 msgid "Import folder structure..."
 msgstr "Importer e-post og mappestruktur frå Evolution"
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Ferdig med å importera e-postar frå Outlook Express"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Klarte ikkje opna postboksen %1"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "Importerer OE4-postboksen %1"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "Importerer OE5+-postboksen %1"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, fuzzy, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "Ignorerer OE5+-mappefila %1"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Importer e-post frå Opera"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -329,20 +329,20 @@ msgstr ""
 "mapper som er namngjevne etter den fila dei kom frå og med førestavinga "
 "OPERA-</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Tel filer …"
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Importerer nye e-postfiler …"
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Importer e-post frå Outlook"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -358,23 +358,23 @@ msgstr ""
 "importerte til mapper med namn etter den fila dei kom frå, med førestavinga "
 "OUTLOOK-</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "Tel e-post …"
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "Tel katalogar …"
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "Tel mapper …"
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Importer e-post i rein tekst"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -385,11 +385,11 @@ msgstr ""
 "ei mappe med same namnet som katalogen dei var i med førestavinga PLAIN-</"
 "p><p>Dette filteret vil importera alle .msg, .eml og .txt e-postar.</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Importer mapper frå Pegasus-epost"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 #, fuzzy
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
@@ -404,39 +404,39 @@ msgstr ""
 "Du vil derimot truleg berre gjera dette ein gong.</p><p><b>Merk:</b> E-"
 "postar vil bli importert i mapper med førestavinga pmail-</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
 msgstr ""
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Importerer nye e-postfiler («.cnm») …"
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Importerer e-postmapper («.pmm») …"
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "Importerer «UNIX»-e-postmapper («.mbx») …"
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "Importerer %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr ""
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 #, fuzzy
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Importer e-post og mappestruktur frå Evolution"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -445,12 +445,12 @@ msgid ""
 "the status of message, e.g. new or forwarded."
 msgstr ""
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 #, fuzzy
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Importer lokal e-post og mappestruktur frå Thunderbird"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -460,12 +460,12 @@ msgid ""
 "Import\" in your local account.</p>"
 msgstr ""
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 #, fuzzy
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "Importer lokal e-post og mappestruktur frå Thunderbird"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 #, fuzzy
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
@@ -482,7 +482,7 @@ msgstr ""
 "massevis av nye mapper.</p> <p>Det er ikkje mogleg å gjenoppretta "
 "mappestrukturen, så mappenamna vil i staden visa strukturen.</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -490,15 +490,15 @@ msgstr ""
 "<b>Fatalt:</b> Klarte ikkje starta KMail for DCOP-kommunikasjon. Sjå til at "
 "<i>kmail</i> er installert."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "Klarte ikkje laga mappa %1 i KMail"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Klarte ikkje leggja melding til i mappa %1 i KMail"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Feil oppsto når meldinga blei lagt til mappa %1 i KMail"
 
diff --git a/tde-i18n-pa/messages/tdepim/kmailcvt.po b/tde-i18n-pa/messages/tdepim/kmailcvt.po
index f94d915a94e..224dc2e083c 100644
--- a/tde-i18n-pa/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-pa/messages/tdepim/kmailcvt.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2007-01-17 10:47+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
@@ -27,11 +27,11 @@ msgid ""
 "Your emails"
 msgstr "aalam@redhat.com,aalam@users.sf.net"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -39,57 +39,57 @@ msgid ""
 "Import\".</p>"
 msgstr ""
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "ਕੋਈ ਡਾਇਰੈਕਟਰੀ ਚੁਣੀ ਨਹੀਂ ਹੈ।"
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "ਆਯਾਤ ਕਰਨ ਲਈ ਕੋਈ ਫਾਇਲ ਨਹੀਂ ਹੈ।"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "%1 ਤੋਂ ਈਮੇਲ ਆਯਾਤ ਕਰਨਾ ਮੁਕੰਮਲ ਹੋਇਆ"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "%1 ਨੂੰ ਖੋਲ੍ਹਣ ਲਈ ਅਸਫ਼ਲ, ਅਧੂਰਾ ਛੱਡਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "%1 ਤੋਂ ਈ-ਮੇਲਾਂ ਆਯਾਤ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
 "%n duplicate messages not imported"
 msgstr ""
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -99,34 +99,34 @@ msgid ""
 "be stored under: \"Evolution-Import\".</p>"
 msgstr ""
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "ਆਯਾਤ ਕਰਨ ਖਤਮ, ਉਪਭੋਗੀ ਨੇ ਖਤਮ ਕੀਤਾ ਹੈ।"
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "ਫਾਇਲ %1 ਆਯਾਤ ਕਰਨੀ ਸ਼ੁਰੂ..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -137,22 +137,22 @@ msgid ""
 "\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "ਫੋਲਡਰ %1 ਆਯਾਤ..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "%1 ਨੂੰ ਆਯਾਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "ਲੋਟਸ ਸੂਚਨਾ ਈ-ਮੇਲ ਅਯਾਤ"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -163,41 +163,41 @@ msgid ""
 "named using the names of the files the messages came from.</p>"
 msgstr ""
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "ਸਭ ਫਾਇਲਾਂ (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "%1 ਤੋਂ ਈ-ਮੇਲ ਆਯਾਤ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "%1 ਸੁਨੇਹਾ"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "OS X ਪੱਤਰ ਤੋਂ ਆਯਾਤ"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
 msgstr ""
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr ""
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr ""
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -206,15 +206,15 @@ msgid ""
 "prefixed with MBOX-</p>"
 msgstr ""
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "mbox ਫਾਇਲਾਂ (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr ""
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -225,44 +225,44 @@ msgid ""
 "your local folder.</p>"
 msgstr ""
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr ""
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "ਫੋਲਡਰ ਢਾਂਚਾ ਆਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr ""
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr ""
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr ""
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr ""
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "OE5+ ਫੋਲਡਰ ਫਾਇਲ %1 ਆਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr ""
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -272,20 +272,20 @@ msgid ""
 "OPERA-</p>"
 msgstr ""
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "ਫਾਇਲਾਂ ਦੀ ਗਿਣਤੀ ਜਾਰੀ ਹੈ..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "ਨਵੀਆਂ ਪੱਤਰ ਫਾਇਲਾਂ ਅਯਾਤ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Outlook ਈ-ਮੇਲਾਂ ਆਯਾਤ"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -295,23 +295,23 @@ msgid ""
 "OUTLOOK-</p>"
 msgstr ""
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "ਮੇਲਾਂ ਦੀ ਗਿਣਤੀ ਜਾਰੀ ਹੈ..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "ਡਾਇਰੈਕਟਰੀਆਂ ਦੀ ਗਿਣਤੀ ਜਾਰੀ ਹੈ..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "ਫੋਲਡਰਾਂ ਦੀ ਗਿਣਤੀ ਜਾਰੀ ਹੈ..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "ਸਮਤਲ ਪਾਠ ਈ-ਮੇਲਾਂ ਆਯਾਤ"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -319,11 +319,11 @@ msgid ""
 "emails.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr ""
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -332,38 +332,38 @@ msgid ""
 "p>"
 msgstr ""
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
 msgstr ""
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr ""
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr ""
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr ""
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "%1 ਨੂੰ ਆਯਾਤ ਕੀਤੀ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "ਫੋਲਡਰ ਢਾਂਚੇ ਦੀ ਜਾਂਚ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -372,11 +372,11 @@ msgid ""
 "the status of message, e.g. new or forwarded."
 msgstr ""
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr ""
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -386,11 +386,11 @@ msgid ""
 "Import\" in your local account.</p>"
 msgstr ""
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "ਥੰਡਰਬਰਡ/ਮੌਜੀਲਾ ਲੋਕਲ ਪੱਤਰ ਅਤੇ ਫੋਲਡਰ ਢਾਂਚਾ ਆਯਾਤ"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -400,21 +400,21 @@ msgid ""
 "the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
 msgstr ""
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "ਕੇਮੇਲ ਵਿੱਚ ਫੋਲਡਰ %1 ਨਹੀਂ ਬਣਾਇਆ ਜਾ ਸਕਦਾ ਹੈ"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "ਕੇਮੇਲ ਵਿੱਚ %1 ਫੋਲਡਰ ਲਈ ਸੁਨੇਹੇ ਜੋੜੇ ਨਹੀਂ ਜਾ ਸਕਦੇ ਹਨ"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "ਕੇਮੇਲ ਵਿੱਚ %1 ਫੋਲਡਰ ਤੋਂ ਸੁਨੇਹੇ ਜੋੜਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ"
 
diff --git a/tde-i18n-pl/messages/tdepim/kmailcvt.po b/tde-i18n-pl/messages/tdepim/kmailcvt.po
index 593f9a4e1b6..29dc709f39b 100644
--- a/tde-i18n-pl/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-pl/messages/tdepim/kmailcvt.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2015-01-18 13:48+0100\n"
 "Last-Translator: mcbx\n"
 "Language-Team:  <pl@li.org>\n"
@@ -31,11 +31,11 @@ msgid ""
 "Your emails"
 msgstr "mgiedz@elka.pw.edu.pl, mikmach@wp.pl"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Importuj wiadomości i strukturę folderów Evolution 1.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -47,46 +47,46 @@ msgstr ""
 "jest odtworzenie struktury folderów, zostaną one umieszczone w folderze: "
 "\"Evolution-Import\"</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "Nie wybrano katalogu."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "Nie znaleziono żadnych plików do zaimportowania."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "Zakończono import wiadomości z %1"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "Nie można otworzyć %1, pomijam"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "Importowanie wiadomości z %1..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
@@ -96,11 +96,11 @@ msgstr ""
 "Nie zaimportowano %n zduplikowanych wiadomości\n"
 "Nie zaimportowano %n zduplikowanych wiadomości"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Importuj wiadomości i strukturę folderów Evolution 2.x"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -116,23 +116,23 @@ msgstr ""
 "folderów.</p><p>Ponieważ możliwe jest odtworzenie struktury folderów, "
 "zostaną one umieszczone w folderze: \"Evolution-Import\".</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "Import zakończony z powodu anulowania przez użytkownika."
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "Rozpocznij import pliku %1..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr "Importuj archiwum KMail"
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
@@ -142,11 +142,11 @@ msgstr ""
 "archiwum zapisywane przez KMail.</p><p>Te pliki zawierają pełne drzewo "
 "katalogów spakowane w jeden plik.</p>"
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Importuj wiadomości i strukturę folderów KMail"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -164,22 +164,22 @@ msgstr ""
 "p><p>Ponieważ możliwe jest odtworzenie struktury folderów, zostaną one "
 "umieszczone w folderze: \"KMail-Import\".</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "Importuj folder %1..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "Nie można zaimportować %1"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "Importowanie wiadomości Lotus Notes"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -197,25 +197,25 @@ msgstr ""
 "zostaną one umieszczone w folderze \"LNotes-Import\", w podfolderach "
 "nazwanych stosowanie do plików z których powstały.</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "Wszystkie pliki (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "Importowanie wiadomości z %1"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Wiadomość %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "Import z programu pocztowego OS X"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -223,7 +223,7 @@ msgstr ""
 "<p><b>Filtr importu poczty z OS X</b></p><p>Ten filtr importuje e-maile z "
 "klienta poczty z systemu Apple Mac OS X.</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
@@ -233,11 +233,11 @@ msgstr ""
 "%n zduplikowanych wiadomości nie zostało zaimportowanych do foldera %1 w "
 "KMail"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Importuj pliki mbox (UNIX, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -251,15 +251,15 @@ msgstr ""
 "formatu.</p> <p><b>Uwaga:</b> Wiadomości zostaną zaimportowane do folderów "
 "nazwanych tak jak plik z którego pochodzą, z przedrostkiem MBOX-</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "pliki mbox (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Import wiadomości Outlook Express"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -277,44 +277,44 @@ msgstr ""
 "foldery z Outlook Express 5 i 6 zostaną umieszczone w folderze: \"OE-Import"
 "\".</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "Nie znaleziono skrzynek pocztowych Outlook Express w katalogu %1."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "Importuj strukturę folderów..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Zakończono import wiadomości Outlook Express"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Nie można otworzyć skrzynki pocztowej %1"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "Importowanie skrzynki pocztowej OE4 %1"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "Importowanie skrzynki pocztowej OE5+ %1"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "Importowanie pliku folderu OE5+ %1"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Import wiadomości Opery"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -331,20 +331,20 @@ msgstr ""
 "folderów nazwanych tak jak konto, z którego pochodzą, z przedrostkiem OPERA-"
 "</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Zliczanie plików...."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Importowanie nowych plików wiadomości..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Import wiadomości Outlooka"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -360,23 +360,23 @@ msgstr ""
 "będą zaimportowane do folderu nazwanego tak samo jak konto, z którego "
 "pochodzą, z prefiksem OUTLOOK-</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "Zliczanie wiadomości..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "Zliczanie katalogów..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "Zliczanie folderów..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Importuj zwykłe wiadomości tekstowe"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -388,11 +388,11 @@ msgstr ""
 "przedrostkiem PLAIN-</p> <p>Ten filtr zaimportuje wszystkie wiadomości ."
 "msg, .eml i .txt</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Import folderów Pegasus-Mail"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -405,7 +405,7 @@ msgstr ""
 "<p><b>Uwaga:</b>Ponieważ możliwe jest odtworzenie struktury folderów, "
 "zostaną one umieszczone w folderze: \"PegasusMail-Import\".</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
@@ -413,32 +413,32 @@ msgstr ""
 "Nie udało się zanalizować struktury folderów, importowanie będzie "
 "kontynuowane bez obsługi podfolderów."
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Importowanie nowych plików wiadomości ('.cnm')..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Importowanie folderów wiadomości ('.pnm')..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "Importowanie 'uniksowych' folderów wiadomości ('.mbx')..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "Importowanie %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "Analizowanie struktury folderów..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Importuj wiadomości i strukturę folderów Sylpheed"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -452,11 +452,11 @@ msgstr ""
 "folderze: \"Sylpheed-Import\".</p><p>Ten filtr odtwarza również stan "
 "wiadomości, np. Nowa lub Przekazana."
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Importuj wiadomości i strukturę folderów The Bat!"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -471,11 +471,11 @@ msgstr ""
 "nie z kont IMAP/DIMAP.</p><p>Ponieważ możliwe jest odtworzenie struktury "
 "folderów, zostaną one umieszczone w folderze: \"TheBat-Import\".</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "Importuj lokalne wiadomości i strukturę folderów Thunderbirda/Mozilli"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -492,7 +492,7 @@ msgstr ""
 "struktury folderów, zostaną one umieszczone w folderze: \"Thunderbird-Import"
 "\".</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -500,15 +500,15 @@ msgstr ""
 "<b>KRYTYCZNY:</b> Nie można uruchomić KMail dla komunikacji z DCOP. Upewnij "
 "się, że <i>kmail</i> jest zainstalowany."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "Nie można założyć folderu %1 w KMail"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Nie można dodać wiadomości do folderu %1 w KMail"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Błąd podczas dodawania wiadomości do folderu %1 w KMail"
 
diff --git a/tde-i18n-pt/messages/tdepim/kmailcvt.po b/tde-i18n-pt/messages/tdepim/kmailcvt.po
index abd486e37bd..19c0ac2e958 100644
--- a/tde-i18n-pt/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-pt/messages/tdepim/kmailcvt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2005-12-31 21:37+0000\n"
 "Last-Translator: José Nuno Pires <jncp@netcabo.pt>\n"
 "Language-Team: pt <kde-i18n-pt@kde.org>\n"
@@ -28,11 +28,11 @@ msgid ""
 "Your emails"
 msgstr "jncp@netcabo.pt,morais@kde.org"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Importar E-mails Locais e Estrutura de Pastas Locais do Evolution 1.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -44,46 +44,46 @@ msgstr ""
 "possível voltar a criar a estrutura de pastas, estas ficarão guardadas sob: "
 "\"Evolution-Import\".</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "Nenhuma directoria seleccionada."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "Nenhum ficheiro encontrado para importar."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "Terminou a importação do correio do %1"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "Não é possível aceder ao %1, a ignorar"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "A importar e-mails de %1..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
@@ -92,11 +92,11 @@ msgstr ""
 "1 mensagem duplicada não importada\n"
 "%n mensagens duplicadas não importadas"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Importar E-mails e Estrutura de Pastas Locais do Evolution 2.x"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -112,34 +112,34 @@ msgstr ""
 "p><p>Como é possível voltar a criar a estrutura de pastas, estas ficarão "
 "guardadas sob: \"Evolution-Import\".</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "Terminou a importação; foi cancelada pelo utilizador."
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "Iniciar a importação do ficheiro %1..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Importar E-mails e Estrutura de Pastas do KMail"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -157,22 +157,22 @@ msgstr ""
 "ficheiros 'mbox'.</p><p>Dado que é possível criar de novo a estrutura de "
 "pastas, estas ficarão guardadas sob:\"KMail-Import\" na sua pasta local.</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "Importar a pasta %1..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "Não foi possível importar %1"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "Importar os E-mails do Lotus Notes"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -191,25 +191,25 @@ msgstr ""
 "guardadas em sub-pastas com os nomes dos ficheiros de onde são oriundas, "
 "sob: \"LNotes-Import\" na sua pasta local.</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "Todos os Ficheiros (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "A importar os e-mails de %1"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Mensagem %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "Importar do OS X Mail"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -217,7 +217,7 @@ msgstr ""
 "<p><b>Filtro de Importação OS X Mail</b></p><p>Este filtro importa e-mails "
 "do cliente Mail do Mac OS X da Apple.</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
@@ -225,11 +225,11 @@ msgstr ""
 "1 mensagem duplicada não importada para a pasta %1 do KMail<\n"
 "%n mensagem duplicadas não importadas para a pasta %1 do KMail"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Importar os ficheiros MBOX (UNIX, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -244,15 +244,15 @@ msgstr ""
 "as pastas com o nome do ficheiro de onde vieram, acompanhadas do prefixo "
 "MBOX-</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "Ficheiros mbox (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Importar os E-mails do Outlook Express"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -270,45 +270,45 @@ msgstr ""
 "estrutura de pastas, as pastas do Outlook Express 5 e 6 serão gravadas sob: "
 "\"OE-Import\" na sua pasta local.</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr ""
 "Não foram encontradas caixas do correio do Outlook Express na pasta %1."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "Importar a estrutura de pastas..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Terminou a importação das mensagens do Outlook Express"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Não é possível aceder à caixa de correio %1"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "A importar a Caixa do Correio do OE4 %1"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "A importar a Caixa do Correio do OE5+ %1"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "A importar o ficheiro da pasta do OE5+ %1"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Importar os E-mails do Opera"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -324,20 +324,20 @@ msgstr ""
 "b> Os e-mails serão importados para uma pasta com o nome da conta de onde "
 "vieram, com o prefixo OPERA-</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "A contar os ficheiros..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "A importar os novos ficheiros de e-mail..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Importar os E-mails do Outlook"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -353,23 +353,23 @@ msgstr ""
 "Os e-mails serão importados para uma pasta com o nome da conta de onde "
 "vieram, com o prefixo OUTLOOK-</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "A contar os e-mails..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "A contar as directorias..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "A contar as pastas..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Importar as Mensagens em Texto Simples"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -381,11 +381,11 @@ msgstr ""
 "encontravam, antecedida de um PLAIN-</p><p>Este filtro irá importar todos os "
 "e-mails em .msg, .eml e .txt.</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Importar Pastas do Pegasus-Mail"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -399,7 +399,7 @@ msgstr ""
 "criar de novo a estrutura de pastas, estas ficarão guardadas sob: "
 "\"PegasusMail-Import\".</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
@@ -407,32 +407,32 @@ msgstr ""
 "Não é possível processar a estrutura de pastas; a continuar a importação sem "
 "o suporte para sub-pastas."
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "A importar os novos ficheiros de correio ('.cnm')..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "A importar as pastas de correio ('.pmm')..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "A importar as pastas do correio do UNIX ('.mbx')..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "A importar %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "A processar a estrutura de pastas..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Importar E-mails e Estrutura de Pastas do Sylpheed"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -446,11 +446,11 @@ msgstr ""
 "sob: \"Sylpheed-Import\" na sua pasta local.</p><p>Este filtro também cria "
 "de novo o estado da mensagem, p.ex. nova ou reencaminhada."
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Importar E-mails e Estrutura de Pastas do The Bat!"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -466,11 +466,11 @@ msgstr ""
 "possível criar de novo a estrutura de pastas, estas ficarão guardadas sob: "
 "\"TheBat-Import\" na sua pasta local.</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "Importar E-mails e Estrutura de Pastas do Thunderbird/Mozilla"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -488,7 +488,7 @@ msgstr ""
 "nome das pastas geradas.</p><p>Dado que é possível criar de novo a estrutura "
 "de pastas, estas ficarão sob: \"Thunderbird-Import\".</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -496,15 +496,15 @@ msgstr ""
 "<b>Fatal</b>: Não foi possível iniciar o KMail para a comunicação por DCOP. "
 "Verifique se o <i>kmail</i> está instalado."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "Não foi possível criar a pasta %1 no KMail"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Não foi possível adicionar a mensagem à pasta %1 no KMail"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Erro ao adicionar a mensagem à pasta %1 no KMail"
 
diff --git a/tde-i18n-pt_BR/messages/tdepim/kmailcvt.po b/tde-i18n-pt_BR/messages/tdepim/kmailcvt.po
index 6d7c21e66ff..a04107ff417 100644
--- a/tde-i18n-pt_BR/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-pt_BR/messages/tdepim/kmailcvt.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2007-08-28 15:15-0300\n"
 "Last-Translator: Felipe Arruda <felipemiguel@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <kde-i18n-pt_br@mail.kde.org>\n"
@@ -32,11 +32,11 @@ msgid ""
 "Your emails"
 msgstr "epx@conectiva.com.br, rodrigo@conectiva.com.br"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Importar Mensagens e Estrutura de Pastas do Evolution 1.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -48,46 +48,46 @@ msgstr ""
 "possível recriar a estrutura de pastas, as pastas serão armazenadas em : "
 "\"Evolution-Import\".</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "Nenhum diretório selecionado."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "Nenhum arquivo encontrado para importar."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "Importação de e-mails finalizada de %1"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "Impossível abrir %1, ignorando"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "Importando e-mails de %1 ..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
@@ -96,11 +96,11 @@ msgstr ""
 "Uma mensagem duplicada não foi importada\n"
 "%n mensagens duplicadas não foram importadas"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Importar Mensagens e Estrutura de Pastas do Evolution 2.x"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -116,34 +116,34 @@ msgstr ""
 "p><p>Já que é possível recriar a estrutura de pasta, as pastas serão criadas "
 "em : \"Evolution-Import\".</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "Importação finalizada, cancelada pelo usuário."
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "Iniciando a importação do arquivo %1..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Importar Mensagens e Estrutura de Pastas do KMail"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -161,22 +161,22 @@ msgstr ""
 "arquivos mbox.</p><p>Já que é possível recriar a estrutura de pasta, as "
 "pastas serão armazenadas em: \"KMail-Import\" na sua pasta local.</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "Importando pasta %1..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "Não foi possível importar %1"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "Importar Mensagens do Lotus Notes"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -195,25 +195,25 @@ msgstr ""
 "subpastas dentro de: \"LNotes-Import\", na sua pasta local, nomeadas de "
 "acordo com o nome dos arquivos dos quais as mensagens vieram.</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "Todos os Arquivos (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "Importando e-mails de %1"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Mensagem %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "Importar do Mail.app do OS X"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -221,7 +221,7 @@ msgstr ""
 "<p><b>Filtro de Importação do Mail.app do OS X</b></p> <p>Esse filtro "
 "importa mensagens do cliente de email do Mac OS X da Apple.</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
@@ -229,11 +229,11 @@ msgstr ""
 "Uma mensagem duplicada não foi importada para a pasta %1 do KMail\n"
 "%n mensagens duplicadas não foram importadas para a pasta %1 do KMail"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Importar arquivos mbox (Unix, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -247,15 +247,15 @@ msgstr ""
 "Unix.</p><p><b>Nota:</b> Os e-mails serão importados para pastas com nomes "
 "iguais aos nomes dos arquivos de onde eles vieram, prefixados com MBOX-</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "arquivos mbox (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Importar E-mails do Outlook Express"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -273,45 +273,45 @@ msgstr ""
 "pastas do Outlook Express 5 e 6 serão armazenadas em: \"OE-Import\" na pasta "
 "local.</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr ""
 "Nenhuma caixa de correio do Outlook Express encontrada no diretório %1."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "Importando estrutura de pastas..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Importação de e-mails do Outlook Express finalizada"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Impossível abrir caixa de correio %1"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "Importando Caixa de Correio %1 do OE4"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "Importando Caixa de Correio %1 do OE5+"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "Importando o arquivo de diretório %1 do OE5+"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Importar Emails do Opera"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -327,20 +327,20 @@ msgstr ""
 "p><p><b>Nota:</b> As mensagens serão importadas para uma pasta com o nome da "
 "conta de onde vieram, com o prefixo OPERA-</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Contando arquivos ..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Importando novos arquivos de correio ..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Importar Emails do Outlook"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -356,23 +356,23 @@ msgstr ""
 "As mensagens serão importadas para uma pasta com o nome da conta de onde "
 "vieram, com o prefixo OUTLOOK-</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "Contando mensagens..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "Contando diretórios..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "Contando pastas..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Importar Mensagens de Texto Puro"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -384,11 +384,11 @@ msgstr ""
 "o prefixo de PLAIN-</p><p>Este filtro importará todos os e-mails .msg, .eml "
 "e .txt.</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Importar Diretórios do Pegasus-Mail"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -402,7 +402,7 @@ msgstr ""
 "recriar a estrutura de pasta, as pastas serão armazenadas em: \"PegasusMail-"
 "Import\".</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
@@ -410,32 +410,32 @@ msgstr ""
 "Não foi possível obter a estrutura de pastas, a importação continuará sem "
 "suporte à subpastas."
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Importando novos arquivos de correio ('.cnm') ..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Importando pastas de correio ('.pmm') ..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "Importando pastas de correio 'UNIX' ('.mbx') ..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "Importando %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "Decodificando estrutura de pastas..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Importar Mensagens e Estrutura de Pastas do Slypheed"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -449,11 +449,11 @@ msgstr ""
 "armazenadas em : \"Sylpheed-Import\" na sua pasta local.</p><p>Este filtro "
 "também recria o status da mensagem, ex: nova ou encaminhada."
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Importar Mensagens e Estrutura de Pastas do \"The Bat!\""
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -469,11 +469,11 @@ msgstr ""
 "possível recriar a estrutura de pasta, as pastas serão armazenadas em : "
 "\"TheBat-Import\" na sua conta local.</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "Importar Mensagens e Estrutura de Pastas do Thunderbird/Mozilla"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -489,7 +489,7 @@ msgstr ""
 "ficará com muitas novas pastas.</p><p>Como é possível recriar a estrutura de "
 "pasta, as pastas serão armazenadas como: \"Thnderbird-Import\".</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -497,15 +497,15 @@ msgstr ""
 "<b>Fatal:</b> não foi possível iniciar o KMail para comunicação DCOP. "
 "Certifique-se de que o <i>kmail</i> está instalado."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "Impossível criar pasta %1 no KMail"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Impossível adicionar mensagem à pasta %1 do KMail"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Erro ao adicionar mensagem à pasta %1 no KMail"
 
diff --git a/tde-i18n-ro/messages/tdepim/kmailcvt.po b/tde-i18n-ro/messages/tdepim/kmailcvt.po
index c40f32d9d55..3b7ac539063 100644
--- a/tde-i18n-ro/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-ro/messages/tdepim/kmailcvt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 27 04 2002 19:22\n"
 "Last-Translator: Claudiu Costin <claudiuc@geocities.com>\n"
 "Language-Team: Romanian <ro-kde@egroups.com>\n"
@@ -27,11 +27,11 @@ msgid ""
 "Your emails"
 msgstr "claudiuc@kde.org"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -39,59 +39,59 @@ msgid ""
 "Import\".</p>"
 msgstr ""
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr ""
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr ""
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr ""
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 #, fuzzy
 msgid "Unable to open %1, skipping"
 msgstr "Nu pot deschide fişierul \"%1\""
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 #, fuzzy
 msgid "Importing emails from %1..."
 msgstr "Import folderele de mail ('.pmm') ..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, fuzzy, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
 "%n duplicate messages not imported"
 msgstr "Eroare la adăugarea mesajului în directorui %1 al KMail"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -101,34 +101,34 @@ msgid ""
 "be stored under: \"Evolution-Import\".</p>"
 msgstr ""
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr ""
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr ""
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -139,24 +139,24 @@ msgid ""
 "\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 #, fuzzy
 msgid "Import folder %1..."
 msgstr "Import folderele de mail ('.pmm') ..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr ""
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 #, fuzzy
 msgid "Import Lotus Notes Emails"
 msgstr "Importare Outlook Express 4"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -167,43 +167,43 @@ msgid ""
 "named using the names of the files the messages came from.</p>"
 msgstr ""
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr ""
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, fuzzy, c-format
 msgid "Importing emails from %1"
 msgstr "Import folderele de mail ('.pmm') ..."
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr ""
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 #, fuzzy
 msgid "Import From OS X Mail"
 msgstr "Importare Pegasus-Mail"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
 msgstr ""
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 #, fuzzy
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "Eroare la adăugarea mesajului în directorui %1 al KMail"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr ""
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -212,16 +212,16 @@ msgid ""
 "prefixed with MBOX-</p>"
 msgstr ""
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr ""
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 #, fuzzy
 msgid "Import Outlook Express Emails"
 msgstr "Importare Outlook Express 4"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -232,46 +232,46 @@ msgid ""
 "your local folder.</p>"
 msgstr ""
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, fuzzy, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "Caut fişiere fişiere '.mbx' Outlook Express 4 în directorul %1"
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr ""
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 #, fuzzy
 msgid "Finished importing Outlook Express emails"
 msgstr "%1 nu este o căsuţă de mail OE5"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, fuzzy, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Nu pot deschide fişierul \"%1\""
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr ""
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr ""
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, fuzzy, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "   import directorul %1 în kmail %2"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 #, fuzzy
 msgid "Import Opera Emails"
 msgstr "Importare Outlook Express 4"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -281,22 +281,22 @@ msgid ""
 "OPERA-</p>"
 msgstr ""
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Înnumăr fişierele..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 #, fuzzy
 msgid "Importing new mail files..."
 msgstr "Import fişiere cu mail-uri noi ('.cnm') ..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 #, fuzzy
 msgid "Import Outlook Emails"
 msgstr "Importare Outlook Express 4"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -306,26 +306,26 @@ msgid ""
 "OUTLOOK-</p>"
 msgstr ""
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 #, fuzzy
 msgid "Counting mail..."
 msgstr "Înnumăr fişierele..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 #, fuzzy
 msgid "Counting directories..."
 msgstr "Înnumăr fişierele..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 #, fuzzy
 msgid "Counting folders..."
 msgstr "Înnumăr fişierele..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr ""
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -333,12 +333,12 @@ msgid ""
 "emails.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 #, fuzzy
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Importare Pegasus-Mail"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -347,38 +347,38 @@ msgid ""
 "p>"
 msgstr ""
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
 msgstr ""
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Import fişiere cu mail-uri noi ('.cnm') ..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Import folderele de mail ('.pmm') ..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "Import fişiere de mail \"unix\" ('.mbx') ..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr ""
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr ""
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -387,11 +387,11 @@ msgid ""
 "the status of message, e.g. new or forwarded."
 msgstr ""
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr ""
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -401,11 +401,11 @@ msgid ""
 "Import\" in your local account.</p>"
 msgstr ""
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -415,7 +415,7 @@ msgid ""
 "the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 #, fuzzy
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
@@ -426,17 +426,17 @@ msgstr ""
 "programul KMail este accesibil prin variabila\n"
 "de mediu PATH."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 #, fuzzy
 msgid "Cannot make folder %1 in KMail"
 msgstr "Nu pot crea directorul %1 în KMail"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 #, fuzzy
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Nu pot adăuga mesajul în directorul %1 din KMail"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 #, fuzzy
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Eroare la adăugarea mesajului în directorui %1 al KMail"
diff --git a/tde-i18n-ru/messages/tdepim/kmailcvt.po b/tde-i18n-ru/messages/tdepim/kmailcvt.po
index 63bfe136d48..46523c2916a 100644
--- a/tde-i18n-ru/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-ru/messages/tdepim/kmailcvt.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2006-01-16 13:21+0300\n"
 "Last-Translator: Andrey Cherepanov <sibskull@mail.ru>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -31,11 +31,11 @@ msgid ""
 "Your emails"
 msgstr "sibskull@mail.ru"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Импорт локальных папок и писем Evolution 1.х"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -46,46 +46,46 @@ msgstr ""
 "(обычно ~/evolution/local).</p><p>Если возможно воссоздать структуру папок, "
 "папки будут сохранены в папке \"Evolution-Import\".</p> "
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "Каталог не выбран."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "не найдено файлов для импорта."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "Импорт электронных писем из %1 закончен"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "Не удаётся открыть %1, будет пропущен"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "Импорт электронных писем из %1..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
@@ -95,11 +95,11 @@ msgstr ""
 "%n повторяющихся письма не были импортированы\n"
 "%n повторяющихся писем не были импортированы"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Импорт локальных папок и писем Evolution 2.х"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -115,34 +115,34 @@ msgstr ""
 "вы получите огромное количество новых папок.</p><p>Если возможно воссоздать "
 "структуру папок, папки будут сохранены в \"Evolution-Import\".</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "Прервано пользователем."
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "Импорт файла %1..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Импорт папок KMail в формате maildir"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -159,22 +159,22 @@ msgstr ""
 "импортирует папки в виде файлов mbox.</p> <p>Если возможно воссоздать "
 "структуру папок, папки будут сохранены в папке \"KMail-Import\".</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "Импорт папки %1..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "Не удаётся импортировать %1"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "Импорт писем Lotus Notes"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -192,25 +192,25 @@ msgstr ""
 "структуру папок, письма будут сохранены в подпапках с именами файлов папки "
 "\"LNotes-Import\".</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "Все файлы (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "Импорт писем из %1"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Письмо %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "Импорт почты из почтового клиента OS X"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -218,7 +218,7 @@ msgstr ""
 "<p><b>Импорт почты OS X</b></p><p>Этот фильтр позволяет импортировать почту "
 "из почтового клиента Apple Mac OS X.</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
@@ -227,11 +227,11 @@ msgstr ""
 "%n повторяющихся письма не были добавлены в папку KMail %1\n"
 "%n повторяющихся писем не были добавлены в папку KMail %1"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Импорт файлов mbox (UNIX, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -245,15 +245,15 @@ msgstr ""
 "формате почты UNIX.</p><p><b>Примечание:</b> импортированные папки будут "
 "иметь префикс MBOX-</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "Файлы mbox (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Импорт писем Outlook Express 5"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -270,44 +270,44 @@ msgstr ""
 "версиях</ul></p><p><b>Примечание:</b>Если возможно воссоздать структуру "
 "папок, папки будут сохранены в \"OE-Import\".</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "В каталоге %1 не найдены почтовые файлы Outlook Express."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "Импорт структуры папок..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Импорт писем Outlook Express закончен"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Не удаётся открыть почтовый файл %1"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "Импорт из почтового файла OE4 %1"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "Импорт из почтового файла OE5+ %1"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "Импорт файла папки OE5+ %1"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Импорт писем Opera"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -322,20 +322,20 @@ msgstr ""
 "это ~/.opera/mail/store/account*).</p><p><b>Примечание:</b> импортированные "
 "папки будут иметь префикс OPERA-</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Подсчёт файлов ..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Импорт новых почтовых файлов..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Импорт писем Outlook Express 5"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -351,23 +351,23 @@ msgstr ""
 "p><p><b>Примечание:</b> Импортированные папки будут иметь префикс OUTLOOK-</"
 "p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "Подсчёт писем..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "Подсчёт каталогов..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "Подсчёт папок..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Импорт файлов сообщений электронной почты"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -379,11 +379,11 @@ msgstr ""
 "PLAIN-</p><p>Этот фильтр импортирует электронные письма из файлов .msg, .eml "
 "и .txt.</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Импорт папок из Pegasus-Mail"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -396,7 +396,7 @@ msgstr ""
 "\\mail\\admin</p><p><b>Примечание:</b> Если возможно воссоздать структуру "
 "папок, папки будут сохранены в папке \"PegasusMail-Import\".</p> "
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
@@ -404,32 +404,32 @@ msgstr ""
 "Невозможно обработать структуру папок. Все сообщения будут импортированы в "
 "одну папку."
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Импортировать новые почтовые файлы ('.cnm')..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Импортировать почтовые папки ('.pmm')..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "Импортировать почтовые папки Unix ('.mbx')..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "Импорт %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "Обработка структуры папок..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Импорт папок и писем Sylpheed"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -442,11 +442,11 @@ msgstr ""
 "сохранены в папке \"Sylpheed-Import\".</p> <p>Также будут импортирован "
 "статус сообщений (новые, пересланные и т.п.)."
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Импорт папок и писем The Bat!"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -462,11 +462,11 @@ msgstr ""
 "воссоздать структуру папок, папки будут сохранены в папке \"TheBat-Import\"."
 "</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "Импорт локальных папок и писем Thunderbird/Mozilla"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -483,7 +483,7 @@ msgstr ""
 "новых папок.</p><p>Если возможно воссоздать структуру папок, папки будут "
 "сохранены в папке \"Thunderbird-Import\".</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -491,15 +491,15 @@ msgstr ""
 "<b>Критическая ошибка:</b> Не удаётся запустить KMail для связи через DCOP. "
 "Убедитесь, что программа <i>kmail</i> установлена."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "Не удаётся создать папку %1 в KMail"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Не удаётся добавить письмо в папку KMail %1"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Ошибка добавления письма в папку KMail %1"
 
diff --git a/tde-i18n-rw/messages/tdepim/kmailcvt.po b/tde-i18n-rw/messages/tdepim/kmailcvt.po
index 324d00cf0d3..8cff98068c1 100644
--- a/tde-i18n-rw/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-rw/messages/tdepim/kmailcvt.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt 3.4\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2005-05-25 18:52-0600\n"
 "Last-Translator: Steve Murphy <murf@e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
@@ -40,12 +40,12 @@ msgstr ""
 "muvia1@yahoo.fr, ngenda_denis@yahoo.co.uk, akiberwa@yahoo.co.uk, "
 "ndonatienuk@yahoo.co.uk"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 #, fuzzy
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "1 . x na "
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 #, fuzzy
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
@@ -57,50 +57,50 @@ msgstr ""
 "Impinduka /Bya hafi ) . </p> <p> ni Kuri i Ububiko... Imiterere , i "
 "Ububiko : \" - \" . </p> "
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 #, fuzzy
 msgid "No directory selected."
 msgstr "Ububiko Byahiswemo . "
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 #, fuzzy
 msgid "No files found for import."
 msgstr "Idosiye Byabonetse ya:  Kuzana . "
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, fuzzy, c-format
 msgid "Finished importing emails from %1"
 msgstr "Kuvana hanze... Kuva: %1 "
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 #, fuzzy
 msgid "Unable to open %1, skipping"
 msgstr "Kuri Gufungura %1 , Gusimbuka: %s "
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 #, fuzzy
 msgid "Importing emails from %1..."
 msgstr "Kuva: %1 ... "
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, fuzzy, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
@@ -109,12 +109,12 @@ msgstr ""
 "1 Gusubiramo &Ubutumwa OYA %n Gusubiramo Ubutumwa OYA cyavuye ahandi/"
 "cyatumijwe "
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 #, fuzzy
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "2 . x na "
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 #, fuzzy
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
@@ -130,37 +130,37 @@ msgstr ""
 "Kubona Gishya Ububiko . </p> <p> ni Kuri i Ububiko... Imiterere , i "
 "Ububiko : \" - \" . </p> "
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 #, fuzzy
 msgid "Finished import, canceled by user."
 msgstr "Kuzana , Kureka ku Umukoresha . "
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 #, fuzzy
 msgid "Start import file %1..."
 msgstr "Gutangira Kuzana Idosiye %1 ... "
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 #, fuzzy
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "na "
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 #, fuzzy
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
@@ -177,24 +177,24 @@ msgstr ""
 "</p> <p> Akayunguruzo: OYA Kuzana Na: Idosiye . </p> <p> ni Kuri i "
 "Ububiko... Imiterere , i Ububiko : \" - \" in Bya hafi Ububiko... . </p> "
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 #, fuzzy
 msgid "Import folder %1..."
 msgstr "Ububiko... %1 ... "
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, fuzzy, c-format
 msgid "Could not import %1"
 msgstr "OYA Kuzana %1 "
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 #, fuzzy
 msgid "Import Lotus Notes Emails"
 msgstr "Kuzana amadosiye ya Lotus"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 #, fuzzy
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
@@ -211,34 +211,34 @@ msgstr ""
 "i Ububiko... Imiterere , i cyavuye ahandi/cyatumijwe Ubutumwa in &Cyitwa: ku "
 "i Idosiye Kuva: : \" - \" in Bya hafi Ububiko... . </p> "
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 #, fuzzy
 msgid "All Files (*)"
 msgstr "Amadosiye yose"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, fuzzy, c-format
 msgid "Importing emails from %1"
 msgstr "Kuva: %1 "
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, fuzzy, c-format
 msgid "Message %1"
 msgstr "Ubutumwa:"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 #, fuzzy
 msgid "Import From OS X Mail"
 msgstr "Ibaruwa yavanywe hanze"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 #, fuzzy
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
 msgstr "<p> <b> </b> </p> <p> Akayunguruzo: e - Kuva: i Umukiriya in . </p> "
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 #, fuzzy
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
@@ -247,11 +247,11 @@ msgstr ""
 "1 Gusubiramo &Ubutumwa OYA cyavuye ahandi/cyatumijwe Kuri Ububiko... %1 in "
 "%n Gusubiramo Ubutumwa OYA cyavuye ahandi/cyatumijwe Kuri Ububiko... %1 in "
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr ""
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 #, fuzzy
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
@@ -265,17 +265,17 @@ msgstr ""
 "Imiterere . </p> <p> <b> icyitonderwa : </b> cyavuye ahandi/cyatumijwe "
 "Ububiko &Cyitwa: Nyuma i Idosiye Kuva: , Na: - </p> "
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 #, fuzzy
 msgid "mbox Files (*)"
 msgstr "Amadosiye y'ibimenyetso (*.sms)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 #, fuzzy
 msgid "Import Outlook Express Emails"
 msgstr "Outlook Express"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 #, fuzzy
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
@@ -292,47 +292,47 @@ msgstr ""
 "icyitonderwa : </b> ni Kuri i Ububiko... Imiterere , i Ububiko Kuva: 5 na "
 "6 : \" - \" in Bya hafi Ububiko... . </p> "
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, fuzzy, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "Byabonetse in Ububiko %1 . "
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 #, fuzzy
 msgid "Import folder structure..."
 msgstr "Ububiko... Imiterere ... "
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 #, fuzzy
 msgid "Finished importing Outlook Express emails"
 msgstr "Kuvana hanze... "
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, fuzzy, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Kuri Gufungura Agasanduku k'ubutumwa %1 "
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, fuzzy, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "iyimura rigeza ku %1"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr ""
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, fuzzy, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "+ Idosiye %1 "
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 #, fuzzy
 msgid "Import Opera Emails"
 msgstr "Kwimura &Ibiranga Opera"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 #, fuzzy
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
@@ -348,23 +348,23 @@ msgstr ""
 "</p> <p> <b> icyitonderwa : </b> cyavuye ahandi/cyatumijwe A Ububiko... "
 "&Cyitwa: Nyuma i Konti: Kuva: , Na: - </p> "
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 #, fuzzy
 msgid "Counting files..."
 msgstr "Idosiye ... "
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 #, fuzzy
 msgid "Importing new mail files..."
 msgstr "Gishya Ibaruwa Idosiye ... "
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 #, fuzzy
 msgid "Import Outlook Emails"
 msgstr "utumenyetso tw'igitabo cy'itumiza"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 #, fuzzy
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
@@ -380,27 +380,27 @@ msgstr ""
 "b> cyavuye ahandi/cyatumijwe A Ububiko... &Cyitwa: Nyuma i Konti: Kuva: , "
 "Na: - </p> "
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 #, fuzzy
 msgid "Counting mail..."
 msgstr "Ibaruwa ... "
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 #, fuzzy
 msgid "Counting directories..."
 msgstr "ububiko bw'amaderese ... "
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 #, fuzzy
 msgid "Counting folders..."
 msgstr "Ububiko ... "
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 #, fuzzy
 msgid "Import Plain Text Emails"
 msgstr "Imbuga z'inyandiko nyazo"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 #, fuzzy
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
@@ -411,11 +411,11 @@ msgstr ""
 "<p> i Ububiko i ku Sisitemu . in A Ububiko... Na: i Izina: Nka i Ububiko "
 "in , ku - </p> <p> Akayunguruzo: Kuzana Byose . , . na . txt . </p> "
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr ""
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 #, fuzzy
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
@@ -428,44 +428,44 @@ msgstr ""
 "Ibaruwa \\m Cyangwa : \\p Ibaruwa \\m \\a DGITO </p> <p> <b> icyitonderwa : "
 "</b> ni Kuri i Ububiko... Imiterere , i Ububiko : \" - \" . </p> "
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 #, fuzzy
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
 msgstr "i Ububiko... Imiterere ; Kuzana Gushigikira . "
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 #, fuzzy
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Gishya Ibaruwa Idosiye ( ' . ) ... "
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 #, fuzzy
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Ibaruwa Ububiko ( ' . ) ... "
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 #, fuzzy
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "' Ibaruwa Ububiko ( ' . ) ... "
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, fuzzy, c-format
 msgid "Importing %1"
 msgstr "Kuvana hanze..."
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 #, fuzzy
 msgid "Parsing the folder structure..."
 msgstr "i Ububiko... Imiterere ... "
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 #, fuzzy
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "na "
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 #, fuzzy
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
@@ -475,12 +475,12 @@ msgid ""
 "the status of message, e.g. new or forwarded."
 msgstr "<p><b>G."
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 #, fuzzy
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "! na "
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 #, fuzzy
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
@@ -491,12 +491,12 @@ msgid ""
 "Import\" in your local account.</p>"
 msgstr "<p><b>G."
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 #, fuzzy
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "/Mozilla na "
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 #, fuzzy
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
@@ -512,7 +512,7 @@ msgstr ""
 "Ububiko . </p> <p> ni Kuri i Ububiko... Imiterere , i Ububiko : \" - \" . </"
 "p> "
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 #, fuzzy
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
@@ -521,17 +521,17 @@ msgstr ""
 "<b> : </b> Kuri Tangira &vendorShortName; ya:  Itumanaho . <i> </i> ni "
 "yakorewe iyinjizaporogaramu . "
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 #, fuzzy
 msgid "Cannot make folder %1 in KMail"
 msgstr "Ubwoko Ububiko... %1 in "
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 #, fuzzy
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "&Ongera &Ubutumwa Kuri Ububiko... %1 in "
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 #, fuzzy
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Ikosa Wongera &Ubutumwa Kuri Ububiko... %1 in "
diff --git a/tde-i18n-se/messages/tdepim/kmailcvt.po b/tde-i18n-se/messages/tdepim/kmailcvt.po
index 31be85da12a..712e4ca3e68 100644
--- a/tde-i18n-se/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-se/messages/tdepim/kmailcvt.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2006-01-10 20:33+0100\n"
 "Last-Translator: Børre Gaup <boerre@skolelinux.no>\n"
 "Language-Team: Northern Sami <i18n-sme@lister.ping.uio.no>\n"
@@ -25,11 +25,11 @@ msgid ""
 "Your emails"
 msgstr "boerre@skolelinux.no"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -37,57 +37,57 @@ msgid ""
 "Import\".</p>"
 msgstr ""
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr ""
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr ""
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr ""
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr ""
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr ""
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
 "%n duplicate messages not imported"
 msgstr ""
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -97,34 +97,34 @@ msgid ""
 "be stored under: \"Evolution-Import\".</p>"
 msgstr ""
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr ""
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr ""
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -135,22 +135,22 @@ msgid ""
 "\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr ""
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr ""
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr ""
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -161,41 +161,41 @@ msgid ""
 "named using the names of the files the messages came from.</p>"
 msgstr ""
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr ""
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr ""
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr ""
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr ""
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
 msgstr ""
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr ""
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr ""
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -204,15 +204,15 @@ msgid ""
 "prefixed with MBOX-</p>"
 msgstr ""
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr ""
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr ""
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -223,44 +223,44 @@ msgid ""
 "your local folder.</p>"
 msgstr ""
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr ""
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr ""
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr ""
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr ""
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr ""
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr ""
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr ""
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr ""
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -270,20 +270,20 @@ msgid ""
 "OPERA-</p>"
 msgstr ""
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr ""
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr ""
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr ""
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -293,23 +293,23 @@ msgid ""
 "OUTLOOK-</p>"
 msgstr ""
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr ""
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr ""
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr ""
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr ""
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -317,11 +317,11 @@ msgid ""
 "emails.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr ""
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -330,38 +330,38 @@ msgid ""
 "p>"
 msgstr ""
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
 msgstr ""
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr ""
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr ""
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr ""
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr ""
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr ""
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -370,11 +370,11 @@ msgid ""
 "the status of message, e.g. new or forwarded."
 msgstr ""
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr ""
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -384,11 +384,11 @@ msgid ""
 "Import\" in your local account.</p>"
 msgstr ""
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -398,21 +398,21 @@ msgid ""
 "the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
 msgstr ""
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr ""
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr ""
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr ""
 
diff --git a/tde-i18n-sk/messages/tdepim/kmailcvt.po b/tde-i18n-sk/messages/tdepim/kmailcvt.po
index f361429dd05..c231d2ef9ca 100644
--- a/tde-i18n-sk/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-sk/messages/tdepim/kmailcvt.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2006-07-05 12:53+0200\n"
 "Last-Translator: Richard Fric <Richard.Fric@kdemail.net>\n"
 "Language-Team: Slovak <kde-i18n-doc@kde.org>\n"
@@ -30,11 +30,11 @@ msgid ""
 "Your emails"
 msgstr "visnovsky@kde.org"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Import lokálnych správ Evolution a štruktúry priečinkov"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -46,46 +46,46 @@ msgstr ""
 "štruktúra priečinkov sa dá znova vytvoriť, priečinky budú uložené pod: "
 "\"Evolution-Import\".</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "Nebol vybraný žiaden priečinok."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "Nenájdené žiadne súbory na import."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "Dokončený prevod pošty z %1"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "Nie je možné otvoriť %1, preskakujem"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "Import emailov z %1..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
@@ -95,11 +95,11 @@ msgstr ""
 "%n duplikované správy neboli importované\n"
 "%n duplikovaných správ nebolo importovaných"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Import lokálnych správ Evolution 2.x a štruktúry priečinkov"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -115,34 +115,34 @@ msgstr ""
 "p><p>Vzhľadom na to, že štruktúra priečinkov sa dá znova vytvoriť, priečinky "
 "budú uložené pod: \"Evolution-Import\".</p> "
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "Import ukončený, zrušený užívateľom."
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "Začiatok importu zo súboru %1..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Import KMail Maildirs a štruktúry priečinkov"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -160,22 +160,22 @@ msgstr ""
 "mbox súbormi.</p><p>Vzhľadom na to, že štruktúra priečinkov sa dá znova "
 "vytvoriť, priečinky budú uložené pod: \"KMail-Import\".</p> "
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "Importovať priečinok %1..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "Nie je možné importovať %1"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "Import Lotus Notes Emails"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -193,25 +193,25 @@ msgstr ""
 "vytvoriť, importované správy sa vytvoria v podpriečinkoch pod: \"LNotes-"
 "Import\", pomenované podľa mien súborov, z ktorých pochádzajú.</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "Všetky súbory (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "Importujú sa správy z %1"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Správa %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "Import z OS X-Mail"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -219,7 +219,7 @@ msgstr ""
 "<p><b>Filter importu z OS X Mail</b></p><p>Tento filter importuje emaily z "
 "poštového klienta na Apple Mac OS X.</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
@@ -228,11 +228,11 @@ msgstr ""
 "%n duplikované správy neboli importované do KMail priečinku %1\n"
 "%n duplikovaných správ nebolo importovaných do KMail priečinku %1"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Import mbox súborov (UNIX, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -246,15 +246,15 @@ msgstr ""
 "p><p><b>Poznámka:</b> Správy budú importované do priečinkov, ktorých mená "
 "budú podľa súborov, z ktorých sa importovalo a predponou MBOX-</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "mbox súbory (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Import pošty z Outlook Expressu"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -271,44 +271,44 @@ msgstr ""
 "Vzhľadom na to, že štruktúra priečinkov sa dá znova vytvoriť, priečinky z "
 "Outlook Express 5 a 6 sa vytvoria pod: \"OE-Import\".</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "V priečinku %1 nie sú žiadne poštové priečinky Outlook Express."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "Import štruktúry priečinkov..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Dokončený prevod pošty z Outlook Expressu"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Nie je možné otvoriť poštový priečinok '%1'"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "Importovanie OE4 mailboxu %1"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "Importovanie OE5+ mailboxu %1"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "Import OE5+ súboru priečinku %1"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Import Opera Emails"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -323,20 +323,20 @@ msgstr ""
 "opera/mail/store/account*).</p><p><b>Poznámka:</b> Správy budú importované "
 "do priečinkov pomenovaných podľa účtu s predponou OPERA</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Počítam súbory..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Import súborov s novými správami..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Import Outlook Emails"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -351,23 +351,23 @@ msgstr ""
 "p><p><b>Poznámka:</b> Správy budú importované do priečinkov pomenovaných "
 "podľa účtu, z ktorého pochádzajú s predponou OUTLOOK</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "Počítajú sa správy..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "Počítajú sa priečinky..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "Počítajú sa priečinky..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Import emailov z čistého textu"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -379,11 +379,11 @@ msgstr ""
 "predponou PLAIN-</p><p>Tento filter importuje všetky správy .msg, .eml a ."
 "txt.</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Import priečinkov z Pegasus-Mail"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -396,7 +396,7 @@ msgstr ""
 "\\admin</p><p><b>Poznámka:</b>Vzhľadom na to, že štruktúra priečinkov sa dá "
 "znova vytvoriť, priečinky budú uložené pod: \"PegasusMail-Import\".</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
@@ -404,32 +404,32 @@ msgstr ""
 "Nedá sa analyzovať štruktúra priečinkov, import bude pokračovať bez podpory "
 "podpriečinkov."
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Importujem súbory s novými správami ('.cnm')..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Importujem priečinky s poštou ('.pmm')..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "Importujem unixové priečinky s poštou ('.mbx')..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "Importovanie %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "Analyzuje sa štruktúra priečinkov..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Import Sylpheed Maildirs a štruktúry priečinkov"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -442,11 +442,11 @@ msgstr ""
 "dá znova vytvoriť, priečinky budú uložené pod: \"Sylpheed-Import\".</"
 "p><p>Tento filter tiež vytvorí stav správ, napr. nová alebo preposlaná."
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Import The Bail Mails a štruktúry priečinkov"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -462,11 +462,11 @@ msgstr ""
 "priečinkov sa dá znova vytvoriť, priečinky sa vytvoria pod: \"TheBat-Import"
 "\".</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "Import lokálnej pošty z Thunderbird/Mozilla a štruktúry pričinkov"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -482,7 +482,7 @@ msgstr ""
 "veľa nových priečinkov.</p><p>Vzhľadom na to, že štruktúra priečinkov sa dá "
 "znova vytvoriť, priečinky budú uložené pod: \"Thunderbird-Import\".</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -490,15 +490,15 @@ msgstr ""
 "<b>Kritická:</b> Nie je možné spustiť KMail pre DCOP komunikáciu. Overte, či "
 "je <i>kmail</i> nainštalovaný."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "Nie je možné vytvoriť priečinok %1 v KMaile"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Nie je možné pridať správu do priečinku %1 v KMaile"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Chyba pri pridávaní správy do priečinku %1 v KMaile"
 
diff --git a/tde-i18n-sl/messages/tdepim/kmailcvt.po b/tde-i18n-sl/messages/tdepim/kmailcvt.po
index b34448c9360..08d779c53b4 100644
--- a/tde-i18n-sl/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-sl/messages/tdepim/kmailcvt.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2006-06-27 03:38+0200\n"
 "Last-Translator: Jure Repinc <jlp@holodeck1.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -33,11 +33,11 @@ msgid ""
 "Your emails"
 msgstr "gregor.rakar@kiss.si,andrej.vernekar@moj.net,jlp@holodeck1.com"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Uvozi krajevno pošto in zgradbo map iz Evolution 1.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -48,46 +48,46 @@ msgstr ""
 "imenik v Evolution (običajno ~/evolution/local/).</p><p>Ker je možno "
 "poustvariti zgradbo map, bodo le te shranjene pod: »Evolution-Import«.</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "Ni izbranega imenika."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "Ni najdenih datotek za uvoz."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "Uvoz e-pošte iz %1 je končan"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "Ni moč odpreti %1, preskakovanje"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "Uvažanje e-pošte iz %1 ..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
@@ -98,11 +98,11 @@ msgstr ""
 "%n podvojeni sporočili nista uvoženi\n"
 "%n podvojena sporočila niso uvožena"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Uvoz pošte in strukture map iz Evolution 2.x"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -118,34 +118,34 @@ msgstr ""
 "p><p>Ker je možno poustvariti zgradbo map, bodo le te shranjene pod: "
 "»Evolution-Import«.</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "Uvoz je končan, prekinjen s strani uporabnika."
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "Začni uvažati datoteko %1 ..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Uvoz pošte in strukture map iz KMaila"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -162,22 +162,22 @@ msgstr ""
 "<p>Ta filter ne uvozi poštnih map, ki vsebujejo datoteke mbox.</p><p>Ker je "
 "možno poustvariti zgradbo map, bodo le te shranjene pod: »Kmail-Import«.</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "Uvozi mapo %1 ..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "Ni moč uvoziti %1"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "Uvozi e-pošto iz Lotus Notes"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -196,25 +196,25 @@ msgstr ""
 "Import« v krajevni mapi. Podmape bodo imele enako ime kot izvorne datoteke s "
 "sporočili.</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "Vse datoteke (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "Uvažanje e-pošte iz %1"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Sporočilo %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "Uvozi mape iz OS X Mail"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -222,7 +222,7 @@ msgstr ""
 "<p><b>Uvozni filter OS X</b></p><p>Ta filter uvaža e-pošto s poštnega "
 "odjemalca za Apple Mac OS X.</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
@@ -232,11 +232,11 @@ msgstr ""
 "%n podvojeni sporočili nista uvoženi v mapo %1 v KMailu\n"
 "%n podvojena sporočila niso uvožena v mapo %1 v KMailu"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Uvozi datoteke mbox (UNIX, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -250,15 +250,15 @@ msgstr ""
 "p> <p><b>Opomba:</b> E-sporočila bodo uvožena v mape poimenovane po izvoru s "
 "predpono MBOX-</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "Datoteke mbox (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Uvozi e-sporočila iz Outlook Expressa"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -275,44 +275,44 @@ msgstr ""
 "je možno poustvariti zgradbo map, bodo le te shranjene pod: »OE-Import« v "
 "krajevni mapi.</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "V imaniku %1 ni bilo moč najti poštnih predalov Outlook Expressa."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "Uvozi strukture map ..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Uvažanje e-pošte iz Outlook Expressa je končano"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Ni moč odpreti poštnega predala %1"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "Uvažanje poštnega predala %1 za OE4"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "Uvažanje poštnega predala %1 za OE5+"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "Uvažanje datoteke OE5+ z mapo %1 "
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Uvozi e-pošto iz Opere"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -328,20 +328,20 @@ msgstr ""
 "sporočila bodo uvožena v mapo poimenovano po računu iz katerega izvirajo, s "
 "predpono OPERA-</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Štetje datotek ..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Uvažanje novih poštnih datotek ..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Uvozi e-pošto iz Outlooka"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -356,23 +356,23 @@ msgstr ""
 "2000 ali novejših</ul></p><p><b>Opomba:</b> E-sporočila bodo uvožena v mapo "
 "poimenovano po računu, iz katerega izvirajo, s predpono OUTLOOK-</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "Štetje e-pošte ..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "Štetje imenikov ..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "Štetje map ..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Uvoz navadnih besedilnih sporočil"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -383,11 +383,11 @@ msgstr ""
 "imenom, kot ga je imel imenik, v katerem se je nahajala, s predpono PLAIN-</"
 "p> <p>Ta filter bo uvozil vsa e-sporočila oblike .msg, .eml in .txt.</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Uvozi mape iz Pegasus-Mail"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -400,39 +400,39 @@ msgstr ""
 "p><p>Ker je možno poustvariti zgradbo map, bodo le te shranjene pod: "
 "»PegasusMail-Import«.</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
 msgstr ""
 "Ni moč razčleniti zgradbe map. Uvoz se bo nadaljeval brez podpore podmapam."
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Uvažanje novih poštnih datotek (».cnm«) ..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Uvažanje poštnih map (».pmm«) ..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "Uvažanje poštnih map »UNIX« (».mbx«) ..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "Uvažanje %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "Razčlenjevanje zgradbe map ..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Uvoz pošte in strukture map iz Sylpheeda"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -446,11 +446,11 @@ msgstr ""
 "mapi.</p> <p>Ta filter prav tako poustvari stanje sporočil, na primer novo "
 "ali posredovano.</p>"
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Uvozi pošto in zgradbo map iz Bat!"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -466,11 +466,11 @@ msgstr ""
 "map, bodo sporočila shranjena v mape pod: »TheBat-Import« v krajevni mapi.</"
 "p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "Uvozi krajevno pošto Thunderbirda/Mozille in strukturo map"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -486,7 +486,7 @@ msgstr ""
 "boste imeli veliko novih map.</p><p>Ker je možno poustvariti zgradbo map, "
 "bodo le te shranjene pod: »Thunderbird-Import«.</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -494,15 +494,15 @@ msgstr ""
 "<b>Pogubna napaka:</b> Ni moč pognati KMail za komunikacijo preko DCOP. "
 "Preverite, če je <i>KMail</i> nameščen."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "Mape %1 v KMail ni moč narediti"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "V KMail ni moč dodati sporočila v mapo %1."
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Napaka pri dodajanju sporočila v mapo %1 v KMailu."
 
diff --git a/tde-i18n-sr/messages/tdepim/kmailcvt.po b/tde-i18n-sr/messages/tdepim/kmailcvt.po
index a9448861dc5..03739f2b4a1 100644
--- a/tde-i18n-sr/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-sr/messages/tdepim/kmailcvt.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2006-01-08 15:56+0100\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
@@ -32,11 +32,11 @@ msgid ""
 "Your emails"
 msgstr "toptan@kde.org.yu,simicsl@verat.net"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Увези пошту и структуру фасцикли Evolution-а 1.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -48,46 +48,46 @@ msgstr ""
 "поново направити структуру фасцикли, она ће бити смештена под: „Evolution-"
 "увоз“.</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "Није одабран ниједан директоријум."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "Није нађен ниједан фајл за увоз."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "Увоз порука из %1 је завршен"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "Не могу да отворим %1, прескачем"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "Увозим е-поруке из %1..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
@@ -97,11 +97,11 @@ msgstr ""
 "%n дуплиране поруке нису увезене\n"
 "%n дуплираних порука није увезено"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Увези пошту и структуру фасцикли Evolution-а 2.x"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -117,34 +117,34 @@ msgstr ""
 "добићете много нових фасцикли.</p><p>Пошто је могуће регенерисати структуру "
 "фасцикли, она ће бити смештене под „Evolution-увоз“.</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "Завршен увоз, отказан од стране корисника."
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "Почни увоз фајла %1..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Увези пошту и структуру фасцикли KMail-а"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -160,22 +160,22 @@ msgstr ""
 "trinity/share/apps/kmail/mail ): у том случају KMailCVT би могао да заглави "
 "у сталној петљи.</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "Фасцикла увоза %1..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "Нисам могао увести %1"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "Увоз порука из Lotus Notes-а"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -193,25 +193,25 @@ msgstr ""
 "фасцикли, увезене поруке ће бити смештене у подфасцикле именоване по "
 "фајловима од којих су настале у локалној фасцикли „LNotes-увоз“.</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "Сви фајлови (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "Увозим е-поруке из %1"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Порука %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "Увоз из OS X Mail-а"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -219,7 +219,7 @@ msgstr ""
 "<p><b>Филтер за увоз из OS X Mail-а</b></p><p>Овај филтер увози е-поруке из "
 "поштанског клијента у Apple-овим Mac OS-у X.</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
@@ -228,11 +228,11 @@ msgstr ""
 "%n дупликатске поруке нису увезене у фасциклу %1 у KMail-у\n"
 "%n дупликатских порука није увезено у фасциклу %1 у KMail-у"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Увоз mbox фајловa (Unix, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -246,15 +246,15 @@ msgstr ""
 "p><p><b>Напомена:</b> Поруке ће бити увезене у фасцикле са именом истим као "
 "што се зове фајл из кога су увезене са префиксом „MBOX-“</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "mbox фајлови (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Увоз порука из Outlook Express-а"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -272,45 +272,45 @@ msgstr ""
 "Outlook Express-а 5 и 6, она ће бити смештена под „ОЕ-увоз“ у вашој локалној "
 "фасцикли.</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr ""
 "Нису пронађени Outlook Express-ови поштански сандучићи у директоријуму %1."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "Увези структуру фасцикле..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Увоз порука из Outlook Express-а је завршен"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Не могу да отворим поштанско сандуче %1"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "Увозим OE4 поштанско сандуче %1"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "Увозим OE5+ поштанско сандуче %1"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "Увозим OE5+ фајл са фасциклама %1"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Увези пошту из Opera-е"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -326,20 +326,20 @@ msgstr ""
 "увезене у фасциклу именовану по налогу из кога су дошле, уз префикс OPERA-</"
 "p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Бројим фајлове..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Увозим нове поштанске фајлове..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Увоз порука из Outlook-а"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -355,23 +355,23 @@ msgstr ""
 "бити увезене у фасциклу именовану по налогу из кога су дошле, уз префикс "
 "OUTLOOK-</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "Бројим пошту..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "Бројим директоријуме..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "Бројим фасцикле..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Увоз обичних текстуалних е-порука"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -383,11 +383,11 @@ msgstr ""
 "са префиксом „PLAIN-“</p><p>Овај филтер ће увести све .msg, .eml и .txt "
 "поруке.</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Увоз фасцикли из Pegasus-Mail-а"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -400,7 +400,7 @@ msgstr ""
 "\\mail\\admin</p><p><b>Напомена:</b> Пошто је могуће поново направити "
 "структуру фасцикли, она ће бити смештена под: „PegasusMail-увоз“.</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
@@ -408,32 +408,32 @@ msgstr ""
 "Не могу да расчланим структуру фасцикле; настављам увоз без подршке за "
 "подфасцикле."
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Увозим нове поштанске фајлове („.cnm“)..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Увозим поштанске фасцикле („.pmm“)..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "Увозим „UNIX“ поштанске фасцикле („.mbx“)..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "Увозим %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "Расчлањујем структуру фасцикле..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Увези пошту и структуру фасцикли Sylpheed-а"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -446,11 +446,11 @@ msgstr ""
 "структуру фасцикли, она ће бити садржана под „Sylpheed-увоз“.</p><p>Овај "
 "филтер такође поново прави статус поруке, нпр. нова или прослеђена."
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Увези пошту и структуру фасцикли The Bat-а!"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -466,11 +466,11 @@ msgstr ""
 "структуру фасцикли, оне ће бити смештене под „The Bat!-увоз“ у вашем "
 "локалном налогу.</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "Увези пошту и структуру фасцикли Thunderbird-а/Mozilla-е"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -486,7 +486,7 @@ msgstr ""
 "добићете много нових фасцикли.</p><p>Пошто је могуће регенерисати структуру "
 "фасцикли, фасцикле ће бити садржане под „Увоз Thunderbird-а“.</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -494,15 +494,15 @@ msgstr ""
 "<b>Кобно:</b> Не могу да покренем KMail за DCOP комуникацију. Уверите се да "
 "је <i>kmail</i> инсталиран."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "Не могу да направим фасциклу %1 у KMail-у"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Не могу да додам поруку у фасциклу %1 у KMail-у"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Грешка приликом додавања поруке у фасциклу %1 у KMail-у"
 
diff --git a/tde-i18n-sr@Latn/messages/tdepim/kmailcvt.po b/tde-i18n-sr@Latn/messages/tdepim/kmailcvt.po
index a25283137e8..f8c09ca8925 100644
--- a/tde-i18n-sr@Latn/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-sr@Latn/messages/tdepim/kmailcvt.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2006-01-08 15:56+0100\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
@@ -32,11 +32,11 @@ msgid ""
 "Your emails"
 msgstr "toptan@kde.org.yu,simicsl@verat.net"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Uvezi poštu i strukturu fascikli Evolution-a 1.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -48,46 +48,46 @@ msgstr ""
 "ponovo napraviti strukturu fascikli, ona će biti smeštena pod: „Evolution-"
 "uvoz“.</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "Nije odabran nijedan direktorijum."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "Nije nađen nijedan fajl za uvoz."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "Uvoz poruka iz %1 je završen"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "Ne mogu da otvorim %1, preskačem"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "Uvozim e-poruke iz %1..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
@@ -97,11 +97,11 @@ msgstr ""
 "%n duplirane poruke nisu uvezene\n"
 "%n dupliranih poruka nije uvezeno"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Uvezi poštu i strukturu fascikli Evolution-a 2.x"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -117,34 +117,34 @@ msgstr ""
 "dobićete mnogo novih fascikli.</p><p>Pošto je moguće regenerisati strukturu "
 "fascikli, ona će biti smeštene pod „Evolution-uvoz“.</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "Završen uvoz, otkazan od strane korisnika."
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "Počni uvoz fajla %1..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Uvezi poštu i strukturu fascikli KMail-a"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -160,22 +160,22 @@ msgstr ""
 "trinity/share/apps/kmail/mail ): u tom slučaju KMailCVT bi mogao da zaglavi "
 "u stalnoj petlji.</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "Fascikla uvoza %1..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "Nisam mogao uvesti %1"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "Uvoz poruka iz Lotus Notes-a"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -193,25 +193,25 @@ msgstr ""
 "fascikli, uvezene poruke će biti smeštene u podfascikle imenovane po "
 "fajlovima od kojih su nastale u lokalnoj fascikli „LNotes-uvoz“.</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "Svi fajlovi (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "Uvozim e-poruke iz %1"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Poruka %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "Uvoz iz OS X Mail-a"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -219,7 +219,7 @@ msgstr ""
 "<p><b>Filter za uvoz iz OS X Mail-a</b></p><p>Ovaj filter uvozi e-poruke iz "
 "poštanskog klijenta u Apple-ovim Mac OS-u X.</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
@@ -228,11 +228,11 @@ msgstr ""
 "%n duplikatske poruke nisu uvezene u fasciklu %1 u KMail-u\n"
 "%n duplikatskih poruka nije uvezeno u fasciklu %1 u KMail-u"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Uvoz mbox fajlova (Unix, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -246,15 +246,15 @@ msgstr ""
 "p><p><b>Napomena:</b> Poruke će biti uvezene u fascikle sa imenom istim kao "
 "što se zove fajl iz koga su uvezene sa prefiksom „MBOX-“</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "mbox fajlovi (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Uvoz poruka iz Outlook Express-a"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -272,45 +272,45 @@ msgstr ""
 "Outlook Express-a 5 i 6, ona će biti smeštena pod „OE-uvoz“ u vašoj lokalnoj "
 "fascikli.</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr ""
 "Nisu pronađeni Outlook Express-ovi poštanski sandučići u direktorijumu %1."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "Uvezi strukturu fascikle..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Uvoz poruka iz Outlook Express-a je završen"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Ne mogu da otvorim poštansko sanduče %1"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "Uvozim OE4 poštansko sanduče %1"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "Uvozim OE5+ poštansko sanduče %1"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "Uvozim OE5+ fajl sa fasciklama %1"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Uvezi poštu iz Opera-e"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -326,20 +326,20 @@ msgstr ""
 "uvezene u fasciklu imenovanu po nalogu iz koga su došle, uz prefiks OPERA-</"
 "p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Brojim fajlove..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Uvozim nove poštanske fajlove..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Uvoz poruka iz Outlook-a"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -355,23 +355,23 @@ msgstr ""
 "biti uvezene u fasciklu imenovanu po nalogu iz koga su došle, uz prefiks "
 "OUTLOOK-</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "Brojim poštu..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "Brojim direktorijume..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "Brojim fascikle..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Uvoz običnih tekstualnih e-poruka"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -383,11 +383,11 @@ msgstr ""
 "sa prefiksom „PLAIN-“</p><p>Ovaj filter će uvesti sve .msg, .eml i .txt "
 "poruke.</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Uvoz fascikli iz Pegasus-Mail-a"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -400,7 +400,7 @@ msgstr ""
 "\\mail\\admin</p><p><b>Napomena:</b> Pošto je moguće ponovo napraviti "
 "strukturu fascikli, ona će biti smeštena pod: „PegasusMail-uvoz“.</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
@@ -408,32 +408,32 @@ msgstr ""
 "Ne mogu da rasčlanim strukturu fascikle; nastavljam uvoz bez podrške za "
 "podfascikle."
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Uvozim nove poštanske fajlove („.cnm“)..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Uvozim poštanske fascikle („.pmm“)..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "Uvozim „UNIX“ poštanske fascikle („.mbx“)..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "Uvozim %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "Rasčlanjujem strukturu fascikle..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Uvezi poštu i strukturu fascikli Sylpheed-a"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -446,11 +446,11 @@ msgstr ""
 "strukturu fascikli, ona će biti sadržana pod „Sylpheed-uvoz“.</p><p>Ovaj "
 "filter takođe ponovo pravi status poruke, npr. nova ili prosleđena."
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Uvezi poštu i strukturu fascikli The Bat-a!"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -466,11 +466,11 @@ msgstr ""
 "strukturu fascikli, one će biti smeštene pod „The Bat!-uvoz“ u vašem "
 "lokalnom nalogu.</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "Uvezi poštu i strukturu fascikli Thunderbird-a/Mozilla-e"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -486,7 +486,7 @@ msgstr ""
 "dobićete mnogo novih fascikli.</p><p>Pošto je moguće regenerisati strukturu "
 "fascikli, fascikle će biti sadržane pod „Uvoz Thunderbird-a“.</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -494,15 +494,15 @@ msgstr ""
 "<b>Kobno:</b> Ne mogu da pokrenem KMail za DCOP komunikaciju. Uverite se da "
 "je <i>kmail</i> instaliran."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "Ne mogu da napravim fasciklu %1 u KMail-u"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Ne mogu da dodam poruku u fasciklu %1 u KMail-u"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Greška prilikom dodavanja poruke u fasciklu %1 u KMail-u"
 
diff --git a/tde-i18n-sv/messages/tdepim/kmailcvt.po b/tde-i18n-sv/messages/tdepim/kmailcvt.po
index a3fb4bd5b5c..f3cc52d0d30 100644
--- a/tde-i18n-sv/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-sv/messages/tdepim/kmailcvt.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2006-01-05 19:25+0100\n"
 "Last-Translator: Stefan Asserhäll <stefan.asserhall@comhem.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -31,11 +31,11 @@ msgid ""
 "Your emails"
 msgstr "chaotica@home.se,newzella@linux.nu"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Importera lokala brev och katalogstruktur från Evolution 1.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -47,46 +47,46 @@ msgstr ""
 "att återskapa korgstrukturen, lagras alla korgar under: \"Evolution import\"."
 "</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "Ingen katalog vald."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "Inga filer hittades att importera."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "Avslutade import av e-post från %1"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "Kunde inte öppna %1. Hoppar över."
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "Importerar brev från %1..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
@@ -95,11 +95,11 @@ msgstr ""
 "1 duplicerat brev importerades inte\n"
 "%n duplicerade brev importerades inte"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Importera lokala brev och katalogstruktur från Evolution 2.x"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -115,34 +115,34 @@ msgstr ""
 "nya korgar.</p> <p>Eftersom det är möjligt att återskapa korgstrukturen, "
 "lagras alla korgar under: \"Evolution-import\".</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "Avslutade import, avbruten av användaren."
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "Starta import av filen %1..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Importera Kmails brevkataloger och katalogstruktur"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -160,22 +160,22 @@ msgstr ""
 "p><p>Eftersom det är möjligt att återskapa korgstrukturen, lagras alla "
 "korgar under: \"KMail-Import\" i din lokala korg.</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "Importera katalog %1..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "Kunde inte importera %1"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "Importera e-post från Lotus Notes"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -193,25 +193,25 @@ msgstr ""
 "korgstrukturen, lagras importerade brev i underkorgar som namnges av filerna "
 "de kom ifrån under \"LNotes-Import\" i din lokala korg.</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "Alla filer (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "Importerar brev från %1"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Brev %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "Importera korgar från OS X-Mail"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -219,7 +219,7 @@ msgstr ""
 "<p><b>OS X-importfilter för e-post</b></p><p>Det här filtret importerar e-"
 "post från e-postprogrammet i Apple Mac OS X.</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
@@ -227,11 +227,11 @@ msgstr ""
 "1 duplicerat brev importerades inte till korgen %1 i Kmail\n"
 "%n duplicerade brev importerades inte till korgen %1 i Kmail"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Importera mbox-filer (Unix, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -245,15 +245,15 @@ msgstr ""
 "p> <p><b>Observera:</b> E-post importeras till kataloger som får namn efter "
 "filen de kom från, med prefixet MBOX-.</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "mbox-filer (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Importera e-post från Outlook Express"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -270,44 +270,44 @@ msgstr ""
 "Eftersom det är möjligt att skapa om katalog-strukturen, lagras alla korgar "
 "från Outlook 5 och 6 under: \"OE-import\" i din lokala katalog.</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "Ingen Outlook Express-brevlåda hittades i katalog %1."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "Importera katalogstruktur..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Avslutade import av Outlook Express e-post"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Kan inte öppna brevlåda %1"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "Importerar OE4-brevlåda %1"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "Importerar OE5+-brevlåda %1"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "Importerar OE5+-katalogfil %1"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Importera e-post från Opera"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -323,20 +323,20 @@ msgstr ""
 "importeras till en katalog som får namn efter kontot de kom från, med "
 "prefixet OPERA-.</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Räknar filer..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Importerar nya brevfiler..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Importera e-post från Outlook"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -352,23 +352,23 @@ msgstr ""
 "till en katalog som får namn efter kontot de kom från, med prefixet OUTLOOK-."
 "</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "Räknar brev..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "Räknar kataloger..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "Räknar korgar..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Importera enkla textbrev"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -379,11 +379,11 @@ msgstr ""
 "katalog med samma namn som de fanns i, med prefixet PLAIN-</p><p>Det här "
 "filtret importerar all .msg-, .eml- och .txt-e-post.</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Importera korgar från Pegasus-Mail"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -397,7 +397,7 @@ msgstr ""
 "återskapa katalogstrukturen, lagras alla kataloger under \"PegasusMail-Import"
 "\".</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
@@ -405,32 +405,32 @@ msgstr ""
 "Kan inte tolka katalogstrukturen. Fortsätter import utan stöd för "
 "underkataloger."
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Importerar nya brevfiler (\".cnm\")..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Importerar brevmappar (\".pmm\")..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "Importerar Unix-brevmappar (\".mbx\")..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "Importerar %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "Tolkar katalogstrukturen..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Importera brevkataloger och katalogstruktur från Sylpheed"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -444,11 +444,11 @@ msgstr ""
 "Import\" i din lokala korg.</p> <p>Det här filtret återskapar också status "
 "på ett brev, t.ex. nytt eller vidarebefordrat."
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Importera lokala brev och katalogstruktur från Bat!"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -464,11 +464,11 @@ msgstr ""
 "korgstrukturen, lagras alla korgar under: \"TheBat-Import\" i din lokala "
 "korg.</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "Importera lokala brev och katalogstruktur från Thunderbird/Mozilla"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -484,7 +484,7 @@ msgstr ""
 "du många nya korgar.</p> <p>Eftersom det är möjligt att återskapa "
 "korgstrukturen, lagras alla korgar under: \"Thunderbird-Import\".</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -492,15 +492,15 @@ msgstr ""
 "<b>Allvarligt fel:</b> Kunde inte starta Kmail för DCOP-kommunikation. "
 "Försäkra dig om att <i>kmail</i> är installerat."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "Kan inte skapa korg %1 i Kmail"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Kan inte lägga till brev i korg %1 i Kmail"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Fel uppstod när brevet skulle läggas till i korg %1 i Kmail"
 
diff --git a/tde-i18n-ta/messages/tdepim/kmailcvt.po b/tde-i18n-ta/messages/tdepim/kmailcvt.po
index ce480e04b05..60545ac3f31 100644
--- a/tde-i18n-ta/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-ta/messages/tdepim/kmailcvt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2005-03-23 23:29-0800\n"
 "Last-Translator: Tamil PC <tamilpc@ambalam.com>\n"
 "Language-Team:  <ta@li.org>\n"
@@ -26,11 +26,11 @@ msgid ""
 "Your emails"
 msgstr "tamilpc@ambalam.com"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "பரிணாம அஞ்சல்கள் மற்றும் அடைவு உருவத்தை இறக்கு"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 #, fuzzy
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
@@ -44,57 +44,57 @@ msgstr ""
 "\" பரிமாணத்தின் அடைவை வைத்திருந்தால், அதனுடன் \"bar\" உள்ளடைவும், கேமெயிலில் இரண்டு "
 "அடைவுகள் உருவாக்கியது : \"foo\" மற்றும் \"foo-bar\"</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "தடம் தேர்வு செய்யப்படவில்லை"
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "இறக்குவதற்கு எந்த கோப்புகளும் இல்லை."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "மின்னஞ்சல்களை %1...இல் இருந்து இறக்குமதி செய்யப்பட்டது."
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "%1 எனும் கோப்பினைத் திறக்க முடியவில்லை,  தாவுகிறது."
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "மின்னஞ்சல்களை %1...இல் இருந்து இறக்குமதி செய்கிறது"
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, fuzzy, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
 "%n duplicate messages not imported"
 msgstr "kஅஞ்சலுக்கு %1 கோப்புறையில் செய்திகளை சேர்க்க இயலாது"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "பரிணாம அஞ்சல்கள் மற்றும் அடைவு உருவத்தை இறக்கு"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 #, fuzzy
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
@@ -111,35 +111,35 @@ msgstr ""
 "folders.</p><p>As it is currently impossible to recreate the folder "
 "structure, it will be \"contained\" in the generated folder's names.</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr ""
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "கோப்பு %1ஐ இறக்க துவக்கவும்..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 #, fuzzy
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "பரிணாம அஞ்சல்கள் மற்றும் அடைவு உருவத்தை இறக்கு"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 #, fuzzy
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
@@ -157,24 +157,24 @@ msgstr ""
 "folders.</p><p>As it is currently impossible to recreate the folder "
 "structure, it will be \"contained\" in the generated folder's names.</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 #, fuzzy
 msgid "Import folder %1..."
 msgstr "கோப்பு %1ஐ இறக்க துவக்கவும்..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "%1 இறக்குமதி செய்ய இயலவில்லை"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 #, fuzzy
 msgid "Import Lotus Notes Emails"
 msgstr "Outlook மின்னஞ்சல்களை இறக்கு"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 #, fuzzy
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
@@ -191,26 +191,26 @@ msgstr ""
 "Emails will be imported into folders named after the file they came from, "
 "prefixed with MBOX-</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 #, fuzzy
 msgid "All Files (*)"
 msgstr "mபெட்டி கோப்புகள் (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, fuzzy, c-format
 msgid "Importing emails from %1"
 msgstr "மின்னஞ்சல்களை %1...இல் இருந்து இறக்குமதி செய்கிறது"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "செய்தி%1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "OS X அஞ்சலில் இருந்து கீழிறக்கு"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -218,18 +218,18 @@ msgstr ""
 "<p><b>OS X அஞ்சல் இறக்கு அலங்காரம்</b></p><p>இந்த அலங்காரம் ஆப்பிள் மாக் OS Xல் அஞ்சல் "
 "உறுப்பினரில் இருந்து மின்னஞ்சல்களை இறக்குகிறது.</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 #, fuzzy
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "kஅஞ்சலுக்கு %1 கோப்புறையில் செய்திகளை சேர்க்க இயலாது"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "mபெட்டிக் கோப்புகளை (UNIX, Evolution) இறக்குமதி செய்"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -243,15 +243,15 @@ msgstr ""
 "Emails will be imported into folders named after the file they came from, "
 "prefixed with MBOX-</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "mபெட்டி கோப்புகள் (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "அவுட்லுக் எக்ஸ்பிரஸ் மின்னஞ்சல்களை இறக்குமதி செய்"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 #, fuzzy
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
@@ -269,45 +269,45 @@ msgstr ""
 "imported into folders named after the file they came from, prefixed with OE-"
 "</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "அவுட்லுக் எக்ஸ்பிரஸ் அஞ்சல் பெட்டிகள் %1  கோப்பகத்தில் காணப்படவில்லை."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 #, fuzzy
 msgid "Import folder structure..."
 msgstr "கோப்பு %1ஐ இறக்க துவக்கவும்..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "அவுட்லுக் எக்ஸ்பிரஸ் மின்னஞ்சல்களை இறக்குமதி செய்து முடிக்கப்பட்டது"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "அஞ்சல் பெட்டியை %1 திறக்க முடியவில்லை"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "OE4+ அஞ்சல் பெட்டியை%1 இறக்குமதி செய்கிறது"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "OE5+ அஞ்சல் பெட்டியை%1 இறக்குமதி செய்கிறது"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, fuzzy, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "புறக்கணிக்கப்படுகிறது OE5+  கோப்புறை கோப்பு %1"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "அவுட்லுக் எக்ஸ்பிரஸ் மின்னஞ்சல்களை இறக்குமதி செய்"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -322,20 +322,20 @@ msgstr ""
 "Emails will be imported into folders named after the file they came from, "
 "prefixed with MBOX-</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "கணக்கிடுகின்ற கோப்புகள்..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "புதிய அஞ்சல் கோப்புகளை இறக்குமதி செய்கிறது...."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Outlook மின்னஞ்சல்களை இறக்கு"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -351,23 +351,23 @@ msgstr ""
 "imported into folders named after the file they came from, prefixed with OE-"
 "</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "அஞ்சல்களை கணக்கிடுகிறது..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "கணக்கிடுகின்ற கோப்புகள்..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "அடைவுகளை கணக்கிடுகிறது..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "வெற்று உரை மின்னஞ்சலை இறக்குமதி செய்"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -379,11 +379,11 @@ msgstr ""
 "prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
 "emails.</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr " Pegasus-அஞ்சலில் இருந்து கோப்புறைகளை இறக்குமதி செய்"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 #, fuzzy
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
@@ -398,39 +398,39 @@ msgstr ""
 "structure. But you will probably only do this one time.</p><p><b>Note:</b> "
 "Emails will be imported into folder with the prefix pmail-</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
 msgstr ""
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "புதிய அஞ்சல் கோப்புகளை இறக்குமதி செய்கிறது.'.cnm')..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "புதிய அஞ்சல் கோப்புகளை இறக்குமதி செய்கிறது...."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "'UNIX'  அஞசல் ('.mbx')... கோப்புறையை இறக்குமதி செய்கிறது"
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "இறக்குமதியாகிறது %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr ""
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 #, fuzzy
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "பரிணாம அஞ்சல்கள் மற்றும் அடைவு உருவத்தை இறக்கு"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 #, fuzzy
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
@@ -445,12 +445,12 @@ msgstr ""
 "\" பரிமாணத்தின் அடைவை வைத்திருந்தால், அதனுடன் \"bar\" உள்ளடைவும், கேமெயிலில் இரண்டு "
 "அடைவுகள் உருவாக்கியது : \"foo\" மற்றும் \"foo-bar\"</p>"
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 #, fuzzy
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "பரிணாம அஞ்சல்கள் மற்றும் அடைவு உருவத்தை இறக்கு"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 #, fuzzy
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
@@ -467,12 +467,12 @@ msgstr ""
 "folders.</p><p>As it is currently impossible to recreate the folder "
 "structure, it will be \"contained\" in the generated folder's names.</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 #, fuzzy
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "பரிணாம அஞ்சல்கள் மற்றும் அடைவு உருவத்தை இறக்கு"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 #, fuzzy
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
@@ -489,7 +489,7 @@ msgstr ""
 "folders.</p><p>As it is currently impossible to recreate the folder "
 "structure, it will be \"contained\" in the generated folder's names.</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -497,15 +497,15 @@ msgstr ""
 "<b>உயிர்நாடி:</b> DCOP தகவல் தொடர்புக்கு Kஅஞ்சலை ஆரம்பிக்க இயலவில்லை. <i>kmail</i> "
 "நிறுவப்பட்டது என்பதை உறுதிபடுத்து."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "kஅஞ்சலுக்கு %1 கோப்புறையில் இறக்குமதி செய்ய இயலாது"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "kஅஞ்சலுக்கு %1 கோப்புறையில் செய்திகளை சேர்க்க இயலாது"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "kஅஞ்சலுக்கு %1 கோப்புறையில் செய்திகளை சேர்க்கும் போது பிழை"
 
diff --git a/tde-i18n-tg/messages/tdepim/kmailcvt.po b/tde-i18n-tg/messages/tdepim/kmailcvt.po
index b1f122aa4e1..58fc598b15d 100644
--- a/tde-i18n-tg/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-tg/messages/tdepim/kmailcvt.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2005-09-16 16:50+0500\n"
 "Last-Translator: Victor Ibragimov <youth_opportunities@tajikngo.org>\n"
 "Language-Team: Tajik\n"
@@ -41,12 +41,12 @@ msgid ""
 msgstr ""
 "rkovacs@khujand.org, youth_opportunities@tajikngo.org, MarinaKL@tajikngo.org"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 #, fuzzy
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Импорт Evolution почтаҳо ва Структураи Папка"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 #, fuzzy
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
@@ -60,46 +60,46 @@ msgstr ""
 "<p>Масалан ,агар шумо дар папкаи\"foo\"дар Еvolution доред,бо \"bar\" папкаи "
 "дар таг буда ,ду папка дар KMail сохта мешаванд :\"foo\"ва\"foo-bar\"<p> "
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "Каталог интихоб нашудааст"
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr ""
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "Импорт кардани хатҳои электрони аз %1 тамом шуд"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "Бе қобилияти дар кушодан %1,партофтан"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "Импорт кардани хатҳои электрони аз %1..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, fuzzy, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
@@ -108,12 +108,12 @@ msgstr ""
 "Дар вақте,ки илова кардани хабар ба папкаи %1дар KMail бударо, нусха "
 "намудани хабари хатто"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 #, fuzzy
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Импорт Evolution почтаҳо ва Структураи Папка"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 #, fuzzy
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
@@ -129,35 +129,35 @@ msgstr ""
 "<p>Масалан ,агар шумо дар папкаи\"foo\"дар Еvolution доред,бо \"bar\" папкаи "
 "дар таг буда ,ду папка дар KMail сохта мешаванд :\"foo\"ва\"foo-bar\"<p> "
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr ""
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr ""
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 #, fuzzy
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Импорт Evolution почтаҳо ва Структураи Папка"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -168,24 +168,24 @@ msgid ""
 "\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 #, fuzzy
 msgid "Import folder %1..."
 msgstr "Импорт кардани хатҳои электрони аз %1..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "Импорт карда нашуд %1"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 #, fuzzy
 msgid "Import Lotus Notes Emails"
 msgstr "Импорт кардани хатҳои Outlook Express "
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 #, fuzzy
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
@@ -201,33 +201,33 @@ msgstr ""
 "почтаҳои аз Ximian Evolution ворид кунед ё дигар почтаҳои,ки анъанави UNIX "
 "форматро истифода мебаранд онҳо аз MBOX-и префикс карда шуда омаданд"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 #, fuzzy
 msgid "All Files (*)"
 msgstr "Файлҳои mbox (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, fuzzy, c-format
 msgid "Importing emails from %1"
 msgstr "Импорт кардани хатҳои электрони аз %1..."
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Хабар %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 #, fuzzy
 msgid "Import From OS X Mail"
 msgstr "Импорти Феҳристҳо аз Pegasus-Mail"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
 msgstr ""
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 #, fuzzy
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
@@ -236,11 +236,11 @@ msgstr ""
 "Дар вақте,ки илова кардани хабар ба папкаи %1дар KMail бударо, нусха "
 "намудани хабари хатто"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Импорти файлҳои mbox (UNIX, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -253,15 +253,15 @@ msgstr ""
 "почтаҳои аз Ximian Evolution ворид кунед ё дигар почтаҳои,ки анъанави UNIX "
 "форматро истифода мебаранд онҳо аз MBOX-и префикс карда шуда омаданд"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "Файлҳои mbox (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Импорт кардани хатҳои Outlook Express "
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 #, fuzzy
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
@@ -279,46 +279,46 @@ msgstr ""
 "ul></p><p><b>Кайд кунед:</b>E-mail-ҳоро дар папкаҳои ,ки номгузори карда "
 "шуданд,ки аз ОЕ-</p> префикс мебошанд,ворид мекунем."
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "Ягон қуттиҳои почтаи Outlook Express  дар каталоги %1 ёф нашудааст"
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 #, fuzzy
 msgid "Import folder structure..."
 msgstr "Импорт кардани хатҳои электрони аз %1..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Импорти хатҳои Outlook Express тамом шуд"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Қуттии почтаи %1 ро кушода намешавад"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "Импорти OE4 қуттии почтаи %1"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "Импорти OE5+ қуттии почта %1"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, fuzzy, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "OE5+ПАПКА файл %1-ро аҳмият надиҳед"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 #, fuzzy
 msgid "Import Opera Emails"
 msgstr "Импорт кардани хатҳои Outlook Express "
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 #, fuzzy
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
@@ -333,21 +333,21 @@ msgstr ""
 "почтаҳои аз Ximian Evolution ворид кунед ё дигар почтаҳои,ки анъанави UNIX "
 "форматро истифода мебаранд онҳо аз MBOX-и префикс карда шуда омаданд"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Ҳисоб кардани файлҳо..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Импорти файлҳои нави хати элетрони..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 #, fuzzy
 msgid "Import Outlook Emails"
 msgstr "Импорт кардани хатҳои Outlook Express "
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 #, fuzzy
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
@@ -364,26 +364,26 @@ msgstr ""
 "ul></p><p><b>Кайд кунед:</b>E-mail-ҳоро дар папкаҳои ,ки номгузори карда "
 "шуданд,ки аз ОЕ-</p> префикс мебошанд,ворид мекунем."
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 #, fuzzy
 msgid "Counting mail..."
 msgstr "Ҳисоб кардани файлҳо..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 #, fuzzy
 msgid "Counting directories..."
 msgstr "Ҳисоб кардани файлҳо..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 #, fuzzy
 msgid "Counting folders..."
 msgstr "Ҳисоб кардани файлҳо..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "E-mail-ҳои аз PLAIN TEXT ворид карда шуда"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -395,11 +395,11 @@ msgstr ""
 "тарафи PLAIN  префикс шудааст.<p> Ин филтр e-mail-ҳои ки аз папкаҳои ,msg,"
 "eml,ва txt ворид мекунад .<p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Импорти Феҳристҳо аз Pegasus-Mail"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 #, fuzzy
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
@@ -414,39 +414,39 @@ msgstr ""
 "структураи папкаро не.Аммо шумо мумкин ,ки инро як бор мекунед. <p> "
 "<p><b>Қайд : Email-ҳо дар папкаи бо префикс pmail ворид мешавад-</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
 msgstr ""
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Импорти файлҳои навъи хатҳои электрони ('.cnm')..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Импорти феҳриҳои почта ('.pmm')..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "Импорти феҳриҳои почтаи UNIX ('.mbx')..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "Импорти %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr ""
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 #, fuzzy
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Импорт Evolution почтаҳо ва Структураи Папка"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 #, fuzzy
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
@@ -461,12 +461,12 @@ msgstr ""
 "<p>Масалан ,агар шумо дар папкаи\"foo\"дар Еvolution доред,бо \"bar\" папкаи "
 "дар таг буда ,ду папка дар KMail сохта мешаванд :\"foo\"ва\"foo-bar\"<p> "
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 #, fuzzy
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Импорт Evolution почтаҳо ва Структураи Папка"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -476,12 +476,12 @@ msgid ""
 "Import\" in your local account.</p>"
 msgstr ""
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 #, fuzzy
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "Импорт Evolution почтаҳо ва Структураи Папка"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -491,7 +491,7 @@ msgid ""
 "the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -499,15 +499,15 @@ msgstr ""
 "<b>Хатогии дағал:</b> кушодани KMail барои алоқа бо DCOP. Бинед ки "
 "программаи <i>kmail</i> доред."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "Феҳрист сохта намешавад %1 дар KMail"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Хабар ба феҳристи %1 гузошта намешавад дар KMail"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Хатоги дар вақти гузоштани хабар ба феҳристи %1 дар KMail"
 
diff --git a/tde-i18n-th/messages/tdepim/kmailcvt.po b/tde-i18n-th/messages/tdepim/kmailcvt.po
index d0923dbb61f..0e91ee32f88 100644
--- a/tde-i18n-th/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-th/messages/tdepim/kmailcvt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2006-11-10 19:45+1100\n"
 "Last-Translator: Sahachart Anukulkitch <drrider@gmail.com>\n"
 "Language-Team: Thai <l10n@opentle.org>\n"
@@ -28,11 +28,11 @@ msgid ""
 "Your emails"
 msgstr "donga_n@yahoo.com,drrider@gmail.com"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "นำเข้าจดหมายในเครื่องและโครงสร้างโฟลเดอร์ของ Evolution 1.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -44,57 +44,57 @@ msgstr ""
 "<p>เนื่องจากมีความเป็นไปได้ที่จะมีการสร้างโครงสร้างโฟลเดอร์ขึ้นมาใหม่ ดังนั้นโฟลเดอร์ต่างๆ "
 "จะถูกเก็บไว้ที่: \"Evolution-Import\"</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "ยังไม่ได้เลือกไดเร็กทอรี"
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "ไม่พบแฟ้มสำหรับจะทำการนำเข้า"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "การนำเข้าอีเมลจาก %1 เสร็จสิ้น"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "ไม่สามารถเปิด %1 ได้, กำลังข้ามไป"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "กำลังนำเข้าอีเมลจาก %1..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
 "%n duplicate messages not imported"
 msgstr "ข้อความซ้ำ %n ข้อความ ไม่ได้ถูกนำเข้า"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "นำเข้าเมลบนเครื่องและโครงสร้างโฟลเดอร์ของ Evolution 2.x"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -110,34 +110,34 @@ msgstr ""
 "<p>เนื่องจากมีความเป็นไปได้ที่จะมีการสร้างโครงสร้างโฟลเดอร์ใหม่ ดังนั้นโฟลเดอร์ต่างๆ "
 "จะจะถูกเก็บไว้ที่ \"Evolution-Import\"</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "การนำเข้าเสร็จสิ้น, ถูกยกเลิกโดยผู้ใช้"
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "เริ่มนำเข้าแฟ้ม %1..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "นำเข้าไดเร็คทอรีเก็บอีเมลและโครงสร้างของโฟลเดอร์ KMail"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -155,22 +155,22 @@ msgstr ""
 "<p>เนื่องจากมีความเป็นไปได้ที่จะมีการสร้างโครงสร้างโฟลเดอร์ขึ้นมาใหม่ ดังนั้นโฟลเดอร์ต่างๆ "
 "จะถูกเก็บไว้ที่: \"KMail-Import\" ในโฟลเดอร์บนเครื่องของคุณ"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "กำลังนำเข้าโฟลเดอร์ %1..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "ไม่สามารถนำเข้า %1 ได้"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "นำเข้าอีเมลของ Lotus Notes"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -188,25 +188,25 @@ msgstr ""
 "ข้อความที่ถูกนำเข้ามาจะถูกเก็บเอาไว้ที่โฟลเดอร์ย่อยr: \"LNotes-Import\", ในโฟลเดอร์ "
 "ในเครื่องของคุณโดยใช้ชื่อของแฟ้มที่ข้อความนั้นมาจาก</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "แฟ้มทั้งหมด(*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "กำลังนำเข้าอีเมลจาก %1"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "ข้อความ %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "นำเข้าจากโปรแกรม Mail ใน OS X"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -214,18 +214,18 @@ msgstr ""
 "<p><b>ตัวกรองการนำเข้าจากโปรแกรม Mail ใน OS X</b></p> "
 "<p>ตัวกรองนี้จะทำการนำเข้าอีเมลจากโปรแกรม Mail ใน Mac OS X ของแอปเปิล</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 #, fuzzy
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "ข้อความที่ซ้ำ %n ข้อความ จะไม่ถูกนำเข้าไปยังโฟลเดอร์ใน KMail"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "นำเข้าแฟ้ม mbox (UNIX, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -238,15 +238,15 @@ msgstr ""
 "ส่งเมลอื่นๆ ที่ใช้รูปแบบ ดั้งเดิมของ UNIX </p> <p><b>ข้อสังเกต</"
 "b>อีเมลจะถูกนำเข้าสู่โฟลเดอร์ที่มีชื่อตามแฟ้มที่มา แล้วนำหน้าด้วย MBOX- </p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "แฟ้ม mbox (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "นำเข้าอีเมล Outlook Express "
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -264,44 +264,44 @@ msgstr ""
 "โฟลเดอร์ต่างๆ จาก Outlook Express 5 และ 6 จะถูกเก็บเอาไว้ที่: \"OE-Import\" ใน "
 "โฟลเดอร์ในเครื่องของคุณ</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "ไม่พบกล่องจดหมายของ Outlook Express ในไดเร็คทอรี %1"
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "นำเข้าโครงสร้างโฟลเดอร์..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "การนำเข้าอีเมลจาก Outlook Express เสร็จสิ้น"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "ไม่สามารถเปิดกล่องจดหมาย %1 ได้"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "กำลังนำเข้ากล่องจดหมาย %1 ของ OE4"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "กำลังนำเข้ากล่องจดหมาย %1 ของ OE5+"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "กำลังนำเข้าแฟ้มโฟลเดอร์ %1 ของ OE5+"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "นำเข้าอีเมลจากโอเปร่า"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -317,20 +317,20 @@ msgstr ""
 "<p><b>ข้อสังเกต:</b> อีเมลจะถูกนำเข้าสูโฟลเดอร์ที่ชื่อเหมือนกับบัญชีผู้ใช้ที่นำเข้ามา โดยจะมี "
 "OPERA- นำหน้าอยู่</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "กำลังนับแฟ้ม..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "กำลังนำเข้าแฟ้มจดหมายใหม่..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "นำเข้าอีเมลของ Outlook"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -345,23 +345,23 @@ msgstr ""
 "p><p><b>ข้อสังเกต:</b> อีเมลจะถูกนำเข้าไปยังโฟลเดอร์ที่มีชื่อเดียวกันกับบัญชีที่มา แล้วนำหน้าด้วย "
 "OUTLOOK-</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "กำลังนับอีเมล..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "กำลังนับไดเร็คทอรี..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "กำลังนับโฟลเดอร์..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "นำเข้าจดหมายข้อความธรรมดา"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -372,11 +372,11 @@ msgstr ""
 "ไดเร็คทอรีที่เก็บอีเมลไว้ โดยจะนำหนัาด้วย PLAIN-ฒฝยฬ "
 "<p>ตัวกรองนี้จะทำการนำเข้าอีเมลที่มีนามสกุล .msg, .eml และ .txt ทั้งหมด</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "นำเข้าโฟลเดอร์จาก Pegasus-Mail"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -389,39 +389,39 @@ msgstr ""
 "<p><b>ข้อสังเกต:</b> เนื่องจากมีความเป็นไปได้ที่จะมีการสร้างโครงสร้างของโฟลเดอร์ใหม่ "
 "ดังนั้นโฟลเดอร์ต่างๆ จะถูกเก็บไว้ที่: \"PegasusMail-Import\"</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
 msgstr ""
 "ไม่สามารถวิเคราะห์โครงสร้างของโฟลเดอร์ได้; ทำการนำเข้าต่อไปโดยไม่มีการรองรับโฟลเดอร์ย่อย"
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "กำลังนำเข้าแฟ้มจดหมายใหม่ ('.cnm') ..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "กำลังนำเข้าโฟลเดอร์จดหมาย ('.pmm') ..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "กำลังนำเข้าโฟลเดอร์จดหมายของ 'UNIX' ('.mbx') ..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "กำลังนำเข้า %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "กำลังวิเคราะห์โครงสร้างโฟลเดอร์..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "นำเข้าไดเร็คทอรีจดหมาย และโครงสร้างโฟลเดอร์จาก Sylpheed"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -435,11 +435,11 @@ msgstr ""
 "จะถูกเก็บเอาไว้ที่: \"Sylpheed-Import\" ในโฟลเดอร์บนเครื่องของคุณ</p> "
 "<p>ตัวกรองนี้จะยังทำการสร้างสถานะข้อความให้ใหม่ด้วย ต.ย. ข้อความใหม่ หรือ ถูกส่งต่อ"
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "นำเข้าอีเมลและดครงสร้างโฟลเดอร์ของ Bat! Mail"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -454,11 +454,11 @@ msgstr ""
 "DIMAP</p><p>เนื่องจากมีความเป็นไปได้ที่จะมีการสร้างโครงสร้างโฟลเดอร์ใหม่ โฟลเดอร์ต่างๆ "
 "จะถูกเก็บเอาไว้ที่: \"TheBat-Import\" ในบัญชีบนเครื่องของคุณ.</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "นำเข้าจดหมายบนเครื่องและโครงสร้างโฟลเดอร์ของ Thunderbird/Mozilla"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -475,7 +475,7 @@ msgstr ""
 "<p>เพราะว่ามีความเป็นไปได้ในการสาร้างโครงสร้างโฟลเดอร์ใหม่ ดังนั้นโฟลเดอร์ต่างๆ "
 "จะถูกเก็บไว้ที่: \"Thunderbird-Import\"</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -483,15 +483,15 @@ msgstr ""
 "<b>ผิดพลาดรุนแรง</b>: ไม่สามารถเริ่มโปรแกรม KMail สำหรับติดต่อกับ DCOP ได้ โปรดตรวจดูว่า "
 "ได้ติดตั้ง <i>kmail</i> ไว้แล้ว"
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "ไม่สามารถสร้างโฟลเดอร์ %1 ในโปรแกรม KMail ได้"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "ไม่สามารถเพิ่มข้อความเข้าไปในโฟลเดอร์ %1 ในโปรแกรม KMail ได้"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "เกิดข้อผิดพลาดขณะเพิ่มข้อความเข้าไปในโฟลเดอร์ %1 ในโปรแกรม KMail"
 
diff --git a/tde-i18n-tr/messages/tdepim/kmailcvt.po b/tde-i18n-tr/messages/tdepim/kmailcvt.po
index 96c79729c27..23f073be05e 100644
--- a/tde-i18n-tr/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-tr/messages/tdepim/kmailcvt.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2008-02-28 20:27+0200\n"
 "Last-Translator: Serdar Soytetir <tulliana@gmail.com>\n"
 "Language-Team: Turkish <kde-i18n-doc@lists.kde.org>\n"
@@ -34,11 +34,11 @@ msgid ""
 "Your emails"
 msgstr "tolgayaman@isnet.net.tr"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Evolution 1.x Yerel E-postalarını ve Dizin Yapısını Al"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -46,57 +46,57 @@ msgid ""
 "Import\".</p>"
 msgstr ""
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "Hiçbir dizin seçilmedi."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "Alma işlemi için dosya bulunamadı."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "%1 konumundan e-postaların alınması tamamlandı"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "%1 açılamadı, atlanıyor"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "%1 konumundan e-postalar alınıyor..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
 "%n duplicate messages not imported"
 msgstr "%n tekrarlanan mesaj alınmadı"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Evolution 2.x Yerel E-postalarını ve Dizin Yapısını Al"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -113,34 +113,34 @@ msgstr ""
 "Eğer bunu yaparsanız dizinler \"Evolution-Import\" dizini altında "
 "saklanacaktır.</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "İçeriye aktarma işlemi bitti, kullanıcı tarafından iptal edildi."
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "%1 dosyasını almayı başlat..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "KMail E-Posta Dizinlerini ve Dizin Yapısını Al"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -151,22 +151,22 @@ msgid ""
 "\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "%1 dizinini içeriye aktar..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "%1 alınamadı"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "Lotus Notları E-postalarını Al"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -177,25 +177,25 @@ msgid ""
 "named using the names of the files the messages came from.</p>"
 msgstr ""
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "Tüm Dosyalar (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "%1 konumundan e-postalar alınıyor..."
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Mesaj %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "OS X Mail'dan Al"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -203,17 +203,17 @@ msgstr ""
 "<p><b>OS X Mail Alım Filtresi</b></p><p>Bu filtre Apple Mac OS X e-posta "
 "istemcisinden e-postaları alır.</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "%n tekrar eden mesaj KMail' deki %1 klasörüne alınamadı"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "mbox Dosyalarını Al (UNIX, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -227,15 +227,15 @@ msgstr ""
 "</b>E-postalar, MBOX- önekinden sonra gelen dosya isimleriyle adlandırılan "
 "dizinlere alınacaktır.</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "mbox Dosyaları (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Outlook Express E-postalarını Al"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -254,44 +254,44 @@ msgstr ""
 "mümkündür. Eğer bunu yaparsanız dizinler \"OE-Import\" dizini altında "
 "saklanacaktır.</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "%1 dizininde Outlook Express posta kutusu bulunamadı."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "Dizin yapısını içeriye aktar..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Outlook Express e-postalarının alınması tamamlandı"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "%1 posta kutusu açılamadı"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "OE4 Posta Kutusu %1 alınıyor"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "OE5+ Posta Kutusu %1 alınıyor"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "OE5+ Dizin dosyası %1 içeriye aktarılıyor"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Opera E-postalarını Al"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -307,20 +307,20 @@ msgstr ""
 "OPERA- önekinden sonra gelen hesap isimleriyle adlandırılan dizinlere "
 "alınacaktır.</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Dosyalar sayılıyor..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Yeni e-posta dosyaları alınıyor..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Outlook E-postalarını Al"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -336,23 +336,23 @@ msgstr ""
 "önekinden sonra gelen hesap isimleriyle adlandırılan dizinlere alınacaktır.</"
 "p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "Posta sayılıyor..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "Dizinler sayılıyor..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "Klasörler sayılıyor..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Düz Metin E-postalarını Al"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -363,11 +363,11 @@ msgstr ""
 "oldukları klasör adının önüne PLAIN- öneki getirilerek oluşturulan dizinde "
 "saklanır. <p>Bu filtre tüm .msg, .eml, .txt e-postalarını alacak.</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Dizinleri Pegasus Mail Uygulamasından Al"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -381,7 +381,7 @@ msgstr ""
 "oluşturmanız mümkündür. Eğer bunu yaparsanız dizinler \"PegasusMail-Import\" "
 "dizini altında saklanacaktır.</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
@@ -389,32 +389,32 @@ msgstr ""
 "Dizin yapısı ayrıştırılamadı; alt dizin desteği olmadan içeriye aktarma "
 "işleminde devam ediliyor."
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Yeni e-posta dosyaları alınıyor ('.cnm')..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "E-posta klasörleri alınıyor ('.pmm')..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "'UNIX' e-posta klasörleri alınıyor ('.mbx')..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "%1 Alınıyor"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "Dizin yapısı ayrıştırılıyor..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Sylpheed İleti Dizinlerini ve Dizin Yapısını İçeriye Aktar"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -423,11 +423,11 @@ msgid ""
 "the status of message, e.g. new or forwarded."
 msgstr ""
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Tümünü içeri aktar! İletileri ve Dizin Yapısını Al"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -443,11 +443,11 @@ msgstr ""
 "dizin yapısını yeniden oluşturmanız mümkündür. Eğer bunu yaparsanız dizinler "
 "\"TheBat-Import\" dizini altında saklanacaktır.</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "Thunderbird/Mozilla Yerel Postalarını ve Dizin Yapısını Al"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -457,7 +457,7 @@ msgid ""
 "the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -465,15 +465,15 @@ msgstr ""
 "<b>Ölümcül Hata</b>DROP iletişimi için KMail başlatılamadı.\n"
 "<i>kmail</i> uygulamasının sisteme kurulu olduğundan emin olun."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "KMail içinde %1 klasörü oluşturulamadı"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "KMail içinde %1 klasörüne mesaj eklenemedi"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "kMail'deki %1 klasörüne mesaj eklerken hata oluştu"
 
diff --git a/tde-i18n-uk/messages/tdepim/kmailcvt.po b/tde-i18n-uk/messages/tdepim/kmailcvt.po
index a4b318c570d..ccac89f0bb1 100644
--- a/tde-i18n-uk/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-uk/messages/tdepim/kmailcvt.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2020-08-19 18:10+0000\n"
 "Last-Translator: Roman Savochenko <roman@oscada.org>\n"
 "Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/"
@@ -33,11 +33,11 @@ msgid ""
 "Your emails"
 msgstr "rysin@kde.org,ivanpetrouchtchak@yahoo.com"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Імпортувати пошту і структуру тек Evolution 1.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -48,46 +48,46 @@ msgstr ""
 "пошти Evolution (переважно це ~/evolution/local/).</p><p>Оскільки можливо "
 "відтворити структуру тек, вона буде міститись в \"Evolution-Import\".</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "Каталог не вибрано."
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "Не знайдено файлів для імпортування."
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "Закінчено імпортування пошти з %1"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "Не вдається відкрити %1, пропускаємо його"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "Імпортування листів з %1..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
@@ -97,11 +97,11 @@ msgstr ""
 "%n повідомлення-дублікати не було імпортовано\n"
 "%n повідомлень-дублікатів не було імпортовано"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Імпортувати пошту і структуру тек Evolution 2.x"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -117,23 +117,23 @@ msgstr ""
 "</p><p>Оскільки можливо відтворити структуру тек, вона буде міститись в "
 "\"Evolution-Import\".</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "Імпортування закінчене, скасоване користувачем."
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "Почати імпортування файла %1..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr "Імпортувати Архівний Файл KMail"
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
@@ -143,11 +143,11 @@ msgstr ""
 "імпортувати архівні файли попередньо експортовані KMail.</p><p>Архівні файли "
 "містять цілковите піддерево теки запакованої у один файл.</p>"
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Імпортувати пошту і структуру тек KMail"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -165,22 +165,22 @@ msgstr ""
 "файлами mbox.</p><p>Оскільки, можливо відтворити структуру тек, вона буде "
 "міститись в \"KMail-Import\" у вашій локальній теці.</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "Імпортувати теку %1..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "Не вдалося імпортувати %1"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "Імпорт пошти з Lotus Notes"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -199,25 +199,25 @@ msgstr ""
 "файлами, з яких вони походять, в \"LNotes-Import\" у вашій локальній теці.</"
 "p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "Всі файли (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "Імпортування листів з %1"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "Повідомлення %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "Імпорт пошти з OS X"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -225,7 +225,7 @@ msgstr ""
 "<p><b>Фільтр імпорту пошти з OS X</b></p><p>Цей фільтр імпортує листи з "
 "клієнта ел. пошти Apple Mac OS X.</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
@@ -234,11 +234,11 @@ msgstr ""
 "%n повідомлення-дублікати не було імпортовано у теку %1 в KMail\n"
 "%n повідомлень-дублікатів не було імпортовано у теку %1 в KMail"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Імпорт файлів у форматі mbox (UNIX, Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -253,15 +253,15 @@ msgstr ""
 "Листи буде імпортовано у теки, назва яких починається з рядка \"MBOX-\", за "
 "яким йде назва файла, з якого було імпортовано листи.</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "файли mbox (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "Імпорт пошти з Outlook Express"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -278,44 +278,44 @@ msgstr ""
 "b>Оскільки можливо відтворити структуру тек, то теки з Outlook Express 5 і 6 "
 "будуть міститись в \"OE-Import\" у вашій локальній теці</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "У каталозі %1 не знайдено скриньок Outlook Express 4 \".mbx\"."
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "Імпортувати структуру тек..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Закінчено імпорт пошти з Outlook Express"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "Не вдається відкрити скриньку %1"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "Імпортування скриньки OE4 - %1"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "Імпортування скриньки OE5+ - %1"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "Імпортування OE5+ файла теки %1"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "Імпорт пошти з Opera"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -331,20 +331,20 @@ msgstr ""
 "імпортовані у теки, назви яких беруться з назв рахунків, з яких вони "
 "походять, з долученим префіксом OPERA-</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "Підрахування файлів..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "Імпортування нових файлів пошти..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "Імпорт пошти з Outlook"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -360,23 +360,23 @@ msgstr ""
 "беруться з назв рахунків, з яких вони походять, з долученим префіксом "
 "OUTLOOK-</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "Підрахування листів..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "Підрахування каталогів..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "Підрахування тек..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "Імпорт пошти з текстових файлів"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -388,11 +388,11 @@ msgstr ""
 "назва каталогу з якого було імпортовано листи.</p><p>Цей фільтр імпортує всі "
 "файли, що закінчуються на .msg, .eml та .txt.</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "Імпортувати теки з Pegasus-Mail"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -405,7 +405,7 @@ msgstr ""
 "C:\\pmail\\mail\\admin</p><p><b>Примітка:</b> Оскільки, можливо відтворити "
 "структуру тек, вона буде міститись в \"PegasusMail-Import\"</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
@@ -413,32 +413,32 @@ msgstr ""
 "Не вдається зробити синтаксичний аналіз структури тек; продовжується "
 "імпортування без підтримки підтек."
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "Імпортування нових файлів пошти (\".cnm\") ..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "Імпортування тек з поштою (\".pmm\") ..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "Імпортування тек з поштою у UNIX форматі (\".mbx\") ..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "Імпортування %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "Аналіз структури тек..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Імпортувати пошту і структуру тек Sylpheed"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -452,11 +452,11 @@ msgstr ""
 "у вашій локальній теці.</p><p>Цей фільтр також відтворює стан повідомлення, "
 "наприклад, нове або переслане."
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "Імпорт Пошти та Структури Тек The Bat!"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -472,11 +472,11 @@ msgstr ""
 "структуру тек, теки буде розміщено в \"TheBat-Import\" у вашому локальному "
 "рахунку.</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "Імпортувати локальну пошту і структуру тек Thunderbird/Mozilla"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -492,7 +492,7 @@ msgstr ""
 "буде створено багато нових тек.</p><p>Оскільки можливо відтворити структуру "
 "тек, вона буде міститись в \"Thunderbird-Import\".</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -500,15 +500,15 @@ msgstr ""
 "<b>Критична помилка:</b> Не вдається запустити KMail для зв'язку з DCOP. "
 "Переконайтеся, що програма <i>kmail</i> встановлена."
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "Неможливо створити теку %1 в KMail"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "Неможливо додати повідомлення в теку %1 в KMail"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Помилка додавання повідомлення до теки %1 в KMail"
 
diff --git a/tde-i18n-zh_CN/messages/tdepim/kmailcvt.po b/tde-i18n-zh_CN/messages/tdepim/kmailcvt.po
index 113755289de..412de8ecbd3 100644
--- a/tde-i18n-zh_CN/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-zh_CN/messages/tdepim/kmailcvt.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2005-08-03 22:39+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -30,11 +30,11 @@ msgid ""
 "Your emails"
 msgstr "i18n-translation@lists.linux.net.cn"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "导入 Evolution 1.x 本地邮件和文件夹结构"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -45,57 +45,57 @@ msgstr ""
 "基目录(通常为 ~/.evolution/local/)。</p><p>由于可以重新创建文件夹结构，文件夹"
 "将存储于“Evolution-Import”下。</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "没有选中目录。"
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "没有找到可导入的文件。"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "从 %1 导入电子邮件完成"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "无法打开 %1，跳过"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "正在从 %1 导入新邮件..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
 "%n duplicate messages not imported"
 msgstr "未导入 %n 封重复的信件"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "导入 Evolution 2.x 本地邮件和文件夹结构"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -110,34 +110,34 @@ msgstr ""
 "多新文件夹。</p><p>由于可以创建文件夹结构，文件夹将存储于“Evolution-"
 "Import”下。</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "完成了导入，被用户取消。"
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "开始导入文件 %1..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "导入 KMail 邮件和文件夹结构"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -153,22 +153,22 @@ msgstr ""
 "中。</p><p>此过滤器不会导入带 mbox 文件的 KMail 邮件文件夹。</p><p>由于可以重"
 "建文件夹结构，文件夹将储于您本地文件夹的“KMail-Import”下。</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "导入文件夹 %1..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "无法导入 %1"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "导入 Lotus Notes 邮件"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -184,25 +184,25 @@ msgstr ""
 "</p><p><b>注意：</b>由于可以重现文件夹结构，导入的信件将会被存储于本地文件"
 "夹“LNotes-Import”的子文件夹中，而子文件夹的名称取决于导入时的文件名。</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "全部文件(*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "正在从 %1 导入邮件"
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "信件 %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "从 OS X 邮件中导入"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -210,17 +210,17 @@ msgstr ""
 "<p><b>OS X 邮件导入过滤器</b></p><p>此过滤器可从 Apple Mac OS X 的邮件客户端"
 "程序中导入电子邮件。</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "未将 %n 封重复的信件导入到 KMail 的文件夹 %1 中"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "导入 mbox 文件(UNIX，Evolution)"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -233,15 +233,15 @@ msgstr ""
 "此过滤器。</p><p><b>注意：</b>电子邮件将会导入到与文件同名的文件夹中，只是带"
 "有前缀“MBOX-”。</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "mbox 文件(*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "导入 Outlook Express 邮件"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -257,44 +257,44 @@ msgstr ""
 "and Settings</i></ul></p><p><b>注意：</b>由于可以重建文件夹结构，Outlook "
 "Express 5 和 6 中的文件夹将被存储于您本地文件夹的“OE-Import”下。</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "未在目录 %1 中找到 Outlook Express 邮箱。"
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "导入文件夹结构..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "导入 Outlook Express 邮件完成"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "无法打开邮箱 %1"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "导入 OE4 邮箱 %1"
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "导入 OE5+ 邮箱 %1"
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "导入 OE5+ 文件夹文件 %1"
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "导入 Opera 邮件"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -308,20 +308,20 @@ msgstr ""
 "p><p>选择账户所在的目录(通常为 ~/.opera/mail/store/account*)。</p><p><b>注"
 "意：</b>电子邮件将会导入到与账户同名的文件夹中，只是带有前缀“OPERA-”。</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "正在统计文件..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "正在导入新邮件文件..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "导入 Outlook 邮件"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -335,23 +335,23 @@ msgstr ""
 "以在 <i>C:\\Documents and Settings</i> 下搜索 .pst 文件<p><p><b>注意：</b>电"
 "子邮件将会导入到与账户同名的文件夹中，只是带有前缀“OUTLOOK-”</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "正在统计邮件..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "正在统计目录..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "正在统计文件夹..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "导入纯文本电子邮件"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -361,11 +361,11 @@ msgstr ""
 "<p>选择您系统中包含电子邮件的目录。邮件会被放在与其所在目录同名的文件夹中，只"
 "是带有前缀“PLAIN-”。</p><p>此过滤器将会导入全部 .msg、.eml 和 .txt 邮件。</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "从 Pegasus-Mail 中导入文件夹"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -377,38 +377,38 @@ msgstr ""
 "许多系统中，此目录存储于 C:\\PMail\\mail 或 C:\\pmail\\mail\\admin</p><p><b>"
 "注意：</b>由于可以重建文件夹结构，文件夹将存储于“PegasusMail-Import”下。</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
 msgstr "无法分析文件夹结构；继续导入而不支持子文件夹。"
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "正在导入新邮件文件(“.cnm”)..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "正在导入邮件文件夹(“.pmm”) ..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "正在导入“UNIX”邮件文件夹(“.mbx”)..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "正在导入 %1"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "正在分析文件夹结构..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "导入 Sylpheed 邮件和文件夹结构"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -421,11 +421,11 @@ msgstr ""
 "件夹的“Sylpheed-Import”下。</p><p>此过滤器还将重建信件的状态，例如新邮件或已"
 "转发。"
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "导入 The Bat! 邮件和文件夹结构"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -439,11 +439,11 @@ msgstr ""
 "件，这适用于 POP 账户，但不适用于 IMAP/DIMAP 账户。</p><p>由于可以重建文件夹"
 "结构，文件夹将储于您本地账户的“TheBat-Import”下。</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "导入 Thunderbird/Mozilla 本地邮件和文件夹结构"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -458,7 +458,7 @@ msgstr ""
 "如果您那么做的话，将会得到很多新文件夹。</p><p>由于可以重建文件夹结构，文件夹"
 "将存储于“Thunderbird-Import”下。</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
@@ -466,15 +466,15 @@ msgstr ""
 "<b>严重错误：</b>无法与 KMail 进行 DCOP 通讯。请确认<i>kmail</i>在您的路径"
 "中。"
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "无法在 KMail 中创建文件夹 %1"
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "无法将信件添加到 KMail 的文件夹 %1 中"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "在将信件添加到 KMail 的文件夹 %1 时出错"
 
diff --git a/tde-i18n-zh_TW/messages/tdepim/kmailcvt.po b/tde-i18n-zh_TW/messages/tdepim/kmailcvt.po
index f67e174c8f6..30c62db423b 100644
--- a/tde-i18n-zh_TW/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-zh_TW/messages/tdepim/kmailcvt.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt1\n"
-"POT-Creation-Date: 2020-10-09 15:41+0200\n"
+"POT-Creation-Date: 2020-12-16 16:51+0100\n"
 "PO-Revision-Date: 2006-01-13 08:36+0800\n"
 "Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
 "dot tw>\n"
@@ -32,11 +32,11 @@ msgid ""
 "Your emails"
 msgstr "id5id5@tcts1.seed.net.tw, acelan@kde.linux.org.tw"
 
-#: filter_evolution.cxx:31
+#: filter_evolution.cpp:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "匯入 Evolution 1.x 的信件"
 
-#: filter_evolution.cxx:33
+#: filter_evolution.cpp:33
 msgid ""
 "<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
 "Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
@@ -47,57 +47,57 @@ msgstr ""
 "常是 ~/evolution/local）。</p><p>這個過濾器會產生一個叫 Evolution-Import 的信"
 "件夾，並幫您保存原先的目錄結構。</p>"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: filter_evolution.cpp:57 filter_evolution_v2.cpp:66
+#: filter_kmail_maildir.cpp:57 filter_mailapp.cpp:52 filter_oe.cpp:60
+#: filter_opera.cpp:60 filter_outlook.cpp:44 filter_plain.cpp:44
+#: filter_pmail.cpp:56 filter_sylpheed.cpp:56 filter_thebat.cpp:62
+#: filter_thunderbird.cpp:65
 msgid "No directory selected."
 msgstr "沒有選擇任何目錄"
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: filter_evolution.cpp:64 filter_evolution_v2.cpp:73
+#: filter_kmail_maildir.cpp:64 filter_mailapp.cpp:53 filter_opera.cpp:67
+#: filter_opera.cpp:152 filter_outlook.cpp:50 filter_sylpheed.cpp:63
+#: filter_thebat.cpp:69 filter_thunderbird.cpp:72
 msgid "No files found for import."
 msgstr "沒有選擇任何檔案"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#: filter_evolution.cpp:76 filter_evolution_v2.cpp:90
+#: filter_kmail_maildir.cpp:83 filter_mailapp.cpp:126 filter_mbox.cpp:132
+#: filter_opera.cpp:141 filter_plain.cpp:80 filter_pmail.cpp:79
+#: filter_sylpheed.cpp:78 filter_thebat.cpp:84 filter_thunderbird.cpp:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "匯入信件夾 %1 完成。"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: filter_evolution.cpp:124 filter_evolution_v2.cpp:160
+#: filter_kmail_maildir.cpp:128 filter_lnotes.cpp:88 filter_mailapp.cpp:62
+#: filter_mbox.cpp:54 filter_opera.cpp:87 filter_outlook.cpp:59
+#: filter_pmail.cpp:165 filter_pmail.cpp:235 filter_pmail.cpp:253
+#: filter_pmail.cpp:294 filter_thebat.cpp:151 filter_thunderbird.cpp:161
 msgid "Unable to open %1, skipping"
 msgstr "無法開啟檔案 '%1'"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: filter_evolution.cpp:145 filter_mailapp.cpp:70 filter_mbox.cpp:60
+#: filter_opera.cpp:89 filter_outlook.cpp:57
 msgid "Importing emails from %1..."
 msgstr "正在匯入信件夾 %1..."
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_evolution.cpp:195 filter_evolution_v2.cpp:92
+#: filter_kmail_maildir.cpp:85 filter_opera.cpp:143 filter_outlook.cpp:58
+#: filter_plain.cpp:82 filter_sylpheed.cpp:80 filter_thebat.cpp:86
+#: filter_thunderbird.cpp:101
 #, c-format
 msgid ""
 "_n: 1 duplicate message not imported\n"
 "%n duplicate messages not imported"
 msgstr "%n 封重複的信件未匯入"
 
-#: filter_evolution_v2.cxx:29
+#: filter_evolution_v2.cpp:29
 msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "匯入 Evolution 2.x 的信件"
 
-#: filter_evolution_v2.cxx:31
+#: filter_evolution_v2.cpp:31
 msgid ""
 "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
 "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
@@ -112,34 +112,34 @@ msgstr ""
 "新的信件夾。</p><p>這個過濾器會產生一個叫 Evolution-Import 的信件夾，並幫您保"
 "存原先的目錄結構。</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#: filter_evolution_v2.cpp:94 filter_kmail_maildir.cpp:87
+#: filter_mailapp.cpp:137 filter_mbox.cpp:138 filter_oe.cpp:102
+#: filter_opera.cpp:155 filter_plain.cpp:84 filter_sylpheed.cpp:82
+#: filter_thebat.cpp:88 filter_thunderbird.cpp:104
 msgid "Finished import, canceled by user."
 msgstr "已取消匯入。"
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
+#: filter_evolution_v2.cpp:124 filter_thunderbird.cpp:94
+#: filter_thunderbird.cpp:129
 msgid "Start import file %1..."
 msgstr "開始匯入檔案 %1..."
 
-#: filter_kmail_archive.cxx:24
+#: filter_kmail_archive.cpp:24
 msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_kmail_archive.cpp:26
 msgid ""
 "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
 "archives files previously exported by KMail.</p><p>Archive files contain a "
 "complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
+#: filter_kmail_maildir.cpp:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "匯入 KMail 的信件"
 
-#: filter_kmail_maildir.cxx:28
+#: filter_kmail_maildir.cpp:28
 msgid ""
 "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
 "mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
@@ -155,22 +155,22 @@ msgstr ""
 "p><p>這個過濾器會產生一個叫 KMail-Import 的資料夾，並幫您保存原先的目錄結構。"
 "</p>"
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+#: filter_kmail_maildir.cpp:196 filter_sylpheed.cpp:140 filter_thebat.cpp:199
 msgid "Import folder %1..."
 msgstr "正在匯入信件夾 %1..."
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_kmail_maildir.cpp:206 filter_kmail_maildir.cpp:211
+#: filter_plain.cpp:67 filter_plain.cpp:71 filter_sylpheed.cpp:153
+#: filter_sylpheed.cpp:158
 #, c-format
 msgid "Could not import %1"
 msgstr "無法匯入 %1"
 
-#: filter_lnotes.cxx:30
+#: filter_lnotes.cpp:30
 msgid "Import Lotus Notes Emails"
 msgstr "匯入 Lotus Notes 信件"
 
-#: filter_lnotes.cxx:32
+#: filter_lnotes.cpp:32
 msgid ""
 "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
 "will import Structured Text files from an exported Lotus Notes email client "
@@ -184,25 +184,25 @@ msgstr ""
 "Lotus Notes 信件格式檔，並將其中信件匯入 KMail 中。</p><p><b>注意：</b>這個過"
 "濾器會產生一個叫 LNotes-Import 的信件夾，並幫您保存原先的目錄格式。</p>"
 
-#: filter_lnotes.cxx:55
+#: filter_lnotes.cpp:55
 msgid "All Files (*)"
 msgstr "所有檔案 (*)"
 
-#: filter_lnotes.cxx:64
+#: filter_lnotes.cpp:64
 #, c-format
 msgid "Importing emails from %1"
 msgstr "正在匯入從 %1 中匯入信件..."
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_lnotes.cpp:109 filter_pmail.cpp:279
 #, c-format
 msgid "Message %1"
 msgstr "信件 %1"
 
-#: filter_mailapp.cxx:32
+#: filter_mailapp.cpp:32
 msgid "Import From OS X Mail"
 msgstr "匯入 OS X 的信件"
 
-#: filter_mailapp.cxx:34
+#: filter_mailapp.cpp:34
 msgid ""
 "<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
 "Mail client in Apple Mac OS X.</p>"
@@ -210,17 +210,17 @@ msgstr ""
 "<p><b>OS X 信件匯入過濾器</b></p><p>這個過濾器會幫忙您將 Apple Mac OS X 的收"
 "發信軟體中的郵件匯入 Kmail 中。</p>"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_mailapp.cpp:129 filter_mbox.cpp:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "有 %n 封重複信件未匯入信件夾 %1。"
 
-#: filter_mbox.cxx:28
+#: filter_mbox.cpp:28
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "匯入 mbox 檔（UNIX 或 Evolution 使用的信件檔）"
 
-#: filter_mbox.cxx:30
+#: filter_mbox.cpp:30
 msgid ""
 "<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
 "KMail. Use this filter if you want to import mails from Ximian Evolution or "
@@ -233,15 +233,15 @@ msgstr ""
 "軟體，您可以用這個過濾器來將信件匯入。</p><p><b>注意：</b>信件會匯入到新的信"
 "件夾，信件夾名稱為原來的檔名前面加上 MBOX-。</p>"
 
-#: filter_mbox.cxx:48
+#: filter_mbox.cpp:48
 msgid "mbox Files (*)"
 msgstr "mbox 檔案 (*)"
 
-#: filter_oe.cxx:40
+#: filter_oe.cpp:40
 msgid "Import Outlook Express Emails"
 msgstr "匯入 Outelook Express 的信件"
 
-#: filter_oe.cxx:42
+#: filter_oe.cpp:42
 msgid ""
 "<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
 "the folder where the mailbox has been stored by searching for .dbx or .mbx "
@@ -256,44 +256,44 @@ msgstr ""
 "找尋有 .dbx 或 .mbx 檔案的信件目錄。</p><p><b>注意：</b>這個過濾器會產生一個"
 "叫 OE-Import 的信件夾，並幫您保存原先的目錄結構。</p>"
 
-#: filter_oe.cxx:67
+#: filter_oe.cpp:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
 msgstr "在 %1 資料夾中找不到 Outlook Express 的信件夾。"
 
-#: filter_oe.cxx:82
+#: filter_oe.cpp:82
 msgid "Import folder structure..."
 msgstr "正在匯入郵件目錄結構..."
 
-#: filter_oe.cxx:101
+#: filter_oe.cpp:101
 msgid "Finished importing Outlook Express emails"
 msgstr "Outlook Express 信件已匯入完成。"
 
-#: filter_oe.cxx:119
+#: filter_oe.cpp:119
 #, c-format
 msgid "Unable to open mailbox %1"
 msgstr "無法開啟檔案 '%1'"
 
-#: filter_oe.cxx:130
+#: filter_oe.cpp:130
 #, c-format
 msgid "Importing OE4 Mailbox %1"
 msgstr "匯入 OE4 信件夾 %1 中..."
 
-#: filter_oe.cxx:144
+#: filter_oe.cpp:144
 #, c-format
 msgid "Importing OE5+ Mailbox %1"
 msgstr "匯入 OE5+ 信件夾 %1 中..."
 
-#: filter_oe.cxx:150
+#: filter_oe.cpp:150
 #, c-format
 msgid "Importing OE5+ Folder file %1"
 msgstr "正在匯入 OE5+ 信件檔 %1 中..."
 
-#: filter_opera.cxx:28
+#: filter_opera.cpp:28
 msgid "Import Opera Emails"
 msgstr "匯入 Opera 的信件"
 
-#: filter_opera.cxx:30
+#: filter_opera.cpp:30
 msgid ""
 "<p><b>Opera email import filter</b></p><p>This filter will import mails from "
 "Opera mail folder. Use this filter if you want to import all mails within a "
@@ -306,20 +306,20 @@ msgstr ""
 "mail/store/account*）。</p><p>這個過濾器將 Opera 中某個帳號的所有郵件匯入，並"
 "存在信件夾內，信件夾的名稱會用 OPERA-您的帳號名稱。</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: filter_opera.cpp:75 filter_outlook.cpp:45 filter_plain.cpp:51
+#: filter_pmail.cpp:61
 msgid "Counting files..."
 msgstr "計算檔案中..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: filter_opera.cpp:82 filter_outlook.cpp:49 filter_plain.cpp:55
 msgid "Importing new mail files..."
 msgstr "正在匯入新的信件檔..."
 
-#: filter_outlook.cxx:28
+#: filter_outlook.cpp:28
 msgid "Import Outlook Emails"
 msgstr "匯入 Outlook 的信件"
 
-#: filter_outlook.cxx:30
+#: filter_outlook.cpp:30
 msgid ""
 "<p><b>Outlook email import filter</b></p><p>This filter will import mails "
 "from a Outlook pst-file. You will need to locate the folder where the pst-"
@@ -333,23 +333,23 @@ msgstr ""
 "and Settings</i> 中找尋 .pst 檔。</p><p><b>注意：</b>這個過濾器會產生一個新的"
 "信件夾，名稱為 pst 檔的檔名前面加上 OUTLOOK-。</p>"
 
-#: filter_outlook.cxx:46
+#: filter_outlook.cpp:46
 msgid "Counting mail..."
 msgstr "計算信件中..."
 
-#: filter_outlook.cxx:47
+#: filter_outlook.cpp:47
 msgid "Counting directories..."
 msgstr "計算目錄中..."
 
-#: filter_outlook.cxx:48
+#: filter_outlook.cpp:48
 msgid "Counting folders..."
 msgstr "計算資料夾中..."
 
-#: filter_plain.cxx:27
+#: filter_plain.cpp:27
 msgid "Import Plain Text Emails"
 msgstr "匯入純文字信件"
 
-#: filter_plain.cxx:29
+#: filter_plain.cpp:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
 "placed in a folder with the same name as the directory they were in, "
@@ -360,11 +360,11 @@ msgstr ""
 "的目錄。這些信件將會匯入到新的信件夾中，名稱為原來目錄的名稱，前面加上 "
 "PLAIN-。</p>"
 
-#: filter_pmail.cxx:31
+#: filter_pmail.cpp:31
 msgid "Import Folders From Pegasus-Mail"
 msgstr "匯入 Pegasus-Mail 的信件"
 
-#: filter_pmail.cxx:33
+#: filter_pmail.cpp:33
 msgid ""
 "<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
 "and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
@@ -377,38 +377,38 @@ msgstr ""
 "</b>這個過濾器會產生一個叫 PegasusMail-Import 的信件夾，並幫您保存原先的目錄"
 "結構。</p>"
 
-#: filter_pmail.cxx:69
+#: filter_pmail.cpp:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder "
 "support."
 msgstr "無法剖析目錄結構：改成不匯入子目錄。"
 
-#: filter_pmail.cxx:72
+#: filter_pmail.cpp:72
 msgid "Importing new mail files ('.cnm')..."
 msgstr "正在匯入新的信件檔('.cnm')..."
 
-#: filter_pmail.cxx:74
+#: filter_pmail.cpp:74
 msgid "Importing mail folders ('.pmm')..."
 msgstr "正在匯入信件夾('.pmm')..."
 
-#: filter_pmail.cxx:76
+#: filter_pmail.cpp:76
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "正在匯入'UNIX'信件夾('.mbx')..."
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_pmail.cpp:175 filter_pmail.cpp:255
 #, c-format
 msgid "Importing %1"
 msgstr "匯入 %1 中"
 
-#: filter_pmail.cxx:290
+#: filter_pmail.cpp:290
 msgid "Parsing the folder structure..."
 msgstr "剖析目錄結構中..."
 
-#: filter_sylpheed.cxx:27
+#: filter_sylpheed.cpp:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "匯入 Sylpheed 的信件"
 
-#: filter_sylpheed.cxx:29
+#: filter_sylpheed.cpp:29
 msgid ""
 "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
 "Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
@@ -421,11 +421,11 @@ msgstr ""
 "並幫您保存原先的目錄結構。</p><p>它並且會重新產生每一封信件的狀態，例如是未讀"
 "的或是已轉寄之類。</p>"
 
-#: filter_thebat.cxx:33
+#: filter_thebat.cpp:33
 msgid "Import The Bat! Mails and Folder Structure"
 msgstr "匯入 The Bat! 的信件"
 
-#: filter_thebat.cxx:35
+#: filter_thebat.cpp:35
 msgid ""
 "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
 "Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
@@ -439,11 +439,11 @@ msgstr ""
 "入，也就是只匯入 POP 帳號的信件，而不會匯入 IMAP/DIMAP 帳號中的信件。</p><p>"
 "這個過濾器會產生一個叫 TheBat-Import 的信件夾，並幫您保存原來的目錄結構。</p>"
 
-#: filter_thunderbird.cxx:28
+#: filter_thunderbird.cpp:28
 msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr "匯入 Thunderbird/Mozilla 郵件"
 
-#: filter_thunderbird.cxx:30
+#: filter_thunderbird.cpp:30
 msgid ""
 "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
 "Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
@@ -458,22 +458,22 @@ msgstr ""
 "使用 maildir 的目錄），不然會產生很多新的信件夾。</p><p>這個過濾器會產生一個"
 "叫 Thunderbird-Import 的信件夾，並幫您保存原先的目錄結構。</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filters.cpp:145 filters.cpp:180 filters.cpp:208
 msgid ""
 "<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
 "<i>kmail</i> is installed."
 msgstr ""
 "<b>嚴重錯誤:</b>無法啟動 KMail DCOP 通訊。請確定您有安裝 <i>KMail</i>。"
 
-#: filters.cxx:153 filters.cxx:188
+#: filters.cpp:153 filters.cpp:188
 msgid "Cannot make folder %1 in KMail"
 msgstr "無法在 KMail 中建立信件夾 %1 "
 
-#: filters.cxx:156 filters.cxx:191
+#: filters.cpp:156 filters.cpp:191
 msgid "Cannot add message to folder %1 in KMail"
 msgstr "無法在 %1 信件夾新增郵件"
 
-#: filters.cxx:162 filters.cxx:194
+#: filters.cpp:162 filters.cpp:194
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "當在信件夾 %1 新增郵件時發生錯誤"