Automated l10n update (.po files)

1 files changed, 346 insertions, 346 deletions

diff --git a/tde-i18n-cy/messages/tdepim/kmailcvt.po b/tde-i18n-cy/messages/tdepim/kmailcvt.po
index 2deb133d08c..62fb4bb11ff 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 00:52-0500\n"
+"POT-Creation-Date: 2014-09-29 12:06-0500\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,28 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Owain Green drwy KGyfieithu - Meddalwedd Gymraeg"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kyfieithu@dotmon.com"
-
-#: filter_mailapp.cxx:32
+#: filter_outlook.cxx:28
 #, fuzzy
-msgid "Import From OS X Mail"
-msgstr "Mewnforio Plygelli o Pegasus-Mail"
+msgid "Import Outlook Emails"
+msgstr "Mewnforio Ebostau Outlook Express"
 
-#: filter_mailapp.cxx:34
+#: filter_outlook.cxx:30
+#, 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>"
+"<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_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -49,6 +49,30 @@ 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
@@ -56,6 +80,21 @@ msgstr "Dim cyfeiriadur wedi'i ddewis."
 msgid "No files found for import."
 msgstr ""
 
+#: 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..."
+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
+#, 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.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
@@ -64,10 +103,18 @@ msgstr ""
 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..."
-msgstr "Yn mewnforio ebostau o %1"
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr ""
+
+#: filter_evolution.cxx: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 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
@@ -77,58 +124,17 @@ msgstr "Yn mewnforio ebostau o %1"
 msgid "Finished importing emails from %1"
 msgstr "Gorffennwyd mewnforio ebostau o %1"
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx: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_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."
+#: filter_kmail_archive.cxx:24
+msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_lnotes.cxx:30
-#, fuzzy
-msgid "Import Lotus Notes Emails"
-msgstr "Mewnforio Ebostau Outlook Express"
-
-#: filter_lnotes.cxx:32
-#, fuzzy
+#: filter_kmail_archive.cxx:26
 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>"
+"<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 ""
-"<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_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "Neges %1"
 
 #: filter_pmail.cxx:31
 msgid "Import Folders From Pegasus-Mail"
@@ -149,11 +155,6 @@ msgstr ""
 "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_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Yn cyfri ffeiliau..."
-
 #: filter_pmail.cxx:69
 msgid ""
 "Cannot parse the folder structure; continuing import without subfolder support."
@@ -176,87 +177,74 @@ msgstr "Yn mewnforio plygelli ebost 'UNIX' ('.mbx')..."
 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 ""
 
-#: filter_outlook.cxx:28
+#: 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 Outlook Emails"
+msgid "Import Lotus Notes Emails"
 msgstr "Mewnforio Ebostau Outlook Express"
 
-#: filter_outlook.cxx:30
+#: filter_lnotes.cxx:32
 #, 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>"
+"<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 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..."
+"<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_outlook.cxx:48
+#: filter_lnotes.cxx:55
 #, 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..."
+msgid "All Files (*)"
+msgstr "ffeiliau mbox (*)"
 
-#: 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
-#, 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_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "Yn mewnforio ebostau o %1"
 
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
+#: filter_kmail_maildir.cxx:26
+msgid "Import KMail Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_evolution.cxx:33
+#: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
+"<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: \"Evolution-Import\".</p>"
-msgstr ""
-
-#: filter_sylpheed.cxx:27
-msgid "Import Sylpheed Maildirs and Folder Structure"
+"stored under: \"KMail-Import\" in your local folder.</p>"
 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."
+#: 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_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
@@ -271,20 +259,20 @@ msgstr "Yn mewnforio ebostau o %1"
 msgid "Could not import %1"
 msgstr ""
 
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution_v2.cxx:31
+#: filter_thunderbird.cxx:30
 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>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 "
+"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>"
+"stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
 
 #: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
@@ -292,62 +280,21 @@ msgstr ""
 msgid "Start import file %1..."
 msgstr ""
 
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Ysgrifennwyd gan %1.</i></p>"
-
-#: 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"
-
-#: 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."
-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
-msgid "Cannot make folder %1 in KMail"
-msgstr "Methu creu plygell %1 yng KMail"
-
-#: filters.cxx:156 filters.cxx: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
-msgid "Error while adding message to folder %1 in KMail"
-msgstr "Gwall tra'n ychwanegu neges at blygell %1 yng KMail."
-
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Mewnforio Ffeiliau mbox (UNIX, Evolution)"
+#: filter_opera.cxx:28
+#, fuzzy
+msgid "Import Opera Emails"
+msgstr "Mewnforio Ebostau Outlook Express"
 
-#: filter_mbox.cxx:30
+#: filter_opera.cxx:30
+#, fuzzy
 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>"
+"<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 "
@@ -356,85 +303,21 @@ msgstr ""
 "<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
-#, fuzzy
-msgid "mbox Files (*)"
-msgstr "ffeiliau mbox (*)"
-
-#: 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>"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
 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_oe.cxx:40
-msgid "Import Outlook Express Emails"
-msgstr "Mewnforio Ebostau Outlook Express"
 
-#: filter_oe.cxx:42
-#, fuzzy
+#: filter_evolution_v2.cxx:31
 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 "
