Update translation files

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

1 files changed, 4255 insertions, 3979 deletions

diff --git a/tde-i18n-cy/messages/tdepim/kmail.po b/tde-i18n-cy/messages/tdepim/kmail.po
index 701bf90c63f..d3e474bd2f6 100644
--- a/tde-i18n-cy/messages/tdepim/kmail.po
+++ b/tde-i18n-cy/messages/tdepim/kmail.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2004-02-25 13:47+0000\n"
 "Last-Translator: KD at KGyfieithu <[email protected]>\n"
 "Language-Team: Cymraeg <[email protected]>\n"
@@ -19,13 +19,13 @@ msgstr ""
 "X-Generator: KBabel 1.2\n"
 "\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Kyfieithu: KD"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -174,6 +174,12 @@ msgstr "Di&m (cymerwch ofal)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Cyfrif i drin adnoddau yn hanner-ymysgogol"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Clirio Gorffenol"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -253,13 +259,13 @@ msgstr "&Mewngofnodi:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"Mae eich Darparwr Gwasanaeth Rhyngrwyd (ISP) wedi rhoi <em>enw defnyddiwr</em> "
-"i chi er mwyn eich dilysu gyda'i gweinyddion. Fel arfer, rhan gyntaf eich "
-"cyfeiriad ebost (y rhan cyn y <em>@</em>) yw hwn."
+"Mae eich Darparwr Gwasanaeth Rhyngrwyd (ISP) wedi rhoi <em>enw defnyddiwr</"
+"em> i chi er mwyn eich dilysu gyda'i gweinyddion. Fel arfer, rhan gyntaf "
+"eich cyfeiriad ebost (y rhan cyn y <em>@</em>) yw hwn."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -282,12 +288,12 @@ msgstr "Cadw eich cyf&rinair POP yn y ffeil ffurfweddu"
 #, fuzzy
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Brithwch y dewisiad yma i wneud i KMail gadw'r cyfrinair SMTP yn ei ffeil "
 "ffurfweddiad.  Cedwir y cyfrinair mewn fformat drysedig, ond ni ddylir ei "
@@ -323,12 +329,13 @@ msgstr "Hidlo negeseuon os ydynt yn &fwy na"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
-"Os dewisiwch y dewisiad yma, defnyddir hidlenni i benderfynu beth i'w wneud â'r "
-"negeseuon.  Wedyn, cewch ddewis i'w lawrlwytho, eu dileu, neu eu cadw ar y "
-"gweinydd."
+"Os dewisiwch y dewisiad yma, defnyddir hidlenni i benderfynu beth i'w wneud "
+"â'r negeseuon.  Wedyn, cewch ddewis i'w lawrlwytho, eu dileu, neu eu cadw ar "
+"y gweinydd."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -377,13 +384,15 @@ msgstr "Gwagu te&stun"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -429,9 +438,9 @@ msgstr "Amnewid:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 
 #: accountdialog.cpp:914
@@ -492,9 +501,9 @@ msgstr "Ll&wytho atodiadau pan mae angen"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 
 #: accountdialog.cpp:1009
@@ -534,7 +543,7 @@ msgstr "<dim>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "blwch derbyn"
 
@@ -542,38 +551,39 @@ msgstr "blwch derbyn"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1485
 #, fuzzy
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 "Noder y gall y nodwedd yma achosi i rai gweinyddion POP3 sydd ddim yn cynnal "
 "blaenbeipio anfon ebostiau llwgr.\n"
 " Gellir ffurfweddu hyn, gan fod rhai gweinyddion yn cynnal blaenbeipio, ond "
-"dydyn nhw ddim yn hysbysu eu galluoedd.  I wirio os hysbysa eich gweinydd POP3 "
-"gynhaliaeth blaenbeipio, defnyddiwch y botwm wrth waelod yr ymgom.\n"
+"dydyn nhw ddim yn hysbysu eu galluoedd.  I wirio os hysbysa eich gweinydd "
+"POP3 gynhaliaeth blaenbeipio, defnyddiwch y botwm wrth waelod yr ymgom.\n"
 " Os ni hysbysa eich gweinydd gynhaliaeth, ond rydych eisiau mwy o gyflymder, "
-"dylech chi wneud rhai arbrofion yn gyntaf gan anfon swp o ebostiau i'ch hunan "
-"a'u lawrlwytho."
+"dylech chi wneud rhai arbrofion yn gyntaf gan anfon swp o ebostiau i'ch "
+"hunan a'u lawrlwytho."
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
 #, fuzzy
@@ -582,23 +592,23 @@ msgstr "Penodwch raglen ebostio yn y gosodiadau."
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1672
@@ -606,8 +616,8 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
@@ -690,11 +700,11 @@ msgstr "Ychwanegu Cyfrif"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
-"Rhaid i chi ychwanegu cyfrif yn yr adran rhwydwaith y gosodiadau er mwyn derbyn "
-"ebost."
+"Rhaid i chi ychwanegu cyfrif yn yr adran rhwydwaith y gosodiadau er mwyn "
+"derbyn ebost."
 
 #: accountwizard.cpp:87
 msgid "Local mailbox"
@@ -731,9 +741,9 @@ msgstr "Gwirydd Sillafu - KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 
 #: accountwizard.cpp:200
@@ -797,8 +807,7 @@ msgstr ""
 msgid "Server Information"
 msgstr "Gwybodaeth am y Gweinydd"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Dim"
@@ -936,17 +945,16 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 
 #: antispamwizard.cpp:919
@@ -983,10 +991,9 @@ msgstr "&Symud Pob Neges i'r Sbwriel"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 
 #: antispamwizard.cpp:1068
@@ -997,8 +1004,8 @@ msgstr ""
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 
 #: antispamwizard.cpp:1076
@@ -1009,8 +1016,8 @@ msgstr "Symudwyd pob neges i'r sbwriel"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 
 #: antispamwizard.cpp:1084
@@ -1020,8 +1027,8 @@ msgstr "Nodi negeseuon dewisiedig fel wedi'u darllen"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 
 #: archivefolderdialog.cpp:48
@@ -1229,8 +1236,8 @@ msgstr ""
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1252,8 +1259,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1284,21 +1291,21 @@ msgstr "Wedi'u dileu"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
-"Nid yw un o'ch dynodiadau yn cydweddu â derbyniwr y neges yma, "
-"<br> dewiswch pa un o'r cyfeiriadau dilynnol sy'n biau i chi:"
+"Nid yw un o'ch dynodiadau yn cydweddu â derbyniwr y neges yma, <br> dewiswch "
+"pa un o'r cyfeiriadau dilynnol sy'n biau i chi:"
 
 #: callback.cpp:222
 #, fuzzy
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
-"Nid yw un o'ch dynodiadau yn cydweddu â derbyniwr y neges yma, "
-"<br> dewiswch pa un o'r cyfeiriadau dilynnol sy'n biau i chi:"
+"Nid yw un o'ch dynodiadau yn cydweddu â derbyniwr y neges yma, <br> dewiswch "
+"pa un o'r cyfeiriadau dilynnol sy'n biau i chi:"
 
 #: callback.cpp:233
 msgid "Select Address"
@@ -1327,18 +1334,21 @@ msgstr ""
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Mae eich gweinyddwr wedi penderfynu ar y gosodiad yma.</p>"
-"<p>Os meddyliwch mai gwall yw hwn, cysylltwch â fo.</p></qt>"
+"<qt><p>Mae eich gweinyddwr wedi penderfynu ar y gosodiad yma.</p><p>Os "
+"meddyliwch mai gwall yw hwn, cysylltwch â fo.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "Llwytho &Proffil..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Ffurf&weddu..."
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Ychwanegu..."
@@ -1369,6 +1379,11 @@ msgstr "<qt>Ydych wir eisiau gwaredu'r dynodiad o'r enw <b>%1</b>?</qt>"
 msgid "Remove Identity"
 msgstr "G&waredu"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "G&waredu"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Ychwanegu..."
@@ -1377,6 +1392,11 @@ msgstr "Ychwanegu..."
 msgid "Modify..."
 msgstr "Addasu..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "G&waredu"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Gosod fel Rhagosod"
@@ -1393,17 +1413,15 @@ msgstr "&Anfon"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Cyfrifon allfynd (ychwanegwch o leiaf un):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Enw"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Math\t"
@@ -1425,8 +1443,7 @@ msgstr "Gosod yn Ragosodyn"
 msgid "Common Options"
 msgstr "Dewisiadau Cyffredin"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "Cadarnha&u cyn anfon"
@@ -1478,17 +1495,16 @@ msgstr "Parth &rhagosod:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Defnyddir y parth rhagosod i gwblhau cyfeiriadau ebost sy'n cynnwys enw'r "
-"defnyddiwr yn unig.</p></qt>"
+"<qt><p>Defnyddir y parth rhagosod i gwblhau cyfeiriadau ebost sy'n cynnwys "
+"enw'r defnyddiwr yn unig.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1508,9 +1524,9 @@ msgstr "Ychwanegu Cludiant"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (rhagosod)"
 
@@ -1591,6 +1607,10 @@ msgstr "Addasu cyfrif"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Methu lleoli cyfrif<b>%1</b>.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "Lliwi&au"
@@ -1707,8 +1727,7 @@ msgstr "Cyswllt dilynedig"
 msgid "Misspelled Words"
 msgstr "Geiriau a gamsillafwyd"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Neges Newydd"
@@ -1916,8 +1935,8 @@ msgstr "R&hagosod yr edeifion yw ar gau "
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 "Agor edeifion sy'n cynnwys &negeseuon newydd, heb eu darllen, neu bwysig, ac "
 "agor edeifion a wylir arnynt."
@@ -1928,67 +1947,53 @@ msgstr "Ymddangosiad y Dyddiad"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>Gellir defnyddio'r mynegiadau yma ar gyfer y dyddiad:</strong></p>"
-"<ul>"
-"<li>d - y diwrnod fel rhif heb sero arweiniol (1-31)</li>"
-"<li>dd -  y diwrnod fel rhif efo sero arweiniol (01-31)</li>"
-"<li>ddd - enw talfyredig y diwrnod (Llun - Sul)</li>"
-"<li>dddd - enw hir y diwrnod (Dydd Llun - Dydd Sul)</li>"
-"<li>M - y mis fel rhif heb sero arweiniol (1-12)</li>"
-"<li>MM - y mis fel rhif efo sero arweiniol (01-12)</li>"
-"<li>MMM - enw talfyredig y mis (Ion - Rhag)</li>"
-"<li>MMMM - enw hir y mis (Ionawr - Rhagfyr)</li>"
-"<li>yy - y flwyddyn fel rhif dau-ddigid (00-99)</li>"
-"<li>yyyy - y flwyddyn fel rhif pedwar-digid (0000-9999)</li></ul>"
-"<p><strong>Gellir defnyddio'r mynegiadau yma ar gyfer yr amser:</string></p> "
-"<ul>"
-"<li>h - yr awr heb sero arweiniol (0-23 neu 1-12 os yn dangos YB/YP)</li>"
-"<li>hh - yr awr efo sero arweiniol (0-23 neu 1-12 os yn dangos YB/YP)</li>"
-"<li>m -  y munudau heb sero arweiniol (0-59)</li>"
-"<li>mm - y munudau efo sero arweiniol (00-59)</li>"
-"<li>s - yr eiliadau heb sero arweiniol (0-59)</li>"
-"<li>ss - yr eiliadau efo sero arweiniol (00-59)</li>"
-"<li>z - y milieiliadau heb sero arweiniol (0-999)</li>"
-"<li>zzz - y milieiliadau efo sero arweiniol (000-999)</li>"
-"<li>AP - newid i ddangos YB/YP.  Amnewidir AP gan \"AM\" neu \"PM\".</li>"
-"<li>ap - newid i ddangos YB/YP.  Amnewidir ap gan \"am\" neu \"pm\".</li>"
-"<li>Z - amserfa mewn ffurf rhifol (-0500)</li></ul>"
-"<p><strong>Anwybyddir pob nod arall o fewnbwn.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>Gellir defnyddio'r mynegiadau yma ar gyfer y dyddiad:</"
+"strong></p><ul><li>d - y diwrnod fel rhif heb sero arweiniol (1-31)</"
+"li><li>dd -  y diwrnod fel rhif efo sero arweiniol (01-31)</li><li>ddd - enw "
+"talfyredig y diwrnod (Llun - Sul)</li><li>dddd - enw hir y diwrnod (Dydd "
+"Llun - Dydd Sul)</li><li>M - y mis fel rhif heb sero arweiniol (1-12)</"
+"li><li>MM - y mis fel rhif efo sero arweiniol (01-12)</li><li>MMM - enw "
+"talfyredig y mis (Ion - Rhag)</li><li>MMMM - enw hir y mis (Ionawr - "
+"Rhagfyr)</li><li>yy - y flwyddyn fel rhif dau-ddigid (00-99)</li><li>yyyy - "
+"y flwyddyn fel rhif pedwar-digid (0000-9999)</li></ul><p><strong>Gellir "
+"defnyddio'r mynegiadau yma ar gyfer yr amser:</string></p> <ul><li>h - yr "
+"awr heb sero arweiniol (0-23 neu 1-12 os yn dangos YB/YP)</li><li>hh - yr "
+"awr efo sero arweiniol (0-23 neu 1-12 os yn dangos YB/YP)</li><li>m -  y "
+"munudau heb sero arweiniol (0-59)</li><li>mm - y munudau efo sero arweiniol "
+"(00-59)</li><li>s - yr eiliadau heb sero arweiniol (0-59)</li><li>ss - yr "
+"eiliadau efo sero arweiniol (00-59)</li><li>z - y milieiliadau heb sero "
+"arweiniol (0-999)</li><li>zzz - y milieiliadau efo sero arweiniol (000-999)</"
+"li><li>AP - newid i ddangos YB/YP.  Amnewidir AP gan \"AM\" neu \"PM\".</"
+"li><li>ap - newid i ddangos YB/YP.  Amnewidir ap gan \"am\" neu \"pm\".</"
+"li><li>Z - amserfa mewn ffurf rhifol (-0500)</li></ul><p><strong>Anwybyddir "
+"pob nod arall o fewnbwn.</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 "Bydd newid y gosodiad edafu eang yn anwybyddu pob gwerth sy'n benodol i "
 "blygell."
@@ -2006,8 +2011,7 @@ msgstr "Dangos b&ar cyflwr HTML"
 msgid "Show s&pam status in fancy headers"
 msgstr "Dangos pob penawd y negeseuon"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr ""
@@ -2016,8 +2020,7 @@ msgstr ""
 msgid "Use smaller font for quoted text"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr ""
@@ -2045,8 +2048,7 @@ msgstr "Ymysgogol"
 msgid "&Override character encoding:"
 msgstr "Goso&d Amgodiad"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, fuzzy, no-c-format
 msgid "Enable system tray icon"
 msgstr "hysbysiad cafn cysawd"
@@ -2153,22 +2155,19 @@ msgstr "Amnewidir <b>%f</b> efo'r enw ffeil i'w olygu."
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>Cynhelir y dalfannau dilynol yn yr ymadroddion ymateb: "
-"<br><b>%D</b>: dyddiad, <b>%S</b>: pwnc,  "
-"<br><b>%e</b>: cyfeiriad yr anfonwr, <b>%F</b>: enw'r anfonwr, <b>%f</b>"
-": blaenlythrennau'r anfonwr, "
-"<br><b>%T</b>: enw'r derbyniwr, <b>%t</b>: enw a chyfeiriad y derbyniwr "
-"<br><b>%C</b>: enwau'r copi carbon, <b>%c</b>: enwau a chyfeiriadau'r copi "
-"carbon "
-"<br><b>%%</b>: nod canran, <b>%_</b>: gofodnod, <b>%L</b>: llin-dorriad</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>Cynhelir y dalfannau dilynol yn yr ymadroddion ymateb: <br><b>%D</b>: "
+"dyddiad, <b>%S</b>: pwnc,  <br><b>%e</b>: cyfeiriad yr anfonwr, <b>%F</b>: "
+"enw'r anfonwr, <b>%f</b>: blaenlythrennau'r anfonwr, <br><b>%T</b>: enw'r "
+"derbyniwr, <b>%t</b>: enw a chyfeiriad y derbyniwr <br><b>%C</b>: enwau'r "
+"copi carbon, <b>%c</b>: enwau a chyfeiriadau'r copi carbon <br><b>%%</b>: "
+"nod canran, <b>%_</b>: gofodnod, <b>%L</b>: llin-dorriad</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2191,21 +2190,20 @@ msgstr "Ateb i &bawb:"
 msgid "&Forward:"
 msgstr "B&laenyrru:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "&Dynodydd dyfynnod:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "Ar %D, wnaethoch ysgrifennu:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "Ar %D, ysgrifennodd %F:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Neges a Flaenyrrwyd"
 
@@ -2244,8 +2242,8 @@ msgstr "Mewnodosd rhagddodiad blaenyrriad newydd:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 "Gwirir y rhestr yma am bob un neges allfynd o'r pen i'r gwaelod ar gyfer set "
 "nodau sy'n cynnwys y nodau gorfodol i gyd."
@@ -2283,10 +2281,9 @@ msgstr "Gwerth"
 msgid "Ne&w"
 msgstr "Ne&wydd"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Enw:"
@@ -2295,8 +2292,7 @@ msgstr "&Enw:"
 msgid "&Value:"
 msgstr "&Gwerth:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr ""
@@ -2304,8 +2300,8 @@ msgstr ""
 #: configuredialog.cpp:3584
 #, fuzzy
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 "Cynnau'r dewisiad yma er mwyn gwneud i Outlook(tm) ddeall eich atebion i "
 "wahoddiadau"
@@ -2334,13 +2330,13 @@ msgstr "atodedig"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 
 #: configuredialog.cpp:3682
@@ -2368,115 +2364,102 @@ msgstr "Ategion &Cêl"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Mae negeseuon weithiau yn dod yn y dau fformat.  Mae'r dewisiad yma yn "
-"rheoli a hoffech un ai'r rhan HTML neu'r rhan destun i'w dangos.</p>"
-"<p>Mae dangos y rhan HTML yn gwneud i'r neges edrych yn well, ond wrth yr un "
-"adeg mae'n cynyddu'r perygl y bydd tyllau diogelwch yn cael eu ymelwa.</p>"
-"<p>Mae dangos y rhan destun plaen yn colli y mwyafrif o fformatio'r neges, ond "
-"mae'n ei gwneud hi bron yn <em>amhosibl</em> i ymelwa tyllau diogelwch yn y "
-"llunydd HTML (Konqueror).</p>"
-"<p>Mae'r dewisiad isod yn amddiffyn yn erbyn un cam-ddefnydd cyffredin "
-"negeseuon HTML, ond mae'n methu amddiffyn yn erbyn problemau diogelwch nad "
-"adnabuwyd wrth yr adeg a ysgrifennwyd y fersiwn yma o KMail.</p>"
-"<p>Y peth callaf, felly, yw <em>peidio</em> â dewis HTML yn lle testun "
-"plaen.</p>"
-"<p><b>Noder:</b> Gallwch osod y dewisiad yma ar sail pob-plygell o'r ddewislen "
-"<i>Plygell</i> ym mhrif ffenestr KMail.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>Mae negeseuon weithiau yn dod yn y dau fformat.  Mae'r dewisiad yma "
+"yn rheoli a hoffech un ai'r rhan HTML neu'r rhan destun i'w dangos.</"
+"p><p>Mae dangos y rhan HTML yn gwneud i'r neges edrych yn well, ond wrth yr "
+"un adeg mae'n cynyddu'r perygl y bydd tyllau diogelwch yn cael eu ymelwa.</"
+"p><p>Mae dangos y rhan destun plaen yn colli y mwyafrif o fformatio'r neges, "
+"ond mae'n ei gwneud hi bron yn <em>amhosibl</em> i ymelwa tyllau diogelwch "
+"yn y llunydd HTML (Konqueror).</p><p>Mae'r dewisiad isod yn amddiffyn yn "
+"erbyn un cam-ddefnydd cyffredin negeseuon HTML, ond mae'n methu amddiffyn yn "
+"erbyn problemau diogelwch nad adnabuwyd wrth yr adeg a ysgrifennwyd y "
+"fersiwn yma o KMail.</p><p>Y peth callaf, felly, yw <em>peidio</em> â dewis "
+"HTML yn lle testun plaen.</p><p><b>Noder:</b> Gallwch osod y dewisiad yma ar "
+"sail pob-plygell o'r ddewislen <i>Plygell</i> ym mhrif ffenestr KMail.</p></"
+"qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Mae rhai hysbysebion ebost yn HTML ac yn cynnwys cyfeiriadau i, er "
-"enghraifft, delweddau a ddefnyddir gan yr hysbysebwyr i gadarnhau eich bod chi "
-"wedi darllen eu negese (&quot;llau gwê&quot;).</p>"
-"<p>Does dim rheswm dilys i lanlwytho delweddau o'r Ryngrwyd fel hyn, oherwydd "
-"gall yr anfonwr o hyd atodi'r delweddau gofynnol yn uniongyrchol i'r neges.</p>"
-"<p>I amddiffyn yn erbyn cam-ddefnydd felly o'r nodwedd dangos HTML KMail, <em>"
-"analluogir</em> y dewisiad yma gan ragosod.</p>"
-"<p>Er hynny, os hoffech, er enghraifft, weld delweddau mewn neges HTML nad oedd "
-"wedi'u atodi iddi, gallwch alluogi'r dewisiad yma, ond dylech chi fod yn "
-"ymwybodol o'r problem posibl.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>Mae rhai hysbysebion ebost yn HTML ac yn cynnwys cyfeiriadau i, er "
+"enghraifft, delweddau a ddefnyddir gan yr hysbysebwyr i gadarnhau eich bod "
+"chi wedi darllen eu negese (&quot;llau gwê&quot;).</p><p>Does dim rheswm "
+"dilys i lanlwytho delweddau o'r Ryngrwyd fel hyn, oherwydd gall yr anfonwr o "
+"hyd atodi'r delweddau gofynnol yn uniongyrchol i'r neges.</p><p>I amddiffyn "
+"yn erbyn cam-ddefnydd felly o'r nodwedd dangos HTML KMail, <em>analluogir</"
+"em> y dewisiad yma gan ragosod.</p><p>Er hynny, os hoffech, er enghraifft, "
+"weld delweddau mewn neges HTML nad oedd wedi'u atodi iddi, gallwch alluogi'r "
+"dewisiad yma, ond dylech chi fod yn ymwybodol o'r problem posibl.</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>Polisi Hysbysiad Lleoliad Neges</h3>"
-"<p>Mae MDNau (Message Disposition Notifications) yn cyffredinoliad o beth a "
-"gelwir yn arferol <b>derbynneb ddarllen</b>.  Mae awdur y neges yn gofyn am "
-"hysbysiad lleoliad i'w anfon, ac mae rhaglen ebost y derbyniwr yn creu ateb y "
-"gall yr awdur yn dysgu ohono be wnaeth ddigwydd i'w neges.  Mae mathau lleoliad "
-"cyffredin yn cynnwys <b>wedi'i dangos</b> (h.y. wedi'i darllen), <b>"
-"wedi'i dileu</b> a <b>wedi''i danfon</b> (h.y. wedi'i blaenyrru).</p>"
-"<p>Mae'r dewisiadau dilynnol ar gael i reoli y ffordd y mae KMail yn anfon "
-"MDNau:</p>"
-"<ul>"
-"<li><em>Anwybyddu</em>: Anwybyddu unrhyw cais ar gyfer hysbysiadau lleoliad "
-"neges.  Ni anfonir MDN byth yn ymysgogol (argymhellir).</li>"
-"<li><em>Gofyn</em>: Ateb ceisiadau ar ôl gofyn i'r defnyddiwr ar gyfer caniatâd "
-"yn unig.  Felly, gallwch anfon MDNau ar gyfer negeseuon penodol tra'n ei "
-"gwrthod neu eu anwybyddu ar gyfer eraill.</li>"
-"<li><em>Gwrthod</em>: Anfon hysbysiad <b>wedi'i gwrthod</b> "
-"o hyd.  Mae hyn yn unig <em>ychydig bach</em> yn well nag anfon MDNau o hyd.  "
-"Bydd yr awdur yn dal i wybod bod rhywun wedi gweithredu ar sail y neges, yr "
-"unig beth yw na all wybod a's darllenwyd neu ddileuwyd ayyb.</li>"
-"<li><em>Anfon o hyd</em>: Anfon yr hysbysiad lleoliad ceisiedig o hyd.  Golyga "
-"hyn bod awdur y neges yn cael gwybod pryd oedd rhywun yn gweithredu ar sail y "
-"neges ac, yn ychwanegol, beth a wnaeth ddigwydd iddi (wedi'i darllen, wedi'i "
-"dileu, ayyb).  Annogir i chi beidio â defnyddio'r dewisiad yma, ond darperir "
-"gan ei fod yn gwneud llawer o synnwyr ar gyfer e.e. rheoli'r berthynas efo "
-"cwsmeriaid.</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>Polisi Hysbysiad Lleoliad Neges</h3><p>Mae MDNau (Message "
+"Disposition Notifications) yn cyffredinoliad o beth a gelwir yn arferol "
+"<b>derbynneb ddarllen</b>.  Mae awdur y neges yn gofyn am hysbysiad lleoliad "
+"i'w anfon, ac mae rhaglen ebost y derbyniwr yn creu ateb y gall yr awdur yn "
+"dysgu ohono be wnaeth ddigwydd i'w neges.  Mae mathau lleoliad cyffredin yn "
+"cynnwys <b>wedi'i dangos</b> (h.y. wedi'i darllen), <b>wedi'i dileu</b> a "
+"<b>wedi''i danfon</b> (h.y. wedi'i blaenyrru).</p><p>Mae'r dewisiadau "
+"dilynnol ar gael i reoli y ffordd y mae KMail yn anfon MDNau:</"
+"p><ul><li><em>Anwybyddu</em>: Anwybyddu unrhyw cais ar gyfer hysbysiadau "
+"lleoliad neges.  Ni anfonir MDN byth yn ymysgogol (argymhellir).</"
+"li><li><em>Gofyn</em>: Ateb ceisiadau ar ôl gofyn i'r defnyddiwr ar gyfer "
+"caniatâd yn unig.  Felly, gallwch anfon MDNau ar gyfer negeseuon penodol "
+"tra'n ei gwrthod neu eu anwybyddu ar gyfer eraill.</li><li><em>Gwrthod</em>: "
+"Anfon hysbysiad <b>wedi'i gwrthod</b> o hyd.  Mae hyn yn unig <em>ychydig "
+"bach</em> yn well nag anfon MDNau o hyd.  Bydd yr awdur yn dal i wybod bod "
+"rhywun wedi gweithredu ar sail y neges, yr unig beth yw na all wybod a's "
+"darllenwyd neu ddileuwyd ayyb.</li><li><em>Anfon o hyd</em>: Anfon yr "
+"hysbysiad lleoliad ceisiedig o hyd.  Golyga hyn bod awdur y neges yn cael "
+"gwybod pryd oedd rhywun yn gweithredu ar sail y neges ac, yn ychwanegol, "
+"beth a wnaeth ddigwydd iddi (wedi'i darllen, wedi'i dileu, ayyb).  Annogir i "
+"chi beidio â defnyddio'r dewisiad yma, ond darperir gan ei fod yn gwneud "
+"llawer o synnwyr ar gyfer e.e. rheoli'r berthynas efo cwsmeriaid.</li></ul></"
+"qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2492,15 +2475,15 @@ msgstr "&Caniatáu i negeseuon lwytho cyfeirnodau allanol o'r Ryngrwyd"
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
-"<b>RHYBUDD:</b> Gall caniatáu HTML yn ebost gynyddu'r risg y bydd eich cysawd "
-"yn cael ei beryglu gan ymelwadau presennol a disgwyliedig.  <a "
-"href=\"whatsthis:%1\">Mwy am ebostau HTML...</a> <a href=\"whatsthis:%2\">"
-"Mwy am cyfeiriadau allanol...</a>"
+"<b>RHYBUDD:</b> Gall caniatáu HTML yn ebost gynyddu'r risg y bydd eich "
+"cysawd yn cael ei beryglu gan ymelwadau presennol a disgwyliedig.  <a href="
+"\"whatsthis:%1\">Mwy am ebostau HTML...</a> <a href=\"whatsthis:%2\">Mwy am "
+"cyfeiriadau allanol...</a>"
 
 #: configuredialog.cpp:3824
 #, fuzzy
@@ -2579,14 +2562,14 @@ msgstr "Atodi llo&fnod yn ymysgogol"
 msgid ""
 "Changing the global HTML setting will override all folder specific values."
 msgstr ""
-"Bydd newid y gosodiad HTML eang yn anwybyddu pob gwerth sy'n benodol i blygell."
+"Bydd newid y gosodiad HTML eang yn anwybyddu pob gwerth sy'n benodol i "
+"blygell."
 
 #: configuredialog.cpp:4251
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr ""
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr ""
@@ -2616,8 +2599,8 @@ msgstr ""
 #: configuredialog.cpp:4580
 #, fuzzy
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Wrth geisio canfod negeseuon nas darllenwyd:"
 
@@ -2642,8 +2625,8 @@ msgstr "Dolennu mewn Pob Plygell"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr ""
 
@@ -2715,27 +2698,23 @@ msgstr "Cyfeiriaduron (fformat \"maildir\")"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>Dewisa hwn pa fformat blwch ebost fydd y rhagosod ar gyfer plygyll lleol:</p>"
-"<p><b>mbox:</b> Cynrychiolir plygyll ebost KMail gan un ffeil bob un.  Gwahanir "
-"negeseuon unigol o'u gilydd gan linell sy'n dechrau efo \"From \".  Mae hyn yn "
-"cynilo lle ar y ddisg, ond gall fod yn llai gadarn, e.e. wrth symud negeseuon "
-"rhwng plygyll.</p>"
-"<p><b>maildir:</b> Cynrychiolir plygyll ebost KMail gan blygyll go iawn ar y "
-"ddisg.  Mae negeseuon unigol yn ffeiliau ar wahân.  Gall hyn golli tipyn o le "
-"ar y ddisg, ond dylai fod yn fwy gadarn, e.e. wrth symud negeseuon rhwng "
-"plygyll.</p></qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>Dewisa hwn pa fformat blwch ebost fydd y rhagosod ar gyfer plygyll "
+"lleol:</p><p><b>mbox:</b> Cynrychiolir plygyll ebost KMail gan un ffeil bob "
+"un.  Gwahanir negeseuon unigol o'u gilydd gan linell sy'n dechrau efo \"From "
+"\".  Mae hyn yn cynilo lle ar y ddisg, ond gall fod yn llai gadarn, e.e. "
+"wrth symud negeseuon rhwng plygyll.</p><p><b>maildir:</b> Cynrychiolir "
+"plygyll ebost KMail gan blygyll go iawn ar y ddisg.  Mae negeseuon unigol yn "
+"ffeiliau ar wahân.  Gall hyn golli tipyn o le ar y ddisg, ond dylai fod yn "
+"fwy gadarn, e.e. wrth symud negeseuon rhwng plygyll.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2772,45 +2751,38 @@ msgstr ""
 #, fuzzy
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Wrth neidio i'r neges nesaf heb ei darllen, gall ddigwydd nad oes mwy o "
-"negeseuon heb eu darllen dan y neges gyfredol.</p>"
-"<p><b>Peidio â dolennu:</b> Bydd y chwiliad yn aros wrth y neges olaf yn y "
-"blygell gyfredol.</p>"
-"<p><b>Dolennu yn y blygell gyfredol:</b> Bydd y chwiliad yn mynd ymlaen wrth "
-"ben y rhestr negeseuon, ond peidio â mynd ymlaen i blygell arall.</p>"
-"<p><b>Dolennu ym mhob plygell:</b> Bydd y chwiliad yn mynd ymlaen wrth ben y "
-"rhestr negeseuon.  Os ni chanfyddir negeseuon heb eu darllen bydd o'n mynd "
-"ymlaen wedyn i'r plygell nesaf.</p>"
-"<p>Yn yr un modd, wrth chwilio am y neges flaenorol heb ei darllen, bydd y "
-"chwiliad yn dechrau o waelod y rhestr negeseuon a mynd ymlaen i'r blygell "
-"flaenorol, yn dibynnu ar ba ddewisiad a ddewisir.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>Wrth neidio i'r neges nesaf heb ei darllen, gall ddigwydd nad oes mwy "
+"o negeseuon heb eu darllen dan y neges gyfredol.</p><p><b>Peidio â dolennu:</"
+"b> Bydd y chwiliad yn aros wrth y neges olaf yn y blygell gyfredol.</"
+"p><p><b>Dolennu yn y blygell gyfredol:</b> Bydd y chwiliad yn mynd ymlaen "
+"wrth ben y rhestr negeseuon, ond peidio â mynd ymlaen i blygell arall.</"
+"p><p><b>Dolennu ym mhob plygell:</b> Bydd y chwiliad yn mynd ymlaen wrth ben "
+"y rhestr negeseuon.  Os ni chanfyddir negeseuon heb eu darllen bydd o'n mynd "
+"ymlaen wedyn i'r plygell nesaf.</p><p>Yn yr un modd, wrth chwilio am y neges "
+"flaenorol heb ei darllen, bydd y chwiliad yn dechrau o waelod y rhestr "
+"negeseuon a mynd ymlaen i'r blygell flaenorol, yn dibynnu ar ba ddewisiad a "
+"ddewisir.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4811
@@ -2879,8 +2851,8 @@ msgstr "&Iaith ar gyfer plygyll cylchwedd:"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 
 #: configuredialog.cpp:4909
@@ -2890,8 +2862,8 @@ msgstr "Mae'r plygyll adnodd yn is-&blygyll o:"
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 
 #: configuredialog.cpp:4921
@@ -2951,19 +2923,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr ""
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr ""
@@ -2976,14 +2947,14 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 
 #: configuredialog.cpp:5048
@@ -3095,17 +3066,16 @@ msgstr "&Blaenyrru"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -3123,15 +3093,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3204,8 +3174,8 @@ msgstr "Golygu Dynodiad"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3466,6 +3436,11 @@ msgstr "Dewis Plygell"
 msgid "Filters"
 msgstr "Hidlo %1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Dewis &Pob Neges"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3498,8 +3473,8 @@ msgstr ""
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 
 #: filterlogdlg.cpp:83
@@ -3516,10 +3491,11 @@ msgstr ""
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 
 #: filterlogdlg.cpp:112
@@ -3541,10 +3517,10 @@ msgstr "Diderfyn"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 
 #: filterlogdlg.cpp:258
@@ -3553,7 +3529,7 @@ msgid ""
 "\"%2\" is the detailed error description."
 msgstr ""
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "Gwall KMail"
@@ -3595,9 +3571,9 @@ msgstr "&Defnyddio Tystysgrif"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
@@ -3649,8 +3625,8 @@ msgstr "Nid oes gennych ganiatád darllen/ysgrifennu i'ch plygell sbwriel."
 
 #: folderdiaacltab.cpp:435
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
@@ -3661,8 +3637,7 @@ msgstr ""
 msgid "Connecting to server %1, please wait..."
 msgstr ""
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr ""
@@ -3688,8 +3663,8 @@ msgstr ""
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
@@ -3719,7 +3694,7 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Dewis Plygell"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Plygyll Lleol"
@@ -3746,9 +3721,9 @@ msgstr "Rh&estr fer o blygyll"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
@@ -3769,11 +3744,20 @@ msgstr "Didd&ymu"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "Anhysbys"
@@ -3895,55 +3879,16 @@ msgstr "Cyflwr:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
 msgstr "<qt><b><br>N<br>e<br>g<br>e<br>s<br> <br>H<br>T<br>M<br>L</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>D"
