Update translation files

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

(cherry picked from commit fec0c2e39f1269d50c7c93dc3669989bca7b8295)

1 files changed, 388 insertions, 425 deletions

diff --git a/tde-i18n-cy/messages/tdepim/kmailcvt.po b/tde-i18n-cy/messages/tdepim/kmailcvt.po
index 62fb4bb11ff..7bf1f0dc4b1 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: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+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"
@@ -18,28 +18,78 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: filter_outlook.cxx:28
-#, fuzzy
-msgid "Import Outlook Emails"
-msgstr "Mewnforio Ebostau Outlook Express"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Owain Green drwy KGyfieithu - Meddalwedd Gymraeg"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kyfieithu@dotmon.com"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "Erfyn Mewnforio KMailCVT"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Cam 1: Dewis Hidlen"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Cam 2: Mewnforio..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Mewnforio ar waith"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Mewnforio wedi gorffen"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Ysgrifennwyd gan %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "Hidlenni Mewnforio KMail"
+
+#: main.cpp:35
 #, fuzzy
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2003, Y Datblygwyr KMailCVT"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Awdur gwreiddiol"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr ""
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "GUI newydd a glanhadau"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr ""
+
+#: filter_evolution.cxx:33
 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-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
-msgstr ""
-"<p><b>Hidlen Mewnforio Outlook Express 4/5/6 Newydd</b></p>"
-"<p>Hidlen Outlook Express newydd yw hon, sy'n cynnal yn gyflawn fersiynau 4 i "
-"6.</p>"
-"<p>Mae Outlook Express yn cadw ei flychau post yn C:\\Windows\\Application "
-"Data\\Identities\\?????\\Microsoft\\Outlook Express yn gyffredinol</p>"
-"<p><b>Noder:</b>Mewnforir ebostau i blygelli wedi'u henwi ar ôl y ffeil y "
-"daethont ohoni, â'r rhagddodiad OE-</p>"
+"<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 "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"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
@@ -49,30 +99,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Dim cyfeiriadur wedi'i ddewis."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Yn cyfri ffeiliau..."
-
-#: filter_outlook.cxx:46
-#, fuzzy
-msgid "Counting mail..."
-msgstr "Yn cyfri ffeiliau..."
-
-#: filter_outlook.cxx:47
-#, fuzzy
-msgid "Counting directories..."
-msgstr "Yn cyfri ffeiliau..."
-
-#: filter_outlook.cxx:48
-#, fuzzy
-msgid "Counting folders..."
-msgstr "Yn cyfri ffeiliau..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Yn mewnforio ffeiliau ebost newydd..."
-
 #: 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
@@ -80,6 +106,22 @@ msgstr "Yn mewnforio ffeiliau ebost newydd..."
 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
+#, 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
+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
 msgid "Importing emails from %1..."
@@ -95,156 +137,56 @@ msgid ""
 "%n duplicate messages not imported"
 msgstr "Gwall tra'n ychwanegu neges at blygell %1 yng KMail."
 
-#: 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
-msgid "Unable to open %1, skipping"
-msgstr "Methwyd agor %1, yn hepgor"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 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 recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 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
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "Gorffennwyd mewnforio ebostau o %1"
-
-#: filter_kmail_archive.cxx:24
-msgid "Import KMail Archive File"
+#: 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
+msgid "Finished import, canceled by user."
 msgstr ""
 
-#: filter_kmail_archive.cxx: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>"
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
 msgstr ""
 
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Mewnforio Plygelli o Pegasus-Mail"
-
-#: filter_pmail.cxx:33
-#, fuzzy
-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:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
+#: filter_kmail_archive.cxx:24
+msgid "Import KMail Archive File"
 msgstr ""
-"<p>Dewiswch y cyfeiriadur Pegasus-Mail ar eich cysawd (sy'n cynnwys ffeiliau "
-"CNM, PMM, ac MBX). Ar sawl cysawd mae hwn wedi'i gadw yn C:\\PMail\\mail</p>"
-"<p><b>Noder:</b> Bydd yr hidlen fewnforio yma'n mewnforio'ch plygelli, ond 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_kmail_archive.cxx:26
 msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
