Merge translation files from master branch.

1 files changed, 858 insertions, 858 deletions

diff --git a/tde-i18n-cy/messages/tdepim/kmail.po b/tde-i18n-cy/messages/tdepim/kmail.po
index 8b69d9abded..8afd06b0546 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: 2020-05-11 13:04+0200\n"
+"POT-Creation-Date: 2020-09-27 21:14+0200\n"
 "PO-Revision-Date: 2004-02-25 13:47+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -104,7 +104,7 @@ msgstr "cofnod amser am negeseuon cyflwr 'Trosglwyddiad wedi'i gwblhau'"
 msgid "multiple encryption keys per address"
 msgstr "allweddau cêl-ysgrifennaeth lluosol am bob cyfeiriad"
 
-#: aboutdata.cpp:212 kmreaderwin.cpp:1303 kmstartup.cpp:149
+#: aboutdata.cpp:212 kmreaderwin.cpp:1302 kmstartup.cpp:149
 #: mailinglistpropertiesdialog.cpp:97
 msgid "KMail"
 msgstr "KMail"
@@ -242,7 +242,7 @@ msgid "Account Type: POP Account"
 msgstr "Math y cyfrif: cyfrif POP"
 
 #: accountdialog.cpp:582 accountdialog.cpp:851 configuredialog.cpp:2550
-#: identitydialog.cpp:112 kmfilterdlg.cpp:164 kmtransport.cpp:376
+#: identitydialog.cpp:112 kmfilterdlg.cpp:163 kmtransport.cpp:376
 msgid "&General"
 msgstr "&Cyffredinol"
 
@@ -350,7 +350,7 @@ msgstr "Ychwan&egion"
 msgid "Check &What the Server Supports"
 msgstr "Gwi&rio Beth a Gynhelir gan y Gweinydd"
 
-#: accountdialog.cpp:782 accountdialog.cpp:1097 kmheaders.cpp:140
+#: accountdialog.cpp:782 accountdialog.cpp:1097 kmheaders.cpp:139
 #: kmtransport.cpp:502
 msgid "Encryption"
 msgstr "Cêl-ysgrifaeth"
@@ -536,7 +536,7 @@ msgstr "<dim>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1438 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "blwch derbyn"
 
@@ -813,13 +813,13 @@ msgstr "Sendmail"
 msgid "Check for supported security capabilities of %1..."
 msgstr ""
 
-#: actionscheduler.cpp:598 kmfiltermgr.cpp:150 kmfiltermgr.cpp:253
-#: kmfiltermgr.cpp:291
+#: actionscheduler.cpp:598 kmfiltermgr.cpp:149 kmfiltermgr.cpp:252
+#: kmfiltermgr.cpp:290
 msgid "<b>Evaluating filter rules:</b> "
 msgstr ""
 
-#: actionscheduler.cpp:605 kmfiltermgr.cpp:157 kmfiltermgr.cpp:260
-#: kmfiltermgr.cpp:297
+#: actionscheduler.cpp:605 kmfiltermgr.cpp:156 kmfiltermgr.cpp:259
+#: kmfiltermgr.cpp:296
 msgid "<b>Filter rules have matched.</b>"
 msgstr ""
 
@@ -1393,13 +1393,13 @@ msgstr "Cyfrifon allfynd (ychwanegwch o leiaf un):"
 
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
 #: customtemplates_base.ui:89 distributionlistdialog.cpp:116
-#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:396 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Enw"
 
 #: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
-#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
+#: kmcomposewin.cpp:399 kmfilterdlg.cpp:217 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Math\t"
@@ -1421,7 +1421,7 @@ msgstr "Gosod yn Ragosodyn"
 msgid "Common Options"
 msgstr "Dewisiadau Cyffredin"
 
-#: configuredialog.cpp:661 kmail.kcfg:412
+#: configuredialog.cpp:661 kmail.kcfg:408
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "Cadarnha&u cyn anfon"
@@ -1658,7 +1658,7 @@ msgstr "Testun Dyfynedig - Trydydd Lefel"
 msgid "Fixed Width Font"
 msgstr "Wynebfath o Led Gosodedig"
 
-#: configuredialog.cpp:1549 kmcomposewin.cpp:386
+#: configuredialog.cpp:1549 kmcomposewin.cpp:385
 msgid "Composer"
 msgstr "Cyfansoddydd"
 
@@ -1985,7 +1985,7 @@ msgstr "Dangos b&ar cyflwr HTML"
 msgid "Show s&pam status in fancy headers"
 msgstr "Dangos pob penawd y negeseuon"
 
-#: configuredialog.cpp:2233 kmail.kcfg:583
+#: configuredialog.cpp:2233 kmail.kcfg:579
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr ""
@@ -1994,7 +1994,7 @@ msgstr ""
 msgid "Use smaller font for quoted text"
 msgstr ""
 
-#: configuredialog.cpp:2241 kmail.kcfg:588
+#: configuredialog.cpp:2241 kmail.kcfg:584
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr ""
@@ -2013,7 +2013,7 @@ msgstr ""
 msgid "Fallback ch&aracter encoding:"
 msgstr "Goso&d Amgodiad"
 
-#: configuredialog.cpp:2338 configuredialog.cpp:2400 kmreaderwin.cpp:584
+#: configuredialog.cpp:2338 configuredialog.cpp:2400 kmreaderwin.cpp:583
 msgid "Auto"
 msgstr "Ymysgogol"
 
@@ -2022,7 +2022,7 @@ msgstr "Ymysgogol"
 msgid "&Override character encoding:"
 msgstr "Goso&d Amgodiad"
 
-#: configuredialog.cpp:2486 kmail.kcfg:105
+#: configuredialog.cpp:2486 kmail.kcfg:104
 #, fuzzy, no-c-format
 msgid "Enable system tray icon"
 msgstr "hysbysiad cafn cysawd"
@@ -2114,11 +2114,11 @@ msgstr "Efo Atodiad"
 msgid "Configure Completion Order"
 msgstr "Ffurfweddu Cylchwedd"
 
-#: configuredialog.cpp:2761 kmlineeditspell.cpp:159
+#: configuredialog.cpp:2761 kmlineeditspell.cpp:158
 msgid "Edit Recent Addresses..."
 msgstr ""
 
-#: configuredialog.cpp:2768 kmedit.cpp:633
+#: configuredialog.cpp:2768 kmedit.cpp:632
 msgid "External Editor"
 msgstr "Golygydd Allanol"
 
@@ -2169,15 +2169,15 @@ msgstr "B&laenyrru:"
 msgid "&Quote indicator:"
 msgstr "&Dynodydd dyfynnod:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4051
+#: configuredialog.cpp:3035 kmmessage.cpp:4050
 msgid "On %D, you wrote:"
 msgstr "Ar %D, wnaethoch ysgrifennu:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4053
+#: configuredialog.cpp:3036 kmmessage.cpp:4052
 msgid "On %D, %F wrote:"
 msgstr "Ar %D, ysgrifennodd %F:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4055
+#: configuredialog.cpp:3037 kmmessage.cpp:4054
 msgid "Forwarded Message"
 msgstr "Neges a Flaenyrrwyd"
 
@@ -2255,7 +2255,7 @@ msgstr "Gwerth"
 msgid "Ne&w"
 msgstr "Ne&wydd"
 
-#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:268
 #: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
 #: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
@@ -2266,7 +2266,7 @@ msgstr "&Enw:"
 msgid "&Value:"
 msgstr "&Gwerth:"
 
-#: configuredialog.cpp:3581 kmail.kcfg:389
+#: configuredialog.cpp:3581 kmail.kcfg:385
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr ""
@@ -2292,13 +2292,13 @@ msgstr "Adnabod unrhyw un o'r allweddeiriau dilynnol fel bwriad o atodi ffeil:"
 msgid "Enter new key word:"
 msgstr "Rhowch allweddair newydd:"
 
-#: configuredialog.cpp:3634 configuredialog.cpp:3635 kmcomposewin.cpp:2297
-#: kmcomposewin.cpp:2298
+#: configuredialog.cpp:3634 configuredialog.cpp:3635 kmcomposewin.cpp:2296
+#: kmcomposewin.cpp:2297
 msgid "attachment"
 msgstr "atodiad"
 
-#: configuredialog.cpp:3636 configuredialog.cpp:3637 kmcomposewin.cpp:2299
-#: kmcomposewin.cpp:2300
+#: configuredialog.cpp:3636 configuredialog.cpp:3637 kmcomposewin.cpp:2298
+#: kmcomposewin.cpp:2299
 msgid "attached"
 msgstr "atodedig"
 
@@ -2477,7 +2477,7 @@ msgstr "Hysbysiadau Lleoliad Neges"
 msgid "Send policy:"
 msgstr "Polisi anfon:"
 
-#: configuredialog.cpp:3845 kmmessage.cpp:1381 kmmessage.cpp:1388
+#: configuredialog.cpp:3845 kmmessage.cpp:1380 kmmessage.cpp:1387
 msgid "&Ignore"
 msgstr "&Anwybyddu"
 
@@ -2897,7 +2897,7 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#: configuredialog.cpp:4970 kmail.kcfg:190
+#: configuredialog.cpp:4970 kmail.kcfg:189
 #, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr ""
@@ -2908,7 +2908,7 @@ msgid ""
 "understands."
 msgstr ""
 
-#: configuredialog.cpp:4977 kmail.kcfg:196
+#: configuredialog.cpp:4977 kmail.kcfg:195
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr ""
@@ -3354,7 +3354,7 @@ msgstr "R&hestr hir o blygyll"
 msgid "Favorite Folders"
 msgstr "Creu Plygell"
 
-#: favoritefolderview.cpp:337 kmfoldertree.cpp:1190 kmmainwidget.cpp:2790
+#: favoritefolderview.cpp:337 kmfoldertree.cpp:1190 kmmainwidget.cpp:2789
 msgid "&Assign Shortcut..."
 msgstr ""
 
@@ -3499,155 +3499,155 @@ msgid ""
 msgstr ""
 
 #: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
-#: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
+#: kmmainwidget.cpp:1771 kmmainwidget.cpp:1788 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "Gwall KMail"
 
-#: folderdiaacltab.cpp:78
+#: folderdiaacltab.cpp:77
 msgid ""
 "_: Permissions\n"
 "None"
 msgstr "Dim"
 
-#: folderdiaacltab.cpp:79
+#: folderdiaacltab.cpp:78
 msgid ""
 "_: Permissions\n"
 "Read"
 msgstr "Darllen"
 
-#: folderdiaacltab.cpp:80
+#: folderdiaacltab.cpp:79
 msgid ""
 "_: Permissions\n"
 "Append"
 msgstr "Atodi"
 
-#: folderdiaacltab.cpp:81
+#: folderdiaacltab.cpp:80
 msgid ""
 "_: Permissions\n"
 "Write"
 msgstr "Ysgrifennu"
 
-#: folderdiaacltab.cpp:82
+#: folderdiaacltab.cpp:81
 msgid ""
 "_: Permissions\n"
 "All"
 msgstr "Popeth"
 
-#: folderdiaacltab.cpp:95
+#: folderdiaacltab.cpp:94
 #, fuzzy
 msgid "&User identifier:"
 msgstr "&Defnyddio Tystysgrif"
 
-#: folderdiaacltab.cpp:101
+#: folderdiaacltab.cpp:100
 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."
 msgstr ""
 
-#: folderdiaacltab.cpp:103 recipientseditor.cpp:776
+#: folderdiaacltab.cpp:102 recipientseditor.cpp:776
 msgid "Se&lect..."
 msgstr "De&wis..."
 
-#: folderdiaacltab.cpp:106 folderdiaacltab.cpp:340
+#: folderdiaacltab.cpp:105 folderdiaacltab.cpp:339
 msgid "Permissions"
 msgstr "Caniatadau"
 
-#: folderdiaacltab.cpp:118
+#: folderdiaacltab.cpp:117
 msgid "<b>Note: </b>Renaming requires write permissions on the parent folder."
 msgstr ""
 
-#: folderdiaacltab.cpp:245
+#: folderdiaacltab.cpp:244
 msgid "Custom Permissions"
 msgstr ""
 
-#: folderdiaacltab.cpp:247
+#: folderdiaacltab.cpp:246
 msgid "Custom Permissions (%1)"
 msgstr ""
 
-#: folderdiaacltab.cpp:339
+#: folderdiaacltab.cpp:338
 msgid "User Id"
 msgstr "Dynodiad Defnyddiwr"
 
-#: folderdiaacltab.cpp:351
+#: folderdiaacltab.cpp:350
 msgid "Add Entry..."
 msgstr "Ychwanegu cofnod ..."
 
-#: folderdiaacltab.cpp:352
+#: folderdiaacltab.cpp:351
 #, fuzzy
 msgid "Modify Entry..."
 msgstr "Addasu cyfrif"
 
-#: folderdiaacltab.cpp:353
+#: folderdiaacltab.cpp:352
 msgid "Remove Entry"
 msgstr "Diddymu Cofnod"
 
-#: folderdiaacltab.cpp:428
+#: folderdiaacltab.cpp:427
 msgid "Error retrieving user permissions."
 msgstr ""
 
-#: folderdiaacltab.cpp:430
+#: folderdiaacltab.cpp:429
 #, fuzzy
 msgid ""
 "You might not have enough permissions to see the permissions of this folder."
 msgstr "Nid oes gennych ganiatád darllen/ysgrifennu i'ch plygell sbwriel."
 
-#: folderdiaacltab.cpp:435
+#: folderdiaacltab.cpp:434
 msgid ""
 "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
+#: folderdiaacltab.cpp:449 folderdiaquotatab.cpp:113
 msgid "Error: no IMAP account defined for this folder"
 msgstr ""
 
-#: folderdiaacltab.cpp:456 folderdiaquotatab.cpp:120
+#: folderdiaacltab.cpp:455 folderdiaquotatab.cpp:119
 msgid "Connecting to server %1, please wait..."
 msgstr ""
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:473 folderdiaquotatab.cpp:138 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr ""
 
-#: folderdiaacltab.cpp:494 folderdiaacltab.cpp:522
+#: folderdiaacltab.cpp:493 folderdiaacltab.cpp:521
 msgid "This IMAP server does not have support for access control lists (ACL)"
 msgstr ""
 
-#: folderdiaacltab.cpp:524
+#: folderdiaacltab.cpp:523
 #, c-format
 msgid ""
 "Error retrieving access control list (ACL) from server\n"
 "%1"
 msgstr ""
 
-#: folderdiaacltab.cpp:569
+#: folderdiaacltab.cpp:568
 msgid "Modify Permissions"
 msgstr ""
 
-#: folderdiaacltab.cpp:603
+#: folderdiaacltab.cpp:602
 msgid "Add Permissions"
 msgstr ""
 
-#: folderdiaacltab.cpp:636
+#: folderdiaacltab.cpp:635
 msgid ""
 "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
+#: folderdiaquotatab.cpp:162 folderdiaquotatab.cpp:176
 msgid "This account does not have support for quota information."
 msgstr ""
 
-#: folderdiaquotatab.cpp:165
+#: folderdiaquotatab.cpp:164
 #, fuzzy, c-format
 msgid ""
 "Error retrieving quota information from server\n"
 "%1"
 msgstr "Dim negeseuon newydd o'r gweinydd"
 
-#: folderdiaquotatab.cpp:184
+#: folderdiaquotatab.cpp:183
 msgid "No quota is set for this folder."
 msgstr ""
 
@@ -3695,7 +3695,7 @@ msgid ""
 "associate with this folder.</qt>"
 msgstr ""
 
-#: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
+#: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:529 snippetdlg.cpp:100
 msgid "The selected shortcut is already used, please select a different one."
 msgstr ""
 
@@ -3733,7 +3733,7 @@ msgstr "Anhysbys"
 
 #: headeritem.cpp:193 headerstyle.cpp:141 headerstyle.cpp:240
 #: headerstyle.cpp:445 headerstyle.cpp:743 headerstyle.cpp:898
-#: kmmainwidget.cpp:1029
+#: kmmainwidget.cpp:1028
 msgid "No Subject"
 msgstr "Dim Pwnc"
 
@@ -4134,12 +4134,12 @@ msgstr "Plygell S&bwriel:"
 msgid "Special &transport:"
 msgstr "Cludiant &arbennig:"
 
-#: identitydialog.cpp:410 kmfolderdia.cpp:808
+#: identitydialog.cpp:410 kmfolderdia.cpp:807
 #, fuzzy
 msgid "&Use custom message templates"
 msgstr "&Defnyddio ôlddodiad dynodiad neges addasiedig."
 
-#: identitydialog.cpp:416 kmfolderdia.cpp:816
+#: identitydialog.cpp:416 kmfolderdia.cpp:815
 msgid "&Copy global templates"
 msgstr ""
 
@@ -4151,7 +4151,7 @@ msgstr "&Llofnod"
 msgid "&Picture"
 msgstr "&Llun"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4115
 msgid "Invalid Email Address"
 msgstr "Cyfeiriad Ebost Annilys"
 
@@ -4979,7 +4979,7 @@ msgstr "Ymofyn cyfrif %1 am ebost newydd."
 msgid " completed"
 msgstr " gorffenwyd"
 
-#: kmacctimap.cpp:607 kmheaders.cpp:1313
+#: kmacctimap.cpp:607 kmheaders.cpp:1312
 msgid "Unable to process messages: "
 msgstr "Methu prosesu'r negeseuon:"
 
@@ -5061,84 +5061,84 @@ msgstr "IMAP wedi'i Dda&d-gysylltu"
 msgid "&Maildir mailbox"
 msgstr "Blwch &ebost Maildir"
 
-#: kmail_options.h:11
+#: kmail_options.h:10
 #, fuzzy
 msgid "Set subject of message"
 msgstr "Gosd pwnc y neges."
 
-#: kmail_options.h:13
+#: kmail_options.h:12
 #, fuzzy
 msgid "Send CC: to 'address'"
 msgstr "Anfon CC: i 'gyfeiriad'."
 
-#: kmail_options.h:15
+#: kmail_options.h:14
 #, fuzzy
 msgid "Send BCC: to 'address'"
 msgstr "Anfon BCC: i 'gyfeiriad'."
 
-#: kmail_options.h:17
+#: kmail_options.h:16
 #, fuzzy
 msgid "Add 'header' to message"
 msgstr "Ychwanegu 'penawd' i'r neges."
 
-#: kmail_options.h:18
+#: kmail_options.h:17
 #, fuzzy
 msgid "Read message body from 'file'"
 msgstr "Darllen corff y neges o 'ffeil'."
 
-#: kmail_options.h:19
+#: kmail_options.h:18
 #, fuzzy
 msgid "Set body of message"
 msgstr "Gosod corff y neges."
 
-#: kmail_options.h:20
+#: kmail_options.h:19
 #, 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
+#: kmail_options.h:20
 #, fuzzy
 msgid "Only check for new mail"
 msgstr "Ymofyn am ebost newydd yn unig."
 
-#: kmail_options.h:22
+#: kmail_options.h:21
 #, fuzzy
 msgid "Only open composer window"
 msgstr "Agor ffenestr gyfansoddi yn unig."
 
-#: kmail_options.h:23
+#: kmail_options.h:22
 #, fuzzy
 msgid "View the given message file"
 msgstr "Dan y c&warel neges"
 
-#: kmail_options.h:24
+#: kmail_options.h:23
 #, 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
+#: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:505 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Post"
 
-#: kmailicalifaceimpl.cpp:94 kmfolderdia.cpp:507 newfolderdialog.cpp:131
+#: kmailicalifaceimpl.cpp:94 kmfolderdia.cpp:506 newfolderdialog.cpp:131
 msgid "Calendar"
 msgstr "Calendr"
 
-#: kmailicalifaceimpl.cpp:95 kmfolderdia.cpp:508 newfolderdialog.cpp:132
+#: kmailicalifaceimpl.cpp:95 kmfolderdia.cpp:507 newfolderdialog.cpp:132
 msgid "Contacts"
 msgstr "Cysylltau"
 
-#: kmailicalifaceimpl.cpp:96 kmfolderdia.cpp:509 newfolderdialog.cpp:133
+#: kmailicalifaceimpl.cpp:96 kmfolderdia.cpp:508 newfolderdialog.cpp:133
 msgid "Notes"
 msgstr "Nodau"
 
-#: kmailicalifaceimpl.cpp:97 kmfolderdia.cpp:510 newfolderdialog.cpp:134
+#: kmailicalifaceimpl.cpp:97 kmfolderdia.cpp:509 newfolderdialog.cpp:134
 msgid "Tasks"
 msgstr "Tasgau"
 
-#: kmailicalifaceimpl.cpp:98 kmfolderdia.cpp:511 newfolderdialog.cpp:135
+#: kmailicalifaceimpl.cpp:98 kmfolderdia.cpp:510 newfolderdialog.cpp:135
 msgid "Journal"
 msgstr "Dyddlyfr"
 
@@ -5232,11 +5232,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:2065
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2064
 msgid "Save to File"
 msgstr "Cadw i Ffeil"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2064
 msgid "&Replace"
 msgstr "&Amnewid"
 