-"<br>i"
-"<br>m"
-"<br> "
-"<br>N"
-"<br>e"
-"<br>g"
-"<br>e"
-"<br>s"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>D<br>i<br>m<br> <br>N<br>e<br>g<br>e<br>s<br> <br>H<br>T<br>M<br>L</"
+"qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -3956,19 +3901,13 @@ msgstr "&Eich enw:"
 #: identitydialog.cpp:123
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Eich enw</h3>"
-"<p>Dylai'r maes yma gynnwys eich enw, fel yr hoffech iddo ymddangos ym mhenawd "
-"yr ebost a anfonir.</p>"
-"<p>Os gadewch hwn yn wag, ni ddengys eich enw go iawn, ond cyfeiriad ebost yn "
-"unig.</p></qt>"
+"<qt><h3>Eich enw</h3><p>Dylai'r maes yma gynnwys eich enw, fel yr hoffech "
+"iddo ymddangos ym mhenawd yr ebost a anfonir.</p><p>Os gadewch hwn yn wag, "
+"ni ddengys eich enw go iawn, ond cyfeiriad ebost yn unig.</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -3976,17 +3915,13 @@ msgstr "Mu&diad:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Mudiad</h3>"
-"<p>Dylai'r maes yma gynnwys enw eich mudiad, os hoffech iddo ei ddangos ym "
-"mhenawd yr ebost a anfonir.</p>"
-"<p>Mae'n ddiogel (ac arferol) i adael hwn yn wag.</p></qt>"
+"<qt><h3>Mudiad</h3><p>Dylai'r maes yma gynnwys enw eich mudiad, os hoffech "
+"iddo ei ddangos ym mhenawd yr ebost a anfonir.</p><p>Mae'n ddiogel (ac "
+"arferol) i adael hwn yn wag.</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -3995,20 +3930,15 @@ msgstr "C&yfeiriad ebost:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Cyfeiriad ebost</h3>"
-"<p>Dylai'r maes yma gynnwys eich cyfeiriad ebost llawn.</p>"
-"<p>Os gadewch hwn yn wag, neu roi un anghywir, bydd pawb yn cael trafferth wrth "
-"ateb i chi.</p></qt>"
+"<qt><h3>Cyfeiriad ebost</h3><p>Dylai'r maes yma gynnwys eich cyfeiriad ebost "
+"llawn.</p><p>Os gadewch hwn yn wag, neu roi un anghywir, bydd pawb yn cael "
+"trafferth wrth ateb i chi.</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4017,21 +3947,12 @@ msgstr "C&yfeiriad ebost:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>[email protected]</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>[email protected]"
-"<br>[email protected]</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>[email protected]</td></tr><tr><th>Aliases:</"
+"th><td>[email protected]<br>[email protected]</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4053,25 +3974,23 @@ msgstr "Eich Allwedd OpenPGP"
 msgid ""
 "Select the OpenPGP key which should be used to digitally sign your messages."
 msgstr ""
-"Dewiswch yr allwedd OpenPGP a ddylai ei defnyddio i lofnodi eich negeseuon ac "
-"wrth gêl-ysgrifennu i'ch hunan."
+"Dewiswch yr allwedd OpenPGP a ddylai ei defnyddio i lofnodi eich negeseuon "
+"ac wrth gêl-ysgrifennu i'ch hunan."
 
 #: identitydialog.cpp:198
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Defnyddir yr allwedd PGP a ddewisir yma i lofnodi negeseuon ac i gêl-ysgrifo "
-"negeseuon i'ch hun.  Gallwch hefyd ddefnyddio alleddau GnuPG.</p>"
-"Gallwch adael hwn yn wag, ond ni fydd KMail yn gallu llofnodi ebostau "
-"gêl-ysgrifol.  Ni fydd effaith ar swyddogaethau ebostio arferol.</p>"
-"Gallwch ddarganfod mwy ynglyn ag allweddau wrth <a>http://www.gnupg.org</a></qt>"
+"<qt><p>Defnyddir yr allwedd PGP a ddewisir yma i lofnodi negeseuon ac i gêl-"
+"ysgrifo negeseuon i'ch hun.  Gallwch hefyd ddefnyddio alleddau GnuPG.</"
+"p>Gallwch adael hwn yn wag, ond ni fydd KMail yn gallu llofnodi ebostau gêl-"
+"ysgrifol.  Ni fydd effaith ar swyddogaethau ebostio arferol.</p>Gallwch "
+"ddarganfod mwy ynglyn ag allweddau wrth <a>http://www.gnupg.org</a></qt>"
 
 #: identitydialog.cpp:205
 #, fuzzy
@@ -4086,30 +4005,27 @@ msgstr "Eich Allwedd OpenPGP"
 #: identitydialog.cpp:218
 #, fuzzy
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
-"Dewiswch yr allwedd OpenPGP a ddylai ei defnyddio i lofnodi eich negeseuon ac "
-"wrth gêl-ysgrifennu i'ch hunan."
+"Dewiswch yr allwedd OpenPGP a ddylai ei defnyddio i lofnodi eich negeseuon "
+"ac wrth gêl-ysgrifennu i'ch hunan."
 
 #: identitydialog.cpp:223
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
 msgstr ""
-"<qt>"
-"<p>Defnyddir yr allwedd PGP a ddewisir yma i lofnodi negeseuon ac i gêl-ysgrifo "
-"negeseuon i'ch hun.  Gallwch hefyd ddefnyddio alleddau GnuPG.</p>"
-"Gallwch adael hwn yn wag, ond ni fydd KMail yn gallu llofnodi ebostau "
-"gêl-ysgrifol.  Ni fydd effaith ar swyddogaethau ebostio arferol.</p>"
-"Gallwch ddarganfod mwy ynglyn ag allweddau wrth <a>http://www.gnupg.org</a></qt>"
+"<qt><p>Defnyddir yr allwedd PGP a ddewisir yma i lofnodi negeseuon ac i gêl-"
+"ysgrifo negeseuon i'ch hun.  Gallwch hefyd ddefnyddio alleddau GnuPG.</"
+"p>Gallwch adael hwn yn wag, ond ni fydd KMail yn gallu llofnodi ebostau gêl-"
+"ysgrifol.  Ni fydd effaith ar swyddogaethau ebostio arferol.</p>Gallwch "
+"ddarganfod mwy ynglyn ag allweddau wrth <a>http://www.gnupg.org</a></qt>"
 
 #: identitydialog.cpp:230
 #, fuzzy
@@ -4127,24 +4043,22 @@ msgid ""
 "Select the S/MIME certificate which should be used to digitally sign your "
 "messages."
 msgstr ""
-"Dewiswch yr allwedd OpenPGP a ddylai ei defnyddio i lofnodi eich negeseuon ac "
-"wrth gêl-ysgrifennu i'ch hunan."
+"Dewiswch yr allwedd OpenPGP a ddylai ei defnyddio i lofnodi eich negeseuon "
+"ac wrth gêl-ysgrifennu i'ch hunan."
 
 #: identitydialog.cpp:247
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Defnyddir yr allwedd PGP a ddewisir yma i lofnodi negeseuon ac i gêl-ysgrifo "
-"negeseuon i'ch hun.  Gallwch hefyd ddefnyddio alleddau GnuPG.</p>"
-"Gallwch adael hwn yn wag, ond ni fydd KMail yn gallu llofnodi ebostau "
-"gêl-ysgrifol.  Ni fydd effaith ar swyddogaethau ebostio arferol.</p>"
-"Gallwch ddarganfod mwy ynglyn ag allweddau wrth <a>http://www.gnupg.org</a></qt>"
+"<qt><p>Defnyddir yr allwedd PGP a ddewisir yma i lofnodi negeseuon ac i gêl-"
+"ysgrifo negeseuon i'ch hun.  Gallwch hefyd ddefnyddio alleddau GnuPG.</"
+"p>Gallwch adael hwn yn wag, ond ni fydd KMail yn gallu llofnodi ebostau gêl-"
+"ysgrifol.  Ni fydd effaith ar swyddogaethau ebostio arferol.</p>Gallwch "
+"ddarganfod mwy ynglyn ag allweddau wrth <a>http://www.gnupg.org</a></qt>"
 
 #: identitydialog.cpp:252
 #, fuzzy
@@ -4157,26 +4071,24 @@ msgstr ""
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 
 #: identitydialog.cpp:274
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Defnyddir yr allwedd PGP a ddewisir yma i lofnodi negeseuon ac i gêl-ysgrifo "
-"negeseuon i'ch hun.  Gallwch hefyd ddefnyddio alleddau GnuPG.</p>"
-"Gallwch adael hwn yn wag, ond ni fydd KMail yn gallu llofnodi ebostau "
-"gêl-ysgrifol.  Ni fydd effaith ar swyddogaethau ebostio arferol.</p>"
-"Gallwch ddarganfod mwy ynglyn ag allweddau wrth <a>http://www.gnupg.org</a></qt>"
+"<qt><p>Defnyddir yr allwedd PGP a ddewisir yma i lofnodi negeseuon ac i gêl-"
+"ysgrifo negeseuon i'ch hun.  Gallwch hefyd ddefnyddio alleddau GnuPG.</"
+"p>Gallwch adael hwn yn wag, ond ni fydd KMail yn gallu llofnodi ebostau gêl-"
+"ysgrifol.  Ni fydd effaith ar swyddogaethau ebostio arferol.</p>Gallwch "
+"ddarganfod mwy ynglyn ag allweddau wrth <a>http://www.gnupg.org</a></qt>"
 
 #: identitydialog.cpp:280
 #, fuzzy
@@ -4197,24 +4109,20 @@ msgstr "&Cyfeiriad Ateb-I:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Cyfeiriadau Ateb-I</h3>"
-"<p>Mae hwn yn gosod y penawd <tt>Ateb-i:</tt> i gynnwys cyfeiriad ebost "
-"gwahanol i'r cyfeiriad <tt>Oddiwrth:</tt> rferol.</p>"
-"<p>Gall hyn fod yn ddefnyddiol pan mae gennych cylch o bobl sy'n gweithio efo'u "
-"gilydd mewn ffyrdd tebyg.  Er enghraifft, efallai hoffech i ebostau a anfonir "
-"gael eich cyfeiriad yn y maes <tt>Oddiwrth:</tt>, ond i ymatebion fynd i "
-"gyfeiriad cylch.</p>"
-"<p>Os mewn amheuaeth, gadewch y maes yma'n wag.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Cyfeiriadau Ateb-I</h3><p>Mae hwn yn gosod y penawd <tt>Ateb-i:</tt> "
+"i gynnwys cyfeiriad ebost gwahanol i'r cyfeiriad <tt>Oddiwrth:</tt> rferol.</"
+"p><p>Gall hyn fod yn ddefnyddiol pan mae gennych cylch o bobl sy'n gweithio "
+"efo'u gilydd mewn ffyrdd tebyg.  Er enghraifft, efallai hoffech i ebostau a "
+"anfonir gael eich cyfeiriad yn y maes <tt>Oddiwrth:</tt>, ond i ymatebion "
+"fynd i gyfeiriad cylch.</p><p>Os mewn amheuaeth, gadewch y maes yma'n wag.</"
+"p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4223,23 +4131,18 @@ msgstr "Cyfeiriadau &BCC:"
 #: identitydialog.cpp:345
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Cyfeiriadau BCC (Blind Carbon Copy)</h3>"
-"<p>Ychwanegir y cyfeiriadau a fewnosodir yma i bob ebost allan a anfonir efo'r "
-"dynodiad yma.  Ni fyddant yn weladwy i dderbynwyr eraill. </p>"
-"<p>Defnyddir hyn yn gyffredin i anfon copi o bob neges anfonedig i gyfrif arall "
-"sy'n biau i chi.</p>"
-"<p>Os mewn amheuaeth, gadewch y maes yma'n wag.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Cyfeiriadau BCC (Blind Carbon Copy)</h3><p>Ychwanegir y cyfeiriadau "
+"a fewnosodir yma i bob ebost allan a anfonir efo'r dynodiad yma.  Ni fyddant "
+"yn weladwy i dderbynwyr eraill. </p><p>Defnyddir hyn yn gyffredin i anfon "
+"copi o bob neges anfonedig i gyfrif arall sy'n biau i chi.</p><p>Os mewn "
+"amheuaeth, gadewch y maes yma'n wag.</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4279,7 +4182,7 @@ msgstr "&Llofnod"
 msgid "&Picture"
 msgstr "&Llun"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Cyfeiriad Ebost Annilys"
 
@@ -4298,8 +4201,8 @@ msgstr ""
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 
 #: identitydialog.cpp:567
@@ -4345,8 +4248,8 @@ msgid ""
 "The custom drafts folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default drafts folder will be used."
 msgstr ""
-"Nid yw'r blygell addasiedig drafftiau ar gyfer dynodiad \"%1\" mewn bodolaeth "
-"(dim mwy).  Felly defnyddir y blygell ragosod drafftiau."
+"Nid yw'r blygell addasiedig drafftiau ar gyfer dynodiad \"%1\" mewn "
+"bodolaeth (dim mwy).  Felly defnyddir y blygell ragosod drafftiau."
 
 #: identitydialog.cpp:662
 #, fuzzy
@@ -4354,13 +4257,13 @@ msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default templates folder will be used."
 msgstr ""
-"Nid yw'r blygell addasiedig drafftiau ar gyfer dynodiad \"%1\" mewn bodolaeth "
-"(dim mwy).  Felly defnyddir y blygell ragosod drafftiau."
+"Nid yw'r blygell addasiedig drafftiau ar gyfer dynodiad \"%1\" mewn "
+"bodolaeth (dim mwy).  Felly defnyddir y blygell ragosod drafftiau."
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (Rhagosod)"
 
@@ -4410,14 +4313,14 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
@@ -4456,14 +4359,19 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Gwall: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 
 #: imapaccountbase.cpp:965
@@ -4622,14 +4530,14 @@ msgstr ""
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4657,136 +4565,110 @@ msgstr "Allwedd Gêl-ysgrifo Anniffiniedig"
 
 #: keyresolver.cpp:642
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:647
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:652
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:662
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:669
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:676
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:684
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:691
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:698
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:707
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:712
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:717
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:724
@@ -4801,136 +4683,110 @@ msgstr "Dewin Tystygrif"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:832
@@ -4944,9 +4800,10 @@ msgstr ""
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
@@ -4974,26 +4831,26 @@ msgstr "Allwedd Lofnodi heb ei Diffinio"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -5004,8 +4861,8 @@ msgstr ""
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -5028,8 +4885,8 @@ msgstr "Defnyddio ar gyfer &Llofnodi"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
@@ -5048,15 +4905,13 @@ msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
-"<qt>"
-"<p>Mae gennych allwedd OpenPGP ymddiriedig ar gyfer pob derbyniwr y neges "
-"yma.</p>"
-"<p>A ddylai'r neges yma gael ei chêl-ysgrifo?</p></qt>"
+"<qt><p>Mae gennych allwedd OpenPGP ymddiriedig ar gyfer pob derbyniwr y "
+"neges yma.</p><p>A ddylai'r neges yma gael ei chêl-ysgrifo?</p></qt>"
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
@@ -5096,11 +4951,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 
 #: keyresolver.cpp:1687
@@ -5148,10 +5003,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Gwall argyfyngus: Methu casglu ebost:"
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Methu ychwanegu'r neges:\n"
+msgid "Failed to add message:\n"
+msgstr "Methu ychwanegu'r neges:\n"
 
 #: kmacctimap.cpp:300
 #, fuzzy, c-format
@@ -5244,6 +5097,63 @@ msgstr "IMAP wedi'i Dda&d-gysylltu"
 msgid "&Maildir mailbox"
 msgstr "Blwch &ebost Maildir"
 
+#: kmail_options.h:11
+#, fuzzy
+msgid "Set subject of message"
+msgstr "Gosd pwnc y neges."
+
+#: kmail_options.h:13
+#, fuzzy
+msgid "Send CC: to 'address'"
+msgstr "Anfon CC: i 'gyfeiriad'."
+
+#: kmail_options.h:15
+#, fuzzy
+msgid "Send BCC: to 'address'"
+msgstr "Anfon BCC: i 'gyfeiriad'."
+
+#: kmail_options.h:17
+#, fuzzy
+msgid "Add 'header' to message"
+msgstr "Ychwanegu 'penawd' i'r neges."
+
+#: kmail_options.h:18
+#, fuzzy
+msgid "Read message body from 'file'"
+msgstr "Darllen corff y neges o 'ffeil'."
+
+#: kmail_options.h:19
+#, fuzzy
+msgid "Set body of message"
+msgstr "Gosod corff y neges."
+
+#: kmail_options.h:20
+#, fuzzy
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Ychwanegu atodiad i'r ebost.  Gellir ailadrodd hwn."
+
+#: kmail_options.h:21
+#, fuzzy
+msgid "Only check for new mail"
+msgstr "Ymofyn am ebost newydd yn unig."
+
+#: kmail_options.h:22
+#, fuzzy
+msgid "Only open composer window"
+msgstr "Agor ffenestr gyfansoddi yn unig."
+
+#: kmail_options.h:23
+#, fuzzy
+msgid "View the given message file"
+msgstr "Dan y c&warel neges"
+
+#: kmail_options.h:24
+#, fuzzy
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+"Anfon neges i bob un 'cyfeiriad', gan atodi'r ffeil y mae'r 'URL' yn ei "
+"benodi."
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Post"
@@ -5287,8 +5197,8 @@ msgid ""
 "KMail will now create the required groupware folders as subfolders of %1; if "
 "you do not want this, cancel and the IMAP resource will be disabled"
 msgstr ""
-"Bydd KMail rwan yn creu y plygyll gofynnol ar gyfer yr adnodd IMAP fel "
-"is-blygyll %1.  Os na ddymunwch hyn, gwthiwch \"Na\", ac analluogir yr adnodd "
+"Bydd KMail rwan yn creu y plygyll gofynnol ar gyfer yr adnodd IMAP fel is-"
+"blygyll %1.  Os na ddymunwch hyn, gwthiwch \"Na\", ac analluogir yr adnodd "
 "IMAP."
 
 #: kmailicalifaceimpl.cpp:1787
@@ -5302,12 +5212,12 @@ msgstr ""
 #: kmailicalifaceimpl.cpp:1795
 #, fuzzy
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
-"Bydd KMail rwan yn creu y plygyll gofynnol ar gyfer yr adnodd IMAP fel "
-"is-blygyll %1.  Os na ddymunwch hyn, gwthiwch \"Na\", ac analluogir yr adnodd "
+"Bydd KMail rwan yn creu y plygyll gofynnol ar gyfer yr adnodd IMAP fel is-"
+"blygyll %1.  Os na ddymunwch hyn, gwthiwch \"Na\", ac analluogir yr adnodd "
 "IMAP."
 
 #: kmailicalifaceimpl.cpp:1802
@@ -5358,11 +5268,11 @@ msgstr "Copiwyd yr URL i'r gludfwrdd."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>Mae ffeil <b>%1</b> mewn bod.<br>Ydych eisiau ei amnewid?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Cadw i Ffeil"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Amnewid"
 
@@ -5380,7 +5290,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5402,11 +5312,11 @@ msgstr "nid yw'n cynnwys"
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -5416,112 +5326,112 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 #, fuzzy
 msgid "Filtering messages"
 msgstr "Dileu Negeseuon"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 #, fuzzy
 msgid "Filtering message %1 of %2"
 msgstr "Symud neges %3 o %2 oddiwrth %1."
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Dim digon o le gwag ar y ddisg?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Symud i'r Blygell Yma"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Copïo i'r Blygell Yma"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 #, fuzzy
 msgid "Moving messages"
 msgstr "Methwyd symud y negeseuon."
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 #, fuzzy
 msgid "Deleting messages"
 msgstr "Dileu Negeseuon"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Agor URL..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Ydych wir eisiau gweithredu <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Gweithredu"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Ni chanfuwyd atodiadau i'w cadw."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 #, fuzzy
 msgid "Save Attachments To"
 msgstr "Cadw Atodiad Fel..."
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr ""
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr ""
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr ""
 "Mae ffeil o'r enw %1 mewn bod yn barod.  Ydych eisiau ysgrifennu drosto?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Ffeil yn Bodoli'n Barod"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "&Trosysgrifo"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 #, fuzzy
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
-"Mae'r rhan yma o'r neges wedi'i chêl-ysgrifo.  Ydych eisiau dal y "
-"cêl-ysgrifaeth wrth gadw?"
+"Mae'r rhan yma o'r neges wedi'i chêl-ysgrifo.  Ydych eisiau dal y cêl-"
+"ysgrifaeth wrth gadw?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "Cwestiwn KMail"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 #, fuzzy
 msgid "Keep Encryption"
 msgstr "Cêl-ysgrifaeth"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 #, fuzzy
 msgid "Do Not Keep"
 msgstr "Peidio â Chêl-ysg&rifo"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 #, fuzzy
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
@@ -5530,98 +5440,98 @@ msgstr ""
 "Mae'r rhan yma o'r neges wedi'i llofnodi.  Ydych eisiau dal y llofnod wrth "
 "gadw?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 #, fuzzy
 msgid "Keep Signature"
 msgstr "Llofnod"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
 "%2"
 msgstr ""
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, fuzzy, c-format
 msgid "Could not write the file %1."
 msgstr "Methu ysgrifennu'r ffeil."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
 " it is not possible to determine who to chat with."
 msgstr ""
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr ""
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 #, fuzzy
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Dewis Allwedd Cêl-ysgrifo"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr ""
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "Post"
@@ -5720,7 +5630,7 @@ msgstr "Maint"
 msgid "Encoding"
 msgstr "Amgodiad"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Compress"
 
@@ -5732,7 +5642,7 @@ msgstr "Cêl-ysgrifo"
 msgid "Sign"
 msgstr "Llofnodi"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 #, fuzzy
 msgid "Name of the attachment:"
 msgstr "atodiad"
@@ -5756,7 +5666,8 @@ msgstr "<derbynwyr>"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1052
@@ -5766,9 +5677,9 @@ msgstr ""
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1067
@@ -5778,9 +5689,8 @@ msgstr "<derbynwyr>"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
@@ -5792,7 +5702,7 @@ msgstr "&Anfon Ebost"
 msgid "&Send Mail Via"
 msgstr "&Sendmail"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Anfon yn &Nes Ymlaen"
@@ -5864,8 +5774,7 @@ msgstr "G&waredu Nodau Dyfynnu"
 msgid "Cl&ean Spaces"
 msgstr "Glan&hau Gofodnodau"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Def&nyddio Wynebfath Penodol"
@@ -6010,31 +5919,31 @@ msgstr ""
 msgid "Select a cryptographic format for this message"
 msgstr "Cêl-ysgrifo pob rhan o'r neges yma?"
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Safonol"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr ""
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr ""
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr ""
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr ""
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr ""
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr ""
 
@@ -6141,58 +6050,59 @@ msgstr "Cyfan&soddydd Newydd"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
-"Ymddengys bod y neges yr ydych wedi cyfansoddi yn cyfeirio i ffeil atodiedig, "
-"ond nid ydych wedi atodi rhywbeth.\n"
+"Ymddengys bod y neges yr ydych wedi cyfansoddi yn cyfeirio i ffeil "
+"atodiedig, ond nid ydych wedi atodi rhywbeth.\n"
 "Ydych eisiau atodi ffeil i'ch neges?"
 
 #: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "Atgoffydd Atodiad Ffeil"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "&Anfon e"
 
 #: kmcomposewin.cpp:2415
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Methodd KMail adnabod lleoliad yr atodiad (%1).</p>"
-"<p>Rhaid i chi benodi'r llwybr llawn os hoffech atodi ffeil.</p></qt>"
+"<qt><p>Methodd KMail adnabod lleoliad yr atodiad (%1).</p><p>Rhaid i chi "
+"benodi'r llwybr llawn os hoffech atodi ffeil.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Atodi Ffeil"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Atodi"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Mewnosod Ffeil"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Mewnosod Ffeil"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:3133
@@ -6233,21 +6143,36 @@ msgid ""
 "View"
 msgstr "Gweld"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Golygu..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Golygu..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Cad&w Fel..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Priodweddau"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Ychwanegu Atodiad..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 #, fuzzy
 msgid "KMail could not compress the file."
 msgstr "Methu ysgrifennu'r ffeil."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 #, fuzzy
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
@@ -6256,273 +6181,269 @@ msgstr ""
 "Mae'r rhan yma o'r neges wedi'i llofnodi.  Ydych eisiau dal y llofnod wrth "
 "gadw?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Cadw"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 #, fuzzy
 msgid "KMail could not uncompress the file."
 msgstr "Methu ysgrifennu'r ffeil."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Cadw Atodiad Fel..."
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr ""
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 #, fuzzy
 msgid "Add as Attachment"
 msgstr "Ychwanegu Atodiad..."
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "atodiad"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "di-enw"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Allwedd Gêl-ysgrifo Anniffiniedig"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Er mwyn gallu cêl-ysgrifo'r neges yma, rhaid i chi yn gyntaf ddiffinio'r "
-"allwedd OpenPGP a ddylir ei defnyddio ar gyfer hyn.</p>"
-"<p>Gallwch ddiffinio'r allwedd OpenPGP a ddylir ei defnyddio efo'r dynodiad "
-"cyfredol yn y ffurfweddiad dynodiad.</p></qt>"
+"<qt><p>Er mwyn gallu cêl-ysgrifo'r neges yma, rhaid i chi yn gyntaf "
+"ddiffinio'r allwedd OpenPGP a ddylir ei defnyddio ar gyfer hyn.</"
+"p><p>Gallwch ddiffinio'r allwedd OpenPGP a ddylir ei defnyddio efo'r "
+"dynodiad cyfredol yn y ffurfweddiad dynodiad.</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Allwedd Lofnodi heb ei Diffinio"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr ""
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 #, fuzzy
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr "Rhaid i chi benodi o leiaf un derbyniwr yn y maes I:."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "Nid ydych wedi penodi pwnc.  Anfon y neges beth bynnag?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 #, fuzzy
 msgid "No To: specified"
 msgstr "Dim Enw wedi'i Benodi"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Nid ydych wedi penodi pwnc.  Anfon y neges beth bynnag?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Ni Phenodwyd Pwnc"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "A&nfon e"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 #, fuzzy
 msgid "&Specify the Subject"
 msgstr "&Na, Gadewch i Mi Benodi'r Pwnc"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr ""
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 #, fuzzy
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Llofnodi/Cêl-ysgrifo"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 #, fuzzy
 msgid "Sign/Encrypt Message?"
 msgstr "Cêl-ysgrifo'r Neges?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 #, fuzzy
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
-"Nid yw'r blygell addasiedig drafftiau ar gyfer dynodiad \"%1\" mewn bodolaeth "
-"(dim mwy).  Felly defnyddir y blygell ragosod drafftiau."
+"Nid yw'r blygell addasiedig drafftiau ar gyfer dynodiad \"%1\" mewn "
+"bodolaeth (dim mwy).  Felly defnyddir y blygell ragosod drafftiau."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Creuwch gyfrif ar gyfer anfon a ceisiwch eto."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Ar fin anfon ebost..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Anfon Cadarnhad"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "Anfo&n Rwan"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "<derbynwyr>"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "<derbynwyr>"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 #, fuzzy
 msgid "Spellcheck: on"
 msgstr "Gwirydd Sillafu"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 #, fuzzy
 msgid "Spellcheck: off"
 msgstr "Gwirydd Sillafu"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr "Diddymwyd y gwirio sillafu."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr "Arhoswyd y gwiriad sillafu."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr "Gwiriad sillafu yn gyflawn."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Gwirydd Sillafu"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr ""
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 #, fuzzy
 msgid "No Chiasmus Keys Found"
 msgstr "Ni Chanfuwyd Tystysgrif"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 #, fuzzy
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Dewis Allwedd Cêl-ysgrifo"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "Llofnodwyd y neges gan %1."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "Llofnodwyd y neges gan %1."
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "Neges OpenPGP - wedi'i chelu"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Rhestr Negeseuon"
@@ -6572,8 +6493,8 @@ msgstr "Gwirydd Sillafu - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 "Ni ellid dechrau ISpell/Aspell.  Sicrhewch bod ISpell neu Aspell wedi ei "
 "ffurfweddu yn iawn, ac yn eich PATH."
@@ -6609,13 +6530,11 @@ msgstr "<qt>Gormod o weithredoedd hidlo yn y rheol hidlo <b>%1</b>.</qt>"
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Gweithred hidlo anhysbys <b>%1</b>"
-"<br>yn y rheol hidlo <b>%2</b>."
-"<br>Yn ei hanwybyddu.</qt>"
+"<qt>Gweithred hidlo anhysbys <b>%1</b><br>yn y rheol hidlo <b>%2</b>.<br>Yn "
+"ei hanwybyddu.</qt>"
 
 #: kmfilteraction.cpp:601
 #, fuzzy
@@ -6852,175 +6771,147 @@ msgstr "chwarae sŵm"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Dyma'r rhestr o hidlau wedi'u rhagddiffinio.  Prosesir o ben i waelod.</p>"
-"<p>Cliciwch ar unrhyw hidlen i'w golygu gan ddefnyddio'r rheolyddion yn hanner "
-"dde yr ymgom.</p></qt>"
+"<qt><p>Dyma'r rhestr o hidlau wedi'u rhagddiffinio.  Prosesir o ben i waelod."
+"</p><p>Cliciwch ar unrhyw hidlen i'w golygu gan ddefnyddio'r rheolyddion yn "
+"hanner dde yr ymgom.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Cliciwch y botwm yma i greu hidlen newydd.</p>"
-"<p>Mewnosodir yr hidlen cyn i'r un a ddewisir ar hyn o bryd, ond gallwch newid "
-"hynny yn nes ymlaen.</p>"
-"<p>Os ydych wedi clicio'r botwm yma wrth gamgymeriad, gallwch ddatwneud hyn gan "
-"glicio ar y botwm <em>Dileu</em>.</p></qt>"
+"<qt><p>Cliciwch y botwm yma i greu hidlen newydd.</p><p>Mewnosodir yr hidlen "
+"cyn i'r un a ddewisir ar hyn o bryd, ond gallwch newid hynny yn nes ymlaen.</"
+"p><p>Os ydych wedi clicio'r botwm yma wrth gamgymeriad, gallwch ddatwneud "
+"hyn gan glicio ar y botwm <em>Dileu</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Cliciwch y botwm yma i greu hidlen newydd.</p>"
-"<p>Mewnosodir yr hidlen cyn i'r un a ddewisir ar hyn o bryd, ond gallwch newid "
-"hynny yn nes ymlaen.</p>"
-"<p>Os ydych wedi clicio'r botwm yma wrth gamgymeriad, gallwch ddatwneud hyn gan "
-"glicio ar y botwm <em>Dileu</em>.</p></qt>"
+"<qt><p>Cliciwch y botwm yma i greu hidlen newydd.</p><p>Mewnosodir yr hidlen "
+"cyn i'r un a ddewisir ar hyn o bryd, ond gallwch newid hynny yn nes ymlaen.</"
+"p><p>Os ydych wedi clicio'r botwm yma wrth gamgymeriad, gallwch ddatwneud "
+"hyn gan glicio ar y botwm <em>Dileu</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:72
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Cliciwch y botwm yma i <em>ddileu</em> yr hidlen a ddewisir ar hyn o bryd "
-"o'r rhestr uchod.</p>"
-"<p>Nid oes ffordd o gael yr hidlen yn ôl wedi'i dileu, ond gallwch gadael yr "
-"ymgom gan glicio <em>Diddymu</em> i daflu'r newidion a wnaed.</p></qt>"
+"<qt><p>Cliciwch y botwm yma i <em>ddileu</em> yr hidlen a ddewisir ar hyn o "
+"bryd o'r rhestr uchod.</p><p>Nid oes ffordd o gael yr hidlen yn ôl wedi'i "
+"dileu, ond gallwch gadael yr ymgom gan glicio <em>Diddymu</em> i daflu'r "
+"newidion a wnaed.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Cliciwch y botwm yma i symud yr hidlen a ddewisir ar hyn o bryd un lle <em>"
-"i lawr</em> yn y rhestr uchod.</p>"
-"<p>Mae hyn yn ddefnyddiol, gan fod trefn yr hidlau yn effeithio'r trefn y maent "
-"yn dod i rym ar negeseuon.  Ceisir yr hidlen uchaf yn gyntaf.</p>"
-"<p>Os ydych wedi clicio'r botwm yma wrth gamgymeriad, gallwch ddatwneud hyn gan "
-"glicio ar y botwm  <em>I Fyny</em>.</p></qt>"
+"<qt><p>Cliciwch y botwm yma i symud yr hidlen a ddewisir ar hyn o bryd un "
+"lle <em>i lawr</em> yn y rhestr uchod.</p><p>Mae hyn yn ddefnyddiol, gan fod "
+"trefn yr hidlau yn effeithio'r trefn y maent yn dod i rym ar negeseuon.  "
+"Ceisir yr hidlen uchaf yn gyntaf.</p><p>Os ydych wedi clicio'r botwm yma "
+"wrth gamgymeriad, gallwch ddatwneud hyn gan glicio ar y botwm  <em>I Fyny</"
+"em>.</p></qt>"
 
 #: kmfilterdlg.cpp:85
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
 msgstr ""
-"<qt>"
-"<p>Cliciwch y botwm yma i symud yr hidlen a ddewisir ar hyn o bryd un lle <em>"
-"i fyny</em> yn y rhestr uchod.</p>"
-"<p>Mae hyn yn ddefnyddiol, gan fod trefn yr hidlau yn effeithio'r trefn y maent "
-"yn dod i rym ar negeseuon.  Ceisir yr hidlen uchaf yn gyntaf.</p>"
-"<p>Os ydych wedi clicio'r botwm yma wrth gamgymeriad, gallwch ddatwneud hyn gan "
-"glicio ar y botwm  <em>I Lawr</em>.</p></qt>"
+"<qt><p>Cliciwch y botwm yma i symud yr hidlen a ddewisir ar hyn o bryd un "
+"lle <em>i fyny</em> yn y rhestr uchod.</p><p>Mae hyn yn ddefnyddiol, gan fod "
+"trefn yr hidlau yn effeithio'r trefn y maent yn dod i rym ar negeseuon.  "
+"Ceisir yr hidlen uchaf yn gyntaf.</p><p>Os ydych wedi clicio'r botwm yma "
+"wrth gamgymeriad, gallwch ddatwneud hyn gan glicio ar y botwm  <em>I Lawr</"
+"em>.</p></qt>"
 
 #: kmfilterdlg.cpp:93
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>Cliciwch y botwm yma i symud yr hidlen a ddewisir ar hyn o bryd un lle <em>"
-"i lawr</em> yn y rhestr uchod.</p>"
-"<p>Mae hyn yn ddefnyddiol, gan fod trefn yr hidlau yn effeithio'r trefn y maent "
-"yn dod i rym ar negeseuon.  Ceisir yr hidlen uchaf yn gyntaf.</p>"
-"<p>Os ydych wedi clicio'r botwm yma wrth gamgymeriad, gallwch ddatwneud hyn gan "
-"glicio ar y botwm  <em>I Fyny</em>.</p></qt>"
+"<qt><p>Cliciwch y botwm yma i symud yr hidlen a ddewisir ar hyn o bryd un "
+"lle <em>i lawr</em> yn y rhestr uchod.</p><p>Mae hyn yn ddefnyddiol, gan fod "
+"trefn yr hidlau yn effeithio'r trefn y maent yn dod i rym ar negeseuon.  "
+"Ceisir yr hidlen uchaf yn gyntaf.</p><p>Os ydych wedi clicio'r botwm yma "
+"wrth gamgymeriad, gallwch ddatwneud hyn gan glicio ar y botwm  <em>I Fyny</"
+"em>.</p></qt>"
 
 #: kmfilterdlg.cpp:101
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Cliciwch y botwm yma i symud yr hidlen a ddewisir ar hyn o bryd un lle <em>"
-"i lawr</em> yn y rhestr uchod.</p>"
-"<p>Mae hyn yn ddefnyddiol, gan fod trefn yr hidlau yn effeithio'r trefn y maent "
-"yn dod i rym ar negeseuon.  Ceisir yr hidlen uchaf yn gyntaf.</p>"
-"<p>Os ydych wedi clicio'r botwm yma wrth gamgymeriad, gallwch ddatwneud hyn gan "
-"glicio ar y botwm  <em>I Fyny</em>.</p></qt>"
+"<qt><p>Cliciwch y botwm yma i symud yr hidlen a ddewisir ar hyn o bryd un "
+"lle <em>i lawr</em> yn y rhestr uchod.</p><p>Mae hyn yn ddefnyddiol, gan fod "
+"trefn yr hidlau yn effeithio'r trefn y maent yn dod i rym ar negeseuon.  "
+"Ceisir yr hidlen uchaf yn gyntaf.</p><p>Os ydych wedi clicio'r botwm yma "
+"wrth gamgymeriad, gallwch ddatwneud hyn gan glicio ar y botwm  <em>I Fyny</"
+"em>.</p></qt>"
 
 #: kmfilterdlg.cpp:107
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Cliciwch y botwm yma i ailenwi'r hidlen a ddewisir ar hyn o bryd.</p>"
-"<p>Enwir hidlau yn ymysgogol, ond iddynt ddechrau efo \"<<\".</p>"
-"<p>Os ydych wedi ailenwi hidlen wrth ddamwain ac eisiau enwi ymysgogol yn ôl, "
-"cliciwch y botwm yma a dewiswch <em>Gwagu</em> ac wedyn <em>Iawn</em> "
-"yn yr ymgom a ymddengys.</p></qt>"
+"<qt><p>Cliciwch y botwm yma i ailenwi'r hidlen a ddewisir ar hyn o bryd.</"
+"p><p>Enwir hidlau yn ymysgogol, ond iddynt ddechrau efo \"<<\".</p><p>Os "
+"ydych wedi ailenwi hidlen wrth ddamwain ac eisiau enwi ymysgogol yn ôl, "
+"cliciwch y botwm yma a dewiswch <em>Gwagu</em> ac wedyn <em>Iawn</em> yn yr "
+"ymgom a ymddengys.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Brithwch yma i orfodi i'r ymgom gadarnhad ymddangos.</p>"
-"<p>Gall hyn fod yn ddefnyddiol os ydych wedi diffinio casgliad rheolau sy'n "
-"nodi negeseuon i'w lawrlwytho yn nes ymlaen.  Heb y bosibilrwydd o orfodi'r "
-"naidlen ymgom, ni ellir lawrlwytho'r negeseuon yma pe bai negeseuon mawr eraill "
-"yn aros ar y gweinydd, neu pe baech eisiau newid y casgliad rheolau i nodi'r "
-"negeseuon yn wahanol.</p></qt>"
+"<qt><p>Brithwch yma i orfodi i'r ymgom gadarnhad ymddangos.</p><p>Gall hyn "
+"fod yn ddefnyddiol os ydych wedi diffinio casgliad rheolau sy'n nodi "
+"negeseuon i'w lawrlwytho yn nes ymlaen.  Heb y bosibilrwydd o orfodi'r "
+"naidlen ymgom, ni ellir lawrlwytho'r negeseuon yma pe bai negeseuon mawr "
+"eraill yn aros ar y gweinydd, neu pe baech eisiau newid y casgliad rheolau i "
+"nodi'r negeseuon yn wahanol.</p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -7030,6 +6921,16 @@ msgstr "Rheolau Hidlo POP3"
 msgid "Filter Rules"
 msgstr "Rheolau Hidlo"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Mewnforio"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Mewnforio"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Hidlau ar Gael"
