[evolution/gnome-2-28] Updated Welsh translation



commit da901d3247f8ca2fbaacd8e24973af4fd5144efc
Author: Iestyn Pryce <dylunio gmail com>
Date:   Sun Sep 13 16:38:00 2009 +0100

    Updated Welsh translation

 po/cy.po | 5619 +++++++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 3699 insertions(+), 1920 deletions(-)
---
diff --git a/po/cy.po b/po/cy.po
index 8ea393e..cfb6b49 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -25,12 +25,13 @@
 # instant messenger: negesydd sydyn
 # thread: trywydd (nid 'edefyn')
 #
+#: ../shell/main.c:631
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-07 17:57+0100\n"
-"PO-Revision-Date: 2009-08-07 18:05+0100\n"
+"POT-Creation-Date: 2009-09-13 16:45+0100\n"
+"PO-Revision-Date: 2009-09-13 16:36+0100\n"
 "Last-Translator: Iestyn Pryce <dylunio gmail com>\n"
 "Language-Team: Cymraeg <gnome-cy pengwyn linux org uk>\n"
 "MIME-Version: 1.0\n"
@@ -134,8 +135,7 @@ msgstr "tabl i weld ac i ddewis yr amrediad amser presennol"
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:148
-#: ../a11y/calendar/ea-week-view.c:147
+#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:147
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -145,8 +145,7 @@ msgstr[2] "Mae ganddo %d digwyddiad."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:152
-#: ../a11y/calendar/ea-week-view.c:149
+#: ../a11y/calendar/ea-day-view.c:152 ../a11y/calendar/ea-week-view.c:149
 msgid "It has no events."
 msgstr "Does ganddo ddim digwyddiad."
 
@@ -187,8 +186,7 @@ msgstr "%A %d %b %Y"
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:189
 #: ../calendar/gui/calendar-component.c:774
-#: ../calendar/gui/e-day-view-top-item.c:844
-#: ../calendar/gui/e-day-view.c:1593
+#: ../calendar/gui/e-day-view-top-item.c:844 ../calendar/gui/e-day-view.c:1593
 #: ../calendar/gui/e-week-view-main-item.c:368
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -220,8 +218,7 @@ msgstr "%d %b %Y"
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:219
 #: ../calendar/gui/calendar-component.c:800
-#: ../calendar/gui/e-day-view-top-item.c:848
-#: ../calendar/gui/e-day-view.c:1609
+#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1609
 #: ../calendar/gui/e-week-view-main-item.c:382
 msgid "%d %b"
 msgstr "%d %b"
@@ -354,12 +351,21 @@ msgstr "Naidlen"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
-msgid "'{0}' is a read-only address book and cannot be modified. Please select a different address book from the side bar in the Contacts view."
-msgstr "Mae '{0}' yn llyfr cyfeiriadau darllen-yn-unig a methu cael ei newid. Dewiswch lyfr cyfeiriadau gwahanol o'r bar ochor yn y golwg Cysylltiadau os gwelwch yn dda."
+msgid ""
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
+msgstr ""
+"Mae '{0}' yn llyfr cyfeiriadau darllen-yn-unig a methu cael ei newid. "
+"Dewiswch lyfr cyfeiriadau gwahanol o'r bar ochor yn y golwg Cysylltiadau os "
+"gwelwch yn dda."
 
 #: ../addressbook/addressbook.error.xml.h:3
-msgid "A contact already exists with this address. Would you like to add a new card with the same address anyway?"
-msgstr "Mae cyswllt gyda'r cyfeiriad hwn yn bodoli'n barod. Ydych chi am ychwanegu cerdyn newydd gyda'r un cyfeiriad beth bynnag?"
+msgid ""
+"A contact already exists with this address. Would you like to add a new card "
+"with the same address anyway?"
+msgstr ""
+"Mae cyswllt gyda'r cyfeiriad hwn yn bodoli'n barod. Ydych chi am ychwanegu "
+"cerdyn newydd gyda'r un cyfeiriad beth bynnag?"
 
 #: ../addressbook/addressbook.error.xml.h:4
 msgid "Address '{0}' already exists."
@@ -378,8 +384,14 @@ msgid "Category editor not available."
 msgstr "Nid yw'r golygydd categori."
 
 #: ../addressbook/addressbook.error.xml.h:8
-msgid "Check to make sure your password is spelled correctly and that you are using a supported login method. Remember that many passwords are case sensitive; your caps lock might be on."
-msgstr "Gwiriwch fod eich cyfrinair wedi ei sillafu'n gywir a'ch bod yn defnyddio dull mewngofnodi sy'n cael ei gynnal. Cofiwch fod rhaid cydweddu llythrennau bach a mawr mewn nifer o gyfrineiriau; gall fod eich 'caps lock' ymlaen."
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+"Gwiriwch fod eich cyfrinair wedi ei sillafu'n gywir a'ch bod yn defnyddio "
+"dull mewngofnodi sy'n cael ei gynnal. Cofiwch fod rhaid cydweddu llythrennau "
+"bach a mawr mewn nifer o gyfrineiriau; gall fod eich 'caps lock' ymlaen."
 
 #: ../addressbook/addressbook.error.xml.h:9
 msgid "Could not get schema information for LDAP server."
@@ -391,8 +403,15 @@ msgstr "Methwyd tynnu'r llyfr cyfeiriadau."
 
 #: ../addressbook/addressbook.error.xml.h:11
 #, fuzzy
-msgid "Currently you can only access the GroupWise System Address Book from Evolution. Please use some other GroupWise mail client once to get your GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
-msgstr "Ar hyn o bryd, dim ond Llyfr Cyfeiriadau System GroupWise fedrwch chi ei gyrchu o Evolution. Defnyddiwch gleient e-bost GroupWise gwahanol am un waith, er mwyn cael eich plygellau Cysylltiadau Aml GroupWise a Chysylltiadau Personol GroupWise."
+msgid ""
+"Currently you can only access the GroupWise System Address Book from "
+"Evolution. Please use some other GroupWise mail client once to get your "
+"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
+msgstr ""
+"Ar hyn o bryd, dim ond Llyfr Cyfeiriadau System GroupWise fedrwch chi ei "
+"gyrchu o Evolution. Defnyddiwch gleient e-bost GroupWise gwahanol am un "
+"waith, er mwyn cael eich plygellau Cysylltiadau Aml GroupWise a "
+"Chysylltiadau Personol GroupWise."
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
@@ -431,19 +450,29 @@ msgstr "Fersiwn Gweinydd"
 
 #: ../addressbook/addressbook.error.xml.h:20
 msgid "Some features may not work properly with your current server"
-msgstr "Efallai na fydd rhai nodweddion yn gweithio'n gywir gyda'ch gweinydd presennol"
+msgstr ""
+"Efallai na fydd rhai nodweddion yn gweithio'n gywir gyda'ch gweinydd "
+"presennol"
 
 #: ../addressbook/addressbook.error.xml.h:21
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "Mae'r llyfr cyfeiriadau Evolution wedi terfynu'n annisgwyl."
 
 #: ../addressbook/addressbook.error.xml.h:22
-msgid "The image you have selected is large. Do you want to resize and store it?"
-msgstr "Mae'r ddelwedd ddewisoch chi'n fawr. Ydych chi am newid ei maint a'i chadw?"
+msgid ""
+"The image you have selected is large. Do you want to resize and store it?"
+msgstr ""
+"Mae'r ddelwedd ddewisoch chi'n fawr. Ydych chi am newid ei maint a'i chadw?"
 
 #: ../addressbook/addressbook.error.xml.h:23
-msgid "This LDAP server may use an older version of LDAP, which does not support this functionality or it may be misconfigured. Ask your administrator for supported search bases."
-msgstr "Mae'n bosib fod y gweinydd LDAP yn defnyddio fersiwn hynach o LDAP, nad yw'n cynnal y weithred, neu gall fod y gweinydd wedi ei gam-gyflunio. Gofynnwch i'ch gweinyddwr pa fonion chwilio sy'n cael eu cynnal."
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+"Mae'n bosib fod y gweinydd LDAP yn defnyddio fersiwn hynach o LDAP, nad yw'n "
+"cynnal y weithred, neu gall fod y gweinydd wedi ei gam-gyflunio. Gofynnwch "
+"i'ch gweinyddwr pa fonion chwilio sy'n cael eu cynnal."
 
 #: ../addressbook/addressbook.error.xml.h:24
 msgid "This address book could not be opened."
@@ -452,12 +481,17 @@ msgstr "Methwyd agor y llyfr cyfeiriadau yma."
 #: ../addressbook/addressbook.error.xml.h:25
 #, fuzzy
 msgid "This address book server does not have any suggested search bases."
-msgstr "Does dim sail chwilio wedi ei awgrymu gan y gweinydd llyfr cyfeiriadau."
+msgstr ""
+"Does dim sail chwilio wedi ei awgrymu gan y gweinydd llyfr cyfeiriadau."
 
 #: ../addressbook/addressbook.error.xml.h:26
 #, fuzzy
-msgid "This address book server might be unreachable or the server name may be misspelled or your network connection could be down."
-msgstr "Mae'n bosib na ellir cyrraedd y gweinydd cyfeiriadau, neu mae'n bosib fod enw'r gweinydd wedi ei gamsillafu neu fod y cysylltiad rhwydwaith â nam."
+msgid ""
+"This address book server might be unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+"Mae'n bosib na ellir cyrraedd y gweinydd cyfeiriadau, neu mae'n bosib fod "
+"enw'r gweinydd wedi ei gamsillafu neu fod y cysylltiad rhwydwaith â nam."
 
 #: ../addressbook/addressbook.error.xml.h:27
 msgid "This address book will be removed permanently."
@@ -485,12 +519,23 @@ msgstr "A hoffech gadw eich newidiadau?"
 
 #: ../addressbook/addressbook.error.xml.h:33
 #, fuzzy
-msgid "You are attempting to move a contact from one address book to another but it cannot be removed from the source. Do you want to save a copy instead?"
-msgstr "Rydych yn ceisio symud cyswllt o un llyfr cyfeiriadau i'r llall, ond ni ellir ei dynnu o'r man gwreiddiol. Yn lle gwneud hynny, ydych chi am gadw copi?"
+msgid ""
+"You are attempting to move a contact from one address book to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+"Rydych yn ceisio symud cyswllt o un llyfr cyfeiriadau i'r llall, ond ni "
+"ellir ei dynnu o'r man gwreiddiol. Yn lle gwneud hynny, ydych chi am gadw "
+"copi?"
 
 #: ../addressbook/addressbook.error.xml.h:34
-msgid "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results the server should be upgraded to a supported version"
-msgstr "Rydych yn cysylltu â gweinydd GroupWise sydd heb ei gynnal. Hwyrach y cewch chi broblemau gyda Evolution. Dylid uwchraddio'r gweinydd at fersiwn sydd wedi ei gynnal, i gael y canlyniadau gorau."
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results the server should be upgraded to "
+"a supported version"
+msgstr ""
+"Rydych yn cysylltu â gweinydd GroupWise sydd heb ei gynnal. Hwyrach y cewch "
+"chi broblemau gyda Evolution. Dylid uwchraddio'r gweinydd at fersiwn sydd "
+"wedi ei gynnal, i gael y canlyniadau gorau."
 
 #: ../addressbook/addressbook.error.xml.h:35
 #, fuzzy
@@ -498,15 +543,19 @@ msgid "You do not have permission to delete contacts in this address book."
 msgstr "Does gennych chi mo'r caniatâd i ddileu'r e-bost hwn."
 
 #: ../addressbook/addressbook.error.xml.h:36
-msgid "You have made modifications to this contact. Do you want to save these changes?"
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
 msgstr "Rydych wedi gwneud newidiadau i'r cyswllt. Ydych chi am eu cadw?"
 
 #: ../addressbook/addressbook.error.xml.h:37
-msgid "Your contacts for {0} will not be available until Evolution is restarted."
-msgstr "Ni fydd eich cysylltiadau ar gyfer {0} ar gael tan y caiff Evolution ei ailgychwyn."
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+"Ni fydd eich cysylltiadau ar gyfer {0} ar gael tan y caiff Evolution ei "
+"ailgychwyn."
 
-#: ../addressbook/addressbook.error.xml.h:38
-#: ../mail/em-vfolder-rule.c:513
+#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:513
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:18
@@ -530,8 +579,7 @@ msgid "_Use as it is"
 msgstr "_Defnyddio fel y mae"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:44
-#: ../mail/mail.error.xml.h:143
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0}"
 msgstr "{0}"
@@ -571,8 +619,7 @@ msgstr "Cyfluniwch awto-gwblhau yma"
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 #: ../addressbook/gui/component/addressbook-view.c:1213
-#: ../calendar/gui/calendar-component.c:193
-#: ../calendar/gui/migration.c:395
+#: ../calendar/gui/calendar-component.c:193 ../calendar/gui/migration.c:395
 #: ../plugins/exchange-operations/exchange-delegates-user.c:75
 #: ../plugins/exchange-operations/exchange-folder.c:579
 msgid "Contacts"
@@ -617,16 +664,11 @@ msgstr "Trefnwch dystysgrifau S/MIME yma"
 #: ../addressbook/gui/component/addressbook-component.c:97
 #: ../addressbook/gui/component/addressbook-migrate.c:499
 #: ../calendar/gui/calendar-component.c:192
-#: ../calendar/gui/memos-component.c:151
-#: ../calendar/gui/migration.c:474
-#: ../calendar/gui/migration.c:576
-#: ../calendar/gui/migration.c:1090
-#: ../calendar/gui/tasks-component.c:148
-#: ../mail/em-folder-tree-model.c:191
-#: ../mail/em-folder-tree-model.c:193
-#: ../mail/em-migrate.c:2890
-#: ../mail/mail-component.c:320
-#: ../mail/mail-vfolder.c:217
+#: ../calendar/gui/memos-component.c:151 ../calendar/gui/migration.c:474
+#: ../calendar/gui/migration.c:576 ../calendar/gui/migration.c:1090
+#: ../calendar/gui/tasks-component.c:148 ../mail/em-folder-tree-model.c:191
+#: ../mail/em-folder-tree-model.c:193 ../mail/em-migrate.c:2890
+#: ../mail/mail-component.c:320 ../mail/mail-vfolder.c:217
 #: ../mail/message-list.c:1515
 msgid "On This Computer"
 msgstr "Ar y Cyfeiriadur Hwn"
@@ -654,14 +696,10 @@ msgstr "Ar Weinyddion LDAP"
 #: ../addressbook/gui/widgets/eab-contact-display.c:650
 #: ../calendar/gui/calendar-component.c:232
 #: ../calendar/gui/calendar-component.c:238
-#: ../calendar/gui/memos-component.c:189
-#: ../calendar/gui/memos-component.c:193
-#: ../calendar/gui/migration.c:484
-#: ../calendar/gui/migration.c:584
-#: ../calendar/gui/migration.c:1098
-#: ../calendar/gui/tasks-component.c:186
-#: ../calendar/gui/tasks-component.c:190
-#: ../mail/em-migrate.c:960
+#: ../calendar/gui/memos-component.c:189 ../calendar/gui/memos-component.c:193
+#: ../calendar/gui/migration.c:484 ../calendar/gui/migration.c:584
+#: ../calendar/gui/migration.c:1098 ../calendar/gui/tasks-component.c:186
+#: ../calendar/gui/tasks-component.c:190 ../mail/em-migrate.c:960
 #: ../plugins/email-custom-header/email-custom-header.c:337
 msgid "Personal"
 msgstr "Personol"
@@ -676,6 +714,7 @@ msgid "Create a new contact"
 msgstr "Creu cyswllt newydd"
 
 #: ../addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
 msgctxt "New"
 msgid "Contact _List"
 msgstr "_Rhestr Gysylltiadau"
@@ -703,16 +742,30 @@ msgid "Failed upgrading Address Book settings or folders."
 msgstr "Methu wrth uwchraddio plygellau neu osodiadau'r Llyfr Cyfeiriadau."
 
 #: ../addressbook/gui/component/addressbook-config.c:217
-msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL."
-msgstr "Mae dewis yr opsiwn hwn yn golygu na fydd Evolution yn cysylltu â'ch gweinydd LDAP oni bai ei fod yn cynnal SSL."
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+"Mae dewis yr opsiwn hwn yn golygu na fydd Evolution yn cysylltu â'ch "
+"gweinydd LDAP oni bai ei fod yn cynnal SSL."
 
 #: ../addressbook/gui/component/addressbook-config.c:219
-msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports TLS."
-msgstr "Mae dewis yr opsiwn hwn yn golygu na fydd Evolution yn cysylltu â'ch gweinydd LDAP oni bai ei fod yn cynnal TLS."
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+"Mae dewis yr opsiwn hwn yn golygu na fydd Evolution yn cysylltu â'ch "
+"gweinydd LDAP oni bai ei fod yn cynnal TLS."
 
 #: ../addressbook/gui/component/addressbook-config.c:221
-msgid "Selecting this option means that your server does not support either SSL or TLS. This means that your connection will be insecure, and that you will be vulnerable to security exploits."
-msgstr "Mae dewis yr opsiwn hwn yn golygu nad yw eich gweinydd yn cynnal SSL na TLS. Bydd eich cysylltiad, felly, yn anniogel, a byddwch yn agored i ymosodiadau diogelwch."
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits."
+msgstr ""
+"Mae dewis yr opsiwn hwn yn golygu nad yw eich gweinydd yn cynnal SSL na TLS. "
+"Bydd eich cysylltiad, felly, yn anniogel, a byddwch yn agored i ymosodiadau "
+"diogelwch."
 
 #: ../addressbook/gui/component/addressbook-config.c:346
 msgid "Base"
@@ -728,17 +781,37 @@ msgid "Copy _book content locally for offline operation"
 msgstr "Copïwch gynnwys y _llyfr yn lleol er mwyn ei ddefnyddio all-lein"
 
 #: ../addressbook/gui/component/addressbook-config.c:759
-msgid "This is the port on the LDAP server that Evolution will try to connect to. A list of standard ports has been provided. Ask your system administrator what port you should specify."
-msgstr "Dyma'r porth y bydd Evolution yn ceisio cysylltu iddo ar y gweinydd LDAP. Mae rhestr o byrth safonol wedi ei ddarparu. Gofynnwch i'ch gweinyddwr systemau pa borth ddylech chi ei benodi."
+msgid ""
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
+msgstr ""
+"Dyma'r porth y bydd Evolution yn ceisio cysylltu iddo ar y gweinydd LDAP. "
+"Mae rhestr o byrth safonol wedi ei ddarparu. Gofynnwch i'ch gweinyddwr "
+"systemau pa borth ddylech chi ei benodi."
 
 #: ../addressbook/gui/component/addressbook-config.c:837
 #, fuzzy
-msgid "This is the method Evolution will use to authenticate you.  Note that setting this to \"Email Address\" requires anonymous access to your LDAP server."
-msgstr "Dyma'r dull y bydd Evolution yn ei ddefnyddio i'ch dilysu. Sylwch y bydd rhaid cael mynediad dienw i'ch gweinydd LDAP os am osod hwn fel \"Cyfeiriad E-bost\"."
+msgid ""
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
+"server."
+msgstr ""
+"Dyma'r dull y bydd Evolution yn ei ddefnyddio i'ch dilysu. Sylwch y bydd "
+"rhaid cael mynediad dienw i'ch gweinydd LDAP os am osod hwn fel \"Cyfeiriad "
+"E-bost\"."
 
 #: ../addressbook/gui/component/addressbook-config.c:916
-msgid "The search scope defines how deep you would like the search to extend down the directory tree. A search scope of \"sub\" will include all entries below your search base. A search scope of \"one\" will only include the entries one level beneath your base."
-msgstr "Mae'r cwmpas chwilio yn penderfynu ba ddyfnder islaw'r goeden cyfeiriaduron yr ydych am i'r chwilio ymestyn. Mae cwmpas chwilio o \"sub\" yn cynnwys bob cofnod islaw'ch bôn chwilio. Mae cwmpas chwilio o \"one\" ond yn cynnwys y cofnodion un lefel islaw'ch bôn."
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
+msgstr ""
+"Mae'r cwmpas chwilio yn penderfynu ba ddyfnder islaw'r goeden cyfeiriaduron "
+"yr ydych am i'r chwilio ymestyn. Mae cwmpas chwilio o \"sub\" yn cynnwys bob "
+"cofnod islaw'ch bôn chwilio. Mae cwmpas chwilio o \"one\" ond yn cynnwys y "
+"cofnodion un lefel islaw'ch bôn."
 
 #: ../addressbook/gui/component/addressbook-config.c:1020
 #: ../addressbook/gui/component/ldap-config.glade.h:17
@@ -746,8 +819,7 @@ msgstr "Mae'r cwmpas chwilio yn penderfynu ba ddyfnder islaw'r goeden cyfeiriadu
 #: ../calendar/gui/dialogs/calendar-setup.c:367
 #: ../calendar/gui/dialogs/calendar-setup.c:378
 #: ../calendar/gui/dialogs/calendar-setup.c:389
-#: ../mail/em-folder-properties.c:283
-#: ../mail/mail-config.glade.h:96
+#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:95
 #: ../plugins/itip-formatter/itip-formatter.c:2558
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
@@ -788,14 +860,12 @@ msgid "Address Book Properties"
 msgstr "Priodweddau Llyfr Cyfeiriadau"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:74
-#: ../calendar/gui/migration.c:148
-#: ../mail/em-migrate.c:1109
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1109
 msgid "Migrating..."
 msgstr "Trosi..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:126
-#: ../calendar/gui/migration.c:195
-#: ../mail/em-migrate.c:1168
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1168
 #, c-format
 msgid "Migrating '%s':"
 msgstr "Yn trosi '%s':"
@@ -810,11 +880,13 @@ msgstr "Gosodiadau Awto-gwblhau"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:1136
 msgid ""
-"The location and hierarchy of the Evolution contact folders has changed since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution contact folders has changed "
+"since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Mae lleoliad a strwythur plygellau cysylltiadau Evolution wedi newid ers Evolution 1.x\n"
+"Mae lleoliad a strwythur plygellau cysylltiadau Evolution wedi newid ers "
+"Evolution 1.x\n"
 "\n"
 "Byddwch yn amyneddgar nes i Evolution fudo'ch plygellau..."
 
@@ -874,10 +946,8 @@ msgstr "Cadw Fel VCard..."
 
 #: ../addressbook/gui/component/addressbook-view.c:951
 #: ../calendar/gui/calendar-component.c:628
-#: ../calendar/gui/memos-component.c:479
-#: ../calendar/gui/tasks-component.c:472
-#: ../mail/em-folder-tree.c:2122
-#: ../ui/evolution-mail-list.xml.h:39
+#: ../calendar/gui/memos-component.c:479 ../calendar/gui/tasks-component.c:472
+#: ../mail/em-folder-tree.c:2122 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "_Ailenwi..."
 
@@ -885,26 +955,19 @@ msgstr "_Ailenwi..."
 #: ../addressbook/gui/widgets/e-addressbook-view.c:954
 #: ../calendar/gui/calendar-component.c:631
 #: ../calendar/gui/e-calendar-table.c:1613
-#: ../calendar/gui/e-calendar-view.c:1828
-#: ../calendar/gui/e-memo-table.c:949
-#: ../calendar/gui/memos-component.c:482
-#: ../calendar/gui/tasks-component.c:475
-#: ../mail/em-folder-tree.c:2119
-#: ../mail/em-folder-view.c:1340
-#: ../ui/evolution-addressbook.xml.h:49
-#: ../ui/evolution-calendar.xml.h:42
-#: ../ui/evolution-mail-list.xml.h:35
-#: ../ui/evolution-memos.xml.h:16
+#: ../calendar/gui/e-calendar-view.c:1828 ../calendar/gui/e-memo-table.c:949
+#: ../calendar/gui/memos-component.c:482 ../calendar/gui/tasks-component.c:475
+#: ../mail/em-folder-tree.c:2119 ../mail/em-folder-view.c:1340
+#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Dileu"
 
 #: ../addressbook/gui/component/addressbook-view.c:957
 #: ../calendar/gui/calendar-component.c:636
-#: ../calendar/gui/memos-component.c:487
-#: ../calendar/gui/tasks-component.c:480
-#: ../mail/em-folder-tree.c:2127
-#: ../ui/evolution-addressbook.xml.h:59
+#: ../calendar/gui/memos-component.c:487 ../calendar/gui/tasks-component.c:480
+#: ../mail/em-folder-tree.c:2127 ../ui/evolution-addressbook.xml.h:59
 #: ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "_Priodweddau"
@@ -930,7 +993,7 @@ msgstr "Rhowch gyfrinair ar gyfer %s (defnyddiwr %s)"
 
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:500
+#: ../plugins/google-account-setup/google-source.c:519
 #: ../plugins/publish-calendar/publish-calendar.c:216
 #: ../smime/gui/component.c:49
 msgid "Enter password"
@@ -949,8 +1012,12 @@ msgid "EFolderList XML for the list of completion URIs."
 msgstr "XML EFolderList am y rhestr cwblhau URIau."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:4
-msgid "Position of the vertical pane, between the card and list views and the preview pane, in pixels."
-msgstr "Lleoliad y cwarel fertigol, rhwng y golygon cerdyn a rhestr a'r cwarel rhagolwg, mewn picseli."
+msgid ""
+"Position of the vertical pane, between the card and list views and the "
+"preview pane, in pixels."
+msgstr ""
+"Lleoliad y cwarel fertigol, rhwng y golygon cerdyn a rhestr a'r cwarel "
+"rhagolwg, mewn picseli."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
 msgid "Show autocompleted name with an address"
@@ -961,7 +1028,9 @@ msgid "Show preview pane"
 msgstr "Dangos cwarel rhagolwg"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
-msgid "The number of characters that must be typed before Evolution will attempt to autocomplete."
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
 msgstr "Y nifer o nodau rhaid eu teipio cyn i Evolution geisio awto-gwblhau."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
@@ -978,7 +1047,9 @@ msgid "Vertical pane position"
 msgstr "Lleoliad cwarel fertigol"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:11
-msgid "Whether force showing the mail address with the name of the autocompleted contact in the entry."
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
 msgstr ""
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:12
@@ -994,9 +1065,8 @@ msgid "Always _show address of the autocompleted contact"
 msgstr "Pob tro dango_s cyfeiriad y cyswllt sydd wedi'i awto-gwblhau"
 
 #: ../addressbook/gui/component/autocompletion-config.c:182
-#, fuzzy
 msgid "Date/Time Format"
-msgstr "Dyddiad ac Amser"
+msgstr "Fformat Dyddiad/Amser"
 
 #: ../addressbook/gui/component/autocompletion-config.c:185
 #: ../mail/em-mailer-prefs.c:1456
@@ -1053,8 +1123,11 @@ msgid "B_rowse this book until limit reached"
 msgstr ""
 
 #: ../addressbook/gui/component/ldap-config.glade.h:16
-msgid "Evolution will use this email address to authenticate you with the server."
-msgstr "Fe fydd Evolution yn defnyddio'r cyfeiriad e-bost yma i'ch dilysu gyda'r gweinydd."
+msgid ""
+"Evolution will use this email address to authenticate you with the server."
+msgstr ""
+"Fe fydd Evolution yn defnyddio'r cyfeiriad e-bost yma i'ch dilysu gyda'r "
+"gweinydd."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid "Lo_gin:"
@@ -1088,29 +1161,51 @@ msgstr "Hidlydd _chwilio:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:27
 #, fuzzy
-msgid "Search filter is the type of object to be searched for. If this is not modified, the default search will be performed on the type \"person\"."
-msgstr "Mae'r hidlydd chwilio yn penodi'r math o wrthrychau sy'n cael eu chwilio amdanynt. Os na chaiff hwn ei newid, y rhagosodiad yw chwilio am wrthrychau o'r dosbarth \"person\"."
+msgid ""
+"Search filter is the type of object to be searched for. If this is not "
+"modified, the default search will be performed on the type \"person\"."
+msgstr ""
+"Mae'r hidlydd chwilio yn penodi'r math o wrthrychau sy'n cael eu chwilio "
+"amdanynt. Os na chaiff hwn ei newid, y rhagosodiad yw chwilio am wrthrychau "
+"o'r dosbarth \"person\"."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Supported Search Bases"
 msgstr "Bonion Chwilio a Gynhelir"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:29
-msgid "The search base is the distinguished name (DN) of the entry where your searches will begin. If you leave this blank, the search will begin at the root of the directory tree."
-msgstr "Y bôn chwilio yw'r enw unigryw (distinguished name: DN) ar y cofnod lle bydd eich chwilota'n cychwyn. Os gadewch hwn yn wag, bydd y chwilota'n cychwyn ar wraidd eich coeden cyfeiriaduron."
+msgid ""
+"The search base is the distinguished name (DN) of the entry where your "
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
+msgstr ""
+"Y bôn chwilio yw'r enw unigryw (distinguished name: DN) ar y cofnod lle bydd "
+"eich chwilota'n cychwyn. Os gadewch hwn yn wag, bydd y chwilota'n cychwyn ar "
+"wraidd eich coeden cyfeiriaduron."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
-msgid "This is the full name of your LDAP server. For example, \"ldap.mycompany.com\"."
-msgstr "Dyma enw llawn eich gweinydd LDAP. Er enghraifft, \"ldap.fynghwmni.com\""
+msgid ""
+"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
+"\"."
+msgstr ""
+"Dyma enw llawn eich gweinydd LDAP. Er enghraifft, \"ldap.fynghwmni.com\""
 
 #: ../addressbook/gui/component/ldap-config.glade.h:31
-msgid "This is the maximum number of entries to download. Setting this number to be too large will slow down your address book."
-msgstr "Dyma uchafswm nifer y cofnodion i'w llwytho i lawr. Gall ei osod yn rhy uchel beri i'ch llyfr cyfeiriadau arafu."
+msgid ""
+"This is the maximum number of entries to download. Setting this number to be "
+"too large will slow down your address book."
+msgstr ""
+"Dyma uchafswm nifer y cofnodion i'w llwytho i lawr. Gall ei osod yn rhy "
+"uchel beri i'ch llyfr cyfeiriadau arafu."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:32
-msgid "This is the name for this server that will appear in your Evolution folder list. It is for display purposes only. "
-msgstr "Dyma enw'r gweinydd fydd yn ymddangos yn eich rhestr plygellau Evolution. Mae hwn at bwrpas dangos ar y sgrin yn unig."
+msgid ""
+"This is the name for this server that will appear in your Evolution folder "
+"list. It is for display purposes only. "
+msgstr ""
+"Dyma enw'r gweinydd fydd yn ymddangos yn eich rhestr plygellau Evolution. "
+"Mae hwn at bwrpas dangos ar y sgrin yn unig."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid "_Download limit:"
@@ -1126,7 +1221,7 @@ msgstr "Dull _mewngofnodi:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:36
 #: ../calendar/gui/dialogs/calendar-setup.c:226
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
@@ -1141,7 +1236,7 @@ msgid "_Search scope:"
 msgstr "Cwmpas _chwilio:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:39
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Server:"
 msgstr "_Gwasanaethwr:"
@@ -1162,10 +1257,10 @@ msgstr "cardiau"
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
 #: ../calendar/gui/dialogs/event-page.glade.h:24
 #: ../plugins/caldav/caldav-source.c:448
-#: ../plugins/calendar-file/calendar-file.c:286
+#: ../plugins/calendar-file/calendar-file.c:293
 #: ../plugins/calendar-http/calendar-http.c:323
 #: ../plugins/calendar-weather/calendar-weather.c:523
-#: ../plugins/google-account-setup/google-source.c:720
+#: ../plugins/google-account-setup/google-source.c:740
 #: ../plugins/google-account-setup/google-contacts-source.c:330
 msgid "minutes"
 msgstr "munudau"
@@ -1385,8 +1480,7 @@ msgstr "Enw"
 #: ../addressbook/gui/widgets/e-minicard-view.c:544
 #: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1816
-#: ../widgets/text/e-text.c:3674
+#: ../widgets/table/e-cell-text.c:1816 ../widgets/text/e-text.c:3674
 #: ../widgets/text/e-text.c:3675
 msgid "Editable"
 msgstr "Golygadwy"
@@ -1538,7 +1632,7 @@ msgid "_Select Address Book"
 msgstr "_Dewis Llyfr Cyfeiriadau"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:323
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want\n"
 "to delete contact list (%s)?"
@@ -1547,6 +1641,7 @@ msgstr ""
 "am ddileu'r rhestr gysylltiadau (%s) ?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:326
+#, fuzzy
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -1555,7 +1650,7 @@ msgstr ""
 "am ddileu'r rhestrau cysylltiadau hyn?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:331
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want\n"
 "to delete contact (%s)?"
@@ -1564,6 +1659,7 @@ msgstr ""
 "am ddileu'r cyswllt (%s) ?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:334
+#, fuzzy
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -1684,7 +1780,9 @@ msgstr "Wedi Canfod Cyswllt Dyblyg"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
 #, fuzzy
-msgid "The name or email of this contact already exists in this folder.  Would you like to add it anyway?"
+msgid ""
+"The name or email of this contact already exists in this folder.  Would you "
+"like to add it anyway?"
 msgstr ""
 "Mae enw neu gyfeiriad e-bost y cyswllt hwn yn bodoli eisoes\n"
 "o fewn y blygell. Ydych chi am ei ychwanegu beth bynnag?"
@@ -1720,17 +1818,14 @@ msgstr "Cyfuno Cyswllt"
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
 #: ../addressbook/gui/widgets/eab-contact-display.c:589
 #: ../addressbook/gui/widgets/eab-contact-display.c:868
-#: ../plugins/groupwise-features/junk-settings.c:420
-#: ../smime/lib/e-cert.c:808
+#: ../plugins/groupwise-features/junk-settings.c:420 ../smime/lib/e-cert.c:808
 msgid "Email"
 msgstr "E-bost"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../addressbook/gui/widgets/e-addressbook-view.c:160
-#: ../calendar/gui/cal-search-bar.c:79
-#: ../calendar/gui/caltypes.xml.h:2
-#: ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:4
+#: ../calendar/gui/cal-search-bar.c:79 ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
 msgid "Any field contains"
 msgstr "Unrhyw faes yn cynnwys"
 
@@ -1771,8 +1866,7 @@ msgstr "Gwall estyn golwg llyfr"
 #: ../widgets/table/e-table-click-to-add.c:507
 #: ../widgets/table/e-table-selection-model.c:302
 #: ../widgets/table/e-table.c:3344
-#: ../widgets/table/e-tree-selection-model.c:817
-#: ../widgets/text/e-text.c:3541
+#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3541
 #: ../widgets/text/e-text.c:3542
 msgid "Model"
 msgstr "Model:"
@@ -1805,8 +1899,7 @@ msgstr "Cadw fel vCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:932
 #: ../calendar/gui/e-calendar-table.c:1591
-#: ../calendar/gui/e-calendar-view.c:1806
-#: ../calendar/gui/e-memo-table.c:932
+#: ../calendar/gui/e-calendar-view.c:1806 ../calendar/gui/e-memo-table.c:932
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Agor"
@@ -1832,14 +1925,17 @@ msgid "_Forward Contacts"
 msgstr "Gyrru _Cysylltiadau ymlaen"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#, fuzzy
 msgid "Send _Message to Contact"
 msgstr "Anfon _Neges I'r Cyswllt"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#, fuzzy
 msgid "Send _Message to List"
 msgstr "Anfon Neges at _Restr"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#, fuzzy
 msgid "Send _Message to Contacts"
 msgstr "Anfon Neges at _Gysylltiadau"
 
@@ -1861,16 +1957,11 @@ msgstr "_Torri"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:952
 #: ../calendar/gui/e-calendar-table.c:1599
-#: ../calendar/gui/e-calendar-view.c:1813
-#: ../calendar/gui/e-memo-table.c:940
-#: ../mail/em-folder-tree.c:991
-#: ../mail/em-folder-view.c:1325
-#: ../mail/message-list.c:2109
-#: ../ui/evolution-addressbook.xml.h:46
-#: ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-message.xml.h:99
-#: ../ui/evolution-memos.xml.h:15
-#: ../ui/evolution-tasks.xml.h:23
+#: ../calendar/gui/e-calendar-view.c:1813 ../calendar/gui/e-memo-table.c:940
+#: ../mail/em-folder-tree.c:991 ../mail/em-folder-view.c:1325
+#: ../mail/message-list.c:2109 ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Copïo"
 
@@ -1880,15 +1971,13 @@ msgstr "_Gludo"
 
 #. All, unmatched, separator
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1534
-#: ../calendar/gui/cal-search-bar.c:624
-#: ../calendar/gui/cal-search-bar.c:667
+#: ../calendar/gui/cal-search-bar.c:624 ../calendar/gui/cal-search-bar.c:667
 #: ../calendar/gui/cal-search-bar.c:686
 msgid "Any Category"
 msgstr "Unrhyw Gategori"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1537
-#: ../calendar/gui/cal-search-bar.c:628
-#: ../calendar/gui/cal-search-bar.c:671
+#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
 #: ../calendar/gui/cal-search-bar.c:690
 msgid "Unmatched"
 msgstr "Heb gydweddu"
@@ -2064,38 +2153,30 @@ msgstr "Safle Gwe"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:154
-#: ../widgets/misc/e-canvas-vbox.c:83
-#: ../widgets/misc/e-canvas-vbox.c:84
-#: ../widgets/misc/e-reflow.c:1421
-#: ../widgets/misc/e-reflow.c:1422
+#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
+#: ../widgets/misc/e-reflow.c:1421 ../widgets/misc/e-reflow.c:1422
 #: ../widgets/table/e-table-click-to-add.c:521
 #: ../widgets/table/e-table-col.c:98
 #: ../widgets/table/e-table-group-container.c:994
 #: ../widgets/table/e-table-group-container.c:995
 #: ../widgets/table/e-table-group-leaf.c:642
 #: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:3069
-#: ../widgets/table/e-table-item.c:3070
-#: ../widgets/text/e-text.c:3716
-#: ../widgets/text/e-text.c:3717
+#: ../widgets/table/e-table-item.c:3069 ../widgets/table/e-table-item.c:3070
+#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
 msgid "Width"
 msgstr "Lled"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:161
-#: ../widgets/misc/e-canvas-vbox.c:95
-#: ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/misc/e-reflow.c:1428
-#: ../widgets/misc/e-reflow.c:1429
+#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
+#: ../widgets/misc/e-reflow.c:1428 ../widgets/misc/e-reflow.c:1429
 #: ../widgets/table/e-table-click-to-add.c:528
 #: ../widgets/table/e-table-group-container.c:987
 #: ../widgets/table/e-table-group-container.c:988
 #: ../widgets/table/e-table-group-leaf.c:635
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3075
-#: ../widgets/table/e-table-item.c:3076
-#: ../widgets/text/e-text.c:3723
-#: ../widgets/text/e-text.c:3724
+#: ../widgets/table/e-table-item.c:3075 ../widgets/table/e-table-item.c:3076
+#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
 msgid "Height"
 msgstr "Uchder"
 
@@ -2208,8 +2289,7 @@ msgstr "Dewisedig"
 msgid "Has Cursor"
 msgstr "Ã? Chyrchwr"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:169
-#: ../mail/em-popup.c:545
+#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:545
 msgid "_Open Link in Browser"
 msgstr "_Agor y Cyswllt Mewn Porwr"
 
@@ -2218,8 +2298,7 @@ msgstr "_Agor y Cyswllt Mewn Porwr"
 msgid "_Copy Link Location"
 msgstr "_Copïo Lleoliad y Cyswllt"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:171
-#: ../mail/em-popup.c:546
+#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:546
 msgid "_Send New Message To..."
 msgstr "_Danfon Neges Newydd i..."
 
@@ -2382,8 +2461,7 @@ msgstr "Protocol ni chynhelir"
 #: ../calendar/gui/e-cal-model-tasks.c:363
 #: ../calendar/gui/e-cal-model-tasks.c:679
 #: ../calendar/gui/e-calendar-table.c:238
-#: ../calendar/gui/e-calendar-table.c:661
-#: ../calendar/gui/print.c:2548
+#: ../calendar/gui/e-calendar-table.c:661 ../calendar/gui/print.c:2548
 msgid "Canceled"
 msgstr "Diddymwyd"
 
@@ -2438,23 +2516,43 @@ msgstr "Gweithred heb ei chynnal"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:110
 #, fuzzy
-msgid "This address book cannot be opened. This either means this book is not marked for offline usage or not yet downloaded for offline usage. Please load the address book once in online mode to download its contents."
-msgstr "Methwyd agor y llyfr cyfeiriadau. Gall fod y llyfr heb ei farcio ar gyfer defnydd all-lein, neu heb ei lwytho i lawr ar gyfer defnydd all-lein. Llwythwch y llyfr cyfeiriadau unwaith yn y modd ar-lein er mwyn llwytho ei gynnwys i lawr."
+msgid ""
+"This address book cannot be opened. This either means this book is not "
+"marked for offline usage or not yet downloaded for offline usage. Please "
+"load the address book once in online mode to download its contents."
+msgstr ""
+"Methwyd agor y llyfr cyfeiriadau. Gall fod y llyfr heb ei farcio ar gyfer "
+"defnydd all-lein, neu heb ei lwytho i lawr ar gyfer defnydd all-lein. "
+"Llwythwch y llyfr cyfeiriadau unwaith yn y modd ar-lein er mwyn llwytho ei "
+"gynnwys i lawr."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:119
 #, fuzzy, c-format
-msgid "This address book cannot be opened.  Please check that the path %s exists and that permissions are set to access it."
-msgstr "Wedi methu agor y llyfr cyfeiriadau hwn. Gwiriwch fodolaeth y llwybr %s, a bod gennych ganiatâd i'w gyrchu."
+msgid ""
+"This address book cannot be opened.  Please check that the path %s exists "
+"and that permissions are set to access it."
+msgstr ""
+"Wedi methu agor y llyfr cyfeiriadau hwn. Gwiriwch fodolaeth y llwybr %s, a "
+"bod gennych ganiatâd i'w gyrchu."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:131
 #, fuzzy
-msgid "This version of Evolution does not have LDAP support compiled in to it.  To use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
-msgstr "Dyw cynhaliaeth LDAP ddim wedi ei grynhoi yn y fersiwn hwn o Evolution. Os ydych chi am ddefnyddio LDAP o fewn Evolution, rhaid i chi osod pecyn Evolution â LDAP wedi ei alluogi."
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  To "
+"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
+msgstr ""
+"Dyw cynhaliaeth LDAP ddim wedi ei grynhoi yn y fersiwn hwn o Evolution. Os "
+"ydych chi am ddefnyddio LDAP o fewn Evolution, rhaid i chi osod pecyn "
+"Evolution â LDAP wedi ei alluogi."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:140
 #, fuzzy
-msgid "This address book cannot be opened.  This either means that an incorrect URI was entered, or the server is unreachable."
-msgstr "Wedi methu agor y llyfr cyfeiriadau hwn. Un ai rydych wedi rhoi URI anghywir, neu mae'r gweinydd yn anghyraeddadwy."
+msgid ""
+"This address book cannot be opened.  This either means that an incorrect URI "
+"was entered, or the server is unreachable."
+msgstr ""
+"Wedi methu agor y llyfr cyfeiriadau hwn. Un ai rydych wedi rhoi URI "
+"anghywir, neu mae'r gweinydd yn anghyraeddadwy."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:148
 #, fuzzy
@@ -2470,7 +2568,8 @@ msgid ""
 "the directory server preferences for this address book."
 msgstr ""
 "Y mae mwy o gardiau wedi cydweddu'r ymholiad na mae'r gweinydd wedi ei\n"
-"gyflunio i'w hanfon neu na mae Evolution wedi'i gyflunio i'w dangos. Newidiwch eich\n"
+"gyflunio i'w hanfon neu na mae Evolution wedi'i gyflunio i'w dangos. "
+"Newidiwch eich\n"
 "ymholiad i fod yn fwy penodol neu codwch y cyfwng canlyniadau yn yr\n"
 "hoffterau gweinydd cyfeiriadur ar gyfer y llyfr cyfeiriadau hwn."
 
@@ -2528,7 +2627,7 @@ msgid "Error removing contact"
 msgstr "Gwall wrth dynnu cyswllt"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:316
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
 "Do you really want to display this contact?"
@@ -2539,7 +2638,7 @@ msgstr[0] ""
 "Bydd agor %d cyswllt yn agor %d ffenest newydd hefyd.\n"
 "Ydych chi wir am ddangos yr holl gysylltiadau?"
 msgstr[1] ""
-"Bydd agor %d gyswllt yn agor %d ffenest newydd hefyd.\n"
+"Bydd agor %d cyswllt yn agor %d ffenest newydd hefyd.\n"
 "Ydych chi wir am ddangos yr holl gysylltiadau?"
 msgstr[2] ""
 "Bydd agor %d cyswllt yn agor %d ffenest newydd hefyd.\n"
@@ -2639,8 +2738,7 @@ msgstr "Golwg Cerdyn"
 #: ../addressbook/importers/evolution-ldif-importer.c:512
 #: ../addressbook/importers/evolution-vcard-importer.c:252
 #: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:687
-#: ../shell/shell.error.xml.h:7
+#: ../calendar/importers/icalendar-importer.c:687 ../shell/shell.error.xml.h:7
 msgid "Importing..."
 msgstr "Mewnforio..."
 
@@ -2707,7 +2805,6 @@ msgid "OUTPUTFILE"
 msgstr "FFEIL_ALLBWN"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:49
-#, fuzzy
 msgid "List local address book folders"
 msgstr "Rhestru plygellau llyfr cyfeiriadau lleol"
 
@@ -2725,16 +2822,23 @@ msgstr "Allforio mewn modd anghydamserol"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:59
 #, fuzzy
-msgid "The number of cards in one output file in asynchronous mode, default size 100."
-msgstr "Y nifer o gardiau yn y ffeil allbwn yn y modd anghydamserol, 100 yw'r rhagosodiad."
+msgid ""
+"The number of cards in one output file in asynchronous mode, default size "
+"100."
+msgstr ""
+"Y nifer o gardiau yn y ffeil allbwn yn y modd anghydamserol, 100 yw'r "
+"rhagosodiad."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "NUMBER"
 msgstr "RHIF"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:99
-msgid "Command line arguments error, please use --help option to see the usage."
-msgstr "Gwall argiau ar y llinell orchymyn: defnyddiwch yr opsiwn --help i weld y defnydd."
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
+msgstr ""
+"Gwall argiau ar y llinell orchymyn: defnyddiwch yr opsiwn --help i weld y "
+"defnydd."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:113
 msgid "Only support csv or vcard format."
@@ -2754,57 +2858,88 @@ msgstr "Gwall heb ei drin"
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
-msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar from the side bar in the Calendar view."
-msgstr "Mae '{0}' yn calendr darllen-yn-unig a methu cael ei newid. Dewiswch calendr gwahanol o'r bar ochor yn y golwg Calendr os gwelwch yn dda."
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
+msgstr ""
+"Mae '{0}' yn calendr darllen-yn-unig a methu cael ei newid. Dewiswch calendr "
+"gwahanol o'r bar ochor yn y golwg Calendr os gwelwch yn dda."
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
 #, fuzzy
-msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar that can accept appointments."
-msgstr "Ffynhonnell calendr darllen-yn-unig sydd wedi'i dewis gennych. Ewch i'r Olwg Galendr a dewiswch galendr fedr dderbyn apwyntiadau."
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
+msgstr ""
+"Ffynhonnell calendr darllen-yn-unig sydd wedi'i dewis gennych. Ewch i'r Olwg "
+"Galendr a dewiswch galendr fedr dderbyn apwyntiadau."
 
 #: ../calendar/calendar.error.xml.h:5
-msgid "Adding a meaningful summary to your appointment will give your recipients an idea of what your appointment is about."
-msgstr "Mae ychwanegu crynodeb pwrpasol at eich apwyntiad yn rhoi gwell syniad i'r derbynwyr o'r hyn i'w ddisgwyl."
+msgid ""
+"Adding a meaningful summary to your appointment will give your recipients an "
+"idea of what your appointment is about."
+msgstr ""
+"Mae ychwanegu crynodeb pwrpasol at eich apwyntiad yn rhoi gwell syniad i'r "
+"derbynwyr o'r hyn i'w ddisgwyl."
 
 #: ../calendar/calendar.error.xml.h:6
-msgid "Adding a meaningful summary to your task will give your recipients an idea of what your task is about."
-msgstr "Mae ychwanegu crynodeb pwrpasol at eich tasg yn rhoi gwell syniad i'r derbynwyr o'r hyn mae'r dasg yn ei olygu."
+msgid ""
+"Adding a meaningful summary to your task will give your recipients an idea "
+"of what your task is about."
+msgstr ""
+"Mae ychwanegu crynodeb pwrpasol at eich tasg yn rhoi gwell syniad i'r "
+"derbynwyr o'r hyn mae'r dasg yn ei olygu."
 
 #: ../calendar/calendar.error.xml.h:7
 #, fuzzy
 msgid "All information in these memos will be deleted and can not be restored."
-msgstr "Bydd yr holl wybodaeth am y tasgau yn cael ei ddileu, ac ni ellir ei adfer."
+msgstr ""
+"Bydd yr holl wybodaeth am y tasgau yn cael ei ddileu, ac ni ellir ei adfer."
 
 #: ../calendar/calendar.error.xml.h:8
 #, fuzzy
 msgid "All information in this memo will be deleted and can not be restored."
-msgstr "Bydd yr holl wybodaeth o fewn y dyddlyfr yn cael ei ddileu, ac ni ellir ei adfer."
+msgstr ""
+"Bydd yr holl wybodaeth o fewn y dyddlyfr yn cael ei ddileu, ac ni ellir ei "
+"adfer."
 
 #: ../calendar/calendar.error.xml.h:9
-msgid "All information on these appointments will be deleted and can not be restored."
-msgstr "Bydd yr holl wybodaeth am yr apwyntiadau yn cael ei ddileu, ac ni ellir ei adfer."
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+"Bydd yr holl wybodaeth am yr apwyntiadau yn cael ei ddileu, ac ni ellir ei "
+"adfer."
 
 #: ../calendar/calendar.error.xml.h:10
 msgid "All information on these tasks will be deleted and can not be restored."
-msgstr "Bydd yr holl wybodaeth am y tasgau yn cael ei ddileu, ac ni ellir ei adfer."
+msgstr ""
+"Bydd yr holl wybodaeth am y tasgau yn cael ei ddileu, ac ni ellir ei adfer."
 
 #: ../calendar/calendar.error.xml.h:11
-msgid "All information on this appointment will be deleted and can not be restored."
-msgstr "Bydd yr holl wybodaeth am yr apwyntiad yn cael ei ddileu, ac ni ellir ei adfer."
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+"Bydd yr holl wybodaeth am yr apwyntiad yn cael ei ddileu, ac ni ellir ei "
+"adfer."
 
 #: ../calendar/calendar.error.xml.h:12
-msgid "All information on this meeting will be deleted and can not be restored."
-msgstr "Bydd yr holl wybodaeth am y cyfarfod yn cael ei ddileu, ac ni ellir ei adfer."
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+"Bydd yr holl wybodaeth am y cyfarfod yn cael ei ddileu, ac ni ellir ei adfer."
 
 #: ../calendar/calendar.error.xml.h:13
 #, fuzzy
 msgid "All information on this memo will be deleted and can not be restored."
-msgstr "Bydd yr holl wybodaeth am y cyfarfod yn cael ei ddileu, ac ni ellir ei adfer."
+msgstr ""
+"Bydd yr holl wybodaeth am y cyfarfod yn cael ei ddileu, ac ni ellir ei adfer."
 
 #: ../calendar/calendar.error.xml.h:14
 msgid "All information on this task will be deleted and can not be restored."
-msgstr "Bydd yr holl wybodaeth am y dasg yn cael ei ddileu, ac ni ellir ei adfer."
+msgstr ""
+"Bydd yr holl wybodaeth am y dasg yn cael ei ddileu, ac ni ellir ei adfer."
 
 #: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
@@ -2815,9 +2950,8 @@ msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "Ydych chi'n siŵr eich bod am ddileu'r apwyntiad o'r enw '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:17
-#, fuzzy
 msgid "Are you sure you want to delete the memo '{0}'?"
-msgstr "Ydych chi'n siŵr eich bod am ddileu'r dasg '{0}'?"
+msgstr "Ydych chi'n siŵr eich bod am ddileu'r memo '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete these {0} appointments?"
@@ -2826,7 +2960,7 @@ msgstr "Ydych chi'n siŵr eich bod am ddileu'r {0} apwyntiad hyn?"
 #: ../calendar/calendar.error.xml.h:19
 #, fuzzy
 msgid "Are you sure you want to delete these {0} memos?"
-msgstr "Ydych chi'n siŵr eich bod am ddileu'r {0} o dasgau hyn?"
+msgstr "Ydych chi'n siŵr eich bod am ddileu'r {0} o memo hyn?"
 
 #: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} tasks?"
@@ -2844,9 +2978,9 @@ msgstr "Ydych chi'n siŵr eich bod am ddileu'r cyfarfod?"
 
 #: ../calendar/calendar.error.xml.h:23
 #: ../calendar/gui/dialogs/delete-comp.c:188
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to delete this memo?"
-msgstr "Ydych chi'n siŵr eich bod am ddileu'r cyfarfod?"
+msgstr "Ydych chi'n siŵr eich bod am ddileu'r memo?"
 
 #: ../calendar/calendar.error.xml.h:24
 #: ../calendar/gui/dialogs/delete-comp.c:185
@@ -2908,12 +3042,19 @@ msgid "Editor could not be loaded."
 msgstr "Methwyd llwytho'r golygydd."
 
 #: ../calendar/calendar.error.xml.h:38
-msgid "Email invitations will be sent to all participants and allow them to accept this task."
-msgstr "Bydd gwahoddiadau yn cael eu hanfon at bob cyfrannwr dros e-bost, fydd yn gadael iddyn nhw dderbyn y dasg."
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+"Bydd gwahoddiadau yn cael eu hanfon at bob cyfrannwr dros e-bost, fydd yn "
+"gadael iddyn nhw dderbyn y dasg."
 
 #: ../calendar/calendar.error.xml.h:39
-msgid "Email invitations will be sent to all participants and allow them to reply."
-msgstr "Bydd gwahoddiadau yn cael eu hanfon at bob cyfrannwr dros e-bost, fydd yn gadael iddyn nhw ymateb."
+msgid ""
+"Email invitations will be sent to all participants and allow them to reply."
+msgstr ""
+"Bydd gwahoddiadau yn cael eu hanfon at bob cyfrannwr dros e-bost, fydd yn "
+"gadael iddyn nhw ymateb."
 
 #: ../calendar/calendar.error.xml.h:40
 msgid "Error loading calendar"
@@ -2929,22 +3070,33 @@ msgstr "Gwall wrth lwytho rhestr dasgau"
 
 #. For Translators: {0} is specify the backend server
 #: ../calendar/calendar.error.xml.h:44
-#, fuzzy
 msgid "Error on '{0}'"
-msgstr "Gwall tra {0}."
+msgstr "Gwall ar '{0}'"
 
 #: ../calendar/calendar.error.xml.h:45
-msgid "If you do not send a cancelation notice, the other participants may not know the meeting is canceled."
-msgstr "Os na anfonwch chi neges ganslo, mae'n bosib na fydd yr holl gyfranwyr yn gwybod fod y cyfarfod wedi ei ganslo."
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+"Os na anfonwch chi neges ganslo, mae'n bosib na fydd yr holl gyfranwyr yn "
+"gwybod fod y cyfarfod wedi ei ganslo."
 
 #: ../calendar/calendar.error.xml.h:46
 #, fuzzy
-msgid "If you do not send a cancelation notice, the other participants may not know the memo has been deleted."
-msgstr "Os na anfonwch chi neges ganslo, mae'n bosib na fydd yr holl gyfranwyr yn gwybod fod y dasg wedi ei chanslo."
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the memo has been deleted."
+msgstr ""
+"Os na anfonwch chi neges ganslo, mae'n bosib na fydd yr holl gyfranwyr yn "
+"gwybod fod y dasg wedi ei chanslo."
 
 #: ../calendar/calendar.error.xml.h:47
-msgid "If you do not send a cancelation notice, the other participants may not know the task has been deleted."
-msgstr "Os na anfonwch chi neges ganslo, mae'n bosib na fydd yr holl gyfranwyr yn gwybod fod y dasg wedi ei chanslo."
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+"Os na anfonwch chi neges ganslo, mae'n bosib na fydd yr holl gyfranwyr yn "
+"gwybod fod y dasg wedi ei chanslo."
 
 #: ../calendar/calendar.error.xml.h:48
 msgid "No response from the server."
@@ -2963,24 +3115,42 @@ msgid "Save Task"
 msgstr "Cadw Tasg"
 
 #: ../calendar/calendar.error.xml.h:52
-msgid "Sending updated information allows other participants to keep their calendars up to date."
-msgstr "Mae anfon gwybodaeth wedi'i ddiweddaru yn gadael i gyfranwyr eraill gadw eu calendrau'n gyfredol."
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+"Mae anfon gwybodaeth wedi'i ddiweddaru yn gadael i gyfranwyr eraill gadw eu "
+"calendrau'n gyfredol."
 
 #: ../calendar/calendar.error.xml.h:53
-msgid "Sending updated information allows other participants to keep their task lists up to date."
-msgstr "Mae anfon gwybodaeth wedi'i ddiweddaru yn gadael i eraill gadw eu rhestr tasgau'n gyfredol."
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+"Mae anfon gwybodaeth wedi'i ddiweddaru yn gadael i eraill gadw eu rhestr "
+"tasgau'n gyfredol."
 
 #: ../calendar/calendar.error.xml.h:55
-msgid "Some attachments are being downloaded. Saving the appointment would result in the loss of these attachments."
-msgstr "Mae rhai atodiadau'n cael eu llwytho i lawr. Bydd cadw'r apwyntiad nawr yn golygu colli'r atodiadau hynny."
+msgid ""
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
+msgstr ""
+"Mae rhai atodiadau'n cael eu llwytho i lawr. Bydd cadw'r apwyntiad nawr yn "
+"golygu colli'r atodiadau hynny."
 
 #: ../calendar/calendar.error.xml.h:56
-msgid "Some attachments are being downloaded. Saving the task would result in the loss of these attachments."
-msgstr "Mae rhai atodiadau'n cael eu llwytho i lawr. Bydd cadw'r dasg nawr yn golygu colli'r atodiadau hynny."
+msgid ""
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
+msgstr ""
+"Mae rhai atodiadau'n cael eu llwytho i lawr. Bydd cadw'r dasg nawr yn golygu "
+"colli'r atodiadau hynny."
 
 #: ../calendar/calendar.error.xml.h:57
 msgid "Some features may not work properly with your current server."
-msgstr "Efallai na fydd rhai nodweddion yn gweithio'n gywir gyda'ch gweinydd presennol."
+msgstr ""
+"Efallai na fydd rhai nodweddion yn gweithio'n gywir gyda'ch gweinydd "
+"presennol."
 
 #: ../calendar/calendar.error.xml.h:58
 msgid "The Evolution calendar has quit unexpectedly."
@@ -3025,9 +3195,8 @@ msgid "This task list will be removed permanently."
 msgstr "Bydd y rhestr dasgau'n cael ei dileu'n barhaol."
 
 #: ../calendar/calendar.error.xml.h:68
-#, fuzzy
 msgid "Unable to load the calendar"
-msgstr "Methu llwytho'r calendr '%s'."
+msgstr "Methu llwytho'r calendr"
 
 #: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to save your changes to this appointment?"
@@ -3060,15 +3229,25 @@ msgstr "Ydych chi am anfon y dasg hon at bob cyfrannwr?"
 
 #: ../calendar/calendar.error.xml.h:76
 msgid "Would you like to send updated meeting information to participants?"
-msgstr "Ydych chi am anfon y wybodaeth ddiweddaraf ynglŷn â'r cyfarfod at y cyfranwyr?"
+msgstr ""
+"Ydych chi am anfon y wybodaeth ddiweddaraf ynglŷn â'r cyfarfod at y "
+"cyfranwyr?"
 
 #: ../calendar/calendar.error.xml.h:77
 msgid "Would you like to send updated task information to participants?"
-msgstr "Ydych chi am anfon gwybodaeth wedi'i ddiweddaru ynglŷn â'r dasg at y cyfranwyr?"
+msgstr ""
+"Ydych chi am anfon gwybodaeth wedi'i ddiweddaru ynglŷn â'r dasg at y "
+"cyfranwyr?"
 
 #: ../calendar/calendar.error.xml.h:78
-msgid "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results, the server should be upgraded to a supported version."
-msgstr "Rydych yn cysylltu â gweinydd GroupWise sydd heb ei gynnal. Hwyrach y cewch chi broblemau gyda Evolution. Dylid uwchraddio'r gweinydd at fersiwn sydd wedi ei gynnal, i gael y canlyniadau gorau."
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results, the server should be upgraded to "
+"a supported version."
+msgstr ""
+"Rydych yn cysylltu â gweinydd GroupWise sydd heb ei gynnal. Hwyrach y cewch "
+"chi broblemau gyda Evolution. Dylid uwchraddio'r gweinydd at fersiwn sydd "
+"wedi ei gynnal, i gael y canlyniadau gorau."
 
 #: ../calendar/calendar.error.xml.h:79
 msgid "You have changed this appointment, but not yet saved it."
@@ -3099,8 +3278,7 @@ msgstr "Ni fydd eich tasgau ar gael tan mae Evolution wedi ei ailgychwyn."
 msgid "_Discard Changes"
 msgstr "_Hepgor Newidiadau"
 
-#: ../calendar/calendar.error.xml.h:86
-#: ../composer/e-composer-actions.c:343
+#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:343
 msgid "_Save"
 msgstr "_Cadw"
 
@@ -3109,8 +3287,7 @@ msgid "_Save Changes"
 msgstr "_Cadw Newidiadau"
 
 #: ../calendar/calendar.error.xml.h:88
-#: ../composer/mail-composer.error.xml.h:34
-#: ../mail/mail.error.xml.h:142
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "_Anfon"
@@ -3213,25 +3390,18 @@ msgid "Memo_s"
 msgstr "_Memos"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:293
-#: ../calendar/gui/e-memos.c:1123
-#: ../calendar/gui/gnome-cal.c:1846
-#: ../calendar/gui/memos-component.c:564
-#: ../calendar/gui/memos-component.c:882
-#: ../calendar/gui/memos-control.c:386
+#: ../calendar/gui/e-memo-table.c:293 ../calendar/gui/e-memos.c:1123
+#: ../calendar/gui/gnome-cal.c:1846 ../calendar/gui/memos-component.c:564
+#: ../calendar/gui/memos-component.c:882 ../calendar/gui/memos-control.c:386
 #: ../calendar/gui/memos-control.c:402
 msgid "Memos"
 msgstr "Memos"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:725
-#: ../calendar/gui/e-tasks.c:1426
-#: ../calendar/gui/gnome-cal.c:1714
-#: ../calendar/gui/print.c:1973
-#: ../calendar/gui/tasks-component.c:557
-#: ../calendar/gui/tasks-component.c:879
-#: ../calendar/gui/tasks-control.c:524
-#: ../calendar/gui/tasks-control.c:540
+#: ../calendar/gui/e-calendar-table.c:725 ../calendar/gui/e-tasks.c:1426
+#: ../calendar/gui/gnome-cal.c:1714 ../calendar/gui/print.c:1973
+#: ../calendar/gui/tasks-component.c:557 ../calendar/gui/tasks-component.c:879
+#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
 #: ../calendar/importers/icalendar-importer.c:76
 #: ../calendar/importers/icalendar-importer.c:751
 #: ../plugins/exchange-operations/exchange-delegates-user.c:75
@@ -3248,8 +3418,7 @@ msgstr "_Calendrau"
 
 #. Tasks
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../plugins/pst-import/pst-importer.c:328
-#: ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:328 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Tasgau"
 
@@ -3268,16 +3437,17 @@ msgstr[2] "munud"
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:23
 #: ../plugins/caldav/caldav-source.c:449
-#: ../plugins/calendar-file/calendar-file.c:287
+#: ../plugins/calendar-file/calendar-file.c:294
 #: ../plugins/calendar-http/calendar-http.c:324
 #: ../plugins/calendar-weather/calendar-weather.c:524
-#: ../plugins/google-account-setup/google-source.c:721
+#: ../plugins/google-account-setup/google-source.c:741
 #: ../plugins/google-account-setup/google-contacts-source.c:331
+#, fuzzy
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "awr"
-msgstr[1] "oriau"
-msgstr[2] "oriau"
+msgstr[1] "awr"
+msgstr[2] "awr"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:293
 msgid "Start time"
@@ -3294,8 +3464,8 @@ msgstr "Diystyru _Popeth"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1592
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1588
 #: ../calendar/gui/e-itip-control.c:1164
 #: ../plugins/itip-formatter/itip-view.c:1023
 msgid "Location:"
@@ -3312,16 +3482,12 @@ msgstr "_Diystyru"
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/comp-editor.c:1038
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:8
-#: ../filter/filter.glade.h:11
-#: ../mail/mail-config.glade.h:168
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:22
-#: ../ui/evolution-addressbook.xml.h:51
-#: ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-mail-messagedisplay.xml.h:5
-#: ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:43
+#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
 #: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "_Golygu"
@@ -3334,32 +3500,32 @@ msgstr "_Hepian"
 msgid "location of appointment"
 msgstr "lleoliad yr apwyntiad"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1451
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1575
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1441
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1565
 msgid "No summary available."
 msgstr "Dim crynodeb ar gael."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1460
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1450
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1452
 msgid "No description available."
 msgstr "Dim disgrifiad ar gael."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1460
 msgid "No location information available."
 msgstr "Dim gwybodaeth lleoliad ar gael."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1515
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1505
 #, c-format
 msgid "You have %d alarms"
 msgstr "Mae gennych %d larwm."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1675
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1665
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1693
 #: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1679
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1669
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3371,22 +3537,24 @@ msgstr ""
 "hwn ei gyflunio i anfon e-bost.  Bydd Evolution yn dangos\n"
 "blwch deialog atgoffa arferol yn lle hynny."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1709
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
+"An Evolution Calendar reminder is about to trigger. This reminder is "
+"configured to run the following program:\n"
 "\n"
 "        %s\n"
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
-"Mae nodyn atgoffa Calendr Evolution bron â chychwyn. Mae'r nodyn atgoffa wedi ei gyflunio i redeg y rhaglen ganlynol:\n"
+"Mae nodyn atgoffa Calendr Evolution bron â chychwyn. Mae'r nodyn atgoffa "
+"wedi ei gyflunio i redeg y rhaglen ganlynol:\n"
 "\n"
 "        %s\n"
 "\n"
 "Ydych chi'n siŵr eich bod am redeg y rhaglen?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1713
 msgid "Do not ask me about this program again."
 msgstr "Peidiwch â gofyn ynghylch y rhaglen hon eto."
 
@@ -3396,7 +3564,9 @@ msgstr "Methwyd cychwyn Bonobo"
 
 #: ../calendar/gui/alarm-notify/notify-main.c:154
 #, fuzzy
-msgid "Could not create the alarm notify service factory, maybe it's already running..."
+msgid ""
+"Could not create the alarm notify service factory, maybe it's already "
+"running..."
 msgstr "Methu creu ffatri gwasanaeth hysbysu am larymau"
 
 #: ../calendar/gui/alarm-notify/util.c:44
@@ -3404,8 +3574,7 @@ msgid "invalid time"
 msgstr "amser annilys"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:69
-#: ../calendar/gui/e-alarm-list.c:406
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406
 #: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
@@ -3415,8 +3584,7 @@ msgstr[1] "%d awr"
 msgstr[2] "%d awr"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:75
-#: ../calendar/gui/e-alarm-list.c:412
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412
 #: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
@@ -3428,8 +3596,7 @@ msgstr[2] "%d munud"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:79
-#: ../calendar/gui/e-alarm-list.c:418
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418
 #: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
@@ -3453,7 +3620,8 @@ msgstr "Gofyn am gadarnhad cyn dileu eitemau"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
-msgstr "Lliw cefndir tasgau sydd i fod i ddod i ben heddiw, ar ffurf \"#rrggbb\"."
+msgstr ""
+"Lliw cefndir tasgau sydd i fod i ddod i ben heddiw, ar ffurf \"#rrggbb\"."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
@@ -3465,11 +3633,14 @@ msgstr "Calendrau i redeg larymau ar eu cyfer"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
 msgid "Check this to use system timezone in Evolution."
-msgstr ""
+msgstr "Gwiriwch hyn er mwyn defnyddio cylchfa amser y system yn Evolution."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
-msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
-msgstr "Y lliw i'w ddefnyddio i dynnu llinell Marcus Bains yn y bar Amser (yn wag fel rhagosodiad)"
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgstr ""
+"Y lliw i'w ddefnyddio i dynnu llinell Marcus Bains yn y bar Amser (yn wag "
+"fel rhagosodiad)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Color to draw the Marcus Bains line in the Day View."
@@ -3558,7 +3729,8 @@ msgstr "Awr cychwyn dydd gwaith, ar ffurf cloc bedair awr ar hugain, 0 i 23."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "Intervals shown in Day and Work Week views, in minutes."
-msgstr "Yr ysbeidiau a ddangosir yng ngolygon Dydd ac Wythnos Waith, mewn munudau."
+msgstr ""
+"Yr ysbeidiau a ddangosir yng ngolygon Dydd ac Wythnos Waith, mewn munudau."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Last alarm time"
@@ -3590,7 +3762,9 @@ msgid "Marcus Bains Line Color - Time bar"
 msgstr "Lliw Llinell Marcus Bains - Bar amser"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
-msgid "Maximum number of recently used timezones to remember in a 'day_second_zones' list."
+msgid ""
+"Maximum number of recently used timezones to remember in a "
+"'day_second_zones' list."
 msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
@@ -3626,43 +3800,64 @@ msgid "Overdue tasks color"
 msgstr "Lliw tasgau hwyr"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
-msgid "Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels."
-msgstr "Lleoliad y cwarel llorweddol, rhwng y calendr llywio dyddiadau a'r rhestr dasgau pan ddim yn yr olwg mis, mewn picseli."
+msgid ""
+"Position of the horizontal pane, between the date navigator calendar and the "
+"task list when not in the month view, in pixels."
+msgstr ""
+"Lleoliad y cwarel llorweddol, rhwng y calendr llywio dyddiadau a'r rhestr "
+"dasgau pan ddim yn yr olwg mis, mewn picseli."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
-msgid "Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels."
-msgstr "Lleoliad y cwarel llorweddol, rhwng yr olwg a'r calendr llywio dyddiadau a'r rhestr dasgau pan yn yr olwg mis, mewn picseli."
+msgid ""
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr ""
+"Lleoliad y cwarel llorweddol, rhwng yr olwg a'r calendr llywio dyddiadau a'r "
+"rhestr dasgau pan yn yr olwg mis, mewn picseli."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
-msgid "Position of the vertical pane, between the calendar lists and the date navigator calendar."
-msgstr "Lleoliad y cwarel fertigol, rhwng y rhestrau calendr a'r calendr llywio dyddiadau."
+msgid ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar."
+msgstr ""
+"Lleoliad y cwarel fertigol, rhwng y rhestrau calendr a'r calendr llywio "
+"dyddiadau."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
-msgid "Position of the vertical pane, between the task list and the task preview pane, in pixels."
-msgstr "Lleoliad y cwarel fertigol, rhwng yr olwg tasgau a'r cwarel rhagolwg tasgau, mewn picseli."
+msgid ""
+"Position of the vertical pane, between the task list and the task preview "
+"pane, in pixels."
+msgstr ""
+"Lleoliad y cwarel fertigol, rhwng yr olwg tasgau a'r cwarel rhagolwg tasgau, "
+"mewn picseli."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
-msgid "Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels."
-msgstr "Lleoliad y cwarel fertigol, rhwng yr olwg a'r calendr llywio dyddiadau a'r rhestr dasgau pan yn yr olwg mis, mewn picseli"
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr ""
+"Lleoliad y cwarel fertigol, rhwng yr olwg a'r calendr llywio dyddiadau a'r "
+"rhestr dasgau pan yn yr olwg mis, mewn picseli"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
-msgid "Position of the vertical pane, between the view and the date navigator calendar and task list when not in the month view, in pixels."
-msgstr "Lleoliad y cwarel fertigol, rhwng y calendr llywio dyddiadau a'r rhestr dasgau pan ddim yn yr olwg mis, mewn picseli."
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list when not in the month view, in pixels."
+msgstr ""
+"Lleoliad y cwarel fertigol, rhwng y calendr llywio dyddiadau a'r rhestr "
+"dasgau pan ddim yn yr olwg mis, mewn picseli."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#, fuzzy
 msgid "Primary calendar"
-msgstr "Argraffu'r calendr yma"
+msgstr "Prif calendr"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#, fuzzy
 msgid "Primary memo list"
-msgstr "Rhestr femo newydd"
+msgstr "Prif rhestr femo"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
-#, fuzzy
 msgid "Primary task list"
-msgstr "Rhestr dasgau newydd"
+msgstr "Prif rhestr tasgau"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid "Programs that are allowed to be run by alarms."
@@ -3716,7 +3911,8 @@ msgstr "Dangos y cwarel \"Rhagolwg\"."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Show timezone field in the event/meeting editor"
-msgstr "Dangos y maes cylchfa amser yn y golygydd digwyddiadau/tasgau/cyfarfodydd"
+msgstr ""
+"Dangos y maes cylchfa amser yn y golygydd digwyddiadau/tasgau/cyfarfodydd"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show type field in the event/task/meeting editor"
@@ -3732,7 +3928,9 @@ msgid "Show week numbers in date navigator"
 msgstr "Dangos rhifau wythnos yn y llywiwr dyddiadau"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
-msgid "Shows the second time zone in a Day View, if set. Value is similar to one used in a 'timezone' key."
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
 msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
@@ -3740,24 +3938,37 @@ msgid "Tasks due today color"
 msgstr "Lliw tasgau i fod i ddod i ben heddiw"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#, fuzzy
 msgid "Tasks vertical pane position"
-msgstr "Lleoliad fertigol cwarel Tasgau"
+msgstr "Lleoliad cwarel fertigol"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 #, no-c-format
-msgid "The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain."
-msgstr "Patrymlun LAU i'w ddefnyddio wrth gefn ar gyfer gwybodaeth rydd/prysur. Rhoddir rhan defnyddiwr y cyfeiriad e-bost yn lle %u, a'r enw parth yn lle %d."
+msgid ""
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
+msgstr ""
+"Patrymlun LAU i'w ddefnyddio wrth gefn ar gyfer gwybodaeth rydd/prysur. "
+"Rhoddir rhan defnyddiwr y cyfeiriad e-bost yn lle %u, a'r enw parth yn lle %"
+"d."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
-msgid "The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like \"America/New York\"."
-msgstr "Y gylchfa amser ragosodedig i'w defnyddio ar gyfer amserau a dyddiadau yn y calendr, ar ffurf lleoliad cylchfa amser Olsen heb ei gyfieithu, fel \"Europe/London\"."
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
+msgstr ""
+"Y gylchfa amser ragosodedig i'w defnyddio ar gyfer amserau a dyddiadau yn y "
+"calendr, ar ffurf lleoliad cylchfa amser Olsen heb ei gyfieithu, fel "
+"\"Europe/London\"."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "The second timezone for a Day View"
 msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
-msgid "This can have three possible values. 0 for errors. 1 for warnings. 2 for debug messages."
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
 msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
@@ -3773,8 +3984,12 @@ msgid "Timezone"
 msgstr "Cylchfa amser"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
-msgid "Transparency of the events in calendar views, a value between 0 (transparent) and 1 (opaque)."
-msgstr "Tryloywder y digwyddiadau yn yr olwg galendr, gwerth rhwng 0 (tryloyw) ac 1 (hollol anhryloyw)."
+msgid ""
+"Transparency of the events in calendar views, a value between 0 "
+"(transparent) and 1 (opaque)."
+msgstr ""
+"Tryloywder y digwyddiadau yn yr olwg galendr, gwerth rhwng 0 (tryloyw) ac 1 "
+"(hollol anhryloyw)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Twenty four hour time format"
@@ -3794,11 +4009,15 @@ msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr "Unedau nodyn atgoffa rhagosodedig, \"munudau\", \"oriau\" neu \"dyddiau\"."
+msgstr ""
+"Unedau nodyn atgoffa rhagosodedig, \"munudau\", \"oriau\" neu \"dyddiau\"."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
-msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr "Unedau er mwyn penderfynu p'un ai i guddio tasgau, \"munudau\", \"oriau\" neu \"dyddiau\"."
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr ""
+"Unedau er mwyn penderfynu p'un ai i guddio tasgau, \"munudau\", \"oriau\" "
+"neu \"dyddiau\"."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Use system timezone"
@@ -3829,16 +4048,24 @@ msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "P'un ai i ofyn am gadarnhad cyn gwaredu apwyntiadau a thasgau."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
-msgid "Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday."
-msgstr "P'un ai i gywasgu penwythnosau yn yr olwg mis, fydd yn rhoi Dydd Sadwrn a Dydd Sul yng ngofod un diwrnod."
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday."
+msgstr ""
+"P'un ai i gywasgu penwythnosau yn yr olwg mis, fydd yn rhoi Dydd Sadwrn a "
+"Dydd Sul yng ngofod un diwrnod."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Whether to display the end time of events in the week and month views."
-msgstr "P'un ai i ddangos amser gorffen digwyddiadau yng ngolygon wythnos a mis."
+msgstr ""
+"P'un ai i ddangos amser gorffen digwyddiadau yng ngolygon wythnos a mis."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
-msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
-msgstr "P'un ai i dynnu Llinell Marcus Bains (llinell yr amser presennol) ar y calendr."
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgstr ""
+"P'un ai i dynnu Llinell Marcus Bains (llinell yr amser presennol) ar y "
+"calendr."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Whether to hide completed tasks in the tasks view."
@@ -3858,7 +4085,8 @@ msgstr "P'un ai i ddangos maes RSVP yn y golygydd digwyddiad/tasg/cyfarfod."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Whether to show categories field in the event/meeting editor"
-msgstr "P'un ai i ddangos maes categorïau yn y golygydd digwyddiad/tasg/cyfarfod."
+msgstr ""
+"P'un ai i ddangos maes categorïau yn y golygydd digwyddiad/tasg/cyfarfod."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to show role field in the event/task/meeting editor"
@@ -3869,12 +4097,16 @@ msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "P'un ai i ddangos maes statws yn y golygydd digwyddiad/tasg/cyfarfod."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
-msgid "Whether to show times in twenty four hour format instead of using am/pm."
-msgstr "P'un ai i ddangos amserau ar ffurf bedair awr ar hugain yn lle defnyddio am/pm."
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
+msgstr ""
+"P'un ai i ddangos amserau ar ffurf bedair awr ar hugain yn lle defnyddio am/"
+"pm."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid "Whether to show timezone field in the event/meeting editor"
-msgstr "P'un ai i ddangos maes cylchfa amser yn y golygydd digwyddiad/tasg/cyfarfod."
+msgstr ""
+"P'un ai i ddangos maes cylchfa amser yn y golygydd digwyddiad/tasg/cyfarfod."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid "Whether to show type field in the event/task/meeting editor"
@@ -3909,6 +4141,11 @@ msgstr "Awr dechrau dydd gwaith"
 msgid "Workday start minute"
 msgstr "Munud cychwyn dydd gwaith"
 
+#: ../calendar/gui/cal-editor-utils.c:100
+#, fuzzy
+msgid "Invalid object"
+msgstr "Cyswllt annilys."
+
 #: ../calendar/gui/cal-search-bar.c:74
 msgid "Summary contains"
 msgstr "Crynodeb yn cynnwys"
@@ -3955,24 +4192,26 @@ msgstr "Negeseuon ag Atodiadau"
 #: ../calendar/gui/cal-search-bar.c:698
 #, fuzzy
 msgid "Active Appointments"
-msgstr "Apwyntiadau"
+msgstr "Apwyntiadau Gweithredol"
 
 #: ../calendar/gui/cal-search-bar.c:702
 msgid "Next 7 Days' Appointments"
 msgstr "Apwyntiadau'r 7 Diwrnod Nesaf"
 
-#: ../calendar/gui/calendar-commands.c:89
-#: ../ui/evolution-addressbook.xml.h:26
-#: ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:71
-#: ../ui/evolution-memos.xml.h:11
-#: ../ui/evolution-tasks.xml.h:14
+#: ../calendar/gui/calendar-commands.c:89 ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Argraffu"
 
 #: ../calendar/gui/calendar-commands.c:331
-msgid "This operation will permanently erase all events older than the selected amount of time. If you continue, you will not be able to recover these events."
-msgstr "Bydd y weithred yn dileu'n barhaol pob digwyddiad sy'n hynach na'r amser a ddewiswyd. Os wnewch chi barhau, fedrwch chi ddim adfer y digwyddiadau."
+msgid ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
+msgstr ""
+"Bydd y weithred yn dileu'n barhaol pob digwyddiad sy'n hynach na'r amser a "
+"ddewiswyd. Os wnewch chi barhau, fedrwch chi ddim adfer y digwyddiadau."
 
 #: ../calendar/gui/calendar-commands.c:337
 msgid "Purge events older than"
@@ -3980,10 +4219,10 @@ msgstr "Gwaredu digwyddiadau sy'n hÅ·n na"
 
 #: ../calendar/gui/calendar-commands.c:342
 #: ../plugins/caldav/caldav-source.c:450
-#: ../plugins/calendar-file/calendar-file.c:288
+#: ../plugins/calendar-file/calendar-file.c:295
 #: ../plugins/calendar-http/calendar-http.c:325
 #: ../plugins/calendar-weather/calendar-weather.c:525
-#: ../plugins/google-account-setup/google-source.c:722
+#: ../plugins/google-account-setup/google-source.c:742
 #: ../plugins/google-account-setup/google-contacts-source.c:332
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
@@ -3991,10 +4230,8 @@ msgstr "dyddiau"
 
 #. Create the Webcal source group
 #: ../calendar/gui/calendar-component.c:194
-#: ../calendar/gui/memos-component.c:152
-#: ../calendar/gui/migration.c:504
-#: ../calendar/gui/migration.c:603
-#: ../calendar/gui/migration.c:1117
+#: ../calendar/gui/memos-component.c:152 ../calendar/gui/migration.c:504
+#: ../calendar/gui/migration.c:603 ../calendar/gui/migration.c:1117
 #: ../calendar/gui/tasks-component.c:149
 msgid "On The Web"
 msgstr "Ar y We"
@@ -4006,8 +4243,7 @@ msgstr "Tywydd"
 
 #. ensure the source name is in current locale, not read from configuration
 #: ../calendar/gui/calendar-component.c:289
-#: ../calendar/gui/calendar-component.c:291
-#: ../calendar/gui/migration.c:398
+#: ../calendar/gui/calendar-component.c:291 ../calendar/gui/migration.c:398
 msgid "Birthdays & Anniversaries"
 msgstr "Penblwyddi"
 
@@ -4016,22 +4252,19 @@ msgid "_New Calendar"
 msgstr "_Calendr Newydd"
 
 #: ../calendar/gui/calendar-component.c:627
-#: ../calendar/gui/memos-component.c:478
-#: ../calendar/gui/tasks-component.c:471
+#: ../calendar/gui/memos-component.c:478 ../calendar/gui/tasks-component.c:471
 #: ../mail/em-folder-tree.c:2114
 msgid "_Copy..."
 msgstr "_Copïo..."
 
 #: ../calendar/gui/calendar-component.c:632
-#: ../calendar/gui/memos-component.c:483
-#: ../calendar/gui/tasks-component.c:476
+#: ../calendar/gui/memos-component.c:483 ../calendar/gui/tasks-component.c:476
 #, fuzzy
 msgid "_Make available for offline use"
 msgstr "_Marcio'r Calendr at ddefnydd all-lein"
 
 #: ../calendar/gui/calendar-component.c:633
-#: ../calendar/gui/memos-component.c:484
-#: ../calendar/gui/tasks-component.c:477
+#: ../calendar/gui/memos-component.c:484 ../calendar/gui/tasks-component.c:477
 #, fuzzy
 msgid "_Do not make available for offline use"
 msgstr "_Peidio â gwneud hwn ar gael all-lein"
@@ -4050,6 +4283,7 @@ msgid "There is no calendar available for creating events and meetings"
 msgstr "Does dim calendr ar gael er mwyn creu digwyddiadau a chyfarfodydd"
 
 #: ../calendar/gui/calendar-component.c:1218
+#, fuzzy
 msgid "Calendar Source Selector"
 msgstr "Dewisydd Ffynhonnell Galendr"
 
@@ -4121,16 +4355,13 @@ msgstr "Golwg Wythnos"
 msgid "Month View"
 msgstr "Golwg Mis"
 
-#: ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
 #: ../calendar/gui/tasktypes.xml.h:3
 msgid "Any Field"
 msgstr "Unrhyw Faes"
 
-#: ../calendar/gui/caltypes.xml.h:3
-#: ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:5
-#: ../mail/em-filter-i18n.h:5
+#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "Atodiadau"
 
@@ -4140,28 +4371,23 @@ msgstr "Atodiadau"
 msgid "Attendee"
 msgstr "Mynychwr"
 
-#: ../calendar/gui/caltypes.xml.h:5
-#: ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
 #: ../calendar/gui/tasktypes.xml.h:8
 msgid "Category"
 msgstr "Categori"
 
-#: ../calendar/gui/caltypes.xml.h:6
-#: ../calendar/gui/memotypes.xml.h:5
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
 msgid "Classification"
 msgstr "Dosbarthiad"
 
-#: ../calendar/gui/caltypes.xml.h:7
-#: ../calendar/gui/e-cal-list-view.c:249
-#: ../calendar/gui/e-cal-model.c:370
-#: ../calendar/gui/e-calendar-table.c:565
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
+#: ../calendar/gui/e-cal-model.c:370 ../calendar/gui/e-calendar-table.c:565
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:340
 msgid "Confidential"
 msgstr "Cyfrinachol"
 
-#: ../calendar/gui/caltypes.xml.h:8
-#: ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
 #: ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:59
 #: ../widgets/misc/e-attachment-tree-view.c:496
@@ -4169,54 +4395,42 @@ msgstr "Cyfrinachol"
 msgid "Description"
 msgstr "Disgrifiad"
 
-#: ../calendar/gui/caltypes.xml.h:9
-#: ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
 #: ../calendar/gui/tasktypes.xml.h:11
 msgid "Description Contains"
 msgstr "Disgrifiad yn Cynnwys"
 
-#: ../calendar/gui/caltypes.xml.h:10
-#: ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12
-#: ../mail/em-filter-i18n.h:22
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22
 msgid "Do Not Exist"
 msgstr "Ddim yn bodoli"
 
-#: ../calendar/gui/caltypes.xml.h:11
-#: ../calendar/gui/memotypes.xml.h:10
-#: ../calendar/gui/tasktypes.xml.h:13
-#: ../mail/em-filter-i18n.h:25
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
 msgid "Exist"
 msgstr "Bodoli"
 
 #: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../mail/message-list.etspec.h:9
+#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:722
 #: ../plugins/save-calendar/csv-format.c:371
 msgid "Location"
 msgstr "Lleoliad"
 
-#: ../calendar/gui/caltypes.xml.h:13
-#: ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:11
 #: ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "Trefnydd"
 
-#: ../calendar/gui/caltypes.xml.h:14
-#: ../calendar/gui/e-cal-list-view.c:248
-#: ../calendar/gui/e-cal-model.c:368
-#: ../calendar/gui/e-calendar-table.c:564
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
+#: ../calendar/gui/e-cal-model.c:368 ../calendar/gui/e-calendar-table.c:564
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Preifat"
 
-#: ../calendar/gui/caltypes.xml.h:15
-#: ../calendar/gui/e-cal-list-view.c:247
-#: ../calendar/gui/e-cal-model.c:359
-#: ../calendar/gui/e-cal-model.c:366
-#: ../calendar/gui/e-calendar-table.c:563
-#: ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
+#: ../calendar/gui/e-cal-model.c:359 ../calendar/gui/e-cal-model.c:366
+#: ../calendar/gui/e-calendar-table.c:563 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Cyhoeddus"
 
@@ -4228,44 +4442,34 @@ msgstr "Ail-ddigwyddiad"
 #: ../calendar/gui/caltypes.xml.h:17
 #: ../calendar/gui/e-cal-list-view.etspec.h:7
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-memo-table.etspec.h:6
-#: ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
 #: ../plugins/save-calendar/csv-format.c:357
 msgid "Summary"
 msgstr "Crynodeb"
 
-#: ../calendar/gui/caltypes.xml.h:18
-#: ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:15
 #: ../calendar/gui/tasktypes.xml.h:23
 msgid "Summary Contains"
 msgstr "Crynodeb yn Cynnwys"
 
-#: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:25
-#: ../mail/em-filter-i18n.h:10
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10
 msgid "contains"
 msgstr "cynnwys"
 
-#: ../calendar/gui/caltypes.xml.h:20
-#: ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:26
-#: ../mail/em-filter-i18n.h:16
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16
 msgid "does not contain"
 msgstr "Ddim yn cynnwys"
 
-#: ../calendar/gui/caltypes.xml.h:21
-#: ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:27
-#: ../mail/em-filter-i18n.h:31
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31
 msgid "is"
 msgstr "yn"
 
-#: ../calendar/gui/caltypes.xml.h:22
-#: ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30
-#: ../mail/em-filter-i18n.h:37
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
 msgid "is not"
 msgstr "ddim yn"
 
@@ -4281,9 +4485,7 @@ msgstr "Dull heb ei gynnal wrth agor y calendr"
 msgid "Permission denied to open the calendar"
 msgstr "Gwrthodwyd caniatâd i agor y calendr"
 
-#: ../calendar/gui/comp-editor-factory.c:438
-#: ../plugins/mail-to-task/mail-to-task.c:455
-#: ../shell/e-shell.c:1261
+#: ../calendar/gui/comp-editor-factory.c:438 ../shell/e-shell.c:1261
 msgid "Unknown error"
 msgstr "Gwall anhysbys"
 
@@ -4430,19 +4632,15 @@ msgstr "Atodi ffeil(iau)"
 #: ../calendar/gui/dialogs/event-page.c:2993
 #: ../calendar/gui/e-cal-model-tasks.c:671
 #: ../calendar/gui/e-day-view-time-item.c:785
-#: ../calendar/gui/e-itip-control.c:1150
-#: ../filter/filter-rule.c:942
-#: ../mail/em-account-editor.c:717
-#: ../mail/em-account-editor.c:1451
-#: ../mail/em-account-prefs.c:435
-#: ../mail/em-junk-hook.c:93
+#: ../calendar/gui/e-itip-control.c:1150 ../filter/filter-rule.c:942
+#: ../mail/em-account-editor.c:717 ../mail/em-account-editor.c:1451
+#: ../mail/em-account-prefs.c:435 ../mail/em-junk-hook.c:93
 #: ../plugins/calendar-weather/calendar-weather.c:333
 #: ../plugins/calendar-weather/calendar-weather.c:387
 #: ../plugins/email-custom-header/email-custom-header.c:394
 #: ../plugins/exchange-operations/exchange-delegates-user.c:179
 #: ../plugins/itip-formatter/itip-formatter.c:2208
-#: ../widgets/misc/e-cell-date-edit.c:312
-#: ../widgets/misc/e-dateedit.c:1463
+#: ../widgets/misc/e-cell-date-edit.c:312 ../widgets/misc/e-dateedit.c:1463
 #: ../widgets/misc/e-dateedit.c:1674
 #: ../widgets/misc/e-signature-combo-box.c:74
 msgid "None"
@@ -4453,18 +4651,16 @@ msgid "Selected Calendars for Alarms"
 msgstr "Calendrau a ddewiswyd ar gyfer Larymau"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:865
-#, fuzzy
 msgid "Time and date:"
-msgstr "Cylchfa amser:"
+msgstr "Amser a dyddiad:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:866
 msgid "Date only:"
 msgstr "Dyddiad yn unig:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#, fuzzy
 msgid "(Shown in a Day View)"
-msgstr "Dangos maes mewn Golwg"
+msgstr "(Dangos mewn Golwg Diwrnod)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid ""
@@ -4482,21 +4678,23 @@ msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 #, no-c-format
-msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
-msgstr "<i>Caiff %u a %d eu hamnewid gan ddefnyddiwr a pharth-enw o'r cyfeiriad e-bost.</i>"
+msgid ""
+"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgstr ""
+"<i>Caiff %u a %d eu hamnewid gan ddefnyddiwr a pharth-enw o'r cyfeiriad e-"
+"bost.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#, fuzzy
 msgid "<span weight=\"bold\">Alarms</span>"
 msgstr "<span weight=\"bold\">Rhybuddion</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: ../mail/mail-config.glade.h:10
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Rhybuddion</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ../mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:13
 #, fuzzy
 msgid "<span weight=\"bold\">Date/Time Format</span>"
 msgstr "<span weight=\"bold\">Amser</span>"
@@ -4506,7 +4704,7 @@ msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<span weight=\"bold\">Gweinydd Statws Rhydd/Prysur Rhagosodedig</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: ../mail/mail-config.glade.h:18
+#: ../mail/mail-config.glade.h:17
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Cyffredinol</span>"
@@ -4577,7 +4775,7 @@ msgstr ""
 "Sul"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:118
 msgid "Pick a color"
 msgstr "Dewiswch liw"
 
@@ -4822,7 +5020,9 @@ msgstr "Mae'r memo hwn wedi ei ddileu."
 #: ../calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
-msgstr "%s  Rydych chi wedi gwneud newidiadau. Hepgor y newidiadau hynny a chau'r golygydd?"
+msgstr ""
+"%s  Rydych chi wedi gwneud newidiadau. Hepgor y newidiadau hynny a chau'r "
+"golygydd?"
 
 #: ../calendar/gui/dialogs/changed-comp.c:78
 #, c-format
@@ -4844,12 +5044,15 @@ msgstr "Mae'r memo hwn wedi ei newid."
 #: ../calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr "%s  Rydych chi wedi gwneud newidiadau. Hepgor y newidiadau hynny a diweddaru'r golygydd?"
+msgstr ""
+"%s  Rydych chi wedi gwneud newidiadau. Hepgor y newidiadau hynny a "
+"diweddaru'r golygydd?"
 
 #: ../calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
-msgstr "%s Dydych chi ddim wedi gwneud unrhyw newidiadau. Diweddaru'r golygydd?"
+msgstr ""
+"%s Dydych chi ddim wedi gwneud unrhyw newidiadau. Diweddaru'r golygydd?"
 
 #: ../calendar/gui/dialogs/comp-editor-page.c:448
 #, c-format
@@ -4857,29 +5060,24 @@ msgid "Validation error: %s"
 msgstr "Gwall dilysu: %s"
 
 # TRWSIO
-#: ../calendar/gui/dialogs/comp-editor-util.c:189
-#: ../calendar/gui/print.c:2349
+#: ../calendar/gui/dialogs/comp-editor-util.c:189 ../calendar/gui/print.c:2349
 msgid " to "
 msgstr " i"
 
 # TRWSIO
-#: ../calendar/gui/dialogs/comp-editor-util.c:193
-#: ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2353
 msgid " (Completed "
 msgstr " (Cyflawnwyd "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:195
-#: ../calendar/gui/print.c:2355
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2355
 msgid "Completed "
 msgstr "Cyflawnwyd"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200
-#: ../calendar/gui/print.c:2360
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2360
 msgid " (Due "
 msgstr " (Amser Disgwyl "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:202
-#: ../calendar/gui/print.c:2362
+#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2362
 msgid "Due "
 msgstr "Amser Disgwyl "
 
@@ -4962,14 +5160,12 @@ msgstr "_Dosbarthiad"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1045
 #: ../mail/mail-signature-editor.c:209
-#: ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "_Ffeil"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1052
-#: ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_Cymorth"
@@ -4982,12 +5178,9 @@ msgstr "_Mewnosod"
 msgid "_Options"
 msgstr "_Opsiynau"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1073
-#: ../mail/em-folder-tree.c:2106
-#: ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-tasks.xml.h:30
+#: ../calendar/gui/dialogs/comp-editor.c:1073 ../mail/em-folder-tree.c:2106
+#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "_Golwg"
@@ -5030,18 +5223,16 @@ msgid "_Private"
 msgstr "_Preifat"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1121
-#, fuzzy
 msgid "Classify as private"
-msgstr "Categoreiddio yn eitem breifat"
+msgstr "Categoreiddio'n breifat"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1126
 msgid "_Confidential"
 msgstr "_Cyfrinachol"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1128
-#, fuzzy
 msgid "Classify as confidential"
-msgstr "Categoreiddio'n Gyfrinachol"
+msgstr "Categoreiddio'n gyfrinachol"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1136
 msgid "R_ole Field"
@@ -5094,10 +5285,11 @@ msgstr "Cadw"
 #: ../calendar/gui/dialogs/comp-editor.c:1973
 #: ../calendar/gui/dialogs/comp-editor.c:2833
 msgid "Changes made to this item may be discarded if an update arrives"
-msgstr "Efallai bydd y newidiadau wnaed i'r eitem yn cael eu tynnu os wnaiff diweddariad gyrraedd"
+msgstr ""
+"Efallai bydd y newidiadau wnaed i'r eitem yn cael eu tynnu os wnaiff "
+"diweddariad gyrraedd"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2801
-#: ../mail/em-utils.c:371
+#: ../calendar/gui/dialogs/comp-editor.c:2801 ../mail/em-utils.c:371
 #: ../plugins/prefer-plain/prefer-plain.c:91
 msgid "attachment"
 msgstr "atodiad"
@@ -5165,9 +5357,8 @@ msgid "The task could not be deleted due to an error"
 msgstr "Methwyd dileu'r dasg oherwydd gwall"
 
 #: ../calendar/gui/dialogs/delete-error.c:93
-#, fuzzy
 msgid "The memo could not be deleted due to an error"
-msgstr "Methwyd dileu eitem oherwydd gwall"
+msgstr "Methwyd dileu'r memo oherwydd gwall"
 
 #: ../calendar/gui/dialogs/delete-error.c:96
 msgid "The item could not be deleted due to an error"
@@ -5430,8 +5621,7 @@ msgstr "_Amser:"
 #: ../calendar/gui/dialogs/event-page.glade.h:19
 #: ../calendar/gui/dialogs/memo-page.glade.h:8
 #: ../calendar/gui/dialogs/task-page.glade.h:10
-#: ../mail/mail-config.glade.h:193
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-config.glade.h:192 ../mail/mail-dialogs.glade.h:21
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:5
 #: ../smime/gui/smime-ui.glade.h:49
 msgid ""
@@ -5448,8 +5638,7 @@ msgid ""
 "until"
 msgstr "hyd"
 
-#: ../calendar/gui/dialogs/memo-editor.c:111
-#: ../calendar/gui/print.c:2469
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2469
 msgid "Memo"
 msgstr "Memo"
 
@@ -5466,14 +5655,10 @@ msgstr ""
 msgid "Unable to open memos in '%s'."
 msgstr "Methu agor memos o fewn '%s'."
 
-#: ../calendar/gui/dialogs/memo-page.c:1031
-#: ../mail/em-format-html.c:1566
-#: ../mail/em-format-html.c:1624
-#: ../mail/em-format-html.c:1649
-#: ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:925
-#: ../mail/em-mailer-prefs.c:78
-#: ../mail/message-list.etspec.h:20
+#: ../calendar/gui/dialogs/memo-page.c:1031 ../mail/em-format-html.c:1566
+#: ../mail/em-format-html.c:1624 ../mail/em-format-html.c:1649
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:925
+#: ../mail/em-mailer-prefs.c:78 ../mail/message-list.etspec.h:20
 msgid "To"
 msgstr "I"
 
@@ -5495,12 +5680,15 @@ msgstr "_Grŵp"
 #: ../calendar/gui/dialogs/recur-comp.c:53
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
-msgstr "Rydych chi'n newid digwyddiad sy'n ail-ddigwydd. Beth hoffech chi newid?"
+msgstr ""
+"Rydych chi'n newid digwyddiad sy'n ail-ddigwydd. Beth hoffech chi newid?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:55
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
-msgstr "Rydych chi'n dirprwyo digwyddiad sy'n ail-ddigwydd. Beth hoffech chi ei ddirprwyo?"
+msgstr ""
+"Rydych chi'n dirprwyo digwyddiad sy'n ail-ddigwydd. Beth hoffech chi ei "
+"ddirprwyo?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:59
 #, c-format
@@ -5510,7 +5698,8 @@ msgstr "Rydych chi'n newid tasg sy'n ail-ddigwydd. Beth hoffech chi newid?"
 #: ../calendar/gui/dialogs/recur-comp.c:63
 #, fuzzy, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
-msgstr "Rydych chi'n newid digwyddiad sy'n ail-ddigwydd. Beth hoffech chi newid?"
+msgstr ""
+"Rydych chi'n newid digwyddiad sy'n ail-ddigwydd. Beth hoffech chi newid?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:87
 msgid "This Instance Only"
@@ -5530,7 +5719,8 @@ msgstr "Pob Enghraifft"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:563
 msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Mae'r apwyntiad yn cynnwys ail-ddigwyddiadau na all Evolution eu newid."
+msgstr ""
+"Mae'r apwyntiad yn cynnwys ail-ddigwyddiadau na all Evolution eu newid."
 
 #: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
@@ -5584,9 +5774,8 @@ msgstr "pedwerydd"
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
 #: ../calendar/gui/dialogs/recurrence-page.c:1039
-#, fuzzy
 msgid "fifth"
-msgstr "Lled"
+msgstr "pumed"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
@@ -5669,7 +5858,7 @@ msgid "<b>Exceptions</b>"
 msgstr "<b>Eithriadau</b>"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:3
+#: ../mail/mail-config.glade.h:2
 msgid "<b>Preview</b>"
 msgstr "<b>Rhagolwg</b>"
 
@@ -5696,6 +5885,10 @@ msgid ""
 "month(s)\n"
 "year(s)"
 msgstr ""
+"diwrnod\n"
+"wythnos\n"
+"mis\n"
+"blynedd"
 
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
@@ -5705,6 +5898,9 @@ msgid ""
 "until\n"
 "forever"
 msgstr ""
+"am\n"
+"tan\n"
+"am byth"
 
 #: ../calendar/gui/dialogs/send-comp.c:160
 msgid "Send my alarms with this event"
@@ -5931,15 +6127,13 @@ msgid "I_mport to Tasks"
 msgstr "_Mewnforio i'r Tasgau"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:68
-#: ../calendar/gui/e-cal-component-preview.c:67
-#: ../mail/em-folder-view.c:3210
+#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3210
 #, c-format
 msgid "Click to open %s"
 msgstr "Cliciwch i agor %s"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:127
-#: ../calendar/gui/e-cal-component-preview.c:170
-#: ../filter/filter-rule.c:859
+#: ../calendar/gui/e-cal-component-preview.c:170 ../filter/filter-rule.c:859
 msgid "Untitled"
 msgstr "Di-deitl"
 
@@ -5952,8 +6146,7 @@ msgstr "Dyddiad Cychwyn:"
 #: ../calendar/gui/e-cal-component-memo-preview.c:191
 #: ../calendar/gui/e-cal-component-preview.c:285
 #: ../calendar/gui/e-itip-control.c:1210
-#: ../calendar/gui/e-itip-control.glade.h:4
-#: ../mail/mail-config.glade.h:76
+#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:75
 msgid "Description:"
 msgstr "Disgrifiad:"
 
@@ -5986,8 +6179,7 @@ msgstr "Statws:"
 #: ../calendar/gui/e-cal-model-tasks.c:675
 #: ../calendar/gui/e-cal-model-tasks.c:752
 #: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:659
-#: ../calendar/gui/print.c:2542
+#: ../calendar/gui/e-calendar-table.c:659 ../calendar/gui/print.c:2542
 msgid "In Progress"
 msgstr "Ar Waith"
 
@@ -5997,12 +6189,9 @@ msgstr "Ar Waith"
 #: ../calendar/gui/e-cal-model-tasks.c:361
 #: ../calendar/gui/e-cal-model-tasks.c:677
 #: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:660
-#: ../calendar/gui/e-itip-control.c:939
-#: ../calendar/gui/e-meeting-store.c:179
-#: ../calendar/gui/e-meeting-store.c:202
-#: ../calendar/gui/print.c:2545
-#: ../calendar/gui/tasktypes.xml.h:9
+#: ../calendar/gui/e-calendar-table.c:660 ../calendar/gui/e-itip-control.c:939
+#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
+#: ../calendar/gui/print.c:2545 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:361
 msgid "Completed"
 msgstr "Cyflawnwyd"
@@ -6011,8 +6200,7 @@ msgstr "Cyflawnwyd"
 #: ../calendar/gui/e-cal-model-tasks.c:357
 #: ../calendar/gui/e-cal-model-tasks.c:673
 #: ../calendar/gui/e-calendar-table.c:232
-#: ../calendar/gui/e-calendar-table.c:658
-#: ../calendar/gui/print.c:2539
+#: ../calendar/gui/e-calendar-table.c:658 ../calendar/gui/print.c:2539
 #: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Heb Gychwyn"
@@ -6022,23 +6210,19 @@ msgid "Priority:"
 msgstr "Blaenoriaeth:"
 
 #: ../calendar/gui/e-cal-component-preview.c:264
-#: ../calendar/gui/e-calendar-table.c:585
-#: ../calendar/gui/tasktypes.xml.h:14
+#: ../calendar/gui/e-calendar-table.c:585 ../calendar/gui/tasktypes.xml.h:14
 #: ../mail/message-list.c:1064
 msgid "High"
 msgstr "Uchel"
 
 #: ../calendar/gui/e-cal-component-preview.c:266
-#: ../calendar/gui/e-cal-model.c:1076
-#: ../calendar/gui/e-calendar-table.c:586
-#: ../calendar/gui/tasktypes.xml.h:17
-#: ../mail/message-list.c:1063
+#: ../calendar/gui/e-cal-model.c:1076 ../calendar/gui/e-calendar-table.c:586
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "Arferol"
 
 #: ../calendar/gui/e-cal-component-preview.c:268
-#: ../calendar/gui/e-calendar-table.c:587
-#: ../calendar/gui/tasktypes.xml.h:16
+#: ../calendar/gui/e-calendar-table.c:587 ../calendar/gui/tasktypes.xml.h:16
 #: ../mail/message-list.c:1062
 msgid "Low"
 msgstr "Isel"
@@ -6086,18 +6270,15 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1027
-#: ../calendar/gui/e-cal-model.c:1082
+#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1082
 #: ../calendar/gui/e-meeting-list-view.c:190
-#: ../calendar/gui/e-meeting-store.c:151
-#: ../calendar/gui/e-meeting-store.c:161
+#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:161
 #: ../calendar/gui/e-meeting-store.c:742
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Ie"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1027
-#: ../calendar/gui/e-cal-model.c:1082
+#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1082
 #: ../calendar/gui/e-meeting-list-view.c:191
 #: ../calendar/gui/e-meeting-store.c:163
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
@@ -6105,17 +6286,13 @@ msgid "No"
 msgstr "Nage"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:372
-#: ../calendar/gui/e-itip-control.c:1195
+#: ../calendar/gui/e-cal-model.c:372 ../calendar/gui/e-itip-control.c:1195
 #: ../calendar/gui/e-itip-control.c:1333
 #: ../calendar/gui/e-meeting-list-view.c:166
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:109
-#: ../calendar/gui/e-meeting-store.c:144
-#: ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/print.c:978
-#: ../calendar/gui/print.c:995
-#: ../mail/em-utils.c:1339
+#: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:144
+#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/print.c:978
+#: ../calendar/gui/print.c:995 ../mail/em-utils.c:1339
 #: ../plugins/itip-formatter/itip-formatter.c:449
 #: ../plugins/itip-formatter/itip-formatter.c:2233
 #: ../plugins/plugin-manager/plugin-manager.c:89
@@ -6159,8 +6336,7 @@ msgstr "Cychwyn:"
 msgid "Due: "
 msgstr "Amser Disgwyl "
 
-#: ../calendar/gui/e-calendar-table.c:588
-#: ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-calendar-table.c:588 ../calendar/gui/tasktypes.xml.h:24
 msgid "Undefined"
 msgstr "Anniffiniedig"
 
@@ -6209,20 +6385,17 @@ msgid "100%"
 msgstr "100%"
 
 #: ../calendar/gui/e-calendar-table.c:897
-#: ../calendar/gui/e-calendar-view.c:659
-#: ../calendar/gui/e-memo-table.c:449
+#: ../calendar/gui/e-calendar-view.c:659 ../calendar/gui/e-memo-table.c:449
 msgid "Deleting selected objects"
 msgstr "Dileu gwrthrych dewisedig"
 
 #: ../calendar/gui/e-calendar-table.c:1176
-#: ../calendar/gui/e-calendar-view.c:873
-#: ../calendar/gui/e-memo-table.c:654
+#: ../calendar/gui/e-calendar-view.c:873 ../calendar/gui/e-memo-table.c:654
 msgid "Updating objects"
 msgstr "Diweddaru gwrthrychau"
 
 #: ../calendar/gui/e-calendar-table.c:1364
-#: ../calendar/gui/e-calendar-view.c:1333
-#: ../calendar/gui/e-memo-table.c:828
+#: ../calendar/gui/e-calendar-view.c:1333 ../calendar/gui/e-memo-table.c:828
 #: ../composer/e-composer-actions.c:219
 msgid "Save as..."
 msgstr "Cadw fel..."
@@ -6232,53 +6405,41 @@ msgstr "Cadw fel..."
 msgid "New _Task"
 msgstr "_Tasg Newydd"
 
-#: ../calendar/gui/e-calendar-table.c:1592
-#: ../calendar/gui/e-memo-table.c:933
+#: ../calendar/gui/e-calendar-table.c:1592 ../calendar/gui/e-memo-table.c:933
 msgid "Open _Web Page"
 msgstr "Agor Tudalen _Gwe"
 
 #: ../calendar/gui/e-calendar-table.c:1593
-#: ../calendar/gui/e-calendar-view.c:1807
-#: ../calendar/gui/e-memo-table.c:934
-#: ../mail/em-folder-view.c:1336
-#: ../mail/em-popup.c:494
+#: ../calendar/gui/e-calendar-view.c:1807 ../calendar/gui/e-memo-table.c:934
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:494
 msgid "_Save As..."
 msgstr "_Cadw Fel..."
 
 #: ../calendar/gui/e-calendar-table.c:1594
-#: ../calendar/gui/e-calendar-view.c:1792
-#: ../calendar/gui/e-memo-table.c:935
+#: ../calendar/gui/e-calendar-view.c:1792 ../calendar/gui/e-memo-table.c:935
 msgid "P_rint..."
 msgstr "_Argraffu..."
 
 #: ../calendar/gui/e-calendar-table.c:1598
-#: ../calendar/gui/e-calendar-view.c:1812
-#: ../calendar/gui/e-memo-table.c:939
-#: ../ui/evolution-addressbook.xml.h:2
-#: ../ui/evolution-calendar.xml.h:1
-#: ../ui/evolution-memos.xml.h:1
-#: ../ui/evolution-tasks.xml.h:1
+#: ../calendar/gui/e-calendar-view.c:1812 ../calendar/gui/e-memo-table.c:939
+#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
+#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Torri"
 
 #: ../calendar/gui/e-calendar-table.c:1600
 #: ../calendar/gui/e-calendar-view.c:1795
-#: ../calendar/gui/e-calendar-view.c:1814
-#: ../calendar/gui/e-memo-table.c:941
-#: ../ui/evolution-addressbook.xml.h:57
-#: ../ui/evolution-calendar.xml.h:46
-#: ../ui/evolution-memos.xml.h:19
-#: ../ui/evolution-tasks.xml.h:28
+#: ../calendar/gui/e-calendar-view.c:1814 ../calendar/gui/e-memo-table.c:941
+#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
+#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Gludo"
 
-#: ../calendar/gui/e-calendar-table.c:1604
-#: ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1604 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Neilltuo Tasg"
 
-#: ../calendar/gui/e-calendar-table.c:1605
-#: ../calendar/gui/e-memo-table.c:945
+#: ../calendar/gui/e-calendar-table.c:1605 ../calendar/gui/e-memo-table.c:945
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Gyrru ymlaen fel iCalendar"
@@ -6292,8 +6453,9 @@ msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcio'r tasgau a ddewiswyd yn rai cyflawn"
 
 #: ../calendar/gui/e-calendar-table.c:1608
+#, fuzzy
 msgid "_Mark as Incomplete"
-msgstr "_Marcio heb eu gorffen"
+msgstr "_Marcio fel heb eu gorffen"
 
 #: ../calendar/gui/e-calendar-table.c:1609
 msgid "_Mark Selected Tasks as Incomplete"
@@ -6341,34 +6503,38 @@ msgstr "Dyddiad cychwyn"
 #: ../calendar/gui/e-calendar-view.c:2337
 #: ../calendar/gui/e-meeting-list-view.c:601
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/em-filter-i18n.h:72
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "Statws"
 
 #: ../calendar/gui/e-calendar-view.c:1478
+#, fuzzy
 msgid "Moving items"
 msgstr "Symud eitemau"
 
 #: ../calendar/gui/e-calendar-view.c:1480
+#, fuzzy
 msgid "Copying items"
-msgstr "Copïo eitemau"
+msgstr "Copïo Eitemau"
 
 #: ../calendar/gui/e-calendar-view.c:1786
 msgid "New _Appointment..."
 msgstr "_Apwyntiad Newydd..."
 
 #: ../calendar/gui/e-calendar-view.c:1787
+#, fuzzy
 msgid "New All Day _Event"
-msgstr "_Digwyddiad Newydd Drwy'r Dydd"
+msgstr "Digwyddiad drwy'r diwrnod newydd"
 
 #: ../calendar/gui/e-calendar-view.c:1788
+#, fuzzy
 msgid "New _Meeting"
-msgstr "_Cyfarfod Newydd"
+msgstr "Cyfarfod Newydd"
 
 #. FIXME: hook in this somehow
 #: ../calendar/gui/e-calendar-view.c:1799
+#, fuzzy
 msgid "_Current View"
 msgstr "Golwg _Cyfredol"
 
@@ -6409,10 +6575,8 @@ msgid "_Reply"
 msgstr "_Ateb"
 
 #: ../calendar/gui/e-calendar-view.c:1824
-#: ../mail/e-attachment-handler-mail.c:140
-#: ../mail/em-folder-view.c:1330
-#: ../mail/em-popup.c:499
-#: ../ui/evolution-mail-message.xml.h:78
+#: ../mail/e-attachment-handler-mail.c:140 ../mail/em-folder-view.c:1330
+#: ../mail/em-popup.c:499 ../ui/evolution-mail-message.xml.h:78
 msgid "Reply to _All"
 msgstr "Ateb i _Bawb"
 
@@ -6420,8 +6584,8 @@ msgstr "Ateb i _Bawb"
 msgid "Make this Occurrence _Movable"
 msgstr "Galluogi _symud y digwyddiad hwn"
 
-#: ../calendar/gui/e-calendar-view.c:1830
-#: ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1830 ../ui/evolution-calendar.xml.h:9
+#, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Dileu _digwyddiad hyn"
 
@@ -6432,8 +6596,7 @@ msgstr "Dileu _Pob digwyddiadau"
 #: ../calendar/gui/e-calendar-view.c:2284
 #: ../calendar/gui/e-itip-control.c:1183
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:171
-#: ../calendar/gui/e-meeting-store.c:194
+#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
 #: ../plugins/itip-formatter/itip-formatter.c:2221
 msgid "Accepted"
 msgstr "Derbyniwyd"
@@ -6441,24 +6604,21 @@ msgstr "Derbyniwyd"
 #: ../calendar/gui/e-calendar-view.c:2285
 #: ../calendar/gui/e-itip-control.c:1191
 #: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:173
-#: ../calendar/gui/e-meeting-store.c:196
+#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
 #: ../plugins/itip-formatter/itip-formatter.c:2227
 msgid "Declined"
 msgstr "Gwrthododd"
 
 #: ../calendar/gui/e-calendar-view.c:2286
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:175
-#: ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
 #: ../calendar/gui/e-meeting-time-sel.c:390
 msgid "Tentative"
 msgstr "I'w gadarnhau"
 
 #: ../calendar/gui/e-calendar-view.c:2287
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:177
-#: ../calendar/gui/e-meeting-store.c:200
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
 #: ../plugins/itip-formatter/itip-formatter.c:2230
 msgid "Delegated"
 msgstr "Dirprwywyd"
@@ -6468,8 +6628,7 @@ msgid "Needs action"
 msgstr "Angen gweithred"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2449
-#: ../calendar/gui/print.c:2501
+#: ../calendar/gui/e-calendar-view.c:2449 ../calendar/gui/print.c:2501
 #, c-format
 msgid "Location: %s"
 msgstr "Lleoliad: %s"
@@ -6519,23 +6678,19 @@ msgstr "Dangos y cwarel \"Rhagolwg\""
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:840
-#: ../calendar/gui/e-day-view.c:1576
-#: ../calendar/gui/e-week-view-main-item.c:359
-#: ../calendar/gui/print.c:1666
+#: ../calendar/gui/e-day-view-top-item.c:840 ../calendar/gui/e-day-view.c:1576
+#: ../calendar/gui/e-week-view-main-item.c:359 ../calendar/gui/print.c:1666
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:805
-#: ../calendar/gui/e-week-view.c:541
+#: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:541
 #: ../calendar/gui/print.c:825
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:808
-#: ../calendar/gui/e-week-view.c:544
+#: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:544
 #: ../calendar/gui/print.c:827
 msgid "pm"
 msgstr "pm"
@@ -6633,8 +6788,7 @@ msgstr "Gorffen"
 msgid "Due"
 msgstr "Yn Disgwyl"
 
-#: ../calendar/gui/e-itip-control.c:995
-#: ../calendar/gui/e-itip-control.c:1052
+#: ../calendar/gui/e-itip-control.c:995 ../calendar/gui/e-itip-control.c:1052
 msgid "iCalendar Information"
 msgstr "Gwybodaeth iCalendar"
 
@@ -6643,10 +6797,8 @@ msgstr "Gwybodaeth iCalendar"
 msgid "iCalendar Error"
 msgstr "Gwall iCalendar"
 
-#: ../calendar/gui/e-itip-control.c:1084
-#: ../calendar/gui/e-itip-control.c:1100
-#: ../calendar/gui/e-itip-control.c:1111
-#: ../calendar/gui/e-itip-control.c:1128
+#: ../calendar/gui/e-itip-control.c:1084 ../calendar/gui/e-itip-control.c:1100
+#: ../calendar/gui/e-itip-control.c:1111 ../calendar/gui/e-itip-control.c:1128
 #: ../plugins/itip-formatter/itip-view.c:346
 #: ../plugins/itip-formatter/itip-view.c:347
 #: ../plugins/itip-formatter/itip-view.c:434
@@ -6658,8 +6810,12 @@ msgstr "Person anhysbys"
 
 #. Describe what the user can do
 #: ../calendar/gui/e-itip-control.c:1135
-msgid "<br> Please review the following information, and then select an action from the menu below."
-msgstr "<br> Rhowch olwg ar y wybodaeth sy'n dilyn, ac yna dewis gweithred o'r ddewislen isod."
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+"<br> Rhowch olwg ar y wybodaeth sy'n dilyn, ac yna dewis gweithred o'r "
+"ddewislen isod."
 
 #: ../calendar/gui/e-itip-control.c:1187
 #: ../plugins/itip-formatter/itip-formatter.c:2224
@@ -6667,11 +6823,14 @@ msgid "Tentatively Accepted"
 msgstr "Wedi derbyn yn betrus"
 
 #: ../calendar/gui/e-itip-control.c:1274
-msgid "The meeting has been canceled, however it could not be found in your calendars"
+msgid ""
+"The meeting has been canceled, however it could not be found in your "
+"calendars"
 msgstr "Mae'r cyfarfod wedi ei ganslo, ond dyw e ddim yn eich calendrau"
 
 #: ../calendar/gui/e-itip-control.c:1276
-msgid "The task has been canceled, however it could not be found in your task lists"
+msgid ""
+"The task has been canceled, however it could not be found in your task lists"
 msgstr "Mae'r dasg wedi ei ganslo, ond dyw e ddim yn eich rhestrau tasgau"
 
 #: ../calendar/gui/e-itip-control.c:1353
@@ -6734,8 +6893,7 @@ msgstr "Mae <b>%s</b> wedi canslo cyfarfod."
 msgid "Meeting Cancelation"
 msgstr "Canslo Cyfarfod"
 
-#: ../calendar/gui/e-itip-control.c:1401
-#: ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1401 ../calendar/gui/e-itip-control.c:1478
 #: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
@@ -6866,7 +7024,9 @@ msgstr "Gwrthrych yn annilys a methir ei ddiweddaru\n"
 
 #: ../calendar/gui/e-itip-control.c:2018
 msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr "Dyw'r ymateb ddim oddi wrth rywun sy'n mynychu'r cyfarfod ar hyn o bryd.  Ychwanegu'r person fel mynychwr?"
+msgstr ""
+"Dyw'r ymateb ddim oddi wrth rywun sy'n mynychu'r cyfarfod ar hyn o bryd.  "
+"Ychwanegu'r person fel mynychwr?"
 
 #: ../calendar/gui/e-itip-control.c:2036
 msgid "Attendee status could not be updated because of an invalid status!\n"
@@ -6881,13 +7041,11 @@ msgstr "Cyflwr mynychwr wedi diweddaru\n"
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Methu"
 
-#: ../calendar/gui/e-itip-control.c:2098
-#: ../calendar/gui/e-itip-control.c:2155
+#: ../calendar/gui/e-itip-control.c:2098 ../calendar/gui/e-itip-control.c:2155
 msgid "Item sent!\n"
 msgstr "Eitem wedi ei ddanfon!\n"
 
-#: ../calendar/gui/e-itip-control.c:2104
-#: ../calendar/gui/e-itip-control.c:2163
+#: ../calendar/gui/e-itip-control.c:2104 ../calendar/gui/e-itip-control.c:2163
 msgid "The item could not be sent!\n"
 msgstr "Methwyd anfon yr eitem!\n"
 
@@ -6932,8 +7090,7 @@ msgstr "Diweddaru cyflwr ymatebwr"
 msgid "Send Latest Information"
 msgstr "Anfon Gwybodaeth Ddiweddar"
 
-#: ../calendar/gui/e-itip-control.c:2473
-#: ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2473 ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Diddymu"
 
@@ -6982,67 +7139,55 @@ msgid "Resources"
 msgstr "Adnoddau"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:84
-#: ../calendar/gui/e-meeting-store.c:101
-#: ../calendar/gui/e-meeting-store.c:736
-#: ../calendar/gui/print.c:974
+#: ../calendar/gui/e-meeting-store.c:84 ../calendar/gui/e-meeting-store.c:101
+#: ../calendar/gui/e-meeting-store.c:736 ../calendar/gui/print.c:974
 msgid "Individual"
 msgstr "Unigol"
 
 #: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-store.c:86
-#: ../calendar/gui/e-meeting-store.c:103
-#: ../calendar/gui/print.c:975
-#: ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/print.c:975 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Grŵp"
 
 #: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:88
-#: ../calendar/gui/e-meeting-store.c:105
+#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
 #: ../calendar/gui/print.c:976
 msgid "Resource"
 msgstr "Adnodd"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:90
-#: ../calendar/gui/e-meeting-store.c:107
+#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
 #: ../calendar/gui/print.c:977
 msgid "Room"
 msgstr "Ystafell"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:119
-#: ../calendar/gui/e-meeting-store.c:136
+#: ../calendar/gui/e-meeting-store.c:119 ../calendar/gui/e-meeting-store.c:136
 #: ../calendar/gui/print.c:991
 msgid "Chair"
 msgstr "Cadeirydd"
 
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:121
-#: ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/e-meeting-store.c:739
-#: ../calendar/gui/print.c:992
+#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
+#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:992
 msgid "Required Participant"
 msgstr "Cyfranogwyr Angenrheidiol"
 
 #: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:123
-#: ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
 #: ../calendar/gui/print.c:993
 msgid "Optional Participant"
 msgstr "Cyfranwyr Dewisol"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:125
-#: ../calendar/gui/e-meeting-store.c:142
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
 #: ../calendar/gui/print.c:994
 msgid "Non-Participant"
 msgstr "Ddim yn Cyfrannu"
 
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:169
-#: ../calendar/gui/e-meeting-store.c:192
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:192
 #: ../calendar/gui/e-meeting-store.c:749
 msgid "Needs Action"
 msgstr "Angen Gweithred"
@@ -7052,8 +7197,7 @@ msgstr "Angen Gweithred"
 msgid "Attendee                          "
 msgstr "Mynychwr                          "
 
-#: ../calendar/gui/e-meeting-store.c:181
-#: ../calendar/gui/e-meeting-store.c:204
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
 msgid "In Process"
 msgstr "Mewn Proses"
 
@@ -7171,19 +7315,17 @@ msgstr "Aelodau"
 msgid "_Delete Selected Memos"
 msgstr "_Dileu'r Memos a Ddewiswyd"
 
-#: ../calendar/gui/e-memo-table.c:1099
-#: ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1099 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Cliciwch i ychwanegu memo"
 
-#: ../calendar/gui/e-memos.c:754
-#: ../calendar/gui/e-tasks.c:902
-#, c-format
+#: ../calendar/gui/e-memos.c:754 ../calendar/gui/e-tasks.c:902
+#, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr ""
-"Gwall ar %s:\n"
+"Gwall ar %s\n"
 " %s"
 
 #: ../calendar/gui/e-memos.c:806
@@ -7195,10 +7337,10 @@ msgstr "Llwytho memos"
 msgid "Opening memos at %s"
 msgstr "Agor memos am %s"
 
-#: ../calendar/gui/e-memos.c:1066
-#: ../calendar/gui/e-tasks.c:1318
+#: ../calendar/gui/e-memos.c:1066 ../calendar/gui/e-tasks.c:1318
+#, fuzzy
 msgid "Deleting selected objects..."
-msgstr "Dileu gwrthrychau dewisedig..."
+msgstr "Dileu gwrthrych dewisedig"
 
 #: ../calendar/gui/e-tasks.c:955
 msgid "Loading tasks"
@@ -7224,8 +7366,7 @@ msgstr "Dewiswch Gylchfa Amser"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:376
-#: ../calendar/gui/print.c:1647
+#: ../calendar/gui/e-week-view-main-item.c:376 ../calendar/gui/print.c:1647
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -7261,7 +7402,7 @@ msgstr "Llwytho memos yn %s"
 msgid "Opening %s"
 msgstr "Yn agor %s"
 
-#: ../calendar/gui/gnome-cal.c:4012
+#: ../calendar/gui/gnome-cal.c:4018
 msgid "Purging"
 msgstr "Puro"
 
@@ -7301,8 +7442,7 @@ msgstr "Dewis Dyddiad"
 msgid "_Select Today"
 msgstr "Dewis _Heddiw"
 
-#: ../calendar/gui/itip-utils.c:410
-#: ../calendar/gui/itip-utils.c:461
+#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:461
 #: ../calendar/gui/itip-utils.c:553
 msgid "An organizer must be set."
 msgstr "Rhaid gosod trefnydd."
@@ -7311,23 +7451,19 @@ msgstr "Rhaid gosod trefnydd."
 msgid "At least one attendee is necessary"
 msgstr "Rhaid bod un neu fwy o fynychwyr"
 
-#: ../calendar/gui/itip-utils.c:635
-#: ../calendar/gui/itip-utils.c:781
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:781
 msgid "Event information"
 msgstr "Gwybodaeth digwyddiad"
 
-#: ../calendar/gui/itip-utils.c:637
-#: ../calendar/gui/itip-utils.c:784
+#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:784
 msgid "Task information"
 msgstr "Gwybodaeth Tasg"
 
-#: ../calendar/gui/itip-utils.c:639
-#: ../calendar/gui/itip-utils.c:787
+#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:787
 msgid "Memo information"
 msgstr "Gwybodaeth memo"
 
-#: ../calendar/gui/itip-utils.c:641
-#: ../calendar/gui/itip-utils.c:805
+#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:805
 msgid "Free/Busy information"
 msgstr "Gwybodaeth statws Rhydd/Prysur"
 
@@ -7361,8 +7497,7 @@ msgstr "Wedi derbyn yn betrus"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:691
-#: ../calendar/gui/itip-utils.c:739
+#: ../calendar/gui/itip-utils.c:691 ../calendar/gui/itip-utils.c:739
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Gwrthododd"
@@ -7434,14 +7569,13 @@ msgstr[0] "%d memo"
 msgstr[1] "%d memo"
 msgstr[2] "%d memo"
 
-#: ../calendar/gui/memos-component.c:562
-#: ../calendar/gui/tasks-component.c:555
-#, c-format
+#: ../calendar/gui/memos-component.c:562 ../calendar/gui/tasks-component.c:555
+#, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
-msgstr[0] ", %d wedi dewis"
-msgstr[1] ", %d wedi dewis"
-msgstr[2] ", %d wedi dewis"
+msgstr[0] "%d wedi dewis"
+msgstr[1] "%d wedi dewis"
+msgstr[2] "%d wedi dewis"
 
 #: ../calendar/gui/memos-component.c:609
 msgid "Failed upgrading memos."
@@ -7450,19 +7584,22 @@ msgstr "Methwyd uwchraddio memos."
 #: ../calendar/gui/memos-component.c:739
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
-msgstr "Methu agor y rhestr dasgau '%s' er mwyn creu cyfarfodydd a digwyddiadau"
+msgstr ""
+"Methu agor y rhestr dasgau '%s' er mwyn creu cyfarfodydd a digwyddiadau"
 
 #: ../calendar/gui/memos-component.c:752
 msgid "There is no calendar available for creating memos"
 msgstr "Does dim calendr ar gael er mwyn creu tasgau"
 
 #: ../calendar/gui/memos-component.c:862
+#, fuzzy
 msgid "Memo Source Selector"
-msgstr "Dewisydd Ffynhonnell Memo"
+msgstr "Dewisydd Ffynhonnell Gyswllt"
 
 #: ../calendar/gui/memos-component.c:1041
+#, fuzzy
 msgid "New memo"
-msgstr "Memo Newydd"
+msgstr "_Memo Newydd"
 
 #: ../calendar/gui/memos-component.c:1042
 msgctxt "New"
@@ -7478,11 +7615,13 @@ msgid "New shared memo"
 msgstr "Memo newydd wedi'i rannu"
 
 #: ../calendar/gui/memos-component.c:1050
+#, fuzzy
 msgctxt "New"
 msgid "_Shared memo"
-msgstr "_Memo wedi rhannu"
+msgstr "_Memo Wedi'i Rhannu"
 
 #: ../calendar/gui/memos-component.c:1051
+#, fuzzy
 msgid "Create a shared new memo"
 msgstr "Creu memo newydd wedi'i rannu"
 
@@ -7499,34 +7638,36 @@ msgstr "_Rhestr femos"
 msgid "Create a new memo list"
 msgstr "Creu rhestr femos newydd"
 
-#: ../calendar/gui/memos-control.c:386
-#: ../calendar/gui/memos-control.c:402
+#: ../calendar/gui/memos-control.c:386 ../calendar/gui/memos-control.c:402
 msgid "Print Memos"
 msgstr "Argraffu Memos"
 
 #: ../calendar/gui/migration.c:157
 msgid ""
-"The location and hierarchy of the Evolution task folders has changed since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution task folders has changed since "
+"Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Mae lleoliad a strwythur plygellau tasgau Evolution wedi newid ers Evolution 1.x\n"
+"Mae lleoliad a strwythur plygellau tasgau Evolution wedi newid ers Evolution "
+"1.x\n"
 "\n"
 "Byddwch yn amyneddgar nes i Evolution fudo'ch plygellau..."
 
 #: ../calendar/gui/migration.c:161
 msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution calendar folders has changed "
+"since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Mae lleoliad a strwythur plygellau calendr Evolution wedi newid ers Evolution 1.x\n"
+"Mae lleoliad a strwythur plygellau calendr Evolution wedi newid ers "
+"Evolution 1.x\n"
 "\n"
 "Byddwch yn amyneddgar nes i Evolution fudo'ch plygellau..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:774
-#: ../calendar/gui/migration.c:942
+#: ../calendar/gui/migration.c:774 ../calendar/gui/migration.c:942
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Methu mudo hen osodiadau o evolution/config.xmldb"
@@ -7762,15 +7903,17 @@ msgstr "Methwyd uwchraddio tasgau."
 #: ../calendar/gui/tasks-component.c:735
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr "Methu agor y rhestr dasgau '%s' er mwyn creu cyfarfodydd a digwyddiadau"
+msgstr ""
+"Methu agor y rhestr dasgau '%s' er mwyn creu cyfarfodydd a digwyddiadau"
 
 #: ../calendar/gui/tasks-component.c:748
 msgid "There is no calendar available for creating tasks"
 msgstr "Does dim calendr ar gael er mwyn creu tasgau"
 
 #: ../calendar/gui/tasks-component.c:859
+#, fuzzy
 msgid "Task Source Selector"
-msgstr "Dewisydd Ffynhonnell Dasg"
+msgstr "Dewisydd Ffynhonnell Gyswllt"
 
 #: ../calendar/gui/tasks-component.c:1113
 msgid "New task"
@@ -7814,21 +7957,22 @@ msgstr "Creu rhestr dasgau newydd"
 
 #: ../calendar/gui/tasks-control.c:484
 msgid ""
-"This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n"
+"This operation will permanently erase all tasks marked as completed. If you "
+"continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"Bydd y weithred hon yn dileu'n barhaol bob tasg sydd wedi'i marcio wedi'i chwblhau. Os wnewch chi barhau, fedrwch chi ddim adfer y tasgau yma.\n"
+"Bydd y weithred hon yn dileu'n barhaol bob tasg sydd wedi'i marcio wedi'i "
+"chwblhau. Os wnewch chi barhau, fedrwch chi ddim adfer y tasgau yma.\n"
 "\n"
 "Dileu'r tasgau yma go iawn?"
 
-#: ../calendar/gui/tasks-control.c:487
-#: ../mail/em-folder-view.c:1126
+#: ../calendar/gui/tasks-control.c:487 ../mail/em-folder-view.c:1126
+#, fuzzy
 msgid "Do not ask me again."
 msgstr "Peidiwch â gofyn eto"
 
-#: ../calendar/gui/tasks-control.c:524
-#: ../calendar/gui/tasks-control.c:540
+#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
 msgid "Print Tasks"
 msgstr "Argraffu Tasgau"
 
@@ -7845,13 +7989,11 @@ msgstr "Diddymwyd"
 msgid "In progress"
 msgstr "Ar waith"
 
-#: ../calendar/gui/tasktypes.xml.h:28
-#: ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
 msgid "is greater than"
 msgstr "yn fwy na"
 
-#: ../calendar/gui/tasktypes.xml.h:29
-#: ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
 msgid "is less than"
 msgstr "yn llai na"
 
@@ -9442,7 +9584,7 @@ msgstr "Pasiffig/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pasiffig/Yap"
 
-#: ../composer/e-composer-autosave.c:444
+#: ../composer/e-composer-autosave.c:445
 msgid "Unable to retrieve message from editor"
 msgstr "Methu cyrchu neges o'r golygydd"
 
@@ -9455,8 +9597,7 @@ msgstr "Neges Di-deitl"
 msgid "Attach a file"
 msgstr "Atodi Ffeil"
 
-#: ../composer/e-composer-actions.c:322
-#: ../mail/mail-signature-editor.c:195
+#: ../composer/e-composer-actions.c:322 ../mail/mail-signature-editor.c:195
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "_Cau"
@@ -9465,22 +9606,16 @@ msgstr "_Cau"
 msgid "Close the current file"
 msgstr "Cau'r ffeil cyfredol"
 
-#: ../composer/e-composer-actions.c:329
-#: ../mail/em-folder-view.c:1337
-#: ../ui/evolution-addressbook.xml.h:58
-#: ../ui/evolution-calendar.xml.h:47
-#: ../ui/evolution-mail-message.xml.h:119
-#: ../ui/evolution-memos.xml.h:20
+#: ../composer/e-composer-actions.c:329 ../mail/em-folder-view.c:1337
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
+#: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "_Argraffu..."
 
-#: ../composer/e-composer-actions.c:336
-#: ../ui/evolution-addressbook.xml.h:27
-#: ../ui/evolution-calendar.xml.h:21
-#: ../ui/evolution-mail-message.xml.h:72
-#: ../ui/evolution-memos.xml.h:12
-#: ../ui/evolution-tasks.xml.h:15
+#: ../composer/e-composer-actions.c:336 ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:72
+#: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "_Rhagolwg Argraffu"
 
@@ -9504,8 +9639,7 @@ msgstr "Cadw fel _Drafft"
 msgid "Save as draft"
 msgstr "Cadw fel drafft"
 
-#: ../composer/e-composer-actions.c:364
-#: ../composer/e-composer-private.c:191
+#: ../composer/e-composer-actions.c:364 ../composer/e-composer-private.c:191
 msgid "S_end"
 msgstr "A_nfon"
 
@@ -9621,8 +9755,9 @@ msgid "Save Draft"
 msgstr "Cadw Drafft"
 
 #: ../composer/e-composer-header.c:120
+#, fuzzy
 msgid "Show"
-msgstr "Dangos"
+msgstr "_Dangos:"
 
 #: ../composer/e-composer-header.c:123
 msgid "Hide"
@@ -9638,19 +9773,20 @@ msgstr "Rhowch y cyfeiriadau fydd yn derbyn copi carbon o'r neges"
 
 #: ../composer/e-composer-header-table.c:46
 #, fuzzy
-msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message"
-msgstr "Rhowch y cyfeiriadau fydd yn derbyn copi carbon o'r neges heb ymddangos yn rhestr derbynwyr y neges."
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message"
+msgstr ""
+"Rhowch y cyfeiriadau fydd yn derbyn copi carbon o'r neges heb ymddangos yn "
+"rhestr derbynwyr y neges."
 
 #: ../composer/e-composer-header-table.c:945
 msgid "Fr_om:"
 msgstr "_Oddi wrth:"
 
-#: ../composer/e-composer-header-table.c:945
-#: ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:923
-#: ../mail/em-mailer-prefs.c:76
-#: ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:296
+#: ../composer/e-composer-header-table.c:945 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:923 ../mail/em-mailer-prefs.c:76
+#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:296
 msgid "From"
 msgstr "Oddi wrth"
 
@@ -9666,8 +9802,7 @@ msgstr "_At:"
 msgid "_Cc:"
 msgstr "_Copi i:"
 
-#: ../composer/e-composer-header-table.c:965
-#: ../mail/em-filter-i18n.h:8
+#: ../composer/e-composer-header-table.c:965 ../mail/em-filter-i18n.h:8
 msgid "CC"
 msgstr "CC"
 
@@ -9675,8 +9810,7 @@ msgstr "CC"
 msgid "_Bcc:"
 msgstr "Copi _dall i:"
 
-#: ../composer/e-composer-header-table.c:971
-#: ../mail/em-filter-i18n.h:6
+#: ../composer/e-composer-header-table.c:971 ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "BCC"
 
@@ -9712,46 +9846,72 @@ msgstr "Cliciwch yma i ddewis plygellau i bostio atynt"
 msgid "Save draft"
 msgstr "Cadw drafft"
 
-#: ../composer/e-msg-composer.c:807
-msgid "Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "Methu llofnodi neges i'w hanfon: Dim tystysgrif llofnodi wedi'i phenodi ar gyfer y cyfrif"
+#: ../composer/e-msg-composer.c:808
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Methu llofnodi neges i'w hanfon: Dim tystysgrif llofnodi wedi'i phenodi ar "
+"gyfer y cyfrif"
 
-#: ../composer/e-msg-composer.c:814
-msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
-msgstr "Methu amgryptio neges i'w hanfon: Dim tystysgrif amgryptio wedi'i phenodi ar gyfer y cyfrif"
+#: ../composer/e-msg-composer.c:815
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Methu amgryptio neges i'w hanfon: Dim tystysgrif amgryptio wedi'i phenodi ar "
+"gyfer y cyfrif"
 
-#: ../composer/e-msg-composer.c:1350
-#: ../composer/e-msg-composer.c:2189
+#: ../composer/e-msg-composer.c:1351 ../composer/e-msg-composer.c:2190
 msgid "Compose Message"
 msgstr "Cyfansoddi'r Neges"
 
-#: ../composer/e-msg-composer.c:3347
-msgid "<b>(The composer contains a non-text message body, which cannot be edited.)</b>"
-msgstr "<b>(Mae'r cyfansoddwr yn cynnwys corff neges nad yw'n destun, na ellir mo'i olygu.)</b>"
+#: ../composer/e-msg-composer.c:3348
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)</"
+"b>"
+msgstr ""
+"<b>(Mae'r cyfansoddwr yn cynnwys corff neges nad yw'n destun, na ellir mo'i "
+"olygu.)</b>"
 
 #: ../composer/mail-composer.error.xml.h:1
-msgid " There are few attachments getting downloaded. Sending the mail will cause the mail to be sent without those pending attachments "
-msgstr "Mae rhai atodiadau'n cael eu llwytho i lawr. Bydd anfon yr e-bost nawr yn ei anfon heb yr atodiadau hynny sydd i ddod"
+msgid ""
+" There are few attachments getting downloaded. Sending the mail will cause "
+"the mail to be sent without those pending attachments "
+msgstr ""
+"Mae rhai atodiadau'n cael eu llwytho i lawr. Bydd anfon yr e-bost nawr yn ei "
+"anfon heb yr atodiadau hynny sydd i ddod"
 
 #: ../composer/mail-composer.error.xml.h:2
 msgid "All accounts have been removed."
 msgstr "Pob cyfrif wedi ei ddileu."
 
 #: ../composer/mail-composer.error.xml.h:3
-msgid "Are you sure you want to discard the message, titled '{0}', you are composing?"
-msgstr "Ydych chi'n siŵr eich bod am waredu'r neges, â'r teitl '{0}', yr ydych yn ei gyfansoddi?"
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr ""
+"Ydych chi'n siŵr eich bod am waredu'r neges, â'r teitl '{0}', yr ydych yn ei "
+"gyfansoddi?"
 
 #: ../composer/mail-composer.error.xml.h:4
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
-msgstr "Oherwydd &quot;{0}&quot;, mae'n bosib fydd rhaid i chi ddewis opsiynau e-bost gwahanol."
+msgstr ""
+"Oherwydd &quot;{0}&quot;, mae'n bosib fydd rhaid i chi ddewis opsiynau e-"
+"bost gwahanol."
 
 #: ../composer/mail-composer.error.xml.h:5
 msgid "Because &quot;{1}&quot;."
 msgstr "Oherwydd &quot;{1}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:6
-msgid "Closing this composer window will discard the message permanently, unless you choose to save the message in your Drafts folder. This will allow you to continue the message at a later date."
-msgstr "Bydd cau'r ffenestr gyfansoddi yma yn gwaredu'r neges am byth, oni bai eich bod yn dewis cadw'r neges yn eich plygell Drafftiau. Bydd gwneud hynny'n gadael i chi barhau'r neges yn hwyrach."
+msgid ""
+"Closing this composer window will discard the message permanently, unless "
+"you choose to save the message in your Drafts folder. This will allow you to "
+"continue the message at a later date."
+msgstr ""
+"Bydd cau'r ffenestr gyfansoddi yma yn gwaredu'r neges am byth, oni bai eich "
+"bod yn dewis cadw'r neges yn eich plygell Drafftiau. Bydd gwneud hynny'n "
+"gadael i chi barhau'r neges yn hwyrach."
 
 #: ../composer/mail-composer.error.xml.h:7
 msgid "Could not create composer window."
@@ -9790,13 +9950,22 @@ msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "Gwall wrth gadw i ffeil awto-gadw o achos &quot;{1}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:16
-msgid "Evolution quit unexpectedly while you were composing a new message. Recovering the message will allow you to continue where you left off."
-msgstr "Gwnaeth Evolution derfynu'n annisgwyl wrth i chi gyfansoddi neges newydd. Bydd adfer y neges yn gadael i chi barhau'r neges yn y man wnaethoch ei adael."
+msgid ""
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
+msgstr ""
+"Gwnaeth Evolution derfynu'n annisgwyl wrth i chi gyfansoddi neges newydd. "
+"Bydd adfer y neges yn gadael i chi barhau'r neges yn y man wnaethoch ei "
+"adael."
 
 #: ../composer/mail-composer.error.xml.h:17
 #, fuzzy
-msgid "Send options available only for Novell GroupWise and Microsoft Exchange accounts."
-msgstr "Opsiynau anfon sydd ond ar gael i gyfrifon Novell Groupwise a Microsoft Exchange."
+msgid ""
+"Send options available only for Novell GroupWise and Microsoft Exchange "
+"accounts."
+msgstr ""
+"Opsiynau anfon sydd ond ar gael i gyfrifon Novell Groupwise a Microsoft "
+"Exchange."
 
 #: ../composer/mail-composer.error.xml.h:18
 msgid "Send options not available."
@@ -9804,17 +9973,23 @@ msgstr "Opsiynau anfon ddim ar gael."
 
 #: ../composer/mail-composer.error.xml.h:19
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
-msgstr "Nid yw'r ffeil `{0}' yn un gyffredin ac ni ellir ei hanfon o fewn neges."
+msgstr ""
+"Nid yw'r ffeil `{0}' yn un gyffredin ac ni ellir ei hanfon o fewn neges."
 
 #: ../composer/mail-composer.error.xml.h:20
-msgid "To attach the contents of this directory, either attach the files in this directory individually, or create an archive of the directory and attach it."
-msgstr "I atodi cynnwys y blygell, dylech naill ai atodi bob ffeil yn y blygell yn unigol, neu greu archif o'r blygell ac atodi'r archif."
+msgid ""
+"To attach the contents of this directory, either attach the files in this "
+"directory individually, or create an archive of the directory and attach it."
+msgstr ""
+"I atodi cynnwys y blygell, dylech naill ai atodi bob ffeil yn y blygell yn "
+"unigol, neu greu archif o'r blygell ac atodi'r archif."
 
 #: ../composer/mail-composer.error.xml.h:21
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
-"Please make sure that you have the correct version of gtkhtml and libgtkhtml installed."
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
 msgstr ""
 "Methu gweithredu'r rheolwr golygydd HTML.\n"
 "\n"
@@ -9860,8 +10035,7 @@ msgstr "_Cadw Drafft"
 msgid "Evolution Mail and Calendar"
 msgstr "Ebost a Chalendr Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2
-#: ../shell/e-shell-window-commands.c:947
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:947
 msgid "Groupware Suite"
 msgstr "Cyfres Meddalwedd Grŵp"
 
@@ -9879,55 +10053,45 @@ msgid "calendar information"
 msgstr "gwybodaeth calendr"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:188
-#: ../plugins/itip-formatter/itip-view.c:191
-#: ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:304
+#: ../e-util/e-datetime-format.c:193 ../plugins/itip-formatter/itip-view.c:191
+#: ../ui/evolution-calendar.xml.h:34 ../widgets/misc/e-cell-date-edit.c:304
 msgid "Today"
 msgstr "Heddiw"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:200
-#: ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "Yfory"
 
-#: ../e-util/e-datetime-format.c:202
-#, fuzzy
+#: ../e-util/e-datetime-format.c:204
 msgid "Yesterday"
-msgstr "Ddoe %l:%M %p"
+msgstr "Ddoe"
 
-#: ../e-util/e-datetime-format.c:205
+#: ../e-util/e-datetime-format.c:207
 #, c-format
 msgid "%d days from now"
-msgstr ""
+msgstr "%d diwrnod yn y difodol"
 
-#: ../e-util/e-datetime-format.c:207
-#, fuzzy, c-format
+#: ../e-util/e-datetime-format.c:209
+#, c-format
 msgid "%d days ago"
-msgstr "1 dydd yn ôl"
+msgstr "%d diwrnod yn ôl"
 
-#: ../e-util/e-datetime-format.c:281
-#: ../e-util/e-datetime-format.c:291
-#: ../e-util/e-datetime-format.c:300
+#: ../e-util/e-datetime-format.c:283 ../e-util/e-datetime-format.c:293
+#: ../e-util/e-datetime-format.c:302
 #, fuzzy
 msgid "Use locale default"
 msgstr "Defnyddio'r _Rhagosodiad"
 
-#: ../e-util/e-datetime-format.c:495
-#, fuzzy
+#: ../e-util/e-datetime-format.c:496
 msgid "Format:"
-msgstr "Fformat"
+msgstr "Fformat:"
 
-#: ../e-util/e-error.c:78
-#: ../e-util/e-error.c:79
-#: ../e-util/e-error.c:121
+#: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
 msgid "Evolution Error"
 msgstr "Gwall Evolution"
 
-#: ../e-util/e-error.c:80
-#: ../e-util/e-error.c:81
-#: ../e-util/e-error.c:119
+#: ../e-util/e-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119
 msgid "Evolution Warning"
 msgstr "Rhybudd Evolution"
 
@@ -9951,8 +10115,9 @@ msgid "Component"
 msgstr "Cwblhau"
 
 #: ../e-util/e-logger.c:162
+#, fuzzy
 msgid "Name of the component being logged"
-msgstr ""
+msgstr "Enw golwg newydd:"
 
 #: ../e-util/e-non-intrusive-error-dialog.c:191
 #, fuzzy
@@ -9983,15 +10148,13 @@ msgstr ""
 msgid "Time"
 msgstr "Amser"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:292
-#: ../mail/message-list.c:2527
+#: ../e-util/e-non-intrusive-error-dialog.c:292 ../mail/message-list.c:2527
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Negeseuon"
 
 #: ../e-util/e-non-intrusive-error-dialog.c:301
-#: ../ui/evolution-mail-messagedisplay.xml.h:2
-#: ../ui/evolution.xml.h:4
+#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "_Cau'r ffenestr hon"
 
@@ -10015,10 +10178,8 @@ msgstr "Dadnamu"
 msgid "Error, Warnings and Debug messages"
 msgstr "Negeseuon Gwallau, Rhybyddion a Dadnamu"
 
-#: ../e-util/e-plugin.c:308
-#: ../filter/rule-editor.c:798
-#: ../mail/em-account-prefs.c:477
-#: ../mail/em-composer-prefs.c:957
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:798
+#: ../mail/em-account-prefs.c:477 ../mail/em-composer-prefs.c:957
 #: ../plugins/plugin-manager/plugin-manager.c:355
 #: ../plugins/publish-calendar/publish-calendar.c:718
 msgid "Enabled"
@@ -10038,11 +10199,16 @@ msgid "The printing system reported the following details about the error:"
 msgstr "Rhoddodd y system argraffu'r manylion canlynol am y gwall:"
 
 #: ../e-util/e-print.c:173
-msgid "The printing system did not report any additional details about the error."
-msgstr "Wnaeth y system argraffu ddim adrodd unrhyw fanylion ychwanegol am y gwall."
+msgid ""
+"The printing system did not report any additional details about the error."
+msgstr ""
+"Wnaeth y system argraffu ddim adrodd unrhyw fanylion ychwanegol am y gwall."
+
+#: ../e-util/e-signature.c:695
+msgid "Autogenerated"
+msgstr "Awtogynhyrchwyd"
 
-#: ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:19
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
 msgid "Because \"{1}\"."
 msgstr "Oherwydd \"{1}\"."
 
@@ -10066,8 +10232,7 @@ msgstr "Ffeil \"{0}\" yn bodoli."
 msgid "Overwrite file?"
 msgstr "Trosysgrifo ffeil?"
 
-#: ../e-util/e-system.error.xml.h:7
-#: ../mail/mail.error.xml.h:141
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
 msgid "_Overwrite"
 msgstr "_Trosysgrifo"
 
@@ -10105,8 +10270,9 @@ msgid "_Later"
 msgstr "_Hwyrach"
 
 #: ../e-util/e-util-labels.c:320
+#, fuzzy
 msgid "Label _Name:"
-msgstr "_Enw Label:"
+msgstr "_Enw label:"
 
 #: ../e-util/e-util-labels.c:343
 msgid "Edit Label"
@@ -10121,7 +10287,9 @@ msgid "Label name cannot be empty."
 msgstr "Ni all enw label bod yn wag."
 
 #: ../e-util/e-util-labels.c:367
-msgid "A label having the same tag already exists on the server. Please rename your label."
+msgid ""
+"A label having the same tag already exists on the server. Please rename your "
+"label."
 msgstr ""
 
 #: ../e-util/gconf-bridge.c:1222
@@ -10249,8 +10417,7 @@ msgstr[2] "%d mlynedd i'r dyfodol"
 msgid "<click here to select a date>"
 msgstr "<cliciwch yma i ddewis dyddiad>"
 
-#: ../filter/filter-datespec.c:297
-#: ../filter/filter-datespec.c:308
+#: ../filter/filter-datespec.c:297 ../filter/filter-datespec.c:308
 #: ../filter/filter-datespec.c:319
 msgid "now"
 msgstr "nawr"
@@ -10284,7 +10451,7 @@ msgstr "Canfod eitemau sy'n cytuno â'r meini prawf canlynol"
 
 #: ../filter/filter-rule.c:916
 msgid "A_dd Condition"
-msgstr ""
+msgstr "Y_chwanegu amod"
 
 #: ../filter/filter-rule.c:922
 msgid "If all conditions are met"
@@ -10318,14 +10485,12 @@ msgstr "Dim ymateb na rhiant"
 msgid "I_nclude threads"
 msgstr "_Cynnwys edafedd"
 
-#: ../filter/filter-rule.c:1038
-#: ../filter/filter.glade.h:3
+#: ../filter/filter-rule.c:1038 ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "Dod I Mewn"
 
-#: ../filter/filter-rule.c:1038
-#: ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1038 ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "Mynd Allan"
 
@@ -10349,8 +10514,7 @@ msgstr "Dyddiad ar goll."
 msgid "Missing file name."
 msgstr "Enw ffeil ar goll."
 
-#: ../filter/filter.error.xml.h:6
-#: ../mail/mail.error.xml.h:75
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "Enw ar goll."
 
@@ -10460,12 +10624,16 @@ msgid "Composer Preferences"
 msgstr "Hoffterau Cyfansoddwr"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configure mail preferences, including security and message display, here"
-msgstr "Cyfluniwch eich hoffterau e-bost, gan gynnwys diogelwch a dangos negeseuon, fan hyn"
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Cyfluniwch eich hoffterau e-bost, gan gynnwys diogelwch a dangos negeseuon, "
+"fan hyn"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Cyfluniwch y gwirydd sillafu, llofnodion, a'r cyfansoddwr negeseuon fan hyn"
+msgstr ""
+"Cyfluniwch y gwirydd sillafu, llofnodion, a'r cyfansoddwr negeseuon fan hyn"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure your email accounts here"
@@ -10506,12 +10674,9 @@ msgid "Evolution Network configuration control"
 msgstr "Rheolaeth gosodiadau Calendr Evolution"
 
 # 48x48/emblems/emblem-mail.icon.in.h:1
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/em-folder-view.c:602
-#: ../mail/importers/elm-importer.c:327
-#: ../mail/importers/pine-importer.c:378
-#: ../mail/mail-component.c:620
-#: ../mail/mail-component.c:621
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:602
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
+#: ../mail/mail-component.c:620 ../mail/mail-component.c:621
 #: ../mail/mail-component.c:793
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
@@ -10523,7 +10688,7 @@ msgid "Mail Accounts"
 msgstr "Cyfrifon Ebost"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:108
 msgid "Mail Preferences"
 msgstr "Hoffterau Ebost"
 
@@ -10536,15 +10701,12 @@ msgstr "Hoffterau Rhwydwaith"
 msgid "_Mail"
 msgstr "_Ebost"
 
-#: ../mail/e-attachment-handler-mail.c:133
-#: ../mail/em-folder-view.c:1331
-#: ../mail/em-popup.c:501
-#: ../ui/evolution-mail-message.xml.h:105
+#: ../mail/e-attachment-handler-mail.c:133 ../mail/em-folder-view.c:1331
+#: ../mail/em-popup.c:501 ../ui/evolution-mail-message.xml.h:105
 msgid "_Forward"
 msgstr "_Ymlaen"
 
-#: ../mail/e-attachment-handler-mail.c:147
-#: ../mail/em-folder-view.c:1329
+#: ../mail/e-attachment-handler-mail.c:147 ../mail/em-folder-view.c:1329
 #: ../ui/evolution-mail-message.xml.h:123
 msgid "_Reply to Sender"
 msgstr "_Ateb i'r Danfonwr"
@@ -10555,10 +10717,8 @@ msgstr "_Ateb i'r Danfonwr"
 msgid "%d attached messages"
 msgstr "%d neges wedi'i hatodi"
 
-#: ../mail/e-mail-attachment-bar.c:122
-#: ../mail/em-format-html-display.c:1642
-#: ../mail/message-list.etspec.h:1
-#: ../widgets/misc/e-attachment-paned.c:147
+#: ../mail/e-mail-attachment-bar.c:122 ../mail/em-format-html-display.c:1642
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:147
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Atodiad"
@@ -10567,9 +10727,8 @@ msgstr[2] "Atodiadau"
 
 #: ../mail/e-mail-attachment-bar.c:615
 #: ../widgets/misc/e-attachment-paned.c:607
-#, fuzzy
 msgid "Icon View"
-msgstr "Golwg Mis"
+msgstr "Golwg Eicon"
 
 #: ../mail/e-mail-attachment-bar.c:616
 #: ../widgets/misc/e-attachment-paned.c:608
@@ -10592,9 +10751,8 @@ msgid "Fin_d:"
 msgstr "_Canfod:"
 
 #: ../mail/e-mail-search-bar.c:540
-#, fuzzy
 msgid "Clear the search"
-msgstr "Chwilio o hyd"
+msgstr "Clirio'r chwiliad"
 
 #: ../mail/e-mail-search-bar.c:559
 msgid "_Previous"
@@ -10662,8 +10820,7 @@ msgstr ""
 "ar gyfer %s a ddangosir isod\n"
 "a thicio'r blwch i'w dderbyn\n"
 
-#: ../mail/em-account-editor.c:487
-#: ../mail/em-filter-folder-element.c:258
+#: ../mail/em-account-editor.c:487 ../mail/em-filter-folder-element.c:258
 #: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Dewiswch Blygell"
@@ -10680,60 +10837,51 @@ msgstr "Bob tro"
 msgid "Ask for each message"
 msgstr "Gofyn am bob neges"
 
-#: ../mail/em-account-editor.c:1877
-#: ../mail/mail-config.glade.h:101
+#: ../mail/em-account-editor.c:1877 ../mail/mail-config.glade.h:100
 msgid "Identity"
 msgstr "Hunaniaeth"
 
-#: ../mail/em-account-editor.c:1928
-#: ../mail/mail-config.glade.h:128
+#: ../mail/em-account-editor.c:1928 ../mail/mail-config.glade.h:127
 msgid "Receiving Email"
 msgstr "Derbyn Ebost"
 
-#: ../mail/em-account-editor.c:2200
+#: ../mail/em-account-editor.c:2216
 msgid "Check for _new messages every"
 msgstr "Gwirio am neges ebost _newydd pob"
 
-#: ../mail/em-account-editor.c:2208
+#: ../mail/em-account-editor.c:2224
 msgid "minu_tes"
 msgstr "munu_dau"
 
-#: ../mail/em-account-editor.c:2398
-#: ../mail/mail-config.glade.h:139
+#: ../mail/em-account-editor.c:2420 ../mail/mail-config.glade.h:138
 msgid "Sending Email"
 msgstr "Anfon E-bost"
 
-#: ../mail/em-account-editor.c:2457
-#: ../mail/mail-config.glade.h:74
+#: ../mail/em-account-editor.c:2479 ../mail/mail-config.glade.h:73
 msgid "Defaults"
 msgstr "Rhagosodiadau"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2523
-#: ../mail/mail-config.glade.h:134
+#: ../mail/em-account-editor.c:2545 ../mail/mail-config.glade.h:133
 #: ../plugins/exchange-operations/exchange-account-setup.c:329
 msgid "Security"
 msgstr "Diogelwch"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2560
-#: ../mail/em-account-editor.c:2655
+#: ../mail/em-account-editor.c:2582 ../mail/em-account-editor.c:2677
 msgid "Receiving Options"
 msgstr "Gosodiadau Derbyn"
 
-#: ../mail/em-account-editor.c:2561
-#: ../mail/em-account-editor.c:2656
+#: ../mail/em-account-editor.c:2583 ../mail/em-account-editor.c:2678
 msgid "Checking for New Messages"
 msgstr "Chwilio am Negeseuon Newydd"
 
-#: ../mail/em-account-editor.c:3123
-#: ../mail/mail-config.glade.h:35
+#: ../mail/em-account-editor.c:3145 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Golygydd Cyfrifon"
 
-#: ../mail/em-account-editor.c:3123
-#: ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:3145 ../mail/mail-config.glade.h:89
 msgid "Evolution Account Assistant"
 msgstr "Cynorthwyydd Cyfrifon Evolution"
 
@@ -10743,17 +10891,16 @@ msgid "[Default]"
 msgstr "[Rhagosodedig]"
 
 #: ../mail/em-account-prefs.c:483
+#, fuzzy
 msgid "Account name"
-msgstr "Enw'r cyfrif"
+msgstr "_Enw cyfrif:"
 
 #: ../mail/em-account-prefs.c:485
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../mail/em-composer-prefs.c:318
-#: ../mail/em-composer-prefs.c:452
-#: ../mail/mail-config.c:1160
-#: ../mail/mail-signature-editor.c:481
+#: ../mail/em-composer-prefs.c:318 ../mail/em-composer-prefs.c:452
+#: ../mail/mail-config.c:1160 ../mail/mail-signature-editor.c:481
 msgid "Unnamed"
 msgstr "Dienw"
 
@@ -10762,6 +10909,7 @@ msgid "Language(s)"
 msgstr "Iaith (ieithoedd)"
 
 #: ../mail/em-composer-prefs.c:994
+#, fuzzy
 msgid "Add signature script"
 msgstr "Ychwanegu sgript llofnod"
 
@@ -10769,13 +10917,13 @@ msgstr "Ychwanegu sgript llofnod"
 msgid "Signature(s)"
 msgstr "Llofnod(ion)"
 
-#: ../mail/em-composer-utils.c:1132
-#: ../mail/em-format-quote.c:415
+#: ../mail/em-composer-utils.c:1132 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Neges Yrrwyd Ymlaen --------"
 
 #: ../mail/em-composer-utils.c:1585
-msgid "No destination address provided, forward of the message has been cancelled."
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
 msgstr ""
 
 #: ../mail/em-composer-utils.c:1591
@@ -10790,8 +10938,12 @@ msgstr "danfonwr anhysbys"
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
 #: ../mail/em-composer-utils.c:2105
-msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
-msgstr "Ar ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} am ${24Hour}:${Minute} ${TimeZone}, ysgrifennodd ${Sender}:"
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+"Ar ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} am ${24Hour}:${Minute} "
+"${TimeZone}, ysgrifennodd ${Sender}:"
 
 #: ../mail/em-composer-utils.c:2248
 msgid "-----Original Message-----"
@@ -10819,9 +10971,8 @@ msgid "Beep"
 msgstr "Bîp"
 
 #: ../mail/em-filter-i18n.h:9
-#, fuzzy
 msgid "Completed On"
-msgstr "Cyflawnwyd"
+msgstr "Cyflawnwyd Ar"
 
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
@@ -10837,10 +10988,8 @@ msgstr "Dyddiad anfon"
 
 #: ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:765
-#: ../ui/evolution-addressbook.xml.h:15
-#: ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:25
-#: ../ui/evolution-memos.xml.h:6
+#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Dileu"
@@ -10893,8 +11042,7 @@ msgstr "Dilynol"
 msgid "Forward to"
 msgstr "Gyrru ymlaen at"
 
-#: ../mail/em-filter-i18n.h:30
-#: ../mail/em-migrate.c:958
+#: ../mail/em-filter-i18n.h:30 ../mail/em-migrate.c:958
 msgid "Important"
 msgstr "Pwysig"
 
@@ -10922,8 +11070,7 @@ msgstr "heb ei osod"
 msgid "is set"
 msgstr "wedi'i osod"
 
-#: ../mail/em-filter-i18n.h:41
-#: ../mail/mail-config.glade.h:103
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.glade.h:102
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Sothach"
@@ -10977,13 +11124,11 @@ msgid "Play Sound"
 msgstr "Chwarae Sain"
 
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:54
-#: ../mail/message-tag-followup.c:61
+#: ../mail/em-filter-i18n.h:54 ../mail/message-tag-followup.c:61
 msgid "Read"
 msgstr "Darllen"
 
-#: ../mail/em-filter-i18n.h:55
-#: ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "Derbynwyr"
 
@@ -11011,13 +11156,11 @@ msgstr "yn dychwelyd 'yn llai na'"
 msgid "Run Program"
 msgstr "Gweithredu Rhaglen"
 
-#: ../mail/em-filter-i18n.h:62
-#: ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "Sgôr"
 
-#: ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "Danfonwr"
 
@@ -11058,12 +11201,9 @@ msgstr "Dechrau gyda"
 msgid "Stop Processing"
 msgstr "Atal Prosesu"
 
-#: ../mail/em-filter-i18n.h:74
-#: ../mail/em-format-quote.c:341
-#: ../mail/em-format.c:928
-#: ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:18
-#: ../mail/message-tag-followup.c:300
+#: ../mail/em-filter-i18n.h:74 ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:928 ../mail/em-mailer-prefs.c:81
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:300
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1112
 msgid "Subject"
@@ -11080,9 +11220,8 @@ msgid "Then"
 msgstr "Yna Wrth"
 
 #: ../mail/em-filter-rule.c:549
-#, fuzzy
 msgid "Add Ac_tion"
-msgstr "Ychwanegu eithriad"
+msgstr "Ychwanegu Gwei_thred"
 
 #: ../mail/em-folder-browser.c:194
 msgid "C_reate Search Folder From Search..."
@@ -11160,10 +11299,8 @@ msgid "Quota usage"
 msgstr "Cyfanswm neges:"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:359
-#: ../mail/em-folder-tree-model.c:517
-#: ../mail/em-folder-tree.c:2602
-#: ../mail/mail-component.c:168
+#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:517
+#: ../mail/em-folder-tree.c:2602 ../mail/mail-component.c:168
 #: ../mail/mail-component.c:608
 #: ../plugins/exchange-operations/exchange-delegates-user.c:75
 #: ../plugins/exchange-operations/exchange-folder.c:593
@@ -11188,43 +11325,35 @@ msgid "Folder _name:"
 msgstr "Enw'r _plygell:"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:195
-#: ../mail/em-folder-tree-model.c:197
-#: ../mail/mail-vfolder.c:960
-#: ../mail/mail-vfolder.c:1028
+#: ../mail/em-folder-tree-model.c:195 ../mail/em-folder-tree-model.c:197
+#: ../mail/mail-vfolder.c:960 ../mail/mail-vfolder.c:1028
 msgid "Search Folders"
 msgstr "Plygellau Chwilio"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:201
-#: ../mail/em-folder-tree-model.c:203
+#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
 msgid "UNMATCHED"
 msgstr "HEB GYDWEDDU"
 
-#: ../mail/em-folder-tree-model.c:510
-#: ../mail/mail-component.c:169
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:169
 msgid "Drafts"
 msgstr "Drafftiau"
 
-#: ../mail/em-folder-tree-model.c:513
-#: ../mail/mail-component.c:172
+#: ../mail/em-folder-tree-model.c:513 ../mail/mail-component.c:172
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 #, fuzzy
 msgid "Templates"
 msgstr "Templed:"
 
-#: ../mail/em-folder-tree-model.c:520
-#: ../mail/mail-component.c:170
+#: ../mail/em-folder-tree-model.c:520 ../mail/mail-component.c:170
 msgid "Outbox"
 msgstr "Blwch Allan"
 
-#: ../mail/em-folder-tree-model.c:522
-#: ../mail/mail-component.c:171
+#: ../mail/em-folder-tree-model.c:522 ../mail/mail-component.c:171
 msgid "Sent"
 msgstr "Wedi Anfon"
 
-#: ../mail/em-folder-tree-model.c:580
-#: ../mail/em-folder-tree-model.c:889
+#: ../mail/em-folder-tree-model.c:580 ../mail/em-folder-tree-model.c:889
 msgid "Loading..."
 msgstr "Yn Llwytho..."
 
@@ -11263,14 +11392,12 @@ msgstr "Symud plygell %s"
 msgid "Copying folder %s"
 msgstr "Copïo plygell %s"
 
-#: ../mail/em-folder-tree.c:895
-#: ../mail/message-list.c:2018
+#: ../mail/em-folder-tree.c:895 ../mail/message-list.c:2018
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Symud ffeiliau i mewn i'r blygell %s"
 
-#: ../mail/em-folder-tree.c:897
-#: ../mail/message-list.c:2020
+#: ../mail/em-folder-tree.c:897 ../mail/message-list.c:2020
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copïo ffeiliau i mewn i'r blygell %s"
@@ -11279,30 +11406,24 @@ msgstr "Copïo ffeiliau i mewn i'r blygell %s"
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Methu gollwng neges(euon) i'r storfa level uchaf"
 
-#: ../mail/em-folder-tree.c:989
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../mail/em-folder-tree.c:989 ../ui/evolution-mail-message.xml.h:100
 msgid "_Copy to Folder"
 msgstr "_Copïo i Blygell"
 
-#: ../mail/em-folder-tree.c:990
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../mail/em-folder-tree.c:990 ../ui/evolution-mail-message.xml.h:113
 msgid "_Move to Folder"
 msgstr "_Symud i Blygell"
 
-#: ../mail/em-folder-tree.c:992
-#: ../mail/em-folder-utils.c:362
-#: ../mail/em-folder-view.c:1186
-#: ../mail/message-list.c:2110
+#: ../mail/em-folder-tree.c:992 ../mail/em-folder-utils.c:362
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2110
 msgid "_Move"
 msgstr "_Symud"
 
-#: ../mail/em-folder-tree.c:994
-#: ../mail/message-list.c:2112
+#: ../mail/em-folder-tree.c:994 ../mail/message-list.c:2112
 msgid "Cancel _Drag"
 msgstr "Diddymu _Llusgo"
 
-#: ../mail/em-folder-tree.c:1702
-#: ../mail/mail-ops.c:1063
+#: ../mail/em-folder-tree.c:1702 ../mail/mail-ops.c:1063
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Sganio plygellau o fewn \"%s\""
@@ -11320,8 +11441,7 @@ msgstr "_Plygell Newydd..."
 msgid "_Move..."
 msgstr "_Symud..."
 
-#: ../mail/em-folder-tree.c:2123
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../mail/em-folder-tree.c:2123 ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh"
 msgstr "_Adnewyddu"
 
@@ -11329,8 +11449,7 @@ msgstr "_Adnewyddu"
 msgid "Fl_ush Outbox"
 msgstr "_Gwacáu'r Blwch Allan"
 
-#: ../mail/em-folder-tree.c:2129
-#: ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2129 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "_Taflu'r Sbwriel"
 
@@ -11344,16 +11463,14 @@ msgstr "Creu _Plygell Chwilio"
 msgid "Copying `%s' to `%s'"
 msgstr "Copïo `%s' i `%s'"
 
-#: ../mail/em-folder-utils.c:362
-#: ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1186
 #: ../mail/em-folder-view.c:1201
 #: ../mail/importers/evolution-mbox-importer.c:82
 #: ../plugins/pst-import/pst-importer.c:302
 msgid "Select folder"
 msgstr "Dewis plygell"
 
-#: ../mail/em-folder-utils.c:362
-#: ../mail/em-folder-view.c:1201
+#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "C_opïo"
 
@@ -11375,19 +11492,16 @@ msgstr "Creu plygell"
 msgid "Specify where to create the folder:"
 msgstr "Penodwch ble i greu'r blygell:"
 
-#: ../mail/em-folder-view.c:1089
-#: ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1089 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Methwyd Dileu E-bost"
 
-#: ../mail/em-folder-view.c:1090
-#: ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Does gennych chi mo'r caniatâd i ddileu'r e-bost hwn."
 
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1335
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:102
 msgid "_Edit as New Message..."
 msgstr "_Golygu fel Neges Newydd..."
 
@@ -11416,8 +11530,9 @@ msgid "Mark as _Important"
 msgstr "Marcio'n _Bwysig"
 
 #: ../mail/em-folder-view.c:1349
+#, fuzzy
 msgid "Mark as Un_important"
-msgstr "Marcio _Ddim yn Bwysig"
+msgstr "Marcio'n Ddi_m yn Bwysig"
 
 #: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
@@ -11437,8 +11552,7 @@ msgstr "_Label"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1355
-#: ../widgets/misc/e-dateedit.c:469
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:469
 msgid "_None"
 msgstr "_Dim"
 
@@ -11477,7 +11591,7 @@ msgstr "Plygell Chwilio ar y _Derbynwyr"
 #: ../mail/em-folder-view.c:1371
 #, fuzzy
 msgid "Search Folder based on Mailing _List"
-msgstr "Plygell Chwilio ar y _Rhestr E-bostio"
+msgstr "Plygell Chwilio ar sail _Rhestr E-bostio..."
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
 #: ../mail/em-folder-view.c:1376
@@ -11503,11 +11617,10 @@ msgstr "Hidlydd ar y _Rhestr E-bostio"
 #. default charset used in mail view
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/em-folder-view.c:2232
-#: ../mail/em-folder-view.c:2275
-#: ../plugins/google-account-setup/google-source.c:303
-#: ../plugins/google-account-setup/google-source.c:593
-#: ../plugins/google-account-setup/google-source.c:764
+#: ../mail/em-folder-view.c:2232 ../mail/em-folder-view.c:2275
+#: ../plugins/google-account-setup/google-source.c:304
+#: ../plugins/google-account-setup/google-source.c:613
+#: ../plugins/google-account-setup/google-source.c:784
 msgid "Default"
 msgstr "Rhagosodiad"
 
@@ -11516,16 +11629,19 @@ msgid "Unable to retrieve message"
 msgstr "Methu nôl y neges"
 
 #: ../mail/em-folder-view.c:2696
+#, fuzzy
 msgid "Create _Search Folder"
 msgstr "Creu _Plygell Chwilio"
 
 #: ../mail/em-folder-view.c:2697
+#, fuzzy
 msgid "_From this Address"
-msgstr "_O'r cyfeiriad hwn"
+msgstr "_O'r Cyfeiriad Hwn"
 
 #: ../mail/em-folder-view.c:2698
+#, fuzzy
 msgid "_To this Address"
-msgstr "_I'r cyfeiriad hwn"
+msgstr "_I'r Cyfeiriad Hwn"
 
 #: ../mail/em-folder-view.c:3191
 #, c-format
@@ -11541,90 +11657,118 @@ msgstr "Cliciwch i alw %s"
 msgid "Click to hide/unhide addresses"
 msgstr "Cliciwch i ddangos/cuddio cyfeiriadau"
 
-#: ../mail/em-format-html-display.c:560
-#: ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:560 ../mail/em-format-html.c:654
 msgid "Unsigned"
 msgstr "Di-lofnod"
 
 #: ../mail/em-format-html-display.c:560
-msgid "This message is not signed. There is no guarantee that this message is authentic."
-msgstr "Nid yw'r neges wedi ei llofnodi. Does dim gwarant fod y neges hon yn ddilys."
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr ""
+"Nid yw'r neges wedi ei llofnodi. Does dim gwarant fod y neges hon yn ddilys."
 
-#: ../mail/em-format-html-display.c:561
-#: ../mail/em-format-html.c:655
+#: ../mail/em-format-html-display.c:561 ../mail/em-format-html.c:655
 msgid "Valid signature"
 msgstr "Llofnod dilys"
 
 #: ../mail/em-format-html-display.c:561
-msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
-msgstr "Mae'r neges hon wedi ei llofnodi ac yn ddilys, sy'n golygu ei bod hi'n ddigon tebyg fod y neges yn un dilys."
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
+"Mae'r neges hon wedi ei llofnodi ac yn ddilys, sy'n golygu ei bod hi'n "
+"ddigon tebyg fod y neges yn un dilys."
 
-#: ../mail/em-format-html-display.c:562
-#: ../mail/em-format-html.c:656
+#: ../mail/em-format-html-display.c:562 ../mail/em-format-html.c:656
 msgid "Invalid signature"
 msgstr "Llofnod annilys"
 
 #: ../mail/em-format-html-display.c:562
-msgid "The signature of this message cannot be verified, it may have been altered in transit."
-msgstr "Methu dilysu llofnod y neges hon: fe all fod wedi ei newid yn ystod ei thaith."
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+"Methu dilysu llofnod y neges hon: fe all fod wedi ei newid yn ystod ei "
+"thaith."
 
-#: ../mail/em-format-html-display.c:563
-#: ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:563 ../mail/em-format-html.c:657
 msgid "Valid signature, but cannot verify sender"
 msgstr "Llofnod dilys, ond yn methu dilysu'r anfonwr"
 
 #: ../mail/em-format-html-display.c:563
-msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
-msgstr "Mae'r neges wedi ei llofnodi â llofnod dilys, ond methwyd dilysu anfonwr y neges."
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+"Mae'r neges wedi ei llofnodi â llofnod dilys, ond methwyd dilysu anfonwr y "
+"neges."
 
-#: ../mail/em-format-html-display.c:564
-#: ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:564 ../mail/em-format-html.c:658
 msgid "Signature exists, but need public key"
 msgstr "Llofnod yn bodoli, ond angen allwedd cyhoeddus"
 
 #: ../mail/em-format-html-display.c:564
-#, fuzzy
-msgid "This message is signed with a signature, but there is no corresponding public key."
-msgstr "Mae'r neges wedi ei llofnodi â llofnod dilys, ond methwyd dilysu anfonwr y neges."
+msgid ""
+"This message is signed with a signature, but there is no corresponding "
+"public key."
+msgstr ""
+"Mae'r neges wedi ei llofnodi â llofnod, ond does dim allwedd cyhoeddus "
+"cyfatebol."
 
-#: ../mail/em-format-html-display.c:571
-#: ../mail/em-format-html.c:664
+#: ../mail/em-format-html-display.c:571 ../mail/em-format-html.c:664
 msgid "Unencrypted"
 msgstr "Heb amgryptio"
 
 #: ../mail/em-format-html-display.c:571
-msgid "This message is not encrypted. Its content may be viewed in transit across the Internet."
-msgstr "Nid yw'r neges hon wedi ei hamgryptio. Gellir darllen ei chynnwys wrth iddi deithio ar draws y Rhyngrwyd."
+msgid ""
+"This message is not encrypted. Its content may be viewed in transit across "
+"the Internet."
+msgstr ""
+"Nid yw'r neges hon wedi ei hamgryptio. Gellir darllen ei chynnwys wrth iddi "
+"deithio ar draws y Rhyngrwyd."
 
-#: ../mail/em-format-html-display.c:572
-#: ../mail/em-format-html.c:665
+#: ../mail/em-format-html-display.c:572 ../mail/em-format-html.c:665
 msgid "Encrypted, weak"
 msgstr "Wedi amgryptio, yn wan"
 
 #: ../mail/em-format-html-display.c:572
-msgid "This message is encrypted, but with a weak encryption algorithm. It would be difficult, but not impossible for an outsider to view the content of this message in a practical amount of time."
-msgstr "Mae'r neges hon wedi ei hamgryptio, ond gydag algorithm amgryptio gwan.  Fe fyddai hi'n anodd, ond nid yn amhosib, i rywun o'r tu allan weld cynnwys y neges hon ymhen cyfnod ymarferol o amser."
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm. It would be "
+"difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+"Mae'r neges hon wedi ei hamgryptio, ond gydag algorithm amgryptio gwan.  Fe "
+"fyddai hi'n anodd, ond nid yn amhosib, i rywun o'r tu allan weld cynnwys y "
+"neges hon ymhen cyfnod ymarferol o amser."
 
-#: ../mail/em-format-html-display.c:573
-#: ../mail/em-format-html.c:666
+#: ../mail/em-format-html-display.c:573 ../mail/em-format-html.c:666
 msgid "Encrypted"
 msgstr "Wedi amgryptio"
 
 #: ../mail/em-format-html-display.c:573
-msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
-msgstr "Mae'r neges hon wedi ei hamgryptio.  Fe fyddai hi'n anodd i rywun o'r tu allan weld cynnwys y neges hon."
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+"Mae'r neges hon wedi ei hamgryptio.  Fe fyddai hi'n anodd i rywun o'r tu "
+"allan weld cynnwys y neges hon."
 
-#: ../mail/em-format-html-display.c:574
-#: ../mail/em-format-html.c:667
+#: ../mail/em-format-html-display.c:574 ../mail/em-format-html.c:667
 msgid "Encrypted, strong"
 msgstr "Wedi amgryptio, yn gryf"
 
 #: ../mail/em-format-html-display.c:574
-msgid "This message is encrypted, with a strong encryption algorithm. It would be very difficult for an outsider to view the content of this message in a practical amount of time."
-msgstr "Mae'r neges hon wedi ei hamgryptio, gydag algorithm amgryptio cryf.  Fe fyddai hi'n anodd iawn i rywun o'r tu allan weld cynnwys y neges hon mewn cyfnod ymarferol o amser."
+msgid ""
+"This message is encrypted, with a strong encryption algorithm. It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+"Mae'r neges hon wedi ei hamgryptio, gydag algorithm amgryptio cryf.  Fe "
+"fyddai hi'n anodd iawn i rywun o'r tu allan weld cynnwys y neges hon mewn "
+"cyfnod ymarferol o amser."
 
-#: ../mail/em-format-html-display.c:675
-#: ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:675 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Gweld Tystysgrif"
 
@@ -11633,9 +11777,8 @@ msgid "This certificate is not viewable"
 msgstr "Ni ellir gweld y dystysgrif"
 
 #: ../mail/em-format-html-display.c:980
-#, fuzzy
 msgid "Completed on"
-msgstr "Cyflawnwyd"
+msgstr "Cyflawnwyd ar"
 
 #: ../mail/em-format-html-display.c:988
 msgid "Overdue:"
@@ -11664,8 +11807,7 @@ msgstr "_Ffitio i'r Lled"
 msgid "Show _Original Size"
 msgstr "Dangos y _Maint Gwreiddiol"
 
-#: ../mail/em-format-html-display.c:1575
-#: ../mail/em-format-html-display.c:1614
+#: ../mail/em-format-html-display.c:1575 ../mail/em-format-html-display.c:1614
 msgid "View _Unformatted"
 msgstr "Gweld testun heb _Fformatio"
 
@@ -11679,16 +11821,19 @@ msgstr "Agor _Gyda"
 
 #: ../mail/em-format-html-display.c:1711
 #, fuzzy
-msgid "Evolution cannot render this email as it is too large to process. You can view it unformatted or with an external text editor."
-msgstr "Ni all Evolution rendro'r e-bost hwn am ei fod yn rhy fawr i'w drin. Gallwch ei weld heb y fformatio neu gan ddefnyddio golygydd testun allanol."
+msgid ""
+"Evolution cannot render this email as it is too large to process. You can "
+"view it unformatted or with an external text editor."
+msgstr ""
+"Ni all Evolution rendro'r e-bost hwn am ei fod yn rhy fawr i'w drin. Gallwch "
+"ei weld heb y fformatio neu gan ddefnyddio golygydd testun allanol."
 
 #: ../mail/em-format-html-print.c:157
 #, c-format
 msgid "Page %d of %d"
 msgstr "Tudalen %d o %d"
 
-#: ../mail/em-format-html.c:505
-#: ../mail/em-format-html.c:514
+#: ../mail/em-format-html.c:505 ../mail/em-format-html.c:514
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Yn nôl `%s'"
@@ -11736,27 +11881,20 @@ msgid "Formatting Message..."
 msgstr "Fformatio Neges..."
 
 # Why are these two msgstr's in caps? Should they be?
-#: ../mail/em-format-html.c:1567
-#: ../mail/em-format-html.c:1631
-#: ../mail/em-format-html.c:1652
-#: ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:926
-#: ../mail/em-mailer-prefs.c:79
+#: ../mail/em-format-html.c:1567 ../mail/em-format-html.c:1631
+#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:926 ../mail/em-mailer-prefs.c:79
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1568
-#: ../mail/em-format-html.c:1637
-#: ../mail/em-format-html.c:1655
-#: ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:927
-#: ../mail/em-mailer-prefs.c:80
+#: ../mail/em-format-html.c:1568 ../mail/em-format-html.c:1637
+#: ../mail/em-format-html.c:1655 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:927 ../mail/em-mailer-prefs.c:80
 msgid "Bcc"
 msgstr "Bcc"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1747
-#: ../mail/em-format-quote.c:352
+#: ../mail/em-format-html.c:1747 ../mail/em-format-quote.c:352
 #: ../mail/em-mailer-prefs.c:1435
 msgid "Mailer"
 msgstr "Ebostiwr"
@@ -11769,27 +11907,22 @@ msgstr "Ebostiwr"
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr ""
 
-#: ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:924
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:924
 #: ../mail/em-mailer-prefs.c:77
 msgid "Reply-To"
 msgstr "Ateb-I"
 
-#: ../mail/em-format.c:929
-#: ../mail/em-mailer-prefs.c:82
-#: ../mail/message-list.etspec.h:2
-#: ../widgets/misc/e-dateedit.c:316
+#: ../mail/em-format.c:929 ../mail/em-mailer-prefs.c:82
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:316
 #: ../widgets/misc/e-dateedit.c:338
 msgid "Date"
 msgstr "Dyddiad"
 
-#: ../mail/em-format.c:930
-#: ../mail/em-mailer-prefs.c:83
+#: ../mail/em-format.c:930 ../mail/em-mailer-prefs.c:83
 msgid "Newsgroups"
 msgstr "Grwpiau Newyddion"
 
-#: ../mail/em-format.c:931
-#: ../mail/em-mailer-prefs.c:84
+#: ../mail/em-format.c:931 ../mail/em-mailer-prefs.c:84
 #: ../plugins/face/org-gnome-face.eplug.xml.h:4
 msgid "Face"
 msgstr "Gwyneb"
@@ -11803,8 +11936,7 @@ msgstr "%s atodiad"
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Methu gramadegu neges S/MIME: Gwall anhysbys"
 
-#: ../mail/em-format.c:1376
-#: ../mail/em-format.c:1533
+#: ../mail/em-format.c:1376 ../mail/em-format.c:1533
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Methu gramadegu neges MIME. Yn dangos ei ffynhonnell."
 
@@ -11813,27 +11945,22 @@ msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Math amgryptio na gynhelir ar gyfer multipart/encrypted"
 
 #: ../mail/em-format.c:1394
-#, fuzzy
 msgid "Could not parse PGP/MIME message"
-msgstr "Methu gramadegu neges S/MIME: Gwall anhysbys"
+msgstr "Methu gramadegu neges PGP/MIME"
 
 #: ../mail/em-format.c:1394
-#, fuzzy
 msgid "Could not parse PGP/MIME message: Unknown error"
-msgstr "Methu gramadegu neges S/MIME: Gwall anhysbys"
+msgstr "Methu gramadegu neges PGP/MIME: Gwall anhysbys"
 
 #: ../mail/em-format.c:1552
 msgid "Unsupported signature format"
 msgstr "Ffurf llofnod na gynhelir"
 
-#: ../mail/em-format.c:1560
-#: ../mail/em-format.c:1698
+#: ../mail/em-format.c:1560 ../mail/em-format.c:1698
 msgid "Error verifying signature"
 msgstr "Gwall wrth wirio llofnod"
 
-#: ../mail/em-format.c:1560
-#: ../mail/em-format.c:1689
-#: ../mail/em-format.c:1698
+#: ../mail/em-format.c:1560 ../mail/em-format.c:1689 ../mail/em-format.c:1698
 msgid "Unknown error verifying signature"
 msgstr "Gwall anhysbys wrth wirio llofnod"
 
@@ -11842,9 +11969,8 @@ msgid "Could not parse PGP message"
 msgstr "Methu gramadegu neges PGP"
 
 #: ../mail/em-format.c:1772
-#, fuzzy
 msgid "Could not parse PGP message: Unknown error"
-msgstr "Methu gramadegu neges S/MIME: Gwall anhysbys"
+msgstr "Methu gramadegu neges PGP: Gwall anhysbys"
 
 #: ../mail/em-mailer-prefs.c:95
 msgid "Every time"
@@ -11875,8 +12001,7 @@ msgstr "Enw Pennawd:"
 msgid "Header Value Contains:"
 msgstr ""
 
-#: ../mail/em-mailer-prefs.c:438
-#: ../widgets/table/e-table-click-to-add.c:500
+#: ../mail/em-mailer-prefs.c:438 ../widgets/table/e-table-click-to-add.c:500
 #: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "Pennawd"
@@ -11895,17 +12020,16 @@ msgid "Tag"
 msgstr "yn ôl"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1063
-#: ../mail/em-mailer-prefs.c:1117
+#: ../mail/em-mailer-prefs.c:1063 ../mail/em-mailer-prefs.c:1117
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr ""
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1071
-#: ../mail/em-mailer-prefs.c:1126
+#: ../mail/em-mailer-prefs.c:1071 ../mail/em-mailer-prefs.c:1126
 #, c-format
-msgid "%s plugin is not available. Please check whether the package is installed."
+msgid ""
+"%s plugin is not available. Please check whether the package is installed."
 msgstr ""
 
 #: ../mail/em-mailer-prefs.c:1092
@@ -11949,11 +12073,13 @@ msgstr "Methu sganio am flychau e-bost ar `%s': %s"
 
 #: ../mail/em-migrate.c:1789
 msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Mae lleoliad a strwythur plygellau blychau ebost Evolution wedi newid ers Evolution 1.x\n"
+"Mae lleoliad a strwythur plygellau blychau ebost Evolution wedi newid ers "
+"Evolution 1.x\n"
 "\n"
 "Byddwch yn amyneddgar nes i Evolution fudo'ch plygellau..."
 
@@ -11972,8 +12098,7 @@ msgstr "Methu creu plygell data `%s' POP3 i'w gadw ar y gweinydd: %s"
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Methu copïo data POP3 `%s' i'w gadw ar y gweinydd: %s"
 
-#: ../mail/em-migrate.c:2504
-#: ../mail/em-migrate.c:2516
+#: ../mail/em-migrate.c:2504 ../mail/em-migrate.c:2516
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Methu creu storfa e-bost lleol `%s': %s"
@@ -11986,11 +12111,13 @@ msgstr "Creu plygell `%s'"
 #: ../mail/em-migrate.c:2874
 #, fuzzy
 msgid ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite since Evolution 2.24.\n"
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
+"since Evolution 2.24.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Mae lleoliad a strwythur plygellau blychau ebost Evolution wedi newid ers Evolution 1.x\n"
+"Mae lleoliad a strwythur plygellau blychau ebost Evolution wedi newid ers "
+"Evolution 1.x\n"
 "\n"
 "Byddwch yn amyneddgar nes i Evolution fudo'ch plygellau..."
 
@@ -12000,8 +12127,12 @@ msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Methu creu plygellau e-bost lleol yn `%s': %s"
 
 #: ../mail/em-migrate.c:2974
-msgid "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
-msgstr "Methu darllen gosodiadau'r Evolution blaenorol, nid yw `evolution/config.xmldb' yn bodoli, neu mae wedi llygru."
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
+"Methu darllen gosodiadau'r Evolution blaenorol, nid yw `evolution/config."
+"xmldb' yn bodoli, neu mae wedi llygru."
 
 #: ../mail/em-popup.c:364
 msgid "Save As..."
@@ -12012,8 +12143,7 @@ msgstr "Cadw Fel..."
 msgid "untitled_image.%s"
 msgstr "delwedd_dideitl.%s"
 
-#: ../mail/em-popup.c:495
-#: ../widgets/misc/e-attachment-handler-image.c:147
+#: ../mail/em-popup.c:495 ../widgets/misc/e-attachment-handler-image.c:147
 msgid "Set as _Background"
 msgstr "Gosodwch fel _Cefndir"
 
@@ -12021,16 +12151,15 @@ msgstr "Gosodwch fel _Cefndir"
 msgid "_Reply to sender"
 msgstr "_Ateb i'r danfonwr"
 
-#: ../mail/em-popup.c:498
-#: ../ui/evolution-mail-message.xml.h:79
+#: ../mail/em-popup.c:498 ../ui/evolution-mail-message.xml.h:79
 msgid "Reply to _List"
 msgstr "Ateb i'r _Rhestr"
 
 #. make it first item
-#: ../mail/em-popup.c:547
-#: ../mail/em-popup.c:746
+#: ../mail/em-popup.c:547 ../mail/em-popup.c:746
+#, fuzzy
 msgid "_Add to Address Book"
-msgstr "_Ychwanegu i'r Llyfr Cyfeiriadau"
+msgstr "Ychw_anegu i'r Llyfr Cyfeiriadau..."
 
 #: ../mail/em-popup.c:725
 #, c-format
@@ -12039,7 +12168,8 @@ msgstr "Agor yn %s..."
 
 #: ../mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
-msgstr "Nid yw'r storfa yn cynnal tanysgrifiadau, neu nid ydynt wedi eu gweithredoli."
+msgstr ""
+"Nid yw'r storfa yn cynnal tanysgrifiadau, neu nid ydynt wedi eu gweithredoli."
 
 #: ../mail/em-subscribe-editor.c:639
 msgid "Subscribed"
@@ -12157,11 +12287,17 @@ msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Cywasgu dangosiad cyfeiriadau yn yr olwg AT/CC/BCC"
 
 #: ../mail/evolution-mail.schemas.in.h:16
-msgid "Compress display of addresses in TO/CC/BCC to the number specified in address_count."
-msgstr "Cywasgu dangosiad cyfeiriadau yn yr olwg AT/CC/BCC i'r nifer a benodir yn address_count."
+msgid ""
+"Compress display of addresses in TO/CC/BCC to the number specified in "
+"address_count."
+msgstr ""
+"Cywasgu dangosiad cyfeiriadau yn yr olwg AT/CC/BCC i'r nifer a benodir yn "
+"address_count."
 
 #: ../mail/evolution-mail.schemas.in.h:17
-msgid "Controls how frequently local changes are synchronized with the remote mail server. The interval must be at least 30 seconds."
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:18
@@ -12169,7 +12305,9 @@ msgid "Custom headers to use while checking for junk."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:19
-msgid "Custom headers to use while checking for junk. The list elements are string in the format \"headername=value\"."
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:20
@@ -12232,7 +12370,9 @@ msgid "Default width of the subscribe dialog."
 msgstr "Lled rhagosodedig y ddeialog Tanysgrifio"
 
 #: ../mail/evolution-mail.schemas.in.h:33
-msgid "Determines whether to look up addresses for junk filtering in local address book only"
+msgid ""
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:34
@@ -12240,7 +12380,11 @@ msgid "Determines whether to lookup in address book for sender email"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:35
-msgid "Determines whether to lookup the sender email in address book. If found, it shouldn't be a spam. It looks up in the books marked for autocompletion. It can be slow, if remote address books (like LDAP) are marked for autocompletion."
+msgid ""
+"Determines whether to lookup the sender email in address book. If found, it "
+"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
+"can be slow, if remote address books (like LDAP) are marked for "
+"autocompletion."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:36
@@ -12248,11 +12392,16 @@ msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:37
-msgid "Determines whether to use custom headers to check for junk. If this option is enabled and the headers are mentioned, it will be improve the junk checking speed."
+msgid ""
+"Determines whether to use custom headers to check for junk. If this option "
+"is enabled and the headers are mentioned, it will be improve the junk "
+"checking speed."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:38
-msgid "Determines whether to use the same fonts for both \"From\" and \"Subject\" lines in the \"Messages\" column in vertical view."
+msgid ""
+"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
+"lines in the \"Messages\" column in vertical view."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:39
@@ -12290,12 +12439,16 @@ msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Gwagio bob plygell Sbwriel wrth adael Evolution."
 
 #: ../mail/evolution-mail.schemas.in.h:47
-msgid "Enable animated images in HTML mail. Many users find animated images annoying and prefer to see a static image instead."
+msgid ""
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
-msgstr "Galluogi modd caret, fel eich bod yn medru gweld cyrchwr wrth ddarllen e-bost."
+msgstr ""
+"Galluogi modd caret, fel eich bod yn medru gweld cyrchwr wrth ddarllen e-"
+"bost."
 
 #: ../mail/evolution-mail.schemas.in.h:49
 #, fuzzy
@@ -12321,11 +12474,15 @@ msgid "Enable search folders on startup."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:54
-msgid "Enable the side bar search feature to allow interactive searching of folder names."
+msgid ""
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:55
-msgid "Enable this to use Space bar key to scroll in message preview, message list and folders."
+msgid ""
+"Enable this to use Space bar key to scroll in message preview, message list "
+"and folders."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:56
@@ -12336,13 +12493,16 @@ msgstr "Methu rendro'r rhan destun neges o faint cyfyngedig."
 msgid "Enable/disable caret mode"
 msgstr "Galluogi/analluogi'r modd caret"
 
-#: ../mail/evolution-mail.schemas.in.h:58
-#: ../mail/mail-config.glade.h:87
+#: ../mail/evolution-mail.schemas.in.h:58 ../mail/mail-config.glade.h:86
 msgid "Encode file names in an Outlook/GMail way"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:59
-msgid "Encode file names in the mail headers same as Outlook or GMail do, to let them display correctly file names with UTF-8 letters sent by Evolution, because they do not follow the RFC 2231, but use the incorrect RFC 2047 standard."
+msgid ""
+"Encode file names in the mail headers same as Outlook or GMail do, to let "
+"them display correctly file names with UTF-8 letters sent by Evolution, "
+"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+"standard."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:60
@@ -12358,36 +12518,64 @@ msgid "Hides the per-folder preview and removes the selection"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:63
-msgid "If a user tries to open 10 or more messages at one time, ask the user if they really want to do it."
-msgstr "Os ydy'r defnyddiwr yn ceisio agor 10 neges neu fwy ar yr un pryd, gofyn iddyn nhw a ydyn nhw wir am wneud hynny."
+msgid ""
+"If a user tries to open 10 or more messages at one time, ask the user if "
+"they really want to do it."
+msgstr ""
+"Os ydy'r defnyddiwr yn ceisio agor 10 neges neu fwy ar yr un pryd, gofyn "
+"iddyn nhw a ydyn nhw wir am wneud hynny."
 
 #: ../mail/evolution-mail.schemas.in.h:64
-msgid "If the \"Preview\" pane is on, then show it side-by-side rather than vertically."
-msgstr "Os yw'r panel \"Rhagolwg\" ar waith, ei ddangos ochr-yn-ochr yn hytrach na'n fertigol."
+msgid ""
+"If the \"Preview\" pane is on, then show it side-by-side rather than "
+"vertically."
+msgstr ""
+"Os yw'r panel \"Rhagolwg\" ar waith, ei ddangos ochr-yn-ochr yn hytrach na'n "
+"fertigol."
 
 #: ../mail/evolution-mail.schemas.in.h:65
 #, fuzzy
-msgid "If there isn't a builtin viewer for a particular MIME type inside Evolution, any MIME types appearing in this list which map to a Bonobo component viewer in GNOME's MIME type database may be used for displaying content."
-msgstr "Os nad oes gwelydd mewnol ar gyfer math mime arbennig o fewn Evolution, gellir defnyddio unrhyw fath mime o fewn y rhestr hon sy'n mapio i welydd cydran bonobo yng nghronfa data mathau mime GNOME er mwyn dangos y cynnwys."
+msgid ""
+"If there isn't a builtin viewer for a particular MIME type inside Evolution, "
+"any MIME types appearing in this list which map to a Bonobo component viewer "
+"in GNOME's MIME type database may be used for displaying content."
+msgstr ""
+"Os nad oes gwelydd mewnol ar gyfer math mime arbennig o fewn Evolution, "
+"gellir defnyddio unrhyw fath mime o fewn y rhestr hon sy'n mapio i welydd "
+"cydran bonobo yng nghronfa data mathau mime GNOME er mwyn dangos y cynnwys."
 
 #: ../mail/evolution-mail.schemas.in.h:66
-msgid "Initial height of the \"Send and Receive Mail\" window. The value updates as the user resizes the window vertically."
+msgid ""
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:67
-msgid "Initial maximize state of the \"Send and Receive Mail\" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the \"Send and Receive Mail\" window cannot be maximized. This key exists only as an implementation detail."
+msgid ""
+"Initial maximize state of the \"Send and Receive Mail\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Send and Receive Mail"
+"\" window cannot be maximized. This key exists only as an implementation "
+"detail."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:68
-msgid "Initial width of the \"Send and Receive Mail\" window. The value updates as the user resizes the window horizontally."
+msgid ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:69
-msgid "It disables/enables the repeated prompts to ask if offline sync is required before going into offline mode."
+msgid ""
+"It disables/enables the repeated prompts to ask if offline sync is required "
+"before going into offline mode."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:70
-msgid "It disables/enables the repeated prompts to warn that deleting messages from a search folder permanently deletes the message, not simply removing it from the search results."
+msgid ""
+"It disables/enables the repeated prompts to warn that deleting messages from "
+"a search folder permanently deletes the message, not simply removing it from "
+"the search results."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:71
@@ -12416,8 +12604,13 @@ msgid "List of accounts"
 msgstr "Rhestr cyfrifon"
 
 #: ../mail/evolution-mail.schemas.in.h:78
-msgid "List of accounts known to the mail component of Evolution. The list contains strings naming subdirectories relative to /apps/evolution/mail/accounts."
-msgstr "Rhestr o gyfrifon y gŵyr cydran ebost Evolution amdanynt.  Mae'r rhestr yn cynnwys llinynnau sy'n enwi is-blygellau perthynol i /apps/evolution/mail/accounts."
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+"Rhestr o gyfrifon y gŵyr cydran ebost Evolution amdanynt.  Mae'r rhestr yn "
+"cynnwys llinynnau sy'n enwi is-blygellau perthynol i /apps/evolution/mail/"
+"accounts."
 
 #: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of custom headers and whether they are enabled."
@@ -12428,8 +12621,13 @@ msgid "List of dictionary language codes used for spell checking."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:81
-msgid "List of labels known to the mail component of Evolution. The list contains strings containing name:color where color uses the HTML hex encoding."
-msgstr "Rhestr o labeli y gŵyr cydran ebost Evolution amdanynt.  Mae'r rhestr yn cynnwys llinynnau sy'n cynnwys enw:lliw lle mae lliw yn defnyddio'r amgodiad hecs HTML."
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:color where color uses the HTML hex encoding."
+msgstr ""
+"Rhestr o labeli y gŵyr cydran ebost Evolution amdanynt.  Mae'r rhestr yn "
+"cynnwys llinynnau sy'n cynnwys enw:lliw lle mae lliw yn defnyddio'r amgodiad "
+"hecs HTML."
 
 #: ../mail/evolution-mail.schemas.in.h:82
 msgid "List of protocol names whose license has been accepted."
@@ -12442,8 +12640,14 @@ msgstr "Llwytho delweddau ar gyfer negeseuon HTML dros http"
 
 #: ../mail/evolution-mail.schemas.in.h:84
 #, fuzzy
-msgid "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - Never load images off the net. \"1\" - Load images in messages from contacts. \"2\" - Always load images off the net."
-msgstr "Llwytho delweddau ar gyfer negeseuon HTML dros http(s). Gwerthoedd posib yw: 0 - Peidio byth â llwytho delweddau o'r rhwyd 1 - Llwytho delweddau os yw'r anfonwr yn y llyfr cyfeiriadau 2 - Llwytho delweddau o'r rhwyd bob amser"
+msgid ""
+"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
+"Never load images off the net. \"1\" - Load images in messages from "
+"contacts. \"2\" - Always load images off the net."
+msgstr ""
+"Llwytho delweddau ar gyfer negeseuon HTML dros http(s). Gwerthoedd posib yw: "
+"0 - Peidio byth â llwytho delweddau o'r rhwyd 1 - Llwytho delweddau os yw'r "
+"anfonwr yn y llyfr cyfeiriadau 2 - Llwytho delweddau o'r rhwyd bob amser"
 
 #: ../mail/evolution-mail.schemas.in.h:85
 msgid "Log filter actions"
@@ -12518,7 +12722,8 @@ msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Promptio'r defnyddiwr pan mae'n ceisio chwynnu plygell."
 
 #: ../mail/evolution-mail.schemas.in.h:103
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Promptio'r defnyddiwr pan mae'n ceisio anfon neges heb bwnc."
 
 #: ../mail/evolution-mail.schemas.in.h:104
@@ -12540,15 +12745,21 @@ msgstr "Promptio pan mae'r defnyddiwr yn llenwi Bcc yn unig"
 
 #: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to open 10 or more messages at once"
-msgstr "Promptio pan mae'r defnyddiwr yn ceisio agor 10 neges neu fwy ar unwaith"
+msgstr ""
+"Promptio pan mae'r defnyddiwr yn ceisio agor 10 neges neu fwy ar unwaith"
 
 #: ../mail/evolution-mail.schemas.in.h:109
-msgid "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
-msgstr "Promptio pan mae'r defnyddiwr yn ceisio anfon e-bost HTML at dderbynwyr nad ydynt o reidrwydd am dderbyn e-bost HTML."
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr ""
+"Promptio pan mae'r defnyddiwr yn ceisio anfon e-bost HTML at dderbynwyr nad "
+"ydynt o reidrwydd am dderbyn e-bost HTML."
 
 #: ../mail/evolution-mail.schemas.in.h:110
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr "Promptio pan mae'r defnyddiwr yn ceisio anfon neges heb dderbynwyr At: na Cc:"
+msgstr ""
+"Promptio pan mae'r defnyddiwr yn ceisio anfon neges heb dderbynwyr At: na Cc:"
 
 #: ../mail/evolution-mail.schemas.in.h:111
 msgid "Prompt when user tries to send unwanted HTML"
@@ -12586,7 +12797,7 @@ msgstr "Cyfeiriadur cadw"
 
 #: ../mail/evolution-mail.schemas.in.h:119
 msgid "Search for the sender photo in local address books"
-msgstr ""
+msgstr "Chwilio am lun o'r anfonwr yn y llyfr cyfeiriadau lleol"
 
 #: ../mail/evolution-mail.schemas.in.h:120
 msgid "Send HTML mail by default"
@@ -12599,7 +12810,9 @@ msgstr "Anfon e-bost HTML yn rhagosod."
 #: ../mail/evolution-mail.schemas.in.h:122
 #, fuzzy
 msgid "Sender email-address column in the message list"
-msgstr "Dangos cyfeiriad e-bost yr anfonwr o fewn y golofn negeseuon yn y rhestr negeseuon"
+msgstr ""
+"Dangos cyfeiriad e-bost yr anfonwr o fewn y golofn negeseuon yn y rhestr "
+"negeseuon"
 
 #: ../mail/evolution-mail.schemas.in.h:123
 #, fuzzy
@@ -12640,7 +12853,9 @@ msgstr "Dangos delweddau animeiddiedig fel animeiddiadau."
 
 #: ../mail/evolution-mail.schemas.in.h:132
 msgid "Show deleted messages (with a strike-through) in the message-list."
-msgstr "Dangos negeseuon sydd wedi eu dileu (gyda llinell drwyddynt) yn y rhestr negeseuon."
+msgstr ""
+"Dangos negeseuon sydd wedi eu dileu (gyda llinell drwyddynt) yn y rhestr "
+"negeseuon."
 
 #: ../mail/evolution-mail.schemas.in.h:133
 msgid "Show deleted messages in the message-list"
@@ -12656,53 +12871,69 @@ msgid "Show photo of the sender"
 msgstr "Dangos llun o'r anfonwr"
 
 #: ../mail/evolution-mail.schemas.in.h:136
-msgid "Show the \"Bcc\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
+msgid ""
+"Show the \"Bcc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:137
-msgid "Show the \"Cc\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
+msgid ""
+"Show the \"Cc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:138
-msgid "Show the \"From\" field when posting to a newsgroup. This is controlled from the View menu when a news account is chosen."
+msgid ""
+"Show the \"From\" field when posting to a newsgroup. This is controlled from "
+"the View menu when a news account is chosen."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:139
 #, fuzzy
-msgid "Show the \"From\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
+msgid ""
+"Show the \"From\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
 msgstr "Dangos y maes \"Oddi wrth\" pan yn danfon neges ebost."
 
 #: ../mail/evolution-mail.schemas.in.h:142
-msgid "Show the \"Reply To\" field when posting to a newsgroup. This is controlled from the View menu when a news account is chosen."
+msgid ""
+"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
+"from the View menu when a news account is chosen."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:143
-msgid "Show the \"Reply To\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
+msgid ""
+"Show the \"Reply To\" field when sending a mail message. This is controlled "
+"from the View menu when a mail account is chosen."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:144
 #, fuzzy
-msgid "Show the email-address of the sender in a separate column in the message list."
-msgstr "Dangos cyfeiriad e-bost yr anfonwr o fewn colofn gyfansawdd y negeseuon yn y rhestr negeseuon"
+msgid ""
+"Show the email-address of the sender in a separate column in the message "
+"list."
+msgstr ""
+"Dangos cyfeiriad e-bost yr anfonwr o fewn colofn gyfansawdd y negeseuon yn y "
+"rhestr negeseuon"
 
 #: ../mail/evolution-mail.schemas.in.h:145
 #, fuzzy
 msgid "Show the photo of the sender in the message reading pane."
-msgstr "Dangos cyfeiriad e-bost yr anfonwr o fewn colofn gyfansawdd y negeseuon yn y rhestr negeseuon"
+msgstr ""
+"Dangos cyfeiriad e-bost yr anfonwr o fewn colofn gyfansawdd y negeseuon yn y "
+"rhestr negeseuon"
 
 #: ../mail/evolution-mail.schemas.in.h:146
 msgid "Spell check inline"
 msgstr "Gwirio sillafu'n fewnol"
 
 #: ../mail/evolution-mail.schemas.in.h:147
-#, fuzzy
 msgid "Spell checking color"
-msgstr "Gwirio Sillafu"
+msgstr "Lliw gwirio sillafu"
 
 #: ../mail/evolution-mail.schemas.in.h:148
-#, fuzzy
 msgid "Spell checking languages"
-msgstr "Gwirio sillafu'n fewnol"
+msgstr "Ieithoedd gwirio sillafu"
 
 #: ../mail/evolution-mail.schemas.in.h:149
 msgid "Subscribe dialog default height"
@@ -12726,11 +12957,15 @@ msgstr "Ategyn rhagosodedig i'r bachyn Sothach"
 
 #: ../mail/evolution-mail.schemas.in.h:154
 msgid "The last time empty junk was run, in days since the epoch."
-msgstr "Y tro diwethaf rhedwyd y broses i wacáu'r sbwriel, mewn diwrnodau ers yr epoc."
+msgstr ""
+"Y tro diwethaf rhedwyd y broses i wacáu'r sbwriel, mewn diwrnodau ers yr "
+"epoc."
 
 #: ../mail/evolution-mail.schemas.in.h:155
 msgid "The last time empty trash was run, in days since the epoch."
-msgstr "Y tro diwethaf rhedwyd y broses i wacáu'r sbwriel, mewn diwrnodau ers yr epoc."
+msgstr ""
+"Y tro diwethaf rhedwyd y broses i wacáu'r sbwriel, mewn diwrnodau ers yr "
+"epoc."
 
 #: ../mail/evolution-mail.schemas.in.h:156
 #, fuzzy
@@ -12743,29 +12978,54 @@ msgid "The variable width font for mail display."
 msgstr "Y ffont lled newidiol er mwyn dangos e-bost"
 
 #: ../mail/evolution-mail.schemas.in.h:158
-msgid "This can have three possible values. \"0\" for errors. \"1\" for warnings. \"2\" for debug messages."
+msgid ""
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:159
 #, fuzzy
-msgid "This decides the max size of the text part that can be formatted under Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
-msgstr "Mae hyn yn penderfynu uchafswm maint y rhan testun fedr evolution ei fformatio. 4MB / 4096 KB yw'r rhagosodiad, ac fe'i ddifinnir mewn KB."
+msgid ""
+"This decides the max size of the text part that can be formatted under "
+"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
+msgstr ""
+"Mae hyn yn penderfynu uchafswm maint y rhan testun fedr evolution ei "
+"fformatio. 4MB / 4096 KB yw'r rhagosodiad, ac fe'i ddifinnir mewn KB."
 
 #: ../mail/evolution-mail.schemas.in.h:160
 #, fuzzy
-msgid "This is the default junk plugin, even though there are multiple plugins enabled. If the default listed plugin is disabled, then it won't fall back to the other available plugins."
-msgstr "Dyma'r ategyn sothach rhagosodedig, hyd yn oed os oes amryw ategion wedi eu galluogi. Os yw'r ategyn sothach rhagosodedig ar gael, fydd ddim cwympo yn ôl at yr ategion rhagosodedig."
+msgid ""
+"This is the default junk plugin, even though there are multiple plugins "
+"enabled. If the default listed plugin is disabled, then it won't fall back "
+"to the other available plugins."
+msgstr ""
+"Dyma'r ategyn sothach rhagosodedig, hyd yn oed os oes amryw ategion wedi eu "
+"galluogi. Os yw'r ategyn sothach rhagosodedig ar gael, fydd ddim cwympo yn "
+"ôl at yr ategion rhagosodedig."
 
 #: ../mail/evolution-mail.schemas.in.h:161
-msgid "This key is read only once and reset to \"false\" after read. This unselects the mail in the list and removes the preview for that folder."
+msgid ""
+"This key is read only once and reset to \"false\" after read. This unselects "
+"the mail in the list and removes the preview for that folder."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:162
-msgid "This key should contain a list of XML structures specifying custom headers, and whether they are to be displayed. The format of the XML structure is &lt;header enabled&gt; - set enabled if the header is to be displayed in the mail view."
-msgstr "Dylai'r allwedd hon gynnwys rhestr o strwythurau XML sy'n penodi penawdau arbennig, a p'un ai dylid eu dangos ai peidio. Ffurf y strwythur XML yw &lt;pennawd galluogwyd&gt; - gosodwch 'galluogwyd' os yw'r pennawd am gael ei ddangos yn yr olwg e-bost."
+msgid ""
+"This key should contain a list of XML structures specifying custom headers, "
+"and whether they are to be displayed. The format of the XML structure is &lt;"
+"header enabled&gt; - set enabled if the header is to be displayed in the "
+"mail view."
+msgstr ""
+"Dylai'r allwedd hon gynnwys rhestr o strwythurau XML sy'n penodi penawdau "
+"arbennig, a p'un ai dylid eu dangos ai peidio. Ffurf y strwythur XML yw &lt;"
+"pennawd galluogwyd&gt; - gosodwch 'galluogwyd' os yw'r pennawd am gael ei "
+"ddangos yn yr olwg e-bost."
 
 #: ../mail/evolution-mail.schemas.in.h:163
-msgid "This option is related to the key lookup_addressbook and is used to determine whether to look up addresses in local address book only to exclude mail sent by known contacts from junk filtering."
+msgid ""
+"This option is related to the key lookup_addressbook and is used to "
+"determine whether to look up addresses in local address book only to exclude "
+"mail sent by known contacts from junk filtering."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:164
@@ -12773,15 +13033,24 @@ msgid "This option would help in improving the speed of fetching."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:165
-msgid "This sets the number of addresses to show in default message list view, beyond which a '...' is shown."
-msgstr "Gosod y nifer o gyfeiriadau i'w dangos yng ngolwg rhagosodedig y rhestr negeseuon. Ar ôl y nifer a benodir, fe ddangosir '...'"
+msgid ""
+"This sets the number of addresses to show in default message list view, "
+"beyond which a '...' is shown."
+msgstr ""
+"Gosod y nifer o gyfeiriadau i'w dangos yng ngolwg rhagosodedig y rhestr "
+"negeseuon. Ar ôl y nifer a benodir, fe ddangosir '...'"
 
 #: ../mail/evolution-mail.schemas.in.h:166
-msgid "This setting specifies whether the threads should be in expanded or collapsed state by default. Evolution requires a restart."
+msgid ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Evolution requires a restart."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:167
-msgid "This setting specifies whether the threads should be sorted based on latest message in each thread, rather than by message's date. Evolution requires a restart."
+msgid ""
+"This setting specifies whether the threads should be sorted based on latest "
+"message in each thread, rather than by message's date. Evolution requires a "
+"restart."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:168
@@ -12813,6 +13082,8 @@ msgstr "Llinyn UID y cyfrif rhagosodedig."
 #: ../mail/evolution-mail.schemas.in.h:174
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr ""
+"Lliw ar gyfer tanlinellu geiriau wedi'i camsillafu pan yn defnyddio gwirio "
+"sillafu mewnlin."
 
 #: ../mail/evolution-mail.schemas.in.h:175
 msgid "Use SpamAssassin daemon and client"
@@ -12845,11 +13116,17 @@ msgid "Use side-by-side or wide layout"
 msgstr "Defnyddio cynllun ochr-yn-ochr neu gynllun llydan"
 
 #: ../mail/evolution-mail.schemas.in.h:182
-msgid "Users get all up in arms over where the cursor should go when replying to a message. This determines whether the cursor is placed at the top of the message or the bottom."
+msgid ""
+"Users get all up in arms over where the cursor should go when replying to a "
+"message. This determines whether the cursor is placed at the top of the "
+"message or the bottom."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:183
-msgid "Users get all up in arms over where their signature should go when replying to a message. This determines whether the signature is placed at the top of the message or the bottom."
+msgid ""
+"Users get all up in arms over where their signature should go when replying "
+"to a message. This determines whether the signature is placed at the top of "
+"the message or the bottom."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:184
@@ -12865,8 +13142,12 @@ msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:187
-msgid "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
-msgstr "P'un ai i gwympo'n ôl ar greu edafedd o'r pynciau ai peidio, pan nad yw'r negeseuon yn cynnwys penawdau Mewn-Ateb-I neu Gyfeirnodau."
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+"P'un ai i gwympo'n ôl ar greu edafedd o'r pynciau ai peidio, pan nad yw'r "
+"negeseuon yn cynnwys penawdau Mewn-Ateb-I neu Gyfeirnodau."
 
 #: ../mail/evolution-mail.schemas.in.h:188
 msgid "Whether sort threads based on latest message in that thread"
@@ -12917,8 +13198,7 @@ msgstr "Mewnforio blwch e-bost"
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:231
 #: ../plugins/pst-import/pst-importer.c:454
-#: ../plugins/pst-import/pst-importer.c:560
-#: ../shell/e-shell-importer.c:555
+#: ../plugins/pst-import/pst-importer.c:560 ../shell/e-shell-importer.c:555
 #, c-format
 msgid "Importing `%s'"
 msgstr "Mewnforio `%s'"
@@ -12945,8 +13225,7 @@ msgstr "Mewnforio e-bost o Pine."
 msgid "Mail to %s"
 msgstr "Ebost i %s"
 
-#: ../mail/mail-autofilter.c:235
-#: ../mail/mail-autofilter.c:274
+#: ../mail/mail-autofilter.c:235 ../mail/mail-autofilter.c:274
 #, c-format
 msgid "Mail from %s"
 msgstr "Ebost wrth %s"
@@ -13060,182 +13339,178 @@ msgid "Failed upgrading Mail settings or folders."
 msgstr "Methu wrth uwchraddio plygellau neu osodiadau e-bost."
 
 #: ../mail/mail-config.glade.h:1
-msgid " Ch_eck for Supported Types "
-msgstr "_Gwirio am Fathau Cynaledig"
-
-#: ../mail/mail-config.glade.h:2
 msgid "(Note: Requires restart of the application)"
-msgstr ""
+msgstr "(Nodyn: Bydd angen ail dechrau'r rhaglen)"
 
-#: ../mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:3
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>Ni chynhelir SSL yn yr adeiledd hwn o Evolution</b>"
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:4
 #, fuzzy
 msgid "<b>Sender Photograph</b>"
 msgstr "<b>Opsiynau calendr</b>"
 
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:5
 msgid "<b>Sig_natures</b>"
 msgstr "<b>_Llofnodion</b>"
 
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:6
 msgid "<b>Top Posting Option</b> (Not Recommended)"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:7
 msgid "<b>_Languages</b>"
 msgstr "<b>_Ieithoedd</b>"
 
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Gwybodaeth Cyfrif</span>"
 
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Dilysiant</span>"
 
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Cyfansoddi Negeseuon</span>"
 
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Cyfluniad</span>"
 
-#: ../mail/mail-config.glade.h:15
+#: ../mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Ymddygiad Rhagosodedig</span>"
 
-#: ../mail/mail-config.glade.h:16
+#: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Dileu Ebost</span>"
 
-#: ../mail/mail-config.glade.h:17
+#: ../mail/mail-config.glade.h:16
 #, fuzzy
 msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
 msgstr "<span weight=\"bold\">Penawdau Ebost _Wedi'u Dangos </span>"
 
-#: ../mail/mail-config.glade.h:19
+#: ../mail/mail-config.glade.h:18
 #, fuzzy
 msgid "<span weight=\"bold\">Labels</span>"
 msgstr "<span weight=\"bold\">Rhybuddion</span>"
 
-#: ../mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Llwytho Delweddau</span>"
 
-#: ../mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Dangos Negeseuon</span>"
 
-#: ../mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Ffontiau Negeseuon</span>"
 
-#: ../mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">Derbynwyr Negeseuon</span>"
 
-#: ../mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:23
 #: ../plugins/publish-calendar/publish-calendar.glade.h:3
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Gwybodaeth Ddewisol</span>"
 
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Dewisiadau</span>"
 
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 
-#: ../mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Ffontiau Printio</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:27
 #, fuzzy
 msgid "<span weight=\"bold\">Proxy Settings</span>"
 msgstr "<span weight=\"bold\">Statws</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Gwybodaeth Angenrheidiol</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">MIME Diogel (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Diogelwch</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Negeseuon Wedi'u Hanfon a rhai Drafft</span>"
 
-#: ../mail/mail-config.glade.h:33
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Cyfluniad Gweinydd</span>"
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:33
 #, fuzzy
 msgid "<span weight=\"bold\">_Authentication Type</span>"
 msgstr "<span weight=\"bold\">Math Dilysiant</span>"
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Rheolaeth Cyfrifon"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "_Ychwanegu Llofnod Newydd..."
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "Ychwanegu _Sgript"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "_Llofnodi negeseuon cyn eu hanfon o hyd wrth ddefnyddio'r cyfrif hwn"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "Amgryptio'ch copi eich _hun hefyd wrth anfon e-bost wedi'i amgryptio"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "_Anfon copi-carbon (cc) bob amser at:"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "_Anfon copi-carbon dall (bcc) bob amser at:"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "_Ymddiried yn yr allweddi yn fy nghylch allweddi o hyd wrth amgryptio"
 
-#: ../mail/mail-config.glade.h:44
+#: ../mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Amgryptio fy nghopi fy _hun hefyd wrth anfon e-bost wedi'i amgryptio"
 
-#: ../mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Always request rea_d receipt"
 msgstr "_Gofyn am Dderbynneb Darllen"
 
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:45
 msgid ""
 "Attachment\n"
 "Inline\n"
 "Quoted"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:48
 msgid ""
 "Attachment\n"
 "Inline (Outlook style)\n"
@@ -13243,62 +13518,64 @@ msgid ""
 "Do not quote"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Automatically insert _emoticon images"
 msgstr "Rhoi delweddau _gwenoglun i mewn yn awtomatig"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:53
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltig (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:54
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltig (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:55
 msgid "C_haracter set:"
 msgstr "_Set nodau:"
 
-#: ../mail/mail-config.glade.h:57
-msgid "Ch_eck for Supported Types "
-msgstr "_Gwirio am Fathau Wedi'u Cynnal"
+#: ../mail/mail-config.glade.h:56
+#: ../plugins/exchange-operations/exchange-account-setup.c:1015
+msgid "Ch_eck for Supported Types"
+msgstr "_Gwirio am Fathau wedi Cynnal"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Check cu_stom headers for junk"
 msgstr "_Gwirio'r e-bost sy'n dod i mewn ar gyfer sothach"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Check incoming _messages for junk"
 msgstr "_Gwirio'r e-bost sy'n dod i mewn ar gyfer sothach"
 
-#: ../mail/mail-config.glade.h:60
+#: ../mail/mail-config.glade.h:59
 msgid "Check spelling while I _type"
 msgstr "Gwirio sillafu wrth i mi _deipio"
 
-#: ../mail/mail-config.glade.h:61
+#: ../mail/mail-config.glade.h:60
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Yn gwirio'r e-bost sy'n dod i mewn i weld a yw'n Sothach"
 
-#: ../mail/mail-config.glade.h:62
+#: ../mail/mail-config.glade.h:61
 msgid "Cle_ar"
 msgstr "C_lirio"
 
-#: ../mail/mail-config.glade.h:63
+#: ../mail/mail-config.glade.h:62
 msgid "Clea_r"
 msgstr "Cl_irio"
 
-#: ../mail/mail-config.glade.h:64
+#: ../mail/mail-config.glade.h:63
 msgid "Color for _misspelled words:"
 msgstr "Lliw'r geiriau _heb eu sillafu'n gywir:"
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:64
 msgid "Confirm _when expunging a folder"
 msgstr "_Cadarnhau wrth chwynnu plygell"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:65
+#, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13314,288 +13591,314 @@ msgstr ""
 "\n"
 "Cliciwch \"Cymhwyso\" i gadw'ch gosodiadau."
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:71
 msgid "De_fault"
 msgstr "_Rhagosodiad"
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:72
 msgid "Default character e_ncoding:"
 msgstr "_Amgodiad nodau rhagosod:"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Delete junk messages on e_xit"
 msgstr "Dileu negeseuon sothach wrth _adael"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "_Arwyddo'n ddigidol y negeseuon sy'n cael eu hanfon (fel rhagosodiad)"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Do not format messages when text si_ze exceeds"
-msgstr "Peidio â fformatio cynnwys testun o fewn e-bost os yw'r maint testun yn fwy na"
+msgstr ""
+"Peidio â fformatio cynnwys testun o fewn e-bost os yw'r maint testun yn fwy "
+"na"
 
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.glade.h:78
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:79
 msgid "Done"
 msgstr "Wedi gorffen"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:80
 msgid "Drafts _Folder:"
 msgstr "_Plygell Drafftiau:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:81
 msgid "Email Accounts"
 msgstr "Cyfrifon Ebost"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:82
 msgid "Email _Address:"
 msgstr "_Cyfeiriad Ebost:"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:83
 msgid "Empty trash folders on e_xit"
 msgstr "Gwagu plygellau sbwriel wrth _adael"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:84
 msgid "Enable Magic S_pacebar"
 msgstr "Galluogi _Bar Ofod Hud"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:85
 #, fuzzy
 msgid "Enable Sea_rch Folders"
 msgstr "Plygellau Chwilio"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:87
 msgid "Encry_ption certificate:"
 msgstr "Tystysgrif _amgryptio:"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:88
 msgid "Encrypt out_going messages (by default)"
 msgstr "_Amgryptio'r negeseuon sy'n cael eu hanfon (fel rhagosodiad)"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:90
 msgid "Fi_xed-width:"
 msgstr "Lled _penodol:"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:91
 msgid "Fix_ed width Font:"
 msgstr "Ffont lled P_enodol:"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:92
 msgid "Font Properties"
 msgstr "Priodweddau Ffont"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:93
 msgid "Format messages in _HTML"
 msgstr "Fformatio negeseuon mewn _HTML"
 
-#: ../mail/mail-config.glade.h:95
+#: ../mail/mail-config.glade.h:94
 msgid "Full Nam_e:"
 msgstr "_Enw Llawn:"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:96
 msgid "HTML Messages"
 msgstr "Negeseuon HTML"
 
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:97
 msgid "H_TTP Proxy:"
 msgstr "Dirprwy H_TTP"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:98
 msgid "Headers"
 msgstr "Penawdau"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:99
 msgid "Highlight _quotations with"
 msgstr "Amlygu _dyfyniadau gyda"
 
-#: ../mail/mail-config.glade.h:102
-msgid "If the server uses a non-standard port then specify the server address as \"server-name:port-number\""
+#: ../mail/mail-config.glade.h:101
+msgid ""
+"If the server uses a non-standard port then specify the server address as "
+"\"server-name:port-number\""
 msgstr ""
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:103
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:105
-#: ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:104 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Labeli"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:105
 msgid "Languages Table"
 msgstr "Tabl Ieithoedd"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:106
 msgid "Mail Configuration"
 msgstr "Cyfluniad Ebost"
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:107
 msgid "Mail Headers Table"
 msgstr "Tabl Penawdau E-bost"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:109
 msgid "Mailbox location"
 msgstr "Lleoliad bocs e-bost"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:110
 msgid "Message Composer"
 msgstr "Cyfansoddwr Negeseuon"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:111
 msgid "No _Proxy for:"
 msgstr ""
 
+#: ../mail/mail-config.glade.h:112
+msgid ""
+"Note: Underscore in the label name is used as mnemonic identifier in menu."
+msgstr ""
+
 #: ../mail/mail-config.glade.h:113
-msgid "Note: Underscore in the label name is used as mnemonic identifier in menu."
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
 msgstr ""
+"Sylwer: bydd dim gofyn i chi roi cyfrinair nes i chi gysylltu am y tro cyntaf"
 
 #: ../mail/mail-config.glade.h:114
-msgid "Note: you will not be prompted for a password until you connect for the first time"
-msgstr "Sylwer: bydd dim gofyn i chi roi cyfrinair nes i chi gysylltu am y tro cyntaf"
-
-#: ../mail/mail-config.glade.h:115
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:115
 msgid "Or_ganization:"
 msgstr "_Corff:"
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:116
 msgid "PGP/GPG _Key ID:"
 msgstr "ID _Allwedd PGP/GPG:"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:117
 msgid "Pass_word:"
 msgstr "_Cyfrinair:"
 
+#: ../mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Please configure the following account settings."
+msgstr "Dewiswch ymhlith yr opsiynau yma"
+
 #: ../mail/mail-config.glade.h:120
 #, fuzzy
-msgid "Please enter a descriptive name for this account in the space below. This name will be used for display purposes only."
+msgid ""
+"Please enter a descriptive name for this account in the space below. This "
+"name will be used for display purposes only."
 msgstr ""
 "Rhowch enw disgrifiadol ar gyfer y cyfrif yn y man isod.\n"
 "Bydd yr enw yn cael ei ddefnyddio at bwrpas dangos yn unig."
 
 #: ../mail/mail-config.glade.h:121
-msgid "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."
-msgstr "Rhowch wybodaeth am y ffordd y byddwch chi'n anfon e-bost. Os nad ydych chi'n siŵr, gofynnwch i'ch gweinyddwr system neu'ch darparwr gwasanaeth Rhyngrwyd."
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+msgstr ""
+"Rhowch wybodaeth am y ffordd y byddwch chi'n anfon e-bost. Os nad ydych "
+"chi'n siŵr, gofynnwch i'ch gweinyddwr system neu'ch darparwr gwasanaeth "
+"Rhyngrwyd."
 
 #: ../mail/mail-config.glade.h:122
-msgid "Please enter your name and email address below. The \"optional\" fields below do not need to be filled in, unless you wish to include this information in email you send."
-msgstr "Rhowch eich enw a'ch cyfeiriad e-bost isod. Does dim rhaid llenwi'r meysydd sy'n \"ddewisol\", oni bai eich bod am gynnwys y wybodaeth hynny yn yr e-bost fyddwch chi'n ei anfon."
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+"Rhowch eich enw a'ch cyfeiriad e-bost isod. Does dim rhaid llenwi'r meysydd "
+"sy'n \"ddewisol\", oni bai eich bod am gynnwys y wybodaeth hynny yn yr e-"
+"bost fyddwch chi'n ei anfon."
 
 #: ../mail/mail-config.glade.h:123
-msgid "Please select among the following options"
-msgstr "Dewiswch ymhlith yr opsiynau yma"
-
-#: ../mail/mail-config.glade.h:124
 msgid "Port:"
 msgstr "Porth:"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:124
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr "_Promptio wrth anfon negeseuon gyda dim ond derbynwyr Bcc wedi eu diffinio"
+msgstr ""
+"_Promptio wrth anfon negeseuon gyda dim ond derbynwyr Bcc wedi eu diffinio"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:125
 msgid "Re_member password"
 msgstr "_Cofio'r cyfrinair"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:126
 msgid "Re_ply-To:"
 msgstr "_Ateb-At:"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:128
 msgid "Remember _password"
 msgstr "Cofio'r _cyfrinair"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:129
 #, fuzzy
 msgid "S_earch for sender photograph only in local address books"
 msgstr "Darparu'r swyddogaethau craidd ar gyfer calendrau lleol."
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:130
 msgid "S_elect..."
 msgstr "D_ewis..."
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:131
 msgid "S_end message receipts:"
 msgstr "_Anfon negeseuon derbyn e-bost:"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:132
 msgid "S_tandard Font:"
 msgstr "Ffont _Safonol:"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font"
 msgstr "Dewis ffont lled sefydlog HTML"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML fixed width font for printing"
 msgstr "Dewis ffont lled sefydlog HTML er mwyn argraffu"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:136
 msgid "Select HTML variable width font"
 msgstr "Dewis ffont lled amrywiol HTML"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:137
 msgid "Select HTML variable width font for printing"
 msgstr "Dewis ffont lled amrywiol HTML er mwyn argraffu"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:139
 msgid "Sending Mail"
 msgstr "Yn Derbyn Post"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:140
 msgid "Sent _Messages Folder:"
 msgstr "Plygell _Negeseuon Wedi'u Hanfon:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:141
 msgid "Ser_ver requires authentication"
 msgstr "Angen _dilysiant ar y gweinydd"
 
-#: ../mail/mail-config.glade.h:143
-msgid "Server _Type: "
+#: ../mail/mail-config.glade.h:142
+msgid "Server _Type:"
 msgstr "_Math o Wasanaethwr:"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:143
 msgid "Sig_ning certificate:"
 msgstr "Tystysgrif _Llofnodi:"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:144
 msgid "Signat_ure:"
 msgstr "_Llofnod:"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:145
 msgid "Signatures"
 msgstr "Llofnodion"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:146
 msgid "Signatures Table"
 msgstr "Tabl Llofnodion"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:147
 msgid "Spell Checking"
 msgstr "Gwirio Sillafu"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:148
 msgid "Start _typing at the bottom on replying"
-msgstr ""
+msgstr "Dechrau _teipio ar y gwaelod wrth ymateb"
 
-#: ../mail/mail-config.glade.h:150
-msgid "T_ype: "
+#: ../mail/mail-config.glade.h:149
+msgid "T_ype:"
 msgstr "_Math: "
 
-#: ../mail/mail-config.glade.h:151
-msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
-msgstr "Mae'r rhestr hon o ieithoedd yn adlewyrchu'r rhai yr ydych wedi gosod geiriadur ar eu cyfer yn unig"
+#: ../mail/mail-config.glade.h:150
+msgid ""
+"The list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"Mae'r rhestr hon o ieithoedd yn adlewyrchu'r rhai yr ydych wedi gosod "
+"geiriadur ar eu cyfer yn unig"
 
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:151
 #, fuzzy
 msgid ""
 "The output of this script will be used as your\n"
@@ -13605,7 +13908,7 @@ msgstr ""
 "dangos yn unig y defnyddir yr enw fyddwch chi'n\n"
 "ei benodi."
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:153
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13613,161 +13916,161 @@ msgstr ""
 "Rhowch yr enw yr hoffech ei ddefnyddio i gyfeirio at y cyfrif hwn.\n"
 "Er enghraifft: \"Gwaith\" neu \"Personol\""
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:155
 msgid "Us_ername:"
 msgstr "_Enw Defnyddiwr:"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:156
 msgid "Use Authe_ntication"
 msgstr "Def_nyddio Dilysiant"
 
-#: ../mail/mail-config.glade.h:158
-#: ../plugins/caldav/caldav-source.c:405
-#: ../plugins/google-account-setup/google-source.c:681
+#: ../mail/mail-config.glade.h:157 ../plugins/caldav/caldav-source.c:405
+#: ../plugins/google-account-setup/google-source.c:701
 #: ../plugins/google-account-setup/google-contacts-source.c:280
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:307
 msgid "User_name:"
 msgstr "_Enw Defnyddiwr:"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:158
 msgid "V_ariable-width:"
 msgstr "Lled _amrywiol:"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:159
+#, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Forward\" to begin. "
+"Click \"Forward\" to begin."
 msgstr ""
 "Croeso i Gynorthwywr Cyfluniad Ebost Evolution.\n"
 "\n"
 "Cliciwch \"Ymlaen\" i ddechrau."
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:162
 msgid "_Add Signature"
 msgstr "_Ychwanegu Llofnod"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:163
 msgid "_Always load images from the Internet"
 msgstr "_Llwytho delweddau o'r Rhyngrwyd bob tro"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "_Ategyn sbwriel rhagosodedig:"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:165
 msgid "_Direct connection to the Internet"
-msgstr ""
+msgstr "_Cysylltiad uniongyrchol i'r Wê"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
-msgstr "_Peidio ag arwyddo ceisiadau am gyfarfodydd (er mwyn cydweddu ag Outlook)"
+msgstr ""
+"_Peidio ag arwyddo ceisiadau am gyfarfodydd (er mwyn cydweddu ag Outlook)"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "Arddull yrru _ymlaen:"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Load images in messages from contacts"
 msgstr "_Llwytho delweddau mewn negeseuon e-bost o gysylltiadau"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Lookup in local address book only"
 msgstr "Rhestru plygellau llyfr cyfeiriadau lleol"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "Gwneud hon yn gyfrif rhagosodedig"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Manual proxy configuration:"
 msgstr "Cyfluniad Ebost"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "_Marcio negeseuon fel rhai wedi eu darllen ar ôl"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "_Peidio byth a llwytho delweddau o'r Rhyngrwyd"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "_Llwybr:"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
-msgstr "_Rhybuddio cyn anfon negeseuon HTML at gysylltiadau nad ydynt eu heisiau"
+msgstr ""
+"_Rhybuddio cyn anfon negeseuon HTML at gysylltiadau nad ydynt eu heisiau"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Rhybuddio cyn anfon negeseuon gyda _llinell bwnc wag"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "_Arddull ateb:"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "_Sgript:"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:182
 msgid "_Secure HTTP Proxy:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:184
-#, fuzzy
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
-msgstr "D_ewis..."
+msgstr "_Dewis..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "_Dangos delweddau wedi'u hanimeiddio"
 
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:187
 #, fuzzy
 msgid "_Show the photograph of sender in the message preview"
 msgstr "Dangos ffynhonnell graidd o e-bost y neges"
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Crebachu penawdau I / Cc / Bcc yn"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "_Defnyddio cysylltiad diogel:"
 
-#: ../mail/mail-config.glade.h:191
-#, fuzzy
+#: ../mail/mail-config.glade.h:190
 msgid "_Use system defaults"
-msgstr "Defnyddio'r _Rhagosodiad"
+msgstr "Defnyddio rhagosodiada_u'r system"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "_Defnyddio'r un ffontiau â rhaglenni eraill"
 
-#: ../mail/mail-config.glade.h:195
+#: ../mail/mail-config.glade.h:194
 msgid "addresses"
 msgstr "cyfeiriadau"
 
-#: ../mail/mail-config.glade.h:196
+#: ../mail/mail-config.glade.h:195
 msgid "color"
 msgstr "lliw"
 
-#: ../mail/mail-config.glade.h:197
+#: ../mail/mail-config.glade.h:196
 msgid "description"
 msgstr "disgrifiad"
 
-#: ../mail/mail-config.glade.h:198
+#: ../mail/mail-config.glade.h:197
 msgid "seconds"
 msgstr "eiliadau"
 
@@ -13804,8 +14107,7 @@ msgstr "Pob plygell leol"
 msgid "Co_mpleted"
 msgstr "_Cyflawnwyd"
 
-#: ../mail/mail-dialogs.glade.h:9
-#: ../mail/message-tag-followup.c:270
+#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tag-followup.c:270
 msgid "Flag to Follow Up"
 msgstr "Baner i Ddilyn Lan"
 
@@ -13834,7 +14136,8 @@ msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
 msgstr ""
-"Mae'r negeseuon yr ydych wedi eu dewis ar gyfer dilyn i fyny wedi eu rhestru isod.\n"
+"Mae'r negeseuon yr ydych wedi eu dewis ar gyfer dilyn i fyny wedi eu rhestru "
+"isod.\n"
 "Dewiswch weithred ddilyn i fyny o'r ddewislen \"Baner\"."
 
 #: ../mail/mail-dialogs.glade.h:17
@@ -13870,10 +14173,10 @@ msgstr "Gafael Ebost"
 #: ../mail/mail-ops.c:562
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
-msgstr "Methu rhoi'r hidlyddion ar waith ar gyfer e-bost sy'n cael ei anfon allan: %s"
+msgstr ""
+"Methu rhoi'r hidlyddion ar waith ar gyfer e-bost sy'n cael ei anfon allan: %s"
 
-#: ../mail/mail-ops.c:574
-#: ../mail/mail-ops.c:601
+#: ../mail/mail-ops.c:574 ../mail/mail-ops.c:601
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13887,8 +14190,7 @@ msgstr ""
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Methu atodi at y blygell `Anfonwyd' lleol: %s"
 
-#: ../mail/mail-ops.c:724
-#: ../mail/mail-ops.c:805
+#: ../mail/mail-ops.c:724 ../mail/mail-ops.c:805
 msgid "Sending message"
 msgstr "Anfon neges"
 
@@ -13902,13 +14204,11 @@ msgstr "Anfon neges %d o %d"
 msgid "Failed to send %d of %d messages"
 msgstr "Methwyd anfon %d o %d neges."
 
-#: ../mail/mail-ops.c:763
-#: ../mail/mail-send-recv.c:701
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:701
 msgid "Canceled."
 msgstr "Diddymwyd."
 
-#: ../mail/mail-ops.c:765
-#: ../mail/mail-send-recv.c:703
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:703
 msgid "Complete."
 msgstr "Cyflawn."
 
@@ -13969,8 +14269,7 @@ msgstr "Yn storio cyfrif '%s'"
 msgid "Refreshing folder"
 msgstr "Adnewyddu plygell"
 
-#: ../mail/mail-ops.c:1693
-#: ../mail/mail-ops.c:1743
+#: ../mail/mail-ops.c:1693 ../mail/mail-ops.c:1743
 msgid "Expunging folder"
 msgstr "Dileu plygell"
 
@@ -14017,8 +14316,7 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "Cadw'r atodiad"
 
-#: ../mail/mail-ops.c:2186
-#: ../mail/mail-ops.c:2194
+#: ../mail/mail-ops.c:2186 ../mail/mail-ops.c:2194
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14067,8 +14365,7 @@ msgstr "Diddymu _Popeth"
 msgid "Updating..."
 msgstr "Diweddaru..."
 
-#: ../mail/mail-send-recv.c:503
-#: ../mail/mail-send-recv.c:580
+#: ../mail/mail-send-recv.c:503 ../mail/mail-send-recv.c:580
 msgid "Waiting..."
 msgstr "Aros..."
 
@@ -14120,7 +14417,8 @@ msgstr "Methu creu cyfeiriadur sbwlio `%s': %s"
 #: ../mail/mail-tools.c:150
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
-msgstr "Ceisio defnyddio movemail gyda ffynhonnell sydd ddim ar ffurf mbox `%s'"
+msgstr ""
+"Ceisio defnyddio movemail gyda ffynhonnell sydd ddim ar ffurf mbox `%s'"
 
 #: ../mail/mail-tools.c:256
 #, c-format
@@ -14162,37 +14460,52 @@ msgstr "Plygell Chwilio Newydd"
 #: ../mail/mail.error.xml.h:1
 #, fuzzy
 msgid "A folder named \"{0}\" already exists. Please use a different name."
-msgstr "Mae plygell o'r enw &quot;{0}&quot; yn bodoli'n barod. Dewiswch enw gwahanol."
+msgstr ""
+"Mae plygell o'r enw &quot;{0}&quot; yn bodoli'n barod. Dewiswch enw gwahanol."
 
 #: ../mail/mail.error.xml.h:2
 #, fuzzy
 msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "Mae plygell o'r enw &quot;{1}&quot; yn bodoli'n barod. Dewiswch enw arall."
+msgstr ""
+"Mae plygell o'r enw &quot;{1}&quot; yn bodoli'n barod. Dewiswch enw arall."
 
 #: ../mail/mail.error.xml.h:3
 #, fuzzy
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
-"You can choose to ignore this folder, overwrite or append its contents, or quit."
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit."
 msgstr ""
 "Mae plygell, sydd heb fod yn wag, eisoes yn bodoli yn &quot;{1}&quot;.\n"
 "\n"
-"Gallwch ddewis anwybyddu'r blygell hon, trosysgrifo neu atodi at ei chynnwys, neu adael."
+"Gallwch ddewis anwybyddu'r blygell hon, trosysgrifo neu atodi at ei "
+"chynnwys, neu adael."
 
 #: ../mail/mail.error.xml.h:6
 #, fuzzy
-msgid "A read receipt notification has been requested for \"{1}\". Send the receipt notification to {0}?"
-msgstr "Mae cais am nodyn cadarnhad darllen ar gyfer &quot;{1}&quot;.  Anfon y nodyn cadarnhad at {0}?"
+msgid ""
+"A read receipt notification has been requested for \"{1}\". Send the receipt "
+"notification to {0}?"
+msgstr ""
+"Mae cais am nodyn cadarnhad darllen ar gyfer &quot;{1}&quot;.  Anfon y nodyn "
+"cadarnhad at {0}?"
 
 #: ../mail/mail.error.xml.h:7
 #, fuzzy
-msgid "A signature already exists with the name \"{0}\". Please specify a different name."
-msgstr "Mae llofnod o'r enw &quot;{0}&quot; yn bodoli'n barod. Dewiswch enw arall."
+msgid ""
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
+msgstr ""
+"Mae llofnod o'r enw &quot;{0}&quot; yn bodoli'n barod. Dewiswch enw arall."
 
 #: ../mail/mail.error.xml.h:8
-msgid "Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about."
-msgstr "Mae ychwanegu llinell Bwnc pwrpasol i'ch negeseuon yn rhoi gwell syniad o'i gynnwys i'r rhai sy'n ei dderbyn."
+msgid ""
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
+msgstr ""
+"Mae ychwanegu llinell Bwnc pwrpasol i'ch negeseuon yn rhoi gwell syniad o'i "
+"gynnwys i'r rhai sy'n ei dderbyn."
 
 #: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account and all its proxies?"
@@ -14203,7 +14516,8 @@ msgid "Are you sure you want to delete this account?"
 msgstr "Ydych chi'n siŵr eich bod am ddileu'r cyfrif hwn?"
 
 #: ../mail/mail.error.xml.h:11
-msgid "Are you sure you want to disable this account and delete all its proxies?"
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
 msgstr "Ydych chi'n siŵr eich bod am ddileu'r cyfrif hwn a'i holl ddirprwyon?"
 
 #: ../mail/mail.error.xml.h:12
@@ -14211,13 +14525,21 @@ msgid "Are you sure you want to open {0} messages at once?"
 msgstr "Ydych chi'n siŵr eich bod am agor {0} neges ar yr un pryd?"
 
 #: ../mail/mail.error.xml.h:13
-msgid "Are you sure you want to permanently remove all the deleted messages in all folders?"
-msgstr "Ydych chi'n siŵr eich bod am waredu'n barhaol bob neges a ddilëwyd ym mhob plygell?"
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr ""
+"Ydych chi'n siŵr eich bod am waredu'n barhaol bob neges a ddilëwyd ym mhob "
+"plygell?"
 
 #: ../mail/mail.error.xml.h:14
 #, fuzzy
-msgid "Are you sure you want to permanently remove all the deleted messages in folder \"{0}\"?"
-msgstr "Ydych chi'n siŵr eich bod am waredu'n barhaol bob neges a ddilëwyd ym mhob plygell?"
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in "
+"folder \"{0}\"?"
+msgstr ""
+"Ydych chi'n siŵr eich bod am waredu'n barhaol bob neges a ddilëwyd ym mhob "
+"plygell?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
@@ -14292,8 +14614,12 @@ msgid "Cannot open target \"{2}\"."
 msgstr "Methu agor targed \"{2}\"."
 
 #: ../mail/mail.error.xml.h:34
-msgid "Cannot read the license file \"{0}\", due to an installation problem. You will not be able to use this provider until you can accept its license."
-msgstr "Methu darllen y ffeil drwydded \"{0}\", oherwydd problem yn y gosodiad.  Fedrwch chi ddim defnyddio'r darparwr hwn nes i chi dderbyn ei drwydded."
+msgid ""
+"Cannot read the license file \"{0}\", due to an installation problem. You "
+"will not be able to use this provider until you can accept its license."
+msgstr ""
+"Methu darllen y ffeil drwydded \"{0}\", oherwydd problem yn y gosodiad.  "
+"Fedrwch chi ddim defnyddio'r darparwr hwn nes i chi dderbyn ei drwydded."
 
 #: ../mail/mail.error.xml.h:35
 msgid "Cannot rename \"{0}\" to \"{1}\"."
@@ -14325,8 +14651,13 @@ msgid "Check Junk Failed"
 msgstr "Gwirio am _Sothach"
 
 #: ../mail/mail.error.xml.h:42
-msgid "Check to make sure your password is spelled correctly. Remember that many passwords are case sensitive; your caps lock might be on."
-msgstr "Sicrhewch fod eich cyfrinair wedi ei sillafu'n gywir.  Cofiwch fod llythrennau mawr yn lle llythrennau bach yn gwneud gwahaniaeth mewn sawl cyfrinair; gall fod eich clo llythrennau mawr (caps lock) ymlaen."
+msgid ""
+"Check to make sure your password is spelled correctly. Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+msgstr ""
+"Sicrhewch fod eich cyfrinair wedi ei sillafu'n gywir.  Cofiwch fod "
+"llythrennau mawr yn lle llythrennau bach yn gwneud gwahaniaeth mewn sawl "
+"cyfrinair; gall fod eich clo llythrennau mawr (caps lock) ymlaen."
 
 #: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
@@ -14367,7 +14698,9 @@ msgid "Do not disable"
 msgstr "Peidiwch ag analluogi"
 
 #: ../mail/mail.error.xml.h:52
-msgid "Do you want to locally synchronize the folders that are marked for offline usage?"
+msgid ""
+"Do you want to locally synchronize the folders that are marked for offline "
+"usage?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:53
@@ -14407,12 +14740,15 @@ msgid "If you continue, you will not be able to recover these messages."
 msgstr "Os wnewch chi barhau, fyddwch chi ddim yn medru adfer y negeseuon."
 
 #: ../mail/mail.error.xml.h:62
-msgid "If you delete the folder, all of its contents and its subfolders contents will be deleted permanently."
+msgid ""
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
 msgstr "Os wnewch chi ddileu'r blygell"
 
 #: ../mail/mail.error.xml.h:63
 msgid "If you proceed, all proxy accounts will be deleted permanently."
-msgstr "Os wnewch chi barhau, bydd pob cyfrif dirprwy yn cael ei ddileu'n barhaol."
+msgstr ""
+"Os wnewch chi barhau, bydd pob cyfrif dirprwy yn cael ei ddileu'n barhaol."
 
 #: ../mail/mail.error.xml.h:64
 msgid ""
@@ -14424,11 +14760,17 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:66
 msgid "If you proceed, the account information will be deleted permanently."
-msgstr "Os wnewch chi barhau, bydd y wybodaeth am y cyfrif yn cael ei ddileu'n barhaol."
+msgstr ""
+"Os wnewch chi barhau, bydd y wybodaeth am y cyfrif yn cael ei ddileu'n "
+"barhaol."
 
 #: ../mail/mail.error.xml.h:67
-msgid "If you quit, these messages will not be sent until Evolution is started again."
-msgstr "Os wnewch chi adael, fydd y negeseuon hyn ddim yn cael eu hanfon nes i chi ail-gychwyn Evolution."
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+msgstr ""
+"Os wnewch chi adael, fydd y negeseuon hyn ddim yn cael eu hanfon nes i chi "
+"ail-gychwyn Evolution."
 
 #: ../mail/mail.error.xml.h:68
 msgid "Ignore"
@@ -14443,8 +14785,16 @@ msgid "Mail filters automatically updated."
 msgstr "Hidlyddion e-bost wedi'u diweddaru'n awtomatig."
 
 #: ../mail/mail.error.xml.h:72
-msgid "Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at least one To: or CC: recipient."
-msgstr "Mae sawl system e-bost yn ychwanegu pennawd Apparently-To at negeseuon sydd â dim ond derbynwyr BCC. Os ychwanegir y pennawd hwn, fe fydd yr holl dderbynwyr yn cael eu rhestru o fewn y neges beth bynnag. I osgoi hyn, dylech ychwanegu o leiaf un derbyniwr At: neu CC:."
+msgid ""
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
+msgstr ""
+"Mae sawl system e-bost yn ychwanegu pennawd Apparently-To at negeseuon sydd "
+"â dim ond derbynwyr BCC. Os ychwanegir y pennawd hwn, fe fydd yr holl "
+"dderbynwyr yn cael eu rhestru o fewn y neges beth bynnag. I osgoi hyn, "
+"dylech ychwanegu o leiaf un derbyniwr At: neu CC:."
 
 #: ../mail/mail.error.xml.h:73
 msgid "Mark all messages as read"
@@ -14471,16 +14821,22 @@ msgid "Please enable the account or send using another account."
 msgstr "Galluogwch y cyfrif neu defnyddiwch gyfrif arall ar gyfer anfon."
 
 #: ../mail/mail.error.xml.h:80
-msgid "Please enter a valid email address in the To: field. You can search for email addresses by clicking on the To: button next to the entry box."
-msgstr "Rhowch gyfeiriad e-bost dilys yn y maes At:. Gallwch chwilio am gyfeiriadau e-bost wrth glicio ar y botwm At: sydd nesaf at y blwch cofnod."
+msgid ""
+"Please enter a valid email address in the To: field. You can search for "
+"email addresses by clicking on the To: button next to the entry box."
+msgstr ""
+"Rhowch gyfeiriad e-bost dilys yn y maes At:. Gallwch chwilio am gyfeiriadau "
+"e-bost wrth glicio ar y botwm At: sydd nesaf at y blwch cofnod."
 
 #: ../mail/mail.error.xml.h:81
 #, fuzzy
 msgid ""
-"Please make sure the following recipients are willing and able to receive HTML email:\n"
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
 "{0}"
 msgstr ""
-"Gwnewch yn siŵr fod y derbynwyr canlynol yn medru derbyn ac yn barod i dderbyn e-bost HTML:\n"
+"Gwnewch yn siŵr fod y derbynwyr canlynol yn medru derbyn ac yn barod i "
+"dderbyn e-bost HTML:\n"
 "{0}\n"
 "Anfon beth bynnag?"
 
@@ -14543,18 +14899,29 @@ msgid "Synchronize folders locally for offline usage?"
 msgstr "Calendr heb ei farcio ar gyfer defnydd all-lein."
 
 #: ../mail/mail.error.xml.h:97
-msgid "System folders are required for Evolution to function correctly and cannot be renamed, moved, or deleted."
-msgstr "Mae Evolution angen plygellau'r system er mwyn gweithio'n gywir, ac ni ellir eu hail-enwi, eu symud na'u dileu."
+msgid ""
+"System folders are required for Evolution to function correctly and cannot "
+"be renamed, moved, or deleted."
+msgstr ""
+"Mae Evolution angen plygellau'r system er mwyn gweithio'n gywir, ac ni ellir "
+"eu hail-enwi, eu symud na'u dileu."
 
 #: ../mail/mail.error.xml.h:98
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
-"Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients in your message. To avoid this, you should add at least one To: or CC: recipient. "
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
 msgstr ""
-"Mae'r rhestr cysylltiadau rydych chi'n anfon ati wedi ei chyflunio i guddio'r rhestr derbynwyr.\n"
+"Mae'r rhestr cysylltiadau rydych chi'n anfon ati wedi ei chyflunio i "
+"guddio'r rhestr derbynwyr.\n"
 "\n"
-"Mae sawl system e-bost yn ychwanegu pennawd Apparently-To at negeseuon sydd â dim ond derbynwyr BCC. Os ychwanegir y pennawd hwn, fe welir yr holl dderbynwyr o fewn eich neges. I osgoi hyn, dylech ychwanegu o leiaf un derbyniwr At: neu CC:."
+"Mae sawl system e-bost yn ychwanegu pennawd Apparently-To at negeseuon sydd "
+"â dim ond derbynwyr BCC. Os ychwanegir y pennawd hwn, fe welir yr holl "
+"dderbynwyr o fewn eich neges. I osgoi hyn, dylech ychwanegu o leiaf un "
+"derbyniwr At: neu CC:."
 
 #: ../mail/mail.error.xml.h:101
 #, fuzzy
@@ -14599,32 +14966,49 @@ msgstr ""
 "Ewch i'r golygydd Plygell Chwilio i'w hychwanegu'n benodol, os oes angen."
 
 #: ../mail/mail.error.xml.h:114
-msgid "This message cannot be sent because the account you chose to send with is not enabled"
-msgstr "Methu anfon y neges am nad yw'r cyfrif yr ydych am anfon drwyddo wedi ei alluogi"
+msgid ""
+"This message cannot be sent because the account you chose to send with is "
+"not enabled"
+msgstr ""
+"Methu anfon y neges am nad yw'r cyfrif yr ydych am anfon drwyddo wedi ei "
+"alluogi"
 
 #: ../mail/mail.error.xml.h:115
-msgid "This message cannot be sent because you have not specified any recipients"
+msgid ""
+"This message cannot be sent because you have not specified any recipients"
 msgstr "Methu anfon y neges am nad ydych wedi penodi unrhyw un i'w dderbyn"
 
 #: ../mail/mail.error.xml.h:116
-msgid "This server does not support this type of authentication and may not support authentication at all."
-msgstr "Nid yw'r gweinydd yn cynnal y math hwn o ddilysiant ac mae'n bosib nad yw'n cynnal dilysiant o gwbl."
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr ""
+"Nid yw'r gweinydd yn cynnal y math hwn o ddilysiant ac mae'n bosib nad yw'n "
+"cynnal dilysiant o gwbl."
 
 #: ../mail/mail.error.xml.h:117
 msgid "This signature has been changed, but has not been saved."
 msgstr "Mae'r llofnod wedi cael ei newid, ond mae heb gael ei arbed."
 
 #: ../mail/mail.error.xml.h:118
-msgid "This will mark all messages as read in the selected folder and its subfolders."
-msgstr "Marcio bob neges yn y blygell a ddewiswyd, a'r is-blygellau, fel rhai wedi'u darllen."
+msgid ""
+"This will mark all messages as read in the selected folder and its "
+"subfolders."
+msgstr ""
+"Marcio bob neges yn y blygell a ddewiswyd, a'r is-blygellau, fel rhai wedi'u "
+"darllen."
 
 #: ../mail/mail.error.xml.h:119
 msgid "Unable to connect to the GroupWise server."
 msgstr "Methwyd cysylltu â'r gweinydd GroupWise."
 
 #: ../mail/mail.error.xml.h:120
-msgid "Unable to open the drafts folder for this account. Use the system drafts folder instead?"
-msgstr "Methu agor y blygell ddrafftiau ar gyfer y cyfrif. Defnyddio plygell ddrafftiau'r system yn lle hynny?"
+msgid ""
+"Unable to open the drafts folder for this account. Use the system drafts "
+"folder instead?"
+msgstr ""
+"Methu agor y blygell ddrafftiau ar gyfer y cyfrif. Defnyddio plygell "
+"ddrafftiau'r system yn lle hynny?"
 
 #: ../mail/mail.error.xml.h:121
 msgid "Unable to read license file."
@@ -14640,7 +15024,8 @@ msgstr "Defnyddio plygell ddrafftiau rhagosodedig?"
 
 #: ../mail/mail.error.xml.h:124
 msgid ""
-"Warning: Deleting messages from a Search Folder will delete the actual message from one of your local or remote folders.\n"
+"Warning: Deleting messages from a Search Folder will delete the actual "
+"message from one of your local or remote folders.\n"
 "Do you really want to do this?"
 msgstr ""
 
@@ -14650,7 +15035,9 @@ msgstr "Dydych chi ddim wedi rhoi'r holl wybodaeth angenrheidiol."
 
 #: ../mail/mail.error.xml.h:128
 msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "Mae gennych negeseuon heb eu hanfon, ydych chi am adael y rhaglen beth bynnag?"
+msgstr ""
+"Mae gennych negeseuon heb eu hanfon, ydych chi am adael y rhaglen beth "
+"bynnag?"
 
 #: ../mail/mail.error.xml.h:129
 msgid "You may not create two accounts with the same name."
@@ -14667,10 +15054,12 @@ msgstr "Rhaid i chi benodi plygell."
 #: ../mail/mail.error.xml.h:132
 msgid ""
 "You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting all local folders, all remote folders, or both."
+"Either by selecting the folders individually, and/or by selecting all local "
+"folders, all remote folders, or both."
 msgstr ""
 "Rhaid i chi benodi o leiaf un plygell fel ffynhonnell,\n"
-"naill ai wrth ddewis y plygellau'n unigol, ac/neu wrth ddewis bob plygell lleol, bob plygell pell, neu'r ddau."
+"naill ai wrth ddewis y plygellau'n unigol, ac/neu wrth ddewis bob plygell "
+"lleol, bob plygell pell, neu'r ddau."
 
 #: ../mail/mail.error.xml.h:134
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
@@ -14736,15 +15125,13 @@ msgstr "Uwch"
 msgid "Highest"
 msgstr "Uchaf"
 
-#: ../mail/message-list.c:1654
-#: ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1654 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1661
-#: ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1661 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Heddiw %l:%M %p"
 
@@ -14765,17 +15152,20 @@ msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3987
-#: ../mail/message-list.c:4462
+#: ../mail/message-list.c:3987 ../mail/message-list.c:4462
 msgid "Generating message list"
 msgstr "Creu rhestr negeseuon"
 
 #: ../mail/message-list.c:4299
-msgid "No message satisfies your search criteria. Either clear search with Search->Clear menu item or change it."
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
 msgstr ""
 
 #: ../mail/message-list.c:4301
-msgid "There are only hidden messages in this folder. Use View->Show Hidden Messages to show them."
+msgid ""
+"There are only hidden messages in this folder. Use View->Show Hidden "
+"Messages to show them."
 msgstr ""
 
 #: ../mail/message-list.c:4303
@@ -14833,8 +15223,7 @@ msgstr "Dilynol"
 msgid "For Your Information"
 msgstr "Er Gwybodaeth"
 
-#: ../mail/message-tag-followup.c:58
-#: ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:58 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Ymlaen"
 
@@ -14842,13 +15231,11 @@ msgstr "Ymlaen"
 msgid "No Response Necessary"
 msgstr "Dim Ymateb Angenrheidiol"
 
-#: ../mail/message-tag-followup.c:62
-#: ../ui/evolution-mail-message.xml.h:76
+#: ../mail/message-tag-followup.c:62 ../ui/evolution-mail-message.xml.h:76
 msgid "Reply"
 msgstr "Ateb"
 
-#: ../mail/message-tag-followup.c:63
-#: ../ui/evolution-mail-message.xml.h:77
+#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:77
 msgid "Reply to All"
 msgstr "Ateb i Bawb"
 
@@ -14900,11 +15287,15 @@ msgid "Local Address Books"
 msgstr "Llyfr Cyfeiriadau Lleol"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid "List of clues for the attachment reminder plugin to look for in a message body"
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body"
 msgstr ""
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid "List of clues for the attachment reminder plugin to look for in a message body."
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body."
 msgstr ""
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:476
@@ -14921,10 +15312,16 @@ msgstr "Bar Atodiadau"
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
 msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr ""
+"Mae'n atgoffa chi pan rydych wedi anghofio ychwanegu atodiad i'ch neges "
+"ebost."
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
-msgid "Evolution has found some keywords that suggest that this message should contain an attachment, but cannot find one."
+msgid ""
+"Evolution has found some keywords that suggest that this message should "
+"contain an attachment, but cannot find one."
 msgstr ""
+"Mae Evolution wedi sylwi ar rhai geiriau yn eich neges hwn sy'n awgrymu "
+"dylai cynnwys atodiad, ond mae methu canfod un."
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
 #, fuzzy
@@ -14945,8 +15342,9 @@ msgid "Audio Inline"
 msgstr "Ategyn sain mewnol"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
+#, fuzzy
 msgid "Play audio attachments directly from Evolution."
-msgstr ""
+msgstr "Dangos vCards yn uniongyrchol mewn negeseuon ebost."
 
 #: ../plugins/backup-restore/backup-restore.c:139
 #, fuzzy
@@ -14972,9 +15370,13 @@ msgstr "Adfer o'r copi wrth gefn"
 
 #: ../plugins/backup-restore/backup-restore.c:289
 #, fuzzy
-msgid "You can restore Evolution from your backup. It can restore all the Mails, Calendars, Tasks, Memos, Contacts. It also restores all your personal settings, mail filters etc."
+msgid ""
+"You can restore Evolution from your backup. It can restore all the Mails, "
+"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
+"settings, mail filters etc."
 msgstr ""
-"Gallwch adfer Evolution o'ch archif. Gellir adfer yr holl E-bost/Calendrau/Tasgau/Memos/Llyfr Cyfeiriadau. \n"
+"Gallwch adfer Evolution o'ch archif. Gellir adfer yr holl E-bost/Calendrau/"
+"Tasgau/Memos/Llyfr Cyfeiriadau. \n"
 "Mae hefyd yn adfer eich holl osodiadau personol, hidlyddion e-bost a.y.b."
 
 #: ../plugins/backup-restore/backup-restore.c:297
@@ -14999,9 +15401,8 @@ msgid "Restore Evolution directory"
 msgstr "Adfer cyfeiriadur Evolution"
 
 #: ../plugins/backup-restore/backup.c:66
-#, fuzzy
 msgid "Check Evolution Backup"
-msgstr "Copi wrth Gefn Evolution"
+msgstr "Gwirio Copi Wrth Gefn Evolution"
 
 #: ../plugins/backup-restore/backup.c:68
 msgid "Restart Evolution"
@@ -15009,7 +15410,7 @@ msgstr "Ail-gychwyn Evolution"
 
 #: ../plugins/backup-restore/backup.c:70
 msgid "With Graphical User Interface"
-msgstr ""
+msgstr "Gyda Rhyngwyneb Defnyddiwr Graffegol"
 
 #: ../plugins/backup-restore/backup.c:188
 #: ../plugins/backup-restore/backup.c:250
@@ -15022,7 +15423,9 @@ msgstr "Creu copi wrth gefn o ddata a gosodiadau Evolution"
 
 #: ../plugins/backup-restore/backup.c:201
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
-msgstr "Gwneud copi wrth gefn o ddata Evolution (E-bost, Cysylltiadau, Calendr, Tasgau, Memos)"
+msgstr ""
+"Gwneud copi wrth gefn o ddata Evolution (E-bost, Cysylltiadau, Calendr, "
+"Tasgau, Memos)"
 
 #: ../plugins/backup-restore/backup.c:212
 msgid "Backup complete"
@@ -15056,9 +15459,9 @@ msgid "Ensuring local sources"
 msgstr ""
 
 #: ../plugins/backup-restore/backup.c:429
-#, fuzzy, c-format
+#, c-format
 msgid "Backing up to the folder %s"
-msgstr "Copi wrth gefn i %s"
+msgstr "Gwneud copi wrth gefn i'r plygell %s"
 
 #: ../plugins/backup-restore/backup.c:434
 #, fuzzy, c-format
@@ -15113,12 +15516,21 @@ msgstr "Ydych chi'n siŵr eich bod am gau Evolution?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
 #, fuzzy
-msgid "Are you sure you want to restore Evolution from the selected backup file?"
+msgid ""
+"Are you sure you want to restore Evolution from the selected backup file?"
 msgstr "Ydych chi'n siŵr eich bod am adfer Evolution o'r archif a ddewiswyd?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-msgid "Evolution backup can start only when Evolution is not running. Please make sure that you save and close all your unsaved windows before proceeding.  If you want Evolution to restart automatically after backup, please enable the toggle button."
-msgstr "Dim ond pan nad yw Evolution yn rhedeg y gellir cychwyn creu copi wrth gefn. Cyn symud ymlaen, gwnewch yn siŵr eich bod yn cadw ac yn cau'r holl ffenestri sydd heb eu cadw. Os ydych am i Evolution ail-gychwyn yn awtomatig ar ôl creu'r copi wrth gefn, galluogwch y botwm toglu."
+msgid ""
+"Evolution backup can start only when Evolution is not running. Please make "
+"sure that you save and close all your unsaved windows before proceeding.  If "
+"you want Evolution to restart automatically after backup, please enable the "
+"toggle button."
+msgstr ""
+"Dim ond pan nad yw Evolution yn rhedeg y gellir cychwyn creu copi wrth gefn. "
+"Cyn symud ymlaen, gwnewch yn siŵr eich bod yn cadw ac yn cau'r holl "
+"ffenestri sydd heb eu cadw. Os ydych am i Evolution ail-gychwyn yn awtomatig "
+"ar ôl creu'r copi wrth gefn, galluogwch y botwm toglu."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
 #, fuzzy
@@ -15141,10 +15553,21 @@ msgid "The selected folder is not writable."
 msgstr "Copïo'r blygell a ddewiswyd i blygell arall"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
-msgid "This will delete all your current Evolution data and settings and restore them from your backup. Evolution restore can start only when Evolution is not running. Please make sure that you close all your unsaved windows before you proceed. If you want Evolution to restart automatically restart after restore, please enable the toggle button."
-msgstr "Bydd hyn yn dileu'r holl ddata a gosodiadau Evolution sydd gennych, ac yn eu hadfer o'r copi wrth gefn. Dim ond pan nad yw Evolution ar waith gall y broses o adfer Evolution gychwyn. Cyn symud ymlaen, gwnewch yn siŵr eich bod yn cau'r holl ffenestri nad ydynt wedi'u cadw. Os ydych am i Evolution ail-gychwyn yn awtomatig ar ôl creu'r copi wrth gefn, galluogwch y botwm toglu."
+msgid ""
+"This will delete all your current Evolution data and settings and restore "
+"them from your backup. Evolution restore can start only when Evolution is "
+"not running. Please make sure that you close all your unsaved windows before "
+"you proceed. If you want Evolution to restart automatically restart after "
+"restore, please enable the toggle button."
+msgstr ""
+"Bydd hyn yn dileu'r holl ddata a gosodiadau Evolution sydd gennych, ac yn eu "
+"hadfer o'r copi wrth gefn. Dim ond pan nad yw Evolution ar waith gall y "
+"broses o adfer Evolution gychwyn. Cyn symud ymlaen, gwnewch yn siŵr eich bod "
+"yn cau'r holl ffenestri nad ydynt wedi'u cadw. Os ydych am i Evolution ail-"
+"gychwyn yn awtomatig ar ôl creu'r copi wrth gefn, galluogwch y botwm toglu."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
+#, fuzzy
 msgid "Backup and restore Evolution data and settings"
 msgstr "Creu copi wrth gefn, ac adfer data a gosodiadau Evolution"
 
@@ -15156,8 +15579,7 @@ msgstr "_Gosodiadau Adfer..."
 msgid "_Backup Settings..."
 msgstr "_Gosodiadau Creu Copi wrth Gefn..."
 
-#: ../plugins/bbdb/bbdb.c:622
-#: ../plugins/bbdb/bbdb.c:631
+#: ../plugins/bbdb/bbdb.c:622 ../plugins/bbdb/bbdb.c:631
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Cysylltiadau Awtomatig"
@@ -15180,7 +15602,9 @@ msgstr "Cysylltiadau Negesu Sydyn"
 #: ../plugins/bbdb/bbdb.c:682
 #, fuzzy
 msgid "Synchronize contact info and images from Pidgin buddy list"
-msgstr "Cysoni bob hyn a hyn y wybodaeth am gysylltion a'u delweddau o restr ffrindiau gaim"
+msgstr ""
+"Cysoni bob hyn a hyn y wybodaeth am gysylltion a'u delweddau o restr "
+"ffrindiau gaim"
 
 #: ../plugins/bbdb/bbdb.c:688
 #, fuzzy
@@ -15201,8 +15625,13 @@ msgstr "BBDB"
 msgid ""
 "Takes the gruntwork out of managing your address book.\n"
 "\n"
-"Automatically fills your address book with names and email addresses as you reply to messages.  Also fills in IM contact information from your buddy lists."
-msgstr "Llenwi'ch llyfr cyfeiriadau'n awtomatig ag enwau a chyfeiriadau e-bost wrth i chi ymateb i negeseuon. Hefyd yn llenwi gwybodaeth negesu sydyn o'ch rhestrau ffrindiau."
+"Automatically fills your address book with names and email addresses as you "
+"reply to messages.  Also fills in IM contact information from your buddy "
+"lists."
+msgstr ""
+"Llenwi'ch llyfr cyfeiriadau'n awtomatig ag enwau a chyfeiriadau e-bost wrth "
+"i chi ymateb i negeseuon. Hefyd yn llenwi gwybodaeth negesu sydyn o'ch "
+"rhestrau ffrindiau."
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
@@ -15236,8 +15665,12 @@ msgid "Convert mail messages to Unicode"
 msgstr "Trosi testun e-bost i Unicode"
 
 #: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
-msgid "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from different character sets."
-msgstr "Trosi neges destun i UTF-8 Unicode er mwyn uno tocynnau sothach/ddim-yn-sothach sydd wedi'u creu mewn setiau nodau gwahanol."
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr ""
+"Trosi neges destun i UTF-8 Unicode er mwyn uno tocynnau sothach/ddim-yn-"
+"sothach sydd wedi'u creu mewn setiau nodau gwahanol."
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
 msgid "Bogofilter Junk Filter"
@@ -15268,19 +15701,19 @@ msgstr "Defnyddio _SSL"
 
 #. add refresh option
 #: ../plugins/caldav/caldav-source.c:433
-#: ../plugins/calendar-file/calendar-file.c:267
+#: ../plugins/calendar-file/calendar-file.c:274
 #: ../plugins/calendar-http/calendar-http.c:308
 #: ../plugins/calendar-weather/calendar-weather.c:508
-#: ../plugins/google-account-setup/google-source.c:698
+#: ../plugins/google-account-setup/google-source.c:718
 #: ../plugins/google-account-setup/google-contacts-source.c:322
 msgid "Re_fresh:"
 msgstr "_Adnewyddu:"
 
 #: ../plugins/caldav/caldav-source.c:451
-#: ../plugins/calendar-file/calendar-file.c:289
+#: ../plugins/calendar-file/calendar-file.c:296
 #: ../plugins/calendar-http/calendar-http.c:326
 #: ../plugins/calendar-weather/calendar-weather.c:526
-#: ../plugins/google-account-setup/google-source.c:723
+#: ../plugins/google-account-setup/google-source.c:743
 #: ../plugins/google-account-setup/google-contacts-source.c:333
 msgid "weeks"
 msgstr "wythnosau"
@@ -15294,37 +15727,37 @@ msgstr ""
 msgid "CalDAV Support"
 msgstr "Ffynonellau CalDAV"
 
-#: ../plugins/calendar-file/calendar-file.c:204
+#: ../plugins/calendar-file/calendar-file.c:208
 #, fuzzy
 msgid "_Customize options"
 msgstr "Addasu"
 
-#: ../plugins/calendar-file/calendar-file.c:224
+#: ../plugins/calendar-file/calendar-file.c:227
 msgid "File _name:"
 msgstr "_Enw ffeil:"
 
-#: ../plugins/calendar-file/calendar-file.c:228
+#: ../plugins/calendar-file/calendar-file.c:231
 #, fuzzy
 msgid "Choose calendar file"
 msgstr "Dewiswch ffeil"
 
-#: ../plugins/calendar-file/calendar-file.c:272
+#: ../plugins/calendar-file/calendar-file.c:279
 #, fuzzy
 msgid "On open"
 msgstr "Agor"
 
-#: ../plugins/calendar-file/calendar-file.c:273
+#: ../plugins/calendar-file/calendar-file.c:280
 msgid "On file change"
 msgstr ""
 
-#: ../plugins/calendar-file/calendar-file.c:274
+#: ../plugins/calendar-file/calendar-file.c:281
 #, fuzzy
 msgid "Periodically"
 msgstr "Personol"
 
-#: ../plugins/calendar-file/calendar-file.c:301
+#: ../plugins/calendar-file/calendar-file.c:308
 msgid "Force read _only"
-msgstr ""
+msgstr "Gorfodi darllen yn _unig"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
 msgid "Add local calendars to Evolution."
@@ -15405,7 +15838,7 @@ msgstr "Imperial (Fahrenheit, modfeddi, a.y.b.)"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
 msgid "Add weather calendars to Evolution."
-msgstr ""
+msgstr "Ychwanegu calendrau tywydd i Evolution."
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
 msgid "Weather Calendars"
@@ -15416,6 +15849,7 @@ msgid "Copy Tool"
 msgstr "Arf Copïo"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
+#, fuzzy
 msgid "Copy things to the clipboard."
 msgstr "Copïo pethau i'r clipfwrdd"
 
@@ -15424,8 +15858,11 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "Gwirio ai Evolution yw'r rhaglen e-bost ragosodedig"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid "Every time Evolution starts, check whether or not it is the default mailer."
-msgstr "Bob tro mae Evolution yn cychwyn, gwirio ai Evolution yw'r rhaglen e-bost ragosodedig."
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
+msgstr ""
+"Bob tro mae Evolution yn cychwyn, gwirio ai Evolution yw'r rhaglen e-bost "
+"ragosodedig."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
 #, fuzzy
@@ -15533,7 +15970,10 @@ msgid "List of Custom Headers"
 msgstr "Penawdau Addasedig"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
-msgid "The key specifies the list of custom headers that you can add to an outgoing message. The format for specifying a Header and Header value is: Name of the custom header followed by \"=\" and the values separated by \";\""
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
 msgstr ""
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
@@ -15559,16 +15999,24 @@ msgstr "Cyfrinair Diogel"
 
 #. i18n: "NTLM" probably doesn't translate
 #: ../plugins/exchange-operations/exchange-account-setup.c:66
-msgid "This option will connect to the Exchange server using secure password (NTLM) authentication."
-msgstr "Bydd yr opsiwn hwn yn cysylltu â'r gweinydd Exchange gan ddefnyddio dilysiant cyfrinair diogel (NTLM)."
+msgid ""
+"This option will connect to the Exchange server using secure password (NTLM) "
+"authentication."
+msgstr ""
+"Bydd yr opsiwn hwn yn cysylltu â'r gweinydd Exchange gan ddefnyddio "
+"dilysiant cyfrinair diogel (NTLM)."
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid "Plaintext Password"
 msgstr "Cyfrinair Testun Plaen"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:76
-msgid "This option will connect to the Exchange server using standard plaintext password authentication."
-msgstr "Bydd yr opsiwn hwn yn cysylltu â'r gweinydd Exchange gan ddefnyddio dilysiant cyfrinair arferol, testun plaen."
+msgid ""
+"This option will connect to the Exchange server using standard plaintext "
+"password authentication."
+msgstr ""
+"Bydd yr opsiwn hwn yn cysylltu â'r gweinydd Exchange gan ddefnyddio "
+"dilysiant cyfrinair arferol, testun plaen."
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:271
 msgid "Out Of Office"
@@ -15651,10 +16099,6 @@ msgstr "_Ebost"
 msgid "_Authentication Type"
 msgstr "Math Dilysi_ant"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1015
-msgid "Ch_eck for Supported Types"
-msgstr "_Gwirio am Fathau wedi Cynnal"
-
 #: ../plugins/exchange-operations/exchange-account-setup.c:1130
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 #, c-format
@@ -15680,15 +16124,20 @@ msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
 msgstr ""
-"Mae Evolution yn y modd all-lein. Fedrwch chi ddim creu na newid plygellau nawr.\n"
+"Mae Evolution yn y modd all-lein. Fedrwch chi ddim creu na newid plygellau "
+"nawr.\n"
 "Newidiwch i'r modd ar-lein ar gyfer y gweithredoedd hynny."
 
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
 #: ../plugins/exchange-operations/exchange-change-password.c:114
-msgid "The current password does not match the existing password for your account. Please enter the correct password"
-msgstr "Nid yw'r cyfrinair yr un peth â chyfrinair presennol eich cyfrif. Rhowch y cyfrinair cywir"
+msgid ""
+"The current password does not match the existing password for your account. "
+"Please enter the correct password"
+msgstr ""
+"Nid yw'r cyfrinair yr un peth â chyfrinair presennol eich cyfrif. Rhowch y "
+"cyfrinair cywir"
 
 #: ../plugins/exchange-operations/exchange-change-password.c:121
 msgid "The two passwords do not match. Please re-enter the passwords."
@@ -15747,7 +16196,9 @@ msgstr "Caniatadau ar gyfer %s"
 #. summarizing the permissions assigned to him.
 #.
 #: ../plugins/exchange-operations/exchange-delegates-user.c:326
-msgid "This message was sent automatically by Evolution to inform you that you have been designated as a delegate. You can now send messages on my behalf."
+msgid ""
+"This message was sent automatically by Evolution to inform you that you have "
+"been designated as a delegate. You can now send messages on my behalf."
 msgstr ""
 
 #. To translators: Another chunk of the same message.
@@ -15935,10 +16386,12 @@ msgstr "<b>Statws:</b>"
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:6
 msgid ""
-"<small>The message specified below will be automatically sent to each person who sends\n"
+"<small>The message specified below will be automatically sent to each person "
+"who sends\n"
 "mail to you while you are out of the office.</small>"
 msgstr ""
-"<small>Bydd y neges a benodir isod yn cael ei hanfon yn awtomatig at bob person fydd yn anfon\n"
+"<small>Bydd y neges a benodir isod yn cael ei hanfon yn awtomatig at bob "
+"person fydd yn anfon\n"
 "e-bost atoch chi tra byddwch chi allan o'r swyddfa.</small>"
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:8
@@ -16144,8 +16597,12 @@ msgid "Cannot perform the operation."
 msgstr "Methu gwneud y weithred."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
-msgid "Changes to options for Exchange account \"{0}\" will only take effect after restarting Evolution."
-msgstr "Bydd y newidiadau i gyfluniad cyfrif Evolution \"{0}\" yn dod i rym wedi i chi adael ac ail-ddechrau Evolution."
+msgid ""
+"Changes to options for Exchange account \"{0}\" will only take effect after "
+"restarting Evolution."
+msgstr ""
+"Bydd y newidiadau i gyfluniad cyfrif Evolution \"{0}\" yn dod i rym wedi i "
+"chi adael ac ail-ddechrau Evolution."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid "Could not authenticate to server."
@@ -16161,7 +16618,8 @@ msgid ""
 "an unknown error occurred. Check the URL, \n"
 "username, and password, and try again."
 msgstr ""
-"Methu cyflunio cyfrif Exchange am i wall anhysbys ddigwydd. Gwiriwch y LAU, yr enw defnyddiwr,\n"
+"Methu cyflunio cyfrif Exchange am i wall anhysbys ddigwydd. Gwiriwch y LAU, "
+"yr enw defnyddiwr,\n"
 "a'r cyfrinair, cyn ail-geisio."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
@@ -16271,8 +16729,12 @@ msgid "Global Catalog Server is not reachable"
 msgstr "Methu cyrraedd y gweinydd Catalog cyffredinol"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
-msgid "If OWA is running on a different path, you must specify that in the account configuration dialog."
-msgstr "Os yw OWA yn rhedeg ar lwybr gwahanol, rhaid i chi roi hynny yn y ddeialog cyflunio cyfrif."
+msgid ""
+"If OWA is running on a different path, you must specify that in the account "
+"configuration dialog."
+msgstr ""
+"Os yw OWA yn rhedeg ar lwybr gwahanol, rhaid i chi roi hynny yn y ddeialog "
+"cyflunio cyfrif."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Mailbox for {0} is not on this server."
@@ -16284,15 +16746,19 @@ msgstr "Gwnewch yn siŵr fod y LAU yn gywir, cyn ceisio eto."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the server name is spelled correctly and try again."
-msgstr "Gwnewch yn siŵr fod enw'r gweinydd wedi ei sillafu'n gywir cyn ceisio eto."
+msgstr ""
+"Gwnewch yn siŵr fod enw'r gweinydd wedi ei sillafu'n gywir cyn ceisio eto."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Make sure the username and password are correct and try again."
-msgstr "Gwnewch yn siŵr fod enw'r defnyddiwr a'r cyfrinair wedi eu sillafu'n gywir cyn ceisio eto."
+msgstr ""
+"Gwnewch yn siŵr fod enw'r defnyddiwr a'r cyfrinair wedi eu sillafu'n gywir "
+"cyn ceisio eto."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No Global Catalog server configured for this account."
-msgstr "Dim gweinydd Catalog cyffredinol wedi ei gyflunio ar gyfer y cyfrif hwn."
+msgstr ""
+"Dim gweinydd Catalog cyffredinol wedi ei gyflunio ar gyfer y cyfrif hwn."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No mailbox for user {0} on {1}."
@@ -16377,9 +16843,9 @@ msgid "Unknown error looking up {0}"
 msgstr "Gwall anhysbys wrth edrych {0} i fyny"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
-#: ../plugins/google-account-setup/google-source.c:604
-#: ../plugins/mail-to-task/mail-to-task.c:343
-#: ../plugins/mail-to-task/mail-to-task.c:555
+#: ../plugins/google-account-setup/google-source.c:624
+#: ../plugins/mail-to-task/mail-to-task.c:599
+#: ../plugins/mail-to-task/mail-to-task.c:821
 msgid "Unknown error."
 msgstr "Gwall anhysbys."
 
@@ -16396,7 +16862,9 @@ msgid "You are nearing your quota available for storing mail on this server."
 msgstr "Rydych yn agos at eich cwota o le i storio e-bost ar y gweinydd hwn."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
-msgid "You are permitted to send a message on behalf of only one delegator at a time."
+msgid ""
+"You are permitted to send a message on behalf of only one delegator at a "
+"time."
 msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
@@ -16412,16 +16880,28 @@ msgid "You may only configure a single Exchange account."
 msgstr "Fedrwch chi ond cyflunio un cyfrif Exchange."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
-msgid "Your current usage is: {0} KB. Try to clear up some space by deleting some mail."
-msgstr "Eich defnydd ar hyn o bryd yw : {0} KB. Ceisiwch greu rhagor o le wrth ddileu rhai negeseuon."
+msgid ""
+"Your current usage is: {0} KB. Try to clear up some space by deleting some "
+"mail."
+msgstr ""
+"Eich defnydd ar hyn o bryd yw : {0} KB. Ceisiwch greu rhagor o le wrth "
+"ddileu rhai negeseuon."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
-msgid "Your current usage is: {0} KB. You will not be able to either send or receive mail now."
-msgstr "Eich defnydd ar hyn o bryd yw : {0} KB. Fedrwch chi ddim anfon na derbyn e-bost nawr."
+msgid ""
+"Your current usage is: {0} KB. You will not be able to either send or "
+"receive mail now."
+msgstr ""
+"Eich defnydd ar hyn o bryd yw : {0} KB. Fedrwch chi ddim anfon na derbyn e-"
+"bost nawr."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
-msgid "Your current usage is: {0} KB. You will not be able to send mail until you clear up some space by deleting some mail."
-msgstr "Eich defnydd ar hyn o bryd yw : {0} KB. Fedrwch chi ddim anfon e-bost nes i chi greu rhagor o le wrth ddileu rhai negeseuon."
+msgid ""
+"Your current usage is: {0} KB. You will not be able to send mail until you "
+"clear up some space by deleting some mail."
+msgstr ""
+"Eich defnydd ar hyn o bryd yw : {0} KB. Fedrwch chi ddim anfon e-bost nes i "
+"chi greu rhagor o le wrth ddileu rhai negeseuon."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "Your password has expired."
@@ -16483,19 +16963,25 @@ msgid "Editor not launchable"
 msgstr ""
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
-msgid "Evolution is unable to create a temporary file to save your mail. Retry later."
+msgid ""
+"Evolution is unable to create a temporary file to save your mail. Retry "
+"later."
 msgstr ""
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
 msgid "External editor still running"
-msgstr ""
+msgstr "Golygydd allanol dal i rhedeg"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
-msgid "The external editor is still running. The mail composer window cannot be closed as long as the editor is active."
+msgid ""
+"The external editor is still running. The mail composer window cannot be "
+"closed as long as the editor is active."
 msgstr ""
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
-msgid "The external editor set in your plugin preferences cannot be launched. Try setting a different editor."
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
 msgstr ""
 
 #: ../plugins/external-editor/external-editor.c:109
@@ -16510,14 +16996,14 @@ msgstr ""
 "Ar gyfer Emacs defnyddiwch \"xemacs\"\n"
 "Ar gyfer VI defnyddiwch \"gvim -f\""
 
-#: ../plugins/external-editor/external-editor.c:307
-#: ../plugins/external-editor/external-editor.c:309
+#: ../plugins/external-editor/external-editor.c:354
+#: ../plugins/external-editor/external-editor.c:356
 msgid "Compose in External Editor"
 msgstr "Cyfansoddi mewn Golygydd Allanol"
 
 #: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
-msgstr ""
+msgstr "Dewiswch png (48*48) sydd a maint < 700beit"
 
 #: ../plugins/face/face.c:69
 msgid "PNG files"
@@ -16531,7 +17017,9 @@ msgstr "_Gwyneb"
 msgid ""
 "Attach a small picture of your face to outgoing messages.\n"
 "\n"
-"First time the user needs to configure a 48x48 PNG image. It is Base-64 encoded and stored in ~/.evolution/faces. This will be used in subsequent sent messages."
+"First time the user needs to configure a 48x48 PNG image. It is Base-64 "
+"encoded and stored in ~/.evolution/faces. This will be used in subsequent "
+"sent messages."
 msgstr ""
 
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:53
@@ -16544,24 +17032,26 @@ msgid "Unsubscribe Folders"
 msgstr "Dad-danysgrifio Plygellau"
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
-msgid "Unsubscribe from an IMAP folder by right-clicking on it in the folder tree."
+msgid ""
+"Unsubscribe from an IMAP folder by right-clicking on it in the folder tree."
 msgstr ""
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
 msgstr "_Dad-danysgrifio"
 
-#: ../plugins/google-account-setup/google-source.c:81
+#: ../plugins/google-account-setup/google-source.c:82
 #: ../plugins/google-account-setup/google-contacts-source.c:51
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-source.c:499
+#: ../plugins/google-account-setup/google-source.c:518
 #, fuzzy, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
-msgstr "Ychwanegu'r blygell at y rhestr o blygellau yr ydych wedi tanysgrifio iddynt"
+msgstr ""
+"Ychwanegu'r blygell at y rhestr o blygellau yr ydych wedi tanysgrifio iddynt"
 
-#: ../plugins/google-account-setup/google-source.c:604
+#: ../plugins/google-account-setup/google-source.c:624
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -16570,11 +17060,11 @@ msgstr ""
 "Methu darllen data o weinydd Google.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:739
+#: ../plugins/google-account-setup/google-source.c:759
 msgid "Cal_endar:"
 msgstr "Cal_endr:"
 
-#: ../plugins/google-account-setup/google-source.c:774
+#: ../plugins/google-account-setup/google-source.c:794
 msgid "Retrieve _list"
 msgstr "Nôl _rhestr"
 
@@ -16605,7 +17095,7 @@ msgid "GroupWise Account Setup"
 msgstr "Gosod Cyfrif Groupwise"
 
 #: ../plugins/groupwise-features/install-shared.c:219
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
 "\n"
@@ -16677,7 +17167,9 @@ msgid "Message Retract"
 msgstr "Statws Neges"
 
 #: ../plugins/groupwise-features/mail-retract.c:57
-msgid "Retracting a message may remove it from the recipient's mailbox. Are you sure you want to do this ?"
+msgid ""
+"Retracting a message may remove it from the recipient's mailbox. Are you "
+"sure you want to do this ?"
 msgstr ""
 
 #: ../plugins/groupwise-features/mail-retract.c:76
@@ -16716,7 +17208,8 @@ msgstr "Trosi'r neges a ddewiswyd yn dasg newydd"
 #: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
 #, fuzzy
 msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr "Mae plygell o'r enw &quot;{0}&quot; yn bodoli'n barod. Dewiswch enw gwahanol."
+msgstr ""
+"Mae plygell o'r enw &quot;{0}&quot; yn bodoli'n barod. Dewiswch enw gwahanol."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
 msgid "Account Already Exists"
@@ -16729,7 +17222,9 @@ msgid "Invalid user"
 msgstr "Defnyddiwr annilys"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
-msgid "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email address and try again."
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
 msgstr ""
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
@@ -16793,7 +17288,9 @@ msgid "This will create a new meeting using the existing meeting details."
 msgstr ""
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
-msgid "This will create a new meeting with the existing meeting details. The recurrence rule needs to be re-entered."
+msgid ""
+"This will create a new meeting with the existing meeting details. The "
+"recurrence rule needs to be re-entered."
 msgstr ""
 
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
@@ -17030,11 +17527,11 @@ msgstr "Olrhain Statws Neges..."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
 msgid "Add Hula support to Evolution."
-msgstr ""
+msgstr "Ychwanegu cynhaliaeth Hula i Evolution"
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
 msgid "Hula Support"
-msgstr ""
+msgstr "Cynhaliaeth Hula"
 
 #: ../plugins/imap-features/imap-headers.c:332
 msgid "Custom Headers"
@@ -17058,10 +17555,12 @@ msgstr "Sylfaenol a _Phenawdau Rhestrau E-bost (Rhagosodiad)"
 
 #: ../plugins/imap-features/imap-headers.glade.h:4
 msgid ""
-"Give the extra headers that you need to fetch in addition to the above standard headers. \n"
+"Give the extra headers that you need to fetch in addition to the above "
+"standard headers. \n"
 "You can ignore this if you choose \"All Headers\"."
 msgstr ""
-"Rhoi'r penawdau ychwanegol yr ydych chi am eu cyrchu yn ogystal â'r penawdau safonol welir uchod. \n"
+"Rhoi'r penawdau ychwanegol yr ydych chi am eu cyrchu yn ogystal â'r penawdau "
+"safonol welir uchod. \n"
 "Os ydych chi'n dewis \"Pob Pennawd\", medrwch anwybyddu hyn."
 
 #: ../plugins/imap-features/imap-headers.glade.h:6
@@ -17070,7 +17569,8 @@ msgid ""
 "The more headers you have the more time it will take to download."
 msgstr ""
 "Dewiswch eich Hoffterau Penawdau IMAP. \n"
-"Po fwyaf y nifer o benawdau sydd gennych, po hiraf fydd y broses o'u llwytho i lawr."
+"Po fwyaf y nifer o benawdau sydd gennych, po hiraf fydd y broses o'u llwytho "
+"i lawr."
 
 #: ../plugins/imap-features/imap-headers.glade.h:8
 msgid ""
@@ -17078,7 +17578,8 @@ msgid ""
 "Use this if you do not have filters based on mailing lists"
 msgstr ""
 "_Penawdau Sylfaenol - (Cyflymaf)\n"
-"Defnyddiwch hwn os nad oes gennych chi hidlyddion yn seiliedig ar restrau e-bost"
+"Defnyddiwch hwn os nad oes gennych chi hidlyddion yn seiliedig ar restrau e-"
+"bost"
 
 #: ../plugins/imap-features/imap-headers.glade.h:10
 #, fuzzy
@@ -17098,20 +17599,28 @@ msgid "Hardware Abstraction Layer not loaded"
 msgstr ""
 
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:52
-msgid "The \"hald\" service is required but not currently running. Please enable the service and rerun this program, or contact your system administrator."
+msgid ""
+"The \"hald\" service is required but not currently running. Please enable "
+"the service and rerun this program, or contact your system administrator."
 msgstr ""
+"Dydy'r gwasanaeth \"hald\" sydd ei hangen ddim yn rhedeg. Galluogwch y "
+"gwasanaeth ac ail rhedwch y rhaglen hwn, neu cysylltwch gyda gweinyddwyr "
+"eich system."
 
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:81
 msgid "Search for an iPod failed"
-msgstr ""
+msgstr "Mae'r chwiliad am iPod wedi methu"
 
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:84
 #, fuzzy
-msgid "Evolution could not find an iPod to synchronize with. Either the iPod is not connected to the system or it is not powered on."
+msgid ""
+"Evolution could not find an iPod to synchronize with. Either the iPod is not "
+"connected to the system or it is not powered on."
 msgstr ""
 "<span weight=\"bold\" size=\"larger\">Methwyd canfod iPod</span>\n"
 "\n"
-"Methodd Evolution â chanfod iPod er mwyn cysoni. Naill ai nad yw'r iPod wedi'i gysylltu â'r system, neu nid yw wedi ei bweru."
+"Methodd Evolution â chanfod iPod er mwyn cysoni. Naill ai nad yw'r iPod "
+"wedi'i gysylltu â'r system, neu nid yw wedi ei bweru."
 
 #: ../plugins/ipod-sync/ical-format.c:119
 #: ../plugins/save-calendar/ical-format.c:164
@@ -17160,14 +17669,12 @@ msgid "Unable to find this task in any task list"
 msgstr "Methu canfod y dasg hon mewn unrhyw restr dasgau"
 
 #: ../plugins/itip-formatter/itip-formatter.c:768
-#, fuzzy
 msgid "Unable to find this memo in any memo list"
-msgstr "Methu canfod y dasg hon mewn unrhyw restr dasgau"
+msgstr "Methu canfod y memo hon mewn unrhyw restr memo"
 
 #: ../plugins/itip-formatter/itip-formatter.c:839
-#, fuzzy
 msgid "Opening the calendar. Please wait.."
-msgstr "Agor calendr"
+msgstr "Agor y calendr. Arhoswch os gwelwch yn dda..."
 
 #: ../plugins/itip-formatter/itip-formatter.c:842
 msgid "Searching for an existing version of this appointment"
@@ -17245,7 +17752,7 @@ msgstr "Dim Gwybodaeth"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1422
 msgid "Unable to send meeting information, the meeting does not exist"
-msgstr ""
+msgstr "Methu danfon gwybodaeth am gyfarfod, dydy'r cyfarfod ddim yn bodoli"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1425
 #, fuzzy
@@ -17254,7 +17761,7 @@ msgstr "Methu canfod y dasg hon mewn unrhyw restr dasgau"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1428
 msgid "Unable to send memo information, the memo does not exist"
-msgstr ""
+msgstr "Methu danfod gwybodaeth am femo, dydy'r memo ddim yn bodoli"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1496
 #: ../plugins/itip-formatter/itip-formatter.c:1507
@@ -17263,8 +17770,12 @@ msgstr "Mae'r calendr sydd wedi'i atodi yn annilys"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1497
 #: ../plugins/itip-formatter/itip-formatter.c:1508
-msgid "The message claims to contain a calendar, but the calendar is not a valid iCalendar."
-msgstr "Mae'r neges yn honni ei bod yn cynnwys calendr, ond nid yw'r calendr yn iCalendar dilys."
+msgid ""
+"The message claims to contain a calendar, but the calendar is not a valid "
+"iCalendar."
+msgstr ""
+"Mae'r neges yn honni ei bod yn cynnwys calendr, ond nid yw'r calendr yn "
+"iCalendar dilys."
 
 #: ../plugins/itip-formatter/itip-formatter.c:1548
 #: ../plugins/itip-formatter/itip-formatter.c:1576
@@ -17275,15 +17786,21 @@ msgstr "Nid yw'r eitem yn y calendr yn ddilys"
 #: ../plugins/itip-formatter/itip-formatter.c:1549
 #: ../plugins/itip-formatter/itip-formatter.c:1577
 #: ../plugins/itip-formatter/itip-formatter.c:1669
-msgid "The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"
-msgstr "Mae'r neges yn cynnwys calendr, ond nid yw'r calendr yn cynnwys unrhyw ddigwyddiadau, tasgau na gwybodaeth statws rhydd/prysur"
+msgid ""
+"The message does contain a calendar, but the calendar contains no events, "
+"tasks or free/busy information"
+msgstr ""
+"Mae'r neges yn cynnwys calendr, ond nid yw'r calendr yn cynnwys unrhyw "
+"ddigwyddiadau, tasgau na gwybodaeth statws rhydd/prysur"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1588
 msgid "The calendar attached contains multiple items"
 msgstr "Mae'r calendr sydd wedi ei atodi yn cynnwys amryw eitemau"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1589
-msgid "To process all of these items, the file should be saved and the calendar imported"
+msgid ""
+"To process all of these items, the file should be saved and the calendar "
+"imported"
 msgstr "I brosesu'r holl eitemau, dylid cadw'r ffeil a mewnforio'r calendr"
 
 #: ../plugins/itip-formatter/itip-formatter.c:2335
@@ -17454,14 +17971,14 @@ msgstr "%A, %B %e, %Y %l:%M:%S %p"
 #: ../plugins/itip-formatter/itip-view.c:527
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
-msgstr ""
+msgstr "Atebwch ar rhan <b>%s</b> os gwelwch yn dda"
 
 #: ../plugins/itip-formatter/itip-view.c:353
 #: ../plugins/itip-formatter/itip-view.c:441
 #: ../plugins/itip-formatter/itip-view.c:529
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
-msgstr ""
+msgstr "Wedi'i dderbyn ar rhan <b>%s</b>"
 
 #: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
@@ -17481,7 +17998,8 @@ msgstr "Mae <b>%s</b> wedi dirprwyo'r cyfarfod canlynol atoch chi:"
 #: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
-msgstr "Mae <b>%s</b>, trwy %s am i chi fod yn bresennol yn y cyfarfod canlynol:"
+msgstr ""
+"Mae <b>%s</b>, trwy %s am i chi fod yn bresennol yn y cyfarfod canlynol:"
 
 #: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
@@ -17500,13 +18018,18 @@ msgstr "Mae <b>%s</b> am ychwanegu at neges sy'n bodoli'n barod:"
 
 #: ../plugins/itip-formatter/itip-view.c:382
 #, fuzzy, c-format
-msgid "<b>%s</b> through %s wishes to receive the latest information for the following meeting:"
-msgstr "Mae <b>%s</b> am dderbyn y wybodaeth ddiweddaraf am y cyfarfod canlynol:"
+msgid ""
+"<b>%s</b> through %s wishes to receive the latest information for the "
+"following meeting:"
+msgstr ""
+"Mae <b>%s</b> am dderbyn y wybodaeth ddiweddaraf am y cyfarfod canlynol:"
 
 #: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
-msgstr "Mae <b>%s</b> am dderbyn y wybodaeth ddiweddaraf am y cyfarfod canlynol:"
+msgid ""
+"<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgstr ""
+"Mae <b>%s</b> am dderbyn y wybodaeth ddiweddaraf am y cyfarfod canlynol:"
 
 #: ../plugins/itip-formatter/itip-view.c:388
 #, fuzzy, c-format
@@ -17541,7 +18064,8 @@ msgstr "Mae <b>%s</b> wedi awgrymu'r newidiadau cyfarfod canlynol."
 #: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
-msgstr "Mae <b>%s</b>, trwy %s wedi gwrthod y newidiadau canlynol i'r cyfarfod:"
+msgstr ""
+"Mae <b>%s</b>, trwy %s wedi gwrthod y newidiadau canlynol i'r cyfarfod:"
 
 #: ../plugins/itip-formatter/itip-view.c:408
 #, c-format
@@ -17585,23 +18109,34 @@ msgstr "Mae <b>%s</b> am ychwanegu at dasg sy'n bodoli'n barod:"
 
 #: ../plugins/itip-formatter/itip-view.c:470
 #, fuzzy, c-format
-msgid "<b>%s</b> through %s wishes to receive the latest information for the following assigned task:"
-msgstr "Mae <b>%s</b> am dderbyn y wybodaeth ddiweddaraf am y dasg ganlynol sydd wedi ei neilltuo:"
+msgid ""
+"<b>%s</b> through %s wishes to receive the latest information for the "
+"following assigned task:"
+msgstr ""
+"Mae <b>%s</b> am dderbyn y wybodaeth ddiweddaraf am y dasg ganlynol sydd "
+"wedi ei neilltuo:"
 
 #: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest information for the following assigned task:"
-msgstr "Mae <b>%s</b> am dderbyn y wybodaeth ddiweddaraf am y dasg ganlynol sydd wedi ei neilltuo:"
+msgid ""
+"<b>%s</b> wishes to receive the latest information for the following "
+"assigned task:"
+msgstr ""
+"Mae <b>%s</b> am dderbyn y wybodaeth ddiweddaraf am y dasg ganlynol sydd "
+"wedi ei neilltuo:"
 
 #: ../plugins/itip-formatter/itip-view.c:476
 #, fuzzy, c-format
-msgid "<b>%s</b> through %s has sent back the following assigned task response:"
-msgstr "Mae <b>%s</b> wedi anfon yn ôl yr ateb canlynol i dasg gafodd ei neilltuo:"
+msgid ""
+"<b>%s</b> through %s has sent back the following assigned task response:"
+msgstr ""
+"Mae <b>%s</b> wedi anfon yn ôl yr ateb canlynol i dasg gafodd ei neilltuo:"
 
 #: ../plugins/itip-formatter/itip-view.c:478
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
-msgstr "Mae <b>%s</b> wedi anfon yn ôl yr ateb canlynol i dasg gafodd ei neilltuo:"
+msgstr ""
+"Mae <b>%s</b> wedi anfon yn ôl yr ateb canlynol i dasg gafodd ei neilltuo:"
 
 #: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
@@ -17615,18 +18150,22 @@ msgstr "Mae <b>%s</b> wedi canslo'r dasg hon, gafodd ei neilltuo:"
 
 #: ../plugins/itip-formatter/itip-view.c:488
 #, fuzzy, c-format
-msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
-msgstr "Mae <b>%s</b> yn cynnig y newidiadau canlynol i dasgau gafodd eu neilltuo:"
+msgid ""
+"<b>%s</b> through %s has proposed the following task assignment changes:"
+msgstr ""
+"Mae <b>%s</b> yn cynnig y newidiadau canlynol i dasgau gafodd eu neilltuo:"
 
 #: ../plugins/itip-formatter/itip-view.c:490
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
-msgstr "Mae <b>%s</b> yn cynnig y newidiadau canlynol i dasgau gafodd eu neilltuo:"
+msgstr ""
+"Mae <b>%s</b> yn cynnig y newidiadau canlynol i dasgau gafodd eu neilltuo:"
 
 #: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
-msgstr "Mae <b>%s</b>, drwy %s, wedi gwrthod y dasg ganlynol gafodd ei neilltuo:"
+msgstr ""
+"Mae <b>%s</b>, drwy %s, wedi gwrthod y dasg ganlynol gafodd ei neilltuo:"
 
 #: ../plugins/itip-formatter/itip-view.c:496
 #, c-format
@@ -17753,7 +18292,7 @@ msgstr "Dangos yr amser fel _rhydd"
 
 #: ../plugins/itip-formatter/itip-view.c:1154
 msgid "_Preserve my reminder"
-msgstr ""
+msgstr "_Cadw fy atgoffydd "
 
 #. To Translators: This is a check box to inherit a reminder.
 #: ../plugins/itip-formatter/itip-view.c:1160
@@ -17775,22 +18314,30 @@ msgid "Itip Formatter"
 msgstr "Fformatydd Itip"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate &quot;{1}&quot;?"
-msgstr "Mae &quot;{0}&quot; wedi dirprwyo'r cyfarfod. Ydych chi am ychwanegu'r dirprwy &quot;{1}&quot;?"
+msgid ""
+"&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
+"&quot;{1}&quot;?"
+msgstr ""
+"Mae &quot;{0}&quot; wedi dirprwyo'r cyfarfod. Ydych chi am ychwanegu'r "
+"dirprwy &quot;{1}&quot;?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid "This meeting has been delegated"
 msgstr "Mae'r cyfarfod hwn wedi ei ddirprwyo"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
-msgid "This response is not from a current attendee. Add the sender as an attendee?"
-msgstr "Dyw'r ymateb ddim oddi wrth rywun sy'n mynychu'r cyfarfod ar hyn o bryd.  Ychwanegu'r person fel mynychwr?"
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
+msgstr ""
+"Dyw'r ymateb ddim oddi wrth rywun sy'n mynychu'r cyfarfod ar hyn o bryd.  "
+"Ychwanegu'r person fel mynychwr?"
 
 #: ../plugins/mail-account-disable/mail-account-disable.c:46
 msgid "Proxy _Logout"
 msgstr "_Allgofnodi o'r Dirprwy"
 
 #: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
+#, fuzzy
 msgid "Disable Account"
 msgstr "Analluogi Cyfrif"
 
@@ -17805,7 +18352,7 @@ msgstr "Dewis ffeil sain"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
 msgid "Blink icon in notification area."
-msgstr ""
+msgstr "Chwincio eicon yn yr man hysbysu."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable D-Bus messages."
@@ -17813,7 +18360,7 @@ msgstr "Galluogi negeseuon D-Bus"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
 msgid "Enable icon in notification area."
-msgstr ""
+msgstr "Gosod eicon yn y man hysbysu."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
 #, fuzzy
@@ -17821,12 +18368,16 @@ msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "Creu neges D-BUS newydd pan fo e-bost newydd yn cyrraedd."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
-msgid "If \"true\", then beep, otherwise will play sound file when new messages arrive."
+msgid ""
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
 msgstr ""
+"Os \"true\", yna chwincio, fel arall bydd ffeil sain yn cael ei chwarae pan "
+"mae neges newydd yn cyrraedd."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Notify new messages for Inbox only."
-msgstr ""
+msgstr "Hysbysu negeseuon newydd ar gyfer y Blwch Derbyn yn unig."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
 #, fuzzy
@@ -17835,12 +18386,14 @@ msgstr "Chwarae ffeil sain pan fo e-bost newydd yn _cyrraedd"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
 msgid "Popup message together with the icon."
-msgstr ""
+msgstr "Neges naidlen yn ogystal a eicon."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 #, fuzzy
 msgid "Show new mail icon in notification area when new messages arrive."
-msgstr "Hysbysu'r defnyddiwr gydag eicon yn y gilfach, a neges hysbysu pan fo neges newydd yn cyrraedd."
+msgstr ""
+"Hysbysu'r defnyddiwr gydag eicon yn y gilfach, a neges hysbysu pan fo neges "
+"newydd yn cyrraedd."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 #, fuzzy
@@ -17859,7 +18412,7 @@ msgstr "Chwarae ffeil sain pan fo e-bost newydd yn _cyrraedd"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
 msgid "Whether show message over the icon when new messages arrive."
-msgstr ""
+msgstr "A ddylid dangos neges dros yr eicon pan mae neges newydd yn cyrraedd."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
 #, fuzzy
@@ -17868,7 +18421,7 @@ msgstr "A ddylai'r bar ochr fod yn weladwy."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
 msgid "Whether to notify new messages in Inbox folder only."
-msgstr ""
+msgstr "A ddylid hysbysu negeseuon newydd yn y Blwch Derbyn yn unig."
 
 #: ../plugins/mail-notification/mail-notification.c:245
 msgid "Generate a _D-Bus message"
@@ -17921,7 +18474,7 @@ msgstr "_Addasu neges hysbysu"
 
 #: ../plugins/mail-notification/mail-notification.c:593
 msgid "Popup _message together with the icon"
-msgstr ""
+msgstr "_Neges naidlen yn ogystal a eicon "
 
 #: ../plugins/mail-notification/mail-notification.c:774
 #, fuzzy
@@ -17933,8 +18486,9 @@ msgid "_Beep"
 msgstr "_Bîp"
 
 #: ../plugins/mail-notification/mail-notification.c:781
+#, fuzzy
 msgid "Play _sound file"
-msgstr "Chwarae ffeil _sain"
+msgstr "Chwarae _ffeil:"
 
 #: ../plugins/mail-notification/mail-notification.c:792
 msgid "Specify _filename:"
@@ -17950,7 +18504,7 @@ msgstr "_Chwarae"
 
 #: ../plugins/mail-notification/mail-notification.c:851
 msgid "Notify new messages for _Inbox only"
-msgstr ""
+msgstr "Hysbysu negeseuon newydd ar gyfer y Blwch Derbyn yn un_ig"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid "Mail Notification"
@@ -17961,34 +18515,148 @@ msgstr "Hysbysiad E-bost Newydd"
 msgid "Notifies you when new mail messages arrive."
 msgstr "Ffeil sain i'w chwarae pan fo e-bost newydd yn cyrraedd."
 
-#: ../plugins/mail-to-task/mail-to-task.c:343
+#: ../plugins/mail-to-task/mail-to-task.c:376
+#, c-format
+msgid ""
+"Selected calendar contains event '%s' already. Would you like to edit the "
+"old event?"
+msgstr ""
+"Mae'r calendr a ddewiswyd yn cynnwys y digwyddiad '%s' yn barod. Hoffech chi "
+"olygu'r hen digwyddiad?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:379
+#, c-format
+msgid ""
+"Selected task list contains task '%s' already. Would you like to edit the "
+"old task?"
+msgstr ""
+"Mae'r rhestr tasgau yn cynnwys y dasg '%s' yn barod. Hoffech chi olygu'r hen "
+"dasg?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:382
+#, c-format
+msgid ""
+"Selected memo list contains memo '%s' already. Would you like to edit the "
+"old memo?"
+msgstr ""
+"Mae'r rhestr memo a ddewiswyd yn cynnwys y memo '%s' yn barod. Hoffech chi "
+"olygu'r hen femo?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:399
+msgid ""
+"Selected calendar contains some events for the given mails already. Would "
+"you like to create new events anyway?"
+msgstr ""
+"Mae'r calendr a ddewiswyd yn barod yn cynnwys digwyddiadau am yr ebyst a "
+"rhoddwyd. Hoffech chi greu digwyddiadau newydd beth bynnag? "
+
+#: ../plugins/mail-to-task/mail-to-task.c:402
+msgid ""
+"Selected task list contains some tasks for the given mails already. Would "
+"you like to create new tasks anyway?"
+msgstr ""
+"Mae'r rhestr dasgau yn barod yn cynnwys tasgau am yr ebyst a rhoddwyd. "
+"Hoffech chi greu tasgau newydd beth bynnag?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:405
+msgid ""
+"Selected memo list contains some memos for the given mails already. Would "
+"you like to create new memos anyway?"
+msgstr ""
+"Mae'r rhestr memos yn barod yn cynnwys memos am yr ebyst a rhoddwyd. Hoffech "
+"chi greu memos newydd beth bynnag?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:423
+msgid ""
+"Selected calendar contains an event for the given mail already. Would you "
+"like to create new event anyway?"
+msgid_plural ""
+"Selected calendar contains events for the given mails already. Would you "
+"like to create new events anyway?"
+msgstr[0] ""
+"Mae'r calendr yn barod yn cynnwys digwyddiad am yr ebost a rhoddwyd. Hoffech "
+"chi greu digwyddiad newydd beth bynnag? "
+msgstr[1] ""
+"Mae'r calendr yn barod yn cynnwys digwyddiadau am yr ebyst a rhoddwyd. "
+"Hoffech chi greu digwyddiadau newydd beth bynnag?"
+msgstr[2] ""
+"Mae'r calendr yn barod yn cynnwys digwyddiadau am yr ebyst a rhoddwyd. "
+"Hoffech chi greu digwyddiadau newydd beth bynnag?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:429
+msgid ""
+"Selected task list contains a task for the given mail already. Would you "
+"like to create new task anyway?"
+msgid_plural ""
+"Selected task list contains tasks for the given mails already. Would you "
+"like to create new tasks anyway?"
+msgstr[0] ""
+"Mae'r rhestr tasgau yn barod yn cynnwys tasg ar gyfer yr ebost a rhoddwyd. "
+"Hoffech chi greu tasg newydd beth bynnag?"
+msgstr[1] ""
+"Mae'r rhestr tasgau yn barod yn cynnwys tasgau ar gyfer yr ebyst a rhoddwyd. "
+"Hoffech chi greu tasgau newydd beth bynnag?"
+msgstr[2] ""
+"Mae'r rhestr tasgau yn barod yn cynnwys tasgau ar gyfer yr ebyst a rhoddwyd. "
+"Hoffech chi greu tasgau newydd beth bynnag?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:435
+msgid ""
+"Selected memo list contains a memo for the given mail already. Would you "
+"like to create new memo anyway?"
+msgid_plural ""
+"Selected memo list contains memos for the given mails already. Would you "
+"like to create new memos anyway?"
+msgstr[0] ""
+"Mae'r rhestr memos yn barod yn cynnwys memo ar gyfer yr ebost a rhoddwyd. "
+"Hoffech chi greu memo newydd beth bynnag?"
+msgstr[1] ""
+"Mae'r rhestr memos yn barod yn cynnwys memos ar gyfer yr ebyst a rhoddwyd. "
+"Hoffech chi greu memos newydd beth bynnag?"
+msgstr[2] ""
+"Mae'r rhestr memos yn barod yn cynnwys memos ar gyfer yr ebyst a rhoddwyd. "
+"Hoffech chi greu memos newydd beth bynnag?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:494
+msgid "[No Summary]"
+msgstr "[Dim Crynodeb]"
+
+#: ../plugins/mail-to-task/mail-to-task.c:505
+msgid "Invalid object returned from a server"
+msgstr "Dychwelodd gwrthrych annilys o'r gweinydd"
+
+#: ../plugins/mail-to-task/mail-to-task.c:570
+#, c-format
+msgid "An error occurred during processing: %s"
+msgstr "Roedd gwall wrth brosesu: %s"
+
+#: ../plugins/mail-to-task/mail-to-task.c:599
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Ni ellir agor calendr. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:350
-msgid "Selected source is read only, thus cannot create event there. Select other source, please."
+#: ../plugins/mail-to-task/mail-to-task.c:606
+msgid ""
+"Selected source is read only, thus cannot create event there. Select other "
+"source, please."
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:353
-msgid "Selected source is read only, thus cannot create task there. Select other source, please."
+#: ../plugins/mail-to-task/mail-to-task.c:609
+msgid ""
+"Selected source is read only, thus cannot create task there. Select other "
+"source, please."
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:356
-msgid "Selected source is read only, thus cannot create memo there. Select other source, please."
+#: ../plugins/mail-to-task/mail-to-task.c:612
+msgid ""
+"Selected source is read only, thus cannot create memo there. Select other "
+"source, please."
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:455
-#, fuzzy, c-format
-msgid "Could not create object. %s"
-msgstr "Methwyd diweddaru'r gwrthrych"
-
-#: ../plugins/mail-to-task/mail-to-task.c:555
-#, fuzzy, c-format
+#: ../plugins/mail-to-task/mail-to-task.c:821
+#, c-format
 msgid "Cannot get source list. %s"
-msgstr ""
-"Methu creu ffeil allbwn: %s\n"
-" %s"
+msgstr "Methu cael rhestr ffynonellau. %s"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
 #, fuzzy
@@ -17996,47 +18664,48 @@ msgid "Convert a mail message to a task."
 msgstr "Trosi'r neges a ddewiswyd yn dasg newydd"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:5
-msgid "Convert to a Mem_o"
-msgstr "Trosi i Mem_o"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
+msgid "Create a Mem_o"
+msgstr "Creu Mem_o"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:6
-msgid "Convert to a _Meeting"
-msgstr "Trosi'n _Gyfarfod"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
+msgid "Create a _Meeting"
+msgstr "Creu _Cyfarfod"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:4
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:7
-msgid "Convert to a _Task"
-msgstr "_Trosi i Dasg"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:3
+msgid "Create a _Task"
+msgstr "Creu _Tasg"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:5
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:8
-msgid "Convert to an _Event"
-msgstr "Trosi'n _Ddigwyddiad"
+msgid "Create an _Event"
+msgstr "Creu _Digwyddiad"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:6
 msgid "Mail-to-Task"
 msgstr "Ebost-i-Dasg"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:4
 #, fuzzy
-msgid "Convert the selected message to a new event"
-msgstr "Trosi'r neges a ddewiswyd yn dasg newydd"
+msgid "Create a new event from the selected message"
+msgstr "Cyfansoddi ateb at anfonwr y neges a ddewiswyd"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:5
 #, fuzzy
-msgid "Convert the selected message to a new meeting"
-msgstr "Trosi'r neges a ddewiswyd yn dasg newydd"
+msgid "Create a new meeting from the selected message"
+msgstr "Creu cais newydd am gyfarfod"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:3
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:6
 #, fuzzy
-msgid "Convert the selected message to a new memo"
-msgstr "Trosi'r neges a ddewiswyd yn dasg newydd"
+msgid "Create a new memo from the selected message"
+msgstr "Cyfansoddi ateb at anfonwr y neges a ddewiswyd"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:4
-msgid "Convert the selected message to a new task"
-msgstr "Trosi'r neges a ddewiswyd yn dasg newydd"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:7
+#, fuzzy
+msgid "Create a new task from the selected message"
+msgstr "Cyfansoddi ateb at anfonwr y neges a ddewiswyd"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
 msgid "Contact list _owner"
@@ -18062,7 +18731,9 @@ msgstr "_Rhestr E-bost"
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
 #, fuzzy
 msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
-msgstr "Darparu gweithredoedd cyffredin i restrau e-bost (tanysgrifio, dad-danysgrifio...)."
+msgstr ""
+"Darparu gweithredoedd cyffredin i restrau e-bost (tanysgrifio, dad-"
+"danysgrifio...)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
 msgid "_Post message to list"
@@ -18082,11 +18753,14 @@ msgstr "Gweithred ddim ar gael"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
-"An e-mail message will be sent to the URL \"{0}\". You can either send the message automatically, or see and change it first.\n"
+"An e-mail message will be sent to the URL \"{0}\". You can either send the "
+"message automatically, or see and change it first.\n"
 "\n"
-"You should receive an answer from the mailing list shortly after the message has been sent."
+"You should receive an answer from the mailing list shortly after the message "
+"has been sent."
 msgstr ""
-"Fe anfonir neges e-bost at y LAU \"{0}\". Gallwch naill ai anfon y neges yn awtomatig, neu ei weld a'i newid gyntaf.\n"
+"Fe anfonir neges e-bost at y LAU \"{0}\". Gallwch naill ai anfon y neges yn "
+"awtomatig, neu ei weld a'i newid gyntaf.\n"
 "\n"
 "Dylech dderbyn ateb oddi wrth y rhestr e-bost yn fuan ar ôl anfon y neges."
 
@@ -18103,8 +18777,12 @@ msgid "Posting not allowed"
 msgstr "Postio heb ei ganiatáu"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
-msgid "Posting to this mailing list is not allowed. Possibly, this is a read-only mailing list. Contact the list owner for details."
-msgstr "Ni chaniateir postio at y rhestr e-bost hon. Mae'n bosib mai rhestr ddarllen-yn-unig yw hi. Cysylltwch â pherchennog y rhestr am fanylion."
+msgid ""
+"Posting to this mailing list is not allowed. Possibly, this is a read-only "
+"mailing list. Contact the list owner for details."
+msgstr ""
+"Ni chaniateir postio at y rhestr e-bost hon. Mae'n bosib mai rhestr ddarllen-"
+"yn-unig yw hi. Cysylltwch â pherchennog y rhestr am fanylion."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "Send e-mail message to mailing list?"
@@ -18113,11 +18791,13 @@ msgstr "Anfon neges e-bost i restr drafod?"
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 #, fuzzy
 msgid ""
-"The action could not be performed. The header for this action did not contain any action that could be processed.\n"
+"The action could not be performed. The header for this action did not "
+"contain any action that could be processed.\n"
 "\n"
 "Header: {0}"
 msgstr ""
-"Methwyd perfformio'r weithredu. Mae hyn yn golygu na fedrwyd delio ag unrhyw beth o fewn pennawd y weithred.\n"
+"Methwyd perfformio'r weithredu. Mae hyn yn golygu na fedrwyd delio ag unrhyw "
+"beth o fewn pennawd y weithred.\n"
 "\n"
 "Pennawd: {0}"
 
@@ -18132,8 +18812,12 @@ msgstr ""
 "Pennawd: {1}"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
-msgid "This message does not contain the header information required for this action."
-msgstr "Nid yw'r neges yn cynnwys y wybodaeth penawdau sydd angen ar gyfer y weithred."
+msgid ""
+"This message does not contain the header information required for this "
+"action."
+msgstr ""
+"Nid yw'r neges yn cynnwys y wybodaeth penawdau sydd angen ar gyfer y "
+"weithred."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
 msgid "_Edit message"
@@ -18176,6 +18860,7 @@ msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Tanysgrifio â'r rhestr trafod mae'r neges hon yn perthyn iddi"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
+#, fuzzy
 msgid "Unsubscribe to the mailing list this message belongs to"
 msgstr "Dad-danysgrifio o'r rhestr trafod mae'r neges hon yn perthyn iddi"
 
@@ -18198,8 +18883,12 @@ msgstr "Marcio bob neges yn yr isblygellau fel rhai wedi'u darllen?"
 
 #: ../plugins/mark-all-read/mark-all-read.c:41
 #, fuzzy
-msgid "Do you want to mark messages as read in the current folder only, or in the current folder as well as all subfolders?"
-msgstr "Marcio bob neges yn y blygell a ddewiswyd, a'r is-blygellau, fel rhai wedi'u darllen."
+msgid ""
+"Do you want to mark messages as read in the current folder only, or in the "
+"current folder as well as all subfolders?"
+msgstr ""
+"Marcio bob neges yn y blygell a ddewiswyd, a'r is-blygellau, fel rhai wedi'u "
+"darllen."
 
 #: ../plugins/mark-all-read/mark-all-read.c:166
 #, fuzzy
@@ -18256,9 +18945,8 @@ msgid "Author(s)"
 msgstr "Awdur(on)"
 
 #: ../plugins/plugin-manager/plugin-manager.c:146
-#, fuzzy
 msgid "Configuration"
-msgstr "Cyfluniad Ebost"
+msgstr "Cyfluniad"
 
 #: ../plugins/plugin-manager/plugin-manager.c:265
 msgid "Note: Some changes will not take effect until restart"
@@ -18327,15 +19015,13 @@ msgstr ""
 
 #. Address book
 #: ../plugins/pst-import/pst-importer.c:315
-#, fuzzy
 msgid "_Address Book"
-msgstr "Llyfr Cyfeiriadau"
+msgstr "Llyfr Cyfeiri_adau"
 
 #. Appointments
 #: ../plugins/pst-import/pst-importer.c:322
-#, fuzzy
 msgid "A_ppointments"
-msgstr "Apwyntiadau"
+msgstr "A_pwyntiadau"
 
 #. Journal
 #: ../plugins/pst-import/pst-importer.c:334
@@ -18344,9 +19030,8 @@ msgid "_Journal entries"
 msgstr "Cofnod dyddlyfr - %s"
 
 #: ../plugins/pst-import/pst-importer.c:349
-#, fuzzy
 msgid "Importing Outlook data"
-msgstr "Mewnforio data Elm"
+msgstr "Mewnforio data Outlook"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 msgid "Calendar Publishing"
@@ -18357,9 +19042,8 @@ msgid "Locations"
 msgstr "Lleoliadau"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
-#, fuzzy
 msgid "Publish calendars to the web."
-msgstr "Caniatáu i galendrau gael eu cyhoeddi ar y we"
+msgstr "Cyhoeddi calendrau i'r we"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
 msgid "_Publish Calendar Information"
@@ -18379,12 +19063,12 @@ msgstr "Methwyd agor %s: Gwall anhysbys"
 #: ../plugins/publish-calendar/publish-calendar.c:117
 #, c-format
 msgid "There was an error while publishing to %s:"
-msgstr ""
+msgstr "Mi oedd yna wall tra'n cyhoeddi i %s:"
 
 #: ../plugins/publish-calendar/publish-calendar.c:119
 #, c-format
 msgid "Publishing to %s finished successfully"
-msgstr ""
+msgstr "Gorffennodd cyhoeddi i %s yn lwyddiannus."
 
 #: ../plugins/publish-calendar/publish-calendar.c:164
 #, c-format
@@ -18587,7 +19271,9 @@ msgstr "Cynnwys profion pell"
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
 #, fuzzy
 msgid "Filter junk messages using SpamAssassin."
-msgstr "Hidlo negeseuon sothach drwy SpamAssassin. Rhaid i SpamAssassin gael ei osod cyn i'r ategyn hwn weithio."
+msgstr ""
+"Hidlo negeseuon sothach drwy SpamAssassin. Rhaid i SpamAssassin gael ei osod "
+"cyn i'r ategyn hwn weithio."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
 #, fuzzy
@@ -18725,6 +19411,7 @@ msgid "Select One Source"
 msgstr "Dewis un ffynhonnell"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
+#, fuzzy
 msgid "Show _only this Calendar"
 msgstr "_Dangos y Calendr hwn yn unig"
 
@@ -18734,6 +19421,7 @@ msgid "Show _only this Memo List"
 msgstr "_Dangos y Rhestr Dasgau hon yn unig"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
+#, fuzzy
 msgid "Show _only this Task List"
 msgstr "_Dangos y Rhestr Dasgau hon yn unig"
 
@@ -18756,11 +19444,13 @@ msgstr "Croeso"
 
 #: ../plugins/startup-wizard/startup-wizard.c:88
 msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect to your email accounts, and to import files from other applications. \n"
+"Welcome to Evolution. The next few screens will allow Evolution to connect "
+"to your email accounts, and to import files from other applications. \n"
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
-"Croeso i Evolution. Bydd y sgrin neu ddau nesaf yn gadael i Evolution gysylltu â'ch cyfrifon e-bost, ac i fewnforio ffeiliau o raglenni eraill.\n"
+"Croeso i Evolution. Bydd y sgrin neu ddau nesaf yn gadael i Evolution "
+"gysylltu â'ch cyfrifon e-bost, ac i fewnforio ffeiliau o raglenni eraill.\n"
 "\n"
 "Cliciwch y botwm \"Ymlaen\" i barhau."
 
@@ -18810,12 +19500,15 @@ msgid "F_all back to threading messages by subject"
 msgstr "Syrthio'n ôl ar drefnu edafedd negeseuon ar sail eu _pwnc"
 
 #: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
-msgid "List of keyword/value pairs for the Templates plugin to substitute in a message body."
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
 msgstr ""
 
 #: ../plugins/templates/templates.c:601
+#, fuzzy
 msgid "No title"
-msgstr "Dim teitl"
+msgstr "Dim Teitl"
 
 #: ../plugins/templates/templates.c:709
 #, fuzzy
@@ -18939,7 +19632,8 @@ msgid "Default window width"
 msgstr "Lled rhagosodedig ffenest"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:8
-msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgid ""
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.h:9
@@ -18964,7 +19658,11 @@ msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ID neu ffugenw'r gydran i'w ddangos yn ragosodedig wrth gychwyn."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:14
-msgid "If true, then connections to the proxy server require authentication. The username is retrieved from the \"/apps/evolution/shell/network_config/authentication_user\" GConf key, and the password is retrieved from either gnome-keyring or the ~/.gnome2_private/Evolution password file."
+msgid ""
+"If true, then connections to the proxy server require authentication. The "
+"username is retrieved from the \"/apps/evolution/shell/network_config/"
+"authentication_user\" GConf key, and the password is retrieved from either "
+"gnome-keyring or the ~/.gnome2_private/Evolution password file."
 msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.h:15
@@ -18982,7 +19680,9 @@ msgid "Initial folder for GtkFileChooser dialogs."
 msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.h:18
-msgid "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List View."
+msgid ""
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
 msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.h:19
@@ -18990,8 +19690,11 @@ msgid "Last upgraded configuration version"
 msgstr "Fersiwn cyfluniad a ddiweddarwyd diwethaf"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:20
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
-msgstr "Rhestr o lwybrau'r plygellau i'w cysoni at ddisg er mwyn eu defnyddio all-lein"
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
+"Rhestr o lwybrau'r plygellau i'w cysoni at ddisg er mwyn eu defnyddio all-"
+"lein"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Non-proxy hosts"
@@ -19023,7 +19726,11 @@ msgid "Secure HTTP proxy port"
 msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.h:28
-msgid "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 representing \"use system settings\", \"no proxy\", \"use manual proxy configuration\" and \"use proxy configuration provided in the autoconfig url\" respectively."
+msgid ""
+"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
+"representing \"use system settings\", \"no proxy\", \"use manual proxy "
+"configuration\" and \"use proxy configuration provided in the autoconfig url"
+"\" respectively."
 msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.h:29
@@ -19034,8 +19741,7 @@ msgstr "Bar ochr yn weladwy"
 msgid "Skip development warning dialog"
 msgstr "Hepgor deialog rhybudd datblygiad"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
-#: ../shell/main.c:489
+#: ../shell/apps_evolution_shell.schemas.in.h:31 ../shell/main.c:489
 msgid "Start in offline mode"
 msgstr "Dechreuwch ym modd all-lein"
 
@@ -19044,8 +19750,12 @@ msgid "Statusbar is visible"
 msgstr "Bar statws yn weladwy"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:33
-msgid "The configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
-msgstr "Fersiwn cyfluniad Evolution, gyda lefel pennaf/lleiaf/cyfluniad (er enghraifft \"2.6.0\")."
+msgid ""
+"The configuration version of Evolution, with major/minor/configuration level "
+"(for example \"2.6.0\")."
+msgstr ""
+"Fersiwn cyfluniad Evolution, gyda lefel pennaf/lleiaf/cyfluniad (er "
+"enghraifft \"2.6.0\")."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default height for the main window, in pixels."
@@ -19060,8 +19770,12 @@ msgid "The default width for the sidebar, in pixels."
 msgstr "Lled rhagosodedig y bar ochr, mewn picseli"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:37
-msgid "The last upgraded configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
-msgstr "Fersiwn Evolution pryd gafodd y cyfluniad ei ddiweddaru diwethaf, gyda lefel pennaf/lleiaf/cyfluniad (er enghraifft \"2.6.0\")."
+msgid ""
+"The last upgraded configuration version of Evolution, with major/minor/"
+"configuration level (for example \"2.6.0\")."
+msgstr ""
+"Fersiwn Evolution pryd gafodd y cyfluniad ei ddiweddaru diwethaf, gyda lefel "
+"pennaf/lleiaf/cyfluniad (er enghraifft \"2.6.0\")."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The machine name to proxy HTTP through."
@@ -19076,23 +19790,39 @@ msgid "The machine name to proxy socks through."
 msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.h:41
-msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/http_host\" that you proxy through."
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"http_host\" that you proxy through."
 msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.h:42
-msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/secure_host\" that you proxy through."
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"secure_host\" that you proxy through."
 msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.h:43
-msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/socks_host\" that you proxy through."
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"socks_host\" that you proxy through."
 msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.h:44
-msgid "The style of the window buttons. Can be \"text\", \"icons\", \"both\", \"toolbar\". If \"toolbar\" is set, the style of the buttons is determined by the GNOME toolbar setting."
-msgstr "Arddull botymau'r ffenestr. Gall fod: \"testun\", \"eiconau\", \"y ddau\", \"bar offer\". Os mai \"bar offer\" sydd wedi ei osod, gosodiadau bar offer GNOME sy'n penderfynu arddull y botymau."
+msgid ""
+"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
+"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
+"by the GNOME toolbar setting."
+msgstr ""
+"Arddull botymau'r ffenestr. Gall fod: \"testun\", \"eiconau\", \"y ddau\", "
+"\"bar offer\". Os mai \"bar offer\" sydd wedi ei osod, gosodiadau bar offer "
+"GNOME sy'n penderfynu arddull y botymau."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:45
-msgid "This key contains a list of hosts which are connected to directly, rather than via the proxy (if it is active). The values can be hostnames, domains (using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
+msgid ""
+"This key contains a list of hosts which are connected to directly, rather "
+"than via the proxy (if it is active). The values can be hostnames, domains "
+"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
+"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
 msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.h:46
@@ -19133,8 +19863,11 @@ msgid "Whether the toolbar should be visible."
 msgstr "A ddylai'r bar offer fod yn weladwy."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "Whether the warning dialog in development versions of Evolution is skipped."
-msgstr "A fydd y ddeialog rhybudd mewn fersiynau datblygu o Evolution yn cael ei hepgor."
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
+msgstr ""
+"A fydd y ddeialog rhybudd mewn fersiynau datblygu o Evolution yn cael ei "
+"hepgor."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the window buttons should be visible."
@@ -19166,11 +19899,15 @@ msgstr "Dewiswch pa fath o fewnforiwr i'w redeg:"
 
 #: ../shell/e-shell-importer.c:131
 #, fuzzy
-msgid "Choose the file that you want to import into Evolution, and select what type of file it is from the list."
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list."
 msgstr ""
-"Dewiswch y ffeil yr ydych am ei mewnforio i Evolution, a dewiswch o'r rhestr pa fath o ffeil yw hi.\n"
+"Dewiswch y ffeil yr ydych am ei mewnforio i Evolution, a dewiswch o'r rhestr "
+"pa fath o ffeil yw hi.\n"
 "\n"
-"Gallwch chi ddewis \"Awtomatig\" os nad ydych chi'n gwybod, ac fe fydd Evolution yn ceisio ei ddatrys."
+"Gallwch chi ddewis \"Awtomatig\" os nad ydych chi'n gwybod, ac fe fydd "
+"Evolution yn ceisio ei ddatrys."
 
 #: ../shell/e-shell-importer.c:135
 msgid "Choose the destination for this import"
@@ -19218,8 +19955,7 @@ msgstr "Hoffterau Evolution"
 
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:47
-#: ../shell/e-shell-window.c:324
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:324
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -19234,10 +19970,12 @@ msgid "Error executing %s. (%s)"
 msgstr "Gwall wrth weithredu %s."
 
 #: ../shell/e-shell-window-commands.c:135
+#, fuzzy
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy heb ei osod."
 
 #: ../shell/e-shell-window-commands.c:138
+#, fuzzy
 msgid "Bug buddy could not be run."
 msgstr "Methu rhedeg Gwall-Gyfaill (Bug Buddy)."
 
@@ -19261,8 +19999,7 @@ msgstr "Safle Gwe Evolution"
 msgid "_Work Online"
 msgstr "_Gweithio Ar-lein"
 
-#: ../shell/e-shell-window-commands.c:1176
-#: ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1176 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "_Gweithio All-lein"
 
@@ -19275,7 +20012,8 @@ msgstr "Gweithio All-lein"
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
-msgstr "Mae Evolution ar-lein ar hyn o bryd. Cliciwch y botwm hwn i weithio all-lein."
+msgstr ""
+"Mae Evolution ar-lein ar hyn o bryd. Cliciwch y botwm hwn i weithio all-lein."
 
 #: ../shell/e-shell-window.c:379
 msgid "Evolution is in the process of going offline."
@@ -19286,7 +20024,8 @@ msgstr "Mae Evolution yn y broses o fynd all-lein."
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
-msgstr "Mae Evolution all-lein ar hyn o bryd. Cliciwch y botwm hwn i weithio ar-lein."
+msgstr ""
+"Mae Evolution all-lein ar hyn o bryd. Cliciwch y botwm hwn i weithio ar-lein."
 
 #: ../shell/e-shell-window.c:778
 #, c-format
@@ -19297,14 +20036,12 @@ msgstr "Newid i %s"
 msgid "Unknown system error."
 msgstr "Gwall system anhysbys."
 
-#: ../shell/e-shell.c:832
-#: ../shell/e-shell.c:833
+#: ../shell/e-shell.c:832 ../shell/e-shell.c:833
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1251
-#: ../widgets/misc/e-cell-date-edit.c:320
+#: ../shell/e-shell.c:1251 ../widgets/misc/e-cell-date-edit.c:320
 msgid "OK"
 msgstr "Iawn"
 
@@ -19331,15 +20068,17 @@ msgid "New Test"
 msgstr "Prawf Newydd"
 
 #: ../shell/test/evolution-test-component.c:104
+#, fuzzy
 msgctxt "New"
 msgid "_Test"
-msgstr "_Prawf"
+msgstr "Prawf"
 
 #: ../shell/test/evolution-test-component.c:105
 msgid "Create a new test item"
 msgstr "Creu eitem prawf newydd"
 
 #: ../shell/import.glade.h:1
+#, fuzzy
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Cliciwch \"Mewnforio\" i gychwyn mewnforio'r ffeil i mewn i Evolution."
 
@@ -19368,6 +20107,7 @@ msgid "Select a File"
 msgstr "Dewis Ffeil"
 
 #: ../shell/import.glade.h:8
+#, fuzzy
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of\n"
@@ -19487,8 +20227,12 @@ msgid "Evolution can not start."
 msgstr "Ni all Evolution gychwyn."
 
 #: ../shell/shell.error.xml.h:6
-msgid "Forgetting your passwords will clear all remembered passwords. You will be reprompted next time they are needed."
-msgstr "Bydd anghofio cyfrineiriau yn clirio bob cyfrinair sydd wedi ei gofio. Byddwch yn cael eich promptio amdanynt y tro nesaf mae eu hangen."
+msgid ""
+"Forgetting your passwords will clear all remembered passwords. You will be "
+"reprompted next time they are needed."
+msgstr ""
+"Bydd anghofio cyfrineiriau yn clirio bob cyfrinair sydd wedi ei gofio. "
+"Byddwch yn cael eich promptio amdanynt y tro nesaf mae eu hangen."
 
 #: ../shell/shell.error.xml.h:8
 msgid "Insufficient disk space for upgrade."
@@ -19500,39 +20244,56 @@ msgstr "Ydych chi'n siŵr eich bod am ddileu hen ddata?"
 
 #: ../shell/shell.error.xml.h:10
 msgid ""
-"The entire contents of the &quot;evolution&quot; directory are about to be permanently removed.\n"
+"The entire contents of the &quot;evolution&quot; directory are about to be "
+"permanently removed.\n"
 "\n"
-"It is suggested you manually verify that all of your mail, contact, and calendar data is present, and that this version of Evolution operates correctly before deleting this old data.\n"
+"It is suggested you manually verify that all of your mail, contact, and "
+"calendar data is present, and that this version of Evolution operates "
+"correctly before deleting this old data.\n"
 "\n"
-"Once deleted, you cannot downgrade to the previous version of Evolution without manual intervention.\n"
+"Once deleted, you cannot downgrade to the previous version of Evolution "
+"without manual intervention.\n"
 msgstr ""
-"Mae holl gynnwys y blygell &quot;evolution&quot; ar fin cael ei ddileu'n barhaol.\n"
+"Mae holl gynnwys y blygell &quot;evolution&quot; ar fin cael ei ddileu'n "
+"barhaol.\n"
 "\n"
-"Awgrymir eich bod yn gwneud yn siŵr bod eich holl ddata e-bost, cysylltiadau a chalendr yn bresennol, a bod y fersiwn hwn o Evolution yn gweithio'n gywir cyn i chi ddileu'r hen ddata yma.\n"
+"Awgrymir eich bod yn gwneud yn siŵr bod eich holl ddata e-bost, cysylltiadau "
+"a chalendr yn bresennol, a bod y fersiwn hwn o Evolution yn gweithio'n gywir "
+"cyn i chi ddileu'r hen ddata yma.\n"
 "\n"
-"Ar ôl dileu, bydd israddio i'r fersiwn flaenorol o Evolution yn broses gymhleth, fydd rhaid ei gwneud â llaw.\n"
+"Ar ôl dileu, bydd israddio i'r fersiwn flaenorol o Evolution yn broses "
+"gymhleth, fydd rhaid ei gwneud â llaw.\n"
 
 #: ../shell/shell.error.xml.h:16
 msgid ""
 "The previous version of Evolution stored its data in a different location.\n"
 "\n"
-"If you choose to remove this data, the entire contents of the &quot;evolution&quot; directory will be removed permanently. If you choose to keep this data, then you may manually remove the contents of &quot;evolution&quot; at your convenience.\n"
+"If you choose to remove this data, the entire contents of the &quot;"
+"evolution&quot; directory will be removed permanently. If you choose to keep "
+"this data, then you may manually remove the contents of &quot;"
+"evolution&quot; at your convenience.\n"
 msgstr ""
 "Roedd y fersiwn flaenorol o Evolution yn storio data mewn man gwahanol.\n"
 "\n"
-"Os wnewch chi ddileu'r data yma, fe fydd holl gynnwys y blygell &quot;evolution&quot; yn cael ei ddileu'n barhaol. Os wnewch chi gadw'r data yma, gallwch ddileu cynnwys &quot;evolution&quot; eich hun pan mae'n gyfleus.\n"
+"Os wnewch chi ddileu'r data yma, fe fydd holl gynnwys y blygell &quot;"
+"evolution&quot; yn cael ei ddileu'n barhaol. Os wnewch chi gadw'r data yma, "
+"gallwch ddileu cynnwys &quot;evolution&quot; eich hun pan mae'n gyfleus.\n"
 
 #: ../shell/shell.error.xml.h:20
+#, fuzzy
 msgid "Upgrade from previous version failed: {0}"
 msgstr "Methwyd uwchraddio o'r fersiwn flaenorol: {0}"
 
 #: ../shell/shell.error.xml.h:21
 msgid ""
-"Upgrading your data and settings will require up to {0} of disk space, but you only have {1} available.\n"
+"Upgrading your data and settings will require up to {0} of disk space, but "
+"you only have {1} available.\n"
 "\n"
-"You will need to make more space available in your home directory before you can continue."
+"You will need to make more space available in your home directory before you "
+"can continue."
 msgstr ""
-"Mae angen hyd at {0} o le disg i uwchraddio'ch data a'ch gosodiadau, ond dim ond {1} sydd ar gael.\n"
+"Mae angen hyd at {0} o le disg i uwchraddio'ch data a'ch gosodiadau, ond dim "
+"ond {1} sydd ar gael.\n"
 "\n"
 "Rhaid i chi ryddhau mwy o le o fewn eich plygell cartref cyn parhau."
 
@@ -19573,14 +20334,17 @@ msgid "_Remind Me Later"
 msgstr "_Atgofia Fi Wedyn"
 
 #: ../shell/shell.error.xml.h:35
+#, fuzzy
 msgid ""
 "{1}\n"
 "\n"
-"If you choose to continue, you may not have access to some of your old data.\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
 msgstr ""
 "{1}\n"
 "\n"
-"Os wnewch chi barhau, efallai na fyddwch yn medru cyrchu peth o'ch hen ddata.\n"
+"Os wnewch chi barhau, efallai na fyddwch yn medru cyrchu peth o'ch hen "
+"ddata.\n"
 
 #: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
@@ -19594,12 +20358,24 @@ msgstr ""
 "Golygu gosodiadau ymddiried:"
 
 #: ../smime/gui/cert-trust-dialog.c:150
-msgid "Because you trust the certificate authority that issued this certificate, then you trust the authenticity of this certificate unless otherwise indicated here"
-msgstr "Am nad ydych yn ymddiried yn yr awdurdod tystysgrifo gyhoeddodd y dystysgrif hon, nid ydych yn ymddiried yn nilysrwydd y dystysgrif hon oni bai iddi gael ei nodi'n wahanol yma"
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+"Am nad ydych yn ymddiried yn yr awdurdod tystysgrifo gyhoeddodd y dystysgrif "
+"hon, nid ydych yn ymddiried yn nilysrwydd y dystysgrif hon oni bai iddi gael "
+"ei nodi'n wahanol yma"
 
 #: ../smime/gui/cert-trust-dialog.c:154
-msgid "Because you do not trust the certificate authority that issued this certificate, then you do not trust the authenticity of this certificate unless otherwise indicated here"
-msgstr "Am nad ydych yn ymddiried yn yr awdurdod tystysgrifo wnaeth gyhoeddi'r dystysgrif, dydych chi ddim yn ymddiried fod y dystysgrif ei hun yn ddilys, oni nodir yn wahanol isod"
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+"Am nad ydych yn ymddiried yn yr awdurdod tystysgrifo wnaeth gyhoeddi'r "
+"dystysgrif, dydych chi ddim yn ymddiried fod y dystysgrif ei hun yn ddilys, "
+"oni nodir yn wahanol isod"
 
 #: ../smime/gui/certificate-manager.c:136
 #: ../smime/gui/certificate-manager.c:383
@@ -19628,8 +20404,7 @@ msgstr "Enw'r Dystysgrif"
 msgid "Purposes"
 msgstr "Pwrpasau"
 
-#: ../smime/gui/certificate-manager.c:293
-#: ../smime/gui/smime-ui.glade.h:37
+#: ../smime/gui/certificate-manager.c:293 ../smime/gui/smime-ui.glade.h:37
 #: ../smime/lib/e-cert.c:552
 msgid "Serial Number"
 msgstr "Rhif Cyfresol"
@@ -19741,11 +20516,14 @@ msgid "Backup All"
 msgstr "Cadw Copi o Bopeth Wrth Gefn"
 
 #: ../smime/gui/smime-ui.glade.h:13
-msgid "Before trusting this CA for any purpose, you should examine its certificate and its policy and procedures (if available)."
-msgstr "Cyn ymddiried mewn Awdurdod Tystysgrifo at unrhyw bwrpas, dylech archwilio ei dystysgrif a'i bolisi a chanllawiau (os yw ar gael)"
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+"Cyn ymddiried mewn Awdurdod Tystysgrifo at unrhyw bwrpas, dylech archwilio "
+"ei dystysgrif a'i bolisi a chanllawiau (os yw ar gael)"
 
-#: ../smime/gui/smime-ui.glade.h:14
-#: ../smime/lib/e-cert.c:1058
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1058
 msgid "Certificate"
 msgstr "Tystysgrif"
 
@@ -19821,13 +20599,11 @@ msgstr "Uned Corff (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "Ã?l bys SHA1"
 
-#: ../smime/gui/smime-ui.glade.h:35
-#: ../smime/lib/e-cert.c:800
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:800
 msgid "SSL Client Certificate"
 msgstr "Tystysgrif Cleient SSL"
 
-#: ../smime/gui/smime-ui.glade.h:36
-#: ../smime/lib/e-cert.c:804
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:804
 msgid "SSL Server Certificate"
 msgstr "Tystysgrif Gwasanaethwr SSL"
 
@@ -19856,7 +20632,8 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "Mae gennych dystysgrifau gan y cyrff hyn sy'n eich adnabod chi:"
 
 #: ../smime/gui/smime-ui.glade.h:44
-msgid "You have certificates on file that identify these certificate authorities:"
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr "Mae gennych dystysgrifau sy'n adnabod yr awdurdodau tystysgrifo yma:"
 
 #: ../smime/gui/smime-ui.glade.h:45
@@ -19876,8 +20653,7 @@ msgstr "_Golygu Ymddiriedaeth CA"
 msgid "Certificate already exists"
 msgstr "Tystysgrif yn bodoli'n barod"
 
-#: ../smime/lib/e-cert.c:222
-#: ../smime/lib/e-cert.c:232
+#: ../smime/lib/e-cert.c:222 ../smime/lib/e-cert.c:232
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
@@ -19959,13 +20735,11 @@ msgstr "Algorithm Allwedd Gyhoeddus y Testun"
 msgid "Subject's Public Key"
 msgstr "Allwedd Gyhoeddus y Testun"
 
-#: ../smime/lib/e-cert.c:791
-#: ../smime/lib/e-cert.c:840
+#: ../smime/lib/e-cert.c:791 ../smime/lib/e-cert.c:840
 msgid "Error: Unable to process extension"
 msgstr "Gwall: Methu prosesu estyniad"
 
-#: ../smime/lib/e-cert.c:812
-#: ../smime/lib/e-cert.c:824
+#: ../smime/lib/e-cert.c:812 ../smime/lib/e-cert.c:824
 msgid "Object Signer"
 msgstr "Llofnodwr Gwrthrych"
 
@@ -20009,8 +20783,7 @@ msgstr "Llofnodwr CRL"
 msgid "Critical"
 msgstr "Gritigol"
 
-#: ../smime/lib/e-cert.c:922
-#: ../smime/lib/e-cert.c:925
+#: ../smime/lib/e-cert.c:922 ../smime/lib/e-cert.c:925
 msgid "Not Critical"
 msgstr "Heb fod yn Gritigol"
 
@@ -20023,8 +20796,7 @@ msgstr "Estyniadau"
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1072
-#: ../smime/lib/e-cert.c:1192
+#: ../smime/lib/e-cert.c:1072 ../smime/lib/e-cert.c:1192
 msgid "Certificate Signature Algorithm"
 msgstr "Algorithm Llofnod Tystysgrif"
 
@@ -20074,8 +20846,9 @@ msgid "Address _Book Properties"
 msgstr "Priodweddau _Llyfr Cyfeiriadau"
 
 #: ../ui/evolution-addressbook.xml.h:3
+#, fuzzy
 msgid "Change the properties of the selected folder"
-msgstr "Newid priodweddau'r blygell a ddewiswyd"
+msgstr "Newid priodweddau'r blygell"
 
 #: ../ui/evolution-addressbook.xml.h:4
 msgid "Co_py All Contacts To..."
@@ -20085,8 +20858,7 @@ msgstr "_Copïo Pob Cyswllt i..."
 msgid "Contact _Preview"
 msgstr "_Rhagolwg Cyswllt"
 
-#: ../ui/evolution-addressbook.xml.h:6
-#: ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
 #: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copïo"
@@ -20094,14 +20866,14 @@ msgstr "Copïo"
 #: ../ui/evolution-addressbook.xml.h:7
 #, fuzzy
 msgid "Copy selected contacts to another folder"
-msgstr "Copïo'r Cyswllt/Cysylltiadau a ddewiswyd i Blygell Arall..."
+msgstr "Copïo'r negeseuon a ddewiswyd i blygell arall"
 
 #: ../ui/evolution-addressbook.xml.h:8
+#, fuzzy
 msgid "Copy the contacts of the selected folder into another folder"
-msgstr "Copïo'r cysylltiadau o fewn y blygell a ddewiswyd i blygell arall"
+msgstr "Copïo'r blygell a ddewiswyd i blygell arall"
 
-#: ../ui/evolution-addressbook.xml.h:9
-#: ../ui/evolution-calendar.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Copïo'r dewis"
 
@@ -20114,14 +20886,12 @@ msgstr "Copïo i Blygell..."
 msgid "Create a new address book folder"
 msgstr "Creu plygell llyfr cyfeiriadau newydd"
 
-#: ../ui/evolution-addressbook.xml.h:12
-#: ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
 #: ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Torri"
 
-#: ../ui/evolution-addressbook.xml.h:13
-#: ../ui/evolution-calendar.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Torri'r dewisiad"
 
@@ -20134,6 +20904,7 @@ msgid "Delete selected contacts"
 msgstr "Dileu cysylltiadau dewisedig"
 
 #: ../ui/evolution-addressbook.xml.h:17
+#, fuzzy
 msgid "Delete the selected folder"
 msgstr "Dileu'r blygell a ddewiswyd"
 
@@ -20146,29 +20917,30 @@ msgid "Mo_ve All Contacts To..."
 msgstr "_Symud Pob Cyswllt i..."
 
 #: ../ui/evolution-addressbook.xml.h:20
+#, fuzzy
 msgid "Move selected contacts to another folder"
-msgstr "Symud y cysylltiadau a ddewiswyd i blygell arall..."
+msgstr "Symud y neges(euon) ddewiswyd i blygell arall"
 
 #: ../ui/evolution-addressbook.xml.h:21
+#, fuzzy
 msgid "Move the contacts of the selected folder into another folder"
-msgstr "Symud y cysylltiadau o fewn y blygell a ddewiswyd i blygell arall"
+msgstr "Symud y blygell a ddewiswyd i blygell arall"
 
 #: ../ui/evolution-addressbook.xml.h:22
 msgid "Move to Folder..."
 msgstr "Symud i Blygell..."
 
-#: ../ui/evolution-addressbook.xml.h:23
-#: ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
 #: ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Gludo"
 
-#: ../ui/evolution-addressbook.xml.h:24
-#: ../ui/evolution-calendar.xml.h:17
+#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "Gludo'r gludfwrdd"
 
 #: ../ui/evolution-addressbook.xml.h:25
+#, fuzzy
 msgid "Previews the contacts to be printed"
 msgstr "Dangos rhagolwg o'r cysylltiadau i'w printio"
 
@@ -20177,27 +20949,30 @@ msgid "Print selected contacts"
 msgstr "Argraffu cysylltiadau dewisedig"
 
 #: ../ui/evolution-addressbook.xml.h:29
+#, fuzzy
 msgid "Rename the selected folder"
 msgstr "Ail-enwi'r blygell a ddewiswyd"
 
 #: ../ui/evolution-addressbook.xml.h:30
+#, fuzzy
 msgid "S_ave Address Book As VCard"
-msgstr "_Cadw'r Llyfr Cyfeiriadau fel VCard"
+msgstr "C_adw'r Llyfr Cyfeiriadau fel vCard"
 
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "Cadw fel VCard..."
 
 #: ../ui/evolution-addressbook.xml.h:32
+#, fuzzy
 msgid "Save selected contacts as a VCard"
 msgstr "Cadw ar ffurf VCard y cysylltiadau sydd wedi eu dewis."
 
 #: ../ui/evolution-addressbook.xml.h:33
+#, fuzzy
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Cadw ar ffurf VCard y cysylltiadau o fewn y blygell a ddewiswyd"
 
-#: ../ui/evolution-addressbook.xml.h:34
-#: ../widgets/text/e-text.c:2719
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2719
 msgid "Select All"
 msgstr "Dewis Popeth"
 
@@ -20236,22 +21011,23 @@ msgid "Stop"
 msgstr "Atal"
 
 #: ../ui/evolution-addressbook.xml.h:43
+#, fuzzy
 msgid "Stop Loading"
-msgstr "Atal Llwytho"
+msgstr "Atal llwytho"
 
 #: ../ui/evolution-addressbook.xml.h:44
 msgid "View the current contact"
 msgstr "Dangoswch y cyswllt cyfredol"
 
-#: ../ui/evolution-addressbook.xml.h:45
-#: ../ui/evolution-calendar.xml.h:39
+#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-tasks.xml.h:21
 msgid "_Actions"
 msgstr "_Gweithredoedd"
 
 #: ../ui/evolution-addressbook.xml.h:47
+#, fuzzy
 msgid "_Copy Contact to..."
-msgstr "_Copïo'r Cyswllt i..."
+msgstr "_Copïo'r Cyswllt I..."
 
 #: ../ui/evolution-addressbook.xml.h:48
 msgid "_Copy Folder Contacts To"
@@ -20266,15 +21042,15 @@ msgid "_Forward Contact..."
 msgstr "_Gyrru Cyswllt Ymlaen..."
 
 #: ../ui/evolution-addressbook.xml.h:53
+#, fuzzy
 msgid "_Move Contact to..."
-msgstr "_Symud Cyswllt i..."
+msgstr "_Symud Cyswllt I..."
 
 #: ../ui/evolution-addressbook.xml.h:54
 msgid "_Move Folder Contacts To"
 msgstr "_Symud Cysylltiadau'r Blygell i"
 
-#: ../ui/evolution-addressbook.xml.h:55
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Newydd"
 
@@ -20319,10 +21095,12 @@ msgid "Go To"
 msgstr "Mynd I"
 
 #: ../ui/evolution-calendar.xml.h:12
+#, fuzzy
 msgid "Go back"
 msgstr "Yn ôl"
 
 #: ../ui/evolution-calendar.xml.h:13
+#, fuzzy
 msgid "Go forward"
 msgstr "Ymlaen"
 
@@ -20334,18 +21112,17 @@ msgstr "Rhestr"
 msgid "Month"
 msgstr "Mis"
 
-#: ../ui/evolution-calendar.xml.h:16
-#: ../ui/evolution-mail-message.xml.h:58
+#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "Nesaf"
 
 #: ../ui/evolution-calendar.xml.h:18
+#, fuzzy
 msgid "Previews the calendar to be printed"
 msgstr "Rhagolygu'r calendr i'w argraffu"
 
-#: ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:70
+#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:70
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "Blaenorol"
@@ -20354,8 +21131,7 @@ msgstr "Blaenorol"
 msgid "Print this calendar"
 msgstr "Argraffu'r calendr yma"
 
-#: ../ui/evolution-calendar.xml.h:23
-#: ../ui/evolution-tasks.xml.h:17
+#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr "_Gwaredu"
 
@@ -20403,8 +21179,7 @@ msgstr "Dangos yr wythnos gweithio"
 msgid "View the current appointment"
 msgstr "Gweld yr apwyntiad cyfredol"
 
-#: ../ui/evolution-calendar.xml.h:36
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-calendar.xml.h:36 ../ui/evolution-mail-global.xml.h:19
 msgid "View the debug console for log messages"
 msgstr ""
 
@@ -20416,8 +21191,7 @@ msgstr "Wythnos"
 msgid "Work Week"
 msgstr "Wythnos Waith"
 
-#: ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-calendar.xml.h:41 ../ui/evolution-mail-global.xml.h:22
 #, fuzzy
 msgid "_Debug Logs"
 msgstr "_Gwelog:"
@@ -20439,6 +21213,7 @@ msgid "Create a new folder for storing mail"
 msgstr "Creu plygell newydd er mwyn cadw e-bost"
 
 #: ../ui/evolution-mail-global.xml.h:5
+#, fuzzy
 msgid "Create or edit Search Folder definitions"
 msgstr "Creu neu olygu diffiniadau Plygellau Chwilio"
 
@@ -20454,8 +21229,7 @@ msgstr ""
 msgid "Empty _Trash"
 msgstr "Gwagu'r Sbwriel"
 
-#: ../ui/evolution-mail-global.xml.h:9
-#: ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
 msgid "F_older"
 msgstr "_Plygell"
 
@@ -20465,8 +21239,10 @@ msgstr "Symud y blygell a ddewiswyd i blygell arall"
 
 #. Alphabetical by name, yo
 #: ../ui/evolution-mail-global.xml.h:12
+#, fuzzy
 msgid "Permanently remove all deleted messages from all folders"
-msgstr "Tynnu'n barhaol, o bob plygell, pob neges sydd wedi marcio wedi'i ddileu"
+msgstr ""
+"Tynnu'n barhaol, o bob plygell, pob neges sydd wedi marcio wedi'i ddileu"
 
 #: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
@@ -20485,6 +21261,7 @@ msgid "Show message preview side-by-side with the message list"
 msgstr "Dangos rhagolwg neges ochr-yn-ochr â'r rhestr negeseuon"
 
 #: ../ui/evolution-mail-global.xml.h:17
+#, fuzzy
 msgid "Show message preview window"
 msgstr "Dangos ffenest rhagolwg neges"
 
@@ -20582,8 +21359,10 @@ msgid "Hide _Read Messages"
 msgstr "Cuddio Negeseuon _Ddarllenwyd"
 
 #: ../ui/evolution-mail-list.xml.h:15
-msgid "Hide deleted messages rather than displaying them with a line through them"
-msgstr "Cuddio negeseuon wedi'u dileu yn hytrach na'u dangos gyda llinell drwyddynt"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
+"Cuddio negeseuon wedi'u dileu yn hytrach na'u dangos gyda llinell drwyddynt"
 
 #: ../ui/evolution-mail-list.xml.h:16
 msgid "Mar_k All Messages as Read"
@@ -20600,7 +21379,9 @@ msgstr "Gludo neges/negeseuon o'r clipfwrdd"
 
 #: ../ui/evolution-mail-list.xml.h:19
 msgid "Permanently remove all deleted messages from this folder"
-msgstr "Tynnu'n barhaol o'r blygell hon bob neges sydd wedi marcio fel un wedi'i ddileu"
+msgstr ""
+"Tynnu'n barhaol o'r blygell hon bob neges sydd wedi marcio fel un wedi'i "
+"ddileu"
 
 #: ../ui/evolution-mail-list.xml.h:20
 msgid "Permanently remove this folder"
@@ -20625,7 +21406,9 @@ msgstr "Dewis _Bob Neges"
 
 #: ../ui/evolution-mail-list.xml.h:26
 msgid "Select all and only the messages that are not currently selected"
-msgstr "Dewis pob un o'r negeseuon, a dim ond y negeseuon, nad ydynt wedi'u dewis ar hyn o bryd"
+msgstr ""
+"Dewis pob un o'r negeseuon, a dim ond y negeseuon, nad ydynt wedi'u dewis ar "
+"hyn o bryd"
 
 #: ../ui/evolution-mail-list.xml.h:27
 msgid "Select all messages in the same thread as the selected message"
@@ -20657,6 +21440,7 @@ msgid "Temporarily hide the selected messages"
 msgstr "Cuddio dros dro'r negeseuon a ddewiswyd"
 
 #: ../ui/evolution-mail-list.xml.h:34
+#, fuzzy
 msgid "Threaded Message list"
 msgstr "Rhestr Drywyddau Neges"
 
@@ -20664,8 +21448,7 @@ msgstr "Rhestr Drywyddau Neges"
 msgid "_Group By Threads"
 msgstr "Grwpio mewn _Edafedd"
 
-#: ../ui/evolution-mail-list.xml.h:37
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:111
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "_Neges"
@@ -20680,6 +21463,7 @@ msgstr "_Defnyddio Hidlyddion"
 
 #. Alphabetical by name, yo
 #: ../ui/evolution-mail-message.xml.h:4
+#, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "Ychwanegu'r Danfonwr at y Llyfr Cyfeiriadau"
 
@@ -20700,6 +21484,7 @@ msgid "Compose _New Message"
 msgstr "Cyfansoddi Neges _Newydd"
 
 #: ../ui/evolution-mail-message.xml.h:9
+#, fuzzy
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Cyfansoddi ateb at bob un o dderbynwyr y neges a ddewiswyd"
 
@@ -20724,18 +21509,22 @@ msgid "Create R_ule"
 msgstr "Creu _Rheol"
 
 #: ../ui/evolution-mail-message.xml.h:15
+#, fuzzy
 msgid "Create a Search Folder for these recipients"
 msgstr "Creu Plygell Chwilio ar gyfer y derbynwyr yma"
 
 #: ../ui/evolution-mail-message.xml.h:16
+#, fuzzy
 msgid "Create a Search Folder for this mailing list"
 msgstr "Creu Plygell Chwilio ar gyfer y rhestr e-bostio"
 
 #: ../ui/evolution-mail-message.xml.h:17
+#, fuzzy
 msgid "Create a Search Folder for this sender"
 msgstr "Creu Plygell Chwilio ar gyfer yr danfonwr yma"
 
 #: ../ui/evolution-mail-message.xml.h:18
+#, fuzzy
 msgid "Create a Search Folder for this subject"
 msgstr "Creu Plygell Chwilio ar gyfer y pwnc yma"
 
@@ -20792,8 +21581,9 @@ msgid "Display the previous unread message"
 msgstr "Dangos y neges flaenorol sydd heb ei darllen"
 
 #: ../ui/evolution-mail-message.xml.h:33
+#, fuzzy
 msgid "F_orward As..."
-msgstr "_Gyrru Ymlaen Fel..."
+msgstr "_Gyrru Ymlaen Fel"
 
 #: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
@@ -20816,6 +21606,7 @@ msgid "Filter the selected messages for junk status"
 msgstr "Hidlo'r negeseuon a ddewiswyd am statws sothach"
 
 #: ../ui/evolution-mail-message.xml.h:39
+#, fuzzy
 msgid "Flag selected messages for follow-up"
 msgstr "Marcio neges(euon) ddewiswyd er mwyn eu dilyn i fyny"
 
@@ -20848,8 +21639,9 @@ msgid "Increase the text size"
 msgstr "Cynyddu maint testun"
 
 #: ../ui/evolution-mail-message.xml.h:49
+#, fuzzy
 msgid "Mar_k as"
-msgstr "_Marcio fel"
+msgstr "Mar_cio Fel"
 
 #: ../ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected messages as having been read"
@@ -20864,6 +21656,7 @@ msgid "Mark the selected messages as junk"
 msgstr "Marcio'r neges(euon) ddewiswyd yn rai sothach"
 
 #: ../ui/evolution-mail-message.xml.h:53
+#, fuzzy
 msgid "Mark the selected messages as not being junk"
 msgstr "Marcio'r neges(euon) ddewiswyd fel rhai sydd ddim yn sothach"
 
@@ -20944,6 +21737,7 @@ msgid "Reset the text to its original size"
 msgstr "Adfer y testun i'w faint gwreiddiol"
 
 #: ../ui/evolution-mail-message.xml.h:81
+#, fuzzy
 msgid "Save the selected messages as a text file"
 msgstr "Cadw'r neges(euon) ddewiswyd fel ffeil destun"
 
@@ -20975,14 +21769,15 @@ msgstr "Dewis yr _holl destun"
 msgid "Select all the text in a message"
 msgstr "Dewis yr holl destun o fewn y neges"
 
-#: ../ui/evolution-mail-message.xml.h:89
-#: ../ui/evolution.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:89 ../ui/evolution.xml.h:27
+#, fuzzy
 msgid "Set up the page settings for your current printer"
 msgstr "Gosod y dewisiadau tudalen i fyny ar gyfer eich argraffydd presennol"
 
 #: ../ui/evolution-mail-message.xml.h:90
 msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "Dangos cyrchwr sy'n chwincian yng nghorff y negeseuon sy'n cael eu dangos"
+msgstr ""
+"Dangos cyrchwr sy'n chwincian yng nghorff y negeseuon sy'n cael eu dangos"
 
 #: ../ui/evolution-mail-message.xml.h:91
 msgid "Show messages with all email headers"
@@ -21105,8 +21900,7 @@ msgstr "_Chwyddo"
 msgid "Close"
 msgstr "Cau"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
 msgstr "Bar offer"
 
@@ -21127,6 +21921,7 @@ msgid "Paste memo from the clipboard"
 msgstr "Gludo memo o'r clipfwrdd"
 
 #: ../ui/evolution-memos.xml.h:10
+#, fuzzy
 msgid "Previews the list of memos to be printed"
 msgstr "Rhagolygu'r rhestr o femos i'w argraffu"
 
@@ -21171,6 +21966,7 @@ msgid "Paste tasks from the clipboard"
 msgstr "Gludo tasgau o'r clipfwrdd"
 
 #: ../ui/evolution-tasks.xml.h:13
+#, fuzzy
 msgid "Previews the list of tasks to be printed"
 msgstr "Rhagolygu'r rhestr o dasgau i'w argraffu"
 
@@ -21199,14 +21995,16 @@ msgid "About Evolution..."
 msgstr "Ynghylch Evolution..."
 
 #: ../ui/evolution.xml.h:2
+#, fuzzy
 msgid "Change Evolution's settings"
-msgstr "Newidiwch Osodiadau Evolution"
+msgstr "Llwytho gsodiadau Evolution"
 
 #: ../ui/evolution.xml.h:3
 msgid "Change the visibility of the toolbar"
 msgstr "Dangos gwelededd y bar offer"
 
 #: ../ui/evolution.xml.h:5
+#, fuzzy
 msgid "Create a new window displaying this folder"
 msgstr "Creu ffenest newydd yn dangos y blygell"
 
@@ -21227,9 +22025,8 @@ msgid "Display window buttons with text only"
 msgstr "Dangos botymau ffenestr gyda thestun yn unig"
 
 #: ../ui/evolution.xml.h:10
-#, fuzzy
 msgid "Evolution _FAQ"
-msgstr "Evolution"
+msgstr "_FAQ Evolution"
 
 #: ../ui/evolution.xml.h:11
 msgid "Exit the program"
@@ -21237,7 +22034,9 @@ msgstr "Gadael y rhaglen"
 
 #: ../ui/evolution.xml.h:12
 msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr "Anghofio'r cyfrineiriau a gofiwyd, fel eich bod yn cael eich promptio amdanynt unwaith eto"
+msgstr ""
+"Anghofio'r cyfrineiriau a gofiwyd, fel eich bod yn cael eich promptio "
+"amdanynt unwaith eto"
 
 #: ../ui/evolution.xml.h:13
 msgid "Hide window buttons"
@@ -21248,9 +22047,8 @@ msgid "I_mport..."
 msgstr "_Mewnforio..."
 
 #: ../ui/evolution.xml.h:15
-#, fuzzy
 msgid "Icons _and Text"
-msgstr "Eiconau _a thestun"
+msgstr "Eiconau _a Thestun"
 
 #: ../ui/evolution.xml.h:16
 msgid "Import data from other programs"
@@ -21269,9 +22067,8 @@ msgid "Open the Frequently Asked Questions webpage"
 msgstr "Agor tudalen wê Cwestiynau a Ofynnir yn Aml"
 
 #: ../ui/evolution.xml.h:21
-#, fuzzy
 msgid "Page Set_up..."
-msgstr "Gosodiad Tudalen:"
+msgstr "_Gosodiad Tudalen..."
 
 #: ../ui/evolution.xml.h:22
 msgid "Prefere_nces"
@@ -21302,6 +22099,7 @@ msgid "Show _Status Bar"
 msgstr "Dangos Bar _Statws"
 
 #: ../ui/evolution.xml.h:30
+#, fuzzy
 msgid "Show _Toolbar"
 msgstr "Dangos _Bar Offer"
 
@@ -21314,8 +22112,9 @@ msgid "Submit Bug Report"
 msgstr "Anfon Adroddiad Nam"
 
 #: ../ui/evolution.xml.h:33
+#, fuzzy
 msgid "Submit _Bug Report"
-msgstr "Anfon Adroddiad _Nam"
+msgstr "Anfon Adroddiad Nam"
 
 #: ../ui/evolution.xml.h:34
 msgid "Submit a bug report using Bug Buddy"
@@ -21326,9 +22125,8 @@ msgid "Toggle whether we are working offline."
 msgstr "Toglu a ydyn ni'n gweithio all-lein."
 
 #: ../ui/evolution.xml.h:36
-#, fuzzy
 msgid "Tool_bar Style"
-msgstr "_Arddull bar offer"
+msgstr "_Arddull Bar Offer"
 
 #: ../ui/evolution.xml.h:37
 msgid "View/Hide the Side Bar"
@@ -21339,9 +22137,8 @@ msgid "View/Hide the Status Bar"
 msgstr "Cuddio/Gweld y Bar Statws"
 
 #: ../ui/evolution.xml.h:39
-#, fuzzy
 msgid "Work _Offline"
-msgstr "Gweithio All-lein"
+msgstr "Gweithio _All-lein"
 
 #: ../ui/evolution.xml.h:40
 msgid "_About"
@@ -21399,8 +22196,7 @@ msgstr "Ar Sail _Cwmni"
 msgid "_Address Cards"
 msgstr "Cardiau _Cyfeiriad"
 
-#: ../views/addressbook/galview.xml.h:3
-#: ../views/calendar/galview.xml.h:3
+#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
 msgid "_List View"
 msgstr "Golwg _Rhestr"
 
@@ -21491,10 +22287,12 @@ msgstr ""
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time zone.\n"
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
 "Use the right mouse button to zoom out."
 msgstr ""
-"Defnyddiwch fotwm chwith y llygoden i chwyddo un ardal o'r map a dewis cylchfa amser.\n"
+"Defnyddiwch fotwm chwith y llygoden i chwyddo un ardal o'r map a dewis "
+"cylchfa amser.\n"
 "Defnyddiwch fotwm de'r llygoden i grebachu."
 
 #: ../widgets/menus/gal-define-views-dialog.c:74
@@ -21560,9 +22358,9 @@ msgid "C_urrent View"
 msgstr "_Golwg Gyfredol"
 
 #: ../widgets/menus/gal-view-menus.c:327
-#, c-format
+#, fuzzy, c-format
 msgid "Select View: %s"
-msgstr "Dewis Golwg: %s"
+msgstr "Golwg Wythnos: %s. %s"
 
 #: ../widgets/menus/gal-view-menus.c:370
 msgid "Current view is a customized view"
@@ -21605,19 +22403,16 @@ msgid "Attached message"
 msgstr "Neges wedi'i hatodi"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment.c:1773
-#: ../widgets/misc/e-attachment.c:2313
+#: ../widgets/misc/e-attachment.c:1773 ../widgets/misc/e-attachment.c:2313
 #: ../widgets/misc/e-attachment-store.c:636
 msgid "attachment.dat"
 msgstr "atodiad.dat"
 
-#: ../widgets/misc/e-attachment.c:1822
-#: ../widgets/misc/e-attachment.c:2619
+#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2619
 msgid "A load operation is already in progress"
 msgstr ""
 
-#: ../widgets/misc/e-attachment.c:1830
-#: ../widgets/misc/e-attachment.c:2627
+#: ../widgets/misc/e-attachment.c:1830 ../widgets/misc/e-attachment.c:2627
 msgid "A save operation is already in progress"
 msgstr ""
 
@@ -21729,9 +22524,8 @@ msgid "S_ave All"
 msgstr "Cadw _Pob Un"
 
 #: ../widgets/misc/e-attachment-view.c:326
-#, fuzzy
 msgid "A_dd Attachment..."
-msgstr "Ychwanegu _atodiad..."
+msgstr "Ychwanegu _Atodiad..."
 
 #: ../widgets/misc/e-attachment-view.c:643
 #, c-format
@@ -21753,8 +22547,7 @@ msgid "Month Calendar"
 msgstr "Calendr Mis"
 
 #: ../widgets/misc/e-canvas-background.c:454
-#: ../widgets/misc/e-canvas-background.c:455
-#: ../widgets/text/e-text.c:3632
+#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3632
 #: ../widgets/text/e-text.c:3633
 msgid "Fill color"
 msgstr "Lliw llenwi"
@@ -21762,17 +22555,14 @@ msgstr "Lliw llenwi"
 #: ../widgets/misc/e-canvas-background.c:461
 #: ../widgets/misc/e-canvas-background.c:462
 #: ../widgets/misc/e-canvas-background.c:468
-#: ../widgets/misc/e-canvas-background.c:469
-#: ../widgets/text/e-text.c:3639
-#: ../widgets/text/e-text.c:3640
-#: ../widgets/text/e-text.c:3646
+#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3639
+#: ../widgets/text/e-text.c:3640 ../widgets/text/e-text.c:3646
 #: ../widgets/text/e-text.c:3647
 msgid "GDK fill color"
 msgstr "Lliw llenwi GDK"
 
 #: ../widgets/misc/e-canvas-background.c:475
-#: ../widgets/misc/e-canvas-background.c:476
-#: ../widgets/text/e-text.c:3653
+#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3653
 #: ../widgets/text/e-text.c:3654
 msgid "Fill stipple"
 msgstr "Llenwi dotwaith"
@@ -21797,24 +22587,21 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:89
-#: ../widgets/misc/e-reflow.c:1414
+#: ../widgets/misc/e-canvas-vbox.c:89 ../widgets/misc/e-reflow.c:1414
 #: ../widgets/table/e-table-group-container.c:1001
 #: ../widgets/table/e-table-group-leaf.c:649
 #: ../widgets/table/e-table-item.c:3062
 msgid "Minimum width"
 msgstr "Lleiafswm lled"
 
-#: ../widgets/misc/e-canvas-vbox.c:90
-#: ../widgets/misc/e-reflow.c:1415
+#: ../widgets/misc/e-canvas-vbox.c:90 ../widgets/misc/e-reflow.c:1415
 #: ../widgets/table/e-table-group-container.c:1002
 #: ../widgets/table/e-table-group-leaf.c:650
 #: ../widgets/table/e-table-item.c:3063
 msgid "Minimum Width"
 msgstr "Lleiafswm Lled"
 
-#: ../widgets/misc/e-canvas-vbox.c:101
-#: ../widgets/misc/e-canvas-vbox.c:102
+#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
 msgid "Spacing"
 msgstr "Bylchu"
 
@@ -21887,16 +22674,13 @@ msgstr "Gorllewin Ewrop"
 msgid "Western European, New"
 msgstr "Gorllewin Ewrop, Newydd"
 
-#: ../widgets/misc/e-charset-picker.c:89
-#: ../widgets/misc/e-charset-picker.c:90
+#: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90
 #: ../widgets/misc/e-charset-picker.c:91
 msgid "Traditional"
 msgstr "Traddodiadol"
 
-#: ../widgets/misc/e-charset-picker.c:92
-#: ../widgets/misc/e-charset-picker.c:93
-#: ../widgets/misc/e-charset-picker.c:94
-#: ../widgets/misc/e-charset-picker.c:95
+#: ../widgets/misc/e-charset-picker.c:92 ../widgets/misc/e-charset-picker.c:93
+#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
 msgid "Simplified"
 msgstr "Symledig"
 
@@ -21963,10 +22747,8 @@ msgid "Invalid Time Value"
 msgstr "Gwerth Amser Annilys"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:123
-#: ../widgets/misc/e-filter-bar.c:178
-#: ../widgets/misc/e-filter-bar.c:306
-#: ../widgets/misc/e-filter-bar.c:737
+#: ../widgets/misc/e-filter-bar.c:123 ../widgets/misc/e-filter-bar.c:178
+#: ../widgets/misc/e-filter-bar.c:306 ../widgets/misc/e-filter-bar.c:737
 msgid "Advanced Search"
 msgstr "Chwilio Uwch"
 
@@ -21983,18 +22765,15 @@ msgstr "_Chwiliadau"
 msgid "Searches"
 msgstr "Chwiliadau"
 
-#: ../widgets/misc/e-filter-bar.h:100
-#: ../widgets/misc/e-filter-bar.h:110
+#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:110
 msgid "_Save Search..."
 msgstr "_Cadw Chwiliad..."
 
-#: ../widgets/misc/e-filter-bar.h:101
-#: ../widgets/misc/e-filter-bar.h:111
+#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:111
 msgid "_Edit Saved Searches..."
 msgstr "_Golygu Chwiliadau wedi'u Harbed..."
 
-#: ../widgets/misc/e-filter-bar.h:102
-#: ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:112
 msgid "_Advanced Search..."
 msgstr "_Chwilio Uwch..."
 
@@ -22020,8 +22799,13 @@ msgstr "Map y Byd"
 
 #: ../widgets/misc/e-map.c:607
 #, fuzzy
-msgid "Mouse-based interactive map widget for selecting timezone. Keyboard users should instead select the timezone from the drop-down combination box below."
-msgstr "Teclyn map rhyngweithiol, sy'n defnyddio'r llygoden er mwyn dewis cylchfa amser. Dylai defnyddwyr y bysellfwrdd, yn lle hynny, ddewis y gylchfa amser o'r blwch combo sydd isod."
+msgid ""
+"Mouse-based interactive map widget for selecting timezone. Keyboard users "
+"should instead select the timezone from the drop-down combination box below."
+msgstr ""
+"Teclyn map rhyngweithiol, sy'n defnyddio'r llygoden er mwyn dewis cylchfa "
+"amser. Dylai defnyddwyr y bysellfwrdd, yn lle hynny, ddewis y gylchfa amser "
+"o'r blwch combo sydd isod."
 
 #: ../widgets/misc/e-online-button.c:106
 msgid "Online"
@@ -22043,31 +22827,25 @@ msgstr "Cysoni Cofnodion Preifat..."
 msgid "Sync Categories:"
 msgstr "Cysoni Categorïau:"
 
-#: ../widgets/misc/e-reflow.c:1435
-#: ../widgets/misc/e-reflow.c:1436
+#: ../widgets/misc/e-reflow.c:1435 ../widgets/misc/e-reflow.c:1436
 msgid "Empty message"
 msgstr "Neges wag"
 
-#: ../widgets/misc/e-reflow.c:1442
-#: ../widgets/misc/e-reflow.c:1443
+#: ../widgets/misc/e-reflow.c:1442 ../widgets/misc/e-reflow.c:1443
 msgid "Reflow model"
 msgstr "Ail-redeg model"
 
-#: ../widgets/misc/e-reflow.c:1449
-#: ../widgets/misc/e-reflow.c:1450
+#: ../widgets/misc/e-reflow.c:1449 ../widgets/misc/e-reflow.c:1450
 msgid "Column width"
 msgstr "Lled colofn"
 
-#: ../widgets/misc/e-search-bar.c:92
-#: ../widgets/misc/e-search-bar.c:359
-#: ../widgets/misc/e-search-bar.c:503
-#: ../widgets/misc/e-search-bar.c:505
+#: ../widgets/misc/e-search-bar.c:92 ../widgets/misc/e-search-bar.c:359
+#: ../widgets/misc/e-search-bar.c:503 ../widgets/misc/e-search-bar.c:505
 #: ../widgets/misc/e-search-bar.c:1021
 msgid "Search"
 msgstr "Chwilio"
 
-#: ../widgets/misc/e-search-bar.c:359
-#: ../widgets/misc/e-search-bar.c:503
+#: ../widgets/misc/e-search-bar.c:359 ../widgets/misc/e-search-bar.c:503
 #: ../widgets/misc/e-search-bar.c:505
 #, fuzzy
 msgid "Click here to change the search type"
@@ -22089,8 +22867,7 @@ msgstr "_Clirio"
 msgid "Item ID"
 msgstr "ID Eitem"
 
-#: ../widgets/misc/e-search-bar.c:906
-#: ../widgets/text/e-text.c:3555
+#: ../widgets/misc/e-search-bar.c:906 ../widgets/text/e-text.c:3555
 #: ../widgets/text/e-text.c:3556
 msgid "Text"
 msgstr "Testun"
@@ -22098,16 +22875,19 @@ msgstr "Testun"
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
 #: ../widgets/misc/e-search-bar.c:1053
+#, fuzzy
 msgid "Sho_w: "
 msgstr "_Dangos:"
 
 #: ../widgets/misc/e-search-bar.c:1072
+#, fuzzy
 msgid "Sear_ch: "
 msgstr "_Chwilio:"
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
 #: ../widgets/misc/e-search-bar.c:1088
+#, fuzzy
 msgid " i_n "
 msgstr "o _fewn"
 
@@ -22268,9 +23048,9 @@ msgstr "Ar ôl _agor:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
 #: ../widgets/misc/e-task-widget.c:251
-#, c-format
+#, fuzzy, c-format
 msgid "%s (...)"
-msgstr "%s (...)"
+msgstr "%s..."
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
@@ -22323,13 +23103,11 @@ msgstr "Colofn Lliw Cefndir"
 msgid "State"
 msgstr "Cyflwr"
 
-#: ../widgets/table/e-table-config.c:385
-#: ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
 msgid "(Ascending)"
 msgstr "(Esgynnol)"
 
-#: ../widgets/table/e-table-config.c:385
-#: ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
 msgid "(Descending)"
 msgstr "(Disgynnol)"
 
@@ -22364,9 +23142,8 @@ msgid "Clear All"
 msgstr "Clirio Pob Un"
 
 #: ../widgets/table/e-table-config.glade.h:4
-#, fuzzy
 msgid "Clear _All"
-msgstr "Clirio Pob Un"
+msgstr "Clirio _Pob Un"
 
 #: ../widgets/table/e-table-config.glade.h:5
 #: ../widgets/table/e-table-header-item.c:1579
@@ -22469,8 +23246,7 @@ msgstr[2] "%s (%d eitem)"
 #: ../widgets/table/e-table-group-container.c:925
 #: ../widgets/table/e-table-group-leaf.c:586
 #: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3020
-#: ../widgets/table/e-table-item.c:3021
+#: ../widgets/table/e-table-item.c:3020 ../widgets/table/e-table-item.c:3021
 msgid "Alternating Row Colors"
 msgstr "Lliwiau Bob yn Ail Res"
 
@@ -22478,10 +23254,8 @@ msgstr "Lliwiau Bob yn Ail Res"
 #: ../widgets/table/e-table-group-container.c:932
 #: ../widgets/table/e-table-group-leaf.c:593
 #: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3027
-#: ../widgets/table/e-table-item.c:3028
-#: ../widgets/table/e-tree.c:3339
-#: ../widgets/table/e-tree.c:3340
+#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
+#: ../widgets/table/e-tree.c:3339 ../widgets/table/e-tree.c:3340
 msgid "Horizontal Draw Grid"
 msgstr "Grid Tynnu Llorweddol"
 
@@ -22489,10 +23263,8 @@ msgstr "Grid Tynnu Llorweddol"
 #: ../widgets/table/e-table-group-container.c:939
 #: ../widgets/table/e-table-group-leaf.c:600
 #: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3034
-#: ../widgets/table/e-table-item.c:3035
-#: ../widgets/table/e-tree.c:3345
-#: ../widgets/table/e-tree.c:3346
+#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-tree.c:3345 ../widgets/table/e-tree.c:3346
 msgid "Vertical Draw Grid"
 msgstr "Grid Tynnu Fertigol"
 
@@ -22500,10 +23272,8 @@ msgstr "Grid Tynnu Fertigol"
 #: ../widgets/table/e-table-group-container.c:946
 #: ../widgets/table/e-table-group-leaf.c:607
 #: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3041
-#: ../widgets/table/e-table-item.c:3042
-#: ../widgets/table/e-tree.c:3351
-#: ../widgets/table/e-tree.c:3352
+#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
+#: ../widgets/table/e-tree.c:3351 ../widgets/table/e-tree.c:3352
 msgid "Draw focus"
 msgstr "Ffocws tynnu"
 
@@ -22511,8 +23281,7 @@ msgstr "Ffocws tynnu"
 #: ../widgets/table/e-table-group-container.c:953
 #: ../widgets/table/e-table-group-leaf.c:614
 #: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3048
-#: ../widgets/table/e-table-item.c:3049
+#: ../widgets/table/e-table-item.c:3048 ../widgets/table/e-table-item.c:3049
 msgid "Cursor mode"
 msgstr "Modd cyrchwr"
 
@@ -22520,8 +23289,7 @@ msgstr "Modd cyrchwr"
 #: ../widgets/table/e-table-group-container.c:960
 #: ../widgets/table/e-table-group-leaf.c:628
 #: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3013
-#: ../widgets/table/e-table-item.c:3014
+#: ../widgets/table/e-table-item.c:3013 ../widgets/table/e-table-item.c:3014
 msgid "Selection model"
 msgstr "Model Dewis"
 
@@ -22529,10 +23297,8 @@ msgstr "Model Dewis"
 #: ../widgets/table/e-table-group-container.c:967
 #: ../widgets/table/e-table-group-leaf.c:621
 #: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3055
-#: ../widgets/table/e-table-item.c:3056
-#: ../widgets/table/e-table.c:3316
-#: ../widgets/table/e-tree.c:3333
+#: ../widgets/table/e-table-item.c:3055 ../widgets/table/e-table-item.c:3056
+#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3333
 #: ../widgets/table/e-tree.c:3334
 msgid "Length Threshold"
 msgstr "Trothwy Hyd"
@@ -22541,10 +23307,8 @@ msgstr "Trothwy Hyd"
 #: ../widgets/table/e-table-group-container.c:974
 #: ../widgets/table/e-table-group-leaf.c:663
 #: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:3089
-#: ../widgets/table/e-table-item.c:3090
-#: ../widgets/table/e-table.c:3323
-#: ../widgets/table/e-tree.c:3365
+#: ../widgets/table/e-table-item.c:3089 ../widgets/table/e-table-item.c:3090
+#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3365
 #: ../widgets/table/e-tree.c:3366
 msgid "Uniform row height"
 msgstr "Uchder cyson rhesi"
@@ -22614,18 +23378,15 @@ msgstr "_Trefnu Fesul"
 msgid "_Custom"
 msgstr "Addasedig"
 
-#: ../widgets/table/e-table-item.c:2999
-#: ../widgets/table/e-table-item.c:3000
+#: ../widgets/table/e-table-item.c:2999 ../widgets/table/e-table-item.c:3000
 msgid "Table header"
 msgstr "Pennyn Tabl"
 
-#: ../widgets/table/e-table-item.c:3006
-#: ../widgets/table/e-table-item.c:3007
+#: ../widgets/table/e-table-item.c:3006 ../widgets/table/e-table-item.c:3007
 msgid "Table model"
 msgstr "Model Tabl"
 
-#: ../widgets/table/e-table-item.c:3082
-#: ../widgets/table/e-table-item.c:3083
+#: ../widgets/table/e-table-item.c:3082 ../widgets/table/e-table-item.c:3083
 msgid "Cursor row"
 msgstr "Rhes Gyrchwr"
 
@@ -22633,8 +23394,7 @@ msgstr "Rhes Gyrchwr"
 msgid "Sort Info"
 msgstr "Manylion Trefnu"
 
-#: ../widgets/table/e-table.c:3330
-#: ../widgets/table/e-tree.c:3372
+#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3372
 #: ../widgets/table/e-tree.c:3373
 msgid "Always search"
 msgstr "Chwilio o hyd"
@@ -22648,8 +23408,7 @@ msgstr "Defnyddiwch glic i ychwanegu"
 msgid "Tree"
 msgstr "Coeden"
 
-#: ../widgets/table/e-tree.c:3358
-#: ../widgets/table/e-tree.c:3359
+#: ../widgets/table/e-tree.c:3358 ../widgets/table/e-tree.c:3359
 msgid "ETree table adapter"
 msgstr "Addasydd tabl ETree"
 
@@ -22673,793 +23432,1813 @@ msgstr "Maint y saeth ehangu"
 msgid "Input Methods"
 msgstr "Dulliau Mewnbwn"
 
-#: ../widgets/text/e-text.c:3548
-#: ../widgets/text/e-text.c:3549
+#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3549
 msgid "Event Processor"
 msgstr "Prosesydd Digwyddiadau"
 
-#: ../widgets/text/e-text.c:3562
-#: ../widgets/text/e-text.c:3563
+#: ../widgets/text/e-text.c:3562 ../widgets/text/e-text.c:3563
 msgid "Bold"
 msgstr "Bras"
 
-#: ../widgets/text/e-text.c:3569
-#: ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
 msgid "Strikeout"
 msgstr "Llinell Drwodd"
 
-#: ../widgets/text/e-text.c:3576
-#: ../widgets/text/e-text.c:3577
+#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
 msgid "Anchor"
 msgstr "Angor"
 
-#: ../widgets/text/e-text.c:3583
-#: ../widgets/text/e-text.c:3584
+#: ../widgets/text/e-text.c:3583 ../widgets/text/e-text.c:3584
 msgid "Justification"
 msgstr "Unioniad"
 
-#: ../widgets/text/e-text.c:3590
-#: ../widgets/text/e-text.c:3591
+#: ../widgets/text/e-text.c:3590 ../widgets/text/e-text.c:3591
 msgid "Clip Width"
 msgstr "Lled Clip"
 
-#: ../widgets/text/e-text.c:3597
-#: ../widgets/text/e-text.c:3598
+#: ../widgets/text/e-text.c:3597 ../widgets/text/e-text.c:3598
 msgid "Clip Height"
 msgstr "Uchder Clip"
 
-#: ../widgets/text/e-text.c:3604
-#: ../widgets/text/e-text.c:3605
+#: ../widgets/text/e-text.c:3604 ../widgets/text/e-text.c:3605
 msgid "Clip"
 msgstr "Clip"
 
-#: ../widgets/text/e-text.c:3611
-#: ../widgets/text/e-text.c:3612
+#: ../widgets/text/e-text.c:3611 ../widgets/text/e-text.c:3612
 msgid "Fill clip rectangle"
 msgstr "Llenwi petryal clip"
 
-#: ../widgets/text/e-text.c:3618
-#: ../widgets/text/e-text.c:3619
+#: ../widgets/text/e-text.c:3618 ../widgets/text/e-text.c:3619
 msgid "X Offset"
 msgstr "Atred X"
 
-#: ../widgets/text/e-text.c:3625
-#: ../widgets/text/e-text.c:3626
+#: ../widgets/text/e-text.c:3625 ../widgets/text/e-text.c:3626
 msgid "Y Offset"
 msgstr "Atred Y"
 
-#: ../widgets/text/e-text.c:3660
-#: ../widgets/text/e-text.c:3661
+#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
 msgid "Text width"
 msgstr "Lled testun"
 
-#: ../widgets/text/e-text.c:3667
-#: ../widgets/text/e-text.c:3668
+#: ../widgets/text/e-text.c:3667 ../widgets/text/e-text.c:3668
 msgid "Text height"
 msgstr "Uchder testun"
 
-#: ../widgets/text/e-text.c:3681
-#: ../widgets/text/e-text.c:3682
+#: ../widgets/text/e-text.c:3681 ../widgets/text/e-text.c:3682
 msgid "Use ellipsis"
 msgstr "Defnyddio marc colli geiriau"
 
-#: ../widgets/text/e-text.c:3688
-#: ../widgets/text/e-text.c:3689
+#: ../widgets/text/e-text.c:3688 ../widgets/text/e-text.c:3689
 msgid "Ellipsis"
 msgstr "Coll geiriau"
 
-#: ../widgets/text/e-text.c:3695
-#: ../widgets/text/e-text.c:3696
+#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
 msgid "Line wrap"
 msgstr "Amlapio llinell"
 
-#: ../widgets/text/e-text.c:3702
-#: ../widgets/text/e-text.c:3703
+#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
 msgid "Break characters"
 msgstr "Torri nodau"
 
-#: ../widgets/text/e-text.c:3709
-#: ../widgets/text/e-text.c:3710
+#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
 msgid "Max lines"
 msgstr "Uchafswm llinellau"
 
-#: ../widgets/text/e-text.c:3730
-#: ../widgets/text/e-text.c:3731
+#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
 msgid "Draw borders"
 msgstr "Tynnu borderi"
 
-#: ../widgets/text/e-text.c:3737
-#: ../widgets/text/e-text.c:3738
+#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Allow newlines"
 msgstr "Caniatáu llinellau newydd"
 
-#: ../widgets/text/e-text.c:3744
-#: ../widgets/text/e-text.c:3745
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw background"
 msgstr "Tynnu cefndir"
 
-#: ../widgets/text/e-text.c:3751
-#: ../widgets/text/e-text.c:3752
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Draw button"
 msgstr "Tynnu botwm"
 
-#: ../widgets/text/e-text.c:3758
-#: ../widgets/text/e-text.c:3759
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 msgid "Cursor position"
 msgstr "Man y cyrchwr"
 
 #. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3766
-#: ../widgets/text/e-text.c:3768
+#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3768
 msgid "IM Context"
 msgstr "Cyd-destun IM"
 
-#: ../widgets/text/e-text.c:3774
-#: ../widgets/text/e-text.c:3775
+#: ../widgets/text/e-text.c:3774 ../widgets/text/e-text.c:3775
 msgid "Handle Popup"
 msgstr "Deliwr Naidlen"
 
 #, fuzzy
+#~ msgid "Shell"
+#~ msgstr "Seychelles"
+
+#~ msgid "The EShell singleton"
+#~ msgstr "Yr unig EShell"
+
+#, fuzzy
+#~ msgid "Search Interrupted"
+#~ msgstr "Hidlydd Chwilio"
+
+#, fuzzy
+#~ msgid "Shell View"
+#~ msgstr "Dewis Golwg: %s"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete this contact list?"
+#~ msgstr ""
+#~ "Ydych chi'n siŵr eich bod\n"
+#~ "am ddileu'r rhestrau cysylltiadau hyn?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete this contact?"
+#~ msgstr ""
+#~ "Ydych chi'n siŵr eich bod\n"
+#~ "am ddileu'r cysylltiadau hyn?"
+
+#~ msgid "If \"true\", show the memo preview pane in the main window."
+#~ msgstr "Os \"true\", dangoswch y rhagolwg memo yn y prif ffenest."
+
+#~ msgid "If \"true\", show the task preview pane in the main window."
+#~ msgstr "Os \"true\", dangoswch y rhagolwg tasgau yn y prif ffenest."
+
+#, fuzzy
+#~ msgid "Memo layout style"
+#~ msgstr "_Arddull ateb:"
+
+#, fuzzy
+#~ msgid "Memo preview pane position (vertical)"
+#~ msgstr "Lleoliad cwarel fertigol golwg Mis"
+
+#, fuzzy
+#~ msgid "Show the memo preview pane"
+#~ msgstr "Dangos y cwarel \"Rhagolwg\""
+
+#, fuzzy
+#~ msgid "Show the task preview pane"
+#~ msgstr "Dangos y cwarel \"Rhagolwg\""
+
+#, fuzzy
+#~ msgid "Task preview pane position (horizontal)"
+#~ msgstr "Lleoliad fertigol cwarel Tasgau"
+
+#, fuzzy
+#~ msgid "Task preview pane position (vertical)"
+#~ msgstr "Lleoliad fertigol cwarel Tasgau"
+
+#, fuzzy
+#~ msgid "Categories:"
+#~ msgstr "Categorïau"
+
+#, fuzzy
+#~ msgid "Shell Settings"
+#~ msgstr "Gosodiadau Exchange"
+
+#, fuzzy
+#~ msgid "Application-wide settings"
+#~ msgstr "Gosodiadau Awto-gwblhau"
+
+#~ msgid "Show CC"
+#~ msgstr "Dangos CC"
+
+#~ msgid "Show BCC"
+#~ msgstr "Dangos BCC"
+
+#~ msgid "Filename"
+#~ msgstr "Enw ffeil"
+
+#, fuzzy
+#~ msgid "The filename of the module"
+#~ msgstr "Newid enw'r blygell"
+
+#, fuzzy
+#~ msgid "Shell Module"
+#~ msgstr "Modd Dewis"
+
+#, fuzzy
+#~ msgid "Show Deleted"
+#~ msgstr "Wedi dileu"
+
+#, fuzzy
+#~ msgid "Show deleted messages"
+#~ msgstr "Negeseuon a yrrwyd ymlaen"
+
+#~ msgid "Add sender to address book"
+#~ msgstr "Ychwanegu'r anfonwr at y llyfr cyfeiriadau"
+
+#, fuzzy
+#~ msgid "Remove the follow-up flag from the selected messages"
+#~ msgstr "Cyfansoddi ateb at anfonwr y neges a ddewiswyd"
+
+#, fuzzy
+#~ msgid "Set the follow-up flag to completed on the selected messages"
+#~ msgstr "Dewis pob neges o fewn yr un trywydd â'r neges a ddewiswyd"
+
+#, fuzzy
+#~ msgid "_Save as mbox..."
+#~ msgstr "Cadw fel..."
+
+#~ msgid "Create Folder"
+#~ msgstr "Creu Plygell"
+
+#, fuzzy
+#~ msgid "\"Filter Editor\" window height"
+#~ msgstr "Uchder rhagosodedig ffenest"
+
+#, fuzzy
+#~ msgid "\"Filter Editor\" window width"
+#~ msgstr "Lled rhagosodedig ffenest"
+
+#, fuzzy
+#~ msgid "\"Search Folder Editor\" window height"
+#~ msgstr "Uchder rhagosodedig ffenest"
+
+#, fuzzy
+#~ msgid "\"Search Folder Editor\" window maximize state"
+#~ msgstr "Plygell Chwilio ar y _Rhestr E-bostio"
+
+#, fuzzy
+#~ msgid "\"Search Folder Editor\" window width"
+#~ msgstr "Plygell Chwilio ar y _Rhestr E-bostio"
+
+#, fuzzy
+#~ msgid "Default height of the mail browser window."
+#~ msgstr "Uchder rhagosodedig y Ffenest Gyfansoddi"
+
+#, fuzzy
+#~ msgid "Default maximized state of the mail browser window."
+#~ msgstr "Lled rhagosodedig y Ffenest Gyfansoddi"
+
+#, fuzzy
+#~ msgid "Default width of the mail browser window."
+#~ msgstr "Lled rhagosodedig y Ffenest Gyfansoddi"
+
+#, fuzzy
+#~ msgid "Layout style"
+#~ msgstr "_Cynllun"
+
+#, fuzzy
+#~ msgid "Mail browser height"
+#~ msgstr "Uchder cyson rhesi"
+
+#, fuzzy
+#~ msgid "Mail browser width"
+#~ msgstr "E-bost yn dechrau gyda"
+
+#, fuzzy
+#~ msgid "Show all message headers"
+#~ msgstr "Ymgwympo pob edefyn neges"
+
+#, fuzzy
+#~ msgid "Show all the headers when viewing a messages."
+#~ msgstr "Dewis yr holl destun o fewn y neges"
+
+#, fuzzy
+#~ msgid " Ch_eck for Supported Types"
+#~ msgstr "_Gwirio am Fathau Cynaledig"
+
+#, fuzzy
+#~ msgid ""
+#~ "The output of this script will be used as your\n"
+#~ "signature. The name you specify will be used\n"
+#~ "for display purposes only. "
+#~ msgstr ""
+#~ "Allbwn y sgript hon fydd eich llofnod. At bwrpas\n"
+#~ "dangos yn unig y defnyddir yr enw fyddwch chi'n\n"
+#~ "ei benodi."
+
+#, fuzzy
+#~ msgid "Contact layout style"
+#~ msgstr "Rhestr Gysylltiadau"
+
+#, fuzzy
+#~ msgid "Contact preview pane position (vertical)"
+#~ msgstr "Lleoliad cwarel fertigol golwg Mis"
+
+#, fuzzy
+#~ msgid "Source List"
+#~ msgstr "Tardd"
+
+#, fuzzy
+#~ msgid "The registry of address books"
+#~ msgstr "Methwyd cael rhestr o lyfrau cyfeiriadau"
+
+#, fuzzy
+#~ msgid "Previewed Contact"
+#~ msgstr "Cyswllt Newydd"
+
+#, fuzzy
+#~ msgid "The contact being shown in the preview pane"
+#~ msgstr "P'un ai i ddangos y cwarel rhagolwg."
+
+#, fuzzy
+#~ msgid "Preview is Visible"
+#~ msgstr "Bar ochr yn weladwy"
+
+#, fuzzy
+#~ msgid "Whether the preview pane is visible"
+#~ msgstr "P'un ai i ddangos y cwarel rhagolwg."
+
+#, fuzzy
+#~ msgid "Source Selector Widget"
+#~ msgstr "Dewisydd Ffynhonnell Memo"
+
+#, fuzzy
+#~ msgid "This widget displays groups of address books"
+#~ msgstr "Methwyd cael rhestr o lyfrau cyfeiriadau"
+
+#, fuzzy
+#~ msgid "Copy the contacts of the selected address book to another"
+#~ msgstr "Copïo'r cysylltiadau o fewn y blygell a ddewiswyd i blygell arall"
+
+#, fuzzy
+#~ msgid "Move the contacts of the selected address book to another"
+#~ msgstr "Symud y cysylltiadau o fewn y blygell a ddewiswyd i blygell arall"
+
+#, fuzzy
+#~ msgid "Show properties of the selected address book"
+#~ msgstr "Newid priodweddau'r blygell a ddewiswyd"
+
+#, fuzzy
+#~ msgid "Rename the selected address book"
+#~ msgstr "Ail-enwi'r blygell a ddewiswyd"
+
+#, fuzzy
+#~ msgid "Copy selected contacts to another address book"
+#~ msgstr "Copïo'r Cyswllt/Cysylltiadau a ddewiswyd i Blygell Arall..."
+
+#, fuzzy
+#~ msgid "Move selected contacts to another address book"
+#~ msgstr "Symud y cysylltiadau a ddewiswyd i blygell arall..."
+
+#, fuzzy
+#~ msgid "Show contact preview below the contact list"
+#~ msgstr "Dangos rhagolwg neges islaw'r rhestr negeseuon"
+
+#, fuzzy
+#~ msgid "Show contact preview alongside the contact list"
+#~ msgstr "Dangos ffenest rhagolwg cysylltiadau"
+
+#, fuzzy
+#~ msgid "The registry of calendars"
+#~ msgstr "Argraffu'r calendr yma"
+
+#, fuzzy
+#~ msgid "Loading calendars"
+#~ msgstr "Yn Llwytho Calendr"
+
+#, fuzzy
+#~ msgid "Opening calendar at %s"
+#~ msgstr "Agor calendr"
+
+#, fuzzy
+#~ msgid "New All Day _Event..."
+#~ msgstr "_Digwyddiad Newydd Drwy'r Dydd"
+
+#, fuzzy
+#~ msgid "Create a new all day event"
+#~ msgstr "Creu apwyntiad gydol-y-dydd newydd"
+
+#~ msgid "New _Meeting..."
+#~ msgstr "_Cyfarfod Newydd..."
+
+#~ msgid "Create a new meeting"
+#~ msgstr "Creu gyfarfod newydd"
+
+#~ msgid "Show one work week"
+#~ msgstr "Dangos un wythnos waith"
+
+#~ msgid "Deleting selected memos..."
+#~ msgstr "Dileu memos dewisedig..."
+
+#~ msgid "_Delete Memo"
+#~ msgstr "_Dileu Memo"
+
+#~ msgid "Print the selected memo"
+#~ msgstr "Argraffu'r memo a ddewiswyd"
+
+#~ msgid "Delete Memo"
+#~ msgid_plural "Delete Memos"
+#~ msgstr[0] "Dileu Memo"
+#~ msgstr[1] "Dileu Memos"
+#~ msgstr[2] "Dileu Memos"
+
+#~ msgid "Deleting selected tasks..."
+#~ msgstr "Dileu tasgau dewisedig..."
+
+#~ msgid "_Delete Task"
+#~ msgstr "_Dileu Tasg"
+
+#~ msgid "Mark selected tasks as incomplete"
+#~ msgstr "Marcio tasgau dewisedig fel anghyflawn"
+
+#~ msgid "_Save as iCalendar..."
+#~ msgstr "_Cadw fel iCalendar..."
+
+#~ msgid "Print the selected task"
+#~ msgstr "Argraffu'r tasg a ddewiswyd"
+
+#~ msgid "Delete Task"
+#~ msgid_plural "Delete Tasks"
+#~ msgstr[0] "Dileu Tasg"
+#~ msgstr[1] "Dileu Tasgau"
+#~ msgstr[2] "Dileu Tasgau"
+
+#~ msgctxt "New"
+#~ msgid "Memo Li_st"
+#~ msgstr "Rhestr Femo_s"
+
+#, fuzzy
+#~ msgid "The registry of memo lists"
+#~ msgstr "Rhestr femo newydd"
+
+#, fuzzy
+#~ msgid "The memo table model"
+#~ msgstr "Model Tabl"
+
+#, fuzzy
+#~ msgid "Memo List Selector"
+#~ msgstr "Dewisydd Ffynhonnell Memo"
+
+#, fuzzy
+#~ msgid "Rename the selected memo list"
+#~ msgstr "Ail-enwi'r blygell a ddewiswyd"
+
+#~ msgid "Memo _Preview"
+#~ msgstr "_Rhagolwg Memo"
+
+#, fuzzy
+#~ msgid "Show memo preview pane"
+#~ msgstr "Dangos cwarel rhagolwg"
+
+#, fuzzy
+#~ msgid "Show memo preview below the memo list"
+#~ msgstr "Dangos rhagolwg neges islaw'r rhestr negeseuon"
+
+#, fuzzy
+#~ msgid "Show memo preview alongside the memo list"
+#~ msgstr "Dangos rhagolwg neges islaw'r rhestr negeseuon"
+
+#~ msgid "Delete Memos"
+#~ msgstr "Dileu Memos"
+
+#~ msgctxt "New"
+#~ msgid "Tas_k List"
+#~ msgstr "Rhestr Da_sgau"
+
+#, fuzzy
+#~ msgid "The registry of task lists"
+#~ msgstr "Rhestr dasgau newydd"
+
+#, fuzzy
+#~ msgid "The task table model"
+#~ msgstr "Model Tabl"
+
+#, fuzzy
+#~ msgid "Task List Selector"
+#~ msgstr "Dewisydd Ffynhonnell Dasg"
+
+#~ msgid "Copy..."
+#~ msgstr "Copïo..."
+
+#, fuzzy
+#~ msgid "Rename the selected task list"
+#~ msgstr "Ail-enwi'r blygell a ddewiswyd"
+
+#, fuzzy
+#~ msgid "Mar_k as Incomplete"
+#~ msgstr "_Marcio heb eu gorffen"
+
+#, fuzzy
+#~ msgid "Show task preview pane"
+#~ msgstr "Dangos cwarel rhagolwg"
+
+#, fuzzy
+#~ msgid "Show task preview below the task list"
+#~ msgstr "Dangos rhagolwg neges islaw'r rhestr negeseuon"
+
+#, fuzzy
+#~ msgid "Show task preview alongside the task list"
+#~ msgstr "Dangos rhagolwg neges islaw'r rhestr negeseuon"
+
+#, fuzzy
+#~ msgid "Delete Tasks"
+#~ msgstr "Tasgau Cyflawnwyd"
+
+#, fuzzy
+#~ msgid "Disable this account"
+#~ msgstr "Analluogi Cyfrif"
+
+#, fuzzy
+#~ msgid "Unsubscribe from the selected folder"
+#~ msgstr "Ail-enwi'r blygell a ddewiswyd"
+
+#, fuzzy
+#~ msgid "N_one"
+#~ msgstr "Dim"
+
+#, fuzzy
+#~ msgid "Show message preview alongside the message list"
+#~ msgstr "Dangos rhagolwg neges islaw'r rhestr negeseuon"
+
+#, fuzzy
+#~ msgid "Subject or Addresses contain"
+#~ msgstr "Pwnc neu Ddanfonwr yn cynnwys"
+
+#, fuzzy
+#~ msgid "Inline Audio"
+#~ msgstr "Mwy nag un vCard"
+
+#, fuzzy
+#~ msgid "Backup Evolution data and settings to an archive file"
+#~ msgstr "Creu copi wrth gefn, ac adfer data a gosodiadau Evolution"
+
+#, fuzzy
+#~ msgid "Restore Evolution data and settings from an archive file"
+#~ msgstr "Creu copi wrth gefn, ac adfer data a gosodiadau Evolution"
+
+#, fuzzy
+#~ msgid "Play themed sound when new messages arrive, if not in beep mode."
+#~ msgstr "Ffeil sain i'w chwarae pan fo e-bost newydd yn cyrraedd."
+
+#~ msgid "Use sound theme"
+#~ msgstr "Defnyddio thema sain"
+
+#~ msgid "Use sound _theme"
+#~ msgstr "Defnyddio _thema sain"
+
+#, fuzzy
+#~ msgid "Save the selected calendar to disk"
+#~ msgstr "Cadw'r neges(euon) ddewiswyd fel ffeil destun"
+
+#, fuzzy
+#~ msgid "Save the selected memo list to disk"
+#~ msgstr "Cadw'r neges(euon) ddewiswyd fel ffeil destun"
+
+#, fuzzy
+#~ msgid "Save the selected task list to disk"
+#~ msgstr "Cadw'r calendr neu'r rhestr dasgau sydd wedi dewis at y ddisg."
+
+#, fuzzy
+#~ msgid "Default window X coordinate"
+#~ msgstr "Cyflwr rhagosodedig ffenest"
+
+#, fuzzy
+#~ msgid "Default window Y coordinate"
+#~ msgstr "Cyflwr rhagosodedig ffenest"
+
+#, fuzzy
+#~ msgid "The default X coordinate for the main window."
+#~ msgstr "Lled rhagosodedig y brif ffenestr, mewn picseli"
+
+#, fuzzy
+#~ msgid "The default Y coordinate for the main window."
+#~ msgstr "Lled rhagosodedig y brif ffenestr, mewn picseli"
+
+#, fuzzy
+#~ msgid "Toolbar Style"
+#~ msgstr "_Arddull Bar Offer"
+
+#, fuzzy
+#~ msgid "Toolbar Visible"
+#~ msgstr "Bar offer yn weladwy"
+
+#, fuzzy
+#~ msgid "Whether the switcher is visible"
+#~ msgstr "A ddylai'r bar ochr fod yn weladwy."
+
+#, fuzzy
+#~ msgid "Switcher Action"
+#~ msgstr "Newid i %s"
+
+#, fuzzy
+#~ msgid "Page Number"
+#~ msgstr "Rhif Cyfresol"
+
+#, fuzzy
+#~ msgid "Shell Sidebar Widget"
+#~ msgstr "Lled rhagosodedig bar ochr"
+
+#, fuzzy
+#~ msgid "Shell Window"
+#~ msgstr "_Ffenestr Newydd"
+
+#, fuzzy
+#~ msgid "Current View ID"
+#~ msgstr "Golwg _Cyfredol"
+
+#, fuzzy
+#~ msgid "The current GAL view ID"
+#~ msgstr "Cadw'r olwg addasedig gyfredol"
+
+#, fuzzy
+#~ msgid "GNOME Pilot is not installed."
+#~ msgstr "Bug buddy heb ei osod."
+
+#, fuzzy
+#~ msgid "GNOME Pilot could not be run."
+#~ msgstr "Methu rhedeg Gwall-Gyfaill (Bug Buddy)."
+
+#, fuzzy
+#~ msgid "_Contents"
+#~ msgstr "Apwyntiadau"
+
+#, fuzzy
+#~ msgid "Open the Evolution User Guide"
+#~ msgstr "Agor Plygell Defnyddiwr Arall"
+
+#, fuzzy
+#~ msgid "Forget all remembered passwords"
+#~ msgstr ""
+#~ "Ydych chi'n siŵr eich bod am ddileu bob cyfrinair sydd wedi ei gofio?"
+
+#, fuzzy
+#~ msgid "Configure Evolution"
+#~ msgstr "Cyfluniad Ebost"
+
+#, fuzzy
+#~ msgid "Show Evolution's shortcut keys"
+#~ msgstr "Newidiwch Osodiadau Evolution"
+
+#, fuzzy
+#~ msgid "Clear the current search parameters"
+#~ msgstr "Chwilio o hyd"
+
+#, fuzzy
+#~ msgid "Manage your saved searches"
+#~ msgstr "Cyfluniwch eich cyfrifon e-bost fan hyn"
+
+#, fuzzy
+#~ msgid "Execute the current search parameters"
+#~ msgstr "Diddymu'r weithred e-bost cyfredol"
+
+#, fuzzy
+#~ msgid "Save the current search parameters"
+#~ msgstr "Cadw'r ffeil cyfredol"
+
+#, fuzzy
+#~ msgid "Submit _Bug Report..."
+#~ msgstr "Anfon Adroddiad _Nam"
+
+#, fuzzy
+#~ msgid "Put Evolution into offline mode"
+#~ msgstr "Dechreuwch ym modd all-lein"
+
+#, fuzzy
+#~ msgid "Put Evolution into online mode"
+#~ msgstr "Dechreuwch ym modd ar-lein"
+
+#~ msgid "Show the side bar"
+#~ msgstr "Dangos y bar ochr"
+
+#, fuzzy
+#~ msgid "Show the status bar"
+#~ msgstr "Dangos Bar _Statws"
+
+#, fuzzy
+#~ msgid "Show _Buttons"
+#~ msgstr "Dangos Animeiddio"
+
+#, fuzzy
+#~ msgid "Show the switcher buttons"
+#~ msgstr "Dangos y cwarel \"Rhagolwg\""
+
+#~ msgid "Show the toolbar"
+#~ msgstr "Dangos y bar offer"
+
+#, fuzzy
+#~ msgid "Name of the active shell view"
+#~ msgstr "Enw golwg newydd:"
+
+#, fuzzy
+#~ msgid "Safe Mode"
+#~ msgstr "Modd _Caret"
+
+#, fuzzy
+#~ msgid "Whether the shell window is in safe mode"
+#~ msgstr "A yw'r chwyddwr wedi ei chwyddo ai peidio"
+
+#, fuzzy
+#~ msgid "UI Manager"
+#~ msgstr "Rheolwr"
+
+#, fuzzy
+#~ msgid "Preparing to go offline..."
+#~ msgstr "Cyfrif Exchange ddim ar-lein."
+
+#, fuzzy
+#~ msgid "Preparing to go online..."
+#~ msgstr "Cyfrif Exchange ddim ar-lein."
+
+#~ msgid "Preparing to quit..."
+#~ msgstr "Paratoi i adael..."
+
+#, fuzzy
+#~ msgid "Network Available"
+#~ msgstr "TLS Ddim ar Gael"
+
+#, fuzzy
+#~ msgid "Whether the network is available"
+#~ msgstr "A yw'r chwyddwr wedi ei chwyddo ai peidio"
+
+#, fuzzy
+#~ msgid "Whether the shell is online"
+#~ msgstr "A yw'r chwyddwr wedi ei chwyddo ai peidio"
+
+#~ msgctxt "New"
+#~ msgid "_Test Item"
+#~ msgstr "Eitem _Brawf"
+
+#~ msgctxt "New"
+#~ msgid "Test _Source"
+#~ msgstr "_Ffynhonnell Brawf"
+
+#~ msgid "Create a new test source"
+#~ msgstr "Creu ffynhonnell prawf newydd"
+
+#~ msgid "File is not a valid .desktop file"
+#~ msgstr "Dydy'r ffeil ddim yn un .desktop dilys"
+
+#~ msgid "Starting %s"
+#~ msgstr "Dechrau %s"
+
+#, fuzzy
+#~ msgid "Specify file containing saved configuration"
+#~ msgstr "Gosod cyfluniad _Peilot"
+
+#, fuzzy
+#~ msgid "ID"
+#~ msgstr "UID"
+
+#, fuzzy
+#~ msgid "Show session management options"
+#~ msgstr "_Dangos delweddau wedi'u hanimeiddio"
+
+#~ msgid "Account Name"
+#~ msgstr "Enw'r Cyfrif"
+
+#~ msgid "Action"
+#~ msgstr "Gweithred"
+
+#~ msgid "%s (cancelled)"
+#~ msgstr "%s (diddymwyd)"
+
+#~ msgid "%s (completed)"
+#~ msgstr "%s (yn gyflawn)"
+
+#, fuzzy
+#~ msgid "Evolution is currently offline because the network is unavailable."
+#~ msgstr ""
+#~ "Mae Evolution all-lein ar hyn o bryd. Cliciwch y botwm hwn i weithio ar-"
+#~ "lein."
+
+#, fuzzy
+#~ msgid "Horizontal Position"
+#~ msgstr "Lleoliad cwarel llorweddol"
+
+#, fuzzy
+#~ msgid "Vertical Position"
+#~ msgstr "Lleoliad cwarel fertigol"
+
+#, fuzzy
+#~ msgid "Source Action"
+#~ msgstr "Tardd Cyfrif"
+
+#, fuzzy
+#~ msgid "Edit Signature Script"
+#~ msgstr "Golygu Llofnod"
+
+#, fuzzy
+#~ msgid "S_cript:"
+#~ msgstr "_Sgript:"
+
+#, fuzzy
+#~ msgid "Script file must be executable."
+#~ msgstr "Rhaid i'r ffeil sgript fodoli, a bod yn weithredadwy."
+
+#, fuzzy
+#~ msgid "Open the link in a web browser"
+#~ msgstr "_Agor y Cyswllt Mewn Porwr"
+
+#~ msgid "_Copy Email Address"
+#~ msgstr "_Copïo Cyfeiriad Ebost"
+
+#~ msgid "Copy the email address to the clipboard"
+#~ msgstr "Copïo cyfeiriad ebost i'r clipfwrdd"
+
+#, fuzzy
+#~ msgid "Send a mail message to this address"
+#~ msgstr "Trosi'r neges a ddewiswyd yn dasg newydd"
+
+#~ msgid "Ch_eck for Supported Types "
+#~ msgstr "_Gwirio am Fathau Wedi'u Cynnal"
+
+#, fuzzy
+#~ msgid "Could not create object. %s"
+#~ msgstr "Methwyd diweddaru'r gwrthrych"
+
+#~ msgid "Convert to a Mem_o"
+#~ msgstr "Trosi i Mem_o"
+
+#~ msgid "Convert to a _Task"
+#~ msgstr "_Trosi i Dasg"
+
+#, fuzzy
+#~ msgid "Convert the selected message to a new event"
+#~ msgstr "Trosi'r neges a ddewiswyd yn dasg newydd"
+
+#, fuzzy
+#~ msgid "Convert the selected message to a new meeting"
+#~ msgstr "Trosi'r neges a ddewiswyd yn dasg newydd"
+
+#, fuzzy
+#~ msgid "Convert the selected message to a new memo"
+#~ msgstr "Trosi'r neges a ddewiswyd yn dasg newydd"
+
+#~ msgid "Convert the selected message to a new task"
+#~ msgstr "Trosi'r neges a ddewiswyd yn dasg newydd"
+
+#, fuzzy
 #~ msgid "Could not open autosave file"
 #~ msgstr "Methwyd agor ffeil"
-#~ msgid "Autogenerated"
-#~ msgstr "Awtogynhyrchwyd"
+
 #~ msgid "Completed on %B %d, %Y, %l:%M %p"
 #~ msgstr "Wedi cwblhau ar %B %d, %Y, %l:%M %p"
+
 #~ msgid "by %B %d, %Y, %l:%M %p"
 #~ msgstr "gan %B %d, %Y %l:%M %p"
+
 #~ msgid " (%a, %R %Z)"
 #~ msgstr "(%a, %R %Z)"
+
 #~ msgid " (%R %Z)"
 #~ msgstr "(%R %Z)"
+
 #~ msgid "%l:%M %p"
 #~ msgstr "%l:%M %p"
+
 #~ msgid "Toggle Attachment Bar"
 #~ msgstr "Toglu'r Bar Atodiadau"
+
 #~ msgid "activate"
 #~ msgstr "gweithredu"
+
 #~ msgid "Permission Denied."
 #~ msgstr "Gwrthodwyd Caniatâd."
+
 #~ msgid "A Folder with this name already exists"
 #~ msgstr "Plygell â'r un enw yn bodoli'n barod"
+
 #~ msgid "_Properties..."
 #~ msgstr "_Priodweddau..."
+
 #~ msgid "3268"
 #~ msgstr "3268"
+
 #~ msgid "389"
 #~ msgstr "389"
+
 #~ msgid "636"
 #~ msgstr "636"
+
 #~ msgid "<b>Display</b>"
 #~ msgstr "<b>Dangos</b>"
+
 #~ msgid "<b>Server Information</b>"
 #~ msgstr "<b>Gwybodaeth Gweinydd</b>"
+
 #~ msgid "<b>Type:</b>"
 #~ msgstr "<b>Math:</b>"
+
 #~ msgid "Add Address Book"
 #~ msgstr "Ychwanegu Llyfr Cyfeiriadau"
+
 #~ msgid "Anonymously"
 #~ msgstr "Dienw"
+
 #~ msgid "Basic"
 #~ msgstr "Sylfaenol"
+
 #~ msgid "Distinguished name"
 #~ msgstr "Enw Gwahaniaethol"
+
 #~ msgid "Email address"
 #~ msgstr "Cyfeiriad e-bost"
+
 #~ msgid "Find Possible Search Bases"
 #~ msgstr "Canfod Bonion Chwilio Posib"
+
 #~ msgid "Search filter"
 #~ msgstr "Hidlydd chwilio"
+
 #~ msgid "Sub"
 #~ msgstr "Is"
+
 #~ msgid "Using email address"
 #~ msgstr "Defnyddio cyfeiriad e-bost"
+
 #~ msgid "Whenever Possible"
 #~ msgstr "Pob Amser Bosib"
+
 #~ msgid "_Add Address Book"
 #~ msgstr "_Ychwanegu Llyfr Cyfeiriadau"
+
 #~ msgid "MSN Messenger"
 #~ msgstr "Negeseuwr MSN"
+
 #~ msgid "Novell Groupwise"
 #~ msgstr "Novell Groupwise"
+
 #~ msgid "_Address: "
 #~ msgstr "_Cyfeiriad:"
+
 #~ msgid "_Categories..."
 #~ msgstr "_Categorïau..."
+
 #~ msgid "_Notes:"
 #~ msgstr "_Nodiadau:"
+
 #~ msgid "United States"
 #~ msgstr "Yr Unol Daleithiau"
+
 #~ msgid "Afghanistan"
 #~ msgstr "Afghanistan"
+
 #~ msgid "Albania"
 #~ msgstr "Albania"
+
 #~ msgid "Algeria"
 #~ msgstr "Algeria"
+
 #~ msgid "American Samoa"
 #~ msgstr "American Samoa"
+
 #~ msgid "Andorra"
 #~ msgstr "Andorra"
+
 #~ msgid "Angola"
 #~ msgstr "Angola"
+
 #~ msgid "Anguilla"
 #~ msgstr "Anguilla"
+
 #~ msgid "Antarctica"
 #~ msgstr "Antarctica"
+
 #~ msgid "Antigua And Barbuda"
 #~ msgstr "Antigua a Barbuda"
+
 #~ msgid "Argentina"
 #~ msgstr "Yr Ariannin"
+
 #~ msgid "Armenia"
 #~ msgstr "Armenia"
+
 #~ msgid "Aruba"
 #~ msgstr "Aruba"
+
 #~ msgid "Australia"
 #~ msgstr "Awstralia"
+
 #~ msgid "Austria"
 #~ msgstr "Awstria"
+
 #~ msgid "Azerbaijan"
 #~ msgstr "Azerbaijan"
+
 #~ msgid "Bahamas"
 #~ msgstr "Bahamas"
+
 #~ msgid "Bahrain"
 #~ msgstr "Bahrain"
+
 #~ msgid "Bangladesh"
 #~ msgstr "Bangladesh"
+
 #~ msgid "Barbados"
 #~ msgstr "Barbados"
+
 #~ msgid "Belarus"
 #~ msgstr "Belarus"
+
 #~ msgid "Belgium"
 #~ msgstr "Gwlad Belg"
+
 #~ msgid "Belize"
 #~ msgstr "Belize"
+
 #~ msgid "Benin"
 #~ msgstr "Benin"
+
 #~ msgid "Bermuda"
 #~ msgstr "Bermuda"
+
 #~ msgid "Bhutan"
 #~ msgstr "Bhutan"
+
 #~ msgid "Bolivia"
 #~ msgstr "Bolifia"
+
 #~ msgid "Bosnia And Herzegowina"
 #~ msgstr "Bosnia a Herzegovina"
+
 #~ msgid "Botswana"
 #~ msgstr "Botswana"
+
 #~ msgid "Bouvet Island"
 #~ msgstr "Ynys Bouvet"
+
 #~ msgid "Brazil"
 #~ msgstr "Brasil"
+
 #~ msgid "British Indian Ocean Territory"
 #~ msgstr "British Indian Ocean Territory"
+
 #~ msgid "Brunei Darussalam"
 #~ msgstr "Brunei Darussalam"
+
 #~ msgid "Bulgaria"
 #~ msgstr "Bwlgaria"
+
 #~ msgid "Burkina Faso"
 #~ msgstr "Burkina Faso"
+
 #~ msgid "Burundi"
 #~ msgstr "Burundi"
+
 #~ msgid "Cambodia"
 #~ msgstr "Cambodia"
+
 #~ msgid "Cameroon"
 #~ msgstr "Cameroon"
+
 #~ msgid "Canada"
 #~ msgstr "Canada"
+
 #~ msgid "Cape Verde"
 #~ msgstr "Cape Verde"
+
 #~ msgid "Cayman Islands"
 #~ msgstr "Ynysoedd y Cayman"
+
 #~ msgid "Central African Republic"
 #~ msgstr "Gweriniaeth Ganol Affrica"
+
 #~ msgid "Chad"
 #~ msgstr "Chad"
+
 #~ msgid "Chile"
 #~ msgstr "Chile"
+
 #~ msgid "China"
 #~ msgstr "Tsieina"
+
 #~ msgid "Christmas Island"
 #~ msgstr "Ynys y Nadolig"
+
 #~ msgid "Cocos (Keeling) Islands"
 #~ msgstr "Ynysoedd Cocos (Keeling)"
+
 #~ msgid "Colombia"
 #~ msgstr "Colombia"
+
 #~ msgid "Comoros"
 #~ msgstr "Comoros"
+
 #~ msgid "Congo"
 #~ msgstr "Congo"
+
 #~ msgid "Congo, The Democratic Republic Of The"
 #~ msgstr "Congo, Gweriniaeth Ddemocratig Y"
+
 #~ msgid "Cook Islands"
 #~ msgstr "Ynysoedd Cook"
+
 #~ msgid "Costa Rica"
 #~ msgstr "Costa Rica"
+
 #~ msgid "Cote d'Ivoire"
 #~ msgstr "Cote d'Ivoire"
+
 #~ msgid "Croatia"
 #~ msgstr "Croatia"
+
 #~ msgid "Cuba"
 #~ msgstr "Ciwba"
+
 #~ msgid "Cyprus"
 #~ msgstr "Cyprus"
+
 #~ msgid "Czech Republic"
 #~ msgstr "Gweriniaeth Tsiec"
+
 #~ msgid "Denmark"
 #~ msgstr "Denmarc"
+
 #~ msgid "Djibouti"
 #~ msgstr "Djibouti"
+
 #~ msgid "Dominica"
 #~ msgstr "Dominica"
+
 #~ msgid "Dominican Republic"
 #~ msgstr "Gweriniaeth Dominica"
+
 #~ msgid "Ecuador"
 #~ msgstr "Ecuador"
+
 #~ msgid "Egypt"
 #~ msgstr "Yr Aifft"
+
 #~ msgid "El Salvador"
 #~ msgstr "El Salvador"
+
 #~ msgid "Equatorial Guinea"
 #~ msgstr "Equatorial Guinea"
+
 #~ msgid "Eritrea"
 #~ msgstr "Eritrea"
+
 #~ msgid "Estonia"
 #~ msgstr "Estonia"
+
 #~ msgid "Ethiopia"
 #~ msgstr "Ethiopia"
+
 #~ msgid "Falkland Islands"
 #~ msgstr "Ynysoedd y Falklands"
+
 #~ msgid "Faroe Islands"
 #~ msgstr "Ynysoedd y Ffaro"
+
 #~ msgid "Fiji"
 #~ msgstr "Ffiji"
+
 #~ msgid "Finland"
 #~ msgstr "Y Ffindir"
+
 #~ msgid "French Guiana"
 #~ msgstr "Guiana Ffrangeg"
+
 #~ msgid "French Polynesia"
 #~ msgstr "Polynesia Ffrangeg"
+
 #~ msgid "French Southern Territories"
 #~ msgstr "French Southern Territories"
+
 #~ msgid "Gabon"
 #~ msgstr "Gabon"
+
 #~ msgid "Gambia"
 #~ msgstr "Gambia"
+
 #~ msgid "Georgia"
 #~ msgstr "Georgia"
+
 #~ msgid "Germany"
 #~ msgstr "Yr Almaen"
+
 #~ msgid "Ghana"
 #~ msgstr "Ghana"
+
 #~ msgid "Gibraltar"
 #~ msgstr "Gibraltar"
+
 #~ msgid "Greece"
 #~ msgstr "Groeg"
+
 #~ msgid "Greenland"
 #~ msgstr "Greenland"
+
 #~ msgid "Grenada"
 #~ msgstr "Grenada"
+
 #~ msgid "Guadeloupe"
 #~ msgstr "Guadeloupe"
+
 #~ msgid "Guam"
 #~ msgstr "Guam"
+
 #~ msgid "Guatemala"
 #~ msgstr "Guatemala"
+
 #~ msgid "Guernsey"
 #~ msgstr "Guernsey"
+
 #~ msgid "Guinea"
 #~ msgstr "Guinea"
+
 #~ msgid "Guinea-bissau"
 #~ msgstr "Guinea-Bissau"
+
 #~ msgid "Guyana"
 #~ msgstr "Guyana"
+
 #~ msgid "Haiti"
 #~ msgstr "Haiti"
+
 #~ msgid "Heard And McDonald Islands"
 #~ msgstr "Ynys Heard ac Ynysoedd McDonald"
+
 #~ msgid "Holy See"
 #~ msgstr "Gwladwriaeth Ddinesig"
+
 #~ msgid "Honduras"
 #~ msgstr "Honduras"
+
 #~ msgid "Hong Kong"
 #~ msgstr "Hong Kong"
+
 #~ msgid "Hungary"
 #~ msgstr "Hwngari"
+
 #~ msgid "Iceland"
 #~ msgstr "Gwlad yr Iâ"
+
 #~ msgid "India"
 #~ msgstr "India"
+
 #~ msgid "Indonesia"
 #~ msgstr "Indonesia"
+
 #~ msgid "Iran"
 #~ msgstr "Iran"
+
 #~ msgid "Iraq"
 #~ msgstr "Irac"
+
 #~ msgid "Ireland"
 #~ msgstr "Iwerddon"
+
 #~ msgid "Isle of Man"
 #~ msgstr "Ynys Manaw"
+
 #~ msgid "Israel"
 #~ msgstr "Israel"
+
 #~ msgid "Italy"
 #~ msgstr "Yr Eidal"
+
 #~ msgid "Jamaica"
 #~ msgstr "Jamaica"
+
 #~ msgid "Japan"
 #~ msgstr "Siapan"
+
 #~ msgid "Jersey"
 #~ msgstr "Jersey"
+
 #~ msgid "Jordan"
 #~ msgstr "Yr Iorddonen"
+
 #~ msgid "Kazakhstan"
 #~ msgstr "Kazakhstan"
+
 #~ msgid "Kiribati"
 #~ msgstr "Kiribati"
+
 #~ msgid "Korea, Democratic People's Republic Of"
 #~ msgstr "Corea, Gweriniaeth Ddemocratig y Bobl"
+
 #~ msgid "Korea, Republic Of"
 #~ msgstr "Gweriniaeth Corea"
+
 #~ msgid "Kuwait"
 #~ msgstr "Kuwait"
+
 #~ msgid "Kyrgyzstan"
 #~ msgstr "Kyrgyzstan"
+
 #~ msgid "Laos"
 #~ msgstr "Laos"
+
 #~ msgid "Latvia"
 #~ msgstr "Latfia"
+
 #~ msgid "Lebanon"
 #~ msgstr "Libanus"
+
 #~ msgid "Lesotho"
 #~ msgstr "Lesotho"
+
 #~ msgid "Liberia"
 #~ msgstr "Liberia"
+
 #~ msgid "Libya"
 #~ msgstr "Libya"
+
 #~ msgid "Liechtenstein"
 #~ msgstr "Liechtenstein"
+
 #~ msgid "Lithuania"
 #~ msgstr "Lithuania"
+
 #~ msgid "Luxembourg"
 #~ msgstr "Luxembourg"
+
 #~ msgid "Macao"
 #~ msgstr "Macao"
+
 #~ msgid "Macedonia"
 #~ msgstr "Macedonia"
+
 #~ msgid "Madagascar"
 #~ msgstr "Madagascar"
+
 #~ msgid "Malawi"
 #~ msgstr "Malawi"
+
 #~ msgid "Malaysia"
 #~ msgstr "Malaysia"
+
 #~ msgid "Maldives"
 #~ msgstr "Maldives"
+
 #~ msgid "Mali"
 #~ msgstr "Mali"
+
 #~ msgid "Malta"
 #~ msgstr "Malta"
+
 #~ msgid "Marshall Islands"
 #~ msgstr "Ynysoedd Marshall"
+
 #~ msgid "Martinique"
 #~ msgstr "Martinique"
+
 #~ msgid "Mauritania"
 #~ msgstr "Mauritania"
+
 #~ msgid "Mauritius"
 #~ msgstr "Mauritius"
+
 #~ msgid "Mayotte"
 #~ msgstr "Mayotte"
+
 #~ msgid "Mexico"
 #~ msgstr "Mecsico"
+
 #~ msgid "Micronesia"
 #~ msgstr "Micronesia"
+
 #~ msgid "Moldova, Republic Of"
 #~ msgstr "Gweriniaeth Moldova"
+
 #~ msgid "Monaco"
 #~ msgstr "Monaco"
+
 #~ msgid "Mongolia"
 #~ msgstr "Mongolia"
+
 #~ msgid "Montserrat"
 #~ msgstr "Montserrat"
+
 #~ msgid "Morocco"
 #~ msgstr "Morocco"
+
 #~ msgid "Mozambique"
 #~ msgstr "Mozambique"
+
 #~ msgid "Myanmar"
 #~ msgstr "Myanmar"
+
 #~ msgid "Namibia"
 #~ msgstr "Namibia"
+
 #~ msgid "Nauru"
 #~ msgstr "Nauru"
+
 #~ msgid "Nepal"
 #~ msgstr "Nepal"
+
 #~ msgid "Netherlands"
 #~ msgstr "Yr Iseldiroedd"
+
 #~ msgid "Netherlands Antilles"
 #~ msgstr "Netherlands Antilles"
+
 #~ msgid "New Caledonia"
 #~ msgstr "Caledonia Newydd"
+
 #~ msgid "New Zealand"
 #~ msgstr "Seland Newydd"
+
 #~ msgid "Nicaragua"
 #~ msgstr "Nicaragua"
+
 #~ msgid "Niger"
 #~ msgstr "Niger"
+
 #~ msgid "Nigeria"
 #~ msgstr "Nigeria"
+
 #~ msgid "Niue"
 #~ msgstr "Niue"
+
 #~ msgid "Norfolk Island"
 #~ msgstr "Ynys Norfolk"
+
 #~ msgid "Northern Mariana Islands"
 #~ msgstr "Ynysoedd Northern Mariana"
+
 #~ msgid "Norway"
 #~ msgstr "Norwy"
+
 #~ msgid "Oman"
 #~ msgstr "Oman"
+
 #~ msgid "Pakistan"
 #~ msgstr "Pacistan"
+
 #~ msgid "Palestinian Territory"
 #~ msgstr "Palestinia"
+
 #~ msgid "Panama"
 #~ msgstr "Panama"
+
 #~ msgid "Papua New Guinea"
 #~ msgstr "Papua Guinea Newydd"
+
 #~ msgid "Paraguay"
 #~ msgstr "Paraguay"
+
 #~ msgid "Peru"
 #~ msgstr "Periw"
+
 #~ msgid "Philippines"
 #~ msgstr "Philippines"
+
 #~ msgid "Pitcairn"
 #~ msgstr "Pitcairn"
+
 #~ msgid "Poland"
 #~ msgstr "Gwlad Pwyl"
+
 #~ msgid "Portugal"
 #~ msgstr "Portiwgal"
+
 #~ msgid "Puerto Rico"
 #~ msgstr "Puerto Rico"
+
 #~ msgid "Qatar"
 #~ msgstr "Qatar"
+
 #~ msgid "Reunion"
 #~ msgstr "Reunion"
+
 #~ msgid "Romania"
 #~ msgstr "Rwmania"
+
 #~ msgid "Russian Federation"
 #~ msgstr "Ffederasiwn Rwsia"
+
 #~ msgid "Rwanda"
 #~ msgstr "Rwanda"
+
 #~ msgid "Saint Kitts And Nevis"
 #~ msgstr "Saint Kitts a Nevis"
+
 #~ msgid "Saint Lucia"
 #~ msgstr "Saint Lucia"
+
 #~ msgid "Saint Vincent And The Grenadines"
 #~ msgstr "Sant Vincent a'r Grenadines"
+
 #~ msgid "Samoa"
 #~ msgstr "Samoa"
+
 #~ msgid "San Marino"
 #~ msgstr "San Marino"
+
 #~ msgid "Sao Tome And Principe"
 #~ msgstr "Sao Tome a Principe"
+
 #~ msgid "Saudi Arabia"
 #~ msgstr "Saudi Arabia"
+
 #~ msgid "Senegal"
 #~ msgstr "Senegal"
+
 #~ msgid "Serbia And Montenegro"
 #~ msgstr "Serbia a Montenegro"
-#~ msgid "Seychelles"
-#~ msgstr "Seychelles"
+
 #~ msgid "Sierra Leone"
 #~ msgstr "Sierra Leone"
+
 #~ msgid "Singapore"
 #~ msgstr "Singapore"
+
 #~ msgid "Slovakia"
 #~ msgstr "Slofacia"
+
 #~ msgid "Slovenia"
 #~ msgstr "Slofenia"
+
 #~ msgid "Solomon Islands"
 #~ msgstr "Ynysoedd Solomon"
+
 #~ msgid "Somalia"
 #~ msgstr "Somalia"
+
 #~ msgid "South Africa"
 #~ msgstr "De Affrica"
+
 #~ msgid "South Georgia And The South Sandwich Islands"
 #~ msgstr "De Georgia ac Ynysoedd De Sandwich"
+
 #~ msgid "Spain"
 #~ msgstr "Sbaen"
+
 #~ msgid "Sri Lanka"
 #~ msgstr "Sri Lanka"
+
 #~ msgid "St. Helena"
 #~ msgstr "St. Helena"
+
 #~ msgid "St. Pierre And Miquelon"
 #~ msgstr "St. Pierre a Miquelon"
+
 #~ msgid "Sudan"
 #~ msgstr "Swdan"
+
 #~ msgid "Suriname"
 #~ msgstr "Suriname"
+
 #~ msgid "Svalbard And Jan Mayen Islands"
 #~ msgstr "Ynysoedd Svalbard a'r Jan Mayen"
+
 #~ msgid "Swaziland"
 #~ msgstr "Swaziland"
+
 #~ msgid "Sweden"
 #~ msgstr "Sweden"
+
 #~ msgid "Switzerland"
 #~ msgstr "Y Swisdir"
+
 #~ msgid "Syria"
 #~ msgstr "Syria"
+
 #~ msgid "Taiwan"
 #~ msgstr "Taiwan"
+
 #~ msgid "Tajikistan"
 #~ msgstr "Tajikistan"
+
 #~ msgid "Tanzania, United Republic Of"
 #~ msgstr "Tanzania, Gwerinaieth Unedig"
+
 #~ msgid "Thailand"
 #~ msgstr "Gwlad Thai"
+
 #~ msgid "Timor-Leste"
 #~ msgstr "Timor-Leste"
+
 #~ msgid "Togo"
 #~ msgstr "Togo"
+
 #~ msgid "Tokelau"
 #~ msgstr "Tokelau"
+
 #~ msgid "Tonga"
 #~ msgstr "Tonga"
+
 #~ msgid "Trinidad And Tobago"
 #~ msgstr "Trinidad a Tobago"
+
 #~ msgid "Tunisia"
 #~ msgstr "Tunisia"
+
 #~ msgid "Turkey"
 #~ msgstr "Twrci"
+
 #~ msgid "Turkmenistan"
 #~ msgstr "Turkmenistan"
+
 #~ msgid "Turks And Caicos Islands"
 #~ msgstr "Ynysoedd Turks a'r Caicos"
+
 #~ msgid "Tuvalu"
 #~ msgstr "Tuvalu"
+
 #~ msgid "Uganda"
 #~ msgstr "Uganda"
+
 #~ msgid "Ukraine"
 #~ msgstr "Wcrain"
+
 #~ msgid "United Arab Emirates"
 #~ msgstr "Emiradau Arabaidd Unedig"
+
 #~ msgid "United Kingdom"
 #~ msgstr "Y Deyrnas Unedig"
+
 #~ msgid "United States Minor Outlying Islands"
 #~ msgstr "United States Minor Outlying Islands"
+
 #~ msgid "Uruguay"
 #~ msgstr "Uruguay"
+
 #~ msgid "Uzbekistan"
 #~ msgstr "Wsbecistan"
+
 #~ msgid "Vanuatu"
 #~ msgstr "Vanuatu"
+
 #~ msgid "Venezuela"
 #~ msgstr "Venezuela"
+
 #~ msgid "Viet Nam"
 #~ msgstr "Fietnam"
+
 #~ msgid "Virgin Islands, British"
 #~ msgstr "Ynysoedd Virgin, Prydeinig"
+
 #~ msgid "Virgin Islands, U.S."
 #~ msgstr "Ynysoedd Virgin, U.D.A."
+
 #~ msgid "Wallis And Futuna Islands"
 #~ msgstr "Ynysoedd Wallis a'r Futuna"
+
 #~ msgid "Western Sahara"
 #~ msgstr "Western Sahara"
+
 #~ msgid "Yemen"
 #~ msgstr "Yemen"
+
 #~ msgid "Zambia"
 #~ msgstr "Zambia"
+
 #~ msgid "Zimbabwe"
 #~ msgstr "Zimbabwe"
+
 #~ msgid "AOL Instant Messenger"
 #~ msgstr "Negesydd Sydyn AOL"
+
 #~ msgid "Yahoo Messenger"
 #~ msgstr "Negesydd Sydyn Yahoo"
+
 #~ msgid "Gadu-Gadu Messenger"
 #~ msgstr "Negesydd Gadu-Gadu"
+
 #~ msgid "Service"
 #~ msgstr "Gwasanaeth"
+
 #~ msgid "Username"
 #~ msgstr "Enw Defnyddiwr"
+
 #~ msgid "Address _2:"
 #~ msgstr "Cyfeiriad _2:"
+
 #~ msgid "Ci_ty:"
 #~ msgstr "_Dinas:"
+
 #~ msgid "Countr_y:"
 #~ msgstr "_Gwlad:"
+
 #~ msgid "Full Address"
 #~ msgstr "Cyfeiriad Llawn"
+
 #~ msgid "_ZIP Code:"
 #~ msgstr "Cod Post/_ZIP:"
+
 #~ msgid "Dr."
 #~ msgstr "Dr."
+
 #~ msgid "Esq."
 #~ msgstr "Ysw."
+
 #~ msgid "I"
 #~ msgstr "I"
+
 #~ msgid "II"
 #~ msgstr "II"
+
 #~ msgid "III"
 #~ msgstr "III"
+
 #~ msgid "Jr."
 #~ msgstr "Jr."
+
 #~ msgid "Miss"
 #~ msgstr "Miss"
+
 #~ msgid "Mr."
 #~ msgstr "Mr."
+
 #~ msgid "Mrs."
 #~ msgstr "Mrs."
+
 #~ msgid "Ms."
 #~ msgstr "Ms."
+
 #~ msgid "Sr."
 #~ msgstr "Sr."
+
 #~ msgid "Add IM Account"
 #~ msgstr "Ychwanegu Cyfrif Negeseuo Cyflym"
-#~ msgid "_Account name:"
-#~ msgstr "_Enw cyfrif:"
+
 #~ msgid "_IM Service:"
 #~ msgstr "Gwasanaeth _Negeseuo Cyflym:"
+
 #~ msgid "\n"
 #~ msgstr "\n"
+
 #~ msgid "Add an email to the List"
 #~ msgstr "Ychwanegu e-bost at y Rhestr"
+
 #~ msgid "Insert email addresses from Address Book"
 #~ msgstr "Mewnosod cyfeiriadau e-bost o'r Llyfr Cyfeiriadau"
+
 #~ msgid "Members"
 #~ msgstr "Aelodau"
+
 #~ msgid "Remove an email address from the List"
 #~ msgstr "Tynnu cyfeiriad e-bost o'r Rhestr"
+
 #~ msgid "_Select"
 #~ msgstr "_Dewis"
+
 #~ msgid ""
 #~ "The changed email or name of this contact already\n"
 #~ "exists in this folder.  Would you like to add it anyway?"
 #~ msgstr ""
 #~ "Mae'r enw neu gyfeiriad e-bost, wedi ei newid, yn bodoli eisoes\n"
 #~ "o fewn y blygell. Ydych chi am ei ychwanegu beth bynnag?"
+
 #~ msgid ""
 #~ "We were unable to open this addressbook.  This either means you have "
 #~ "entered an incorrect URI, or the LDAP server is unreachable."
 #~ msgstr ""
 #~ "Wedi methu agor y llyfr cyfeiriadau hwn. Un ai rydych wedi rhoi URI "
 #~ "anghywir, neu mae'r gweinydd LDAP yn anghyraeddadwy."
+
 #~ msgid "10 pt. Tahoma"
 #~ msgstr "10 pt. Tahoma"
+
 #~ msgid "8 pt. Tahoma"
 #~ msgstr "8 pt. Tahoma"
+
 #~ msgid "Blank forms at end:"
 #~ msgstr "Ffurflenni gwag ar y diwedd:"
+
 #~ msgid "Body"
 #~ msgstr "Corff"
+
 #~ msgid "Bottom:"
 #~ msgstr "Gwaelod:"
+
 #~ msgid "Dimensions:"
 #~ msgstr "Dimensiynau:"
+
 #~ msgid "F_ont..."
 #~ msgstr "_Ffont..."
+
 #~ msgid "Fonts"
 #~ msgstr "Ffontiau"
+
 #~ msgid "Footer:"
 #~ msgstr "Troedyn:"
+
 #~ msgid "Header/Footer"
 #~ msgstr "Pennawd/Troedyn"
+
 #~ msgid "Headings"
 #~ msgstr "Penawdau"
+
 #~ msgid "Headings for each letter"
 #~ msgstr "Penawdau ar gyfer bob llythyren"
+
 #~ msgid "Height:"
 #~ msgstr "Uchder:"
+
 #~ msgid "Immediately follow each other"
 #~ msgstr "Yn dilyn ei gilydd yn syth"
+
 #~ msgid "Include:"
 #~ msgstr "Cynnwys:"
+
 #~ msgid "Landscape"
 #~ msgstr "Tirlun"
+
 #~ msgid "Left:"
 #~ msgstr "Chwith:"
+
 #~ msgid "Letter tabs on side"
 #~ msgstr "Tabiau llythrennau ar yr ochr"
+
 #~ msgid "Margins"
 #~ msgstr "Ymylau"
+
 #~ msgid "Number of columns:"
 #~ msgstr "Nifer y colofnau:"
+
 #~ msgid "Options"
 #~ msgstr "Opsiynau"
+
 #~ msgid "Orientation"
 #~ msgstr "Gogwydd"
-



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]