@@ -5254,7 +5254,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:965 kmkernel.cpp:2064
+#: kmcommands.cpp:965 kmkernel.cpp:2063
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5290,12 +5290,12 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1747 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1444
 #, fuzzy
 msgid "Filtering messages"
 msgstr "Dileu Negeseuon"
 
-#: kmcommands.cpp:1755 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1452
 #, fuzzy
 msgid "Filtering message %1 of %2"
 msgstr "Symud neges %3 o %2 oddiwrth %1."
@@ -5435,7 +5435,7 @@ msgid ""
 " it is not possible to determine who to chat with."
 msgstr ""
 
-#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5315 objecttreeparser.cpp:1858
 msgid ""
 "Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
 "report this bug."
@@ -5443,19 +5443,19 @@ msgstr ""
 
 #: 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
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5317 kmcomposewin.cpp:5322
+#: kmcomposewin.cpp:5331 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr ""
 
-#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5328 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."
 msgstr ""
 
-#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5337 objecttreeparser.cpp:1878
 msgid ""
 "No keys have been found. Please check that a valid key path has been set in "
 "the Chiasmus configuration."
@@ -5500,145 +5500,145 @@ msgstr ""
 msgid "Mail: %1"
 msgstr "Post"
 
-#: kmcomposewin.cpp:207
+#: kmcomposewin.cpp:206
 #, fuzzy
 msgid "Select an identity for this message"
 msgstr "Defnyddio llunio HTML ar gyfer y neges yma."
 
-#: kmcomposewin.cpp:211
+#: kmcomposewin.cpp:210
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr ""
 
-#: kmcomposewin.cpp:216
+#: kmcomposewin.cpp:215
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr ""
 
-#: kmcomposewin.cpp:220
+#: kmcomposewin.cpp:219
 msgid "Select the outgoing account to use for sending this message"
 msgstr ""
 
-#: kmcomposewin.cpp:224
+#: kmcomposewin.cpp:223
 msgid "Set the \"From:\" email address for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:228
+#: kmcomposewin.cpp:227
 msgid "Set the \"Reply-To:\" email address for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:248
+#: kmcomposewin.cpp:247
 msgid "Select email address(es)"
 msgstr "Dewis cyfeiriad(au) ebost"
 
-#: kmcomposewin.cpp:295
+#: kmcomposewin.cpp:294
 #, fuzzy
 msgid "Set a subject for this message"
 msgstr "Gosd pwnc y neges."
 
-#: kmcomposewin.cpp:297
+#: kmcomposewin.cpp:296
 msgid "&Identity:"
 msgstr "&Dynodiad:"
 
-#: kmcomposewin.cpp:298
+#: kmcomposewin.cpp:297
 msgid "&Dictionary:"
 msgstr "&Geiriadur:"
 
-#: kmcomposewin.cpp:299
+#: kmcomposewin.cpp:298
 msgid "&Sent-Mail folder:"
 msgstr "Plygell Ebost Anfonedig:"
 
-#: kmcomposewin.cpp:300
+#: kmcomposewin.cpp:299
 msgid "&Mail transport:"
 msgstr "&Cludiant ebost:"
 
-#: kmcomposewin.cpp:301
+#: kmcomposewin.cpp:300
 msgid ""
 "_: sender address field\n"
 "&From:"
 msgstr "&Oddi wrth:"
 
-#: kmcomposewin.cpp:302
+#: kmcomposewin.cpp:301
 msgid "&Reply to:"
 msgstr "&Ateb i:"
 
-#: kmcomposewin.cpp:303
+#: kmcomposewin.cpp:302
 msgid "S&ubject:"
 msgstr "P&wnc:"
 
-#: kmcomposewin.cpp:305
+#: kmcomposewin.cpp:304
 msgid "Sticky"
 msgstr "Gludiog"
 
-#: kmcomposewin.cpp:308
+#: kmcomposewin.cpp:307
 msgid "Use the selected value as your identity for future messages"
 msgstr ""
 
-#: kmcomposewin.cpp:311
+#: kmcomposewin.cpp:310
 msgid "Use the selected value as your sent-mail folder for future messages"
 msgstr ""
 
-#: kmcomposewin.cpp:314
+#: kmcomposewin.cpp:313
 msgid "Use the selected value as your outgoing account for future messages"
 msgstr ""
 
-#: kmcomposewin.cpp:317
+#: kmcomposewin.cpp:316
 msgid "Use the selected value as your dictionary for future messages"
 msgstr ""
 
-#: kmcomposewin.cpp:398 kmfoldertree.cpp:1719 kmheaders.cpp:141
-#: kmheaders.cpp:187 kmmainwidget.cpp:416 kmmainwidget.cpp:423
-#: kmmainwidget.cpp:430 kmmimeparttree.cpp:67 kmpopfiltercnfrmdlg.cpp:43
+#: kmcomposewin.cpp:397 kmfoldertree.cpp:1719 kmheaders.cpp:140
+#: kmheaders.cpp:186 kmmainwidget.cpp:415 kmmainwidget.cpp:422
+#: kmmainwidget.cpp:429 kmmimeparttree.cpp:67 kmpopfiltercnfrmdlg.cpp:43
 msgid "Size"
 msgstr "Maint"
 
-#: kmcomposewin.cpp:399 kmmimeparttree.cpp:66
+#: kmcomposewin.cpp:398 kmmimeparttree.cpp:66
 msgid "Encoding"
 msgstr "Amgodiad"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:405 kmcomposewin.cpp:3325
 msgid "Compress"
 msgstr "Compress"
 
-#: kmcomposewin.cpp:408
+#: kmcomposewin.cpp:407
 msgid "Encrypt"
 msgstr "Cêl-ysgrifo"
 
-#: kmcomposewin.cpp:410
+#: kmcomposewin.cpp:409
 msgid "Sign"
 msgstr "Llofnodi"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
+#: kmcomposewin.cpp:620 kmcomposewin.cpp:3701
 #, fuzzy
 msgid "Name of the attachment:"
 msgstr "atodiad"
 
-#: kmcomposewin.cpp:868
+#: kmcomposewin.cpp:867
 #, fuzzy
 msgid ""
 "Autosaving the message as %1 failed.\n"
 "Reason: %2"
 msgstr "Methwyd symud y negeseuon."
 
-#: kmcomposewin.cpp:872
+#: kmcomposewin.cpp:871
 #, fuzzy
 msgid "Autosaving Failed"
 msgstr "Methwyd symud y negeseuon."
 
-#: kmcomposewin.cpp:1042
+#: kmcomposewin.cpp:1041
 #, fuzzy
 msgid "Primary Recipients"
 msgstr "<derbynwyr>"
 
-#: kmcomposewin.cpp:1043
+#: kmcomposewin.cpp:1042
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email.</"
 "qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:1052
+#: kmcomposewin.cpp:1051
 msgid "Additional Recipients"
 msgstr ""
 
-#: kmcomposewin.cpp:1053
+#: kmcomposewin.cpp:1052
 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:</"
@@ -5646,373 +5646,373 @@ msgid ""
 "Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:1067
+#: kmcomposewin.cpp:1066
 #, fuzzy
 msgid "Hidden Recipients"
 msgstr "<derbynwyr>"
 
-#: kmcomposewin.cpp:1068
+#: kmcomposewin.cpp:1067
 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>"
 msgstr ""
 
-#: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
+#: kmcomposewin.cpp:1235 kmcomposewin.cpp:1257
 msgid "&Send Mail"
 msgstr "&Anfon Ebost"
 
-#: kmcomposewin.cpp:1240 kmcomposewin.cpp:1262
+#: kmcomposewin.cpp:1239 kmcomposewin.cpp:1261
 #, fuzzy
 msgid "&Send Mail Via"
 msgstr "&Sendmail"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
+#: kmcomposewin.cpp:1242 kmcomposewin.cpp:1251 kmcomposewin.cpp:4457
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Anfon yn &Nes Ymlaen"
 
-#: kmcomposewin.cpp:1245 kmcomposewin.cpp:1255
+#: kmcomposewin.cpp:1244 kmcomposewin.cpp:1254
 #, fuzzy
 msgid "Send &Later Via"
 msgstr "Anfon yn &Nes Ymlaen"
 
-#: kmcomposewin.cpp:1293
+#: kmcomposewin.cpp:1292
 #, fuzzy
 msgid "Save as &Draft"
 msgstr "&Cadw fel Drafft"
 
-#: kmcomposewin.cpp:1296
+#: kmcomposewin.cpp:1295
 #, fuzzy
 msgid "Save as &Template"
 msgstr "&Amnewid"
 
-#: kmcomposewin.cpp:1299
+#: kmcomposewin.cpp:1298
 msgid "&Insert File..."
 msgstr "Mewn&osod Ffeil..."
 
-#: kmcomposewin.cpp:1302
+#: kmcomposewin.cpp:1301
 #, fuzzy
 msgid "&Insert File Recent"
 msgstr "Mewnosod Ffeil"
 
-#: kmcomposewin.cpp:1309
+#: kmcomposewin.cpp:1308
 msgid "&Address Book"
 msgstr "&Llyfr Cyfeiriadau"
 
-#: kmcomposewin.cpp:1312
+#: kmcomposewin.cpp:1311
 msgid "&New Composer"
 msgstr "Cyfan&soddydd Newydd"
 
-#: kmcomposewin.cpp:1316
+#: kmcomposewin.cpp:1315
 msgid "New Main &Window"
 msgstr "Prif Ffenest&r Newydd"
 
-#: kmcomposewin.cpp:1321
+#: kmcomposewin.cpp:1320
 #, fuzzy
 msgid "Select &Recipients..."
 msgstr "<derbynwyr>"
 
-#: kmcomposewin.cpp:1323
+#: kmcomposewin.cpp:1322
 #, fuzzy
 msgid "Save &Distribution List..."
 msgstr "Tanysgrifiad"
 
-#: kmcomposewin.cpp:1345
+#: kmcomposewin.cpp:1344
 msgid "Pa&ste as Quotation"
 msgstr "Gl&udo fel Dyfyniad"
 
-#: kmcomposewin.cpp:1348
+#: kmcomposewin.cpp:1347
 #, fuzzy
 msgid "Paste as Attac&hment"
 msgstr "atodiad"
 
-#: kmcomposewin.cpp:1351
+#: kmcomposewin.cpp:1350
 msgid "Add &Quote Characters"
 msgstr "&Ychwanegu Nodau Dyfynnu"
 
-#: kmcomposewin.cpp:1356
+#: kmcomposewin.cpp:1355
 msgid "Re&move Quote Characters"
 msgstr "G&waredu Nodau Dyfynnu"
 
-#: kmcomposewin.cpp:1362
+#: kmcomposewin.cpp:1361
 msgid "Cl&ean Spaces"
 msgstr "Glan&hau Gofodnodau"
 
-#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
+#: kmail.kcfg:354 kmcomposewin.cpp:1364 kmreaderwin.cpp:616
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Def&nyddio Wynebfath Penodol"
 
-#: kmcomposewin.cpp:1370
+#: kmcomposewin.cpp:1369
 msgid "&Urgent"
 msgstr "Ar &Frys"
 
-#: kmcomposewin.cpp:1373
+#: kmcomposewin.cpp:1372
 msgid "&Request Disposition Notification"
 msgstr "&Gofyn am Hysbysiad Lleoliad"
 
-#: kmcomposewin.cpp:1378
+#: kmcomposewin.cpp:1377
 msgid "Se&t Encoding"
 msgstr "Goso&d Amgodiad"
 
-#: kmcomposewin.cpp:1381
+#: kmcomposewin.cpp:1380
 msgid "&Wordwrap"
 msgstr "&Amlapio testun"
 
-#: kmcomposewin.cpp:1386
+#: kmcomposewin.cpp:1385
 msgid "&Snippets"
 msgstr ""
 
-#: kmcomposewin.cpp:1392
+#: kmcomposewin.cpp:1391
 msgid "&Automatic Spellchecking"
 msgstr "G&wirio Sillafu Ymysgogol"
 
-#: kmcomposewin.cpp:1402
+#: kmcomposewin.cpp:1401
 msgid "Auto-Detect"
 msgstr "Hunan-ddarganfod"
 
-#: kmcomposewin.cpp:1407
+#: kmcomposewin.cpp:1406
 msgid "Formatting (HTML)"
 msgstr ""
 
-#: kmcomposewin.cpp:1411
+#: kmcomposewin.cpp:1410
 msgid "&All Fields"
 msgstr "&Pob Maes"
 
-#: kmcomposewin.cpp:1414
+#: kmcomposewin.cpp:1413
 msgid "&Identity"
 msgstr "&dynodiad"
 
-#: kmcomposewin.cpp:1417
+#: kmcomposewin.cpp:1416
 msgid "&Dictionary"
 msgstr "&Geiriadur"
 
-#: kmcomposewin.cpp:1420
+#: kmcomposewin.cpp:1419
 msgid "&Sent-Mail Folder"
 msgstr "&Plygell Ebostau Anfonedig"
 
-#: kmcomposewin.cpp:1423
+#: kmcomposewin.cpp:1422
 msgid "&Mail Transport"
 msgstr "&Cludiant Ebost"
 
-#: kmcomposewin.cpp:1426
+#: kmcomposewin.cpp:1425
 msgid "&From"
 msgstr "&Oddiwrth"
 
-#: kmcomposewin.cpp:1429
+#: kmcomposewin.cpp:1428
 msgid "&Reply To"
 msgstr "&Ateb I"
 
-#: kmcomposewin.cpp:1433
+#: kmcomposewin.cpp:1432
 msgid "&To"
 msgstr "&I"
 
-#: kmcomposewin.cpp:1436
+#: kmcomposewin.cpp:1435
 msgid "&CC"
 msgstr "&CC"
 
-#: kmcomposewin.cpp:1439
+#: kmcomposewin.cpp:1438
 msgid "&BCC"
 msgstr "&BCC"
 
-#: kmcomposewin.cpp:1443
+#: kmcomposewin.cpp:1442
 msgid "S&ubject"
 msgstr "P&wnc"
 
-#: kmcomposewin.cpp:1448
+#: kmcomposewin.cpp:1447
 msgid "Append S&ignature"
 msgstr "Atodi &Llofnod"
 
-#: kmcomposewin.cpp:1451
+#: kmcomposewin.cpp:1450
 #, fuzzy
 msgid "Prepend S&ignature"
 msgstr "Atodi &Llofnod"
 
-#: kmcomposewin.cpp:1455
+#: kmcomposewin.cpp:1454
 #, fuzzy
 msgid "Insert Signature At C&ursor Position"
 msgstr "Lleoliad y Blygell"
 
-#: kmcomposewin.cpp:1459
+#: kmcomposewin.cpp:1458
 msgid "Attach &Public Key..."
 msgstr "Atodi Allwedd &Gyhoeddus..."
 
-#: kmcomposewin.cpp:1462
+#: kmcomposewin.cpp:1461
 msgid "Attach &My Public Key"
 msgstr "Atodi &F'Allwedd Gyhoeddus..."
 
-#: kmcomposewin.cpp:1465 kmcomposewin.cpp:2337
+#: kmcomposewin.cpp:1464 kmcomposewin.cpp:2336
 msgid "&Attach File..."
 msgstr "A&todi Ffeil..."
 
-#: kmcomposewin.cpp:1468
+#: kmcomposewin.cpp:1467
 msgid "&Remove Attachment"
 msgstr "&Gwaredu Atodiad"
 
-#: kmcomposewin.cpp:1471
+#: kmcomposewin.cpp:1470
 msgid "&Save Attachment As..."
 msgstr "&Cadw Atodiad Fel..."
 
-#: kmcomposewin.cpp:1474
+#: kmcomposewin.cpp:1473
 msgid "Attachment Pr&operties"
 msgstr "Priodweddau y&r Atodiad"
 
-#: kmcomposewin.cpp:1484
+#: kmcomposewin.cpp:1483
 msgid "&Spellchecker..."
 msgstr "Gwirydd &Sillafu..."
 
-#: kmcomposewin.cpp:1488 kmcomposewin.cpp:1491
+#: kmcomposewin.cpp:1487 kmcomposewin.cpp:1490
 #, fuzzy
 msgid "Encrypt Message with Chiasmus..."
 msgstr "Deiws y Blygell efo'r Canolbwynt"
 
-#: kmcomposewin.cpp:1499
+#: kmcomposewin.cpp:1498
 msgid "&Encrypt Message"
 msgstr "C&êl-ysgrifo Neges"
 
-#: kmcomposewin.cpp:1502
+#: kmcomposewin.cpp:1501
 msgid "&Sign Message"
 msgstr "Llof&odi Neges"
 
-#: kmcomposewin.cpp:1549
+#: kmcomposewin.cpp:1548
 msgid "&Cryptographic Message Format"
 msgstr ""
 
-#: kmcomposewin.cpp:1554
+#: kmcomposewin.cpp:1553
 #, fuzzy
 msgid "Select a cryptographic format for this message"
 msgstr "Cêl-ysgrifo pob rhan o'r neges yma?"
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
+#: kmcomposewin.cpp:1557 kmcomposewin.cpp:5157
 msgid "Standard"
 msgstr "Safonol"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
 msgid "Bulleted List (Disc)"
 msgstr ""
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
 msgid "Bulleted List (Circle)"
 msgstr ""
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
 msgid "Bulleted List (Square)"
 msgstr ""
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
 msgid "Ordered List (Decimal)"
 msgstr ""
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
 msgid "Ordered List (Alpha lower)"
 msgstr ""
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
 msgid "Ordered List (Alpha upper)"
 msgstr ""
 
-#: kmcomposewin.cpp:1566
+#: kmcomposewin.cpp:1565
 #, fuzzy
 msgid "Select Style"
 msgstr "Dewis Ffeil Sŵn"
 
-#: kmcomposewin.cpp:1569
+#: kmcomposewin.cpp:1568
 #, fuzzy
 msgid "Select a list style"
 msgstr "Dewis Ffeil Sŵn"
 
-#: kmcomposewin.cpp:1574
+#: kmcomposewin.cpp:1573
 #, fuzzy
 msgid "Select a font"
 msgstr "Dewis &Pob Neges"
 
-#: kmcomposewin.cpp:1579
+#: kmcomposewin.cpp:1578
 #, fuzzy
 msgid "Select a font size"
 msgstr "Dewis Ffeil Sŵn"
 
-#: kmcomposewin.cpp:1583
+#: kmcomposewin.cpp:1582
 msgid "Align Left"
 msgstr "Alinio Chwith"
 
-#: kmcomposewin.cpp:1587
+#: kmcomposewin.cpp:1586
 msgid "Align Right"
 msgstr "Alinio Dde"
 
-#: kmcomposewin.cpp:1590
+#: kmcomposewin.cpp:1589
 msgid "Align Center"
 msgstr "Alinio i'r Canol"
 
-#: kmcomposewin.cpp:1593
+#: kmcomposewin.cpp:1592
 msgid "&Bold"
 msgstr "&Trwm"
 
-#: kmcomposewin.cpp:1596
+#: kmcomposewin.cpp:1595
 msgid "&Italic"
 msgstr "&Italig"
 
-#: kmcomposewin.cpp:1599
+#: kmcomposewin.cpp:1598
 msgid "&Underline"
 msgstr "&Tanlinellu"
 
-#: kmcomposewin.cpp:1602
+#: kmcomposewin.cpp:1601
 msgid "Reset Font Settings"
 msgstr ""
 
-#: kmcomposewin.cpp:1605
+#: kmcomposewin.cpp:1604
 msgid "Text Color..."
 msgstr "Lliw Testun..."
 
-#: kmcomposewin.cpp:1619
+#: kmcomposewin.cpp:1618
 #, fuzzy
 msgid "Configure KMail..."
 msgstr "&Furffweddu KMail..."
 
-#: kmcomposewin.cpp:1628
+#: kmcomposewin.cpp:1627
 #, fuzzy
 msgid " Spellcheck: %1 "
 msgstr "Gwirydd Sillafu"
 
-#: kmcomposewin.cpp:1629 kmcomposewin.cpp:1643
+#: kmcomposewin.cpp:1628 kmcomposewin.cpp:1642
 msgid " Column: %1 "
 msgstr "Colofn: %1"
 
-#: kmcomposewin.cpp:1630 kmcomposewin.cpp:1641
+#: kmcomposewin.cpp:1629 kmcomposewin.cpp:1640
 msgid " Line: %1 "
 msgstr "Llinell: %1"
 
-#: kmcomposewin.cpp:2252
+#: kmcomposewin.cpp:2251
 #, fuzzy
 msgid "Re&save as Template"
 msgstr "&Amnewid"
 
-#: kmcomposewin.cpp:2253
+#: kmcomposewin.cpp:2252
 msgid "&Save as Draft"
 msgstr "&Cadw fel Drafft"
 
-#: kmcomposewin.cpp:2255
+#: kmcomposewin.cpp:2254
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
 msgstr ""
 
-#: kmcomposewin.cpp:2257
+#: kmcomposewin.cpp:2256
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
 msgstr ""
 
-#: kmcomposewin.cpp:2261
+#: kmcomposewin.cpp:2260
 #, fuzzy
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Hoffech daflu'r neges neu ei chadw tan hwyrach?"
 
-#: kmcomposewin.cpp:2262
+#: kmcomposewin.cpp:2261
 #, fuzzy
 msgid "Close Composer"
 msgstr "Cyfan&soddydd Newydd"
 