@@ -7119,6 +7020,11 @@ msgstr "Ychwanegu'r hidlen yma i'r ddewislen Gweithredu Gweithredoedd Hidlo"
 msgid "Icon for this filter:"
 msgstr "eicon ar gyfer yr hidlen yma:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "I"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "I Fyny"
@@ -7127,16 +7033,29 @@ msgstr "I Fyny"
 msgid "Down"
 msgstr "I Lawr"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Ailenwi..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Newydd"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Copïo I"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Wedi'u dileu"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7145,8 +7064,8 @@ msgstr "Rh&estr fer o blygyll"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 
 #: kmfilterdlg.cpp:786
@@ -7222,29 +7141,25 @@ msgstr "Cywiro y gelc IMAP"
 #: kmfoldercachedimap.cpp:122
 #, fuzzy
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>Cywiro'r celc IMAP.</b></p>"
-"<p>Os oes gennych broblemau efo cydamseru plygell IMAP, dylech geisio "
-"ail-adeiladu'r ffeil mynegai yn gyntaf.  Bydd hwn yn cymryd ychydig o amser i "
-"ail-adeiladu, ond ni fydd yn achosi problemau.</p>"
-"<p>O nid yw hynny'n ddigonol, gallwch geisio ailfywio'r celc IMAP.  Os wnewch "
-"hyn, byddwch yn colli pob newidiad lleol ar gyfer y blygell yma a'i holl "
-"is-blygyll.</p>"
+"<p><b>Cywiro'r celc IMAP.</b></p><p>Os oes gennych broblemau efo cydamseru "
+"plygell IMAP, dylech geisio ail-adeiladu'r ffeil mynegai yn gyntaf.  Bydd "
+"hwn yn cymryd ychydig o amser i ail-adeiladu, ond ni fydd yn achosi "
+"problemau.</p><p>O nid yw hynny'n ddigonol, gallwch geisio ailfywio'r celc "
+"IMAP.  Os wnewch hyn, byddwch yn colli pob newidiad lleol ar gyfer y blygell "
+"yma a'i holl is-blygyll.</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7281,8 +7196,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:612
@@ -7304,8 +7219,8 @@ msgid ""
 "subfolders?\n"
 "This will remove all changes you have done locally to your folders."
 msgstr ""
-"Ydych yn sicr yr hoffech ailfywio celc IMAP plygell %1, a'i holl is-blygyll?n "
-"Bydd hyn yn gwaredu pob newid a wnaethoch yn lleol i'ch plygyll."
+"Ydych yn sicr yr hoffech ailfywio celc IMAP plygell %1, a'i holl is-blygyll?"
+"n Bydd hyn yn gwaredu pob newid a wnaethoch yn lleol i'ch plygyll."
 
 #: kmfoldercachedimap.cpp:743 kmmainwidget.cpp:1316
 msgid "Refresh IMAP Cache"
@@ -7322,8 +7237,8 @@ msgstr "Ailgreuwyd mynegai y blygell yma."
 #: kmfoldercachedimap.cpp:777
 #, fuzzy
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 "Nid yw plygell %1 mewn cyflwr cydamseru cychwynnol (%2 oedd y cyflwr). \n"
 "Ydych am ei ailosod i'r cyflwr cydamseru cychwynnol a cydamseru serch hynny?"
@@ -7459,10 +7374,8 @@ msgstr "Creu is-blygyll ar y gweinydd"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:1719
@@ -7484,9 +7397,8 @@ msgstr "Nôl rhestr plygyll"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2597
@@ -7495,14 +7407,14 @@ msgstr "Terfynwyd"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2951
@@ -7516,11 +7428,11 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:3123
@@ -7529,15 +7441,20 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "&Symud I"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr ""
 
@@ -7551,8 +7468,7 @@ msgstr "Symud Neges i Blygell"
 msgid "Permissions (ACL)"
 msgstr "Caniatadau"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Cyffredinol"
@@ -7577,8 +7493,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Defnyddio &eiconau addasiedig"
@@ -7598,14 +7513,13 @@ msgstr "Ymofyn Ebost yn y Blygell yma"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
 msgstr ""
 
 #: kmfolderdia.cpp:431
@@ -7620,9 +7534,9 @@ msgstr "&Darfod hen negeseuon yn y blygell yma"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 
 #: kmfolderdia.cpp:459
@@ -7634,17 +7548,21 @@ msgstr ""
 msgid "Sho&w column:"
 msgstr "Colofn Faint"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Gosod yn Ragosodyn"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Anfonwr"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Derbyniwr"
@@ -7656,11 +7574,11 @@ msgstr "Dynodiad yr &Anfonwr:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 
 #: kmfolderdia.cpp:500
@@ -7680,12 +7598,12 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 
 #: kmfolderdia.cpp:555
@@ -7718,17 +7636,17 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 
 #: kmfolderdir.cpp:209
@@ -7807,7 +7725,8 @@ msgstr "Gwall wrth lanlwytho'r plygell"
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "Mae'r mynegai ebost ar gyfer '%1' o fersiwn anhysbys KMail (%2).\n"
 "Gellir ailgreu'r mynegai o'ch plygell ebost, ond gall fod rhyw wybodaeth, yn "
@@ -7841,8 +7760,8 @@ msgstr ""
 #: kmfoldermaildir.cpp:92
 #, fuzzy
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 "Gwall wrth agor %1.  Unai nid plygell maildir ddilys yw hon, neu nid oes "
 "gennych ganiatadau cyrchiad digonol."
@@ -7889,21 +7808,18 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ymddengys bod mynegai plygell '%2' wedi dyddio.  Er mwyn osgoi llygru "
+"<qt><p>Ymddengys bod mynegai plygell '%2' wedi dyddio.  Er mwyn osgoi llygru "
 "negeseuon, ail-greuir y mynegai.  Fel canlyniad, gall negeseuon a ddileuwyd "
-"ail-ymddangos a gall baneri cyflwr gael eu colli.</p>"
-"<p>Darllenwch y cofnod cyfatebol yn yr <a href=\"%1\">"
-"adran FAQ (Cwestiynau a Ofynnir yn Aml) o'r llawlyfr KMail</a> "
-"ar gyfer gwybodaeth am sut i atal i'r broblem yma ddigwydd eto.</p></qt>"
+"ail-ymddangos a gall baneri cyflwr gael eu colli.</p><p>Darllenwch y cofnod "
+"cyfatebol yn yr <a href=\"%1\">adran FAQ (Cwestiynau a Ofynnir yn Aml) o'r "
+"llawlyfr KMail</a> ar gyfer gwybodaeth am sut i atal i'r broblem yma "
+"ddigwydd eto.</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -7962,7 +7878,7 @@ msgstr ""
 "Ymddengys nad yw '%1' yn blygell.\n"
 "Symudwch y ffeil allan o'r ffordd."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 #, fuzzy
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
@@ -7971,7 +7887,7 @@ msgstr ""
 "Mae caniatadau plygell '%1' yn anghywir.\n"
 "Sicrhewch y gallwch ddarllen ac addasu cynnwys y blygell yma."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 #, fuzzy
 msgid ""
 "KMail could not create folder '%1';\n"
@@ -7982,8 +7898,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -7991,7 +7907,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Methwyd creu plygell"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8095,9 +8011,9 @@ msgstr "&Cywiro Celc IMAP..."
 
 #: kmfoldertree.cpp:1280
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
@@ -8243,13 +8159,13 @@ msgstr ""
 #: kmheaders.cpp:1598
 #, fuzzy, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Ydych wir eisiau dileu'r negeseuon dewisiedig?"
-"<br>Wedi'u dileu, ni ellir eu adfer!</qt>"
+"<qt>Ydych wir eisiau dileu'r negeseuon dewisiedig?<br>Wedi'u dileu, ni ellir "
+"eu adfer!</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8307,127 +8223,126 @@ msgstr ""
 "Methiant wrth addasu %1\n"
 "(Dim lle ar ôl ar y ddyfais?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Cais Llofnod Tystysgrif"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 #, fuzzy
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Llofnodwch y dystysgrif yma a'i dychwelyd i'r anfonwr."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr ""
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr ""
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr ""
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Nid oes gennych ganiatád darllen/ysgrifennu i'ch plygell blwch derbyn."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "blwch anfon"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "Nid oes gennych ganiatád darllen/ysgrifennu i'ch plygell blwch anfon."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "ebostau anfonedig"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr ""
 "Nid oes gennych ganiatád darllen/ysgrifennu i'ch plygell blwch anfonedig."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "sbwriel"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Nid oes gennych ganiatád darllen/ysgrifennu i'ch plygell sbwriel."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "drafftiau"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Nid oes gennych ganiatád darllen/ysgrifennu i'ch plygell drafftiau."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 #, fuzzy
 msgid "templates"
 msgstr "&Amnewid"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 #, fuzzy
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Nid oes gennych ganiatád darllen/ysgrifennu i'ch plygell sbwriel."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Chwiliad Diwethaf"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr ""
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "Ddaeth KMail ar draws gwall angheuol, a bydd yn terfynu rwan."
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8437,11 +8352,11 @@ msgstr ""
 "Ddaeth KMail ar draws gwall angheuol, a bydd yn terfynu rwan.\n"
 "Y gwall oedd:n %1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Gwagu'r Sbwriel"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 #, fuzzy
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Ydych wir eisiau gwagu'r blygell sbwriel?"
@@ -8522,8 +8437,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr ""
 
 #: kmmainwidget.cpp:971
@@ -8561,8 +8475,8 @@ msgstr "Ydych wir eisiau gwagu'r blygell sbwriel?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
 "<qt>Ydych wir eisiau symud pob neges o blygell <b>%1</b> i'r sbwriel?</qt>"
 
@@ -8590,12 +8504,12 @@ msgstr "<derbynwyr>"
 #: kmmainwidget.cpp:1210
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>Ydych wir eisiau dileu'r blygell chwilio <b>%1</b>"
-"?  Ni ddileuir y negeseuon a ddangosir ynddi os gwnewch, oherwydd cedwir mewn "
-"plygell wahanol.</qt>"
+"<qt>Ydych wir eisiau dileu'r blygell chwilio <b>%1</b>?  Ni ddileuir y "
+"negeseuon a ddangosir ynddi os gwnewch, oherwydd cedwir mewn plygell wahanol."
+"</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8608,36 +8522,39 @@ msgstr "<qt>Ydych wir eisiau gwaredu'r blygell wag <b>%1</b>?</qt>"
 #: kmmainwidget.cpp:1222
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Ydych wir eisiau gwaredu'r blygell wag <b>%1</b> "
-"a;i holl is-blygyll?  Mae'n bosibl nad ydy'r is-blygyll yna yn wag, a bydd eu "
-"cynnwys yn cael eu gwaredu hefyd.</qt>"
+"<qt>Ydych wir eisiau gwaredu'r blygell wag <b>%1</b> a;i holl is-blygyll?  "
+"Mae'n bosibl nad ydy'r is-blygyll yna yn wag, a bydd eu cynnwys yn cael eu "
+"gwaredu hefyd.</qt>"
 
 #: kmmainwidget.cpp:1231
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
 "<qt>Ydych wir eisiau dileu'r blygell <b>%1</b>, gan daflu ei chynnwys?</qt>"
 
 #: kmmainwidget.cpp:1238
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt>Ydych wir eisiau dileu'r blygell <b>%1</b> a'i holl is-blygyll, gan daflu "
-"ei chynnwys?</qt>"
+"<qt>Ydych wir eisiau dileu'r blygell <b>%1</b> a'i holl is-blygyll, gan "
+"daflu ei chynnwys?</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Wedi'u dileu"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8653,13 +8570,13 @@ msgstr "Ydych wir eisiau darfod pob hen neges?"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
-"Bydd defnyddio HTML yn ebost yn eich gwneud yn fwy archolladwy gan \"ebostach\" "
-"a gall cynyddu'r debygrwydd y peryglir eich cysawd gan ymelwadau cyfredol a "
-"disgwyliedig eraill."
+"Bydd defnyddio HTML yn ebost yn eich gwneud yn fwy archolladwy gan \"ebostach"
+"\" a gall cynyddu'r debygrwydd y peryglir eich cysawd gan ymelwadau cyfredol "
+"a disgwyliedig eraill."
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
@@ -8673,12 +8590,12 @@ msgstr ""
 #, fuzzy
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
-"Bydd defnyddio HTML yn ebost yn eich gwneud yn fwy archolladwy gan \"ebostach\" "
-"a gall cynyddu'r debygrwydd y peryglir eich cysawd gan ymelwadau cyfredol a "
-"disgwyliedig eraill."
+"Bydd defnyddio HTML yn ebost yn eich gwneud yn fwy archolladwy gan \"ebostach"
+"\" a gall cynyddu'r debygrwydd y peryglir eich cysawd gan ymelwadau cyfredol "
+"a disgwyliedig eraill."
 
 #: kmmainwidget.cpp:1381
 msgid "Load External References"
@@ -8694,12 +8611,12 @@ msgstr "Hidlo ar Restr Ebost %1 ..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
-"Mae swyddogaeth Ateb pan Allan o'r Swyddfa KMail yn dibynnu ar hidlo ar ochr y "
-"gweinydd.  Nid ydych wedi ffurfweddu gweinydd IMAP eto ar gyfer hyn.\n"
+"Mae swyddogaeth Ateb pan Allan o'r Swyddfa KMail yn dibynnu ar hidlo ar ochr "
+"y gweinydd.  Nid ydych wedi ffurfweddu gweinydd IMAP eto ar gyfer hyn.\n"
 "Gallwch wneud hyn ar dab \"Hidlo\" y ffurfweddiad cyfrif IMAP."
 
 #: kmmainwidget.cpp:1743
@@ -8716,7 +8633,8 @@ msgstr "Methu cychwyn rheolydd tystysgrif.  Gwiriwch eich gosodiad!"
 #: kmmainwidget.cpp:1787
 #, fuzzy
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr "Methu cychwyn rheolydd tystysgrif.  Gwiriwch eich gosodiad!"
 
 #: kmmainwidget.cpp:2508
@@ -9062,8 +8980,7 @@ msgstr "Cadw A&todiadau..."
 msgid "Appl&y All Filters"
 msgstr "Gweithred&u Hidlau"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, fuzzy, no-c-format
 msgid "A&pply Filter"
 msgstr "Gweithred&u Hidlau"
@@ -9177,7 +9094,6 @@ msgstr "Neges Nesaf &Heb ei Darllen"
 msgid "Go to the next unread message"
 msgstr "Mynd i'r neges nesaf heb ei darllen"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "Neges &Blaenorol"
@@ -9321,72 +9237,72 @@ msgstr "Ymgychwyn..."
 #: kmmessage.cpp:1336
 #, fuzzy
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Mae'r neges hon yn cynnwys cais i anfon hysbysiad lleoliad.\n"
-"Gallwch un ai anwybyddu'r cais, neu adael i KMail anfon ymateb \"gwrthodwyd\" "
-"neu arferol."
+"Gallwch un ai anwybyddu'r cais, neu adael i KMail anfon ymateb \"gwrthodwyd"
+"\" neu arferol."
 
 #: kmmessage.cpp:1341
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "Mae'r neges hon yn cynnwys cais i anfon hysbysiad lleoliad.\n"
-"Mae'n cynnwys cyfarwyddiad prosesu a nodwyd fel \"gofynnol\", ond sy'n anhysbys "
-"i KMail.\n"
+"Mae'n cynnwys cyfarwyddiad prosesu a nodwyd fel \"gofynnol\", ond sy'n "
+"anhysbys i KMail.\n"
 "Gallwch un ai anwybyddu'r cais, neu adael i KMail anfon ymateb \"methiant\"."
 
 #: kmmessage.cpp:1348
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Mae'r neges hon yn cynnwys cais i anfon hysbysiad lleoliad,\n"
 "ond ceisir anfon yr hysbysiad i fwy nag un cyfeiriad.\n"
-"Gallwch un ai anwybyddu'r cais, neu adael i KMail anfon ymateb \"gwrthodwyd\" "
-"neu arferol."
+"Gallwch un ai anwybyddu'r cais, neu adael i KMail anfon ymateb \"gwrthodwyd"
+"\" neu arferol."
 
 #: kmmessage.cpp:1355
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Mae'r neges hon yn cynnwys cais i anfon hysbysiad lleoliad,\n"
 "ond ni osodir llwybr dychwelyd.\n"
-"Gallwch un ai anwybyddu'r cais, neu adael i KMail anfon ymateb \"gwrthodwyd\" "
-"neu arferol."
+"Gallwch un ai anwybyddu'r cais, neu adael i KMail anfon ymateb \"gwrthodwyd"
+"\" neu arferol."
 
 #: kmmessage.cpp:1361
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Mae'r neges hon yn cynnwys cais i anfon hysbysiad lleoliad,\n"
-"ond mae'r cyfeiriad llwybr-dywchelyd yn wahanol i'r cyfeiriad y ceisir anfon yr "
-"hysbysiad iddo.\n"
-"Gallwch un ai anwybyddu'r cais, neu adael i KMail anfon ymateb \"gwrthodwyd\" "
-"neu arferol."
+"ond mae'r cyfeiriad llwybr-dywchelyd yn wahanol i'r cyfeiriad y ceisir anfon "
+"yr hysbysiad iddo.\n"
+"Gallwch un ai anwybyddu'r cais, neu adael i KMail anfon ymateb \"gwrthodwyd"
+"\" neu arferol."
 
 #: kmmessage.cpp:1379 kmmessage.cpp:1386
 msgid "Message Disposition Notification Request"
@@ -9405,24 +9321,24 @@ msgid ""
 "Header \"Disposition-Notification-Options\" contained required, but unknown "
 "parameter"
 msgstr ""
-"Ni wnaeth y penawd \"Dewisiadau-Hysbysiad-Lleoliad\" gynnwys paramedr gofynnol, "
-"ond anhysbys"
+"Ni wnaeth y penawd \"Dewisiadau-Hysbysiad-Lleoliad\" gynnwys paramedr "
+"gofynnol, ond anhysbys"
 
 #: kmmessage.cpp:1650
 msgid "Receipt: "
 msgstr "Derbynneb:"
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Atodiad: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "Dangos atodiadau fel yr awgrymir gan yr anfonwr."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 #, fuzzy
 msgid "The attachment '%1' has been deleted."
 msgstr "Diddymwyd y digwyddiad %1"
@@ -9474,47 +9390,41 @@ msgstr "Priodweddau Darnau'r Neges"
 #: kmmsgpartdlg.cpp:88
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p><em>Math MIME</em> y ffeil.</p>"
-"<p>Fel arfer, nid oes angen i chi cyffwrdd â'r gosodiad yma, gan wirir math y "
-"ffeil yn ymysgogol.  Ond weithiau, efallai ni fydd %1 yn darganfod y math yn "
-"gywir.  Dyma lle y gallwch drwsio hynny.</p></qt>"
+"<qt><p><em>Math MIME</em> y ffeil.</p><p>Fel arfer, nid oes angen i chi "
+"cyffwrdd â'r gosodiad yma, gan wirir math y ffeil yn ymysgogol.  Ond "
+"weithiau, efallai ni fydd %1 yn darganfod y math yn gywir.  Dyma lle y "
+"gallwch drwsio hynny.</p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Maint y rhan.</p>"
-"<p>Weithiau, bydd %1 yn rhoi maint amcangyfrifol yn unig yma, oherwydd buasai "
-"cyfrifo y maint cywir yn cymryd gormod o amser.  Os felly, gwneir hyn yn "
-"weledol gan ychwanegu  \"(est.)\" i'r maint a ddangosir.</p></qt>"
+"<qt><p>Maint y rhan.</p><p>Weithiau, bydd %1 yn rhoi maint amcangyfrifol yn "
+"unig yma, oherwydd buasai cyfrifo y maint cywir yn cymryd gormod o amser.  "
+"Os felly, gwneir hyn yn weledol gan ychwanegu  \"(est.)\" i'r maint a "
+"ddangosir.</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Enw ffeil y rhan.</p>"
-"<p>Er bod y rhagosod yma yw'r ffeil atodedig, nid yw'n penodi'r ffeil i'w "
-"atodi.  Yn lle, mae'n awgrymu enw ffeil i'w ddefnyddio gan ddibynnydd ebost y "
-"derbyniwr wrth gadw'r rhan i'r ddisg.</p></qt>"
+"<qt><p>Enw ffeil y rhan.</p><p>Er bod y rhagosod yma yw'r ffeil atodedig, "
+"nid yw'n penodi'r ffeil i'w atodi.  Yn lle, mae'n awgrymu enw ffeil i'w "
+"ddefnyddio gan ddibynnydd ebost y derbyniwr wrth gadw'r rhan i'r ddisg.</p></"
+"qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9523,17 +9433,15 @@ msgstr "&Disgrifiad:"
 #: kmmsgpartdlg.cpp:128
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Disgrifiad y rhan.</p>"
-"<p>Disgrifiad gwybodaethol y rhan yw hwn, yn debyg iawn i Bwnc amr gyfer yr "
-"holl neges.  Bydd y mwyafrif o ddibynnyddion ebost yn dangos y wybodaeth yma yn "
-"eu rhagolygon neges, wrth ymyl eicon yr atodiad.</p></qt>"
+"<qt><p>Disgrifiad y rhan.</p><p>Disgrifiad gwybodaethol y rhan yw hwn, yn "
+"debyg iawn i Bwnc amr gyfer yr holl neges.  Bydd y mwyafrif o ddibynnyddion "
+"ebost yn dangos y wybodaeth yma yn eu rhagolygon neges, wrth ymyl eicon yr "
+"atodiad.</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9542,23 +9450,21 @@ msgstr "&Amgodiad:"
 #: kmmsgpartdlg.cpp:143
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Amgodiad cludiant y rhan yma.</p>"
-"<p>Fel arfer, nid oes angen newid hyn, oherwydd bydd %1 yn defnyddio amgodiad "
-"rhagosod synhwyrol, yn dibynnu ar y math MIME.  Ond weithiau gallwch leihau "
-"maint y neges ganlynol yn arwyddocaol, e.e. os nid yw ffeil PostScript yn "
-"cynnwys data deuol, ond testun pur yn unig.  Os felly, bydd dewis "
-"\"argraffadwy-dyfynedig\" yn lle'r \"bas64\" rhagosod yn cynilo i fyny at 25% "
-"ym maint canlynol y neges.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Amgodiad cludiant y rhan yma.</p><p>Fel arfer, nid oes angen newid "
+"hyn, oherwydd bydd %1 yn defnyddio amgodiad rhagosod synhwyrol, yn dibynnu "
+"ar y math MIME.  Ond weithiau gallwch leihau maint y neges ganlynol yn "
+"arwyddocaol, e.e. os nid yw ffeil PostScript yn cynnwys data deuol, ond "
+"testun pur yn unig.  Os felly, bydd dewis \"argraffadwy-dyfynedig\" yn lle'r "
+"\"bas64\" rhagosod yn cynilo i fyny at 25% ym maint canlynol y neges.</p></"
+"qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9567,20 +9473,17 @@ msgstr "Awgrymu dangosydd &ymysgogol"
 #: kmmsgpartdlg.cpp:159
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Brithwch y dewisiad yma os hoffech awgrymu i'r derbyniwr y dylir dangos y "
-"rhan yma yn ymysgogol (mewnlin) yn y rhagolwg neges, yn lle'r golwg eicon "
-"rhagosod.</p>"
-"<p>Yn dechnegol, gwneir hyn gan osod maes penawd <em>Lleoliad-Cynnwys</em> "
-"i \"fewnlin\" yn lle'r  \"atodiad\" rhagosod.</p></qt>"
+"<qt><p>Brithwch y dewisiad yma os hoffech awgrymu i'r derbyniwr y dylir "
+"dangos y rhan yma yn ymysgogol (mewnlin) yn y rhagolwg neges, yn lle'r golwg "
+"eicon rhagosod.</p><p>Yn dechnegol, gwneir hyn gan osod maes penawd "
+"<em>Lleoliad-Cynnwys</em> i \"fewnlin\" yn lle'r  \"atodiad\" rhagosod.</p></"
+"qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9589,15 +9492,13 @@ msgstr "&Llofnodi'r rhan yma"
 #: kmmsgpartdlg.cpp:171
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Britwch y dewisiad yma os hoffech i'r rhan neges yma gael ei llofnodi.</p>"
-"<p>Gwneir y llofnod efo'r allwedd yr ydych wedi cysylltu efo'r dynodiad a "
-"ddewisir ar hyn o bryd.</p></qt>"
+"<qt><p>Britwch y dewisiad yma os hoffech i'r rhan neges yma gael ei llofnodi."
+"</p><p>Gwneir y llofnod efo'r allwedd yr ydych wedi cysylltu efo'r dynodiad "
+"a ddewisir ar hyn o bryd.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9606,14 +9507,11 @@ msgstr "Cêl-y&sgrifo'r rhan yma"
 #: kmmsgpartdlg.cpp:181
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Brithwch y dewisiad yma os hoffech i'r rhan neges yma i gael ei "
-"chêl-ysgrifo.</p>"
-"<p>Cêl-ysgrifir y rhan ar gyfer derbynwyr y neges.</p></qt>"
+"<qt><p>Brithwch y dewisiad yma os hoffech i'r rhan neges yma i gael ei chêl-"
+"ysgrifo.</p><p>Cêl-ysgrifir y rhan ar gyfer derbynwyr y neges.</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9628,16 +9526,13 @@ msgstr "Hidlenni POP"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"Negeseuon i'w hidlo a ganfuwyd ar y Cyfrif POP: <b>%1</b>"
-"<p>Mae'r negeseuon a ddangosir yma yn fwy na'r terfyn maint uchaf a ddiffinwyd "
-"ar gyfer y cyfrif yma."
-"<br>Gallwch ddewis beth i wneud efo nhw gan fritho'r botwm addas."
+"Negeseuon i'w hidlo a ganfuwyd ar y Cyfrif POP: <b>%1</b><p>Mae'r negeseuon "
+"a ddangosir yma yn fwy na'r terfyn maint uchaf a ddiffinwyd ar gyfer y "
+"cyfrif yma.<br>Gallwch ddewis beth i wneud efo nhw gan fritho'r botwm addas."
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -9894,15 +9789,14 @@ msgstr ""
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1335
@@ -9912,18 +9806,17 @@ msgid ""
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -9931,15 +9824,13 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2>Croeso i KMail %1</h2>"
-"<p>Y dibynnydd ebost ar gyfer yr Amgylchedd Penbwrdd K yw KMail.  Dylunir i fod "
-"yn hollol gyfaddas â safonau ebostio y Rhyngrwyd, yn cynnwys MIME, SMTP, POP3 "
-"ac IMAP.</p>\n"
-"<ul>"
-"<li>Mae gan KMail lawer o nodweddion grymus a ddisgrifir yn y <a href=\"%2\">"
-"ddogfennaeth</a></li>\n"
-"<li>Mae'r <a href=\"%3\">dudalen gartref KMail</a> yn cynnig gwybodaeth ynglyn "
-"â fersiynau newydd o KMail</li></ul>\n"
+"<h2>Croeso i KMail %1</h2><p>Y dibynnydd ebost ar gyfer yr Amgylchedd "
+"Penbwrdd K yw KMail.  Dylunir i fod yn hollol gyfaddas â safonau ebostio y "
+"Rhyngrwyd, yn cynnwys MIME, SMTP, POP3 ac IMAP.</p>\n"
+"<ul><li>Mae gan KMail lawer o nodweddion grymus a ddisgrifir yn y <a href="
+"\"%2\">ddogfennaeth</a></li>\n"
+"<li>Mae'r <a href=\"%3\">dudalen gartref KMail</a> yn cynnig gwybodaeth "
+"ynglyn â fersiynau newydd o KMail</li></ul>\n"
 "<p><span style='font-size:125%; font-weight:bold;'>Newidiadau pwysig</span> "
 "(i gymharu â KMail %8):</p>\n"
 "<ul>\n"
@@ -9954,22 +9845,20 @@ msgstr ""
 "<p>&nbsp; &nbsp; Y Tîm KMail</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
-"<p>Arhoswch am eiliad i lenwi'r panel ffurfweddiad KMail wrth "
-"Gosodiadau-&gt;Ffurfweddu KMail.\n"
-"Mae angen i chi greu o leiaf dynodiad rhagosod, cyfrif ebost derbyn, a chyfrif "
-"ebost anfon.</p>\n"
+"<p>Arhoswch am eiliad i lenwi'r panel ffurfweddiad KMail wrth Gosodiadau-&gt;"
+"Ffurfweddu KMail.\n"
+"Mae angen i chi greu o leiaf dynodiad rhagosod, cyfrif ebost derbyn, a "
+"chyfrif ebost anfon.</p>\n"
 
 #: kmreaderwin.cpp:1375
 msgid ""
@@ -10007,7 +9896,8 @@ msgstr "Gweld Atodiad: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[KMail: Mae'r atodiad yn cynnwys data deuol.  Ceisio dangos y nod cyntaf.]\n"
@@ -10037,12 +9927,14 @@ msgstr "Agor Atodiad?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -10066,6 +9958,59 @@ msgstr "Cyd&weddu ag unrhyw un o'r dilynnol"
 msgid "(match all of the following)"
 msgstr "Cy&dweddu â pob un o'r dilynnol"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Darllen"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Hen"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Wedi'u dileu"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Wedi'u ateb"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Wedi'u blaenyrru"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "Mewn Ciw"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Anfonwyd"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Wedi'u gwylio"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Anwybyddwyd"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Ebostach"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Ebost iawn"
+
+#: kmsearchpattern.h:232
+#, fuzzy
+msgid "To Do"
+msgstr "I:"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Efo Atodiad"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -10150,21 +10095,21 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
-"Methodd symud y neges a anfonwyd \"%1\" o'r \"blwch anfon\" i'r blygell \"ebost "
-"a anfonwyd\".\n"
+"Methodd symud y neges a anfonwyd \"%1\" o'r \"blwch anfon\" i'r blygell "
+"\"ebost a anfonwyd\".\n"
 "Rhesymau posibl: diffyg lle ar y ddisg, neu ganiatad ysgrifennu.  Ceisiwch "
 "trwsio'r broblem a symud y neges â llaw."
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 
 #: kmsender.cpp:454
@@ -10191,8 +10136,8 @@ msgstr "Ymgychwyn y broses anfon..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 
 #: kmsender.cpp:505
@@ -10217,8 +10162,9 @@ msgstr "Methodd anfon (rhai) negeseuon yn y rhes."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -10235,20 +10181,16 @@ msgstr "Erthylwyd anfon/"
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>Methwyd anfon:</p>"
-"<p>%1</p>"
-"<p>Bydd y neges yn aros yn y blygell 'blwch anfon' tan i chi drwsio'r broblem "
-"(e.e. cyferiad wedi'i dorri) neu symud y neges o'r blygell 'blwch anfon'.</p>"
-"<p>Defnyddwyd y protocol cludiant dilynnol: %2</p>"
-"<p>Ydych eisiau i mi ddal i anfon gweddill y negeseuon?</p> "
+"<p>Methwyd anfon:</p><p>%1</p><p>Bydd y neges yn aros yn y blygell 'blwch "
+"anfon' tan i chi drwsio'r broblem (e.e. cyferiad wedi'i dorri) neu symud y "
+"neges o'r blygell 'blwch anfon'.</p><p>Defnyddwyd y protocol cludiant "
+"dilynnol: %2</p><p>Ydych eisiau i mi ddal i anfon gweddill y negeseuon?</p> "
 
 #: kmsender.cpp:730
 #, fuzzy
@@ -10269,8 +10211,9 @@ msgstr "&Erthylu anfon"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
@@ -10314,34 +10257,35 @@ msgstr "Terfynodd Sendmail yn anarferol."
 #, fuzzy
 msgid "You need to supply a username and a password to use this SMTP server."
 msgstr ""
-"Rhaid i chi ddarparu defnydd-enw a chyfrinair i ddefnyddio'r gweinydd SMTP yma."
+"Rhaid i chi ddarparu defnydd-enw a chyfrinair i ddefnyddio'r gweinydd SMTP "
+"yma."
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 
 #: kmstartup.cpp:232
@@ -10353,6 +10297,10 @@ msgstr "Dechrau %1"
 msgid "Exit"
 msgstr "Terfynu"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 #, fuzzy
 msgid "New Messages In"
@@ -10382,8 +10330,9 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 "Brithwch y dewisiad yma i wneud i KMail gadw'r cyfrinair SMTP yn ei ffeil "
@@ -10460,8 +10409,9 @@ msgid ""
 "A command to run locally, prior to sending email. This can be used to set up "
 "ssh tunnels, for example. Leave it empty if no command should be run."
 msgstr ""
-"Gorchymyn i'w redeg yn lleol, cyn anfon ebost.  Gellir defnyddio hwn i sefydlu "
-"twnelau ssh, er enghraifft.  Gadewch yn wag os ni ddylir rhedeg gorchymyn."
+"Gorchymyn i'w redeg yn lleol, cyn anfon ebost.  Gellir defnyddio hwn i "
+"sefydlu twnelau ssh, er enghraifft.  Gadewch yn wag os ni ddylir rhedeg "
+"gorchymyn."
 
 #: kmtransport.cpp:427
 msgid "Server &requires authentication"
@@ -10469,8 +10419,8 @@ msgstr "Mae angen &dilysiant ar y gweinydd."
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 "Brithwch y dewisiad yma os mae angen ar eich gweinydd dilysiant cyn derbyn "
 "ebost.  Gelwir hyn yn 'SMTP wedi'i Ddilysu' (ASMTP, Authenticated SMTP)."