-"folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
-"your local folder.</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 ""
-"<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
-#, 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
-#, fuzzy
-msgid "Import folder structure..."
-msgstr "Yn mewnforio ebostau o %1"
-
-#: filter_oe.cxx:101
-msgid "Finished importing Outlook Express emails"
-msgstr "Gorffennwyd mewnforio ebostau Outlook Express"
-
-#: filter_oe.cxx:119
-#, c-format
-msgid "Unable to open mailbox %1"
-msgstr "Methwyd agor y blwch ebost %1"
-
-#: filter_oe.cxx:130
-#, c-format
-msgid "Importing OE4 Mailbox %1"
-msgstr "Yn mewnforio blwch ebost OE4 %1"
-
-#: filter_oe.cxx:144
-#, c-format
-msgid "Importing OE5+ Mailbox %1"
-msgstr "Yn mewnforio blwch ebost OE5+ %1"
-
-#: filter_oe.cxx:150
-#, fuzzy, c-format
-msgid "Importing OE5+ Folder file %1"
-msgstr "Yn anwybyddu ffeil Blygelli OE5+ %1"
 
 #. i18n: file kimportpagedlg.ui line 91
 #: rc.cpp:3
@@ -511,80 +394,202 @@ msgstr ""
 msgid "Remove &duplicate messages during import"
 msgstr ""
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
+#: 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 ""
 
-#: filter_thebat.cxx:35
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "GUI newydd a glanhadau"
+
+#: _translatorinfo.cpp:1
 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 ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Owain Green drwy KGyfieithu - Meddalwedd Gymraeg"
 
-#: filter_kmail_archive.cxx:24
-msgid "Import KMail Archive File"
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kyfieithu@dotmon.com"
+
+#: filter_mailapp.cxx:32
+#, fuzzy
+msgid "Import From OS X Mail"
+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>"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#, fuzzy
 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>"
+"_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."
+
+#: 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"
+
+#: filter_oe.cxx:40
+msgid "Import Outlook Express Emails"
+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 "
+"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 "
+"daethont ohoni, â'r rhagddodiad OE-</p>"
 
-#: filter_kmail_maildir.cxx:26
-msgid "Import KMail Maildirs and Folder Structure"
+#: filter_oe.cxx: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
+#, fuzzy
+msgid "Import folder structure..."
+msgstr "Yn mewnforio ebostau o %1"
+
+#: filter_oe.cxx:101
+msgid "Finished importing Outlook Express emails"
+msgstr "Gorffennwyd mewnforio ebostau Outlook Express"
+
+#: filter_oe.cxx:119
+#, c-format
+msgid "Unable to open mailbox %1"
+msgstr "Methwyd agor y blwch ebost %1"
+
+#: filter_oe.cxx:130
+#, c-format
+msgid "Importing OE4 Mailbox %1"
+msgstr "Yn mewnforio blwch ebost OE4 %1"
+
+#: filter_oe.cxx:144
+#, c-format
+msgid "Importing OE5+ Mailbox %1"
+msgstr "Yn mewnforio blwch ebost OE5+ %1"
+
+#: filter_oe.cxx:150
+#, fuzzy, c-format
+msgid "Importing OE5+ Folder file %1"
+msgstr "Yn anwybyddu ffeil Blygelli OE5+ %1"
+
+#: filter_sylpheed.cxx:27
+msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:28
+#: filter_sylpheed.cxx:29
 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><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: \"KMail-Import\" in your local folder.</p>"
+"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_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+#: 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."
 msgstr ""
+"<b>Marwol:</b> Methu cychwyn KMail ar gyfer cyfathrebu DCOP. Sicrhewch bod <i>"
+"kmail</i> wedi'i sefydlu."
 
-#: filter_thunderbird.cxx:30
+#: filters.cxx:153 filters.cxx:188
+msgid "Cannot make folder %1 in KMail"
+msgstr "Methu creu plygell %1 yng KMail"
+
+#: filters.cxx:156 filters.cxx: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
+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"
+
+#: filter_plain.cxx:29
 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>"
+"<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_opera.cxx:28
-#, fuzzy
-msgid "Import Opera Emails"
-msgstr "Mewnforio Ebostau Outlook Express"
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Mewnforio Ffeiliau mbox (UNIX, Evolution)"
 
-#: filter_opera.cxx:30
-#, fuzzy
+#: filter_mbox.cxx: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 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>"
+"<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 "
@@ -593,30 +598,25 @@ msgstr ""
 "<p><b>Noder:</b> Mewnforir ebostau i blygelli wedi'u henwi ar ôl y ffeil y "
 "daethont ohoni, â'r rhagddodiad MBOX.</p>"
 
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Hidlenni Mewnforio KMail"
-
-#: main.cpp:35
+#: filter_mbox.cxx:48
 #, fuzzy
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2003, Y Datblygwyr KMailCVT"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Awdur gwreiddiol"
+msgid "mbox Files (*)"
+msgstr "ffeiliau mbox (*)"
 
-#: main.cpp:37
-msgid "Maintainer & New filters"
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
 msgstr ""
 
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "GUI newydd a glanhadau"
+#: 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 ""
 
 #, fuzzy
 #~ msgid "File %1 does not seem to be an Outlook Express mailbox"