-#: kmcomposewin.cpp:2333
+#: kmcomposewin.cpp:2332
 msgid ""
 "The message you have composed seems to refer to an attached file but you "
 "have not attached anything.\n"
@@ -6022,15 +6022,15 @@ msgstr ""
 "atodiedig, ond nid ydych wedi atodi rhywbeth.\n"
 "Ydych eisiau atodi ffeil i'ch neges?"
 
-#: kmcomposewin.cpp:2336
+#: kmcomposewin.cpp:2335
 msgid "File Attachment Reminder"
 msgstr "Atgoffydd Atodiad Ffeil"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:2337 kmcomposewin.cpp:4479
 msgid "&Send as Is"
 msgstr "&Anfon e"
 
-#: kmcomposewin.cpp:2415
+#: kmcomposewin.cpp:2414
 #, fuzzy
 msgid ""
 "<qt><p>KMail could not recognize the location of the attachment (%1);</"
@@ -6039,84 +6039,84 @@ 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>"
 
-#: kmcomposewin.cpp:2424
+#: kmcomposewin.cpp:2423
 msgid ""
 "<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
 "p>"
 msgstr ""
 
-#: kmcomposewin.cpp:2777
+#: kmcomposewin.cpp:2776
 msgid "Attach File"
 msgstr "Atodi Ffeil"
 
-#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2777
 #, no-c-format
 msgid "&Attach"
 msgstr "&Atodi"
 
-#: kmcomposewin.cpp:2959
+#: kmcomposewin.cpp:2958
 msgid "Insert File"
 msgstr "Mewnosod Ffeil"
 
-#: kmcomposewin.cpp:3129
+#: kmcomposewin.cpp:3128
 msgid ""
 "<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
+#: kmcomposewin.cpp:3132
 msgid "Key Export Failed"
 msgstr ""
 
-#: kmcomposewin.cpp:3160
+#: kmcomposewin.cpp:3159
 #, fuzzy
 msgid "Exporting key..."
 msgstr "Gwagu'r sbwriel..."
 
-#: kmcomposewin.cpp:3171
+#: kmcomposewin.cpp:3170
 #, c-format
 msgid "OpenPGP key 0x%1"
 msgstr "Allwedd OpenPGP 0x%1"
 
-#: kmcomposewin.cpp:3186
+#: kmcomposewin.cpp:3185
 msgid "Attach Public OpenPGP Key"
 msgstr "Atodi Allwedd OpenPGP Gyhoeddus"
 
-#: kmcomposewin.cpp:3187
+#: kmcomposewin.cpp:3186
 msgid "Select the public key which should be attached."
 msgstr "Dewis yr allwedd gyhoeddus a ddylid eu hatodi."
 
-#: kmcomposewin.cpp:3209 kmmimeparttree.cpp:135 kmreaderwin.cpp:2035
+#: kmcomposewin.cpp:3208 kmmimeparttree.cpp:135 kmreaderwin.cpp:2034
 msgid ""
 "_: to open\n"
 "Open"
 msgstr "Agor"
 
-#: kmcomposewin.cpp:3211 kmmimeparttree.cpp:136 kmreaderwin.cpp:2036
+#: kmcomposewin.cpp:3210 kmmimeparttree.cpp:136 kmreaderwin.cpp:2035
 msgid "Open With..."
 msgstr "Agor Efo..."
 
-#: kmcomposewin.cpp:3213
+#: kmcomposewin.cpp:3212
 msgid ""
 "_: to view\n"
 "View"
 msgstr "Gweld"
 
-#: kmcomposewin.cpp:3216
+#: kmcomposewin.cpp:3215
 #, fuzzy
 msgid "Edit With..."
 msgstr "Golygu..."
 
-#: kmcomposewin.cpp:3224
+#: kmcomposewin.cpp:3223
 msgid "Add Attachment..."
 msgstr "Ychwanegu Atodiad..."
 
-#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
+#: kmcomposewin.cpp:3310 kmcomposewin.cpp:3318
 #, fuzzy
 msgid "KMail could not compress the file."
 msgstr "Methu ysgrifennu'r ffeil."
 
-#: kmcomposewin.cpp:3325
+#: kmcomposewin.cpp:3324
 #, fuzzy
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
@@ -6125,45 +6125,45 @@ msgstr ""
 "Mae'r rhan yma o'r neges wedi'i llofnodi.  Ydych eisiau dal y llofnod wrth "
 "gadw?"
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid "Keep"
 msgstr "Cadw"
 
-#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
+#: kmcomposewin.cpp:3391 kmcomposewin.cpp:3399
 #, fuzzy
 msgid "KMail could not uncompress the file."
 msgstr "Methu ysgrifennu'r ffeil."
 
-#: kmcomposewin.cpp:3600
+#: kmcomposewin.cpp:3599
 msgid "Save Attachment As"
 msgstr "Cadw Atodiad Fel..."
 
-#: kmcomposewin.cpp:3855 kmedit.cpp:178
+#: kmcomposewin.cpp:3854 kmedit.cpp:177
 msgid "Add as Text"
 msgstr ""
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:179
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 #, fuzzy
 msgid "Add as Attachment"
 msgstr "Ychwanegu Atodiad..."
 
-#: kmcomposewin.cpp:3857
+#: kmcomposewin.cpp:3856
 msgid ""
 "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:3859
+#: kmcomposewin.cpp:3858
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "atodiad"
 
-#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
-#: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
+#: kmcomposewin.cpp:3933 kmfilterdlg.cpp:716 kmfolderdia.cpp:330
+#: kmfolderdia.cpp:709 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "di-enw"
 
-#: kmcomposewin.cpp:3960
+#: kmcomposewin.cpp:3959
 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) "
@@ -6171,11 +6171,11 @@ msgid ""
 "identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:3967
+#: kmcomposewin.cpp:3966
 msgid "Undefined Encryption Key"
 msgstr "Allwedd Gêl-ysgrifo Anniffiniedig"
 
-#: kmcomposewin.cpp:4014
+#: kmcomposewin.cpp:4013
 #, fuzzy
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -6187,98 +6187,98 @@ msgstr ""
 "p><p>Gallwch ddiffinio'r allwedd OpenPGP a ddylir ei defnyddio efo'r "
 "dynodiad cyfredol yn y ffurfweddiad dynodiad.</p></qt>"
 
-#: kmcomposewin.cpp:4021
+#: kmcomposewin.cpp:4020
 msgid "Undefined Signing Key"
 msgstr "Allwedd Lofnodi heb ei Diffinio"
 
-#: kmcomposewin.cpp:4128
+#: kmcomposewin.cpp:4127
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
 
-#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
+#: kmcomposewin.cpp:4129 kmkernel.cpp:1299
 msgid "Online/Offline"
 msgstr ""
 
-#: kmcomposewin.cpp:4145
+#: kmcomposewin.cpp:4144
 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."
 msgstr ""
 
-#: kmcomposewin.cpp:4156
+#: kmcomposewin.cpp:4155
 #, fuzzy
 msgid ""
 "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:4164
+#: kmcomposewin.cpp:4163
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "Nid ydych wedi penodi pwnc.  Anfon y neges beth bynnag?"
 
-#: kmcomposewin.cpp:4166
+#: kmcomposewin.cpp:4165
 #, fuzzy
 msgid "No To: specified"
 msgstr "Dim Enw wedi'i Benodi"
 
-#: kmcomposewin.cpp:4191
+#: kmcomposewin.cpp:4190
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Nid ydych wedi penodi pwnc.  Anfon y neges beth bynnag?"
 
-#: kmcomposewin.cpp:4193
+#: kmcomposewin.cpp:4192
 msgid "No Subject Specified"
 msgstr "Ni Phenodwyd Pwnc"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "S&end as Is"
 msgstr "A&nfon e"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 #, fuzzy
 msgid "&Specify the Subject"
 msgstr "&Na, Gadewch i Mi Benodi'r Pwnc"
 
-#: kmcomposewin.cpp:4233
+#: kmcomposewin.cpp:4232
 msgid "&Keep markup, do not sign/encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not sign"
 msgstr ""
 
-#: kmcomposewin.cpp:4237
+#: kmcomposewin.cpp:4236
 #, fuzzy
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Llofnodi/Cêl-ysgrifo"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Encrypt (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Sign (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4241
+#: kmcomposewin.cpp:4240
 msgid ""
 "<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:4243
+#: kmcomposewin.cpp:4242
 #, fuzzy
 msgid "Sign/Encrypt Message?"
 msgstr "Cêl-ysgrifo'r Neges?"
 
-#: kmcomposewin.cpp:4292
+#: kmcomposewin.cpp:4291
 #, fuzzy
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
@@ -6287,135 +6287,135 @@ msgstr ""
 "Nid yw'r blygell addasiedig drafftiau ar gyfer dynodiad \"%1\" mewn "
 "bodolaeth (dim mwy).  Felly defnyddir y blygell ragosod drafftiau."
 
-#: kmcomposewin.cpp:4392 kmsender.cpp:114
+#: kmcomposewin.cpp:4391 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Creuwch gyfrif ar gyfer anfon a ceisiwch eto."
 
-#: kmcomposewin.cpp:4455
+#: kmcomposewin.cpp:4454
 msgid "About to send email..."
 msgstr "Ar fin anfon ebost..."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "Send Confirmation"
 msgstr "Anfon Cadarnhad"
 
-#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4456 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "Anfo&n Rwan"
 
-#: kmcomposewin.cpp:4478
+#: kmcomposewin.cpp:4477
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 #, fuzzy
 msgid "Too many receipients"
 msgstr "<derbynwyr>"
 
-#: kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:4480
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "<derbynwyr>"
 
-#: kmcomposewin.cpp:4727
+#: kmcomposewin.cpp:4726
 #, fuzzy
 msgid "Spellcheck: on"
 msgstr "Gwirydd Sillafu"
 
-#: kmcomposewin.cpp:4729
+#: kmcomposewin.cpp:4728
 #, fuzzy
 msgid "Spellcheck: off"
 msgstr "Gwirydd Sillafu"
 
-#: kmcomposewin.cpp:4786
+#: kmcomposewin.cpp:4785
 msgid " Spell check canceled."
 msgstr "Diddymwyd y gwirio sillafu."
 
-#: kmcomposewin.cpp:4789
+#: kmcomposewin.cpp:4788
 msgid " Spell check stopped."
 msgstr "Arhoswyd y gwiriad sillafu."
 
-#: kmcomposewin.cpp:4792
+#: kmcomposewin.cpp:4791
 msgid " Spell check complete."
 msgstr "Gwiriad sillafu yn gyflawn."
 
-#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
+#: kmcomposewin.cpp:4990 kmcomposewin.cpp:4998
 msgid "Spellchecker"
 msgstr "Gwirydd Sillafu"
 
-#: kmcomposewin.cpp:5303
+#: kmcomposewin.cpp:5302
 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."
 msgstr ""
 
-#: kmcomposewin.cpp:5307
+#: kmcomposewin.cpp:5306
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 
-#: kmcomposewin.cpp:5310
+#: kmcomposewin.cpp:5309
 msgid "No Chiasmus Backend Configured"
 msgstr ""
 
-#: kmcomposewin.cpp:5341
+#: kmcomposewin.cpp:5340
 #, fuzzy
 msgid "No Chiasmus Keys Found"
 msgstr "Ni Chanfuwyd Tystysgrif"
 
-#: kmcomposewin.cpp:5345
+#: kmcomposewin.cpp:5344
 #, fuzzy
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Dewis Allwedd Cêl-ysgrifo"
 
-#: kmcomposewin.cpp:5377
+#: kmcomposewin.cpp:5376
 #, fuzzy
 msgid "Message will be signed"
 msgstr "Llofnodwyd y neges gan %1."
 
-#: kmcomposewin.cpp:5377
+#: kmcomposewin.cpp:5376
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "Llofnodwyd y neges gan %1."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "Neges OpenPGP - wedi'i chelu"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Rhestr Negeseuon"
 
-#: kmedit.cpp:458
+#: kmedit.cpp:457
 msgid "Unable to start external editor."
 msgstr "Methu cychwyn golygydd allanol."
 
-#: kmedit.cpp:522
+#: kmedit.cpp:521
 #, fuzzy
 msgid "No Suggestions"
 msgstr "Awgrymiadau"
 
-#: kmedit.cpp:529
+#: kmedit.cpp:528
 #, fuzzy
 msgid "Add to Dictionary"
 msgstr "&Geiriadur"
 
-#: kmedit.cpp:530
+#: kmedit.cpp:529
 #, fuzzy
 msgid "Ignore All"
 msgstr "&Anwybyddu"
 
-#: kmedit.cpp:587
+#: kmedit.cpp:586
 msgid "Automatic spellchecking is not possible on text with markup."
 msgstr ""
 
-#: kmedit.cpp:631
+#: kmedit.cpp:630
 msgid ""
 "The external editor is still running.\n"
 "Abort the external editor or leave it open?"
@@ -6423,19 +6423,19 @@ msgstr ""
 "Mae'r golygydd allanol yn dal i redeg.\n"
 "Erthylu'r golygydd allanol, neu ei adael yn agored?"
 
-#: kmedit.cpp:634
+#: kmedit.cpp:633
 msgid "Abort Editor"
 msgstr "Erthylu'r Golygydd"
 
-#: kmedit.cpp:634
+#: kmedit.cpp:633
 msgid "Leave Editor Open"
 msgstr "Gadael y Golygydd yn Agored"
 
-#: kmedit.cpp:661
+#: kmedit.cpp:660
 msgid "Spellcheck - KMail"
 msgstr "Gwirydd Sillafu - KMail"
 
-#: kmedit.cpp:884
+#: kmedit.cpp:883
 msgid ""
 "ISpell/Aspell could not be started. Please make sure you have ISpell or "
 "Aspell properly configured and in your PATH."
@@ -6443,11 +6443,11 @@ msgstr ""
 "Ni ellid dechrau ISpell/Aspell.  Sicrhewch bod ISpell neu Aspell wedi ei "
 "ffurfweddu yn iawn, ac yn eich PATH."
 
-#: kmedit.cpp:893
+#: kmedit.cpp:892
 msgid "ISpell/Aspell seems to have crashed."
 msgstr "Ymddengys bod Spell/Aspell wedi chwalu."
 
-#: kmedit.cpp:902
+#: kmedit.cpp:901
 msgid "No misspellings encountered."
 msgstr "Ni chyfarfuwyd camsillafiannau."
 
@@ -6713,7 +6713,7 @@ msgstr "pibellu drwy"
 msgid "Play Sound"
 msgstr "chwarae sŵm"
 
-#: kmfilterdlg.cpp:55
+#: kmfilterdlg.cpp:54
 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 "
@@ -6723,7 +6723,7 @@ msgstr ""
 "</p><p>Cliciwch ar unrhyw hidlen i'w golygu gan ddefnyddio'r rheolyddion yn "
 "hanner dde yr ymgom.</p></qt>"
 
-#: kmfilterdlg.cpp:61
+#: kmfilterdlg.cpp:60
 #, fuzzy
 msgid ""
 "<qt><p>Click this button to create a new filter.</p><p>The filter will be "
@@ -6736,7 +6736,7 @@ msgstr ""
 "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
+#: kmfilterdlg.cpp:67
 #, fuzzy
 msgid ""
 "<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
@@ -6748,7 +6748,7 @@ msgstr ""
 "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
+#: kmfilterdlg.cpp:71
 #, fuzzy
 msgid ""
 "<qt><p>Click this button to <em>delete</em> the currently-selected filter "
@@ -6761,7 +6761,7 @@ msgstr ""
 "dileu, ond gallwch gadael yr ymgom gan glicio <em>Diddymu</em> i daflu'r "
 "newidion a wnaed.</p></qt>"
 
-#: kmfilterdlg.cpp:79
+#: kmfilterdlg.cpp:78
 #, fuzzy
 msgid ""
 "<qt><p>Click this button to move the currently-selected filter to the "
@@ -6776,7 +6776,7 @@ msgstr ""
 "wrth gamgymeriad, gallwch ddatwneud hyn gan glicio ar y botwm  <em>I Fyny</"
 "em>.</p></qt>"
 
-#: kmfilterdlg.cpp:85
+#: kmfilterdlg.cpp:84
 #, fuzzy
 msgid ""
 "<qt><p>Click this button to move the currently-selected filter <em>up</em> "
@@ -6793,7 +6793,7 @@ msgstr ""
 "wrth gamgymeriad, gallwch ddatwneud hyn gan glicio ar y botwm  <em>I Lawr</"
 "em>.</p></qt>"
 
-#: kmfilterdlg.cpp:93
+#: kmfilterdlg.cpp:92
 #, fuzzy
 msgid ""
 "<qt><p>Click this button to move the currently-selected filter <em>down</em> "
@@ -6810,7 +6810,7 @@ msgstr ""
 "wrth gamgymeriad, gallwch ddatwneud hyn gan glicio ar y botwm  <em>I Fyny</"
 "em>.</p></qt>"
 
-#: kmfilterdlg.cpp:101
+#: kmfilterdlg.cpp:100
 #, fuzzy
 msgid ""
 "<qt><p>Click this button to move the currently-selected filter to the "
@@ -6825,7 +6825,7 @@ msgstr ""
 "wrth gamgymeriad, gallwch ddatwneud hyn gan glicio ar y botwm  <em>I Fyny</"
 "em>.</p></qt>"
 
-#: kmfilterdlg.cpp:107
+#: kmfilterdlg.cpp:106
 #, fuzzy
 msgid ""
 "<qt><p>Click this button to rename the currently-selected filter.</"
@@ -6840,7 +6840,7 @@ msgstr ""
 "cliciwch y botwm yma a dewiswch <em>Gwagu</em> ac wedyn <em>Iawn</em> yn yr "
 "ymgom a ymddengys.</p></qt>"
 
-#: kmfilterdlg.cpp:114
+#: kmfilterdlg.cpp:113
 #, fuzzy
 msgid ""
 "<qt><p>Check this button to force the confirmation dialog to be displayed.</"
@@ -6857,133 +6857,133 @@ msgstr ""
 "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
+#: kmfilterdlg.cpp:132
 msgid "POP3 Filter Rules"
 msgstr "Rheolau Hidlo POP3"
 
-#: kmfilterdlg.cpp:133
+#: kmfilterdlg.cpp:132
 msgid "Filter Rules"
 msgstr "Rheolau Hidlo"
 
-#: kmfilterdlg.cpp:155
+#: kmfilterdlg.cpp:154
 msgid "Available Filters"
 msgstr "Hidlau ar Gael"
 
-#: kmfilterdlg.cpp:168
+#: kmfilterdlg.cpp:167
 msgid "A&dvanced"
 msgstr "U&wch"
 
-#: kmfilterdlg.cpp:175
+#: kmfilterdlg.cpp:174
 msgid "Filter Criteria"
 msgstr "Meini Prawf Hidlo"
 
-#: kmfilterdlg.cpp:179
+#: kmfilterdlg.cpp:178
 msgid "Filter Action"
 msgstr "Gweithred Hidlo"
 
-#: kmfilterdlg.cpp:182
+#: kmfilterdlg.cpp:181
 msgid "Global Options"
 msgstr "Dewisiadau Eang"
 
-#: kmfilterdlg.cpp:183
+#: kmfilterdlg.cpp:182
 msgid "Always &show matched 'Download Later' messages in confirmation dialog"
 msgstr ""
 "Dan&gos negeseuon 'Lawrlwytho yn Nes Ymlaen' cydwedd yn yr ymgom cadarnhau o "
 "hyd."
 
-#: kmfilterdlg.cpp:188
+#: kmfilterdlg.cpp:187
 msgid "Filter Actions"
 msgstr "Gweithredoedd Hidlo"
 
-#: kmfilterdlg.cpp:193
+#: kmfilterdlg.cpp:192
 msgid "Advanced Options"
 msgstr "Dewisiadau Uwch"
 
-#: kmfilterdlg.cpp:201
+#: kmfilterdlg.cpp:200
 #, fuzzy
 msgid "Apply this filter to incoming messages:"
 msgstr "i negeseuon &cyrraedd"
 
-#: kmfilterdlg.cpp:205
+#: kmfilterdlg.cpp:204
 #, fuzzy
 msgid "from all accounts"
 msgstr "Cyfrifon"
 
-#: kmfilterdlg.cpp:208
+#: kmfilterdlg.cpp:207
 msgid "from all but online IMAP accounts"
 msgstr ""
 
-#: kmfilterdlg.cpp:211
+#: kmfilterdlg.cpp:210
 msgid "from checked accounts only"
 msgstr ""
 
-#: kmfilterdlg.cpp:217
+#: kmfilterdlg.cpp:216
 #, fuzzy
 msgid "Account Name"
 msgstr "Cyfrif:"
 
-#: kmfilterdlg.cpp:224
+#: kmfilterdlg.cpp:223
 #, fuzzy
 msgid "Apply this filter to &sent messages"
 msgstr "Gweithredu'r hidlen yma"
 
-#: kmfilterdlg.cpp:227
+#: kmfilterdlg.cpp:226
 #, fuzzy
 msgid "Apply this filter on manual &filtering"
 msgstr "ar &hidlo â llaw"
 