@@ -10496,15 +10446,14 @@ msgstr "A&nfon enw gwesteiwr addasiedig i'r gweinydd"
 #: kmtransport.cpp:478
 #, fuzzy
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 "Brithwch y dewisiad yma i wneud i KMail ddefnyddio enw gwesteiwr addasiedig "
-"wrth ddynodi ei hun i'r gweinydd ebost."
-"<p>Mae hyn yn ddefnyddiol pan nid yw enw gwesteiwr eich cysawd wedi'i osod yn "
-"gywir, neu i guddio enw gwesteiwr go iawn eich cysawd."
+"wrth ddynodi ei hun i'r gweinydd ebost.<p>Mae hyn yn ddefnyddiol pan nid yw "
+"enw gwesteiwr eich cysawd wedi'i osod yn gywir, neu i guddio enw gwesteiwr "
+"go iawn eich cysawd."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10537,8 +10486,8 @@ msgstr "Caniateir ffeiliau lleol yn unig."
 #: kmtransport.cpp:786
 #, fuzzy
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr "Enw parth neu gyfeiriad rhifiadol y gweinydd SMTP."
 
 #: kmtransport.cpp:788
@@ -10553,10 +10502,10 @@ msgstr "Gwall wrth lanlwytho'r plygell"
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -10791,35 +10740,27 @@ msgstr "G&olygu Neges"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ni ellid prosesu gwybodaeth adeiledd a ddychwelwyd gan y ategyn Celu; "
-"efallai mae'r ategyn wedi cael niwed.</p>"
-"<p>Cyswlltwch â gweinyddwr eich cysawd.</p></qt>"
+"<qt><p>Ni ellid prosesu gwybodaeth adeiledd a ddychwelwyd gan y ategyn Celu; "
+"efallai mae'r ategyn wedi cael niwed.</p><p>Cyswlltwch â gweinyddwr eich "
+"cysawd.</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
-msgstr ""
-"<p>Ni chanfuwyd Ategyn Celu gweithredol, a ni redodd y côd mewnadeiladedig yn "
-"llwyddiannus.</p>"
-"<p>Gallwch wneud dau beth i newid hyn:</p>"
-"<ul>"
-"<li><em>unai</em> gweithredu Ategyn gan ddefnyddio yr ymgom Gosodiadau->"
-"Ffurfweddu KMail->Ategyn.</li>"
-"<li><em>neu</em> benodi gosodiadau OpenPGP traddodiadol ar dab Dynodiad->"
-"Uwch yr un un ymgom.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
+msgstr ""
+"<p>Ni chanfuwyd Ategyn Celu gweithredol, a ni redodd y côd mewnadeiladedig "
+"yn llwyddiannus.</p><p>Gallwch wneud dau beth i newid hyn:</"
+"p><ul><li><em>unai</em> gweithredu Ategyn gan ddefnyddio yr ymgom Gosodiadau-"
+">Ffurfweddu KMail->Ategyn.</li><li><em>neu</em> benodi gosodiadau OpenPGP "
+"traddodiadol ar dab Dynodiad->Uwch yr un un ymgom.</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -10831,8 +10772,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 
 #: messagecomposer.cpp:565
@@ -10847,14 +10788,14 @@ msgstr ""
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 
@@ -10953,8 +10894,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 
@@ -10981,9 +10922,8 @@ msgid ""
 "There are conflicting encryption preferences for these recipients.\n"
 "Encrypt this message?"
 msgstr ""
-"<qt>"
-"<p>Gwrthdaro yn yr hoffterau cêl-ysgrifo!</p>"
-"<p>Dylai'r neges yma gael ei chêl-ysgrifo?</p></qt>"
+"<qt><p>Gwrthdaro yn yr hoffterau cêl-ysgrifo!</p><p>Dylai'r neges yma gael "
+"ei chêl-ysgrifo?</p></qt>"
 
 #: messagecomposer.cpp:909
 #, fuzzy
@@ -10992,8 +10932,9 @@ msgstr "Peidio â Chêl-ysg&rifo"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
 
 #: messagecomposer.cpp:930
@@ -11003,8 +10944,8 @@ msgstr "Anfon heb ei Gêl-ysgrifo?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 
@@ -11025,80 +10966,75 @@ msgstr "Cêl-ys&grifo Pob Darn"
 msgid "Unencrypted Message Warning"
 msgstr "Neges wedi'i chêl-ysgrifo"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Gwall: Ni dychwelodd yr Ategyn Celu '%1' ddata wedi'i amgodio.</p> "
-"<p>Rhowch adroddiad ynglyn â'r nam yma:"
-"<br>%2</p></qt>"
+"<qt><p>Gwall: Ni dychwelodd yr Ategyn Celu '%1' ddata wedi'i amgodio.</p> "
+"<p>Rhowch adroddiad ynglyn â'r nam yma:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>Ni ffitia pob nod i mewn i'r amgodiad a ddewiswyd."
-"<br>"
-"<br>Anfon y neges beth bynnag?</qt>"
+"<qt>Ni ffitia pob nod i mewn i'r amgodiad a ddewiswyd.<br><br>Anfon y neges "
+"beth bynnag?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Bydd rhai nodau yn cael eu colli"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 #, fuzzy
 msgid "Lose Characters"
 msgstr "&Ychwanegu Nodau Dyfynnu"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 #, fuzzy
 msgid "Change Encoding"
 msgstr "Goso&d Amgodiad"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 
 #: newfolderdialog.cpp:59
@@ -11120,10 +11056,10 @@ msgstr "&Fformat Blwch Ebost"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:124
@@ -11134,8 +11070,8 @@ msgstr "Eiconau Plygell"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:165
@@ -11180,8 +11116,7 @@ msgstr "Canlyniadau gwahanol ar gyfer y llofnodion"
 msgid "The crypto engine returned no cleartext data."
 msgstr "Ni ddychwelodd y peiriant celu ddata testun clir!"
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Cyflwr:"
 
@@ -11211,8 +11146,8 @@ msgstr "Ni chanfuwyd rhaglennig %1."
 #: objecttreeparser.cpp:704
 #, fuzzy, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
 "Llofnodir y neges, ond ni ellir gwirio dilysrwydd y llofnod.<br />Rheswm: %1"
 
@@ -11253,27 +11188,27 @@ msgstr "Ni all y rhaglennig celu \"%1\" ddatgelu negeseuon."
 #: objecttreeparser.cpp:1000
 #, fuzzy
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
-"<b>Noder:</b> Neges HTML yw hon.  Ar gyfer rhesymau diogelwch, dangosir y côd "
-"crai un unig. Os ymddiriedir anfonwr y neges yma, gallwch weithredu "
-"ymddangosiad HTML wedi'i fformatio ar gyfer y neges hon <a "
-"href=\"kmail:showHTML\">gan glicio yma</a>."
+"<b>Noder:</b> Neges HTML yw hon.  Ar gyfer rhesymau diogelwch, dangosir y "
+"côd crai un unig. Os ymddiriedir anfonwr y neges yma, gallwch weithredu "
+"ymddangosiad HTML wedi'i fformatio ar gyfer y neges hon <a href=\"kmail:"
+"showHTML\">gan glicio yma</a>."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
-"<b>Noder:</b> Neges HTML yw hon.  Ar gyfer rhesymau diogelwch, dangosir y côd "
-"crai un unig. Os ymddiriedir anfonwr y neges yma, gallwch weithredu "
-"ymddangosiad HTML wedi'i fformatio ar gyfer y neges hon <a "
-"href=\"kmail:showHTML\">gan glicio yma</a>."
+"<b>Noder:</b> Neges HTML yw hon.  Ar gyfer rhesymau diogelwch, dangosir y "
+"côd crai un unig. Os ymddiriedir anfonwr y neges yma, gallwch weithredu "
+"ymddangosiad HTML wedi'i fformatio ar gyfer y neges hon <a href=\"kmail:"
+"showHTML\">gan glicio yma</a>."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11523,8 +11458,8 @@ msgstr "cedwyd:"
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 "Ni chedwir cyfeiriad ebost yn y %1 a ddefnyddir ar gyfer llofnodi, felly ni "
 "ellir ei gymharu â chyfeiriad yr anfonwr %2."
@@ -11646,14 +11581,15 @@ msgstr "Neges Wall Kioslave"
 #: popaccount.cpp:495
 #, fuzzy
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
-"Ni chynhela eich gweinydd POP3 y gorchymyn UIDL.  Mae angen y gorchymyn yma i "
-"benodi, mewn ffordd dibynnadwy, pa ebostau ar y gweinydd sydd wedi eu gweld o'r "
-"blaen gan KMail. \n"
+"Ni chynhela eich gweinydd POP3 y gorchymyn UIDL.  Mae angen y gorchymyn yma "
+"i benodi, mewn ffordd dibynnadwy, pa ebostau ar y gweinydd sydd wedi eu "
+"gweld o'r blaen gan KMail. \n"
 "Ni weithia'r nodwedd i adael ebostau ar y gweinydd yn iawn felly."
 
 #: popaccount.cpp:752
@@ -11671,7 +11607,8 @@ msgstr ""
 #: popaccount.cpp:905
 #, fuzzy
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 "Nôl neges %1 o %2 (%3 o %4 KB) oddiwrth %5 (mae %6 KB yn aros ar y gweinydd)."
 
@@ -11691,1729 +11628,14 @@ msgstr "Ymateb Annilys o'r Gweinydd"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 "Ni chynhelir y gorchymyn TOP gan eich gweinydd.  Felly ni ellir nôl penawdau "
 "ebostau mawr, cyn eu lawrlwytho."
 
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Mynd"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "P&lygell"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Neges"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr ""
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "B&laenyrru"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, fuzzy, no-c-format
-msgid "Signing"
-msgstr "Llofnodi"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, fuzzy, no-c-format
-msgid "&Automatically sign messages"
-msgstr "L&lofnodi negeseuon yn ymysgogol gan ddefnyddio OpenPGP"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, fuzzy, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"<qt>"
-"<p>Pan alluogir y dewisiad yma, llofnodir gan ragosod pob neges yr anfonwch.  "
-"Wrth gwrs, mae o hyd yn bosibl analluogi llofnodi ar gyfer pob neges yn "
-"unigol.</p></qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, fuzzy, no-c-format
-msgid "Encrypting"
-msgstr "Cêl-ysgrifaeth"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Dangos testun llofnodedig/cêl-ysgrifedig wedi cyfansoddi"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, fuzzy, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Cadw negeseuon an&foniedig wedi'u cêl-ysgrifo"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Brithwch i gadw negeseuon wedi'u cêl-ysgrifo"
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Cadw Negeseuon yn Gêl-ysgrifedig</h1>\n"
-"Pan frithwch y blwch yma, cedwir negeseuon a anfonwyd fel y's anfonwyd, sef, yn "
-"gêl-ysgrifedig.  Ni argymhellir hyn oherwydd ni fyddwch yn gallu darllen y "
-"negeseuon mwyach os darfodir tystysgrif ofynnol.\n"
-"<p>\n"
-"Serch hynny, gall fod rheolau lleol sy'n eich gorfod troi'r dewisiad yma "
-"arnodd.  Mewn amheuaeth, gwiriwch efo'ch gweinyddwr lleol.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Dangos yr allweddau &cêl-ysgrifo ar gyfer cymeradwydo o hyd"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, fuzzy, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Cêl-ysgrifennu negeseuon yn ymysgogol lle &bo'n bosibl."
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, fuzzy, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"<qt>"
-"<p>Pan alluogir y dewisiad yma, celir pob neges yr anfonwch pan mae "
-"cêl-ysgrifaeth yn bosibl a dymunol.  Wrth gwrs, mae o hyd yn bosibl analluogi'r "
-"cêl-ysgrifaeth ymysgogol ar gyfer pob neges yn unigol.</p></qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, no-c-format
-msgid "To:"
-msgstr "I:"
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "CC:"
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, fuzzy, no-c-format
-msgid "Universal"
-msgstr "Cyffredinol"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, fuzzy, no-c-format
-msgid "Reply"
-msgstr "&Ateb I"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, fuzzy, no-c-format
-msgid "Reply to All"
-msgstr "Ateb i &Bawb..."
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, fuzzy, no-c-format
-msgid "Forward"
-msgstr "B&laenyrru"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, fuzzy, no-c-format
-msgid "Shortc&ut:"
-msgstr "Byrlwybr:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, fuzzy, no-c-format
-msgid "&Template type:"
-msgstr "&Amnewid"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Priodweddau Plygell"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "Mae'r &blygell yn cynnwys rhestr ebost"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "C&yfeiriad y rhestr:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "Ar&ferol:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "&Heb eu darllen:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Neges yn Darfod"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "Dar&fod ar ôl:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "&Darfod negeseuon darlleniedig"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Darfod ar ô&l:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "Darfod negeseuon &heb eu darllen"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "Diwrnod(au)"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "Wythnos(au)"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "Mis(oedd)"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Uwch"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, fuzzy, no-c-format
-msgid "Sender identit&y:"
-msgstr "Dynodiad yr &Anfonwr:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, fuzzy, no-c-format
-msgid "&Storage format:"
-msgstr "Fformat &Cadw:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, fuzzy, no-c-format
-msgid "&List displays:"
-msgstr "&Ymddangosiad y Rhestri:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, fuzzy, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Creu Tystysgrif"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, fuzzy, no-c-format
-msgid "OCSP responder signature:"
-msgstr "Llofnod dilys"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, fuzzy, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Anfon &eich tystysgrif eich hun"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, fuzzy, no-c-format
-msgid "Do not check certificate policies"
-msgstr "&Peidio ac anfon tystysgrifau"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, fuzzy, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Wrth ychwanegu tystysgrifau"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, fuzzy, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "Anfon &eich tystysgrif eich hun"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, fuzzy, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "Anfon &eich tystysgrif eich hun"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "&Ychwanegu..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "&Cylchwedd"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "Dynodiadau &sy'n bodoli:"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "Diderfyn"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, fuzzy, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "Ffurfweddu Llofnod"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, fuzzy, no-c-format
-msgid "Reply to Sender"
-msgstr "Ate&b i'r anfonwr:"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, fuzzy, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Ateb i &Bawb..."
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, fuzzy, no-c-format
-msgid "Forward Message"
-msgstr "Neges a Flaenyrrwyd"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "Rhybuddio wrth geisio anfon negeseuon &heb eu llofnodi"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr "Brithwch i gael eich rhybuddio wrth anfon negeseuon heb eu llofnodi."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Rhybuddio wrth geisio anfon negeseuon heb eu llofnodi</h1>\n"
-"Os brithir y dewisiad yma, byddwch yn cael eich rhybuddio os geiswch anfon "
-"rhannau o'r neges, neu'r holl neges, heb eu llofnodi.\n"
-"<p>\n"
-"Argymhellir gadael y dewisiad yma arnodd ar gyfer cywirdeb uchaf.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "Rhy&buddio wrth geisio anfon negeseuon heb eu cêl-ysgrifo"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-"Brithwch i gael eich rhybuddio wrth geisio anfon negeseuon heb eu cêl-ysgrifo."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Rhybuddio wrth geisio anfon negeseuon heb eu cêl-ysgrifo</h1>\n"
-"Os brithir y dewisiad yma, byddwch yn cael eich rhybuddio os geiswch anfon "
-"rhannau o'r neges, neu'r holl neges, heb eu llofnodi.\n"
-"<p>\n"
-"Argymhellir gadael y dewisiad yma arnodd ar gyfer cywirdeb uchaf.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, fuzzy, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "Rhybuddio os nad oes &cyfeiriad ebost y derbyniwr yn y dystysgrif"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr "Brithwch i gael eich rhybuddio os nid yw'r cyfeiriad yn y dystysgrif"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Rhybuddio os nad yw cyfeiriad ebost yr anfonwr yn y dystysgrif</h1>\n"
-"Os brithir y dewisiad yma, rhoir rhybudd os nid yw'r dystysgrif a ddefnyddir ar "
-"gyfer cêl-ysgrifo yn cynnwys  cyfeiriad ebost yr anfonwr.\n"
-"<p>\n"
-"Argymhellir gadael y dewisiad yma arnodd ar gyfer diogelwch uchaf.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, fuzzy, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr "Rhybuddio os bydd y dystys&grif CA yn darfod mewn llai na"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, fuzzy, no-c-format
-msgid "For signing"
-msgstr "Defnyddio ar gyfer &Llofnodi"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, fuzzy, no-c-format
-msgid "For encryption"
-msgstr "Cêl-ysgrifaeth"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr "o ddiwrnodau"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Dewis y nifer o ddiwrnodau yma"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Rhybuddio os derfydd y dystysgrif lofnod </h1>\n"
-"Dewis y nifer lleiaf o ddiwrnodau a ddylai'r dystysgrif lofnod fod yn ddilys "
-"heb roi rhybudd.\n"
-"<p>\n"
-"14 diwrnod yw'r gosodiad a argymhellir ar gyfer SPHINX.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Rhybuddio os derfydd tystysgrif gêl-ysgrifo</h1>\n"
-"Dewis y nifer lleiaf o ddiwrnodau a ddylai'r dystysgrif gêl-ysgrifo fod yn "
-"ddilys heb roi rhybudd.\n"
-"<p>\n"
-"14 diwrnod yw'r gosodiad a argymhellir ar gyfer SPHINX.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Rhybuddio os derfydd tystysgrif yn y cadwyn</h1>\n"
-"Dewis y nifer lleiaf o ddiwrnodau a ddylai pob tystysgrif yn y cadwyn fod yn "
-"ddilys heb roi rhybudd.\n"
-"<p>\n"
-"14 diwrnod yw'r gosodiad a argymhellir ar gyfer SPHINX.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Rhybuddio os derfydd y dystysgrif CA </h1>\n"
-"Dewis y nifer lleiaf o ddiwrnodau a ddylai'r dystysgrif CA fod yn ddilys heb "
-"roi rhybudd.\n"
-"<p>\n"
-"14 diwrnod yw'r gosodiad a argymhellir ar gyfer SPHINX.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Rhybuddio os derfydd y dystysgrif wraidd </h1>\n"
-"Dewis y nifer lleiaf o ddiwrnodau a ddylai'r dystysgrif fod yn ddilys heb roi "
-"rhybudd.\n"
-"<p>\n"
-"14 diwrnod yw'r gosodiad a argymhellir ar gyfer SPHINX.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, fuzzy, no-c-format
-msgid "For root certificates:"
-msgstr "Anfon &eich tystysgrif eich hun"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, fuzzy, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Chwilio am Dystysgrifau Eraill"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, fuzzy, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "&Peidio ac anfon tystysgrifau"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr ""
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, fuzzy, no-c-format
-msgid "Template content"
-msgstr "Eiconau Plygell"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, fuzzy, no-c-format
-msgid "Template shortcut"
-msgstr "&Amnewid"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, fuzzy, no-c-format
-msgid "Template type"
-msgstr "&Amnewid"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, fuzzy, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "&Dangos y cafn cysawd o hyd"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, fuzzy, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Hysbysiad Ebost Newydd"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "Penodi golyg&ydd"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "Defny&ddio golygydd allanol yn lle cyfansoddydd"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Galluogi swyddogaeth cylchwedd"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, fuzzy, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr ""
-"M&odd etifeddiaeth: Llarpio penawdau Oddiwrth:/I: mewn atebion i wahoddiadau"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, fuzzy, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr "&Cadw'r set nodau gwreiddiol wrth ateb neu flaenyrru (os yn bosibl)."
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "Atodi llo&fnod yn ymysgogol"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "Lapio &geiriau wrth golofn:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Rhybuddio os bydd y dystysgrif &wraidd yn darfod mewn llai na"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, fuzzy, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Cynnau'r dewisiad yma er mwyn gwneud i Outlook(tm) ddeall eich atebion i "
-"wahoddiadau"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "Gofyn yn ymysgogol am &hysbysiadau lleoliad negeseuon"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, fuzzy, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Galluogwch y dewisiad yma os ydych eisiau i KMail ofyn am Hysbysiadau "
-"Lleoliad Negeseuon (Message Disposition Notifications - MDNs) ar gyfer bob un "
-"o'ch negeseuon allfynd.</p>"
-"<p>Mae'r dewisiad yma yn effeithio ar y rhagosod yn unig; gallwch o hyd alluogi "
-"neu analluogi gofyn am MDNs ar sail pob-neges yn y cyfansoddydd, eitem dewislen "
-"<em>Dewisiadau</em>->&gt; <em>Gofyn am Hysbysiad Lleoliad</em>.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, fuzzy, no-c-format
-msgid "Autosave interval:"
-msgstr "Cyfnod y&mofyn:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "Amnewid rha&gddodiad a adnabyddir gan \"Re:\""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Amnewid rhagddodiad a adnabyddir gan \"&Fwd:\""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "Defnyddion dyfynnu dea&llus"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Mae'r llofnod wedi darfod."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr "&Cadw'r set nodau gwreiddiol wrth ateb neu flaenyrru (os yn bosibl)."
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Cadw negeseuon an&foniedig wedi'u cêl-ysgrifo"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, fuzzy, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Dangos pob penawd y negeseuon"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, fuzzy, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Hysbysiadau Lleoliad Neges"
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, fuzzy, no-c-format
-msgid "Message template for new message"
-msgstr "Rhestr Negeseuon - Maes Dyddiad"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, fuzzy, no-c-format
-msgid "Message template for forward"
-msgstr "Nodi Neges fel Wedi'i &Blaenyrru"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, fuzzy, no-c-format
-msgid "Quote characters"
-msgstr "&Ychwanegu Nodau Dyfynnu"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
 msgstr ""
 
 #: recipientseditor.cpp:104
@@ -13531,6 +11753,11 @@ msgstr "Ychwanegu e"
 msgid "Add as BCC"
 msgstr "Ychwanegu Cyfrif"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "Didd&ymu"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13547,10 +11774,10 @@ msgstr "<derbynwyr>"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 
 #: redirectdialog.cpp:57
@@ -13568,8 +11795,8 @@ msgstr ""
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 
 #: redirectdialog.cpp:116
@@ -13682,10 +11909,19 @@ msgstr "yn fwy na neu'n gyfartal i"
 msgid " bytes"
 msgstr "beit"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr "o ddiwrnodau"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 
 #: searchjob.cpp:257
@@ -13841,13 +12077,11 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:265
@@ -13865,8 +12099,7 @@ msgid ""
 msgstr "Math cyfrif: cyfrif POP"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
+msgid "Contents of script '%1':\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:320
@@ -13884,8 +12117,7 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
+msgid "Sieve capabilities:\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:345
@@ -13894,8 +12126,7 @@ msgstr ""
 
 #: sievedebugdialog.cpp:354
 #, fuzzy
-msgid ""
-"Available Sieve scripts:\n"
+msgid "Available Sieve scripts:\n"
 msgstr "Hidlau ar Gael"
 
 #: sievedebugdialog.cpp:358
@@ -13964,8 +12195,8 @@ msgstr ""
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 
 #: signatureconfigurator.cpp:126
@@ -13985,17 +12216,22 @@ msgstr ""
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "Pen&odi gorchymyn:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Llwybr"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Cofnod newydd:"
@@ -14032,6 +12268,11 @@ msgstr "Ychwanegu cyfrif"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt>Ydych wir eisiau gwaredu'r dynodiad o'r enw <b>%1</b>?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "Gwethr&edu ar:"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -14046,6 +12287,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "Golygu..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -14085,9 +12330,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -14126,6 +12371,16 @@ msgstr ""
 "Methu agor ffeil \"%1\":\n"
 "%2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, no-c-format
+msgid "To:"
+msgstr "I:"
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "CC:"
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14163,36 +12418,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -14426,6 +12677,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 #, fuzzy
 msgid "Set Cursor Position"
@@ -14463,114 +12718,6 @@ msgstr ""
 msgid "Turn Debug Off"
 msgstr ""
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-
-#: tips.cpp:9
-#, fuzzy
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"\n"
-"<p>...y gallwch creu hidlau yn gyflym ar anfonwr, dderbyniwr,\n"
-"bwnc a rhestri ebost ego <em>Offer-&gt;Creu&nbsp;Hidlen</em>?</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...y gallwch gael gwared â'r &quot;[enw'r rhest ebost]&quot;\n"
-"a ychwanegir i bwnc rhai rhestri ebost gan ddefnyddio'r weithred\n"
-"hidlo <em>ail-ysgrifennu penawd</em> Defnyddiwch\n"
-"<pre>ail-ysgrifennu penawd &quot;Pwnc&quot;\n"
-"   amnewid &quot;\\s*\\[enw'r rhestr ebost\\]\\s*&quot;\n"
-"   efo&quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-#, fuzzy
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...y gallwch cysylltu rhestri ebost â plygyll yn yr ymgom\n"
-"<em>Plygell-&gt;Priodweddau...</em> ? Wedyn gallwch ddefnyddio\n"
-"<em>Neges-&gt;Newydd&nbsp;Neges&nbsp;i&nbsp;Rhestr&nbsp;Ebost...</em>\n"
-"i agor y cyfansoddydd efo'r cyfeiriad rhestr ebost yno yn barod.\n"
-"Fel arall, gallwch glicio efo botwm canol y llygoden ar y blygell.</p>\n"
-
-#: tips.cpp:35
-#, fuzzy
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...y gallwch neilltuo eiconau addasiedig i bob plygell yn unigol?\n"
-"Gweler <em>Plygell-&gt;Priodweddau...</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...y gall KMail ddangos bar lliw yn dynodi'r math o neges\n"
-"(Testun Plaen/HTML/OpenPGP) a ddangosir yn gyfredol?</p>\n"
-"<p>Mae hyn yn difetha cynlluniau i ffugo gwiriad llofnod llwyddiannus gan\n"
-"anfon ebostau HTML sy'n dynwared fframau cyflwr llofnod KMail.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...y gallwch hidlo ar unrhyw penawd gan fewnosod ei enw ym maes golygu "
-"cyntaf rheol chwilio?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...y gallwch hidlo allan negeseuon HTML-yn-unig efo'r rheol\n"
-"<pre>&quot;Math-cynnwys&quot; yn cynnwys &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-#, fuzzy
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...y bydd y rhan ddewisiedig o'r neges yn unig yn cael ei dyfynnu wrth "
-"ateb?</p>\n"
-"<p>Os ni ddewisir rhywbeth, dyfynnir yr holl neges.</p>\n"
-"<p>Mae hyn yn gweithio hyd yn oed efo testun atodiadau os ddewiswch\n"
-"<em>Gweld-&gt;Atodiadau-&gt;Mewnlin</em>.</p>\n"
-"<p>Mae'r nodwedd yma ar gael efo pob gorchymyn ateb heblaw\n"
-"<em>Neges-&gt;Ateb Heb Ddyfynnu</em>.</p>\n"
-"<p align=\"right\"><em>cyfrannwyd gan David F. Newman</em></p>\n"
-
 #: undostack.cpp:110
 #, fuzzy
 msgid "There is nothing to undo."
@@ -14639,6 +12786,17 @@ msgstr "Atodiad #%1 (di-enw)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr ""
+"Mae ffeil o'r enw \"%1\" mewn bod eisoes.  Ydych wir eisiau ysgrifennu "
+"drosti?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Trosysgrifo'r Ffeil?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -14762,9 +12920,9 @@ msgstr "Dileu Negeseuon"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 
 #: xfaceconfigurator.cpp:100
@@ -14796,9 +12954,9 @@ msgstr "Dewis Ffeil..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 
 #: xfaceconfigurator.cpp:156
@@ -14808,15 +12966,15 @@ msgstr "Ychwanegu i'r Llyfr Cyfeiriadau"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 
 #: xfaceconfigurator.cpp:180
@@ -14825,8 +12983,8 @@ msgstr ""
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
@@ -14842,142 +13000,1629 @@ msgstr "Dim Llun"
 msgid "You do not have your own contact defined in the address book."
 msgstr ""
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, fuzzy, no-c-format
+msgid "Signing"
+msgstr "Llofnodi"
+
+#: composercryptoconfiguration.ui:35
+#, fuzzy, no-c-format
+msgid "&Automatically sign messages"
+msgstr "L&lofnodi negeseuon yn ymysgogol gan ddefnyddio OpenPGP"
+
+#: composercryptoconfiguration.ui:38
+#, fuzzy, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
+"<qt><p>Pan alluogir y dewisiad yma, llofnodir gan ragosod pob neges yr "
+"anfonwch.  Wrth gwrs, mae o hyd yn bosibl analluogi llofnodi ar gyfer pob "
+"neges yn unigol.</p></qt>"
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, fuzzy, no-c-format
+msgid "Encrypting"
+msgstr "Cêl-ysgrifaeth"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-#, fuzzy
-msgid "Set subject of message"
-msgstr "Gosd pwnc y neges."
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
 
-#: kmail_options.h:13
-#, fuzzy
-msgid "Send CC: to 'address'"
-msgstr "Anfon CC: i 'gyfeiriad'."
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Dangos testun llofnodedig/cêl-ysgrifedig wedi cyfansoddi"
 
-#: kmail_options.h:15
-#, fuzzy
-msgid "Send BCC: to 'address'"
-msgstr "Anfon BCC: i 'gyfeiriad'."
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
 
-#: kmail_options.h:17
-#, fuzzy
-msgid "Add 'header' to message"
-msgstr "Ychwanegu 'penawd' i'r neges."
+#: composercryptoconfiguration.ui:81
+#, fuzzy, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Cadw negeseuon an&foniedig wedi'u cêl-ysgrifo"
 
-#: kmail_options.h:18
-#, fuzzy
-msgid "Read message body from 'file'"
-msgstr "Darllen corff y neges o 'ffeil'."
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Brithwch i gadw negeseuon wedi'u cêl-ysgrifo"
 
-#: kmail_options.h:19
-#, fuzzy
-msgid "Set body of message"
-msgstr "Gosod corff y neges."
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Cadw Negeseuon yn Gêl-ysgrifedig</h1>\n"
+"Pan frithwch y blwch yma, cedwir negeseuon a anfonwyd fel y's anfonwyd, sef, "
+"yn gêl-ysgrifedig.  Ni argymhellir hyn oherwydd ni fyddwch yn gallu darllen "
+"y negeseuon mwyach os darfodir tystysgrif ofynnol.\n"
+"<p>\n"
+"Serch hynny, gall fod rheolau lleol sy'n eich gorfod troi'r dewisiad yma "
+"arnodd.  Mewn amheuaeth, gwiriwch efo'ch gweinyddwr lleol.\n"
+"</qt>"
 
-#: kmail_options.h:20
-#, fuzzy
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Ychwanegu atodiad i'r ebost.  Gellir ailadrodd hwn."
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Dangos yr allweddau &cêl-ysgrifo ar gyfer cymeradwydo o hyd"
 
-#: kmail_options.h:21
-#, fuzzy
-msgid "Only check for new mail"
-msgstr "Ymofyn am ebost newydd yn unig."
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
 
-#: kmail_options.h:22
-#, fuzzy
-msgid "Only open composer window"
-msgstr "Agor ffenestr gyfansoddi yn unig."
+#: composercryptoconfiguration.ui:114
+#, fuzzy, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Cêl-ysgrifennu negeseuon yn ymysgogol lle &bo'n bosibl."
 
-#: kmail_options.h:23
-#, fuzzy
-msgid "View the given message file"
-msgstr "Dan y c&warel neges"
+#: composercryptoconfiguration.ui:117
+#, fuzzy, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"<qt><p>Pan alluogir y dewisiad yma, celir pob neges yr anfonwch pan mae cêl-"
+"ysgrifaeth yn bosibl a dymunol.  Wrth gwrs, mae o hyd yn bosibl analluogi'r "
+"cêl-ysgrifaeth ymysgogol ar gyfer pob neges yn unigol.</p></qt>"
 
-#: kmail_options.h:24
-#, fuzzy
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
 msgstr ""
-"Anfon neges i bob un 'cyfeiriad', gan atodi'r ffeil y mae'r 'URL' yn ei benodi."
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Darllen"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr ""
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Hen"
+#: customtemplates_base.ui:234
+#, fuzzy, no-c-format
+msgid "Universal"
+msgstr "Cyffredinol"
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Wedi'u dileu"
+#: customtemplates_base.ui:239
+#, fuzzy, no-c-format
+msgid "Reply"
+msgstr "&Ateb I"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Wedi'u ateb"
+#: customtemplates_base.ui:244
+#, fuzzy, no-c-format
+msgid "Reply to All"
+msgstr "Ateb i &Bawb..."
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Wedi'u blaenyrru"
+#: customtemplates_base.ui:249
+#, fuzzy, no-c-format
+msgid "Forward"
+msgstr "B&laenyrru"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "Mewn Ciw"
+#: customtemplates_base.ui:261
+#, fuzzy, no-c-format
+msgid "Shortc&ut:"
+msgstr "Byrlwybr:"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Anfonwyd"
+#: customtemplates_base.ui:283
+#, fuzzy, no-c-format
+msgid "&Template type:"
+msgstr "&Amnewid"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Wedi'u gwylio"
+#: customtemplates_kfg.kcfg:12
+#, fuzzy, no-c-format
+msgid "Template content"
+msgstr "Eiconau Plygell"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Anwybyddwyd"
+#: customtemplates_kfg.kcfg:17
+#, fuzzy, no-c-format
+msgid "Template shortcut"
+msgstr "&Amnewid"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Ebostach"
+#: customtemplates_kfg.kcfg:22
+#, fuzzy, no-c-format
+msgid "Template type"
+msgstr "&Amnewid"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Ebost iawn"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Priodweddau Plygell"
 