+"<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_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Yn mewnforio ffeiliau ebost newydd ('.cnm')..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Yn mewnforio plygelli ebost ('.pmm')..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "Yn mewnforio plygelli ebost 'UNIX' ('.mbx')..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "Yn mewnforio %1"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "Neges %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr ""
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Ysgrifennwyd gan %1.</i></p>"
-
-#: filter_lnotes.cxx:30
-#, fuzzy
-msgid "Import Lotus Notes Emails"
-msgstr "Mewnforio Ebostau Outlook Express"
-
-#: filter_lnotes.cxx:32
-#, fuzzy
-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 into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
-msgstr ""
-"<p><b>hidlen mewnforio mbox</b></p>"
-"<p>Bydd yr hidlen hon yn mewnforio ffeiliau mbox i KMail.  Defnyddiwch yr "
-"hidlen yma os hoffech fewnforio o Ximian Evolution neu ebostyddion eraill sy'n "
-"defnyddio'r ffromat 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
-#, fuzzy
-msgid "All Files (*)"
-msgstr "ffeiliau mbox (*)"
-
-#: filter_lnotes.cxx:64
-#, c-format
-msgid "Importing emails from %1"
-msgstr "Yn mewnforio ebostau o %1"
-
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr ""
 
 #: filter_kmail_maildir.cxx: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 local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</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
-msgid "Finished import, canceled by user."
+"<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 "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
@@ -259,177 +201,42 @@ msgstr "Yn mewnforio ebostau o %1"
 msgid "Could not import %1"
 msgstr ""
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr ""
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr ""
-
-#: filter_opera.cxx:28
+#: filter_lnotes.cxx:30
 #, fuzzy
-msgid "Import Opera Emails"
+msgid "Import Lotus Notes Emails"
 msgstr "Mewnforio Ebostau Outlook Express"
 
-#: filter_opera.cxx:30
+#: filter_lnotes.cxx:32
 #, fuzzy
 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 account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>hidlen mewnforio mbox</b></p>"
-"<p>Bydd yr hidlen hon yn mewnforio ffeiliau mbox i KMail.  Defnyddiwch yr "
-"hidlen yma os hoffech fewnforio o Ximian Evolution neu ebostyddion eraill sy'n "
-"defnyddio'r ffromat 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_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr ""
+"<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 "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
+msgstr ""
+"<p><b>hidlen mewnforio mbox</b></p><p>Bydd yr hidlen hon yn mewnforio "
+"ffeiliau mbox i KMail.  Defnyddiwch yr hidlen yma os hoffech fewnforio o "
+"Ximian Evolution neu ebostyddion eraill sy'n defnyddio'r ffromat "
+"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_evolution_v2.cxx: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/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "O:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "I:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Cyfredol:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Mewnforio ar waith ..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Cyfanswm:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, fuzzy, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr "Cliciwch 'Yn ôl' i fewnforio rhagor o ebostau neu gysylltau"
-
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
-msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
-msgstr ""
-"<b>Croeso i KMailCVT - Erfyn Mewnforio KMail</b>\n"
-"<br>"
-"<br>\n"
-" Cynorthwya'r raglen hon i chi fewnforio'ch ebost o'ch rhaglen ebost blaenorol "
-"i KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Dewiswch y rhaglen yr hoffech fewnforio ohoni, os gwelwch yn dda, a chliciwch "
-"'Nesaf'."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr ""
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Hidlenni Mewnforio KMail"
-
-#: main.cpp:35
+#: filter_lnotes.cxx:55
 #, fuzzy
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2003, Y Datblygwyr KMailCVT"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Awdur gwreiddiol"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr ""
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "GUI newydd a glanhadau"
+msgid "All Files (*)"
+msgstr "ffeiliau mbox (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Owain Green drwy KGyfieithu - Meddalwedd Gymraeg"
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "Yn mewnforio ebostau o %1"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kyfieithu@dotmon.com"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "Neges %1"
 
 #: filter_mailapp.cxx:32
 #, fuzzy
@@ -438,8 +245,8 @@ msgstr "Mewnforio Plygelli o Pegasus-Mail"
 
 #: filter_mailapp.cxx: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>"