-#: kmfilterdlg.cpp:230
+#: kmfilterdlg.cpp:229
 msgid "If this filter &matches, stop processing here"
 msgstr "Os &cydwedda'r hidlen, atal prosesu yma/"
 
-#: kmfilterdlg.cpp:234
+#: kmfilterdlg.cpp:233
 #, fuzzy
 msgid "Add this filter to the Apply Filter menu"
 msgstr "Ychwanegu'r hidlen yma i'r ddewislen Gweithredu Gweithredoedd Hidlo"
 
-#: kmfilterdlg.cpp:236
+#: kmfilterdlg.cpp:235
 msgid "Shortcut:"
 msgstr "Byrlwybr:"
 
-#: kmfilterdlg.cpp:242
+#: kmfilterdlg.cpp:241
 #, fuzzy
 msgid "Additionally add this filter to the toolbar"
 msgstr "Ychwanegu'r hidlen yma i'r ddewislen Gweithredu Gweithredoedd Hidlo"
 
-#: kmfilterdlg.cpp:247
+#: kmfilterdlg.cpp:246
 msgid "Icon for this filter:"
 msgstr "eicon ar gyfer yr hidlen yma:"
 
-#: kmfilterdlg.cpp:612
+#: kmfilterdlg.cpp:611
 msgid "Up"
 msgstr "I Fyny"
 
-#: kmfilterdlg.cpp:613
+#: kmfilterdlg.cpp:612
 msgid "Down"
 msgstr "I Lawr"
 
-#: kmfilterdlg.cpp:632
+#: kmfilterdlg.cpp:631
 msgid "Rename..."
 msgstr "Ailenwi..."
 
-#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
+#: kmail_part.rc:10 kmfilterdlg.cpp:632 kmmainwin.rc:10 kmsearchpattern.h:218
 #, no-c-format
 msgid "New"
 msgstr "Newydd"
 
-#: kmfilterdlg.cpp:645
+#: kmfilterdlg.cpp:644
 #, fuzzy
 msgid "Select Source Folders"
 msgstr "Rh&estr fer o blygyll"
 
-#: kmfilterdlg.cpp:756
+#: kmfilterdlg.cpp:755
 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."
 msgstr ""
 
-#: kmfilterdlg.cpp:786
+#: kmfilterdlg.cpp:785
 msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
@@ -6991,34 +6991,34 @@ msgstr ""
 "Ni chedwyd yr hidlau dilynnol gan eu bod yn annilys (e.e. heb gynnwys "
 "gweithredoedd neu reolau chwilio)."
 
-#: kmfilterdlg.cpp:947
+#: kmfilterdlg.cpp:946
 msgid "Rename Filter"
 msgstr "Ailenwi Hidlen"
 
-#: kmfilterdlg.cpp:948
+#: kmfilterdlg.cpp:947
 msgid ""
 "Rename filter \"%1\" to:\n"
 "(leave the field empty for automatic naming)"
 msgstr ""
 
-#: kmfilterdlg.cpp:973
+#: kmfilterdlg.cpp:972
 #, fuzzy
 msgid "Select Folders to Filter"
 msgstr "Deiws y Blygell efo'r Canolbwynt"
 
-#: kmfilterdlg.cpp:1136
+#: kmfilterdlg.cpp:1135
 msgid "Please select an action."
 msgstr "Dewiswch weithred."
 
-#: kmfilterdlg.cpp:1303
+#: kmfilterdlg.cpp:1302
 msgid "&Download mail"
 msgstr "&Lawrlwytho ebost"
 
-#: kmfilterdlg.cpp:1304
+#: kmfilterdlg.cpp:1303
 msgid "Download mail la&ter"
 msgstr "Lawrlwytho ebost yn &nes ymlaen"
 
-#: kmfilterdlg.cpp:1305
+#: kmfilterdlg.cpp:1304
 msgid "D&elete mail from server"
 msgstr "&Dileu ebost oddiar y gweinydd"
 
@@ -7137,11 +7137,11 @@ 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."
 
-#: kmfoldercachedimap.cpp:743 kmmainwidget.cpp:1316
+#: kmfoldercachedimap.cpp:743 kmmainwidget.cpp:1315
 msgid "Refresh IMAP Cache"
 msgstr "Ailfywio'r Gelc IMAP"
 
-#: kmfoldercachedimap.cpp:744 kmmainwidget.cpp:1316
+#: kmfoldercachedimap.cpp:744 kmmainwidget.cpp:1315
 msgid "&Refresh"
 msgstr "&Ailfywio"
 
@@ -7364,7 +7364,7 @@ msgid ""
 "another folder now?</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1917
 msgid "Do Not Move"
 msgstr ""
 
@@ -7373,55 +7373,55 @@ msgstr ""
 msgid "Move Messages to Folder"
 msgstr "Symud Neges i Blygell"
 
-#: kmfolderdia.cpp:84
+#: kmfolderdia.cpp:83
 #, fuzzy
 msgid "Permissions (ACL)"
 msgstr "Caniatadau"
 
-#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:121 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Cyffredinol"
 
-#: kmfolderdia.cpp:125
+#: kmfolderdia.cpp:124
 msgid "Templates"
 msgstr ""
 
-#: kmfolderdia.cpp:134
+#: kmfolderdia.cpp:133
 msgid "Access Control"
 msgstr ""
 
-#: kmfolderdia.cpp:141
+#: kmfolderdia.cpp:140
 #, fuzzy
 msgid "Quota"
 msgstr "Cyfanswm"
 
-#: kmfolderdia.cpp:327
+#: kmfolderdia.cpp:326
 msgid ""
 "Not enough permissions to rename this folder.\n"
 "The parent folder doesn't have write support.\n"
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:355
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Defnyddio &eiconau addasiedig"
 
-#: kmfolderdia.cpp:361
+#: kmfolderdia.cpp:360
 msgid "&Normal:"
 msgstr "&Arferol:"
 
-#: kmfolderdia.cpp:376
+#: kmfolderdia.cpp:375
 msgid "&Unread:"
 msgstr "&Heb ei ddarllen:"
 
-#: kmfolderdia.cpp:413
+#: kmfolderdia.cpp:412
 #, fuzzy
 msgid "Act on new/unread mail in this folder"
 msgstr "Ymofyn Ebost yn y Blygell yma"
 
-#: kmfolderdia.cpp:415
+#: kmfolderdia.cpp:414
 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 "
@@ -7432,52 +7432,52 @@ msgid ""
 "spam folder.</p></qt>"
 msgstr ""
 
-#: kmfolderdia.cpp:431
+#: kmfolderdia.cpp:430
 #, fuzzy
 msgid "Include this folder in mail checks"
 msgstr "Cynnwys yn yr ymofyn:"
 
-#: kmfolderdia.cpp:442
+#: kmfolderdia.cpp:441
 #, fuzzy
 msgid "Keep replies in this folder"
 msgstr "&Darfod hen negeseuon yn y blygell yma"
 
-#: kmfolderdia.cpp:444
+#: kmfolderdia.cpp:443
 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."
 msgstr ""
 
-#: kmfolderdia.cpp:459
+#: kmfolderdia.cpp:458
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr ""
 
-#: kmfolderdia.cpp:461
+#: kmfolderdia.cpp:460
 #, fuzzy
 msgid "Sho&w column:"
 msgstr "Colofn Faint"
 
-#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
-#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:467 kmheaders.cpp:184
+#: kmheaders.cpp:247 kmheaders.cpp:391 kmheaders.cpp:576 kmheaders.cpp:793
 #: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Anfonwr"
 
-#: 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
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:468 kmheaders.cpp:141
+#: kmheaders.cpp:187 kmheaders.cpp:244 kmheaders.cpp:249 kmheaders.cpp:393
+#: kmheaders.cpp:578 kmheaders.cpp:795 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Derbyniwr"
 
-#: kmfolderdia.cpp:480
+#: kmfolderdia.cpp:479
 #, fuzzy
 msgid "&Sender identity:"
 msgstr "Dynodiad yr &Anfonwr:"
 
-#: kmfolderdia.cpp:486
+#: kmfolderdia.cpp:485
 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, "
@@ -7486,16 +7486,16 @@ msgid ""
 "main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 
-#: kmfolderdia.cpp:500
+#: kmfolderdia.cpp:499
 #, fuzzy
 msgid "&Folder contents:"
 msgstr "Eiconau Plygell"
 
-#: kmfolderdia.cpp:533
+#: kmfolderdia.cpp:532
 msgid "Generate free/&busy and activate alarms for:"
 msgstr ""
 
-#: kmfolderdia.cpp:540
+#: kmfolderdia.cpp:539
 msgid ""
 "This setting defines which users sharing this folder should get \"busy\" "
 "periods in their freebusy lists and should see the alarms for the events or "
@@ -7511,41 +7511,41 @@ msgid ""
 "it is not known who will go to those events."
 msgstr ""
 
-#: kmfolderdia.cpp:555
+#: kmfolderdia.cpp:554
 msgid "Nobody"
 msgstr "Neb"
 
-#: kmfolderdia.cpp:556
+#: kmfolderdia.cpp:555
 #, fuzzy
 msgid "Admins of This Folder"
 msgstr "&Darfod hen negeseuon yn y blygell yma"
 
-#: kmfolderdia.cpp:557
+#: kmfolderdia.cpp:556
 #, fuzzy
 msgid "All Readers of This Folder"
 msgstr "&Darfod hen negeseuon yn y blygell yma"
 
-#: kmfolderdia.cpp:560
+#: kmfolderdia.cpp:559
 msgid ""
 "This setting allows you to disable alarms for folders shared by others. "
 msgstr ""
 
-#: kmfolderdia.cpp:562
+#: kmfolderdia.cpp:561
 msgid "Block alarms locally"
 msgstr ""
 
-#: kmfolderdia.cpp:576
+#: kmfolderdia.cpp:575
 msgid "Share unread state with all users"
 msgstr ""
 
-#: kmfolderdia.cpp:579
+#: kmfolderdia.cpp:578
 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."
 msgstr ""
 
-#: kmfolderdia.cpp:661
+#: kmfolderdia.cpp:660
 msgid ""
 "You have configured this folder to contain groupware information and the "
 "general configuration option to hide groupware folders is set. That means "
@@ -7658,11 +7658,11 @@ msgstr ""
 "cynnwys baneri cyflwr, yn cael ei cholli.  Ydych eisiau israddio eich ffeil "
 "mynegai?"
 
-#: kmfoldermaildir.cpp:89
+#: kmfoldermaildir.cpp:88
 msgid "Error opening %1; this folder is missing."
 msgstr ""
 
-#: kmfoldermaildir.cpp:92
+#: kmfoldermaildir.cpp:91
 #, fuzzy
 msgid ""
 "Error opening %1; either this is not a valid maildir folder, or you do not "
@@ -7671,29 +7671,29 @@ msgstr ""
 "Gwall wrth agor %1.  Unai nid plygell maildir ddilys yw hon, neu nid oes "
 "gennych ganiatadau cyrchiad digonol."
 
-#: kmfoldermaildir.cpp:124
+#: kmfoldermaildir.cpp:123
 #, fuzzy
 msgid "Folder `%1' changed; recreating index."
 msgstr "Newidwyd plygell '%1'.  Ailgreuir y mynegai."
 
-#: kmfoldermaildir.cpp:253
+#: kmfoldermaildir.cpp:252
 #, fuzzy
 msgid "Could not sync maildir folder."
 msgstr "Methu cydamseru'r blygell maildir."
 
-#: kmfoldermaildir.cpp:418
+#: kmfoldermaildir.cpp:417
 msgid "Message could not be added to the folder, possibly disk space is low."
 msgstr ""
 
-#: kmfoldermaildir.cpp:514
+#: kmfoldermaildir.cpp:513
 msgid "KMFolderMaildir::addMsg: abnormally terminating to prevent data loss."
 msgstr "KMFolderMaildir::addMsg: yn terfynu yn anarferol i atal colli data."
 
-#: kmfoldermaildir.cpp:888 kmfoldermbox.cpp:799
+#: kmfoldermaildir.cpp:887 kmfoldermbox.cpp:799
 msgid "Writing index file"
 msgstr "Ysgrifennu ffeil mynegai."
 
-#: kmfoldermaildir.cpp:896 kmfoldermbox.cpp:808
+#: kmfoldermaildir.cpp:895 kmfoldermbox.cpp:808
 #, fuzzy
 msgid ""
 "Your outbox contains messages which were most-likely not created by KMail;\n"
@@ -7767,11 +7767,11 @@ msgstr "Methu ychwanegu neges i'r blygell (dim lle ar ôl ar y ddyfais?)"
 msgid "Are you sure you want to expire old messages?"
 msgstr "Ydych wir eisiau darfod hen negeseuon?"
 
-#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1330
+#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1329
 msgid "Expire Old Messages?"
 msgstr "Darfod Hen Negeseuon?"
 
-#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1330
+#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1329
 msgid "Expire"
 msgstr "Darfod"
 
@@ -7783,7 +7783,7 @@ msgstr ""
 "Ymddengys nad yw '%1' yn blygell.\n"
 "Symudwch y ffeil allan o'r ffordd."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1382
 #, fuzzy
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
@@ -7792,7 +7792,7 @@ msgstr ""
 "Mae caniatadau plygell '%1' yn anghywir.\n"
 "Sicrhewch y gallwch ddarllen ac addasu cynnwys y blygell yma."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1374
 #, fuzzy
 msgid ""
 "KMail could not create folder '%1';\n"
@@ -7812,7 +7812,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Methwyd creu plygell"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1690
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -7834,7 +7834,7 @@ msgstr "Cliciwch i waredu'r gwasanaeth a ddewisir yn gyfredol"
 msgid "You can start typing to filter the list of folders"
 msgstr ""
 
-#: kmfoldertree.cpp:407 kmheaders.cpp:130
+#: kmfoldertree.cpp:407 kmheaders.cpp:129
 msgid "View Columns"
 msgstr "Gwled Colofnau"
 
@@ -7872,11 +7872,11 @@ msgstr "Ewch I"
 msgid "Do Not Go To"
 msgstr ""
 
-#: kmfoldertree.cpp:1092 kmmainwidget.cpp:2780
+#: kmfoldertree.cpp:1092 kmmainwidget.cpp:2779
 msgid "&New Folder..."
 msgstr "&Plygell Newydd"
 
-#: kmfoldertree.cpp:1103 kmmainwidget.cpp:2668
+#: kmfoldertree.cpp:1103 kmmainwidget.cpp:2667
 msgid "Check &Mail"
 msgstr "Ymofyn am E&bost"
 
@@ -7910,7 +7910,7 @@ msgstr "Tanysgrifiad..."
 msgid "Refresh Folder List"
 msgstr "Rhestr Plygyll"
 
-#: kmfoldertree.cpp:1177 kmmainwidget.cpp:3771
+#: kmfoldertree.cpp:1177 kmmainwidget.cpp:3770
 msgid "&Troubleshoot IMAP Cache..."
 msgstr "&Cywiro Celc IMAP..."
 
@@ -7921,13 +7921,13 @@ msgid ""
 "ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 
-#: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
-#: kmmainwidget.cpp:426 kmsearchpattern.h:220
+#: kmfoldertree.cpp:1695 kmmainwidget.cpp:411 kmmainwidget.cpp:418
+#: kmmainwidget.cpp:425 kmsearchpattern.h:219
 msgid "Unread"
 msgstr "Heb eu Darllen"
 
-#: kmfoldertree.cpp:1708 kmmainwidget.cpp:414 kmmainwidget.cpp:421
-#: kmmainwidget.cpp:428
+#: kmfoldertree.cpp:1708 kmmainwidget.cpp:413 kmmainwidget.cpp:420
+#: kmmainwidget.cpp:427
 msgid "Total"
 msgstr "Cyfanswm"
 
@@ -7957,64 +7957,64 @@ msgstr "<qt>Methu symud plygell <b>%1</b> i mewn i is-blygell dan ei hun.</qt>"
 msgid "Moving the selected folders is not possible"
 msgstr "Ni chynhelir symud plygyll IMAP"
 
-#: kmheaders.cpp:132
+#: kmheaders.cpp:131
 msgid "Status"
 msgstr "Cyflwr"
 
-#: kmheaders.cpp:133 kmsearchpattern.h:218
+#: kmheaders.cpp:132 kmsearchpattern.h:217
 msgid "Important"
 msgstr "Pwysig"
 
-#: kmheaders.cpp:134
+#: kmheaders.cpp:133
 #, fuzzy
 msgid "Action Item"
 msgstr "Gweth&redu"
 
-#: kmheaders.cpp:135
+#: kmheaders.cpp:134
 msgid "Attachment"
 msgstr "Atodiad"
 
-#: kmheaders.cpp:136 kmsearchpattern.h:233
+#: kmheaders.cpp:135 kmsearchpattern.h:232
 #, fuzzy
 msgid "Invitation"
 msgstr "Dogfennaeth"
 
-#: kmheaders.cpp:137
+#: kmheaders.cpp:136
 #, fuzzy
 msgid "Spam/Ham"
 msgstr "ebostach"
 
-#: kmheaders.cpp:138
+#: kmheaders.cpp:137
 #, fuzzy
 msgid "Watched/Ignored"
 msgstr "wedi'u anwybyddu"
 
-#: kmheaders.cpp:139
+#: kmheaders.cpp:138
 msgid "Signature"
 msgstr "Llofnod"
 
-#: kmheaders.cpp:184 kmheaders.cpp:804 kmheaders.cpp:2646
-#: kmpopfiltercnfrmdlg.cpp:39 kmsearchpatternedit.cpp:41 searchwindow.cpp:223
+#: kmheaders.cpp:183 kmheaders.cpp:803 kmheaders.cpp:2645
+#: kmpopfiltercnfrmdlg.cpp:39 kmsearchpatternedit.cpp:40 searchwindow.cpp:223
 #: templatesinsertcommand.cpp:145 templatesinsertcommand.cpp:246
 msgid "Subject"
 msgstr "Pwnc"
 
-#: kmheaders.cpp:186 kmheaders.cpp:799 kmheaders.cpp:2641
+#: kmheaders.cpp:185 kmheaders.cpp:798 kmheaders.cpp:2640
 #: kmpopfiltercnfrmdlg.cpp:42 searchwindow.cpp:227
 #: templatesinsertcommand.cpp:66 templatesinsertcommand.cpp:170
 msgid "Date"
 msgstr "Dyddiad"
 
-#: kmheaders.cpp:801 kmheaders.cpp:2643
+#: kmheaders.cpp:800 kmheaders.cpp:2642
 #, fuzzy
 msgid "Order of Arrival"
 msgstr "Dyddiad (Trefn Cyrraedd)"
 
-#: kmheaders.cpp:806 kmheaders.cpp:2648
+#: kmheaders.cpp:805 kmheaders.cpp:2647
 msgid " (Status)"
 msgstr "(Cyflwr)"
 
-#: kmheaders.cpp:1398
+#: kmheaders.cpp:1397
 #, fuzzy, c-format
 msgid ""
 "_n: 1 unsent\n"
@@ -8023,11 +8023,11 @@ msgstr ""
 "%n heb ei ddarllen\n"
 "%n heb eu darllen"
 
-#: kmheaders.cpp:1398
+#: kmheaders.cpp:1397
 msgid "0 unsent"
 msgstr ""
 
-#: kmheaders.cpp:1400
+#: kmheaders.cpp:1399
 #, fuzzy, c-format
 msgid ""
 "_n: 1 unread\n"
@@ -8036,12 +8036,12 @@ msgstr ""
 "%n heb ei ddarllen\n"
 "%n heb eu darllen"
 
-#: kmheaders.cpp:1400
+#: kmheaders.cpp:1399
 #, fuzzy
 msgid "0 unread"
 msgstr "heb eu darllen"
 
-#: kmheaders.cpp:1402
+#: kmheaders.cpp:1401
 #, fuzzy
 msgid ""
 "_n: 1 message, %1.\n"
@@ -8050,18 +8050,18 @@ msgstr ""
 "%n neges, %1.\n"
 "%n o negeseuon, %1."
 
-#: kmheaders.cpp:1403
+#: kmheaders.cpp:1402
 #, fuzzy
 msgid "0 messages"
 msgstr "<neges>"
 
-#: kmheaders.cpp:1405
+#: kmheaders.cpp:1404
 msgid ""
 "_: %1 = n messages, m unread.\n"
 "%1 Folder is read-only."
 msgstr ""
 
-#: kmheaders.cpp:1598
+#: kmheaders.cpp:1597
 #, fuzzy, c-format
 msgid ""
 "_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
@@ -8072,55 +8072,55 @@ msgstr ""
 "<qt>Ydych wir eisiau dileu'r negeseuon dewisiedig?<br>Wedi'u dileu, ni ellir "
 "eu adfer!</qt>"
 
-#: kmheaders.cpp:1600
+#: kmheaders.cpp:1599
 msgid "Delete Messages"
 msgstr "Dileu Negeseuon"
 
-#: kmheaders.cpp:1600
+#: kmheaders.cpp:1599
 #, fuzzy
 msgid "Delete Message"
 msgstr "Dileu Negeseuon"
 