-#: kmsearchpattern.h:232
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "Mae'r &blygell yn cynnwys rhestr ebost"
+
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "C&yfeiriad y rhestr:"
+
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "Ar&ferol:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "&Heb eu darllen:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Neges yn Darfod"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "Dar&fod ar ôl:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "&Darfod negeseuon darlleniedig"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Darfod ar ô&l:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "Darfod negeseuon &heb eu darllen"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "Diwrnod(au)"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "Wythnos(au)"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "Mis(oedd)"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Uwch"
+
+#: folderpropertiesdialog.ui:462
+#, fuzzy, no-c-format
+msgid "Sender identit&y:"
+msgstr "Dynodiad yr &Anfonwr:"
+
+#: folderpropertiesdialog.ui:483
+#, fuzzy, no-c-format
+msgid "&Storage format:"
+msgstr "Fformat &Cadw:"
+
+#: folderpropertiesdialog.ui:494
+#, fuzzy, no-c-format
+msgid "&List displays:"
+msgstr "&Ymddangosiad y Rhestri:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr ""
+
+#: kmail.kcfg:62
+#, no-c-format
+msgid ""
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
+msgstr ""
+
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr ""
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+
+#: kmail.kcfg:109
+#, fuzzy, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "&Dangos y cafn cysawd o hyd"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, fuzzy, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Hysbysiad Ebost Newydd"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "Penodi golyg&ydd"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "Defny&ddio golygydd allanol yn lle cyfansoddydd"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Galluogi swyddogaeth cylchwedd"
+
+#: kmail.kcfg:172
+#, fuzzy, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr ""
+"M&odd etifeddiaeth: Llarpio penawdau Oddiwrth:/I: mewn atebion i wahoddiadau"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr ""
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr ""
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr ""
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr ""
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, fuzzy, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr "&Cadw'r set nodau gwreiddiol wrth ateb neu flaenyrru (os yn bosibl)."
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "Atodi llo&fnod yn ymysgogol"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+
+#: kmail.kcfg:349
+#, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "Lapio &geiriau wrth golofn:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Rhybuddio os bydd y dystysgrif &wraidd yn darfod mewn llai na"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, fuzzy, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Cynnau'r dewisiad yma er mwyn gwneud i Outlook(tm) ddeall eich atebion i "
+"wahoddiadau"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "Gofyn yn ymysgogol am &hysbysiadau lleoliad negeseuon"
+
+#: kmail.kcfg:417
+#, fuzzy, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>Galluogwch y dewisiad yma os ydych eisiau i KMail ofyn am Hysbysiadau "
+"Lleoliad Negeseuon (Message Disposition Notifications - MDNs) ar gyfer bob "
+"un o'ch negeseuon allfynd.</p><p>Mae'r dewisiad yma yn effeithio ar y "
+"rhagosod yn unig; gallwch o hyd alluogi neu analluogi gofyn am MDNs ar sail "
+"pob-neges yn y cyfansoddydd, eitem dewislen <em>Dewisiadau</em>->&gt; "
+"<em>Gofyn am Hysbysiad Lleoliad</em>.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr ""
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+
+#: kmail.kcfg:443
+#, fuzzy, no-c-format
+msgid "Autosave interval:"
+msgstr "Cyfnod y&mofyn:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "Amnewid rha&gddodiad a adnabyddir gan \"Re:\""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Amnewid rhagddodiad a adnabyddir gan \"&Fwd:\""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "Defnyddion dyfynnu dea&llus"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Mae'r llofnod wedi darfod."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr ""
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr ""
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr ""
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr "&Cadw'r set nodau gwreiddiol wrth ateb neu flaenyrru (os yn bosibl)."
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr ""
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr ""
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Cadw negeseuon an&foniedig wedi'u cêl-ysgrifo"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, fuzzy, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Dangos pob penawd y negeseuon"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, fuzzy, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Hysbysiadau Lleoliad Neges"
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:659
+#, fuzzy, no-c-format
+msgid "Message template for new message"
+msgstr "Rhestr Negeseuon - Maes Dyddiad"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr ""
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr ""
+
+#: kmail.kcfg:674
+#, fuzzy, no-c-format
+msgid "Message template for forward"
+msgstr "Nodi Neges fel Wedi'i &Blaenyrru"
+
+#: kmail.kcfg:679
+#, fuzzy, no-c-format
+msgid "Quote characters"
+msgstr "&Ychwanegu Nodau Dyfynnu"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Golygu &Ffeil"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Golygu..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, fuzzy, no-c-format
+msgid "&View"
+msgstr "Gweld..."
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Mynd"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "P&lygell"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Neges"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr ""
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "B&laenyrru"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Dynodiadau &sy'n bodoli:"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, no-c-format
+msgid "Main Toolbar"
+msgstr ""
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Dewisiadau Cyffredin"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr ""
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr ""
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+
+#: smimeconfiguration.ui:49
+#, fuzzy, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Creu Tystysgrif"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr ""
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+
+#: smimeconfiguration.ui:94
+#, fuzzy, no-c-format
+msgid "OCSP responder signature:"
+msgstr "Llofnod dilys"
+
+#: smimeconfiguration.ui:126
+#, fuzzy, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Anfon &eich tystysgrif eich hun"
+
+#: smimeconfiguration.ui:136
+#, fuzzy, no-c-format
+msgid "Do not check certificate policies"
+msgstr "&Peidio ac anfon tystysgrifau"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr ""
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+
+#: smimeconfiguration.ui:158
+#, fuzzy, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Wrth ychwanegu tystysgrifau"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr ""
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr ""
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+
+#: smimeconfiguration.ui:253
+#, fuzzy, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "Anfon &eich tystysgrif eich hun"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:307
+#, fuzzy, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "Anfon &eich tystysgrif eich hun"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr ""
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "&Ychwanegu..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "&Cylchwedd"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "Dynodiadau &sy'n bodoli:"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "Diderfyn"
+
+#: templatesconfiguration_base.ui:30
+#, fuzzy, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "Ffurfweddu Llofnod"
+
+#: templatesconfiguration_base.ui:129
+#, fuzzy, no-c-format
+msgid "Reply to Sender"
+msgstr "Ate&b i'r anfonwr:"
+
+#: templatesconfiguration_base.ui:172
+#, fuzzy, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Ateb i &Bawb..."
+
+#: templatesconfiguration_base.ui:215
+#, fuzzy, no-c-format
+msgid "Forward Message"
+msgstr "Neges a Flaenyrrwyd"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "Rhybuddio wrth geisio anfon negeseuon &heb eu llofnodi"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "Brithwch i gael eich rhybuddio wrth anfon negeseuon heb eu llofnodi."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Rhybuddio wrth geisio anfon negeseuon heb eu llofnodi</h1>\n"
+"Os brithir y dewisiad yma, byddwch yn cael eich rhybuddio os geiswch anfon "
+"rhannau o'r neges, neu'r holl neges, heb eu llofnodi.\n"
+"<p>\n"
+"Argymhellir gadael y dewisiad yma arnodd ar gyfer cywirdeb uchaf.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "Rhy&buddio wrth geisio anfon negeseuon heb eu cêl-ysgrifo"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+"Brithwch i gael eich rhybuddio wrth geisio anfon negeseuon heb eu cêl-"
+"ysgrifo."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Rhybuddio wrth geisio anfon negeseuon heb eu cêl-ysgrifo</h1>\n"
+"Os brithir y dewisiad yma, byddwch yn cael eich rhybuddio os geiswch anfon "
+"rhannau o'r neges, neu'r holl neges, heb eu llofnodi.\n"
+"<p>\n"
+"Argymhellir gadael y dewisiad yma arnodd ar gyfer cywirdeb uchaf.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, fuzzy, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "Rhybuddio os nad oes &cyfeiriad ebost y derbyniwr yn y dystysgrif"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "Brithwch i gael eich rhybuddio os nid yw'r cyfeiriad yn y dystysgrif"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Rhybuddio os nad yw cyfeiriad ebost yr anfonwr yn y dystysgrif</h1>\n"
+"Os brithir y dewisiad yma, rhoir rhybudd os nid yw'r dystysgrif a ddefnyddir "
+"ar gyfer cêl-ysgrifo yn cynnwys  cyfeiriad ebost yr anfonwr.\n"
+"<p>\n"
+"Argymhellir gadael y dewisiad yma arnodd ar gyfer diogelwch uchaf.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, fuzzy, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr "Rhybuddio os bydd y dystys&grif CA yn darfod mewn llai na"
+
+#: warningconfiguration.ui:104
+#, fuzzy, no-c-format
+msgid "For signing"
+msgstr "Defnyddio ar gyfer &Llofnodi"
+
+#: warningconfiguration.ui:115
+#, fuzzy, no-c-format
+msgid "For encryption"
+msgstr "Cêl-ysgrifaeth"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Dewis y nifer o ddiwrnodau yma"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Rhybuddio os derfydd y dystysgrif lofnod </h1>\n"
+"Dewis y nifer lleiaf o ddiwrnodau a ddylai'r dystysgrif lofnod fod yn ddilys "
+"heb roi rhybudd.\n"
+"<p>\n"
+"14 diwrnod yw'r gosodiad a argymhellir ar gyfer SPHINX.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Rhybuddio os derfydd tystysgrif gêl-ysgrifo</h1>\n"
+"Dewis y nifer lleiaf o ddiwrnodau a ddylai'r dystysgrif gêl-ysgrifo fod yn "
+"ddilys heb roi rhybudd.\n"
+"<p>\n"
+"14 diwrnod yw'r gosodiad a argymhellir ar gyfer SPHINX.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Rhybuddio os derfydd tystysgrif yn y cadwyn</h1>\n"
+"Dewis y nifer lleiaf o ddiwrnodau a ddylai pob tystysgrif yn y cadwyn fod yn "
+"ddilys heb roi rhybudd.\n"
+"<p>\n"
+"14 diwrnod yw'r gosodiad a argymhellir ar gyfer SPHINX.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Rhybuddio os derfydd y dystysgrif CA </h1>\n"
+"Dewis y nifer lleiaf o ddiwrnodau a ddylai'r dystysgrif CA fod yn ddilys heb "
+"roi rhybudd.\n"
+"<p>\n"
+"14 diwrnod yw'r gosodiad a argymhellir ar gyfer SPHINX.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Rhybuddio os derfydd y dystysgrif wraidd </h1>\n"
+"Dewis y nifer lleiaf o ddiwrnodau a ddylai'r dystysgrif fod yn ddilys heb "
+"roi rhybudd.\n"
+"<p>\n"
+"14 diwrnod yw'r gosodiad a argymhellir ar gyfer SPHINX.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, fuzzy, no-c-format
+msgid "For root certificates:"
+msgstr "Anfon &eich tystysgrif eich hun"
+
+#: warningconfiguration.ui:305
+#, fuzzy, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Chwilio am Dystysgrifau Eraill"
+
+#: warningconfiguration.ui:316
+#, fuzzy, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "&Peidio ac anfon tystysgrifau"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr ""
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+
+#: tips:10
 #, fuzzy
-msgid "To Do"
-msgstr "I:"
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"\n"
+"<p>...y gallwch creu hidlau yn gyflym ar anfonwr, dderbyniwr,\n"
+"bwnc a rhestri ebost ego <em>Offer-&gt;Creu&nbsp;Hidlen</em>?</p>\n"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Efo Atodiad"
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...y gallwch gael gwared â'r &quot;[enw'r rhest ebost]&quot;\n"
+"a ychwanegir i bwnc rhai rhestri ebost gan ddefnyddio'r weithred\n"
+"hidlo <em>ail-ysgrifennu penawd</em> Defnyddiwch\n"
+"<pre>ail-ysgrifennu penawd &quot;Pwnc&quot;\n"
+"   amnewid &quot;\\s*\\[enw'r rhestr ebost\\]\\s*&quot;\n"
+"   efo&quot;&quot;</pre>\n"
+"</p>\n"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
+#: tips:29
+#, fuzzy
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
 msgstr ""
+"<p>...y gallwch cysylltu rhestri ebost â plygyll yn yr ymgom\n"
+"<em>Plygell-&gt;Priodweddau...</em> ? Wedyn gallwch ddefnyddio\n"
+"<em>Neges-&gt;Newydd&nbsp;Neges&nbsp;i&nbsp;Rhestr&nbsp;Ebost...</em>\n"
+"i agor y cyfansoddydd efo'r cyfeiriad rhestr ebost yno yn barod.\n"
+"Fel arall, gallwch glicio efo botwm canol y llygoden ar y blygell.</p>\n"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "Llwybr"
+#: tips:39
+#, fuzzy
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...y gallwch neilltuo eiconau addasiedig i bob plygell yn unigol?\n"
+"Gweler <em>Plygell-&gt;Priodweddau...</em></p>\n"
 
-#: util.h:208
+#: tips:46
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
 msgstr ""
-"Mae ffeil o'r enw \"%1\" mewn bod eisoes.  Ydych wir eisiau ysgrifennu drosti?"
+"<p>...y gall KMail ddangos bar lliw yn dynodi'r math o neges\n"
+"(Testun Plaen/HTML/OpenPGP) a ddangosir yn gyfredol?</p>\n"
+"<p>Mae hyn yn difetha cynlluniau i ffugo gwiriad llofnod llwyddiannus gan\n"
+"anfon ebostau HTML sy'n dynwared fframau cyflwr llofnod KMail.</p>\n"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Trosysgrifo'r Ffeil?"
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...y gallwch hidlo ar unrhyw penawd gan fewnosod ei enw ym maes golygu "
+"cyntaf rheol chwilio?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...y gallwch hidlo allan negeseuon HTML-yn-unig efo'r rheol\n"
+"<pre>&quot;Math-cynnwys&quot; yn cynnwys &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+
+#: tips:70
+#, fuzzy
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...y bydd y rhan ddewisiedig o'r neges yn unig yn cael ei dyfynnu wrth "
+"ateb?</p>\n"
+"<p>Os ni ddewisir rhywbeth, dyfynnir yr holl neges.</p>\n"
+"<p>Mae hyn yn gweithio hyd yn oed efo testun atodiadau os ddewiswch\n"
+"<em>Gweld-&gt;Atodiadau-&gt;Mewnlin</em>.</p>\n"
+"<p>Mae'r nodwedd yma ar gael efo pob gorchymyn ateb heblaw\n"
+"<em>Neges-&gt;Ateb Heb Ddyfynnu</em>.</p>\n"
+"<p align=\"right\"><em>cyfrannwyd gan David F. Newman</em></p>\n"
 
 #~ msgid ""
 #~ "_: recipient address field\n"
@@ -14999,7 +14644,9 @@ msgstr "Trosysgrifo'r Ffeil?"
 
 #, fuzzy
 #~ msgid "The error message from the server communication is here:"
-#~ msgstr "Gall hyn fod o achos nid oes gennych ganiatad i wneud hyn.  Dyma'r neges wall o'r cyfathrebiaeth gweinydd:"
+#~ msgstr ""
+#~ "Gall hyn fod o achos nid oes gennych ganiatad i wneud hyn.  Dyma'r neges "
+#~ "wall o'r cyfathrebiaeth gweinydd:"
 
 #, fuzzy
 #~ msgid "Todo"
@@ -15056,16 +14703,20 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encrypt All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are encrypted by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Cêl-ysgrifo pob rhan y neges gan ragosod</h1>\n"
-#~ "Os dewisir y dewisiad yma, cêl-ysgrifir pob rhan o neges (h.y. prif gorff y neges a pob atodiad) gan ragosod.\n"
+#~ "Os dewisir y dewisiad yma, cêl-ysgrifir pob rhan o neges (h.y. prif gorff "
+#~ "y neges a pob atodiad) gan ragosod.\n"
 #~ "<p>\n"
-#~ "Rhagosodiad yw hwn - gallwch o hyd ei anwybyddu ar gyfer pob neges unigol.\n"
+#~ "Rhagosodiad yw hwn - gallwch o hyd ei anwybyddu ar gyfer pob neges "
+#~ "unigol.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before encrypting each part"
@@ -15077,12 +14728,16 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Encrypting Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be encrypted.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be encrypted.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Gofyn cyn cêl-ysgrifo pob rhan</h1>\n"
-#~ "Pan ddewisir y dewisiad yma, byddwch yn cael eich gofyn am bob rhan o'r neges (h.y. prif gorff y neges yn ogystal â pob atodiad) yn unigol a hoffech gêl-ysgrifo'r rhan.\n"
+#~ "Pan ddewisir y dewisiad yma, byddwch yn cael eich gofyn am bob rhan o'r "
+#~ "neges (h.y. prif gorff y neges yn ogystal â pob atodiad) yn unigol a "
+#~ "hoffech gêl-ysgrifo'r rhan.\n"
 #~ "</qt>"
 
 #, fuzzy
@@ -15098,14 +14753,16 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ "<h1>Do Not Encrypt Messages</h1>\n"
 #~ "If this option is selected, messages are not encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Peidio â chêl-ysgrifo negeseuon</h1>\n"
 #~ "Os dewisir y dewisiad yma, ni chêl-ysgrifir negeseuon gan ragosod.\n"
 #~ "<p>\n"
-#~ "Rhagosodiad yw hwn - gallwch o hyd ei anwybyddu ar gyfer pob neges unigol.\n"
+#~ "Rhagosodiad yw hwn - gallwch o hyd ei anwybyddu ar gyfer pob neges "
+#~ "unigol.\n"
 #~ "</qt>"
 
 #~ msgid "Triple-DES"
@@ -15117,18 +14774,31 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encryption Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The encryption algorithm describes how the computer applies your recipient's key to your message so that only the intended receiver can read the message.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The encryption algorithm describes how the computer applies "
+#~ "your recipient's key to your message so that only the intended receiver "
+#~ "can read the message.\n"
 #~ "<p>\n"
-#~ "The selection of a certain encryption algorithm determines how easy or how difficult it is to intercept and read a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain encryption algorithm determines how easy or "
+#~ "how difficult it is to intercept and read a message. However, all "
+#~ "algorithms provided in the SPHINX environment are considered to be very "
+#~ "safe. Generally, the default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Algorithm Cêl-ysgrifo</h1>\n"
-#~ "Disgrifiad i'r cyfrifiadur am sut i weithredu tasg penodol yw algorithm.  Mae'r algorithm cêl-ysgrifo yn disgrifio sut mae'r cyfrifiadur yn gweithredu allwedd eich derbyniwr i'ch neges er mwyn i'r derbyniwr arfaethedig yn unig allu darllen y neges.\n"
+#~ "Disgrifiad i'r cyfrifiadur am sut i weithredu tasg penodol yw algorithm.  "
+#~ "Mae'r algorithm cêl-ysgrifo yn disgrifio sut mae'r cyfrifiadur yn "
+#~ "gweithredu allwedd eich derbyniwr i'ch neges er mwyn i'r derbyniwr "
+#~ "arfaethedig yn unig allu darllen y neges.\n"
 #~ "<p>\n"
-#~ "Mae dewis rhyw algorithm cêl-ysgrifo yn penodi faint mor hawdd neu faint mor anodd yw hi i ryng-gipio a darllen neges.  Serch hynny, ystyrir bod pob algorithm a ddarperir yn yr amgylchedd SPHINX yn ddiogel iawn.  Fel rheol, bydd y rhagosodiad yn gweithio yn berffaith iawn yma.\n"
+#~ "Mae dewis rhyw algorithm cêl-ysgrifo yn penodi faint mor hawdd neu faint "
+#~ "mor anodd yw hi i ryng-gipio a darllen neges.  Serch hynny, ystyrir bod "
+#~ "pob algorithm a ddarperir yn yr amgylchedd SPHINX yn ddiogel iawn.  Fel "
+#~ "rheol, bydd y rhagosodiad yn gweithio yn berffaith iawn yma.\n"
 #~ "<p>\n"
 #~ "Rhagosodiad yw hwn, gallwch ei anwybyddu ar gyfer pob neges unigol.\n"
 #~ "</qt>"
@@ -15145,16 +14815,23 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Certificate Check Can End With Locally Saved Certificate</h1>\n"
-#~ "If this option is checked, the check of the certificate chain can end with a locally saved certificate.\n"
+#~ "If this option is checked, the check of the certificate chain can end "
+#~ "with a locally saved certificate.\n"
 #~ "<p>\n"
-#~ "Locally saved certificates are your own certificates as well as the certificates of communication partners and certification authorities (CAs).\n"
+#~ "Locally saved certificates are your own certificates as well as the "
+#~ "certificates of communication partners and certification authorities "
+#~ "(CAs).\n"
 #~ "</h1>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "<h1>Gall y gwirio tystysgrif orffen efo tystysgrif a gedwir yn lleol</h1>\n"
-#~ "Os dewisir y dewisiad yma, gall y gwirio tystysgrif orffen efo tystysgrif a gedwir yn lleol.\n"
+#~ "<h1>Gall y gwirio tystysgrif orffen efo tystysgrif a gedwir yn lleol</"
+#~ "h1>\n"
+#~ "Os dewisir y dewisiad yma, gall y gwirio tystysgrif orffen efo tystysgrif "
+#~ "a gedwir yn lleol.\n"
 #~ "<p>\n"
-#~ "Cynhwysa \"tystysgrifau a gedwir yn lleol\" eich tystysgrifau eich hyn, yn ogystal â thystysgrifau partneriaid cyfathrebu ac awdurdodau tystysgrifo (CAs).\n"
+#~ "Cynhwysa \"tystysgrifau a gedwir yn lleol\" eich tystysgrifau eich hyn, "
+#~ "yn ogystal â thystysgrifau partneriaid cyfathrebu ac awdurdodau "
+#~ "tystysgrifo (CAs).\n"
 #~ "</h1>"
 
 #~ msgid "Always c&heck to root certificate"
@@ -15166,12 +14843,15 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always Check Certificate Path To Root Certificate</h1>\n"
-#~ "If this option is turned on, the certificate path belonging to the receiver's certificate will always be checked all the way to the root certificate.\n"
+#~ "If this option is turned on, the certificate path belonging to the "
+#~ "receiver's certificate will always be checked all the way to the root "
+#~ "certificate.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Gwirio llwybr y dystysgrif hyd at y dystysgrif wraidd bob tro</h1>\n"
-#~ "Os troir y dewisiad yma arnodd, gwirir llwybr y dystysgrif sy'n biau i dystysgrif y derbyniwr hyd at y dystysgrif wraidd bob tro.\n"
+#~ "Os troir y dewisiad yma arnodd, gwirir llwybr y dystysgrif sy'n biau i "
+#~ "dystysgrif y derbyniwr hyd at y dystysgrif wraidd bob tro.\n"
 #~ "</qt>"
 
 #~ msgid "Check certificate &path"
@@ -15183,14 +14863,17 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Check Certificate Path</h1>\n"
-#~ "If this option is turned on, the whole path of the receiver's certificate up to the root will be checked.\n"
+#~ "If this option is turned on, the whole path of the receiver's certificate "
+#~ "up to the root will be checked.\n"
 #~ "<p>\n"
-#~ "Note that it is not possible to turn off checking the receiver's certificate itself.\n"
+#~ "Note that it is not possible to turn off checking the receiver's "
+#~ "certificate itself.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Gwirio llwybr y dystysgrif</h1>\n"
-#~ "Os troir y dewisiad yma arnodd, gwirir holl lwybr tystysgrif y derbyniwr hyd at y dystysgrif wraidd.\n"
+#~ "Os troir y dewisiad yma arnodd, gwirir holl lwybr tystysgrif y derbyniwr "
+#~ "hyd at y dystysgrif wraidd.\n"
 #~ "<p>\n"
 #~ "Noder nid yw'n bosibl atal gwirio tystysgrif y derbyniwr ei hun.\n"
 #~ "</qt>"
@@ -15204,16 +14887,28 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Use Certificate Revocation Lists (CRLs)</h1>\n"
-#~ "A certificate revocation list contains certificates that have been withdrawn and should not be used for encryption purposes any longer. A user may wish to have his or her certificate revoked because he or she suspects that the certificate's integrity has been compromised (e.g. somebody has guessed the PIN).\n"
+#~ "A certificate revocation list contains certificates that have been "
+#~ "withdrawn and should not be used for encryption purposes any longer. A "
+#~ "user may wish to have his or her certificate revoked because he or she "
+#~ "suspects that the certificate's integrity has been compromised (e.g. "
+#~ "somebody has guessed the PIN).\n"
 #~ "<p>\n"
-#~ "It is recommended to use CRLs for maximum security. In the configuration dialog for certificate and CRL management, you can select where to retrieve the CRLs from.\n"
+#~ "It is recommended to use CRLs for maximum security. In the configuration "
+#~ "dialog for certificate and CRL management, you can select where to "
+#~ "retrieve the CRLs from.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Defnyddio rhestri dirymu tystysgrifau (CRLau)</h1>\n"
-#~ "Mae rhestr dirymu tystysgrifau yn cynnwys tystysgrifau sydd wedi'u tynnu yn ôl, a ni ddylir eu defnyddio mwyach ar gyfer pwrpas cêl-ysgrifo.  Gall defnyddiwr ddymuno cael dirymu ei d/thystysgrif gan ei f/bod yn amau bod cywirdeb y dystysgrif wedi'i beryglu (e.e. mae rhywun wedi dyfalu'r PIN).\n"
+#~ "Mae rhestr dirymu tystysgrifau yn cynnwys tystysgrifau sydd wedi'u tynnu "
+#~ "yn ôl, a ni ddylir eu defnyddio mwyach ar gyfer pwrpas cêl-ysgrifo.  Gall "
+#~ "defnyddiwr ddymuno cael dirymu ei d/thystysgrif gan ei f/bod yn amau bod "
+#~ "cywirdeb y dystysgrif wedi'i beryglu (e.e. mae rhywun wedi dyfalu'r "
+#~ "PIN).\n"
 #~ "<p>\n"
-#~ "Argymhellir defnyddio CRLau ar gyfer diogelwch mwyaf.  Yn yr ymgom ffurfweddu rheolaeth tystysgrifau a CRLau, gallwch benodi o le i nôl y CRLau.\n"
+#~ "Argymhellir defnyddio CRLau ar gyfer diogelwch mwyaf.  Yn yr ymgom "
+#~ "ffurfweddu rheolaeth tystysgrifau a CRLau, gallwch benodi o le i nôl y "
+#~ "CRLau.\n"
 #~ "</qt>"
 
 #, fuzzy
@@ -15221,17 +14916,20 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgstr "&Rhybuddio os bydd yn CRL yn darfod mewn llai na"
 
 #~ msgid "Check to be warned if a CRL expires in the near future"
-#~ msgstr "Brithwch i gael eich rhybuddio os bydd CRL yn darfod yn y dyfodol nesaf"
+#~ msgstr ""
+#~ "Brithwch i gael eich rhybuddio os bydd CRL yn darfod yn y dyfodol nesaf"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "If this box is checked, you will be warned if one of the CRLs you are using is about to expire in the near future.\n"
+#~ "If this box is checked, you will be warned if one of the CRLs you are "
+#~ "using is about to expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Rhybuddio os bydd CRL yn darfod yn y dyfodol nesaf</h1>\n"
-#~ "Os brithir y blwch yma, byddwch yn eich rhybuddio os bydd un o'r CRLau yr ydych yn defnyddio am darfod yn y dyfodol nesaf.\n"
+#~ "Os brithir y blwch yma, byddwch yn eich rhybuddio os bydd un o'r CRLau yr "
+#~ "ydych yn defnyddio am darfod yn y dyfodol nesaf.\n"
 #~ "</qt>"
 
 #~ msgid "Number of days before warning"
@@ -15240,14 +14938,16 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "In this field you can specify how soon before a CRL expires you are warned about this expiry.\n"
+#~ "In this field you can specify how soon before a CRL expires you are "
+#~ "warned about this expiry.\n"
 #~ "<p>\n"
 #~ "The recommended setting for the SPHINX environment is 7 days.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Rhybuddio os bydd CRL yn darfod yn y dyfodol nesaf</h1>\n"
-#~ "Yn y maes yma, gallwch benodi faint mor fuan cyn i CRL ddarfod y byddwch yn cael eich rhybuddio am y darfod.\n"
+#~ "Yn y maes yma, gallwch benodi faint mor fuan cyn i CRL ddarfod y byddwch "
+#~ "yn cael eich rhybuddio am y darfod.\n"
 #~ "<p>\n"
 #~ "Y gosodiad a argymhellir ar gyfer yr amgylchedd SPHINX yw 7 diwrnod.\n"
 #~ "</qt>"
@@ -15256,21 +14956,27 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgstr "Cêl-ysgrifo o hyd pan anfonir i chi eich &hun"
 
 #~ msgid "Check to have encrypted messages also encrypted using your own key."
-#~ msgstr "Brithwch i gêl-ysgrifo negeseuon cêl-ysgrifiedig gan ddefnyddio eich allwedd eich hun hefyd."
+#~ msgstr ""
+#~ "Brithwch i gêl-ysgrifo negeseuon cêl-ysgrifiedig gan ddefnyddio eich "
+#~ "allwedd eich hun hefyd."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always encrypt to self</h1>\n"
-#~ "If this box is checked, encrypted messages sent by you will also be encrypted using your own key.\n"
+#~ "If this box is checked, encrypted messages sent by you will also be "
+#~ "encrypted using your own key.\n"
 #~ "<p>\n"
-#~ "It is recommended to leave this option turned on to enable you to read the messages you have sent.\n"
+#~ "It is recommended to leave this option turned on to enable you to read "
+#~ "the messages you have sent.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Cêl-ysgrifo o hyd pan anfonir i chi eich hun</h1>\n"
-#~ "Os frithir y blwch yma, bydd negeseuon cêl-ysgrifedig a anfonir gennych hefyd yn cael ei cêl-ysgrifo gan ddefnyddio eich allwedd eich hun.\n"
+#~ "Os frithir y blwch yma, bydd negeseuon cêl-ysgrifedig a anfonir gennych "
+#~ "hefyd yn cael ei cêl-ysgrifo gan ddefnyddio eich allwedd eich hun.\n"
 #~ "<p>\n"
-#~ "Argymhellir gadael y dewisiad yma arnodd i alluogi i chi ddarllen y negeseuon a anfonwyd gennych.\n"
+#~ "Argymhellir gadael y dewisiad yma arnodd i alluogi i chi ddarllen y "
+#~ "negeseuon a anfonwyd gennych.\n"
 #~ "</qt>"
 
 #, fuzzy
@@ -15278,21 +14984,28 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgstr "Rhybuddio os bydd &tystysgrif yn y cadwyn yn darfod mewn llai na"
 
 #~ msgid "Check to be warned if the certificate expires soon"
-#~ msgstr "Brithwch i gael eich rhybuddio os bydd y dystysgrif yn darfod yn fuan"
+#~ msgstr ""
+#~ "Brithwch i gael eich rhybuddio os bydd y dystysgrif yn darfod yn fuan"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for encrypting that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for encrypting that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Rhybuddio os derfydd y dystysgrif</h1>\n"
-#~ "Os brithir y dewisiad yma, byddwch yn cael eich rhybuddio wrth geisio defnyddio tystysgrif ar gyfer gêl-ysgrifo sy'n darfod yn ystod y nifer penodol o ddiwrnodau.\n"
+#~ "Os brithir y dewisiad yma, byddwch yn cael eich rhybuddio wrth geisio "
+#~ "defnyddio tystysgrif ar gyfer gêl-ysgrifo sy'n darfod yn ystod y nifer "
+#~ "penodol o ddiwrnodau.\n"
 #~ "<p>\n"
-#~ "Argymhellir cadw'r dewisiad yma arnodd i osgoi defnyddio tystysgrifau sydd am ddarfod yn y dyfodol agos.\n"
+#~ "Argymhellir cadw'r dewisiad yma arnodd i osgoi defnyddio tystysgrifau "
+#~ "sydd am ddarfod yn y dyfodol agos.\n"
 #~ "</qt>"
 
 #, fuzzy
@@ -15315,8 +15028,29 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "Selects which certificates to send"
 #~ msgstr "Dewis pa dystysgrif i'w hanfon"
 
-#~ msgid "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver will not be able to determine whether it was really you who sent the message or whether the message was altered by a third party. <p> The receiver can obtain your certificate from a central server, but you can also opt to enclose your certificate with your message. You can select whether you do not want to include a certificate at all, only your own certificate or the whole chain of certificates that certify your own certificate, including or excluding the root certificate. <p> It is recommended to always include at least your own certificate with the message. <p> This setting is a default, you can override it for each individual message. </qt>"
-#~ msgstr "<qt> <h1>Anfon Tystysgrifau</h1> heb eich tystysgrif, ni fydd y derbyniwr yn gallu penodi a chi yn wir oedd wedi anfon y neges, neu a addaswyd y neges gan drydydd plaid.<p> Gall y derbyniwr gael eich tystysgrif o weinydd canolog, ond gallwch hefyd ddewis amgau eich tystysgrif efo'ch neges.  Gallwch ddewis peidio â cynnwys tystysgrif o gwbl, cynnwys eich tystysgrif eich hun yn unig, neu gynnwys yr holl gadwyn o dystysgrifau sy'n tystysgrifo eich tystysgrif eich hun, yn cynnwys neu peidio â chynnwys y dystysgrif wraidd.<p> Argymhellir gynnwys o hyd o leiaf eich tystysgrif eich hun efo'r neges.<p> Rhagosodiad yw hwn, gallwch ei anwybyddu ar gyfer pob gosodiad unigol. </qt>"
+#~ msgid ""
+#~ "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver "
+#~ "will not be able to determine whether it was really you who sent the "
+#~ "message or whether the message was altered by a third party. <p> The "
+#~ "receiver can obtain your certificate from a central server, but you can "
+#~ "also opt to enclose your certificate with your message. You can select "
+#~ "whether you do not want to include a certificate at all, only your own "
+#~ "certificate or the whole chain of certificates that certify your own "
+#~ "certificate, including or excluding the root certificate. <p> It is "
+#~ "recommended to always include at least your own certificate with the "
+#~ "message. <p> This setting is a default, you can override it for each "
+#~ "individual message. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>Anfon Tystysgrifau</h1> heb eich tystysgrif, ni fydd y derbyniwr "
+#~ "yn gallu penodi a chi yn wir oedd wedi anfon y neges, neu a addaswyd y "
+#~ "neges gan drydydd plaid.<p> Gall y derbyniwr gael eich tystysgrif o "
+#~ "weinydd canolog, ond gallwch hefyd ddewis amgau eich tystysgrif efo'ch "
+#~ "neges.  Gallwch ddewis peidio â cynnwys tystysgrif o gwbl, cynnwys eich "
+#~ "tystysgrif eich hun yn unig, neu gynnwys yr holl gadwyn o dystysgrifau "
+#~ "sy'n tystysgrifo eich tystysgrif eich hun, yn cynnwys neu peidio â "
+#~ "chynnwys y dystysgrif wraidd.<p> Argymhellir gynnwys o hyd o leiaf eich "
+#~ "tystysgrif eich hun efo'r neges.<p> Rhagosodiad yw hwn, gallwch ei "
+#~ "anwybyddu ar gyfer pob gosodiad unigol. </qt>"
 
 #~ msgid "Send &your own certificate"
 #~ msgstr "Anfon &eich tystysgrif eich hun"
@@ -15336,14 +15070,17 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Sign All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are signed by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Llofnodi pob rhan o'r neges gan ragosod</h1>\n"
-#~ "Os ddewisir y dewisiad yma, llofnodir pob rhan o'r neges (h.y. prif gorff y neges yn ogystal â phob atodiad)  gan ragosod.\n"
+#~ "Os ddewisir y dewisiad yma, llofnodir pob rhan o'r neges (h.y. prif gorff "
+#~ "y neges yn ogystal â phob atodiad)  gan ragosod.\n"
 #~ "<p>\n"
 #~ "Rhagosodiad yw hwn, gallwch ei anwybyddu ar gyfer pob gosodiad unigol.\n"
 #~ "</qt>"
@@ -15357,12 +15094,16 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Signing Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be signed.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be signed.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Gofyn cyn llofnodi pob rhan</h1>\n"
-#~ "Os ddewisir y dewisiad yma, gofynnir i chi ar gyfer pob rhan o'r neges (h.y. prif gorff y neges yn ogystal â phob atodiad) yn unigol a ydych eisiau i'r rhan gael ei llofnodi.\n"
+#~ "Os ddewisir y dewisiad yma, gofynnir i chi ar gyfer pob rhan o'r neges (h."
+#~ "y. prif gorff y neges yn ogystal â phob atodiad) yn unigol a ydych eisiau "
+#~ "i'r rhan gael ei llofnodi.\n"
 #~ "</qt>"
 
 #, fuzzy
@@ -15378,7 +15119,8 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ "<h1>Do Not Sign Messages</h1>\n"
 #~ "If this option is selected, messages are not signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
@@ -15389,7 +15131,8 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ "</qt>"
 
 #, fuzzy
-#~ msgid "The signature certificate is configured on the <em>Certificates</em> page."
+#~ msgid ""
+#~ "The signature certificate is configured on the <em>Certificates</em> page."
 #~ msgstr "Ffurfweddir y dystysgrif lofnod ar y dudalen <em>Dystysgrifau</em>!"
 
 #~ msgid "RSA + SHA-1"
@@ -15401,18 +15144,31 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Signature Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The signature algorithm describes how the computer applies your signature key to your message so that the receiver can determine whether the message really is from you.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The signature algorithm describes how the computer applies "
+#~ "your signature key to your message so that the receiver can determine "
+#~ "whether the message really is from you.\n"
 #~ "<p>\n"
-#~ "The selection of a certain signature algorithm determines how easy or how difficult it is to forge a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain signature algorithm determines how easy or how "
+#~ "difficult it is to forge a message. However, all algorithms provided in "
+#~ "the SPHINX environment are considered to be very safe. Generally, the "
+#~ "default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Algorithm Llofnod</h1>\n"
-#~ "Disgrifiad i'r cyfrifiadur am sut i weithredu tasg penodol yw algorithm.  Mae'r algorithm llofnod yn disgrifio sut mae'r cyfrifiadur yn gweithredu eich allwedd lofnod i'ch neges er mwyn i'r derbyniwr allu penodi a yw'r neges yn dod yn wir oddi wrthych.\n"
+#~ "Disgrifiad i'r cyfrifiadur am sut i weithredu tasg penodol yw algorithm.  "
+#~ "Mae'r algorithm llofnod yn disgrifio sut mae'r cyfrifiadur yn gweithredu "
+#~ "eich allwedd lofnod i'ch neges er mwyn i'r derbyniwr allu penodi a yw'r "
+#~ "neges yn dod yn wir oddi wrthych.\n"
 #~ "<p>\n"
-#~ "Mae dewis rhyw algorithm llofnod yn penodi faint mor hawdd neu faint mor anodd yw hi i ffugio neges.  Serch hynny, ystyrir bod pob algorithm a ddarperir yn yr amgylchedd SPHINX yn ddiogel iawn.  Fel rheol, bydd y rhagosodiad yn gweithio yn berffaith iawn yma.\n"
+#~ "Mae dewis rhyw algorithm llofnod yn penodi faint mor hawdd neu faint mor "
+#~ "anodd yw hi i ffugio neges.  Serch hynny, ystyrir bod pob algorithm a "
+#~ "ddarperir yn yr amgylchedd SPHINX yn ddiogel iawn.  Fel rheol, bydd y "
+#~ "rhagosodiad yn gweithio yn berffaith iawn yma.\n"
 #~ "<p>\n"
 #~ "Rhagosodiad yw hwn, gallwch ei anwybyddu ar gyfer pob neges unigol.\n"
 #~ "</qt>"