+"<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
@@ -449,25 +256,28 @@ msgid ""
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "Gwall tra'n ychwanegu neges at blygell %1 yng KMail."
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "Erfyn Mewnforio KMailCVT"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Cam 1: Dewis Hidlen"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Cam 2: Mewnforio..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Mewnforio Ffeiliau mbox (UNIX, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Mewnforio ar waith"
+#: filter_mbox.cxx: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 "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>hidlen mewnforio mbox</b></p><p>Bydd yr hidlen hon yn mewnforio "
+"ffeiliau mbox i KMail.  Defnyddiwch yr hidlen yma os hoffech fewnforio o "
+"Ximian Evolution neu ebostyddion eraill sy'n defnyddio'r ffromat "
+"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>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Mewnforio wedi gorffen"
+#: filter_mbox.cxx:48
+#, fuzzy
+msgid "mbox Files (*)"
+msgstr "ffeiliau mbox (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -476,22 +286,19 @@ msgstr "Mewnforio Ebostau Outlook Express"
 #: filter_oe.cxx:42
 #, fuzzy
 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 files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<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 "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Hidlen Mewnforio Outlook Express 4/5/6 Newydd</b></p>"
-"<p>Hidlen Outlook Express newydd yw hon, sy'n cynnal yn gyflawn fersiynau 4 i "
-"6.</p>"
-"<p>Mae Outlook Express yn cadw ei flychau post yn C:\\Windows\\Application "
-"Data\\Identities\\?????\\Microsoft\\Outlook Express yn gyffredinol</p>"
-"<p><b>Noder:</b>Mewnforir ebostau i blygelli wedi'u henwi ar ôl y ffeil y "
+"<p><b>Hidlen Mewnforio Outlook Express 4/5/6 Newydd</b></p><p>Hidlen Outlook "
+"Express newydd yw hon, sy'n cynnal yn gyflawn fersiynau 4 i 6.</p><p>Mae "
+"Outlook Express yn cadw ei flychau post yn C:\\Windows\\Application Data"
+"\\Identities\\?????\\Microsoft\\Outlook Express yn gyffredinol</"
+"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
@@ -528,27 +335,183 @@ msgstr "Yn mewnforio blwch ebost OE5+ %1"
 msgid "Importing OE5+ Folder file %1"
 msgstr "Yn anwybyddu ffeil Blygelli OE5+ %1"
 
+#: filter_opera.cxx:28
+#, fuzzy
+msgid "Import Opera Emails"
+msgstr "Mewnforio Ebostau Outlook Express"
+
+#: filter_opera.cxx:30
+#, fuzzy
+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 "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+"<p><b>hidlen mewnforio mbox</b></p><p>Bydd yr hidlen hon yn mewnforio "
+"ffeiliau mbox i KMail.  Defnyddiwch yr hidlen yma os hoffech fewnforio o "
+"Ximian Evolution neu ebostyddion eraill sy'n defnyddio'r ffromat "
+"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
+msgid "Counting files..."
+msgstr "Yn cyfri ffeiliau..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Yn mewnforio ffeiliau ebost newydd..."
+
+#: filter_outlook.cxx:28
+#, fuzzy
+msgid "Import Outlook Emails"
+msgstr "Mewnforio Ebostau Outlook Express"
+
+#: filter_outlook.cxx:30
+#, fuzzy
+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-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+"<p><b>Hidlen Mewnforio Outlook Express 4/5/6 Newydd</b></p><p>Hidlen Outlook "
+"Express newydd yw hon, sy'n cynnal yn gyflawn fersiynau 4 i 6.</p><p>Mae "
+"Outlook Express yn cadw ei flychau post yn C:\\Windows\\Application Data"
+"\\Identities\\?????\\Microsoft\\Outlook Express yn gyffredinol</"
+"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
+#, fuzzy
+msgid "Counting mail..."
+msgstr "Yn cyfri ffeiliau..."
+
+#: filter_outlook.cxx:47
+#, fuzzy
+msgid "Counting directories..."
+msgstr "Yn cyfri ffeiliau..."
+
+#: filter_outlook.cxx:48
+#, fuzzy
+msgid "Counting folders..."
+msgstr "Yn cyfri ffeiliau..."
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "Mewnforio Ebostau Testun Plaen"
+
+#: filter_plain.cxx: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, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+"<p>Dewiswch y cyfeiriadur sy'n cynnwys yr ebostau ar eich cysawd. Rhoddir yr "
+"ebostau mewn plygell â'r un enw a'r cyfeiriadur roeddent ynddi, â'r "
+"rhagddodiad PLAIN-</p><p>Bydd yr hidlen hon yn mewnforio pob ebost .msg, ."
+"eml, a .txt.</p>"
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Mewnforio Plygelli o Pegasus-Mail"
+
+#: filter_pmail.cxx:33
+#, fuzzy
+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:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+"<p>Dewiswch y cyfeiriadur Pegasus-Mail ar eich cysawd (sy'n cynnwys ffeiliau "
+"CNM, PMM, ac MBX). Ar sawl cysawd mae hwn wedi'i gadw yn C:\\PMail\\mail</"
+"p><p><b>Noder:</b> Bydd yr hidlen fewnforio yma'n mewnforio'ch plygelli, ond "
+"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
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Yn mewnforio ffeiliau ebost newydd ('.cnm')..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Yn mewnforio plygelli ebost ('.pmm')..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "Yn mewnforio plygelli ebost 'UNIX' ('.mbx')..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "Yn mewnforio %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr ""
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr ""
 
 #: filter_sylpheed.cxx: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 possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<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 "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr ""