-#: kmheaders.cpp:1624
+#: kmheaders.cpp:1623
 #, fuzzy
 msgid "Messages deleted successfully."
 msgstr "Symudwyd y negeseuon yn llwyddiannus."
 
-#: kmheaders.cpp:1624
+#: kmheaders.cpp:1623
 #, fuzzy
 msgid "Messages moved successfully"
 msgstr "Symudwyd y negeseuon yn llwyddiannus."
 
-#: kmheaders.cpp:1647
+#: kmheaders.cpp:1646
 #, fuzzy
 msgid "Deleting messages failed."
 msgstr "Methwyd symud y negeseuon."
 
-#: kmheaders.cpp:1647
+#: kmheaders.cpp:1646
 msgid "Moving messages failed."
 msgstr "Methwyd symud y negeseuon."
 
-#: kmheaders.cpp:1650
+#: kmheaders.cpp:1649
 #, fuzzy
 msgid "Deleting messages canceled."
 msgstr "Diddymwyd symud y negeseuon."
 
-#: kmheaders.cpp:1650
+#: kmheaders.cpp:1649
 #, fuzzy
 msgid "Moving messages canceled."
 msgstr "Diddymwyd symud y negeseuon."
 
-#: kmheaders.cpp:2470 kmmainwidget.cpp:2989 kmreadermainwin.cpp:508
+#: kmheaders.cpp:2469 kmmainwidget.cpp:2988 kmreadermainwin.cpp:508
 #: searchwindow.cpp:856
 msgid "&Copy To"
 msgstr "&Copïo I"
 
-#: kmheaders.cpp:2473 kmheaders.cpp:2479 kmmainwidget.cpp:2986
+#: kmheaders.cpp:2472 kmheaders.cpp:2478 kmmainwidget.cpp:2985
 #: searchwindow.cpp:857
 msgid "&Move To"
 msgstr "&Symud I"
 
-#: kmheaders.cpp:2818 kmheaders.cpp:2858
+#: kmheaders.cpp:2817 kmheaders.cpp:2857
 msgid ""
 "Failure modifying %1\n"
 "(No space left on device?)"
@@ -8128,87 +8128,87 @@ msgstr ""
 "Methiant wrth addasu %1\n"
 "(Dim lle ar ôl ar y ddyfais?)"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:726
 msgid "Certificate Signature Request"
 msgstr "Cais Llofnod Tystysgrif"
 
-#: kmkernel.cpp:730
+#: kmkernel.cpp:729
 #, 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:1261
+#: kmkernel.cpp:1260
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:1271
+#: kmkernel.cpp:1270
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:1298
+#: kmkernel.cpp:1297
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr ""
 
-#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1300 kmmainwidget.cpp:1923
 msgid "Work Online"
 msgstr ""
 
-#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1921
 msgid "Work Offline"
 msgstr ""
 
-#: kmkernel.cpp:1444
+#: kmkernel.cpp:1443
 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:1452
+#: kmkernel.cpp:1451
 msgid "outbox"
 msgstr "blwch anfon"
 
-#: kmkernel.cpp:1454
+#: kmkernel.cpp:1453
 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:1471
+#: kmkernel.cpp:1470
 msgid "sent-mail"
 msgstr "ebostau anfonedig"
 
-#: kmkernel.cpp:1473
+#: kmkernel.cpp:1472
 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:1480
+#: kmkernel.cpp:1479
 msgid "trash"
 msgstr "sbwriel"
 
-#: kmkernel.cpp:1482
+#: kmkernel.cpp:1481
 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:1489
+#: kmkernel.cpp:1488
 msgid "drafts"
 msgstr "drafftiau"
 
-#: kmkernel.cpp:1491
+#: kmkernel.cpp:1490
 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:1500
+#: kmkernel.cpp:1499
 #, fuzzy
 msgid "templates"
 msgstr "&Amnewid"
 
-#: kmkernel.cpp:1502
+#: kmkernel.cpp:1501
 #, 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:1546 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1545 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Chwiliad Diwethaf"
 
-#: kmkernel.cpp:1731
+#: kmkernel.cpp:1730
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
@@ -8218,11 +8218,11 @@ msgid ""
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1736
+#: kmkernel.cpp:1735
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1894
+#: kmkernel.cpp:1893
 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 "
@@ -8231,7 +8231,7 @@ msgid ""
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1906
+#: kmkernel.cpp:1905
 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 "
@@ -8239,15 +8239,15 @@ msgid ""
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1915
+#: kmkernel.cpp:1914
 msgid "Migrate Mail Files?"
 msgstr ""
 
-#: kmkernel.cpp:2150
+#: kmkernel.cpp:2149
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "Ddaeth KMail ar draws gwall angheuol, a bydd yn terfynu rwan."
 
-#: kmkernel.cpp:2152
+#: kmkernel.cpp:2151
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8257,80 +8257,80 @@ msgstr ""
 "Ddaeth KMail ar draws gwall angheuol, a bydd yn terfynu rwan.\n"
 "Y gwall oedd:n %1"
 
-#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2284 kmmainwidget.cpp:1150
 msgid "Empty Trash"
 msgstr "Gwagu'r Sbwriel"
 
-#: kmkernel.cpp:2286
+#: kmkernel.cpp:2285
 #, fuzzy
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Ydych wir eisiau gwagu'r blygell sbwriel?"
 
-#: kmlineeditspell.cpp:134
+#: kmlineeditspell.cpp:133
 msgid "vCard Import Failed"
 msgstr "Mewnforio vCerdyn wedi Methu"
 
-#: kmlineeditspell.cpp:135
+#: kmlineeditspell.cpp:134
 msgid "<qt>Unable to access <b>%1</b>.</qt>"
 msgstr "<qt>Methu cyrchu <b>%1</b>.</qt>"
 
-#: kmlineeditspell.cpp:194 recipientspicker.cpp:578
+#: kmlineeditspell.cpp:193 recipientspicker.cpp:578
 msgid "Recent Addresses"
 msgstr "Cyfeiriadau Diweddar"
 
-#: kmmainwidget.cpp:601
+#: kmmainwidget.cpp:600
 msgid "S&earch:"
 msgstr "C&hwilio"
 
-#: kmmainwidget.cpp:664 kmmainwidget.cpp:1686
+#: kmmainwidget.cpp:663 kmmainwidget.cpp:1685
 msgid "Move Message to Folder"
 msgstr "Symud Neges i Blygell"
 
-#: kmmainwidget.cpp:669 kmmainwidget.cpp:1795
+#: kmmainwidget.cpp:668 kmmainwidget.cpp:1794
 msgid "Copy Message to Folder"
 msgstr "Copïo Neges i Blygell"
 
-#: kmmainwidget.cpp:674 kmmainwidget.cpp:1674
+#: kmmainwidget.cpp:673 kmmainwidget.cpp:1673
 #, fuzzy
 msgid "Jump to Folder"
 msgstr "Copïo i'r Blygell Yma"
 
-#: kmmainwidget.cpp:717
+#: kmmainwidget.cpp:716
 msgid "Remove Duplicate Messages"
 msgstr "Gwaredu Negeseuon Dyblyg"
 
-#: kmmainwidget.cpp:722
+#: kmmainwidget.cpp:721
 msgid "Abort Current Operation"
 msgstr ""
 
-#: kmmainwidget.cpp:727
+#: kmmainwidget.cpp:726
 msgid "Focus on Next Folder"
 msgstr "Canolbwyntio ar y Blygell Nesaf"
 
-#: kmmainwidget.cpp:732
+#: kmmainwidget.cpp:731
 msgid "Focus on Previous Folder"
 msgstr "Canolbwyntio ar y Blygell Flaenorol"
 
-#: kmmainwidget.cpp:737
+#: kmmainwidget.cpp:736
 msgid "Select Folder with Focus"
 msgstr "Deiws y Blygell efo'r Canolbwynt"
 
-#: kmmainwidget.cpp:742
+#: kmmainwidget.cpp:741
 #, fuzzy
 msgid "Focus on Next Message"
 msgstr "Canolbwyntio ar y Blygell Nesaf"
 
-#: kmmainwidget.cpp:747
+#: kmmainwidget.cpp:746
 #, fuzzy
 msgid "Focus on Previous Message"
 msgstr "Canolbwyntio ar y Blygell Flaenorol"
 
-#: kmmainwidget.cpp:752
+#: kmmainwidget.cpp:751
 #, fuzzy
 msgid "Select Message with Focus"
 msgstr "Deiws y Blygell efo'r Canolbwynt"
 
-#: kmmainwidget.cpp:951
+#: kmmainwidget.cpp:950
 #, fuzzy
 msgid ""
 "_n: 1 new message in %1\n"
@@ -8339,74 +8339,74 @@ msgstr ""
 "%n neges, %1.\n"
 "%n o negeseuon, %1."
 
-#: kmmainwidget.cpp:967
+#: kmmainwidget.cpp:966
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
 "<b>New mail arrived</b><br>%1"
 msgstr ""
 
-#: kmmainwidget.cpp:971
+#: kmmainwidget.cpp:970
 msgid "New mail arrived"
 msgstr "Cyrhaeddodd ebost newydd"
 
-#: kmmainwidget.cpp:1100
+#: kmmainwidget.cpp:1099
 #, c-format
 msgid "Properties of Folder %1"
 msgstr "Priodweddau Plygell %1"
 
-#: kmmainwidget.cpp:1124
+#: kmmainwidget.cpp:1123
 msgid "This folder does not have any expiry options set"
 msgstr "Ni osodir dewisiadau darfod ar gyfer y blygell yma"
 
-#: kmmainwidget.cpp:1132
+#: kmmainwidget.cpp:1131
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>Ydych wir eisiau darfod y blygell <b>%1</b>?</qt>"
 
-#: kmmainwidget.cpp:1133
+#: kmmainwidget.cpp:1132
 msgid "Expire Folder"
 msgstr "Darfod Plygell"
 
-#: kmmainwidget.cpp:1134
+#: kmmainwidget.cpp:1133
 msgid "&Expire"
 msgstr "Darf&od"
 
-#: kmmainwidget.cpp:1151
+#: kmmainwidget.cpp:1150
 msgid "Move to Trash"
 msgstr "Symud i Sbwriel"
 
-#: kmmainwidget.cpp:1153
+#: kmmainwidget.cpp:1152
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Ydych wir eisiau gwagu'r blygell sbwriel?"
 
-#: kmmainwidget.cpp:1154
+#: kmmainwidget.cpp:1153
 msgid ""
 "<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>"
 
-#: kmmainwidget.cpp:1173
+#: kmmainwidget.cpp:1172
 msgid "Moved all messages to the trash"
 msgstr "Symudwyd pob neges i'r sbwriel"
 
-#: kmmainwidget.cpp:1200
+#: kmmainwidget.cpp:1199
 msgid ""
 "It is not possible to delete this folder right now because it is being "
 "syncronized. Please wait until the syncronization of this folder is complete "
 "and then try again."
 msgstr ""
 
-#: kmmainwidget.cpp:1203
+#: kmmainwidget.cpp:1202
 #, fuzzy
 msgid "Unable to delete folder"
 msgstr "Methwyd creu plygell"
 
-#: kmmainwidget.cpp:1209
+#: kmmainwidget.cpp:1208
 #, fuzzy
 msgid "Delete Search"
 msgstr "<derbynwyr>"
 
-#: kmmainwidget.cpp:1210
+#: kmmainwidget.cpp:1209
 #, fuzzy
 msgid ""
 "<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
@@ -8416,15 +8416,15 @@ msgstr ""
 "negeseuon a ddangosir ynddi os gwnewch, oherwydd cedwir mewn plygell wahanol."
 "</qt>"
 
-#: kmmainwidget.cpp:1214
+#: kmmainwidget.cpp:1213
 msgid "Delete Folder"
 msgstr "Dileu Plygell"
 
-#: kmmainwidget.cpp:1217
+#: kmmainwidget.cpp:1216
 msgid "<qt>Are you sure you want to delete the empty folder <b>%1</b>?</qt>"
 msgstr "<qt>Ydych wir eisiau gwaredu'r blygell wag <b>%1</b>?</qt>"
 
-#: kmmainwidget.cpp:1222
+#: kmmainwidget.cpp:1221
 #, fuzzy
 msgid ""
 "<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
@@ -8436,7 +8436,7 @@ msgstr ""
 "Mae'n bosibl nad ydy'r is-blygyll yna yn wag, a bydd eu cynnwys yn cael eu "
 "gwaredu hefyd.</qt>"
 
-#: kmmainwidget.cpp:1231
+#: kmmainwidget.cpp:1230
 #, fuzzy
 msgid ""
 "<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
@@ -8445,7 +8445,7 @@ msgid ""
 msgstr ""
 "<qt>Ydych wir eisiau dileu'r blygell <b>%1</b>, gan daflu ei chynnwys?</qt>"
 
-#: kmmainwidget.cpp:1238
+#: kmmainwidget.cpp:1237
 #, fuzzy
 msgid ""
 "<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
@@ -8456,7 +8456,7 @@ msgstr ""
 "<qt>Ydych wir eisiau dileu'r blygell <b>%1</b> a'i holl is-blygyll, gan "
 "daflu ei chynnwys?</qt>"
 
-#: kmmainwidget.cpp:1313
+#: kmmainwidget.cpp:1312
 msgid ""
 "Are you sure you want to refresh the IMAP cache?\n"
 "This will remove all changes that you have done locally to your IMAP folders."
@@ -8464,11 +8464,11 @@ msgstr ""
 "Ydych wir eisiau ailfywio'r gelc IMAP?\n"
 "Bydd hyn yn gwaredu pog newid a wnaeth yn lleol i'ch plygyll IMAP."
 
-#: kmmainwidget.cpp:1329
+#: kmmainwidget.cpp:1328
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Ydych wir eisiau darfod pob hen neges?"
 
-#: kmmainwidget.cpp:1353
+#: kmmainwidget.cpp:1352
 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 "
@@ -8478,15 +8478,15 @@ msgstr ""
 "\" a gall cynyddu'r debygrwydd y peryglir eich cysawd gan ymelwadau cyfredol "
 "a disgwyliedig eraill."
 
-#: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
+#: kmmainwidget.cpp:1355 kmmainwidget.cpp:1379 kmsender.cpp:504
 msgid "Security Warning"
 msgstr "Rhybudd Diogelwch"
 
-#: kmmainwidget.cpp:1357
+#: kmmainwidget.cpp:1356
 msgid "Use HTML"
 msgstr ""
 
-#: kmmainwidget.cpp:1377
+#: kmmainwidget.cpp:1376
 #, fuzzy
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -8497,19 +8497,19 @@ msgstr ""
 "\" a gall cynyddu'r debygrwydd y peryglir eich cysawd gan ymelwadau cyfredol "
 "a disgwyliedig eraill."
 
-#: kmmainwidget.cpp:1381
+#: kmmainwidget.cpp:1380
 msgid "Load External References"
 msgstr ""
 
-#: kmmainwidget.cpp:1634
+#: kmmainwidget.cpp:1633
 msgid "Filter on Mailing-List..."
 msgstr "Hidlo ar Restr Ebost..."
 
-#: kmmainwidget.cpp:1639
+#: kmmainwidget.cpp:1638
 msgid "Filter on Mailing-List %1..."
 msgstr "Hidlo ar Restr Ebost %1 ..."
 
-#: kmmainwidget.cpp:1738
+#: kmmainwidget.cpp:1737
 msgid ""
 "KMail's Out of Office Reply functionality relies on server-side filtering. "
 "You have not yet configured an IMAP server for this.\n"
@@ -8519,524 +8519,524 @@ msgstr ""
 "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
+#: kmmainwidget.cpp:1742
 msgid "No Server-Side Filtering Configured"
 msgstr "Ni Ffurfweddir Hidlo ar Ochr y Gweinydd"
 
-#: kmmainwidget.cpp:1770
+#: kmmainwidget.cpp:1769
 #, fuzzy
 msgid ""
 "Could not start certificate manager 'kleopatra'; please check your "
 "installation."
 msgstr "Methu cychwyn rheolydd tystysgrif.  Gwiriwch eich gosodiad!"
 
-#: kmmainwidget.cpp:1787
+#: kmmainwidget.cpp:1786
 #, fuzzy
 msgid ""
 "Could not start GnuPG LogViewer (kwatchgnupg); please check your "
 "installation."
 msgstr "Methu cychwyn rheolydd tystysgrif.  Gwiriwch eich gosodiad!"
 
-#: kmmainwidget.cpp:2508
+#: kmmainwidget.cpp:2507
 #, fuzzy
 msgid "Forward With Custom Template"
 msgstr "&Defnyddio ôlddodiad dynodiad neges addasiedig."
 
-#: kmmainwidget.cpp:2517
+#: kmmainwidget.cpp:2516
 #, fuzzy
 msgid "Reply With Custom Template"
 msgstr "&Defnyddio ôlddodiad dynodiad neges addasiedig."
 
-#: kmmainwidget.cpp:2525
+#: kmmainwidget.cpp:2524
 #, fuzzy
 msgid "Reply to All With Custom Template"
 msgstr "&Defnyddio ôlddodiad dynodiad neges addasiedig."
 
-#: kmmainwidget.cpp:2620 kmmainwidget.cpp:2625 kmmainwidget.cpp:2630
+#: kmmainwidget.cpp:2619 kmmainwidget.cpp:2624 kmmainwidget.cpp:2629
 #, fuzzy
 msgid "(no custom templates)"
 msgstr "&Defnyddio ôlddodiad dynodiad neges addasiedig."
 
-#: kmmainwidget.cpp:2645 kmmimeparttree.cpp:139
+#: kmmainwidget.cpp:2644 kmmimeparttree.cpp:139
 msgid "Save &As..."
 msgstr "Cad&w Fel..."
 
-#: kmmainwidget.cpp:2652
+#: kmmainwidget.cpp:2651
 msgid "&Compact All Folders"
 msgstr "&Cywasgu Pob Plygell"
 
-#: kmmainwidget.cpp:2656
+#: kmmainwidget.cpp:2655
 msgid "&Expire All Folders"
 msgstr "&Darfod Pob Plygell"
 
-#: kmmainwidget.cpp:2660
+#: kmmainwidget.cpp:2659
 msgid "&Refresh Local IMAP Cache"
 msgstr "&Ail-fywio Celc IMAP Leol"
 
-#: kmmainwidget.cpp:2664
+#: kmmainwidget.cpp:2663
 #, fuzzy
 msgid "Empty All &Trash Folders"
 msgstr "&Cywasgu Pob Plygell"
 
-#: kmmainwidget.cpp:2672
+#: kmmainwidget.cpp:2671
 #, fuzzy
 msgid "Check Mail in Favorite Folders"
 msgstr "Ymofyn Ebost yn y Blygell yma"
 
-#: kmmainwidget.cpp:2679
+#: kmmainwidget.cpp:2678
 msgid "Check Mail &In"
 msgstr "Ymofyn Ebost &Cyrraedd"
 
-#: kmmainwidget.cpp:2689
+#: kmmainwidget.cpp:2688
 msgid "&Send Queued Messages"
 msgstr "An&fon Negeseuon yn y Rhes"
 
-#: kmmainwidget.cpp:2692
+#: kmmainwidget.cpp:2691
 msgid "Online Status (unknown)"
 msgstr ""
 
-#: kmmainwidget.cpp:2696
+#: kmmainwidget.cpp:2695
 #, fuzzy
 msgid "Send Queued Messages Via"
 msgstr "An&fon Negeseuon yn y Rhes"
 
-#: kmmainwidget.cpp:2707
+#: kmmainwidget.cpp:2706
 msgid "&Address Book..."
 msgstr "&Llyfr Cyfeiriadau..."
 
-#: kmmainwidget.cpp:2712
+#: kmmainwidget.cpp:2711
 msgid "Certificate Manager..."
 msgstr "Trefnydd Tysysgrifau ..."
 
-#: kmmainwidget.cpp:2717
+#: kmmainwidget.cpp:2716
 msgid "GnuPG Log Viewer..."
 msgstr ""
 
-#: kmmainwidget.cpp:2722
+#: kmmainwidget.cpp:2721
 msgid "&Import Messages..."
 msgstr "&Mewnforio Negeseuon..."
 
-#: kmmainwidget.cpp:2727
+#: kmmainwidget.cpp:2726
 #, fuzzy
 msgid "&Debug Sieve..."
 msgstr "&Ychwanegu Gwasanaeth..."
 
-#: kmmainwidget.cpp:2733
+#: kmmainwidget.cpp:2732
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Golygu Ymatebion \"Allan o'r Swyddfa\"..."
 
-#: kmmainwidget.cpp:2739
+#: kmmainwidget.cpp:2738
 #, fuzzy
 msgid "Filter &Log Viewer..."
 msgstr "Hidlo ar &Oddiwrth..."
 
-#: kmmainwidget.cpp:2742
+#: kmmainwidget.cpp:2741
 msgid "&Anti-Spam Wizard..."
 msgstr ""
 
-#: kmmainwidget.cpp:2744
+#: kmmainwidget.cpp:2743
 msgid "&Anti-Virus Wizard..."
 msgstr ""
 
-#: kmmainwidget.cpp:2748 kmreadermainwin.cpp:367
+#: kmmainwidget.cpp:2747 kmreadermainwin.cpp:367
 msgid "&Move to Trash"
 msgstr "&Symud i Sbwriel"
 