@@ -15429,12 +15185,16 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Store Messages With Signatures</h1>\n"
-#~ "When this box is checked, sent messages are stored together with the signatures applied to them. This is recommended, because it enables you to check later whether you signed a message or a certain part of it.\n"
+#~ "When this box is checked, sent messages are stored together with the "
+#~ "signatures applied to them. This is recommended, because it enables you "
+#~ "to check later whether you signed a message or a certain part of it.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Cadw negeseuon efo llofnodion</h1>\n"
-#~ "Pan frithir y blwch yma, cedwir negeseuon anfonedig ynghyd â'r llofnodion a weithredwyd iddynt.  Argymhellir hyn, oherwydd mae'n galluogi i chi wirio yn nes ymlaen a wnaethoch chi lofnodi neges neu rhan ohoni.\n"
+#~ "Pan frithir y blwch yma, cedwir negeseuon anfonedig ynghyd â'r llofnodion "
+#~ "a weithredwyd iddynt.  Argymhellir hyn, oherwydd mae'n galluogi i chi "
+#~ "wirio yn nes ymlaen a wnaethoch chi lofnodi neges neu rhan ohoni.\n"
 #~ "</qt>"
 
 #~ msgid "Compound mode:"
@@ -15449,12 +15209,18 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Multipart detached signature</h1>\n"
-#~ "When this option is selected, the signature and the signed data will be separate parts of a Multipart/Signed message part. Signed message data will be readable even by Mail User Agents not supporting the signaturing algorithm and not supporting ASN.1 decoding.\n"
+#~ "When this option is selected, the signature and the signed data will be "
+#~ "separate parts of a Multipart/Signed message part. Signed message data "
+#~ "will be readable even by Mail User Agents not supporting the signaturing "
+#~ "algorithm and not supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Llofnod datgysylltiedig amlran</h1>\n"
-#~ "Pan ddewisir y dewisiad yma, bydd y llofnod a'r data llofnodedig yn rhannau ar wahân o ran neges Amlran/Llofnodedig.  Bydd data neges llofnodedig yn ddarllenadwy hyd yn oed gan Asiantau Defnyddiwr Ebost nad yw yn cynnal yr algorithm llofnodi a nad yw yn cynnal datgodiad ASN.1.\n"
+#~ "Pan ddewisir y dewisiad yma, bydd y llofnod a'r data llofnodedig yn "
+#~ "rhannau ar wahân o ran neges Amlran/Llofnodedig.  Bydd data neges "
+#~ "llofnodedig yn ddarllenadwy hyd yn oed gan Asiantau Defnyddiwr Ebost nad "
+#~ "yw yn cynnal yr algorithm llofnodi a nad yw yn cynnal datgodiad ASN.1.\n"
 #~ "</qt>"
 
 #~ msgid "Opa&que (only recommended for SPHINX)"
@@ -15466,12 +15232,16 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Opaque signed messages</h1>\n"
-#~ "When this option is selected, both the signature and the signed data will be encoded into one ASN.1 block. Messages will be readable only by Mail User Agents supporting ASN.1 decoding.\n"
+#~ "When this option is selected, both the signature and the signed data will "
+#~ "be encoded into one ASN.1 block. Messages will be readable only by Mail "
+#~ "User Agents supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Negeseuon llofnodedig afloyw</h1>\n"
-#~ "Pan ddewisir y dewisiad yma, amgodir y llofnod a'r data llofnodedig i mewn i un bloc ASN.1.  Bydd negeseuon yn ddarllenadwy gan Asiantau Defnyddiwr Ebost sy'n cynnal datgodiad ASN.1 yn unig.\n"
+#~ "Pan ddewisir y dewisiad yma, amgodir y llofnod a'r data llofnodedig i "
+#~ "mewn i un bloc ASN.1.  Bydd negeseuon yn ddarllenadwy gan Asiantau "
+#~ "Defnyddiwr Ebost sy'n cynnal datgodiad ASN.1 yn unig.\n"
 #~ "</qt>"
 
 #~ msgid "Entering PIN is required:"
@@ -15484,8 +15254,23 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgstr "Dewis faint mor aml a ddylai roi'r PIN"
 
 #, fuzzy
-#~ msgid "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter the PIN in order to access your personal security environment (PSE) that contains your certificates. <p> The more often you need to enter your PIN, the more protected you are against email messages being forged in your name, but the more inconvenient operations will be. <p> If you are unsure what to select here, leave this option as it is. <p> Note that it is not possible to turn off PIN entry entirely for security reasons. </qt>"
-#~ msgstr "<qt> <h1>Mewnosod PIN</h1>Yma, gallwch ddewis faint mor aml y mae angen i chi fewnosod y PIN er mwyn cyrchu eich amgylchedd diogelwch personol (PSE) sy'n cynnwys eich tystysgrifau.<p> Yr amlaf y mae angen i chi fewnosod eich PIN, y mwyaf y'ch amddiffynnir yn erbyn negeseuon ebost sy'n cael eu ffugio yn eich enw chi, ond y mwyaf anghyfleus y bydd gweithrediadau.<p> Os ydych yn ansicr am beth i'w ddewis yma, gadewch y dewisiad yma fel mae.<p> Noder nad yw yn bosibl atal mewnosod PIN yn hollol, am resymau diogelwch.</qt>"
+#~ msgid ""
+#~ "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter "
+#~ "the PIN in order to access your personal security environment (PSE) that "
+#~ "contains your certificates. <p> The more often you need to enter your "
+#~ "PIN, the more protected you are against email messages being forged in "
+#~ "your name, but the more inconvenient operations will be. <p> If you are "
+#~ "unsure what to select here, leave this option as it is. <p> Note that it "
+#~ "is not possible to turn off PIN entry entirely for security reasons. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>Mewnosod PIN</h1>Yma, gallwch ddewis faint mor aml y mae angen i "
+#~ "chi fewnosod y PIN er mwyn cyrchu eich amgylchedd diogelwch personol "
+#~ "(PSE) sy'n cynnwys eich tystysgrifau.<p> Yr amlaf y mae angen i chi "
+#~ "fewnosod eich PIN, y mwyaf y'ch amddiffynnir yn erbyn negeseuon ebost "
+#~ "sy'n cael eu ffugio yn eich enw chi, ond y mwyaf anghyfleus y bydd "
+#~ "gweithrediadau.<p> Os ydych yn ansicr am beth i'w ddewis yma, gadewch y "
+#~ "dewisiad yma fel mae.<p> Noder nad yw yn bosibl atal mewnosod PIN yn "
+#~ "hollol, am resymau diogelwch.</qt>"
 
 #~ msgid "Once per session"
 #~ msgstr "Unwaith bob sesiwn"
@@ -15503,16 +15288,22 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for signing that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for signing that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Rhybuddio os derfydd y dystysgrif</h1>\n"
-#~ "Os brithir y dewisiad yma, byddwch yn cael eich rhybuddio wrth geisio defnyddio tystysgrif ar gyfer llofnodi sy'n darfod yn ystod y nifer penodol o ddiwrnodau.\n"
+#~ "Os brithir y dewisiad yma, byddwch yn cael eich rhybuddio wrth geisio "
+#~ "defnyddio tystysgrif ar gyfer llofnodi sy'n darfod yn ystod y nifer "
+#~ "penodol o ddiwrnodau.\n"
 #~ "<p>\n"
-#~ "Argymhellir cadw'r dewisiad yma arnodd i osgoi defnyddio tystysgrifau sydd am ddarfod yn y dyfodol agos.\n"
+#~ "Argymhellir cadw'r dewisiad yma arnodd i osgoi defnyddio tystysgrifau "
+#~ "sydd am ddarfod yn y dyfodol agos.\n"
 #~ "</qt>"
 
 #, fuzzy
@@ -15525,14 +15316,16 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Signer's Email Address Is Not In Certificate</h1>\n"
-#~ "If this option is checked, a warning is issued if the email address of the signer is not contained in the certificate used for signing.\n"
+#~ "If this option is checked, a warning is issued if the email address of "
+#~ "the signer is not contained in the certificate used for signing.\n"
 #~ "<p>\n"
 #~ "It is recommended to leave this option turned on for maximum integrity.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Rhybuddio os nad yw cyfeiriad ebost yr anfonwr yn y dystysgrif</h1>\n"
-#~ "Os brithir y dewisiad yma, rhoir rhybudd os nid yw'r dystysgrif a ddefnyddir ar gyfer llofnodi yn cynnwys  cyfeiriad ebost yr anfonwr.\n"
+#~ "Os brithir y dewisiad yma, rhoir rhybudd os nid yw'r dystysgrif a "
+#~ "ddefnyddir ar gyfer llofnodi yn cynnwys  cyfeiriad ebost yr anfonwr.\n"
 #~ "<p>\n"
 #~ "Argymhellir gadael y dewisiad yma arnodd ar gyfer cywirdeb uchaf.\n"
 #~ "</qt>"
@@ -15631,22 +15424,38 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ "<b>Welcome to the Certificate Wizard.</b>\n"
 #~ "<br>\n"
 #~ "<br>\n"
-#~ "In a few easy steps, this wizard will help you with the creation of a certificate. You use your certificates in order to sign messages, to encrypt messages and to decrypt messages that other people send to you in encrypted form.\n"
+#~ "In a few easy steps, this wizard will help you with the creation of a "
+#~ "certificate. You use your certificates in order to sign messages, to "
+#~ "encrypt messages and to decrypt messages that other people send to you in "
+#~ "encrypted form.\n"
 #~ "<p>\n"
-#~ "The certificates can either be generated in a centralized or a decentralized manner. Please contact your local help desk if you are unsure how to create a certificate in your organization."
+#~ "The certificates can either be generated in a centralized or a "
+#~ "decentralized manner. Please contact your local help desk if you are "
+#~ "unsure how to create a certificate in your organization."
 #~ msgstr ""
 #~ "<b>Croeso i'r Dewin Tystysgrif!</b>\n"
 #~ "<br>\n"
 #~ "<br>\n"
-#~ "Mewn rhai camau hawdd, bydd y dewin yma yn eich cynorthwyo i greu tystysgrif.  Rydych yn defnyddio eich tystysgrifau i lofnodi negeseuon, gêl-ysgrifo negeseuon, a datgelu negeseuon a anfonir i chi gan bobl eraill mewn ffurf gêl-ysgrifedig.\n"
+#~ "Mewn rhai camau hawdd, bydd y dewin yma yn eich cynorthwyo i greu "
+#~ "tystysgrif.  Rydych yn defnyddio eich tystysgrifau i lofnodi negeseuon, "
+#~ "gêl-ysgrifo negeseuon, a datgelu negeseuon a anfonir i chi gan bobl "
+#~ "eraill mewn ffurf gêl-ysgrifedig.\n"
 #~ "<p>\n"
-#~ "Gellir creu y tystysgrifau mewn ffordd canoledig neu ddatcanoledig.  Cysylltwch â'ch canolfan gymorth leol os nid ydych yn sicr am sut i greu tystysgrif yn eich mudiad."
+#~ "Gellir creu y tystysgrifau mewn ffordd canoledig neu ddatcanoledig.  "
+#~ "Cysylltwch â'ch canolfan gymorth leol os nid ydych yn sicr am sut i greu "
+#~ "tystysgrif yn eich mudiad."
 
 #~ msgid "Your Personal Data"
 #~ msgstr "Eich Data Personol"
 
-#~ msgid "On this page, you will enter some personal data that will be stored in your certificate and that will help other people to determine that it is actually you who is sending a message."
-#~ msgstr "Ar y dudalen yma, byddwch yn rhoi data personol i'w cadw yn eich tystysgrif, ac a fydd yn helpu i bobl eraill benodi mai chi sy'n anfon y neges."
+#~ msgid ""
+#~ "On this page, you will enter some personal data that will be stored in "
+#~ "your certificate and that will help other people to determine that it is "
+#~ "actually you who is sending a message."
+#~ msgstr ""
+#~ "Ar y dudalen yma, byddwch yn rhoi data personol i'w cadw yn eich "
+#~ "tystysgrif, ac a fydd yn helpu i bobl eraill benodi mai chi sy'n anfon y "
+#~ "neges."
 
 #~ msgid "Enter your name here"
 #~ msgstr "Rhowch eich enw yma"
@@ -15657,14 +15466,22 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "Enter your organization here"
 #~ msgstr "Rhowch eich mudiad yma"
 
-#~ msgid "Enter your organization (e.g. your company, your department, or your authority) here as it should appear on the certificate."
-#~ msgstr "Rhowch eich mudiad (e.e. eich cwmni, eich adran, neu eich awdurdod) yma fel y dylai ei ddangos yn y tystysgrif."
+#~ msgid ""
+#~ "Enter your organization (e.g. your company, your department, or your "
+#~ "authority) here as it should appear on the certificate."
+#~ msgstr ""
+#~ "Rhowch eich mudiad (e.e. eich cwmni, eich adran, neu eich awdurdod) yma "
+#~ "fel y dylai ei ddangos yn y tystysgrif."
 
 #~ msgid "Enter your email address here"
 #~ msgstr "Rhowch eich cyfeiriad ebost yma"
 
-#~ msgid "Enter the email address here which you want to use in connection with the certificate."
-#~ msgstr "Rhowch y cyfeiriad ebost yma yr hoffech ddefnyddio mewn cysylltiad â'r dystysgrif."
+#~ msgid ""
+#~ "Enter the email address here which you want to use in connection with the "
+#~ "certificate."
+#~ msgstr ""
+#~ "Rhowch y cyfeiriad ebost yma yr hoffech ddefnyddio mewn cysylltiad â'r "
+#~ "dystysgrif."
 
 #~ msgid "&Department:"
 #~ msgstr "&Adran:"
@@ -15675,8 +15492,14 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "Certificate Generation"
 #~ msgstr "Creu Tystysgrif"
 
-#~ msgid "On this page, you will select whether certificate generation is done centralized or decentralized. Please check with your local help desk if you are unsure what to select here."
-#~ msgstr "Ar y dudalen yma, byddwch yn dewis a wneir creu tystysgrif yn ganolog neu yn ganoledig neu yn ddatganoledig.  Gwiriwch efo'ch canolfan gymorth leol os nad ydych yn sicr ynglyn â beth i'w ddewis yma."
+#~ msgid ""
+#~ "On this page, you will select whether certificate generation is done "
+#~ "centralized or decentralized. Please check with your local help desk if "
+#~ "you are unsure what to select here."
+#~ msgstr ""
+#~ "Ar y dudalen yma, byddwch yn dewis a wneir creu tystysgrif yn ganolog neu "
+#~ "yn ganoledig neu yn ddatganoledig.  Gwiriwch efo'ch canolfan gymorth leol "
+#~ "os nad ydych yn sicr ynglyn â beth i'w ddewis yma."
 
 #~ msgid "Certificate &Generation"
 #~ msgstr "C&reu Tystysgrif"
@@ -15695,15 +15518,24 @@ msgstr "Trosysgrifo'r Ffeil?"
 
 #~ msgid ""
 #~ "<qt>\n"
-#~ "Your signature key pair is now ready to be sent to the CA (certification authority) which will generate a certificate for you and send it back via email. Please review the certificate shown below. You should also write down the checksum so that you can match it against the certificate sent back by the CA.\n"
+#~ "Your signature key pair is now ready to be sent to the CA (certification "
+#~ "authority) which will generate a certificate for you and send it back via "
+#~ "email. Please review the certificate shown below. You should also write "
+#~ "down the checksum so that you can match it against the certificate sent "
+#~ "back by the CA.\n"
 #~ "<p>\n"
-#~ "If you want to change anything, press Back and make your changes. Otherwise press Finish to send the signature key pair to the CA.\n"
+#~ "If you want to change anything, press Back and make your changes. "
+#~ "Otherwise press Finish to send the signature key pair to the CA.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "Mae eich ddwy allwedd llofnodi yn barod rwan i'w anfon i'r CA (awdurdod tysysgrifo), fydd yn creu tystysgrif i chi a'i hanfon yn ôl mewn ebost.  Adolygwch y dystysgrif isod.  Dylech hefyd ysgrifennu'r prawfswm i lawr i chi allu ei gydweddu â'r dystysgrif a dychwelir gan y CA.\n"
+#~ "Mae eich ddwy allwedd llofnodi yn barod rwan i'w anfon i'r CA (awdurdod "
+#~ "tysysgrifo), fydd yn creu tystysgrif i chi a'i hanfon yn ôl mewn ebost.  "
+#~ "Adolygwch y dystysgrif isod.  Dylech hefyd ysgrifennu'r prawfswm i lawr i "
+#~ "chi allu ei gydweddu â'r dystysgrif a dychwelir gan y CA.\n"
 #~ "<p>\n"
-#~ "Os hoffech newid rhywbeth, gwthiwch Yn Ôl a gwnewch eich newidiadau.  Fel arall, gwthiwch Gorffen i anfon y ddwy allwedd llofnodi i'r CA..\n"
+#~ "Os hoffech newid rhywbeth, gwthiwch Yn Ôl a gwnewch eich newidiadau.  Fel "
+#~ "arall, gwthiwch Gorffen i anfon y ddwy allwedd llofnodi i'r CA..\n"
 #~ "</qt>"
 
 #~ msgid "Extension"
@@ -15774,11 +15606,15 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgstr "[%1] %2"
 
 #~ msgid ""
-#~ "_n: Transmission complete. %n new message in %1 KB (%2 KB remaining on the server).\n"
-#~ "Transmission complete. %n new messages in %1 KB (%2 KB remaining on the server)."
+#~ "_n: Transmission complete. %n new message in %1 KB (%2 KB remaining on "
+#~ "the server).\n"
+#~ "Transmission complete. %n new messages in %1 KB (%2 KB remaining on the "
+#~ "server)."
 #~ msgstr ""
-#~ "Trosglwyddiad yn gyflawn.  %n neges newydd mewn %1 KB (%2 KB yn weddill ar y gweinydd).\n"
-#~ "Trosglwyddiad yn gyflawn.  %n o negeseuon newydd mewn %1 KB (%2 KB yn weddill ar y gweinydd)."
+#~ "Trosglwyddiad yn gyflawn.  %n neges newydd mewn %1 KB (%2 KB yn weddill "
+#~ "ar y gweinydd).\n"
+#~ "Trosglwyddiad yn gyflawn.  %n o negeseuon newydd mewn %1 KB (%2 KB yn "
+#~ "weddill ar y gweinydd)."
 
 #~ msgid ""
 #~ "_n: Transmission complete. %n message in %1 KB.\n"
@@ -15798,11 +15634,15 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgstr "Trosglwyddiad yn gyflawn. Dim neges newydd."
 
 #~ msgid ""
-#~ "_n: Transmission for account %3 complete. %n new message in %1 KB (%2 KB remaining on the server).\n"
-#~ "Transmission for account %3 complete. %n new messages in %1 KB (%2 KB remaining on the server)."
+#~ "_n: Transmission for account %3 complete. %n new message in %1 KB (%2 KB "
+#~ "remaining on the server).\n"
+#~ "Transmission for account %3 complete. %n new messages in %1 KB (%2 KB "
+#~ "remaining on the server)."
 #~ msgstr ""
-#~ "Trosglwyddiad yn gyflawn ar gyfer cyfrif %3.  %n neges newydd mewn %1 KB (%2 KB yn weddill ar y gweinydd).\n"
-#~ "Trosglwyddiad yn gyflawnar gyfer cyfrif %3.  %n o negeseuon newydd mewn %1 KB (%2 KB yn weddill ar y gweinydd)."
+#~ "Trosglwyddiad yn gyflawn ar gyfer cyfrif %3.  %n neges newydd mewn %1 KB "
+#~ "(%2 KB yn weddill ar y gweinydd).\n"
+#~ "Trosglwyddiad yn gyflawnar gyfer cyfrif %3.  %n o negeseuon newydd mewn "
+#~ "%1 KB (%2 KB yn weddill ar y gweinydd)."
 
 #~ msgid ""
 #~ "_n: Transmission for account %2 complete. %n message in %1 KB.\n"
@@ -15836,8 +15676,11 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "Mark Thread as &Ham"
 #~ msgstr "Nodi'r Edefyn fel E&bost Iawn"
 
-#~ msgid "<qt>The destination folder of the account <b>%1</b> was restored to the inbox.</qt>"
-#~ msgstr "<qt>Adferwyd plygell cyrchfan y cyfrif <b>%1</b> i'r blwch derbyn.</qt>"
+#~ msgid ""
+#~ "<qt>The destination folder of the account <b>%1</b> was restored to the "
+#~ "inbox.</qt>"
+#~ msgstr ""
+#~ "<qt>Adferwyd plygell cyrchfan y cyfrif <b>%1</b> i'r blwch derbyn.</qt>"
 
 #, fuzzy
 #~ msgid "Additionally, mark detected spam messages as read"
@@ -15896,8 +15739,12 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "Invalid Reply-To Address"
 #~ msgstr "Cyfeiriad Ebost Annilys"
 
-#~ msgid "The wallet could not be opened. This error is most probably caused by providing a wrong password."
-#~ msgstr "Ni ellid agor y waled.  Mwy na thebyg, achosir y gwall yma gan ddarparu cyfrinair anghywir."
+#~ msgid ""
+#~ "The wallet could not be opened. This error is most probably caused by "
+#~ "providing a wrong password."
+#~ msgstr ""
+#~ "Ni ellid agor y waled.  Mwy na thebyg, achosir y gwall yma gan ddarparu "
+#~ "cyfrinair anghywir."
 
 #~ msgid "Local"
 #~ msgstr "Lleol"
@@ -15938,12 +15785,18 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgstr "Cynnwys yn yr ymofyn:"
 
 #~ msgid ""
-#~ "The directory ~/KMail exists. From now on, KMail uses the directory ~/Mail for its messages.\n"
-#~ "KMail can move the contents of the directory ~/KMail into ~/Mail, but this will replace existing files with the same name in the directory ~/Mail (e.g. inbox).\n"
+#~ "The directory ~/KMail exists. From now on, KMail uses the directory ~/"
+#~ "Mail for its messages.\n"
+#~ "KMail can move the contents of the directory ~/KMail into ~/Mail, but "
+#~ "this will replace existing files with the same name in the directory ~/"
+#~ "Mail (e.g. inbox).\n"
 #~ "Should KMail move the mail folders now?"
 #~ msgstr ""
-#~ "Mae'r cyfeiriadur ~/KMail yn bodoli.  Ond ers dipyn, defnyddia KMail y cyfeiriadur ~/Mail ar gyfer ei negeseuon.\n"
-#~ "Gall KMail symud cynnwys y cyfeiriadur ~/KMail i mewn i ~/Mail, ond bydd hyn yn amnewid ffeiliau cyfredol efo'r un un enw yn y cyfeiriadur ~/Mail (e.e. blwch derbyn).\n"
+#~ "Mae'r cyfeiriadur ~/KMail yn bodoli.  Ond ers dipyn, defnyddia KMail y "
+#~ "cyfeiriadur ~/Mail ar gyfer ei negeseuon.\n"
+#~ "Gall KMail symud cynnwys y cyfeiriadur ~/KMail i mewn i ~/Mail, ond bydd "
+#~ "hyn yn amnewid ffeiliau cyfredol efo'r un un enw yn y cyfeiriadur ~/Mail "
+#~ "(e.e. blwch derbyn).\n"
 #~ "Dylai KMail symud y plygyll ebost rwan?"
 
 #~ msgid "&Compact"
@@ -16006,12 +15859,23 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgstr "sboncio"
 
 #, fuzzy
-#~ msgid "Your email address is not valid because it does not contain a <emph>@</emph>: you will not create valid messages if you do not change your address."
-#~ msgstr "Nid yw eich cyfeiriad ebost yn ddilys oherwydd nid yw'n cynnwys <emph>@</emph>.  Ni chreuir negeseuon dilys heb i chi newid eich cyfeiriad."
+#~ msgid ""
+#~ "Your email address is not valid because it does not contain a <emph>@</"
+#~ "emph>: you will not create valid messages if you do not change your "
+#~ "address."
+#~ msgstr ""
+#~ "Nid yw eich cyfeiriad ebost yn ddilys oherwydd nid yw'n cynnwys <emph>@</"
+#~ "emph>.  Ni chreuir negeseuon dilys heb i chi newid eich cyfeiriad."
 
 #, fuzzy
-#~ msgid "Your email address is not valid because it contains more than one <emph>@</emph>: you will not create valid messages if you do not change your address."
-#~ msgstr "Nid yw eich cyfeiriad ebost yn ddilys oherwydd mae'n cynnwys mwy nag un <emph>@</emph>.  Ni chreuir negeseuon dilys heb i chi newid eich cyfeiriad."
+#~ msgid ""
+#~ "Your email address is not valid because it contains more than one "
+#~ "<emph>@</emph>: you will not create valid messages if you do not change "
+#~ "your address."
+#~ msgstr ""
+#~ "Nid yw eich cyfeiriad ebost yn ddilys oherwydd mae'n cynnwys mwy nag un "
+#~ "<emph>@</emph>.  Ni chreuir negeseuon dilys heb i chi newid eich "
+#~ "cyfeiriad."
 
 #~ msgid "&Thread list of message headers"
 #~ msgstr "&Edafu'r rhestr o benawdau neges"
@@ -16077,8 +15941,12 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgstr "Anfon &Rwan"
 
 #, fuzzy
-#~ msgid "In order to let Outlook recognize you as the receiver, you need to indicate which one of the following addresses is your email address:"
-#~ msgstr "Er mwyn gadael i Outlook(tm) eich adnabod fel y derbyniwr, rhaid i chi benodi pa un o'r cyfeiriadau ebost dilynnol yw eich cyfeiriad ebost:"
+#~ msgid ""
+#~ "In order to let Outlook recognize you as the receiver, you need to "
+#~ "indicate which one of the following addresses is your email address:"
+#~ msgstr ""
+#~ "Er mwyn gadael i Outlook(tm) eich adnabod fel y derbyniwr, rhaid i chi "
+#~ "benodi pa un o'r cyfeiriadau ebost dilynnol yw eich cyfeiriad ebost:"
 
 #~ msgid "The answer was registered in your calendar."
 #~ msgstr "Cofrestrwyd yr ateb yn eich calendr."
@@ -16086,14 +15954,19 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "The answer was registered in your task list."
 #~ msgstr "Cofrestrwyd yr ateb yn eich rhestr dasgau."
 
-#~ msgid "None of your identities match the receiver of this message,<br> please choose which of the following addresses is yours:"
-#~ msgstr "Nid yw un o'ch dynodiadau yn cydweddu â derbyniwr y neges yma, <br> dewiswch pa un o'r cyfeiriadau dilynnol sy'n biau i chi:"
+#~ msgid ""
+#~ "None of your identities match the receiver of this message,<br> please "
+#~ "choose which of the following addresses is yours:"
+#~ msgstr ""
+#~ "Nid yw un o'ch dynodiadau yn cydweddu â derbyniwr y neges yma, <br> "
+#~ "dewiswch pa un o'r cyfeiriadau dilynnol sy'n biau i chi:"
 
 #~ msgid "Write your name here."
 #~ msgstr "Ysgrifennwch eich enw yma."
 
 #~ msgid "You can write the company or organization you work for."
-#~ msgstr "Gallwch ysgrifennu enw'r cwmni neu mudiad yr ydych yn gweithio iddo."
+#~ msgstr ""
+#~ "Gallwch ysgrifennu enw'r cwmni neu mudiad yr ydych yn gweithio iddo."
 
 #~ msgid "Groupware Functionality for KMail"
 #~ msgstr "Swyddogaeth Gylchwedd ar gyfer KMail"
@@ -16114,8 +15987,22 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgstr "Creu Plygell"
 
 #, fuzzy
-#~ msgid "<b>You do not seem to have any groupware folders configured in KMail.</b><br>This is probably because you are running KMail for the first time, or because you have enabled the groupware functionality for the first time.<br>You now have the choice between disabling the groupware functionality, or leaving it enabled and going through this wizard.<br>If you disable the groupware functionality for now, you can always enable it again from the KMail configure dialog."
-#~ msgstr "<b>Ymddengys nad ydych wedi ffurfweddu plygyll cylchwedd yn KMail.</b><br>Mwy na thebyg, y rheswm yw eich bod yn rhedeg KMail am y tro cyntaf, neu wedi galluogi'r swyddogaeth cylchewedd am y tro cyntaf.<br>Mae gennych y dewis rwan rhwng analluogi'r swyddogaeth cylchwedd, neu ei gadael yn alluog a mynd drwy'r dewin yma.<br>Os analluogwch y swyddogaeth cylchwedd rwan, gallwch o hyd ei halluogi eto o'r ymgom ffurfweddu KMail."
+#~ msgid ""
+#~ "<b>You do not seem to have any groupware folders configured in KMail.</"
+#~ "b><br>This is probably because you are running KMail for the first time, "
+#~ "or because you have enabled the groupware functionality for the first "
+#~ "time.<br>You now have the choice between disabling the groupware "
+#~ "functionality, or leaving it enabled and going through this wizard.<br>If "
+#~ "you disable the groupware functionality for now, you can always enable it "
+#~ "again from the KMail configure dialog."
+#~ msgstr ""
+#~ "<b>Ymddengys nad ydych wedi ffurfweddu plygyll cylchwedd yn KMail.</"
+#~ "b><br>Mwy na thebyg, y rheswm yw eich bod yn rhedeg KMail am y tro "
+#~ "cyntaf, neu wedi galluogi'r swyddogaeth cylchewedd am y tro cyntaf."
+#~ "<br>Mae gennych y dewis rwan rhwng analluogi'r swyddogaeth cylchwedd, neu "
+#~ "ei gadael yn alluog a mynd drwy'r dewin yma.<br>Os analluogwch y "
+#~ "swyddogaeth cylchwedd rwan, gallwch o hyd ei halluogi eto o'r ymgom "
+#~ "ffurfweddu KMail."
 
 #~ msgid "Groupware Functions"
 #~ msgstr "Swyddogaethau Cylchwedd"
@@ -16138,26 +16025,56 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "Please set at least your name and email address."
 #~ msgstr "Gosodwch o leiaf eich enw a'ch cyfeiriad ebost."
 
-#~ msgid "If the groupware server is a kolab server with default settings, you only need to set these settings."
-#~ msgstr "Os mae'r gweinydd cylchwedd yn weinydd kolab efo gosodiadau rhagosod, mae angen i chi osod y gosodiadau yma yn unig."
+#~ msgid ""
+#~ "If the groupware server is a kolab server with default settings, you only "
+#~ "need to set these settings."
+#~ msgstr ""
+#~ "Os mae'r gweinydd cylchwedd yn weinydd kolab efo gosodiadau rhagosod, mae "
+#~ "angen i chi osod y gosodiadau yma yn unig."
 
-#~ msgid "If you want, you can create new accounts before going on with groupware configuration."
-#~ msgstr "Os hoffech, gallwch greu cyfrifon newydd cyn gyrru ymlaen efo ffurfweddu'r gylchwedd."
+#~ msgid ""
+#~ "If you want, you can create new accounts before going on with groupware "
+#~ "configuration."
+#~ msgstr ""
+#~ "Os hoffech, gallwch greu cyfrifon newydd cyn gyrru ymlaen efo "
+#~ "ffurfweddu'r gylchwedd."
 
-#~ msgid "If you want to make your groupware folders work with other applications, you might want to select a different language than English.<br>If this is not an issue, leave the language as is."
-#~ msgstr "Os hoffech wneud i'ch plygyll cylchwedd weithio efo cynhwysiadau eraill, mwy na thebyg byddwch eisiau dewis iaith arall yn lle Saesneg. <br>Os nid yw hyn o bwys, gadewch yr iaith fel mae hi. "
+#~ msgid ""
+#~ "If you want to make your groupware folders work with other applications, "
+#~ "you might want to select a different language than English.<br>If this is "
+#~ "not an issue, leave the language as is."
+#~ msgstr ""
+#~ "Os hoffech wneud i'ch plygyll cylchwedd weithio efo cynhwysiadau eraill, "
+#~ "mwy na thebyg byddwch eisiau dewis iaith arall yn lle Saesneg. <br>Os nid "
+#~ "yw hyn o bwys, gadewch yr iaith fel mae hi. "
 
-#~ msgid "The groupware functionality needs some special folders to store the contents of the calendar, contacts, tasks etc.<br>Please select the folder that the groupware folders should be subfolders of."
-#~ msgstr "Mae angen ar y swyddogaeth cylchwedd rai plygyll arbennig i gadw cynnwys y calendr, cysylltiadau, tasgau, ayyb.<br>Dewiswch y blygell y dylai'r plygyll cylchwedd fod yn is-blygyll ohoni."
+#~ msgid ""
+#~ "The groupware functionality needs some special folders to store the "
+#~ "contents of the calendar, contacts, tasks etc.<br>Please select the "
+#~ "folder that the groupware folders should be subfolders of."
+#~ msgstr ""
+#~ "Mae angen ar y swyddogaeth cylchwedd rai plygyll arbennig i gadw cynnwys "
+#~ "y calendr, cysylltiadau, tasgau, ayyb.<br>Dewiswch y blygell y dylai'r "
+#~ "plygyll cylchwedd fod yn is-blygyll ohoni."
 
 #~ msgid "<unnamed>"
 #~ msgstr "<di-enw>"
 
-#~ msgid "You have chosen the folder <b>%1</b> as parent of the groupware folders. When pressing the Finish button, those folders will be created if they do not already exist"
-#~ msgstr "Rydych wedi dewis y blygell <b>%1</b> fel rhiant y plygyll cylchwedd. Ar ôl i chi wthio'r botwm Gorffen, bydd y plygyll yma yn cael eu creu os nad ydynt mewn bod eisoes."
+#~ msgid ""
+#~ "You have chosen the folder <b>%1</b> as parent of the groupware folders. "
+#~ "When pressing the Finish button, those folders will be created if they do "
+#~ "not already exist"
+#~ msgstr ""
+#~ "Rydych wedi dewis y blygell <b>%1</b> fel rhiant y plygyll cylchwedd. Ar "
+#~ "ôl i chi wthio'r botwm Gorffen, bydd y plygyll yma yn cael eu creu os nad "
+#~ "ydynt mewn bod eisoes."
 
-#~ msgid "The folders present indicates that you want to use the selected folder language"
-#~ msgstr "Mae'r plygyll sydd yma yn awgrymu eich bod chi eisiau defnyddio'r iaith benodol i'r plygyll"
+#~ msgid ""
+#~ "The folders present indicates that you want to use the selected folder "
+#~ "language"
+#~ msgstr ""
+#~ "Mae'r plygyll sydd yma yn awgrymu eich bod chi eisiau defnyddio'r iaith "
+#~ "benodol i'r plygyll"
 
 #, fuzzy
 #~ msgid "The folder language cannot be guessed, please select a language:"
@@ -16213,8 +16130,10 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgstr "blaenyrru i"
 
 #, fuzzy
-#~ msgid "You need to supply a user name and a password to access this mailbox."
-#~ msgstr "Rhaid i chi ddarparu defnydd-enw a chyfrinair i gyrchu'r blwch ebost yma."
+#~ msgid ""
+#~ "You need to supply a user name and a password to access this mailbox."
+#~ msgstr ""
+#~ "Rhaid i chi ddarparu defnydd-enw a chyfrinair i gyrchu'r blwch ebost yma."
 
 #~ msgid "On Program Exit, Perform Following Tasks"
 #~ msgstr "Wrth Terfynu'r Rhaglen, Gweithredu'r Tasgau Dilynol"
@@ -16313,8 +16232,24 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "Security & Privacy Settings"
 #~ msgstr "Gosodiadau Diogelwch a Preifatrwydd"
 
