Merge translation files from master branch.

2 files changed, 121 insertions, 121 deletions

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-cy/messages/tdepim/tdeio_imap4.po b/tde-i18n-cy/messages/tdepim/tdeio_imap4.po
index 911482688f0..57671835c3f 100644
--- a/tde-i18n-cy/messages/tdepim/tdeio_imap4.po
+++ b/tde-i18n-cy/messages/tdepim/tdeio_imap4.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdepim/tdeio_imap4.po\n"
-"POT-Creation-Date: 2020-05-11 04:03+0200\n"
+"POT-Creation-Date: 2020-12-16 16:52+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
@@ -22,88 +22,88 @@ msgid ""
 "Your emails"
 msgstr ""
 
-#: imap4.cc:622
+#: imap4.cpp:622
 msgid "Message from %1 while processing '%2': %3"
 msgstr ""
 
-#: imap4.cc:624
+#: imap4.cpp:624
 msgid "Message from %1: %2"
 msgstr ""
 
-#: imap4.cc:948
+#: imap4.cpp:948
 msgid ""
 "The following folder will be created on the server: %1 What do you want to "
 "store in this folder?"
 msgstr ""
 
-#: imap4.cc:950
+#: imap4.cpp:950
 msgid "Create Folder"
 msgstr "Creu Plygell"
 
-#: imap4.cc:951
+#: imap4.cpp:951
 msgid "&Messages"
 msgstr "&Negeseuon"
 
-#: imap4.cc:951
+#: imap4.cpp:951
 msgid "&Subfolders"
 msgstr "I&sblygelli"
 
-#: imap4.cc:1285
+#: imap4.cpp:1285
 msgid "Unsubscribe of folder %1 failed. The server returned: %2"
 msgstr ""
 
-#: imap4.cc:1306
+#: imap4.cpp:1306
 msgid "Subscribe of folder %1 failed. The server returned: %2"
 msgstr ""
 
-#: imap4.cc:1375 imap4.cc:1387 imap4.cc:1418
+#: imap4.cpp:1375 imap4.cpp:1387 imap4.cpp:1418
 msgid "Changing the flags of message %1 failed."
 msgstr "Methodd newid baneri neges %1."
 
-#: imap4.cc:1464
+#: imap4.cpp:1464
 msgid ""
 "Setting the Access Control List on folder %1 for user %2 failed. The server "
 "returned: %3"
 msgstr ""
 
-#: imap4.cc:1483
+#: imap4.cpp:1483
 msgid ""
 "Deleting the Access Control List on folder %1 for user %2 failed. The server "
 "returned: %3"
 msgstr ""
 
-#: imap4.cc:1500 imap4.cc:1527
+#: imap4.cpp:1500 imap4.cpp:1527
 msgid ""
 "Retrieving the Access Control List on folder %1 failed. The server returned: "
 "%2"
 msgstr ""
 
-#: imap4.cc:1561
+#: imap4.cpp:1561
 msgid "Searching of folder %1 failed. The server returned: %2"
 msgstr ""
 
-#: imap4.cc:1595
+#: imap4.cpp:1595
 #, fuzzy
 msgid "Custom command %1:%2 failed. The server returned: %3"
 msgstr "Methu cael gwybodaeth am blygell %1. Ymatebodd y gweinydd: %2"
 
-#: imap4.cc:1678
+#: imap4.cpp:1678
 msgid "Setting the annotation %1 on folder %2  failed. The server returned: %3"
 msgstr ""
 
-#: imap4.cc:1702
+#: imap4.cpp:1702
 msgid ""
 "Retrieving the annotation %1 on folder %2 failed. The server returned: %3"
 msgstr ""
 
-#: imap4.cc:1739
+#: imap4.cpp:1739
 #, fuzzy
 msgid ""
 "Retrieving the quota root information on folder %1 failed. The server "
 "returned: %2"
 msgstr "Methu cael gwybodaeth am blygell %1. Ymatebodd y gweinydd: %2"
 
-#: imap4.cc:2064
+#: imap4.cpp:2064
 msgid ""
 "The server %1 supports neither IMAP4 nor IMAP4rev1.\n"
 "It identified itself with: %2"
@@ -111,7 +111,7 @@ msgstr ""
 "Nid yw'r gweinydd %1 yn cynnal na IMAP4 na IMAP4rev1.\n"
 "Dynododd ei hun â %2"
 
-#: imap4.cc:2075
+#: imap4.cpp:2075
 msgid ""
 "The server does not support TLS.\n"
 "Disable this security feature to connect unencrypted."
@@ -119,23 +119,23 @@ msgstr ""
 "Nid yw'r gweinydd yn cynnal TLS.\n"
 "Analluogwch y nodwedd diogelwch yma i gysylltu heb gêl-ysgrifaeth."
 
-#: imap4.cc:2100
+#: imap4.cpp:2100
 msgid "Starting TLS failed."
 msgstr "Methodd cychwyn TLS."
 
-#: imap4.cc:2109
+#: imap4.cpp:2109
 msgid "LOGIN is disabled by the server."
 msgstr ""
 
-#: imap4.cc:2116
+#: imap4.cpp:2116
 msgid "The authentication method %1 is not supported by the server."
 msgstr "Ni chynhelir y dull awdurdodi %1 gan y gweinydd."
 
-#: imap4.cc:2144
+#: imap4.cpp:2144
 msgid "Username and password for your IMAP account:"
 msgstr ""
 
-#: imap4.cc:2158
+#: imap4.cpp:2158
 #, fuzzy
 msgid ""
 "Unable to login. Probably the password is wrong.\n"
@@ -146,7 +146,7 @@ msgstr ""
 "Atebodd y gweinydd:\n"
 "%1"
 
-#: imap4.cc:2165
+#: imap4.cpp:2165
 #, fuzzy
 msgid ""
 "Unable to authenticate via %1.\n"
@@ -157,11 +157,11 @@ msgstr ""
 "Atebodd y gweinydd:\n"
 "%2"
 
-#: imap4.cc:2172
+#: imap4.cpp:2172
 msgid "SASL authentication is not compiled into tdeio_imap4."
 msgstr ""
 
-#: imap4.cc:2716
+#: imap4.cpp:2716
 msgid "Unable to open folder %1. The server replied: %2"
 msgstr "Methu agor y blygell %1. Atebodd y gweinydd: %2"