-#: kmmainwidget.cpp:2749 kmreadermainwin.cpp:368
+#: kmmainwidget.cpp:2748 kmreadermainwin.cpp:368
 msgid "Move message to trashcan"
 msgstr "Symud y neges i'r sbwriel"
 
-#: kmmainwidget.cpp:2761
+#: kmmainwidget.cpp:2760
 #, fuzzy
 msgid "M&ove Thread to Trash"
 msgstr "Symud i Sbwriel"
 
-#: kmmainwidget.cpp:2762
+#: kmmainwidget.cpp:2761
 #, fuzzy
 msgid "Move thread to trashcan"
 msgstr "Symud y neges i'r sbwriel"
 
-#: kmmainwidget.cpp:2766
+#: kmmainwidget.cpp:2765
 #, fuzzy
 msgid "Delete T&hread"
 msgstr "wedi'u dileu"
 
-#: kmmainwidget.cpp:2770
+#: kmmainwidget.cpp:2769
 msgid "&Find Messages..."
 msgstr "&Canfod Negeseuon..."
 
-#: kmmainwidget.cpp:2773
+#: kmmainwidget.cpp:2772
 msgid "&Find in Message..."
 msgstr "&Canfod mewn Neges..."
 
-#: kmmainwidget.cpp:2776
+#: kmmainwidget.cpp:2775
 msgid "Select &All Messages"
 msgstr "Dewis &Pob Neges"
 
-#: kmmainwidget.cpp:2783
+#: kmmainwidget.cpp:2782
 msgid "&Properties"
 msgstr "&Priodweddau"
 
-#: kmmainwidget.cpp:2786
+#: kmmainwidget.cpp:2785
 #, fuzzy
 msgid "&Mailing List Management..."
 msgstr "Rhestr Ebost Gysylltiedig"
 
-#: kmmainwidget.cpp:2795
+#: kmmainwidget.cpp:2794
 msgid "Mark All Messages as &Read"
 msgstr "Nodi Pob Neges fel Dda&rllenedig"
 
-#: kmmainwidget.cpp:2798
+#: kmmainwidget.cpp:2797
 #, fuzzy
 msgid "&Expiration Settings"
 msgstr "Dynodiadau &sy'n bodoli:"
 
-#: kmmainwidget.cpp:2801
+#: kmmainwidget.cpp:2800
 msgid "&Compact Folder"
 msgstr "&Crynhoi Plygell"
 
-#: kmmainwidget.cpp:2804
+#: kmmainwidget.cpp:2803
 #, fuzzy
 msgid "Check Mail &in This Folder"
 msgstr "&Ymofyn Ebost yn y Blygell Yma"
 
-#: kmmainwidget.cpp:2816
+#: kmmainwidget.cpp:2815
 #, fuzzy
 msgid "&Archive Folder..."
 msgstr "&Plygell Newydd"
 
-#: kmmainwidget.cpp:2820
+#: kmmainwidget.cpp:2819
 msgid "Prefer &HTML to Plain Text"
 msgstr "Gwell &HTML na Testun Plaen"
 
-#: kmmainwidget.cpp:2823
+#: kmmainwidget.cpp:2822
 msgid "Load E&xternal References"
 msgstr ""
 
-#: kmmainwidget.cpp:2826
+#: kmmainwidget.cpp:2825
 msgid "&Thread Messages"
 msgstr "&Edafu Negeseuon"
 
-#: kmmainwidget.cpp:2829
+#: kmmainwidget.cpp:2828
 msgid "Thread Messages also by &Subject"
 msgstr "Edafu Negeseuon gan &Bwnc hefyd"
 
-#: kmmainwidget.cpp:2832
+#: kmmainwidget.cpp:2831
 #, fuzzy
 msgid "Copy Folder"
 msgstr "Copïo i'r Blygell Yma"
 
-#: kmmainwidget.cpp:2834
+#: kmmainwidget.cpp:2833
 #, fuzzy
 msgid "Cut Folder"
 msgstr "Creu Plygell"
 
-#: kmmainwidget.cpp:2836
+#: kmmainwidget.cpp:2835
 #, fuzzy
 msgid "Paste Folder"
 msgstr "Creu Plygell"
 
-#: kmmainwidget.cpp:2839
+#: kmmainwidget.cpp:2838
 #, fuzzy
 msgid "Copy Messages"
 msgstr "<neges>"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2840
 #, fuzzy
 msgid "Cut Messages"
 msgstr "<neges>"
 
-#: kmmainwidget.cpp:2843
+#: kmmainwidget.cpp:2842
 #, fuzzy
 msgid "Paste Messages"
 msgstr "Dileu Negeseuon"
 
-#: kmmainwidget.cpp:2847
+#: kmmainwidget.cpp:2846
 msgid "&New Message..."
 msgstr "&Neges Newydd..."
 
-#: kmmainwidget.cpp:2850 kmmainwidget.cpp:2927
+#: kmmainwidget.cpp:2849 kmmainwidget.cpp:2926
 #, fuzzy
 msgid "New Message From &Template"
 msgstr "Dim negeseuon newydd o'r gweinydd"
 
-#: kmmainwidget.cpp:2858
+#: kmmainwidget.cpp:2857
 msgid "New Message t&o Mailing-List..."
 msgstr "Neges Newydd i &Restr Ebost"
 
-#: kmmainwidget.cpp:2863 kmreadermainwin.cpp:378 searchwindow.cpp:321
+#: kmmainwidget.cpp:2862 kmreadermainwin.cpp:378 searchwindow.cpp:321
 msgid ""
 "_: Message->\n"
 "&Forward"
 msgstr "&Blaenyrru"
 
-#: kmmainwidget.cpp:2867 kmreadermainwin.cpp:381 searchwindow.cpp:330
+#: kmmainwidget.cpp:2866 kmreadermainwin.cpp:381 searchwindow.cpp:330
 msgid "&Inline..."
 msgstr "&Mewnlin..."
 
-#: kmmainwidget.cpp:2873 kmreadermainwin.cpp:387 searchwindow.cpp:326
+#: kmmainwidget.cpp:2872 kmreadermainwin.cpp:387 searchwindow.cpp:326
 msgid ""
 "_: Message->Forward->\n"
 "As &Attachment..."
 msgstr "&Fel Atodiad..."
 
-#: kmmainwidget.cpp:2879 kmreadermainwin.cpp:393 searchwindow.cpp:342
+#: kmmainwidget.cpp:2878 kmreadermainwin.cpp:393 searchwindow.cpp:342
 #, fuzzy
 msgid ""
 "_: Message->Forward->\n"
 "As Di&gest..."
 msgstr "&Fel Atodiad..."
 
-#: kmmainwidget.cpp:2885 kmreadermainwin.cpp:399 searchwindow.cpp:347
+#: kmmainwidget.cpp:2884 kmreadermainwin.cpp:399 searchwindow.cpp:347
 msgid ""
 "_: Message->Forward->\n"
 "&Redirect..."
 msgstr "Ail-&gyfeirio..."
 
-#: kmmainwidget.cpp:2897
+#: kmmainwidget.cpp:2896
 msgid "Send A&gain..."
 msgstr "Anfon E&to..."
 
-#: kmmainwidget.cpp:2902
+#: kmmainwidget.cpp:2901
 msgid "&Create Filter"
 msgstr "&Creu Hidlen"
 
-#: kmmainwidget.cpp:2905
+#: kmmainwidget.cpp:2904
 msgid "Filter on &Subject..."
 msgstr "Hidlo ar &Pwnc..."
 
-#: kmmainwidget.cpp:2910
+#: kmmainwidget.cpp:2909
 msgid "Filter on &From..."
 msgstr "Hidlo ar &Oddiwrth..."
 
-#: kmmainwidget.cpp:2915
+#: kmmainwidget.cpp:2914
 msgid "Filter on &To..."
 msgstr "Hidlo ar &I..."
 
-#: kmmainwidget.cpp:2920
+#: kmmainwidget.cpp:2919
 msgid "Filter on Mailing-&List..."
 msgstr "Hidlo ar &Restr Ebost..."
 
-#: kmmainwidget.cpp:2933
+#: kmmainwidget.cpp:2932
 msgid "Mark &Thread"
 msgstr "Nodi &Edefyn"
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2935
 msgid "Mark Thread as &Read"
 msgstr "Nodi Edefyn fel Wedi'i Ddar&llen"
 
-#: kmmainwidget.cpp:2937
+#: kmmainwidget.cpp:2936
 msgid "Mark all messages in the selected thread as read"
 msgstr "Nodi pob neges yn yr edefyn dewisiedig fel wedi'i darllen"
 
-#: kmmainwidget.cpp:2942
+#: kmmainwidget.cpp:2941
 msgid "Mark Thread as &New"
 msgstr "Nodi Edefyn fel &Newydd"
 
-#: kmmainwidget.cpp:2943
+#: kmmainwidget.cpp:2942
 msgid "Mark all messages in the selected thread as new"
 msgstr "Nodi pob neges yn yr edefyn dewisiedig fel newydd"
 
-#: kmmainwidget.cpp:2948
+#: kmmainwidget.cpp:2947
 msgid "Mark Thread as &Unread"
 msgstr "Nodi Edefyn fel &Heb ei Ddarllen"
 
-#: kmmainwidget.cpp:2949
+#: kmmainwidget.cpp:2948
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Nodi pob neges yn yr edefyn dewisiedig fel heb ei darllen"
 
-#: kmmainwidget.cpp:2957
+#: kmmainwidget.cpp:2956
 msgid "Mark Thread as &Important"
 msgstr "Nodi Edefyn fel &Pwysig"
 
-#: kmmainwidget.cpp:2960
+#: kmmainwidget.cpp:2959
 msgid "Remove &Important Thread Mark"
 msgstr ""
 
-#: kmmainwidget.cpp:2963
+#: kmmainwidget.cpp:2962
 #, fuzzy
 msgid "Mark Thread as &Action Item"
 msgstr "Nodi Edefyn fel Wedi'i &Anfon"
 
-#: kmmainwidget.cpp:2966
+#: kmmainwidget.cpp:2965
 #, fuzzy
 msgid "Remove &Action Item Thread Mark"
 msgstr "Neges bwysig"
 
-#: kmmainwidget.cpp:2970
+#: kmmainwidget.cpp:2969
 msgid "&Watch Thread"
 msgstr "&Gwylio ar yr Edefyn"
 
-#: kmmainwidget.cpp:2974
+#: kmmainwidget.cpp:2973
 msgid "&Ignore Thread"
 msgstr "&Anwybyddu'r Edefyn"
 
-#: kmmainwidget.cpp:2982
+#: kmmainwidget.cpp:2981
 msgid "Save A&ttachments..."
 msgstr "Cadw A&todiadau..."
 
-#: kmmainwidget.cpp:2992
+#: kmmainwidget.cpp:2991
 #, fuzzy
 msgid "Appl&y All Filters"
 msgstr "Gweithred&u Hidlau"
 
-#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
+#: kmail_part.rc:142 kmmainwidget.cpp:2996 kmmainwin.rc:145
 #, fuzzy, no-c-format
 msgid "A&pply Filter"
 msgstr "Gweithred&u Hidlau"
 
-#: kmmainwidget.cpp:3004
+#: kmmainwidget.cpp:3003
 msgid ""
 "_: View->\n"
 "&Unread Count"
 msgstr "Cyfanswm &Heb eu Darllen"
 
-#: kmmainwidget.cpp:3006
+#: kmmainwidget.cpp:3005
 msgid "Choose how to display the count of unread messages"
 msgstr "Dewis sut i ddangos cyfanswm y negeseuon heb eu darllen"
 
-#: kmmainwidget.cpp:3008
+#: kmmainwidget.cpp:3007
 msgid ""
 "_: View->Unread Count\n"
 "View in &Separate Column"
 msgstr "Gwled mewn &Colofn Wahanol"
 
-#: kmmainwidget.cpp:3014
+#: kmmainwidget.cpp:3013
 msgid ""
 "_: View->Unread Count\n"
 "View After &Folder Name"
 msgstr "Gweld ar Ôl Enw'r &Blygell"
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3020
 msgid ""
 "_: View->\n"
 "&Total Column"
 msgstr "Colofn &Gyfanswm"
 
-#: kmmainwidget.cpp:3024
+#: kmmainwidget.cpp:3023
 msgid ""
 "Toggle display of column showing the total number of messages in folders."
 msgstr "Dangos/cuddio'r golofn sy'n dangos cyfanswm o negeseuon mewn plygyll."
 
-#: kmmainwidget.cpp:3026
+#: kmmainwidget.cpp:3025
 #, fuzzy
 msgid ""
 "_: View->\n"
 "&Size Column"
 msgstr "Colofn &Gyfanswm"
 
-#: kmmainwidget.cpp:3029
+#: kmmainwidget.cpp:3028
 #, fuzzy
 msgid "Toggle display of column showing the total size of messages in folders."
 msgstr "Dangos/cuddio'r golofn sy'n dangos cyfanswm o negeseuon mewn plygyll."
 
-#: kmmainwidget.cpp:3032
+#: kmmainwidget.cpp:3031
 msgid ""
 "_: View->\n"
 "&Expand Thread"
 msgstr "&Ehangu Edefyn"
 
-#: kmmainwidget.cpp:3033
+#: kmmainwidget.cpp:3032
 msgid "Expand the current thread"
 msgstr "Ehangu'r edefyn cyfredol"
 
-#: kmmainwidget.cpp:3038
+#: kmmainwidget.cpp:3037
 msgid ""
 "_: View->\n"
 "&Collapse Thread"
 msgstr "&Dad-ehangu'r Edefyn"
 
-#: kmmainwidget.cpp:3039
+#: kmmainwidget.cpp:3038
 msgid "Collapse the current thread"
 msgstr "Dad-ehangu'r edefyn cyfredol"
 
-#: kmmainwidget.cpp:3044
+#: kmmainwidget.cpp:3043
 msgid ""
 "_: View->\n"
 "Ex&pand All Threads"
 msgstr "Ehangu &Pob Edefyn"
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3044
 msgid "Expand all threads in the current folder"
 msgstr "Ehangu pob edefyn yn y blygell gyfredol"
 
-#: kmmainwidget.cpp:3050
+#: kmmainwidget.cpp:3049
 msgid ""
 "_: View->\n"
 "C&ollapse All Threads"
 msgstr "Dad-ehangu Po&b Edefyn"
 
-#: kmmainwidget.cpp:3051
+#: kmmainwidget.cpp:3050
 msgid "Collapse all threads in the current folder"
 msgstr "Dad-ehangu pob edefyn yn y blygell gyfredol"
 
-#: kmmainwidget.cpp:3056 kmreadermainwin.cpp:373
+#: kmmainwidget.cpp:3055 kmreadermainwin.cpp:373
 msgid "&View Source"
 msgstr "&Gweld Tarddiad"
 
-#: kmmainwidget.cpp:3060
+#: kmmainwidget.cpp:3059
 msgid "&Display Message"
 msgstr "&Dangos Neges"
 
-#: kmmainwidget.cpp:3066
+#: kmmainwidget.cpp:3065
 msgid "&Next Message"
 msgstr "&Neges Nesaf"
 
-#: kmmainwidget.cpp:3067
+#: kmmainwidget.cpp:3066
 msgid "Go to the next message"
 msgstr "Mynd i'r neges nesaf"
 
-#: kmmainwidget.cpp:3071
+#: kmmainwidget.cpp:3070
 msgid "Next &Unread Message"
 msgstr "Neges Nesaf &Heb ei Darllen"
 
-#: kmmainwidget.cpp:3073
+#: kmmainwidget.cpp:3072
 msgid "Go to the next unread message"
 msgstr "Mynd i'r neges nesaf heb ei darllen"
 
-#: kmmainwidget.cpp:3084
+#: kmmainwidget.cpp:3083
 msgid "&Previous Message"
 msgstr "Neges &Blaenorol"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3084
 msgid "Go to the previous message"
 msgstr "Mynd i'r neges blaenorol"
 
-#: kmmainwidget.cpp:3089
+#: kmmainwidget.cpp:3088
 msgid "Previous Unread &Message"
 msgstr "Neges Bl&aenorol Heb ei Darllen"
 
-#: kmmainwidget.cpp:3091
+#: kmmainwidget.cpp:3090
 msgid "Go to the previous unread message"
 msgstr "Mynd i'r neges blaenorol heb ei darllen"
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3102
 msgid "Next Unread &Folder"
 msgstr "&Plygell Nesaf Heb ei Darllen"
 
-#: kmmainwidget.cpp:3104
+#: kmmainwidget.cpp:3103
 msgid "Go to the next folder with unread messages"
 msgstr "Mynd i'r blygell nesaf efo negeseuon heb eu darllen"
 
-#: kmmainwidget.cpp:3112
+#: kmmainwidget.cpp:3111
 msgid "Previous Unread F&older"
 msgstr "Plyg&ell Flaenorol Heb ei Ddarllen"
 
-#: kmmainwidget.cpp:3113
+#: kmmainwidget.cpp:3112
 msgid "Go to the previous folder with unread messages"
 msgstr "Mynd i'r blygell flaenorol efo negeseuon heb eu darllen"
 
-#: kmmainwidget.cpp:3120
+#: kmmainwidget.cpp:3119
 msgid ""
 "_: Go->\n"
 "Next Unread &Text"
 msgstr "&Testun Nesaf heb ei Ddarllen"
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3120
 msgid "Go to the next unread text"
 msgstr "Mynd i'r testun nesaf heb ei ddarllen"
 
-#: kmmainwidget.cpp:3122
+#: kmmainwidget.cpp:3121
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
@@ -9044,57 +9044,57 @@ msgstr ""
 "Sgrolio i lawr y neges gyfredol.  Os wrth waelod y neges gyfredol, mynd i'r "
 "neges nesaf heb ei darllen."
 
-#: kmmainwidget.cpp:3129
+#: kmmainwidget.cpp:3128
 msgid "Show Quick Search"
 msgstr ""
 
-#: kmmainwidget.cpp:3136
+#: kmmainwidget.cpp:3135
 msgid "Configure &Filters..."
 msgstr "Ffurfweddu &Hidlau..."
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3137
 msgid "Configure &POP Filters..."
 msgstr "Ffurfweddu Hidlau &POP3..."
 
-#: kmmainwidget.cpp:3140
+#: kmmainwidget.cpp:3139
 #, fuzzy
 msgid "Manage &Sieve Scripts..."
 msgstr "Hidlau ar Gael"
 
-#: kmmainwidget.cpp:3143
+#: kmmainwidget.cpp:3142
 msgid "KMail &Introduction"
 msgstr "&Cyflwyniad KMail"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3143
 msgid "Display KMail's Welcome Page"
 msgstr "Dangos Tudalen Groeso KMail"
 
-#: kmmainwidget.cpp:3150
+#: kmmainwidget.cpp:3149
 msgid "Configure &Notifications..."
 msgstr "Ffurfweddu &Hysbysiadau..."
 
-#: kmmainwidget.cpp:3155
+#: kmmainwidget.cpp:3154
 msgid "&Configure KMail..."
 msgstr "&Furffweddu KMail..."
 
-#: kmmainwidget.cpp:3454
+#: kmmainwidget.cpp:3453
 msgid "E&mpty Trash"
 msgstr "Gwagu'r &Sbwriel"
 
-#: kmmainwidget.cpp:3455
+#: kmmainwidget.cpp:3454
 msgid "&Move All Messages to Trash"
 msgstr "&Symud Pob Neges i'r Sbwriel"
 
-#: kmmainwidget.cpp:3464
+#: kmmainwidget.cpp:3463
 #, fuzzy
 msgid "&Delete Search"
 msgstr "Dile&u Plygell"
 
-#: kmmainwidget.cpp:3465
+#: kmmainwidget.cpp:3464
 msgid "&Delete Folder"
 msgstr "Dile&u Plygell"
 
-#: kmmainwidget.cpp:3649
+#: kmmainwidget.cpp:3648
 #, c-format
 msgid ""
 "_n: Removed %n duplicate message.\n"
@@ -9103,25 +9103,25 @@ msgstr ""
 "Gwaredwyd %n neges ddyblyg.\n"
 "Gwaredwyd %n o negeseuon dyblyg."
 
-#: kmmainwidget.cpp:3651
+#: kmmainwidget.cpp:3650
 msgid "No duplicate messages found."
 msgstr "Ni chanfuwyd negeseuon dyblyg."
 
-#: kmmainwidget.cpp:3721
+#: kmmainwidget.cpp:3720
 #, c-format
 msgid "Filter %1"
 msgstr "Hidlo %1"
 
-#: kmmainwidget.cpp:3855
+#: kmmainwidget.cpp:3854
 msgid "Subscription"
 msgstr "Tanysgrifiad"
 
-#: kmmainwidget.cpp:3872
+#: kmmainwidget.cpp:3871
 #, fuzzy
 msgid "Local Subscription"
 msgstr "Tanysgrifiad"
 
-#: kmmainwidget.cpp:4007
+#: kmmainwidget.cpp:4006
 #, fuzzy
 msgid "Out of office reply active"
 msgstr "Gosodwyd ateb Allan-o'r-Swyddfa yn llwyddiannus."