-#~ msgid "<qt><p>This option enables the <em>unconditional</em> sending of delivery- and read confirmations (&quot;receipts&quot;).</p><p>Returning these confirmations (so-called <em>receipts</em>) makes it easy for the sender to track whether and - more importantly - <em>when</em> you read his/her message.</p><p>You can return <em>delivery</em> confirmations in a fine-grained manner using the &quot;confirm delivery&quot; filter action. We advise against issuing <em>read</em> confirmations at all.</p></qt>"
-#~ msgstr "<qt><p>Galluoga'r dewisiad yma yr anfon <em>diamod</em> o gadarnhadau derbyn a darllen (&quot;derbynnebau&quot;).</p><p>Mae dychwelyd y gadarnhadau yma (<em>derbynebau</em> ys dywedir) yn ei gwneud hi'n haws i'r anfonwr i ddilyn a ydych chi wedi darllen, ac - yn mwy bwysig - <em>pryd</em> y wnaethoch ddarllen ei neges.</p><p>Gallwch ddychwelyd cadarnhadau <em>derbyn</em> mewn ffordd graen mân gan ddefnyddio'r weithred hidlo &quot;cadarnhau derbyn&quot;.  Rydym yn eich cynghori yn erbyn cyhoeddi cadarnhadau <em>darllen</em> o gwbl.</p></qt>"
+#~ msgid ""
+#~ "<qt><p>This option enables the <em>unconditional</em> sending of "
+#~ "delivery- and read confirmations (&quot;receipts&quot;).</p><p>Returning "
+#~ "these confirmations (so-called <em>receipts</em>) makes it easy for the "
+#~ "sender to track whether and - more importantly - <em>when</em> you read "
+#~ "his/her message.</p><p>You can return <em>delivery</em> confirmations in "
+#~ "a fine-grained manner using the &quot;confirm delivery&quot; filter "
+#~ "action. We advise against issuing <em>read</em> confirmations at all.</"
+#~ "p></qt>"
+#~ msgstr ""
+#~ "<qt><p>Galluoga'r dewisiad yma yr anfon <em>diamod</em> o gadarnhadau "
+#~ "derbyn a darllen (&quot;derbynnebau&quot;).</p><p>Mae dychwelyd y "
+#~ "gadarnhadau yma (<em>derbynebau</em> ys dywedir) yn ei gwneud hi'n haws "
+#~ "i'r anfonwr i ddilyn a ydych chi wedi darllen, ac - yn mwy bwysig - "
+#~ "<em>pryd</em> y wnaethoch ddarllen ei neges.</p><p>Gallwch ddychwelyd "
+#~ "cadarnhadau <em>derbyn</em> mewn ffordd graen mân gan ddefnyddio'r "
+#~ "weithred hidlo &quot;cadarnhau derbyn&quot;.  Rydym yn eich cynghori yn "
+#~ "erbyn cyhoeddi cadarnhadau <em>darllen</em> o gwbl.</p></qt>"
 
 #~ msgid "Open&PGP"
 #~ msgstr "Open&PGP"
@@ -16334,9 +16269,6 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "&New"
 #~ msgstr "&Newydd"
 
-#~ msgid "Confi&gure..."
-#~ msgstr "Ffurf&weddu..."
-
 #~ msgid "Deac&tivate"
 #~ msgstr "Di&weithredu"
 
@@ -16428,20 +16360,40 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "Can't save to addressbook."
 #~ msgstr "Methu cadw i'r llyfr cyfeiriadau."
 
-#~ msgid "<qt>The email address <b>%1</b> was added to your addressbook. You can add more information to this entry by opening the addressbook.</qt>"
-#~ msgstr "<qt>Ychwanegwyd y cyfeiriad ebost <b>%1</b> i'ch llyfr cyfeiriadau. Gallwch ychwanegu mwy o wybodaeth i'r cofnod yma gan agor y llyfr cyfeiriadau.</qt>"
+#~ msgid ""
+#~ "<qt>The email address <b>%1</b> was added to your addressbook. You can "
+#~ "add more information to this entry by opening the addressbook.</qt>"
+#~ msgstr ""
+#~ "<qt>Ychwanegwyd y cyfeiriad ebost <b>%1</b> i'ch llyfr cyfeiriadau. "
+#~ "Gallwch ychwanegu mwy o wybodaeth i'r cofnod yma gan agor y llyfr "
+#~ "cyfeiriadau.</qt>"
 
 #~ msgid "<qt>The email address <b>%1</b> is already in your addressbook.</qt>"
-#~ msgstr "<qt>Mae'r cyfeiriad ebost <b>%1</b> eisoes yn eich llyfr cyfeiriadau.</qt>"
+#~ msgstr ""
+#~ "<qt>Mae'r cyfeiriad ebost <b>%1</b> eisoes yn eich llyfr cyfeiriadau.</qt>"
 
-#~ msgid "No external address book application found. You might want to install KAddressBook from the tdepim module."
-#~ msgstr "Ni chanfuwyd cymhwysiad llyfr cyfeiriadau allanol.  Efallai hoffech osod KLlyfrCyfeiriadau o'r modiwl tdepim."
+#~ msgid ""
+#~ "No external address book application found. You might want to install "
+#~ "KAddressBook from the tdepim module."
+#~ msgstr ""
+#~ "Ni chanfuwyd cymhwysiad llyfr cyfeiriadau allanol.  Efallai hoffech osod "
+#~ "KLlyfrCyfeiriadau o'r modiwl tdepim."
 
-#~ msgid "The VCard was added to your addressbook. You can add more information to this entry by opening the addressbook."
-#~ msgstr "Ychwanegwyd y VCard i'ch llyfr cyfeiriadau.  Gallwch ychwanegu mwy o wybodaeth i'r cofnod yma gan agor y llyfr cyfeiriadau."
+#~ msgid ""
+#~ "The VCard was added to your addressbook. You can add more information to "
+#~ "this entry by opening the addressbook."
+#~ msgstr ""
+#~ "Ychwanegwyd y VCard i'ch llyfr cyfeiriadau.  Gallwch ychwanegu mwy o "
+#~ "wybodaeth i'r cofnod yma gan agor y llyfr cyfeiriadau."
 
-#~ msgid "The VCard's primary email address is already in your addressbook. However you may save the VCard into a file and import it into the addressbook manually."
-#~ msgstr "Mae prif gyfeiriad ebost y VCard yn eich llyfr cyfeiriadau eisoes.  Ond gallwch gadw'r VCard i mewn i ffeil, a'i fewnforio i'r llyfr cyfeiriadau â llaw."
+#~ msgid ""
+#~ "The VCard's primary email address is already in your addressbook. However "
+#~ "you may save the VCard into a file and import it into the addressbook "
+#~ "manually."
+#~ msgstr ""
+#~ "Mae prif gyfeiriad ebost y VCard yn eich llyfr cyfeiriadau eisoes.  Ond "
+#~ "gallwch gadw'r VCard i mewn i ffeil, a'i fewnforio i'r llyfr cyfeiriadau "
+#~ "â llaw."
 
 #~ msgid "Cancel job"
 #~ msgstr "Diddymu'r swydd"
@@ -16464,23 +16416,47 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "&Attach file..."
 #~ msgstr "A&todi ffeil..."
 
-#~ msgid "You specified not to sign some parts of this message, but you wanted to be warned not to send unsigned messages!"
-#~ msgstr "Rydych wedi penderfynu peidio â llofnodi rhai darnau o'r neges yma, ond roeddech chi eisiau eich rhybuddio i beidio ac anfon negeseuon heb eu llofnodi!"
+#~ msgid ""
+#~ "You specified not to sign some parts of this message, but you wanted to "
+#~ "be warned not to send unsigned messages!"
+#~ msgstr ""
+#~ "Rydych wedi penderfynu peidio â llofnodi rhai darnau o'r neges yma, ond "
+#~ "roeddech chi eisiau eich rhybuddio i beidio ac anfon negeseuon heb eu "
+#~ "llofnodi!"
 
-#~ msgid "You specified not to sign this message, but you wanted to be warned not to send unsigned messages!"
-#~ msgstr "Rydych wedi penderfynu peidio â llofnodi'r neges yma, ond roeddech chi eisiau eich rhybuddio i beidio ac anfon negeseuon heb eu llofnodi!"
+#~ msgid ""
+#~ "You specified not to sign this message, but you wanted to be warned not "
+#~ "to send unsigned messages!"
+#~ msgstr ""
+#~ "Rydych wedi penderfynu peidio â llofnodi'r neges yma, ond roeddech chi "
+#~ "eisiau eich rhybuddio i beidio ac anfon negeseuon heb eu llofnodi!"
 
 #~ msgid "Sign all parts of this message?"
 #~ msgstr "Llofnodi pob rhan o'r neges yma?"
 
-#~ msgid "<qt><p>You have a trusted OpenPGP key for every recipient of this message and the message will be signed.</p><p>Should this message also be encrypted?</p></qt>"
-#~ msgstr "<qt><p>Mae gennych allwedd OpenPGP ymddiriedig ar gyfer pob derbyniwr y neges yma, a bydd y neges yn cael ei llofnodi.</p><p>A ddylai'r neges yma gael ei chêl-ysgrifo hefyd?</p></qt>"
+#~ msgid ""
+#~ "<qt><p>You have a trusted OpenPGP key for every recipient of this message "
+#~ "and the message will be signed.</p><p>Should this message also be "
+#~ "encrypted?</p></qt>"
+#~ msgstr ""
+#~ "<qt><p>Mae gennych allwedd OpenPGP ymddiriedig ar gyfer pob derbyniwr y "
+#~ "neges yma, a bydd y neges yn cael ei llofnodi.</p><p>A ddylai'r neges yma "
+#~ "gael ei chêl-ysgrifo hefyd?</p></qt>"
 
-#~ msgid "You specified not to encrypt some parts of this message, but you wanted to be warned not to send unencrypted messages!"
-#~ msgstr "Rydych wedi penderfynu peidio â chêl-ysgrifo rhai darnau o'r neges yma, ond roeddech chi eisiau eich rhybuddio i beidio ac anfon negeseuon heb eu cêl-ysgrifo!"
+#~ msgid ""
+#~ "You specified not to encrypt some parts of this message, but you wanted "
+#~ "to be warned not to send unencrypted messages!"
+#~ msgstr ""
+#~ "Rydych wedi penderfynu peidio â chêl-ysgrifo rhai darnau o'r neges yma, "
+#~ "ond roeddech chi eisiau eich rhybuddio i beidio ac anfon negeseuon heb eu "
+#~ "cêl-ysgrifo!"
 
-#~ msgid "You specified not to encrypt this message, but you wanted to be warned not to send unencrypted messages!"
-#~ msgstr "Rydych wedi penderfynu peidio â chêl-ysgrifo'r neges yma, ond roeddech chi eisiau eich rhybuddio i beidio ac anfon negeseuon heb eu cêl-ysgrifo!"
+#~ msgid ""
+#~ "You specified not to encrypt this message, but you wanted to be warned "
+#~ "not to send unencrypted messages!"
+#~ msgstr ""
+#~ "Rydych wedi penderfynu peidio â chêl-ysgrifo'r neges yma, ond roeddech "
+#~ "chi eisiau eich rhybuddio i beidio ac anfon negeseuon heb eu cêl-ysgrifo!"
 
 #~ msgid "Encryption Warning"
 #~ msgstr "Rhybudd Cêl-ysgrifo"
@@ -16488,11 +16464,19 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "Warning: Your S/MIME Plug-in configuration is unsafe."
 #~ msgstr "Rhybudd: Mae eich ffurfweddiad Ategyn S/MIME yn anniogel."
 
-#~ msgid "Encrypted messages should be stored in unencrypted form; saving locally in encrypted form is not allowed."
-#~ msgstr "Dylai cadw negeseuon wedi'u cêl-ysgrifo mewn ffurff heb ei gêl-ysgrifo; ni chaniateir cadw'n lleol mewn ffurf wedi ei gêl-ysgrifo."
+#~ msgid ""
+#~ "Encrypted messages should be stored in unencrypted form; saving locally "
+#~ "in encrypted form is not allowed."
+#~ msgstr ""
+#~ "Dylai cadw negeseuon wedi'u cêl-ysgrifo mewn ffurff heb ei gêl-ysgrifo; "
+#~ "ni chaniateir cadw'n lleol mewn ffurf wedi ei gêl-ysgrifo."
 
-#~ msgid "Please correct the wrong settings in KMail's Plug-in configuration pages as soon as possible."
-#~ msgstr "Gwiriwch y gosodiadau anghywir yn nhudalennau ffurfweddiad Ategyn KMail mor gyflym ac sy'n bosibl."
+#~ msgid ""
+#~ "Please correct the wrong settings in KMail's Plug-in configuration pages "
+#~ "as soon as possible."
+#~ msgstr ""
+#~ "Gwiriwch y gosodiadau anghywir yn nhudalennau ffurfweddiad Ategyn KMail "
+#~ "mor gyflym ac sy'n bosibl."
 
 #~ msgid "Store message in the recommended way?"
 #~ msgstr "Cadw'r neges yn y ffordd argymelledig?"
@@ -16506,38 +16490,88 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "<qt><p>This message could not be signed.</p>%1</qt>"
 #~ msgstr "<qt><p>Ni ellid llofnodi'r neges yma.</p>%1</qt>"
 
-#~ msgid "<qt><p><b>This message could not be encrypted!</b></p><p>The Crypto Plug-in '%1' did not return an encoded text block.</p><p>Probably a recipient's public key was not found or is untrusted.</p></qt>"
-#~ msgstr "<qt><p><b>Ni ellid cêl-ysgrifo'r neges yma!</b></p><p>Ni ddychwelodd yr Ategyn Celu '%1' floc testun amgodiedig.</p><p>Mwy na thebyg ni chanfuwyd allwedd gyhoeddus derbyniwr, neu ni ellid rhoi ymddiried ynddi.</p></qt>"
+#~ msgid ""
+#~ "<qt><p><b>This message could not be encrypted!</b></p><p>The Crypto Plug-"
+#~ "in '%1' did not return an encoded text block.</p><p>Probably a "
+#~ "recipient's public key was not found or is untrusted.</p></qt>"
+#~ msgstr ""
+#~ "<qt><p><b>Ni ellid cêl-ysgrifo'r neges yma!</b></p><p>Ni ddychwelodd yr "
+#~ "Ategyn Celu '%1' floc testun amgodiedig.</p><p>Mwy na thebyg ni chanfuwyd "
+#~ "allwedd gyhoeddus derbyniwr, neu ni ellid rhoi ymddiried ynddi.</p></qt>"
 
 #~ msgid "<qt><p>This message could not be encrypted!</p>%1</qt>"
 #~ msgstr "<qt><p>Ni ellid cêl-ysgrifo'r neges yma!</p>%1</qt>"
 
-#~ msgid "<qt><p>Error: The Crypto Plug-in '%1' returned<br>       \" structuring.makeMultiMime \"<br>but did <b>not</b> specify a Content-Type header for the ciphertext that was generated.</p><p>Please report this bug:<br>%2</p></qt>"
-#~ msgstr "<qt><p>Gwall: Dychwelodd yr Ategyn Celu '%1'<br>       \" structuring.makeMultiMime \"<br>ond<b>ni</b> phenododd benawd Math-Cynnwys (Content-Type) ar gyfer y testun seiffr a greuwyd.</p><p>Rhowch adroddiad ynglyn â'r nam yma:<br>%2</p></qt>"
+#~ msgid ""
+#~ "<qt><p>Error: The Crypto Plug-in '%1' returned<br>       \" structuring."
+#~ "makeMultiMime \"<br>but did <b>not</b> specify a Content-Type header for "
+#~ "the ciphertext that was generated.</p><p>Please report this bug:<br>%2</"
+#~ "p></qt>"
+#~ msgstr ""
+#~ "<qt><p>Gwall: Dychwelodd yr Ategyn Celu '%1'<br>       \" structuring."
+#~ "makeMultiMime \"<br>ond<b>ni</b> phenododd benawd Math-Cynnwys (Content-"
+#~ "Type) ar gyfer y testun seiffr a greuwyd.</p><p>Rhowch adroddiad ynglyn "
+#~ "â'r nam yma:<br>%2</p></qt>"
 
 #~ msgid "No, let me change the encoding"
 #~ msgstr "Na, gadewch i mi newid yr amgodiad"
 
-#~ msgid "<qt>This message could not be signed because the OpenPGP key which should be used for signing messages with this identity couldn't be found in your keyring.<br><br>You can change the OpenPGP key which should be used with the current identity in the identity configuration.</qt>"
-#~ msgstr "<qt>Ni allwyd llofnodi'r neges yma oherwydd ni ellid canfod yr allwedd OpenPGP a ddylai gael ei defnyddio ar gyfer llofnodi negeseuon efo'r dynodiad yma ar eich modrwy allweddau.<br><br>Gallwch newid yr allwedd OpenPGP a ddylir ei defnyddio efo'r dynodiad cyfredol yn y ffurfweddiad dynodiadau.</qt>"
+#~ msgid ""
+#~ "<qt>This message could not be signed because the OpenPGP key which should "
+#~ "be used for signing messages with this identity couldn't be found in your "
+#~ "keyring.<br><br>You can change the OpenPGP key which should be used with "
+#~ "the current identity in the identity configuration.</qt>"
+#~ msgstr ""
+#~ "<qt>Ni allwyd llofnodi'r neges yma oherwydd ni ellid canfod yr allwedd "
+#~ "OpenPGP a ddylai gael ei defnyddio ar gyfer llofnodi negeseuon efo'r "
+#~ "dynodiad yma ar eich modrwy allweddau.<br><br>Gallwch newid yr allwedd "
+#~ "OpenPGP a ddylir ei defnyddio efo'r dynodiad cyfredol yn y ffurfweddiad "
+#~ "dynodiadau.</qt>"
 
-#~ msgid "<qt>This message could not be signed because you didn't define the OpenPGP key which should be used for signing messages with this identity.<br><br>You can define the OpenPGP key which should be used with the current identity in the identity configuration.</qt>"
-#~ msgstr "<qt>Ni allwyd llofnodi'r neges yma oherwydd ni wnaethoch benodi yr allwedd OpenPGP a ddylai gael ei defnyddio ar gyfer llofnodi negeseuon efo'r dynodiad yma.<br><br>Gallwch newid yr allwedd OpenPGP a ddylir ei defnyddio efo'r dynodiad cyfredol yn y ffurfweddiad dynodiadau.</qt>"
+#~ msgid ""
+#~ "<qt>This message could not be signed because you didn't define the "
+#~ "OpenPGP key which should be used for signing messages with this identity."
+#~ "<br><br>You can define the OpenPGP key which should be used with the "
+#~ "current identity in the identity configuration.</qt>"
+#~ msgstr ""
+#~ "<qt>Ni allwyd llofnodi'r neges yma oherwydd ni wnaethoch benodi yr "
+#~ "allwedd OpenPGP a ddylai gael ei defnyddio ar gyfer llofnodi negeseuon "
+#~ "efo'r dynodiad yma.<br><br>Gallwch newid yr allwedd OpenPGP a ddylir ei "
+#~ "defnyddio efo'r dynodiad cyfredol yn y ffurfweddiad dynodiadau.</qt>"
 
 #~ msgid "Select Certificate [%1]"
 #~ msgstr "Dewis Tystysgrif [%1]"
 
-#~ msgid "The certificate you want to use for signing expires in %1 days.<br>This means that after this period, the recipients will not be able to check your signature any longer."
-#~ msgstr "Bydd y dystysgrif yr ydych eisiau ei defnyddio ar gyfer llofnodi yn darfod mewn %1 o ddiwrnodau.<br> Golyga hyn na fydd derbynwyr yn gallu gwirio'ch llofnod mwyach ar ôl y cyfnod yma."
+#~ msgid ""
+#~ "The certificate you want to use for signing expires in %1 days.<br>This "
+#~ "means that after this period, the recipients will not be able to check "
+#~ "your signature any longer."
+#~ msgstr ""
+#~ "Bydd y dystysgrif yr ydych eisiau ei defnyddio ar gyfer llofnodi yn "
+#~ "darfod mewn %1 o ddiwrnodau.<br> Golyga hyn na fydd derbynwyr yn gallu "
+#~ "gwirio'ch llofnod mwyach ar ôl y cyfnod yma."
 
-#~ msgid "The certificate you want to use for signing expired %1 days ago.<br>This means that the recipients will not be able to check your signature."
-#~ msgstr "Mae'r dystysgrif yr ydych eisiau ei defnyddio ar gyfer llofnodi wedi darfod %1 o ddiwrnodau yn ôl.<br> Golyga hyn na fydd derbynwyr yn gallu gwirio'ch llofnod."
+#~ msgid ""
+#~ "The certificate you want to use for signing expired %1 days ago.<br>This "
+#~ "means that the recipients will not be able to check your signature."
+#~ msgstr ""
+#~ "Mae'r dystysgrif yr ydych eisiau ei defnyddio ar gyfer llofnodi wedi "
+#~ "darfod %1 o ddiwrnodau yn ôl.<br> Golyga hyn na fydd derbynwyr yn gallu "
+#~ "gwirio'ch llofnod."
 
-#~ msgid "The certificate you want to use for signing expires today.<br>This means that, starting from tomorrow, the recipients will not be able to check your signature any longer."
-#~ msgstr "Mae'r dystysgrif yr ydych eisiau ei defnyddio ar gyfer llofnodi yn darfod heddiw.<br> Golyga hyn na fydd derbynwyr yn gallu gwirio'ch llofnod mwyach, yn dechrau o yfory."
+#~ msgid ""
+#~ "The certificate you want to use for signing expires today.<br>This means "
+#~ "that, starting from tomorrow, the recipients will not be able to check "
+#~ "your signature any longer."
+#~ msgstr ""
+#~ "Mae'r dystysgrif yr ydych eisiau ei defnyddio ar gyfer llofnodi yn darfod "
+#~ "heddiw.<br> Golyga hyn na fydd derbynwyr yn gallu gwirio'ch llofnod "
+#~ "mwyach, yn dechrau o yfory."
 
 #~ msgid "<qt><p>%1</p><p>Do you still want to use this certificate?</p></qt>"
-#~ msgstr "<qt><p>%1</p><p>Ydych eisiau defnyddio'r dystysgrif yma fodd bynnag?</p></qt>"
+#~ msgstr ""
+#~ "<qt><p>%1</p><p>Ydych eisiau defnyddio'r dystysgrif yma fodd bynnag?</p></"
+#~ "qt>"
 
 #~ msgid "Certificate Warning"
 #~ msgstr "Rhybudd Tystysgrif"
@@ -16545,44 +16579,117 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "&Don't Use Certificate"
 #~ msgstr "&Peidio â Defnyddio Tystysgrif"
 
-#~ msgid "The root certificate of the certificate you want to use for signing expires in %1 days.<br>This means that after this period, the recipients will not be able to check your signature any longer."
-#~ msgstr "Bydd tystysgrif wraidd y dystysgrif yr ydych eisiau ei defnyddio ar gyfer llofnodi yn darfod mewn %1 o ddiwrnodau.<br> Golyga hyn na fydd derbynwyr yn gallu gwirio'ch llofnod mwyach ar ôl y cyfnod yma."
+#~ msgid ""
+#~ "The root certificate of the certificate you want to use for signing "
+#~ "expires in %1 days.<br>This means that after this period, the recipients "
+#~ "will not be able to check your signature any longer."
+#~ msgstr ""
+#~ "Bydd tystysgrif wraidd y dystysgrif yr ydych eisiau ei defnyddio ar gyfer "
+#~ "llofnodi yn darfod mewn %1 o ddiwrnodau.<br> Golyga hyn na fydd derbynwyr "
+#~ "yn gallu gwirio'ch llofnod mwyach ar ôl y cyfnod yma."
 
-#~ msgid "The root certificate of the certificate you want to use for signing expired %1 days ago.<br>This means that the recipients will not be able to check your signature."
-#~ msgstr "Darfu tystysgrif wraidd y dystysgrif yr ydych eisiau ei defnyddio ar gyfer llofnodi %1 o ddiwrnodau yn ôl.<br> Golyga hyn na fydd derbynwyr yn gallu gwirio'ch llofnod."
+#~ msgid ""
+#~ "The root certificate of the certificate you want to use for signing "
+#~ "expired %1 days ago.<br>This means that the recipients will not be able "
+#~ "to check your signature."
+#~ msgstr ""
+#~ "Darfu tystysgrif wraidd y dystysgrif yr ydych eisiau ei defnyddio ar "
+#~ "gyfer llofnodi %1 o ddiwrnodau yn ôl.<br> Golyga hyn na fydd derbynwyr yn "
+#~ "gallu gwirio'ch llofnod."
 
-#~ msgid "The root certificate of the certificate you want to use for signing expires today.<br>This means that beginning from tomorrow, the recipients will not be able to check your signature any longer."
-#~ msgstr "Bydd tystysgrif wraidd y dystysgrif yr ydych eisiau ei defnyddio ar gyfer llofnodi yn darfod heddiw.<br> Golyga hyn na fydd derbynwyr yn gallu gwirio'ch llofnod mwyach, yn dechrau o yfory."
+#~ msgid ""
+#~ "The root certificate of the certificate you want to use for signing "
+#~ "expires today.<br>This means that beginning from tomorrow, the recipients "
+#~ "will not be able to check your signature any longer."
+#~ msgstr ""
+#~ "Bydd tystysgrif wraidd y dystysgrif yr ydych eisiau ei defnyddio ar gyfer "
+#~ "llofnodi yn darfod heddiw.<br> Golyga hyn na fydd derbynwyr yn gallu "
+#~ "gwirio'ch llofnod mwyach, yn dechrau o yfory."
 
-#~ msgid "The CA certificate of the certificate you want to use for signing expires in %1 days.<br>This means that after this period, the recipients will not be able to check your signature any longer."
-#~ msgstr "Bydd tystysgrif CA y dystysgrif yr ydych eisiau ei defnyddio ar gyfer llofnodi yn darfod mewn %1 o ddiwrnodau.<br> Golyga hyn na fydd derbynwyr yn gallu gwirio'ch llofnod mwyach ar ôl y cyfnod yma."
+#~ msgid ""
+#~ "The CA certificate of the certificate you want to use for signing expires "
+#~ "in %1 days.<br>This means that after this period, the recipients will not "
+#~ "be able to check your signature any longer."
+#~ msgstr ""
+#~ "Bydd tystysgrif CA y dystysgrif yr ydych eisiau ei defnyddio ar gyfer "
+#~ "llofnodi yn darfod mewn %1 o ddiwrnodau.<br> Golyga hyn na fydd derbynwyr "
+#~ "yn gallu gwirio'ch llofnod mwyach ar ôl y cyfnod yma."
 
-#~ msgid "The CA certificate of the certificate you want to use for signing expired %1 days ago.<br>This means that the recipients will not be able to check your signature."
-#~ msgstr "Darfu tystysgrif CA y dystysgrif yr ydych eisiau ei defnyddio ar gyfer llofnodi %1 o ddiwrnodau yn ôl.<br> Golyga hyn na fydd derbynwyr yn gallu gwirio'ch llofnod."
+#~ msgid ""
+#~ "The CA certificate of the certificate you want to use for signing expired "
+#~ "%1 days ago.<br>This means that the recipients will not be able to check "
+#~ "your signature."
+#~ msgstr ""
+#~ "Darfu tystysgrif CA y dystysgrif yr ydych eisiau ei defnyddio ar gyfer "
+#~ "llofnodi %1 o ddiwrnodau yn ôl.<br> Golyga hyn na fydd derbynwyr yn gallu "
+#~ "gwirio'ch llofnod."
 
-#~ msgid "The CA certificate of the certificate you want to use for signing expires today.<br>This means that beginning from tomorrow, the recipients will not be able to check your signature any longer."
-#~ msgstr "Bydd tystysgrif CA y dystysgrif yr ydych eisiau ei defnyddio ar gyfer llofnodi yn darfod heddiw.<br> Golyga hyn na fydd derbynwyr yn gallu gwirio'ch llofnod mwyach, yn dechrau o yfory."
+#~ msgid ""
+#~ "The CA certificate of the certificate you want to use for signing expires "
+#~ "today.<br>This means that beginning from tomorrow, the recipients will "
+#~ "not be able to check your signature any longer."
+#~ msgstr ""
+#~ "Bydd tystysgrif CA y dystysgrif yr ydych eisiau ei defnyddio ar gyfer "
+#~ "llofnodi yn darfod heddiw.<br> Golyga hyn na fydd derbynwyr yn gallu "
+#~ "gwirio'ch llofnod mwyach, yn dechrau o yfory."
 
-#~ msgid "The certificate you want to use for signing does not contain your sender email address.<br>This means that it is not possible for the recipients to check whether the email really came from you."
-#~ msgstr "Nid yw'r dystysgrif yr ydych eisiau ei defnyddio ar gyfer llofnodi yn cynnwys eich cyfeiriad ebost anfonwr.<br>Golyga hyn na fydd derbynwyr yn gallu gwirio bod yr ebost wedi dod oddiwrthoch chi yn wir."
+#~ msgid ""
+#~ "The certificate you want to use for signing does not contain your sender "
+#~ "email address.<br>This means that it is not possible for the recipients "
+#~ "to check whether the email really came from you."
+#~ msgstr ""
+#~ "Nid yw'r dystysgrif yr ydych eisiau ei defnyddio ar gyfer llofnodi yn "
+#~ "cynnwys eich cyfeiriad ebost anfonwr.<br>Golyga hyn na fydd derbynwyr yn "
+#~ "gallu gwirio bod yr ebost wedi dod oddiwrthoch chi yn wir."
 
 #~ msgid "[unknown error]"
 #~ msgstr "[gwall anhysbys]"
 
-#~ msgid "<qt><p><b>This message could not be signed!</b></p><p>The Crypto Plug-In '%1' reported the following details:</p><p><i>%2</i></p><p>Your configuration might be invalid or the Plug-In damaged.</p><p><b>Please contact your system administrator.</b></p></qt>"
-#~ msgstr "<qt><p><b>Ni ellid llofnodi'r neges yma!</b></p><p>Adroddodd yr Ategyn Celu '%1' y manylion yma:</p><p><i>%2</i></p><p>Gall fod eich ffurfweddiad yn annilys, neu bod yr Ategyn wedi cael niwed.</p> <p><b>Cysylltwch â gweinyddwr eich cysawd.</b></p></qt> "
+#~ msgid ""
+#~ "<qt><p><b>This message could not be signed!</b></p><p>The Crypto Plug-In "
+#~ "'%1' reported the following details:</p><p><i>%2</i></p><p>Your "
+#~ "configuration might be invalid or the Plug-In damaged.</p><p><b>Please "
+#~ "contact your system administrator.</b></p></qt>"
+#~ msgstr ""
+#~ "<qt><p><b>Ni ellid llofnodi'r neges yma!</b></p><p>Adroddodd yr Ategyn "
+#~ "Celu '%1' y manylion yma:</p><p><i>%2</i></p><p>Gall fod eich "
+#~ "ffurfweddiad yn annilys, neu bod yr Ategyn wedi cael niwed.</p> "
+#~ "<p><b>Cysylltwch â gweinyddwr eich cysawd.</b></p></qt> "
 
-#~ msgid "<qt>No active Crypto Plug-In could be found.<br><br>Please activate a Plug-In in the configuration dialog.</qt>"
-#~ msgstr "<qt>Ni ellid canfod Ategyn Celu gweithredol.<br><br>Gweithredwch Ategyn yn yr ymgom ffurfweddiad.</qt>"
+#~ msgid ""
+#~ "<qt>No active Crypto Plug-In could be found.<br><br>Please activate a "
+#~ "Plug-In in the configuration dialog.</qt>"
+#~ msgstr ""
+#~ "<qt>Ni ellid canfod Ategyn Celu gweithredol.<br><br>Gweithredwch Ategyn "
+#~ "yn yr ymgom ffurfweddiad.</qt>"
 
-#~ msgid "<qt><p>The certification revocation lists, that are used for checking the validity of the certificate you want to use for encrypting, expire in %1 days.</p><p>Do you still want to encrypt this message?</p></qt>"
-#~ msgstr "<qt><p>Bydd y rhestri dirymu tystysgrifau, a ddefnyddir i wirio dilysrwydd y dystysgrif yr ydych eisiau ei defnyddio ar gyfer llofnodi, yn darfod mewn %1  o ddiwrnodau.</p><p>Ydych chi eisiau cêl-ysgrifo'r neges yma beth bynnag?</p></qt>"
+#~ msgid ""
+#~ "<qt><p>The certification revocation lists, that are used for checking the "
+#~ "validity of the certificate you want to use for encrypting, expire in %1 "
+#~ "days.</p><p>Do you still want to encrypt this message?</p></qt>"
+#~ msgstr ""
+#~ "<qt><p>Bydd y rhestri dirymu tystysgrifau, a ddefnyddir i wirio "
+#~ "dilysrwydd y dystysgrif yr ydych eisiau ei defnyddio ar gyfer llofnodi, "
+#~ "yn darfod mewn %1  o ddiwrnodau.</p><p>Ydych chi eisiau cêl-ysgrifo'r "
+#~ "neges yma beth bynnag?</p></qt>"
 
-#~ msgid "<qt><p><b>This message could not be encrypted!</b></p><p>The Crypto Plug-In '%1' reported the following details:</p><p><i>%2</i></p><p>Your configuration might be invalid or the Plug-In damaged.</p><p><b>Please contact your system administrator.</b></p></qt>"
-#~ msgstr "<qt><p><b>Ni ellid cêl-ysgrifo'r neges hon!</b></p><p>Adroddodd yr Ategyn Celu '%1' y manylion dilynnol:</p><p><i>%2</i></p><p>Gall fod eich ffurfweddiad yn annilys, neu bod yr Ategyn wedi cael niwed.</p> <p><b>Cysylltwch â gweinyddwr eich cysawd.</b></p></qt> "
+#~ msgid ""
+#~ "<qt><p><b>This message could not be encrypted!</b></p><p>The Crypto Plug-"
+#~ "In '%1' reported the following details:</p><p><i>%2</i></p><p>Your "
+#~ "configuration might be invalid or the Plug-In damaged.</p><p><b>Please "
+#~ "contact your system administrator.</b></p></qt>"
+#~ msgstr ""
+#~ "<qt><p><b>Ni ellid cêl-ysgrifo'r neges hon!</b></p><p>Adroddodd yr Ategyn "
+#~ "Celu '%1' y manylion dilynnol:</p><p><i>%2</i></p><p>Gall fod eich "
+#~ "ffurfweddiad yn annilys, neu bod yr Ategyn wedi cael niwed.</p> "
+#~ "<p><b>Cysylltwch â gweinyddwr eich cysawd.</b></p></qt> "
 
-#~ msgid "Enter different address for recipient %1 or enter \" * \" to see all certificates:"
-#~ msgstr "Rhowch cyfeiriad gwahanol ar gyfer derbyniwr %1 neu rowch  \" * \" i weld pob tystysgrif:"
+#~ msgid ""
+#~ "Enter different address for recipient %1 or enter \" * \" to see all "
+#~ "certificates:"
+#~ msgstr ""
+#~ "Rhowch cyfeiriad gwahanol ar gyfer derbyniwr %1 neu rowch  \" * \" i weld "
+#~ "pob tystysgrif:"
 
 #~ msgid "Select Certificate for Encryption [%1]"
 #~ msgstr "Dewis Tystysgrif ar gyfer Cêl-ysgrifo [%1]"
@@ -16590,29 +16697,71 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "&Select certificate for recipient %1:"
 #~ msgstr "D&ewis tystysgrif ar gyfer derbyniwr %1:"
 
-#~ msgid "(Certificates matching address \"%1\", press [Cancel] to use different address for recipient %2.)"
-#~ msgstr "(Mae'r tystysgrifau yn cydweddu â chyfeiriad \"%1\", gwthiwch [Diddymu] i ddefnyddio cyfeiriad gwahanol ar gyfer derbyniwr %2.)"
+#~ msgid ""
+#~ "(Certificates matching address \"%1\", press [Cancel] to use different "
+#~ "address for recipient %2.)"
+#~ msgstr ""
+#~ "(Mae'r tystysgrifau yn cydweddu â chyfeiriad \"%1\", gwthiwch [Diddymu] i "
+#~ "ddefnyddio cyfeiriad gwahanol ar gyfer derbyniwr %2.)"
 
 #~ msgid "Certificate Warning [%1]"
 #~ msgstr "Rhybudd Tystysgrif [%1]"
 