+
+#: filter_thebat.cxx: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 "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr ""
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
-"<b>Marwol:</b> Methu cychwyn KMail ar gyfer cyfathrebu DCOP. Sicrhewch bod <i>"
-"kmail</i> wedi'i sefydlu."
+"<b>Marwol:</b> Methu cychwyn KMail ar gyfer cyfathrebu DCOP. Sicrhewch bod "
+"<i>kmail</i> wedi'i sefydlu."
 
 #: filters.cxx:153 filters.cxx:188
 msgid "Cannot make folder %1 in KMail"
@@ -562,60 +525,60 @@ msgstr "Methu ychwanegu neges at blygell %1 yng KMail"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Gwall tra'n ychwanegu neges at blygell %1 yng KMail."
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "Mewnforio Ebostau Testun Plaen"
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "O:"
 
-#: filter_plain.cxx: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, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
-"<p>Dewiswch y cyfeiriadur sy'n cynnwys yr ebostau ar eich cysawd. Rhoddir yr "
-"ebostau mewn plygell â'r un enw a'r cyfeiriadur roeddent ynddi, â'r rhagddodiad "
-"PLAIN-</p>"
-"<p>Bydd yr hidlen hon yn mewnforio pob ebost .msg, .eml, a .txt.</p>"
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "I:"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Mewnforio Ffeiliau mbox (UNIX, Evolution)"
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Cyfredol:"
 
-#: filter_mbox.cxx: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 other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-msgstr ""
-"<p><b>hidlen mewnforio mbox</b></p>"
-"<p>Bydd yr hidlen hon yn mewnforio ffeiliau mbox i KMail.  Defnyddiwch yr "
-"hidlen yma os hoffech fewnforio o Ximian Evolution neu ebostyddion eraill sy'n "
-"defnyddio'r ffromat 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>"
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Mewnforio ar waith ..."
 
-#: filter_mbox.cxx:48
-#, fuzzy
-msgid "mbox Files (*)"
-msgstr "ffeiliau mbox (*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
-msgstr ""
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Cyfanswm:"
 
-#: filter_thebat.cxx:35
+#: kimportpagedlg.ui:199
+#, fuzzy, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr "Cliciwch 'Yn ôl' i fewnforio rhagor o ebostau neu gysylltau"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 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 imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
+msgstr ""
+"<b>Croeso i KMailCVT - Erfyn Mewnforio KMail</b>\n"
+"<br><br>\n"
+" Cynorthwya'r raglen hon i chi fewnforio'ch ebost o'ch rhaglen ebost "
+"blaenorol i KMail.<br><br><br><br>\n"
+" Dewiswch y rhaglen yr hoffech fewnforio ohoni, os gwelwch yn dda, a "
+"chliciwch 'Nesaf'."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
 msgstr ""
 
 #, fuzzy