@@ -9134,7 +9134,7 @@ msgstr "&Ffenestr Newydd"
 msgid " Initializing..."
 msgstr "Ymgychwyn..."
 
-#: kmmessage.cpp:1336
+#: kmmessage.cpp:1335
 #, fuzzy
 msgid ""
 "This message contains a request to return a notification about your "
@@ -9146,7 +9146,7 @@ msgstr ""
 "Gallwch un ai anwybyddu'r cais, neu adael i KMail anfon ymateb \"gwrthodwyd"
 "\" neu arferol."
 
-#: kmmessage.cpp:1341
+#: kmmessage.cpp:1340
 #, fuzzy
 msgid ""
 "This message contains a request to send a notification about your reception "
@@ -9160,7 +9160,7 @@ msgstr ""
 "anhysbys i KMail.\n"
 "Gallwch un ai anwybyddu'r cais, neu adael i KMail anfon ymateb \"methiant\"."
 
-#: kmmessage.cpp:1348
+#: kmmessage.cpp:1347
 #, fuzzy
 msgid ""
 "This message contains a request to send a notification about your reception "
@@ -9174,7 +9174,7 @@ msgstr ""
 "Gallwch un ai anwybyddu'r cais, neu adael i KMail anfon ymateb \"gwrthodwyd"
 "\" neu arferol."
 
-#: kmmessage.cpp:1355
+#: kmmessage.cpp:1354
 #, fuzzy
 msgid ""
 "This message contains a request to send a notification about your reception "
@@ -9188,7 +9188,7 @@ msgstr ""
 "Gallwch un ai anwybyddu'r cais, neu adael i KMail anfon ymateb \"gwrthodwyd"
 "\" neu arferol."
 
-#: kmmessage.cpp:1361
+#: kmmessage.cpp:1360
 #, fuzzy
 msgid ""
 "This message contains a request to send a notification about your reception "
@@ -9204,19 +9204,19 @@ msgstr ""
 "Gallwch un ai anwybyddu'r cais, neu adael i KMail anfon ymateb \"gwrthodwyd"
 "\" neu arferol."
 
-#: kmmessage.cpp:1379 kmmessage.cpp:1386
+#: kmmessage.cpp:1378 kmmessage.cpp:1385
 msgid "Message Disposition Notification Request"
 msgstr "Cais Hysbysiad Lleoliad y Neges"
 
-#: kmmessage.cpp:1381
+#: kmmessage.cpp:1380
 msgid "Send \"&denied\""
 msgstr "Anfon \"&gwrthodwyd\""
 
-#: kmmessage.cpp:1381 kmmessage.cpp:1388
+#: kmmessage.cpp:1380 kmmessage.cpp:1387
 msgid "&Send"
 msgstr "An&fon"
 
-#: kmmessage.cpp:1458
+#: kmmessage.cpp:1457
 msgid ""
 "Header \"Disposition-Notification-Options\" contained required, but unknown "
 "parameter"
@@ -9224,26 +9224,26 @@ msgstr ""
 "Ni wnaeth y penawd \"Dewisiadau-Hysbysiad-Lleoliad\" gynnwys paramedr "
 "gofynnol, ond anhysbys"
 
-#: kmmessage.cpp:1650
+#: kmmessage.cpp:1649
 msgid "Receipt: "
 msgstr "Derbynneb:"
 
-#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3170 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Atodiad: %1"
 
-#: kmmessage.cpp:3202
+#: kmmessage.cpp:3201
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "Dangos atodiadau fel yr awgrymir gan yr anfonwr."
 
-#: kmmessage.cpp:3204
+#: kmmessage.cpp:3203
 #, fuzzy
 msgid "The attachment '%1' has been deleted."
 msgstr "Diddymwyd y digwyddiad %1"
 
-#: kmmimeparttree.cpp:137 kmreaderwin.cpp:2037
+#: kmmimeparttree.cpp:137 kmreaderwin.cpp:2036
 msgid ""
 "_: to view something\n"
 "View"
@@ -9253,12 +9253,12 @@ msgstr "Dangos"
 msgid "Save All Attachments..."
 msgstr "Cadw Pob Atodiad"
 
-#: kmmimeparttree.cpp:152 kmreaderwin.cpp:2044 kmreaderwin.cpp:2808
+#: kmmimeparttree.cpp:152 kmreaderwin.cpp:2043 kmreaderwin.cpp:2807
 #, fuzzy
 msgid "Delete Attachment"
 msgstr "&Gwaredu Atodiad"
 
-#: kmmimeparttree.cpp:155 kmreaderwin.cpp:2042 kmreaderwin.cpp:2864
+#: kmmimeparttree.cpp:155 kmreaderwin.cpp:2041 kmreaderwin.cpp:2863
 #, fuzzy
 msgid "Edit Attachment"
 msgstr "Atodiad"
@@ -9469,237 +9469,237 @@ msgstr "anhysbys"
 msgid "Save Attachments..."
 msgstr "Cadw Atodiadau...."
 
-#: kmreaderwin.cpp:489
+#: kmreaderwin.cpp:488
 msgid ""
 "_: View->\n"
 "&Headers"
 msgstr "&Penawdau"
 
-#: kmreaderwin.cpp:490
+#: kmreaderwin.cpp:489
 msgid "Choose display style of message headers"
 msgstr "Dewis arddull dangos penawdau'r negeseuon"
 
-#: kmreaderwin.cpp:495
+#: kmreaderwin.cpp:494
 #, fuzzy
 msgid ""
 "_: View->headers->\n"
 "&Enterprise Headers"
 msgstr "Penawdau &Byr"
 
-#: kmreaderwin.cpp:498
+#: kmreaderwin.cpp:497
 #, fuzzy
 msgid "Show the list of headers in Enterprise style"
 msgstr "Dangos y rhestr penawdau mewn fformat pert"
 
-#: kmreaderwin.cpp:502
+#: kmreaderwin.cpp:501
 msgid ""
 "_: View->headers->\n"
 "&Fancy Headers"
 msgstr "Penawdau &Pert"
 
-#: kmreaderwin.cpp:505
+#: kmreaderwin.cpp:504
 msgid "Show the list of headers in a fancy format"
 msgstr "Dangos y rhestr penawdau mewn fformat pert"
 
-#: kmreaderwin.cpp:509
+#: kmreaderwin.cpp:508
 msgid ""
 "_: View->headers->\n"
 "&Brief Headers"
 msgstr "Penawdau &Byr"
 
-#: kmreaderwin.cpp:512
+#: kmreaderwin.cpp:511
 msgid "Show brief list of message headers"
 msgstr "Dangos rhestr fer o benawdau"
 
-#: kmreaderwin.cpp:516
+#: kmreaderwin.cpp:515
 msgid ""
 "_: View->headers->\n"
 "&Standard Headers"
 msgstr "Penawdau &Safonol"
 
-#: kmreaderwin.cpp:519
+#: kmreaderwin.cpp:518
 msgid "Show standard list of message headers"
 msgstr "Dangos rhestr safonol o benawdau"
 
-#: kmreaderwin.cpp:523
+#: kmreaderwin.cpp:522
 msgid ""
 "_: View->headers->\n"
 "&Long Headers"
 msgstr "Penawdau &Hir"
 
-#: kmreaderwin.cpp:526
+#: kmreaderwin.cpp:525
 msgid "Show long list of message headers"
 msgstr "Dangos rhestr hir o benawdau"
 
-#: kmreaderwin.cpp:530
+#: kmreaderwin.cpp:529
 msgid ""
 "_: View->headers->\n"
 "&All Headers"
 msgstr "P&ob Penawd"
 
-#: kmreaderwin.cpp:533
+#: kmreaderwin.cpp:532
 msgid "Show all message headers"
 msgstr "Dangos pob penawd y negeseuon"
 
-#: kmreaderwin.cpp:539
+#: kmreaderwin.cpp:538
 msgid ""
 "_: View->\n"
 "&Attachments"
 msgstr "&Atodiadau"
 
-#: kmreaderwin.cpp:540
+#: kmreaderwin.cpp:539
 msgid "Choose display style of attachments"
 msgstr "Dewis arddull dangos yr atodiadau"
 
-#: kmreaderwin.cpp:544
+#: kmreaderwin.cpp:543
 msgid ""
 "_: View->attachments->\n"
 "&As Icons"
 msgstr "Fel &Eiconau"
 
-#: kmreaderwin.cpp:547
+#: kmreaderwin.cpp:546
 msgid "Show all attachments as icons. Click to see them."
 msgstr "Dangos pob atodiad fel eicon.  Cliciwch i'w gweld nhw."
 
-#: kmreaderwin.cpp:551
+#: kmreaderwin.cpp:550
 msgid ""
 "_: View->attachments->\n"
 "&Smart"
 msgstr "&Deallus"
 
-#: kmreaderwin.cpp:554
+#: kmreaderwin.cpp:553
 msgid "Show attachments as suggested by sender."
 msgstr "Dangos atodiadau fel yr awgrymir gan yr anfonwr."
 
-#: kmreaderwin.cpp:558
+#: kmreaderwin.cpp:557
 msgid ""
 "_: View->attachments->\n"
 "&Inline"
 msgstr "&Mewnlin"
 
-#: kmreaderwin.cpp:561
+#: kmreaderwin.cpp:560
 msgid "Show all attachments inline (if possible)"
 msgstr "Dangos pob atodiad mewnlin (os bosibl)"
 
-#: kmreaderwin.cpp:565
+#: kmreaderwin.cpp:564
 msgid ""
 "_: View->attachments->\n"
 "&Hide"
 msgstr "&Cuddio"
 
-#: kmreaderwin.cpp:568
+#: kmreaderwin.cpp:567
 #, fuzzy
 msgid "Do not show attachments in the message viewer"
 msgstr "Peidio â dangos atodiadau yn y gwelydd negeseuon"
 
-#: kmreaderwin.cpp:572
+#: kmreaderwin.cpp:571
 #, fuzzy
 msgid ""
 "_: View->attachments->\n"
 "In Header &Only"
 msgstr "&Cuddio"
 
-#: kmreaderwin.cpp:575
+#: kmreaderwin.cpp:574
 #, fuzzy
 msgid "Show Attachments only in the header of the mail"
 msgstr "Dangos pob atodiad fel eicon.  Cliciwch i'w gweld nhw."
 
-#: kmreaderwin.cpp:580
+#: kmreaderwin.cpp:579
 msgid "&Set Encoding"
 msgstr "&Gosod Amgodiad"
 
-#: kmreaderwin.cpp:588
+#: kmreaderwin.cpp:587
 msgid "New Message To..."
 msgstr "Neges Newydd I..."
 
-#: kmreaderwin.cpp:591
+#: kmreaderwin.cpp:590
 msgid "Reply To..."
 msgstr "Ateb I..."
 
-#: kmreaderwin.cpp:594
+#: kmreaderwin.cpp:593
 msgid "Forward To..."
 msgstr "Blaenyrru I..."
 
-#: kmreaderwin.cpp:597
+#: kmreaderwin.cpp:596
 msgid "Add to Address Book"
 msgstr "Ychwanegu i'r Llyfr Cyfeiriadau"
 
-#: kmreaderwin.cpp:600
+#: kmreaderwin.cpp:599
 msgid "Open in Address Book"
 msgstr "Agor yn y Lyfr Cyfeiriadau"
 
-#: kmreaderwin.cpp:604
+#: kmreaderwin.cpp:603
 #, fuzzy
 msgid "Select All Text"
 msgstr "Dewis &Pob Neges"
 
-#: kmreaderwin.cpp:606 kmreaderwin.cpp:1997
+#: kmreaderwin.cpp:605 kmreaderwin.cpp:1996
 msgid "Copy Link Address"
 msgstr "Copïo Cyfeiriad Cyswllt"
 
-#: kmreaderwin.cpp:608
+#: kmreaderwin.cpp:607
 msgid "Open URL"
 msgstr "Agor URL"
 
-#: kmreaderwin.cpp:610
+#: kmreaderwin.cpp:609
 msgid "Bookmark This Link"
 msgstr "Tudnodi'r Cyswllt Yma"
 
-#: kmreaderwin.cpp:614
+#: kmreaderwin.cpp:613
 msgid "Save Link As..."
 msgstr "Cadw'r Cyswllt Fel..."
 
-#: kmreaderwin.cpp:621
+#: kmreaderwin.cpp:620
 #, fuzzy
 msgid "Chat &With..."
 msgstr "Agor Efo..."
 
-#: kmreaderwin.cpp:1261
+#: kmreaderwin.cpp:1260
 msgid "Full namespace support for IMAP"
 msgstr ""
 
-#: kmreaderwin.cpp:1262
+#: kmreaderwin.cpp:1261
 msgid "Offline mode"
 msgstr "Modd All-lein"
 
-#: kmreaderwin.cpp:1263
+#: kmreaderwin.cpp:1262
 msgid "Sieve script management and editing"
 msgstr ""
 
-#: kmreaderwin.cpp:1264
+#: kmreaderwin.cpp:1263
 msgid "Account specific filtering"
 msgstr ""
 
-#: kmreaderwin.cpp:1265
+#: kmreaderwin.cpp:1264
 msgid "Filtering of incoming mail for online IMAP accounts"
 msgstr ""
 
-#: kmreaderwin.cpp:1266
+#: kmreaderwin.cpp:1265
 msgid "Online IMAP folders can be used when filtering into folders"
 msgstr ""
 
-#: kmreaderwin.cpp:1267
+#: kmreaderwin.cpp:1266
 #, fuzzy
 msgid "Automatically delete older mails on POP servers"
 msgstr "Anfon cada&rnhadau derbyn yn ymysgogol"
 
-#: kmreaderwin.cpp:1305
+#: kmreaderwin.cpp:1304
 msgid "The email client for the Trinity Desktop Environment."
 msgstr ""
 
-#: kmreaderwin.cpp:1313
+#: kmreaderwin.cpp:1312
 msgid ""
 "<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
 "wait . . .</p>&nbsp;"
 msgstr ""
 
-#: kmreaderwin.cpp:1321
+#: kmreaderwin.cpp:1320
 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;"
 msgstr ""
 
-#: kmreaderwin.cpp:1338
+#: kmreaderwin.cpp:1337
 #, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
@@ -9744,11 +9744,11 @@ msgstr ""
 "<p>Diolch,</p>\n"
 "<p>&nbsp; &nbsp; Y Tîm KMail</p>"
 
-#: kmreaderwin.cpp:1361 kmreaderwin.cpp:1383
+#: kmreaderwin.cpp:1360 kmreaderwin.cpp:1382
 msgid "<li>%1</li>\n"
 msgstr "<li>%1</li>\n"
 
-#: kmreaderwin.cpp:1366
+#: kmreaderwin.cpp:1365
 msgid ""
 "<p>Please take a moment to fill in the KMail configuration panel at Settings-"
 "&gt;Configure KMail.\n"
@@ -9760,40 +9760,40 @@ msgstr ""
 "Mae angen i chi greu o leiaf dynodiad rhagosod, cyfrif ebost derbyn, a "
 "chyfrif ebost anfon.</p>\n"
 
-#: kmreaderwin.cpp:1378
+#: kmreaderwin.cpp:1377
 msgid ""
 "<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
 "(compared to KMail %1):</p>\n"
 msgstr ""
 
-#: kmreaderwin.cpp:1521
+#: kmreaderwin.cpp:1520
 msgid "( body part )"
 msgstr "( rhan gorff )"
 
-#: kmreaderwin.cpp:1893
+#: kmreaderwin.cpp:1892
 #, fuzzy
 msgid "Could not send MDN."
 msgstr "Methu anfon Hsbysiad Lleoliad Neges (MDN)!"
 
-#: kmreaderwin.cpp:1995
+#: kmreaderwin.cpp:1994
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "Cyfeiriad Ebost"
 
-#: kmreaderwin.cpp:2047
+#: kmreaderwin.cpp:2046
 msgid "Decrypt With Chiasmus..."
 msgstr ""
 
-#: kmreaderwin.cpp:2053
+#: kmreaderwin.cpp:2052
 msgid "Scroll To"
 msgstr ""
 
-#: kmreaderwin.cpp:2211 kmreaderwin.cpp:2247 kmreaderwin.cpp:2267
+#: kmreaderwin.cpp:2210 kmreaderwin.cpp:2246 kmreaderwin.cpp:2266
 #, c-format
 msgid "View Attachment: %1"
 msgstr "Gweld Atodiad: %1"
 
-#: kmreaderwin.cpp:2260
+#: kmreaderwin.cpp:2259
 #, c-format
 msgid ""
 "_n: [KMail: Attachment contains binary data. Trying to show first "
@@ -9804,15 +9804,15 @@ msgstr ""
 "[KMail: Mae'r atodiad yn cynnwys data deuol.  Ceisio dangos y %n o nodau "
 "cyntaf.]"
 
-#: kmreaderwin.cpp:2356
+#: kmreaderwin.cpp:2355
 msgid "&Open with '%1'"
 msgstr "&Agor efo '%1'"
 
-#: kmreaderwin.cpp:2358
+#: kmreaderwin.cpp:2357
 msgid "&Open With..."
 msgstr "&Agor Gyda..."
 
-#: kmreaderwin.cpp:2360
+#: kmreaderwin.cpp:2359
 #, fuzzy
 msgid ""
 "Open attachment '%1'?\n"
@@ -9821,163 +9821,163 @@ msgstr ""
 "Agor atodiad '%1'?\n"
 "Noder: gall agor atodiad beryglu diogelwch eich cysawd!"
 
-#: kmreaderwin.cpp:2365
+#: kmreaderwin.cpp:2364
 msgid "Open Attachment?"
 msgstr "Agor Atodiad?"
 
-#: kmreaderwin.cpp:2807
+#: kmreaderwin.cpp:2806
 msgid ""
 "Deleting an attachment might invalidate any digital signature on this "
 "message."
 msgstr ""
 
-#: kmreaderwin.cpp:2863
+#: kmreaderwin.cpp:2862
 msgid ""
 "Modifying an attachment might invalidate any digital signature on this "
 "message."
 msgstr ""
 
-#: kmreaderwin.cpp:2959
+#: kmreaderwin.cpp:2958
 #, fuzzy
 msgid "Attachments:"
 msgstr "Atodiad"
 
-#: kmsearchpattern.cpp:913
+#: kmsearchpattern.cpp:912
 msgid ""
 "_: name used for a virgin filter\n"
 "unknown"
 msgstr "anhysbys"
 
-#: kmsearchpattern.cpp:919
+#: kmsearchpattern.cpp:918
 #, fuzzy
 msgid "(match any of the following)"
 msgstr "Cyd&weddu ag unrhyw un o'r dilynnol"
 
-#: kmsearchpattern.cpp:921
+#: kmsearchpattern.cpp:920
 #, fuzzy
 msgid "(match all of the following)"
 msgstr "Cy&dweddu â pob un o'r dilynnol"
 
-#: kmsearchpattern.h:221
+#: kmsearchpattern.h:220
 msgid "Read"
 msgstr "Darllen"
 
-#: kmsearchpattern.h:222
+#: kmsearchpattern.h:221
 msgid "Old"
 msgstr "Hen"
 
-#: kmsearchpattern.h:223
+#: kmsearchpattern.h:222
 msgid "Deleted"
 msgstr "Wedi'u dileu"
 
-#: kmsearchpattern.h:224
+#: kmsearchpattern.h:223
 msgid "Replied"
 msgstr "Wedi'u ateb"
 
-#: kmsearchpattern.h:225
+#: kmsearchpattern.h:224
 msgid "Forwarded"
 msgstr "Wedi'u blaenyrru"
 
-#: kmsearchpattern.h:226
+#: kmsearchpattern.h:225
 msgid "Queued"
 msgstr "Mewn Ciw"
 
-#: kmsearchpattern.h:227
+#: kmsearchpattern.h:226
 msgid "Sent"
 msgstr "Anfonwyd"
 
-#: kmsearchpattern.h:228
+#: kmsearchpattern.h:227
 msgid "Watched"
 msgstr "Wedi'u gwylio"
 
-#: kmsearchpattern.h:229
+#: kmsearchpattern.h:228
 msgid "Ignored"
 msgstr "Anwybyddwyd"
 
-#: kmsearchpattern.h:230
+#: kmsearchpattern.h:229
 msgid "Spam"
 msgstr "Ebostach"
 
-#: kmsearchpattern.h:231
+#: kmsearchpattern.h:230
 msgid "Ham"
 msgstr "Ebost iawn"
 
-#: kmsearchpattern.h:232
+#: kmsearchpattern.h:231
 #, fuzzy
 msgid "To Do"
 msgstr "I:"
 
-#: kmsearchpattern.h:234
+#: kmsearchpattern.h:233
 msgid "Has Attachment"
 msgstr "Efo Atodiad"
 
-#: kmsearchpatternedit.cpp:34
+#: kmsearchpatternedit.cpp:33
 #, fuzzy
 msgid "Complete Message"
 msgstr "Dileu Negeseuon"
 
-#: kmsearchpatternedit.cpp:35
+#: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Body of Message"
 msgstr "G&olygu Neges"
 