-#~ msgid "The certificate of the recipient you want to send this message to expires in %1 days.<br>This means that after this period, the recipient will not be able to read your message any longer."
-#~ msgstr "Bydd tystysgrif y derbyniwr yr ydych am anfon y neges yma iddo yn darfod mewn %1 o ddiwrnodau.<br>Golyga hyn na fydd y derbyniwr yn gallu darllen eich neges mwyach ar ôl y cyfnod yna."
+#~ msgid ""
+#~ "The certificate of the recipient you want to send this message to expires "
+#~ "in %1 days.<br>This means that after this period, the recipient will not "
+#~ "be able to read your message any longer."
+#~ msgstr ""
+#~ "Bydd tystysgrif y derbyniwr yr ydych am anfon y neges yma iddo yn darfod "
+#~ "mewn %1 o ddiwrnodau.<br>Golyga hyn na fydd y derbyniwr yn gallu darllen "
+#~ "eich neges mwyach ar ôl y cyfnod yna."
 
-#~ msgid "The certificate of the recipient you want to send this message to expired %1 days ago.<br>This means that the recipient will not be able to read your message."
-#~ msgstr "Darfuwyd tystysgrif y derbyniwr yr ydych am anfon y neges yma iddo ers %1 o ddiwrnodau.<br>Golyga hyn na fydd y derbyniwr yn gallu darllen eich neges."
+#~ msgid ""
+#~ "The certificate of the recipient you want to send this message to expired "
+#~ "%1 days ago.<br>This means that the recipient will not be able to read "
+#~ "your message."
+#~ msgstr ""
+#~ "Darfuwyd tystysgrif y derbyniwr yr ydych am anfon y neges yma iddo ers %1 "
+#~ "o ddiwrnodau.<br>Golyga hyn na fydd y derbyniwr yn gallu darllen eich "
+#~ "neges."
 
-#~ msgid "The certificate of the recipient you want to send this message to expires today.<br>This means that beginning from tomorrow, the recipient will not be able to read your message any longer."
-#~ msgstr "Bydd tystysgrif y derbyniwr yr ydych am anfon y neges yma iddo yn darfod heddiw.<br>Golyga hyn na fydd y derbyniwr yn gallu darllen eich neges mwyach yn dechrau o yfory."
+#~ msgid ""
+#~ "The certificate of the recipient you want to send this message to expires "
+#~ "today.<br>This means that beginning from tomorrow, the recipient will not "
+#~ "be able to read your message any longer."
+#~ msgstr ""
+#~ "Bydd tystysgrif y derbyniwr yr ydych am anfon y neges yma iddo yn darfod "
+#~ "heddiw.<br>Golyga hyn na fydd y derbyniwr yn gallu darllen eich neges "
+#~ "mwyach yn dechrau o yfory."
 
-#~ msgid "One of the certificates in the chain of the certificate of the recipient you want to send this message to expires in %1 days.<br>This means that after this period, the recipient might not be able to read your message any longer."
-#~ msgstr "Bydd un o'r tystysgrifau yn y cadwyn o dystysgrifau'r derbyniwr yr ydych am anfon y neges yma iddo yn darfod mewn %1 o ddiwrnodau.<br>Golyga hyn y gall y derbyniwr fethu darllen eich neges mwyach ar ôl y cyfnod yna."
+#~ msgid ""
+#~ "One of the certificates in the chain of the certificate of the recipient "
+#~ "you want to send this message to expires in %1 days.<br>This means that "
+#~ "after this period, the recipient might not be able to read your message "
+#~ "any longer."
+#~ msgstr ""
+#~ "Bydd un o'r tystysgrifau yn y cadwyn o dystysgrifau'r derbyniwr yr ydych "
+#~ "am anfon y neges yma iddo yn darfod mewn %1 o ddiwrnodau.<br>Golyga hyn y "
+#~ "gall y derbyniwr fethu darllen eich neges mwyach ar ôl y cyfnod yna."
 
-#~ msgid "One of the certificates in the chain of the certificate of the recipient you want to send this message to expired %1 days ago.<br>This means that the recipient might not be able to read your message."
-#~ msgstr "Darfuwyd un o'r tystysgrifau yn y cadwyn o dystysgrifau'r derbyniwr yr ydych am anfon y neges yma iddo ers %1 o ddiwrnodau.<br>Golyga hyn y gall y derbyniwr fethu darllen eich neges."
+#~ msgid ""
+#~ "One of the certificates in the chain of the certificate of the recipient "
+#~ "you want to send this message to expired %1 days ago.<br>This means that "
+#~ "the recipient might not be able to read your message."
+#~ msgstr ""
+#~ "Darfuwyd un o'r tystysgrifau yn y cadwyn o dystysgrifau'r derbyniwr yr "
+#~ "ydych am anfon y neges yma iddo ers %1 o ddiwrnodau.<br>Golyga hyn y gall "
+#~ "y derbyniwr fethu darllen eich neges."
 
-#~ msgid "One of the certificates in the chain of the certificate of the recipient you want to send this message to expires today.<br>This means that beginning from tomorrow, the recipient might not be able to read your message any longer."
-#~ msgstr "Bydd un o'r tystysgrifau yn y cadwyn o dystysgrifau'r derbyniwr yr ydych am anfon y neges yma iddo yn darfod heddiw.<br>Golyga hyn y gall y derbyniwr fethu darllen eich neges mwyach yn dechrau o yfory."
+#~ msgid ""
+#~ "One of the certificates in the chain of the certificate of the recipient "
+#~ "you want to send this message to expires today.<br>This means that "
+#~ "beginning from tomorrow, the recipient might not be able to read your "
+#~ "message any longer."
+#~ msgstr ""
+#~ "Bydd un o'r tystysgrifau yn y cadwyn o dystysgrifau'r derbyniwr yr ydych "
+#~ "am anfon y neges yma iddo yn darfod heddiw.<br>Golyga hyn y gall y "
+#~ "derbyniwr fethu darllen eich neges mwyach yn dechrau o yfory."
 
 #~ msgid "Unable to obtain your public key."
 #~ msgstr "Methu nôl eich allwedd gyhoeddus."
@@ -16623,8 +16772,16 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "Unable to obtain the selected public key."
 #~ msgstr "Methu cael yr allwedd gyhoeddus ddewisiedig."
 
-#~ msgid "<qt><p>In order to be able to encrypt this message you first have to define the OpenPGP key, which should be used to encrypt the message to yourself.</p><p>You can define the OpenPGP key, which should be used with the current identity, in the identity configuration.</p></qt>"
-#~ msgstr "<qt><p>Er mwyn gallu cêl-ysgrifo'r neges yma, rhaid i chi yn gyntaf ddiffinio'r allwedd OpenPGP a ddylir ei defnyddio i gêl-ysgrifo'r neges i chi eich hun.</p><p>Gallwch ddiffinio'r allwedd OpenPGP a ddylir ei defnyddio efo'r dynodiad cyfredol yn y ffurfweddiad dynodiad.</p></qt>"
+#~ msgid ""
+#~ "<qt><p>In order to be able to encrypt this message you first have to "
+#~ "define the OpenPGP key, which should be used to encrypt the message to "
+#~ "yourself.</p><p>You can define the OpenPGP key, which should be used with "
+#~ "the current identity, in the identity configuration.</p></qt>"
+#~ msgstr ""
+#~ "<qt><p>Er mwyn gallu cêl-ysgrifo'r neges yma, rhaid i chi yn gyntaf "
+#~ "ddiffinio'r allwedd OpenPGP a ddylir ei defnyddio i gêl-ysgrifo'r neges i "
+#~ "chi eich hun.</p><p>Gallwch ddiffinio'r allwedd OpenPGP a ddylir ei "
+#~ "defnyddio efo'r dynodiad cyfredol yn y ffurfweddiad dynodiad.</p></qt>"
 
 #~ msgid "&Yes, Send as Is"
 #~ msgstr "&Iawn, Anfon fel Mae"
@@ -16706,19 +16863,26 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgstr "Mae tasg wedi'i neilltuo i chi: <br>%1"
 
 #~ msgid "Sender <b>accepts</b> the invitation to meet in %1<br>from %2 to %3."
-#~ msgstr "<b>Derbynna</b> yr anfonwr y gwahoddiad i gyfarfod yn %1 <br> o %2 i %3."
+#~ msgstr ""
+#~ "<b>Derbynna</b> yr anfonwr y gwahoddiad i gyfarfod yn %1 <br> o %2 i %3."
 
 #~ msgid "Sender <b>accepts</b> the task <b>%1</b>."
 #~ msgstr "<b>Derbynna</b> yr anfonwr y dasg <b>%1</b>."
 
-#~ msgid "Sender <b>tentatively accepts</b> the invitation to meet in %1<br>from %2 to %3."
-#~ msgstr "<b>Derbynna</b> yr anfonwr <b>yn betrus</b> y gwahoddiad i gyfarfod yn %1 <br> o %2 i %3."
+#~ msgid ""
+#~ "Sender <b>tentatively accepts</b> the invitation to meet in %1<br>from %2 "
+#~ "to %3."
+#~ msgstr ""
+#~ "<b>Derbynna</b> yr anfonwr <b>yn betrus</b> y gwahoddiad i gyfarfod yn %1 "
+#~ "<br> o %2 i %3."
 
 #~ msgid "Sender <b>tentatively accepts</b> the task <b>%1</b>."
 #~ msgstr "<b>Derbynna</b> yr anfonwr <b>yn betrus</b> y dasg <b>%1</b>."
 
-#~ msgid "Sender <b>declines</b> the invitation to meet in %1<br>from %2 to %3."
-#~ msgstr "<b>Gwrthoda</b> yr anfonwr y gwahoddiad i gyfarfod yn %1 <br> o %2 i %3."
+#~ msgid ""
+#~ "Sender <b>declines</b> the invitation to meet in %1<br>from %2 to %3."
+#~ msgstr ""
+#~ "<b>Gwrthoda</b> yr anfonwr y gwahoddiad i gyfarfod yn %1 <br> o %2 i %3."
 
 #~ msgid "Sender <b>declines</b> the task %1."
 #~ msgstr "<b>Gwrthoda</b> yr anfonwr y dasg <b>%1</b>."
@@ -16756,8 +16920,12 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "Folder is read-only."
 #~ msgstr "Mae'r blygell yn ddarllenadwy yn unig."
 
-#~ msgid "<qt>Do you really want to delete the selected message?<br>Once deleted, it cannot be restored!</qt>"
-#~ msgstr "<qt>Ydych wir eisiau dileu'r neges ddewisiedig?<br>Wedi'i ddileu, ni ellir ei adfer!</qt>"
+#~ msgid ""
+#~ "<qt>Do you really want to delete the selected message?<br>Once deleted, "
+#~ "it cannot be restored!</qt>"
+#~ msgstr ""
+#~ "<qt>Ydych wir eisiau dileu'r neges ddewisiedig?<br>Wedi'i ddileu, ni "
+#~ "ellir ei adfer!</qt>"
 
 #~ msgid "<qt>Failed to execute signature script<br><b>%1</b>:<br>%2</qt>"
 #~ msgstr "<qt>Methodd weithredu sgript llofnod<br><b>%1</b>:<br>%2</qt>"
@@ -16777,8 +16945,12 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "Empty &Trash"
 #~ msgstr "Gwagu'r &Sbwriel"
 
-#~ msgid "Expire old messages from all folders? Expired messages are permanently deleted."
-#~ msgstr "Darfod hen negeseuon o bob plygell?  Dileuir negeseuon wedi darfod yn barhaol."
+#~ msgid ""
+#~ "Expire old messages from all folders? Expired messages are permanently "
+#~ "deleted."
+#~ msgstr ""
+#~ "Darfod hen negeseuon o bob plygell?  Dileuir negeseuon wedi darfod yn "
+#~ "barhaol."
 
 #~ msgid "Don't Expire"
 #~ msgstr "Peidio â Darfod"
@@ -16789,8 +16961,14 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "Copy Link Location"
 #~ msgstr "Copïo Lleoliad Cyswllt"
 
-#~ msgid "Operations on the parent of a closed thread are now performed on all messages of that thread. That means it is now possible for example to delete a whole thread or subthread by closing it and deleting the parent."
-#~ msgstr "Gweithredir gweithredoedd ar riant edefyn caëedig ar bob neges yn yr edefyn yna rwan.  Golyga hyn ei bod hi'n bosibl, er enghraifft, i ddileu holl edefyn neu is-edefyn drwy ei gau a dileu'r rhiant."
+#~ msgid ""
+#~ "Operations on the parent of a closed thread are now performed on all "
+#~ "messages of that thread. That means it is now possible for example to "
+#~ "delete a whole thread or subthread by closing it and deleting the parent."
+#~ msgstr ""
+#~ "Gweithredir gweithredoedd ar riant edefyn caëedig ar bob neges yn yr "
+#~ "edefyn yna rwan.  Golyga hyn ei bod hi'n bosibl, er enghraifft, i ddileu "
+#~ "holl edefyn neu is-edefyn drwy ei gau a dileu'r rhiant."
 
 #~ msgid "KMail can now be embedded in the Kontact container application."
 #~ msgstr "Gellir mewnadeiladu KMail yn y cymhwysiad cynhwysydd Kyswllt."
@@ -16802,7 +16980,8 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgstr "Cynhelir gwirio sillafu tra'n teipio."
 
 #~ msgid "Panel applet showing unread message totals."
-#~ msgstr "Rhaglennig Panel sy'n dangos cyfansymiau o negeseuon heb eu darllen."
+#~ msgstr ""
+#~ "Rhaglennig Panel sy'n dangos cyfansymiau o negeseuon heb eu darllen."
 
 #~ msgid "Per folder duplicate mail removal"
 #~ msgstr "Gwaredu ebostau dyblyg ym mhob plygell."
@@ -16820,7 +16999,8 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgstr "Blaenbeipio SMTP (cyflymach i anfon ebost)."
 
 #~ msgid "Separate reader window improvements, including new tool bar"
-#~ msgstr "Gwelliannau i'r ffenestr ddarllenydd ar wahân, yn cynnwys bar offer newydd"
+#~ msgstr ""
+#~ "Gwelliannau i'r ffenestr ddarllenydd ar wahân, yn cynnwys bar offer newydd"
 
 #~ msgid "Configurable startup folder."
 #~ msgstr "Plygell cychwyn a ellir ei ffurfweddu."
@@ -16846,14 +17026,16 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "More flexible layout (no message pane or panes side by side)"
 #~ msgstr "Cynllun mwy hyblyg (dim cwarel(i) neges ymyl wrth ymyl)"
 
-#~ msgid "View..."
-#~ msgstr "Gweld..."
-
 #~ msgid "Properties..."
 #~ msgstr "Priodweddau..."
 
-#~ msgid "Only one instance of KMail can be run at any one time. It is already running with PID %1 on host %2 according to the lock file located at %3."
-#~ msgstr "Dim ond un enghraifft o KMail a ellir ei redeg wrth un adeg.  Mae'n rhedeg eisoes efo PID %1 ar westeiwr %2, yn ôl y ffeil clo a leolir wrth %3."
+#~ msgid ""
+#~ "Only one instance of KMail can be run at any one time. It is already "
+#~ "running with PID %1 on host %2 according to the lock file located at %3."
+#~ msgstr ""
+#~ "Dim ond un enghraifft o KMail a ellir ei redeg wrth un adeg.  Mae'n "
+#~ "rhedeg eisoes efo PID %1 ar westeiwr %2, yn ôl y ffeil clo a leolir wrth "
+#~ "%3."
 
 #~ msgid "Good signature!"
 #~ msgstr "Llofnod dilys!"
@@ -16888,16 +17070,24 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>X.500 Directory Services</h1>\n"
-#~ "You can use X.500 directory services to retrieve certificates and certificate revocation lists that are not saved locally. Ask your local administrator if you want to make use of this feature and are unsure which directory service you can use.\n"
+#~ "You can use X.500 directory services to retrieve certificates and "
+#~ "certificate revocation lists that are not saved locally. Ask your local "
+#~ "administrator if you want to make use of this feature and are unsure "
+#~ "which directory service you can use.\n"
 #~ "<p>\n"
-#~ "If you do not use a directory service, you can still use local certificates.\n"
+#~ "If you do not use a directory service, you can still use local "
+#~ "certificates.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Gwasanaethau Cyfeiriadur X.500</h1>\n"
-#~ "Gallwch ddefnyddio gwasanaethau cyfeiriadur X.500 i nôl tystysgrifau a rhestri dirymu tystysgrifau na chedwir yn lleol.  Gofynnwch i'ch gweinyddwr lleol os hoffech ddefnyddio'r nodwedd yma, ac os ydych yn ansicr o ba wasanaeth cyfeiriadur i'w ddefnyddio.\n"
+#~ "Gallwch ddefnyddio gwasanaethau cyfeiriadur X.500 i nôl tystysgrifau a "
+#~ "rhestri dirymu tystysgrifau na chedwir yn lleol.  Gofynnwch i'ch "
+#~ "gweinyddwr lleol os hoffech ddefnyddio'r nodwedd yma, ac os ydych yn "
+#~ "ansicr o ba wasanaeth cyfeiriadur i'w ddefnyddio.\n"
 #~ "<p>\n"
-#~ "Os ni ddefnyddiwch gwasanaeth cyfeiriadur, gallwch ddal i ddefnyddio tystysgrifau lleol serch hynny.\n"
+#~ "Os ni ddefnyddiwch gwasanaeth cyfeiriadur, gallwch ddal i ddefnyddio "
+#~ "tystysgrifau lleol serch hynny.\n"
 #~ "</qt>"
 
 #~ msgid "Local/Remote Certificates"
@@ -16912,12 +17102,18 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>First Local, Then Directory Services</h1>\n"
-#~ "When this option is selected, the email client will first try to find the necessary certificates on your local computer. If they cannot be found there, it will query the directory services specified in the list above in the order given there.\n"
+#~ "When this option is selected, the email client will first try to find the "
+#~ "necessary certificates on your local computer. If they cannot be found "
+#~ "there, it will query the directory services specified in the list above "
+#~ "in the order given there.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Lleol yn gyntaf, wedyn gwasanaethau cyfeiriadur</h1>\n"
-#~ "Pan ddewisir y dewisiad yma, bydd y dibynnydd ebost yn ceisio canfod y tystysgrifau gofynnol ar eich cyfrifiadur lleol yn gyntaf.  Os na ellir eu canfod yna, bydd yn holi y gwasanaethau cyfeiriadur a phenodir yn y rhestr uchod yn y trefn a rhoir yna.\n"
+#~ "Pan ddewisir y dewisiad yma, bydd y dibynnydd ebost yn ceisio canfod y "
+#~ "tystysgrifau gofynnol ar eich cyfrifiadur lleol yn gyntaf.  Os na ellir "
+#~ "eu canfod yna, bydd yn holi y gwasanaethau cyfeiriadur a phenodir yn y "
+#~ "rhestr uchod yn y trefn a rhoir yna.\n"
 #~ "</qt>"
 
 #~ msgid "&Local only, don't use directory services"
@@ -16929,16 +17125,22 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Local Only, Don't Use Directory Services</h1>\n"
-#~ "When this option is selected, the email client will only try to find the necessary certificates on your local computer. If they cannot be found there, they are not available for the operation in question.\n"
+#~ "When this option is selected, the email client will only try to find the "
+#~ "necessary certificates on your local computer. If they cannot be found "
+#~ "there, they are not available for the operation in question.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Lleol yn unig, peidiwch â defnyddio gwasanaethau cyfeiriadur</h1>\n"
-#~ "Pan ddewisir y dewisiad yma, bydd y dibynnydd ebost yn ceisio canfod y tystysgrifau gofynnol ar eich cyfrifiadur lleol yn unig.  Os na ellir eu canfod yna, nid ydynt ar gael ar gyfer y weithrediad penodol.\n"
+#~ "Pan ddewisir y dewisiad yma, bydd y dibynnydd ebost yn ceisio canfod y "
+#~ "tystysgrifau gofynnol ar eich cyfrifiadur lleol yn unig.  Os na ellir eu "
+#~ "canfod yna, nid ydynt ar gael ar gyfer y weithrediad penodol.\n"
 #~ "</qt>"
 
 #~ msgid "&Directory services only, don't use locally saved information"
-#~ msgstr "&Gwasanaethau cyfeiriadur yn unig, peidiwch â defnyddio gwybodaeth a gedwir yn lleol"
+#~ msgstr ""
+#~ "&Gwasanaethau cyfeiriadur yn unig, peidiwch â defnyddio gwybodaeth a "
+#~ "gedwir yn lleol"
 
 #~ msgid "Click to use remote certificates only"
 #~ msgstr "Cliciwch i ddefnyddio tystysgrifau pell yn unig"
@@ -16946,29 +17148,45 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Directory Services Only</h1>\n"
-#~ "When this option is selected, the email client will not use the certificates on your local computer. Instead, it will query the directory services specified in the list above in the order given there. If none of the services has the certificate in question, it cannot be used for the operation.\n"
+#~ "When this option is selected, the email client will not use the "
+#~ "certificates on your local computer. Instead, it will query the directory "
+#~ "services specified in the list above in the order given there. If none of "
+#~ "the services has the certificate in question, it cannot be used for the "
+#~ "operation.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Gwasanaethau cyfeiriadur yn unig</h1>\n"
-#~ "Pan ddewisir y dewisiad yma, ni fydd y dibynnydd ebost yn defnyddio'r tystysgrifau ar eich cyfrifiadur lleol.  Yn lle, bydd yn holi y gwasanaethau cyfeiriadur a phenodir yn y rhestr uchod yn y trefn a rhoir yna.  Os nid oes gan un o'r gwasanaethau y dystysgrif benodol, nid yw ar gael ar gyfer y weithrediad.\n"
+#~ "Pan ddewisir y dewisiad yma, ni fydd y dibynnydd ebost yn defnyddio'r "
+#~ "tystysgrifau ar eich cyfrifiadur lleol.  Yn lle, bydd yn holi y "
+#~ "gwasanaethau cyfeiriadur a phenodir yn y rhestr uchod yn y trefn a rhoir "
+#~ "yna.  Os nid oes gan un o'r gwasanaethau y dystysgrif benodol, nid yw ar "
+#~ "gael ar gyfer y weithrediad.\n"
 #~ "</qt>"
 
 #~ msgid "Local/Remote CRLs"
 #~ msgstr "CRLau Lleol/Pell"
 
 #~ msgid "Click to use both local and remote CRLs"
-#~ msgstr "Cliciwch i ddefnyddio Rhestri Dirymu Tystysgrifau (CRLau) lleol a pell ill dau"
+#~ msgstr ""
+#~ "Cliciwch i ddefnyddio Rhestri Dirymu Tystysgrifau (CRLau) lleol a pell "
+#~ "ill dau"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>First Local, Then Directory Services</h1>\n"
-#~ "When this option is selected, the email client will first try to find the necessary certificate revocation lists (CRLs) on your local computer. If they cannot be found there, it will query the directory services specified in the list above in the order given there.\n"
+#~ "When this option is selected, the email client will first try to find the "
+#~ "necessary certificate revocation lists (CRLs) on your local computer. If "
+#~ "they cannot be found there, it will query the directory services "
+#~ "specified in the list above in the order given there.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Lleol yn gyntaf, wedyn gwasanaethau cyfeiriadur</h1>\n"
-#~ "Pan ddewisir y dewisiad yma, bydd y dibynnydd ebost yn ceisio canfod y rhestri dirymu tystysgrifau (CRLau)   gofynnol ar eich cyfrifiadur lleol yn gyntaf.  Os na ellir eu canfod yna, bydd yn holi y gwasanaethau cyfeiriadur a phenodir yn y rhestr uchod yn y trefn a rhoir yna.\n"
+#~ "Pan ddewisir y dewisiad yma, bydd y dibynnydd ebost yn ceisio canfod y "
+#~ "rhestri dirymu tystysgrifau (CRLau)   gofynnol ar eich cyfrifiadur lleol "
+#~ "yn gyntaf.  Os na ellir eu canfod yna, bydd yn holi y gwasanaethau "
+#~ "cyfeiriadur a phenodir yn y rhestr uchod yn y trefn a rhoir yna.\n"
 #~ "</qt>"
 
 #~ msgid "Click to use only local CRLs"
@@ -16977,12 +17195,18 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Local Only, Don't Use Directory Services</h1>\n"
-#~ "When this option is selected, the email client will only try to find the necessary certificate revocation lists (CRLs) on your local computer. If they cannot be found there, they are not available for the operation in question.\n"
+#~ "When this option is selected, the email client will only try to find the "
+#~ "necessary certificate revocation lists (CRLs) on your local computer. If "
+#~ "they cannot be found there, they are not available for the operation in "
+#~ "question.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Lleol yn unig, peidiwch â defnyddio gwasanaethau cyfeiriadur</h1>\n"
-#~ "Pan ddewisir y dewisiad yma, bydd y dibynnydd ebost yn ceisio canfod y rhestri dirymu tystysgrifau (CRLau) gofynnol ar eich cyfrifiadur lleol yn unig.  Os na ellir eu canfod yna, nid ydynt ar gael ar gyfer y weithrediad penodol.\n"
+#~ "Pan ddewisir y dewisiad yma, bydd y dibynnydd ebost yn ceisio canfod y "
+#~ "rhestri dirymu tystysgrifau (CRLau) gofynnol ar eich cyfrifiadur lleol yn "
+#~ "unig.  Os na ellir eu canfod yna, nid ydynt ar gael ar gyfer y "
+#~ "weithrediad penodol.\n"
 #~ "</qt>"
 
 #~ msgid "Click to use remote CRLs only"
@@ -16991,12 +17215,20 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Directory Services Only</h1>\n"
-#~ "When this option is selected, the email client will not use the certificate revocation lists (CRLs) on your local computer. Instead, it will query the directory services specified in the list above in the order given there. If none of the services has the certificate in question, it cannot be used for the operation.\n"
+#~ "When this option is selected, the email client will not use the "
+#~ "certificate revocation lists (CRLs) on your local computer. Instead, it "
+#~ "will query the directory services specified in the list above in the "
+#~ "order given there. If none of the services has the certificate in "
+#~ "question, it cannot be used for the operation.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Gwasanaethau cyfeiriadur yn unig</h1>\n"
-#~ "Pan ddewisir y dewisiad yma, ni fydd y dibynnydd ebost yn defnyddio'r rhestri dirymu tystysgrifau (CRLau) ar eich cyfrifiadur lleol.  Yn lle, bydd yn holi y gwasanaethau cyfeiriadur a phenodir yn y rhestr uchod yn y trefn a rhoir yna.  Os nid oes gan un o'r gwasanaethau y dystysgrif benodol, nid yw ar gael ar gyfer y weithrediad.\n"
+#~ "Pan ddewisir y dewisiad yma, ni fydd y dibynnydd ebost yn defnyddio'r "
+#~ "rhestri dirymu tystysgrifau (CRLau) ar eich cyfrifiadur lleol.  Yn lle, "
+#~ "bydd yn holi y gwasanaethau cyfeiriadur a phenodir yn y rhestr uchod yn y "
+#~ "trefn a rhoir yna.  Os nid oes gan un o'r gwasanaethau y dystysgrif "
+#~ "benodol, nid yw ar gael ar gyfer y weithrediad.\n"
 #~ "</qt>"
 
 #~ msgid "Click to add a service"
@@ -17005,12 +17237,16 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Add a Directory Service</h1>\n"
-#~ "By clicking this button, you can select a new directory service to be used for retrieving certificates and CRLs. You will be asked for the server name and an optional description.\n"
+#~ "By clicking this button, you can select a new directory service to be "
+#~ "used for retrieving certificates and CRLs. You will be asked for the "
+#~ "server name and an optional description.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Ychwanegu Gwasanaeth Cyfeiriadur</h1>\n"
-#~ "Gan glicio'r botwm yma, gallwch ddewis gwasanaeth cyfeiriadur newydd i'w ddefnyddio ar gyfer nôl tystysgrifau a CRLau.  Byddwch yn cael eich gofyn am enw'r gweinydd a disgrifiad dewisol.\n"
+#~ "Gan glicio'r botwm yma, gallwch ddewis gwasanaeth cyfeiriadur newydd i'w "
+#~ "ddefnyddio ar gyfer nôl tystysgrifau a CRLau.  Byddwch yn cael eich gofyn "
+#~ "am enw'r gweinydd a disgrifiad dewisol.\n"
 #~ "</qt>"
 
 #~ msgid "&Remove Service"
@@ -17019,12 +17255,16 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Remove Directory Service</h1>\n"
-#~ "By clicking this button, you can remove the currently selected directory service in the list above. You will have a chance to rethink your decision before the entry is deleted from the list.\n"
+#~ "By clicking this button, you can remove the currently selected directory "
+#~ "service in the list above. You will have a chance to rethink your "
+#~ "decision before the entry is deleted from the list.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Gwaredu Gwasanaeth Cyfeiriadur</h1>\n"
-#~ "Gan glicio'r botwm yma, gallwch waredu'r gwasanaeth cyfeiriadur a ddewisir ar hyn o bryd yn y rhestr uchod.  Byddwch yn cael cyfle i ail-ystyried eich penderfyniad cyn i'r cofnod gael ei ddileu o'r rhestr.\n"
+#~ "Gan glicio'r botwm yma, gallwch waredu'r gwasanaeth cyfeiriadur a "
+#~ "ddewisir ar hyn o bryd yn y rhestr uchod.  Byddwch yn cael cyfle i ail-"
+#~ "ystyried eich penderfyniad cyn i'r cofnod gael ei ddileu o'r rhestr.\n"
 #~ "</qt>"
 
 #~ msgid "Connection is encrypted"
@@ -17040,23 +17280,55 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ "<p>...y gallwch ddefnuddio bysyll Chwith/Dde eich\n"
 #~ "bysellfwrdd i fynd i'r neges flaenorol/nesaf?</p>\n"
 
-#~ msgid " <qt><h3>KMail Window Layout</h3><ul><li>Long folder list</li><li>MIME tree (if visible) between message list and reader pane</li></ul></qt>"
-#~ msgstr "<qt><h3>Haenlun Ffenest KMail </h3><ul><li>Rhestr hir o blygyll </li><li>Coeden MIME (os yn weladwy) rhwng y rhestr negeseuon a'r cwarel darllenydd</li></ul></qt>"
+#~ msgid ""
+#~ " <qt><h3>KMail Window Layout</h3><ul><li>Long folder list</li><li>MIME "
+#~ "tree (if visible) between message list and reader pane</li></ul></qt>"
+#~ msgstr ""
+#~ "<qt><h3>Haenlun Ffenest KMail </h3><ul><li>Rhestr hir o blygyll </"
+#~ "li><li>Coeden MIME (os yn weladwy) rhwng y rhestr negeseuon a'r cwarel "
+#~ "darllenydd</li></ul></qt>"
 
-#~ msgid " <qt><h3>KMail Window Layout</h3><ul><li>Long folder list</li><li>MIME tree (if visible) below reader pane</li></ul></qt>"
-#~ msgstr "<qt><h3>Haenlun Ffenest KMail </h3><ul><li>Rhestr hir o blygyll </li><li>Coeden MIME (os yn weladwy) dan y cwarel darllenydd</li></ul></qt>"
+#~ msgid ""
+#~ " <qt><h3>KMail Window Layout</h3><ul><li>Long folder list</li><li>MIME "
+#~ "tree (if visible) below reader pane</li></ul></qt>"
+#~ msgstr ""
+#~ "<qt><h3>Haenlun Ffenest KMail </h3><ul><li>Rhestr hir o blygyll </"
+#~ "li><li>Coeden MIME (os yn weladwy) dan y cwarel darllenydd</li></ul></qt>"
 
-#~ msgid " <qt><h3>KMail Window Layout</h3><ul><li>Basically long folder list</ li><li>MIME tree (if visible) below folder list</li></ul></qt>"
-#~ msgstr "<qt><h3>Haenlun Ffenest KMail </h3><ul><li>Rhestr hir sylfaenol o blygyll </li><li>Coeden MIME (os yn weladwy) dan y rhestr plygyll</li></ul></qt>"
+#~ msgid ""
+#~ " <qt><h3>KMail Window Layout</h3><ul><li>Basically long folder list</ "
+#~ "li><li>MIME tree (if visible) below folder list</li></ul></qt>"
+#~ msgstr ""
+#~ "<qt><h3>Haenlun Ffenest KMail </h3><ul><li>Rhestr hir sylfaenol o blygyll "
+#~ "</li><li>Coeden MIME (os yn weladwy) dan y rhestr plygyll</li></ul></qt>"
 
-#~ msgid " <qt><h3>KMail Window Layout</h3><ul><li>Medium folder list</li><li>MIME tree (if visible) between message list and reader pane</li><li>Full width reader pane</li></ul></qt>"
-#~ msgstr "<qt><h3>Haenlun Ffenest KMail </h3><ul><li>Rhestr canolig o blygyll </li><li>Coeden MIME (os yn weladwy) rhwng y rhestr negeseuon a'r cwarel darllenydd</li><li>Cwarel darllenydd lled llawn</li></ul></qt>"
+#~ msgid ""
+#~ " <qt><h3>KMail Window Layout</h3><ul><li>Medium folder list</li><li>MIME "
+#~ "tree (if visible) between message list and reader pane</li><li>Full width "
+#~ "reader pane</li></ul></qt>"
+#~ msgstr ""
+#~ "<qt><h3>Haenlun Ffenest KMail </h3><ul><li>Rhestr canolig o blygyll </"
+#~ "li><li>Coeden MIME (os yn weladwy) rhwng y rhestr negeseuon a'r cwarel "
+#~ "darllenydd</li><li>Cwarel darllenydd lled llawn</li></ul></qt>"
 
-#~ msgid " <qt><h3>KMail Window Layout</h3><ul><li>Short folder list</li><li>MIME tree (if visible) between message list / folder tree and reader pane</li><li>Full width reader pane and MIME tree</li></ul></qt>"
-#~ msgstr "<qt><h3>Haenlun Ffenest KMail </h3><ul><li>Rhestr byr o blygyll </li><li>Coeden MIME (os yn weladwy) rhwng y rhestr negeseuon / coeden MIME a'r cwarel darllenydd</li><li>Cwarel darllenydd lled llawn a choeden MIME</li></ul></qt>"
+#~ msgid ""
+#~ " <qt><h3>KMail Window Layout</h3><ul><li>Short folder list</li><li>MIME "
+#~ "tree (if visible) between message list / folder tree and reader pane</"
+#~ "li><li>Full width reader pane and MIME tree</li></ul></qt>"
+#~ msgstr ""
+#~ "<qt><h3>Haenlun Ffenest KMail </h3><ul><li>Rhestr byr o blygyll </"
+#~ "li><li>Coeden MIME (os yn weladwy) rhwng y rhestr negeseuon / coeden MIME "
+#~ "a'r cwarel darllenydd</li><li>Cwarel darllenydd lled llawn a choeden "
+#~ "MIME</li></ul></qt>"
 
-#~ msgid " <qt><p>Below, you can change the arrangement of KMail's window components (folder list, message list, reader pane and the optional MIME tree).</p></qt>"
-#~ msgstr "<qt><p>Yn isod, gallwch newid trefniant cydrannau ffenest KMail(rhestr plygyll, rhestr negeseuon, cwarel darllenydd, a'r goeden MIME ddewisol.</p></qt>"
+#~ msgid ""
+#~ " <qt><p>Below, you can change the arrangement of KMail's window "
+#~ "components (folder list, message list, reader pane and the optional MIME "
+#~ "tree).</p></qt>"
+#~ msgstr ""
+#~ "<qt><p>Yn isod, gallwch newid trefniant cydrannau ffenest KMail(rhestr "
+#~ "plygyll, rhestr negeseuon, cwarel darllenydd, a'r goeden MIME ddewisol.</"
+#~ "p></qt>"
 
 #~ msgid "&Window Layout"
 #~ msgstr "&Haenlun Ffenest"
@@ -17082,5 +17354,9 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid " <qt>No HTML Message</qt>"
 #~ msgstr "<qt>Dim Neges HTML</qt>"
 
-#~ msgid " <qt><p>The OpenPGP key you choose here will be used to sign messages and to encrypt messages to yourself.</p></qt>"
-#~ msgstr "<qt><p>Defnyddir yr allwedd OpenPGP y dewiswch yma i lofnodi negeseuon ac i gêl-ysgrifennu i'ch hunan. .</p></qt>"
+#~ msgid ""
+#~ " <qt><p>The OpenPGP key you choose here will be used to sign messages and "
+#~ "to encrypt messages to yourself.</p></qt>"
+#~ msgstr ""
+#~ "<qt><p>Defnyddir yr allwedd OpenPGP y dewiswch yma i lofnodi negeseuon ac "
+#~ "i gêl-ysgrifennu i'ch hunan. .</p></qt>"