-#: kmsearchpatternedit.cpp:36
+#: kmsearchpatternedit.cpp:35
 #, fuzzy
 msgid "Anywhere in Headers"
 msgstr "ail-ysgrifennu penawd"
 
-#: kmsearchpatternedit.cpp:37
+#: kmsearchpatternedit.cpp:36
 #, fuzzy
 msgid "All Recipients"
 msgstr "<derbynwyr>"
 
-#: kmsearchpatternedit.cpp:38
+#: kmsearchpatternedit.cpp:37
 #, fuzzy
 msgid "Size in Bytes"
 msgstr "<maint mewn beitiau>"
 
-#: kmsearchpatternedit.cpp:39
+#: kmsearchpatternedit.cpp:38
 #, fuzzy
 msgid "Age in Days"
 msgstr "<oed mewn diwrnodau>"
 
-#: kmsearchpatternedit.cpp:40
+#: kmsearchpatternedit.cpp:39
 #, fuzzy
 msgid "Message Status"
 msgstr "Rhestr Negeseuon"
 
-#: kmsearchpatternedit.cpp:42
+#: kmsearchpatternedit.cpp:41
 #, fuzzy
 msgid "From"
 msgstr "&Oddiwrth"
 
-#: kmsearchpatternedit.cpp:43 recipientseditor.cpp:100
+#: kmsearchpatternedit.cpp:42 recipientseditor.cpp:100
 msgid "To"
 msgstr "I"
 
-#: kmsearchpatternedit.cpp:44 recipientseditor.cpp:102
+#: kmsearchpatternedit.cpp:43 recipientseditor.cpp:102
 msgid "CC"
 msgstr "CC"
 
-#: kmsearchpatternedit.cpp:45
+#: kmsearchpatternedit.cpp:44
 #, fuzzy
 msgid "Reply To"
 msgstr "&Ateb I"
 
-#: kmsearchpatternedit.cpp:46
+#: kmsearchpatternedit.cpp:45
 #, fuzzy
 msgid "Organization"
 msgstr "Sefydliad:"
 
-#: kmsearchpatternedit.cpp:397
+#: kmsearchpatternedit.cpp:396
 msgid "Search Criteria"
 msgstr "Meini Prawf Chwilio"
 
-#: kmsearchpatternedit.cpp:414
+#: kmsearchpatternedit.cpp:413
 msgid "Match a&ll of the following"
 msgstr "Cy&dweddu â pob un o'r dilynnol"
 
-#: kmsearchpatternedit.cpp:415
+#: kmsearchpatternedit.cpp:414
 msgid "Match an&y of the following"
 msgstr "Cyd&weddu ag unrhyw un o'r dilynnol"
 
@@ -10197,17 +10197,17 @@ msgstr "Dechrau %1"
 msgid "Exit"
 msgstr "Terfynu"
 
-#: kmsystemtray.cpp:357
+#: kmsystemtray.cpp:356
 #, fuzzy
 msgid "New Messages In"
 msgstr "Negeseuon Newydd Yn..."
 
-#: kmsystemtray.cpp:567
+#: kmsystemtray.cpp:566
 #, fuzzy
 msgid "There are no unread messages"
 msgstr "Darfod negeseuon &heb eu darllen"
 
-#: kmsystemtray.cpp:569
+#: kmsystemtray.cpp:568
 #, c-format
 msgid ""
 "_n: There is 1 unread message.\n"
@@ -13177,36 +13177,36 @@ msgid ""
 "set here."
 msgstr ""
 
-#: kmail.kcfg:93
+#: kmail.kcfg:92
 #, no-c-format
 msgid "The most recently selected folder in the folder selection dialog."
 msgstr ""
 
-#: kmail.kcfg:101
+#: kmail.kcfg:100
 #, no-c-format
 msgid ""
 "Disregard the users umask setting and use \"read-write for the user only\" "
 "instead"
 msgstr ""
 
-#: kmail.kcfg:109
+#: kmail.kcfg:108
 #, fuzzy, no-c-format
 msgid "Policy for showing the system tray icon"
 msgstr "&Dangos y cafn cysawd o hyd"
 
-#: kmail.kcfg:117
+#: kmail.kcfg:116
 #, 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
+#: kmail.kcfg:120
 #, fuzzy, no-c-format
 msgid "Verbose new mail notification"
 msgstr "Hysbysiad Ebost Newydd"
 
-#: kmail.kcfg:122
+#: kmail.kcfg:121
 #, no-c-format
 msgid ""
 "If this option is enabled then for each folder the number of newly arrived "
@@ -13214,35 +13214,35 @@ msgid ""
 "a simple 'New mail arrived' message."
 msgstr ""
 
-#: kmail.kcfg:126
+#: kmail.kcfg:125
 #, no-c-format
 msgid "Specify e&ditor:"
 msgstr "Penodi golyg&ydd"
 
-#: kmail.kcfg:130
+#: kmail.kcfg:129
 #, no-c-format
 msgid "Use e&xternal editor instead of composer"
 msgstr "Defny&ddio golygydd allanol yn lle cyfansoddydd"
 
-#: kmail.kcfg:157
+#: kmail.kcfg:156
 #, no-c-format
 msgid ""
 "The threshold for when to warn the user that a folder is nearing its quota "
 "limit."
 msgstr ""
 
-#: kmail.kcfg:166
+#: kmail.kcfg:165
 #, no-c-format
 msgid "Enable groupware functionality"
 msgstr "Galluogi swyddogaeth cylchwedd"
 
-#: kmail.kcfg:172
+#: kmail.kcfg:171
 #, 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
+#: kmail.kcfg:172
 #, no-c-format
 msgid ""
 "Microsoft Outlook has a number of shortcomings in its implementation of the "
@@ -13251,12 +13251,12 @@ msgid ""
 "this option."
 msgstr ""
 
-#: kmail.kcfg:178
+#: kmail.kcfg:177
 #, no-c-format
 msgid "Send groupware invitations in the mail body"
 msgstr ""
 
-#: kmail.kcfg:179
+#: kmail.kcfg:178
 #, no-c-format
 msgid ""
 "Microsoft Outlook has a number of shortcomings  in its implementation of the "
@@ -13265,12 +13265,12 @@ msgid ""
 "setting this option."
 msgstr ""
 
-#: kmail.kcfg:184
+#: kmail.kcfg:183
 #, no-c-format
 msgid "Exchange compatible invitations naming"
 msgstr ""
 
-#: kmail.kcfg:185
+#: kmail.kcfg:184
 #, no-c-format
 msgid ""
 "Microsoft Outlook, when used in combination with a Microsoft Exchange "
@@ -13279,14 +13279,14 @@ msgid ""
 "Exchange understands."
 msgstr ""
 
-#: kmail.kcfg:191
+#: kmail.kcfg:190
 #, no-c-format
 msgid ""
 "When replying to invitations, send the reply comment in way that Microsoft "
 "Outlook understands."
 msgstr ""
 
-#: kmail.kcfg:197
+#: kmail.kcfg:196
 #, no-c-format
 msgid ""
 "When this is checked, you will not see the mail composer window. Instead, "
@@ -13296,33 +13296,33 @@ msgid ""
 "modifying it by hand."
 msgstr ""
 
-#: kmail.kcfg:213
+#: kmail.kcfg:212
 #, no-c-format
 msgid "Delete invitation emails after the reply to them has been sent"
 msgstr ""
 
-#: kmail.kcfg:214
+#: kmail.kcfg:213
 #, 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
+#: kmail.kcfg:218
 #, no-c-format
 msgid ""
 "When encountering a Toltec scheduling message, display a custom replacement "
 "text for it."
 msgstr ""
 
-#: kmail.kcfg:224
+#: kmail.kcfg:223
 #, no-c-format
 msgid ""
 "The text that will be displayed as a replacement when encountering Toltec "
 "scheduling messages."
 msgstr ""
 
-#: kmail.kcfg:233
+#: kmail.kcfg:232
 #, no-c-format
 msgid ""
 "<p>Enabling this makes it possible to store the entries from the Kontact "
@@ -13331,14 +13331,14 @@ msgid ""
 "this is done in the Trinity Control Center.</p>"
 msgstr ""
 
-#: kmail.kcfg:238
+#: kmail.kcfg:237
 #, 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
+#: kmail.kcfg:243
 #, no-c-format
 msgid ""
 "<p>If the account used for storing groupware information is not used to "
@@ -13347,7 +13347,7 @@ msgid ""
 "additional online IMAP account.</p>"
 msgstr ""
 
-#: kmail.kcfg:251
+#: kmail.kcfg:247
 #, no-c-format
 msgid ""
 "<p>Choose the storage format of the groupware folders. <ul><li>The default "
@@ -13358,19 +13358,19 @@ msgid ""
 "when using a Kolab server or a compatible solution.</li></ul></p>"
 msgstr ""
 
-#: kmail.kcfg:260
+#: kmail.kcfg:256
 #, 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
+#: kmail.kcfg:261
 #, no-c-format
 msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
 msgstr ""
 
-#: kmail.kcfg:270
+#: kmail.kcfg:266
 #, no-c-format
 msgid ""
 "<p>If you want to set the folder names of the IMAP storage to your local "
@@ -13380,42 +13380,42 @@ msgid ""
 "languages impossible. </p><p>So do not set this unless you have to.</p>"
 msgstr ""
 
-#: kmail.kcfg:276
+#: kmail.kcfg:272
 #, no-c-format
 msgid "Also filter new mails received in groupware folders."
 msgstr ""
 
-#: kmail.kcfg:283
+#: kmail.kcfg:279
 #, no-c-format
 msgid ""
 "Synchronize groupware changes in DIMAP folders immediately when being online."
 msgstr ""
 
-#: kmail.kcfg:292
+#: kmail.kcfg:288
 #, no-c-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
 "displayed."
 msgstr ""
 
-#: kmail.kcfg:299
+#: kmail.kcfg:295
 #, no-c-format
 msgid "Maximal number of connections per host"
 msgstr ""
 
-#: kmail.kcfg:300
+#: kmail.kcfg:296
 #, 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
+#: kmail.kcfg:304
 #, no-c-format
 msgid "Show quick search line edit"
 msgstr ""
 
-#: kmail.kcfg:309
+#: kmail.kcfg:305
 #, no-c-format
 msgid ""
 "This option enables or disables the search line edit above the message list "
@@ -13423,34 +13423,34 @@ msgid ""
 "list."
 msgstr ""
 
-#: kmail.kcfg:313
+#: kmail.kcfg:309
 #, no-c-format
 msgid "Hide local inbox if unused"
 msgstr ""
 
-#: kmail.kcfg:321
+#: kmail.kcfg:317
 #, no-c-format
 msgid "Forward Inline As Default."
 msgstr ""
 
-#: kmail.kcfg:325
+#: kmail.kcfg:321
 #, no-c-format
 msgid ""
 "Allow the semicolon charactor (';') to be used as separator in the message "
 "composer."
 msgstr ""
 
-#: kmail.kcfg:328
+#: kmail.kcfg:324
 #, 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
+#: kmail.kcfg:328
 #, fuzzy, no-c-format
 msgid "A&utomatically insert signature"
 msgstr "Atodi llo&fnod yn ymysgogol"
 
-#: kmail.kcfg:336
+#: kmail.kcfg:332
 #, no-c-format
 msgid ""
 "Remember this identity, so that it will be used in future composer windows "
@@ -13458,21 +13458,21 @@ msgid ""
 "        "
 msgstr ""
 
-#: kmail.kcfg:341
+#: kmail.kcfg:337
 #, 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
+#: kmail.kcfg:341
 #, no-c-format
 msgid ""
 "Remember this mail transport, so that it will be used in future composer "
 "windows as well."
 msgstr ""
 
-#: kmail.kcfg:349
+#: kmail.kcfg:345
 #, no-c-format
 msgid ""
 "Remember this dictionary, so that it will be used in future composer windows "
@@ -13480,17 +13480,17 @@ msgid ""
 "        "
 msgstr ""
 
-#: kmail.kcfg:354
+#: kmail.kcfg:350
 #, no-c-format
 msgid "Word &wrap at column:"
 msgstr "Lapio &geiriau wrth golofn:"
 
-#: kmail.kcfg:368
+#: kmail.kcfg:364
 #, 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
+#: kmail.kcfg:366 kmail.kcfg:373
 #, no-c-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -13498,7 +13498,7 @@ msgid ""
 "off."
 msgstr ""
 
-#: kmail.kcfg:390
+#: kmail.kcfg:386
 #, fuzzy, no-c-format
 msgid ""
 "Turn this option on to make Outlook &#8482; understand attachment names "
@@ -13507,12 +13507,12 @@ msgstr ""
 "Cynnau'r dewisiad yma er mwyn gwneud i Outlook(tm) ddeall eich atebion i "
 "wahoddiadau"
 
-#: kmail.kcfg:416
+#: kmail.kcfg:412
 #, no-c-format
 msgid "Automatically request &message disposition notifications"
 msgstr "Gofyn yn ymysgogol am &hysbysiadau lleoliad negeseuon"
 
-#: kmail.kcfg:417
+#: kmail.kcfg:413
 #, fuzzy, no-c-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -13528,24 +13528,24 @@ msgstr ""
 "pob-neges yn y cyfansoddydd, eitem dewislen <em>Dewisiadau</em>->&gt; "
 "<em>Gofyn am Hysbysiad Lleoliad</em>.</p></qt>"
 
-#: kmail.kcfg:421
+#: kmail.kcfg:417
 #, no-c-format
 msgid "Use recent addresses for autocompletion"
 msgstr ""
 
-#: kmail.kcfg:422
+#: kmail.kcfg:418
 #, 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
+#: kmail.kcfg:439
 #, fuzzy, no-c-format
 msgid "Autosave interval:"
 msgstr "Cyfnod y&mofyn:"
 
-#: kmail.kcfg:444
+#: kmail.kcfg:440
 #, no-c-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -13553,95 +13553,95 @@ msgid ""
 "autosaving by setting it to the value 0."
 msgstr ""
 
-#: kmail.kcfg:448
+#: kmail.kcfg:444
 #, no-c-format
 msgid "Insert signatures above quoted text"
 msgstr ""
 
-#: kmail.kcfg:455
+#: kmail.kcfg:451
 #, no-c-format
 msgid "Replace recognized prefi&x with \"Re:\""
 msgstr "Amnewid rha&gddodiad a adnabyddir gan \"Re:\""
 
-#: kmail.kcfg:462
+#: kmail.kcfg:458
 #, no-c-format
 msgid "Replace recognized prefix with \"&Fwd:\""
 msgstr "Amnewid rhagddodiad a adnabyddir gan \"&Fwd:\""
 
-#: kmail.kcfg:466
+#: kmail.kcfg:462
 #, no-c-format
 msgid "Use smart &quoting"
 msgstr "Defnyddion dyfynnu dea&llus"
 
-#: kmail.kcfg:470
+#: kmail.kcfg:466
 #, fuzzy, no-c-format
 msgid "Remove the signature when replying"
 msgstr "Mae'r llofnod wedi darfod."
 
-#: kmail.kcfg:474
+#: kmail.kcfg:470
 #, no-c-format
 msgid "Only quote selected text when replying"
 msgstr ""
 
-#: kmail.kcfg:479
+#: kmail.kcfg:475
 #, no-c-format
 msgid "Type of addressee selector"
 msgstr ""
 
-#: kmail.kcfg:480
+#: kmail.kcfg:476
 #, no-c-format
 msgid ""
 "Sets the type of the dialog for selecting recipients for To,\n"
 "        CC and BCC."
 msgstr ""
 
-#: kmail.kcfg:489
+#: kmail.kcfg:485
 #, no-c-format
 msgid "Type of recipients editor"
 msgstr ""
 
-#: kmail.kcfg:490
+#: kmail.kcfg:486
 #, no-c-format
 msgid ""
 "Sets the type of the recipients editor for editing To,\n"
 "        CC and BCC."
 msgstr ""
 
-#: kmail.kcfg:506
+#: kmail.kcfg:502
 #, no-c-format
 msgid "Maximum number of recipient editor lines."
 msgstr ""
 
-#: kmail.kcfg:512
+#: kmail.kcfg:508
 #, no-c-format
 msgid ""
 "List of message part types to strip off mails that are being forwarded "
 "inline."
 msgstr ""
 
-#: kmail.kcfg:516
+#: kmail.kcfg:512
 #, no-c-format
 msgid "The maximum size in MB that email attachments are allowed to have."
 msgstr ""
 
-#: kmail.kcfg:521
+#: kmail.kcfg:517
 #, no-c-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
 
-#: kmail.kcfg:528
+#: kmail.kcfg:524
 #, no-c-format
 msgid ""
 "Show the GnuPG Audit Log even after crypto operations that completed "
 "successfully."
 msgstr ""
 
-#: kmail.kcfg:557
+#: kmail.kcfg:553
 #, 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
+#: kmail.kcfg:568
 #, no-c-format
 msgid ""
 "Some emails, especially those generated automatically, do not specify the "
@@ -13651,87 +13651,87 @@ msgid ""
 "the world. As a default the encoding configured for the whole system is used."
 msgstr ""
 
-#: kmail.kcfg:578
+#: kmail.kcfg:574
 #, 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
+#: kmail.kcfg:580
 #, 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
+#: kmail.kcfg:585
 #, 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
+#: kmail.kcfg:588
 #, no-c-format
 msgid "Automatic collapse level:"
 msgstr ""
 
-#: kmail.kcfg:600
+#: kmail.kcfg:596
 #, no-c-format
 msgid "Reduce font size for quoted text"
 msgstr ""
 
-#: kmail.kcfg:601
+#: kmail.kcfg:597
 #, no-c-format
 msgid "Enable this option to show quoted text with a smaller font."
 msgstr ""
 
-#: kmail.kcfg:612
+#: kmail.kcfg:608
 #, fuzzy, no-c-format
 msgid "Show current message sender time"
 msgstr "Cadw negeseuon an&foniedig wedi'u cêl-ysgrifo"
 
-#: kmail.kcfg:613
+#: kmail.kcfg:609
 #, 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
+#: kmail.kcfg:614
 #, fuzzy, no-c-format
 msgid "Show user agent in fancy headers"
 msgstr "Dangos pob penawd y negeseuon"
 
-#: kmail.kcfg:619
+#: kmail.kcfg:615
 #, 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
+#: kmail.kcfg:620
 #, no-c-format
 msgid "Allow to delete attachments of existing mails."
 msgstr ""
 
-#: kmail.kcfg:628
+#: kmail.kcfg:624
 #, no-c-format
 msgid "Allow to edit attachments of existing mails."
 msgstr ""
 
-#: kmail.kcfg:633
+#: kmail.kcfg:629
 #, no-c-format
 msgid "Always decrypt messages when viewing or ask befor decrypting"
 msgstr ""
 
-#: kmail.kcfg:647
+#: kmail.kcfg:643
 #, fuzzy, no-c-format
 msgid "Send Message Disposition Notifications with an empty sender."
 msgstr "Hysbysiadau Lleoliad Neges"
 
-#: kmail.kcfg:648
+#: kmail.kcfg:644
 #, no-c-format
 msgid ""
 "Send Message Disposition Notifications with an empty sender string. Some "
@@ -13739,64 +13739,64 @@ msgid ""
 "experiencing problems sending MDNs, uncheck this option."
 msgstr ""
 
-#: kmail.kcfg:654
+#: kmail.kcfg:650
 #, no-c-format
 msgid "Phrases has been converted to templates"
 msgstr ""
 
-#: kmail.kcfg:655
+#: kmail.kcfg:651
 #, no-c-format
 msgid "Old phrases have been converted to templates"
 msgstr ""
 
-#: kmail.kcfg:659
+#: kmail.kcfg:655
 #, fuzzy, no-c-format
 msgid "Message template for new message"
 msgstr "Rhestr Negeseuon - Maes Dyddiad"
 
-#: kmail.kcfg:664
+#: kmail.kcfg:660
 #, no-c-format
 msgid "Message template for reply"
 msgstr ""
 
-#: kmail.kcfg:669
+#: kmail.kcfg:665
 #, no-c-format
 msgid "Message template for reply to all"
 msgstr ""
 
-#: kmail.kcfg:674
+#: kmail.kcfg:670
 #, fuzzy, no-c-format
 msgid "Message template for forward"
 msgstr "Nodi Neges fel Wedi'i &Blaenyrru"
 
-#: kmail.kcfg:679
+#: kmail.kcfg:675
 #, fuzzy, no-c-format
 msgid "Quote characters"
 msgstr "&Ychwanegu Nodau Dyfynnu"
 
-#: kmail.kcfg:688
+#: kmail.kcfg:684
 #, no-c-format
 msgid "Allow out-of-office settings to to be changeable by the user."
 msgstr ""
 
-#: kmail.kcfg:692
+#: kmail.kcfg:688
 #, 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
+#: kmail.kcfg:692
 #, no-c-format
 msgid "Send out-of-office replies to mails coming from this domain only."
 msgstr ""
 
-#: kmail.kcfg:700
+#: kmail.kcfg:696
 #, no-c-format
 msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
 msgstr ""
 
-#: kmail.kcfg:704
+#: kmail.kcfg:700
 #, no-c-format
 msgid ""
 "Check if there is still an active out-of-office reply configured when "