Updated Welsh translation.

2007-05-23 Rhys Jones <rhys@sucs.org> * cy.po: Updated Welsh translation. svn path=/trunk/; revision=33572
author: Rhys Jones <rhys@sucs.org> 2007-05-24 04:33:45 +0800
committer: Rhys James Jones <rhysj@src.gnome.org> 2007-05-24 04:33:45 +0800
commit: 2f1de610ab8fcf524d2bc9e6d737d3124833eb0b (patch)
tree: 02ab32314ab8b11056ad0b5701302a17b4a97fbc /po/cy.po
parent: 089c025754234ab8535a9f84d675662dca0a2580 (diff)
download: gsoc2013-evolution-2f1de610ab8fcf524d2bc9e6d737d3124833eb0b.tar
gsoc2013-evolution-2f1de610ab8fcf524d2bc9e6d737d3124833eb0b.tar.gz
gsoc2013-evolution-2f1de610ab8fcf524d2bc9e6d737d3124833eb0b.tar.bz2
gsoc2013-evolution-2f1de610ab8fcf524d2bc9e6d737d3124833eb0b.tar.lz
gsoc2013-evolution-2f1de610ab8fcf524d2bc9e6d737d3124833eb0b.tar.xz
gsoc2013-evolution-2f1de610ab8fcf524d2bc9e6d737d3124833eb0b.tar.zst
gsoc2013-evolution-2f1de610ab8fcf524d2bc9e6d737d3124833eb0b.zip
1 files changed, 3615 insertions, 3447 deletions
diff --git a/po/cy.po b/po/cy.po
index 59550e7ecf..ca044efb35 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -1,7 +1,7 @@
 # Evolution yn Gymraeg.
 # Telsa Gwynne
 # Dafydd Harries <daf@muse.19inch.net>, 2003 2004.
-# Rhys Jones <rhys@sucs.org>, 2005.
+# Rhys Jones <rhys@sucs.org>, 2005-7.
 # Eraill drwy Kyfieithu.
 #
 # This file is based upon a file which carried the following notice:
@@ -14,7 +14,7 @@
 # rhysj - Cwblhawyd yn GNOME 2.10. Rhai termau:
 # Attendee: Mynychwr (nid 'cyfarfotwr')
 # Filter (fel enw): Hidlydd (ll. hidlyddion), nid hidlen/hidlenni
-# Due today: i fod i ddod i ben heddiw
+# Due today: i fod i ddod i bn hddiw
 # Overdue: yn hwyr
 # Auto-complete: Awto-gwblhau
 # Contacts: Cysylltiadau (nid 'cysylltau')
@@ -25,13 +25,12 @@
 # instant messenger: negesydd sydyn
 # thread: trywydd (nid 'edefyn')
 #
-#: ../mail/em-format-html-display.c:681
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-30 08:34+0100\n"
-"PO-Revision-Date: 2006-07-29 12:33-0000\n"
+"POT-Creation-Date: 2007-05-23 21:33+0100\n"
+"PO-Revision-Date: 2007-05-17 22:14-0000\n"
 "Last-Translator: Rhys Jones <rhys@sucs.org>\n"
 "Language-Team: Cymraeg <gnome-cy@pengwyn.linux.org.uk>\n"
 "MIME-Version: 1.0\n"
@@ -41,21 +40,21 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:179
 msgid "evolution addressbook"
 msgstr "llyfr cyfeiriadau evolution"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:226
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:223
 msgid "New Contact"
 msgstr "Cyswllt Newydd"
 
-#: ../a11y/addressbook/ea-minicard-view.c:35
-#: ../addressbook/gui/component/addressbook-component.c:234
+#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../addressbook/gui/component/addressbook-component.c:231
 msgid "New Contact List"
 msgstr "Rhestr Gysylltiadau Newydd"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:162
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -64,7 +63,7 @@ msgstr[1] "mae gan %s, y blygell llyfr cyfeiriadau cyfredol, %d gerdyn"
 msgstr[2] "mae gan %s, y blygell llyfr cyfeiriadau cyfredol, %d cerdyn"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../ui/evolution-message-composer.xml.h:12
+#: ../ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Agor"
 
@@ -80,32 +79,32 @@ msgstr "Cyswllt:"
 msgid "evolution minicard"
 msgstr "cerdyn bychan Evolution"
 
-#: ../a11y/calendar/ea-cal-view-event.c:264
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
 msgstr "Mae ganddo larymau."
 
-#: ../a11y/calendar/ea-cal-view-event.c:267
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
 msgstr "Mae'n ail-ddigwydd."
 
-#: ../a11y/calendar/ea-cal-view-event.c:270
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
 msgstr "Mae'n gyfarfod."
 
-#: ../a11y/calendar/ea-cal-view-event.c:276
+#: ../a11y/calendar/ea-cal-view-event.c:278
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Digwyddiad Calendr: Crynodeb yw %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:280
 msgid "Calendar Event: It has no summary."
 msgstr "Digwyddiad Calendr: Does ganddo ddim crynodeb."
 
-#: ../a11y/calendar/ea-cal-view-event.c:297
+#: ../a11y/calendar/ea-cal-view-event.c:300
 msgid "calendar view event"
 msgstr "gweld digwyddiad calendr"
 
-#: ../a11y/calendar/ea-cal-view-event.c:526
+#: ../a11y/calendar/ea-cal-view-event.c:529
 msgid "Grab Focus"
 msgstr "Cipio Ffocws"
 
@@ -174,8 +173,8 @@ msgstr "gwybodaeth galendr am wythnos waith"
 msgid "calendar view for one or more days"
 msgstr "golwg galendr am un diwrnod neu fwy"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:187
-#: ../calendar/gui/calendar-component.c:703
+#: ../a11y/calendar/ea-gnome-calendar.c:188
+#: ../calendar/gui/calendar-component.c:707
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -185,32 +184,32 @@ msgstr "%A %d %b %Y"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:190
-#: ../calendar/gui/calendar-component.c:706
+#: ../a11y/calendar/ea-gnome-calendar.c:191
+#: ../calendar/gui/calendar-component.c:710
 #: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:2104
+#: ../calendar/gui/e-day-view.c:2106
 #: ../calendar/gui/e-week-view-main-item.c:319
 #: ../calendar/gui/e-week-view-main-item.c:533
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:192
-#: ../a11y/calendar/ea-gnome-calendar.c:197
-#: ../a11y/calendar/ea-gnome-calendar.c:199
-#: ../calendar/gui/calendar-component.c:708
-#: ../calendar/gui/calendar-component.c:713
-#: ../calendar/gui/calendar-component.c:715
+#: ../a11y/calendar/ea-gnome-calendar.c:193
+#: ../a11y/calendar/ea-gnome-calendar.c:198
+#: ../a11y/calendar/ea-gnome-calendar.c:200
+#: ../calendar/gui/calendar-component.c:712
+#: ../calendar/gui/calendar-component.c:717
+#: ../calendar/gui/calendar-component.c:719
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:216
-#: ../a11y/calendar/ea-gnome-calendar.c:222
-#: ../a11y/calendar/ea-gnome-calendar.c:228
-#: ../a11y/calendar/ea-gnome-calendar.c:230
-#: ../calendar/gui/calendar-component.c:727
-#: ../calendar/gui/calendar-component.c:734
-#: ../calendar/gui/calendar-component.c:740
-#: ../calendar/gui/calendar-component.c:742
+#: ../a11y/calendar/ea-gnome-calendar.c:217
+#: ../a11y/calendar/ea-gnome-calendar.c:223
+#: ../a11y/calendar/ea-gnome-calendar.c:229
+#: ../a11y/calendar/ea-gnome-calendar.c:231
+#: ../calendar/gui/calendar-component.c:731
+#: ../calendar/gui/calendar-component.c:738
+#: ../calendar/gui/calendar-component.c:744
+#: ../calendar/gui/calendar-component.c:746
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -219,26 +218,26 @@ msgstr "%d %b %Y"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:220
-#: ../calendar/gui/calendar-component.c:732
+#: ../a11y/calendar/ea-gnome-calendar.c:221
+#: ../calendar/gui/calendar-component.c:736
 #: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:2120
+#: ../calendar/gui/e-day-view.c:2122
 #: ../calendar/gui/e-week-view-main-item.c:333
 #: ../calendar/gui/e-week-view-main-item.c:547
 msgid "%d %b"
 msgstr "%d %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:247
-#: ../a11y/calendar/ea-gnome-calendar.c:255
+#: ../a11y/calendar/ea-gnome-calendar.c:248
+#: ../a11y/calendar/ea-gnome-calendar.c:256
 #: ../calendar/importers/icalendar-importer.c:772
 msgid "Gnome Calendar"
 msgstr "Calendr Gnome"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:291
 msgid "search bar"
 msgstr "bar chwilio"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:292
 msgid "evolution calendar search bar"
 msgstr "bar chwilio calendr evolution"
 
@@ -277,11 +276,11 @@ msgstr "naidlen"
 msgid "popup a child"
 msgstr "dangos naidlen plentyn"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:612
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:614
 msgid "edit"
 msgstr "golygu"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:613
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:615
 msgid "begin editing this cell"
 msgstr "dechrau golygu'r gell"
 
@@ -294,19 +293,19 @@ msgstr "toglu"
 msgid "toggle the cell"
 msgstr "toglu'r gell"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:171
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:192
 msgid "expand"
 msgstr "ehangu"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:172
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:193
 msgid "expands the row in the ETree containing this cell"
 msgstr "ehangu'r rhes yn yr ETree sy'n cynnwys y gell"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:177
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:198
 msgid "collapse"
 msgstr "ymgwympo"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:178
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:199
 msgid "collapses the row in the ETree containing this cell"
 msgstr "ymgwympo'r rhes yn yr ETree sy'n cynnwys y gell"
 
@@ -328,17 +327,17 @@ msgstr "clic"
 msgid "sort"
 msgstr "trefnu"
 
-#: ../a11y/widgets/ea-calendar-item.c:296
-#: ../a11y/widgets/ea-calendar-item.c:302
+#: ../a11y/widgets/ea-calendar-item.c:298
+#: ../a11y/widgets/ea-calendar-item.c:304
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
-#: ../a11y/widgets/ea-calendar-item.c:304
+#: ../a11y/widgets/ea-calendar-item.c:306
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "Calendr: o %s i %s"
 
-#: ../a11y/widgets/ea-calendar-item.c:339
+#: ../a11y/widgets/ea-calendar-item.c:341
 msgid "evolution calendar item"
 msgstr "eitem galendr evolution"
 
@@ -427,35 +426,45 @@ msgstr "Gwall wrth gadw {0} i {1}: {2}"
 msgid "Failed to authenticate with LDAP server."
 msgstr "Methwyd dilysu gyda'r gweinydd LDAP."
 
+#. Unknown error
 #: ../addressbook/addressbook.error.xml.h:13
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1853
+msgid "Failed to delete contact"
+msgstr "Methu dileu'r cyswllt"
+
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "GroupWise Address book creation:"
 msgstr "Creu Llyfr Cyfeiriadau GroupWise:"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:15
 msgid "LDAP server did not respond with valid schema information."
 msgstr "Ni atebodd y gweinydd LDAP gyda gwybodaeth sgema dilys."
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:16
+msgid "Permission Denied."
+msgstr "Gwrthodwyd Caniatâd."
+
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "Server Version"
 msgstr "Fersiwn Gweinydd"
 
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:18
 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"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "Mae'r llyfr cyfeiriadau Evolution wedi terfynu'n annisgwyl."
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:20
 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:19
+#: ../addressbook/addressbook.error.xml.h:21
 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 "
@@ -465,20 +474,20 @@ msgstr ""
 "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:20
+#: ../addressbook/addressbook.error.xml.h:22
 msgid "This address book will be removed permanently."
 msgstr "Bydd y llyfr cyfeiriadau yn cael ei ddileu am byth."
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "This addressbook could not be opened."
 msgstr "Methwyd agor y llyfr cyfeiriadau yma."
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "This addressbook server does not have any suggested search bases."
 msgstr ""
 "Does dim sail chwilio wedi ei awgrymu gan y gweinydd llyfr cyfeiriadau."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:25
 msgid ""
 "This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -486,27 +495,27 @@ 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:24
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Nid yw'r gweinydd yma yn cynnal gwybodaeth sgema LDAPv3."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "Unable to open addressbook"
 msgstr "Wedi methu agor llyfr cyfeiriadau"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "Unable to perform search."
 msgstr "Ni ellir chwilio."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to save {0}."
 msgstr "Methu cadw {0}."
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Would you like to save your changes?"
 msgstr "A hoffech gadw eich newidiadau?"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:31
 msgid ""
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -515,7 +524,7 @@ msgstr ""
 "ellir ei dynnu o'r man gwreiddiol. Yn lle gwneud hynny, ydych chi am gadw "
 "copi?"
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:32
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -525,50 +534,64 @@ msgstr ""
 "chi broblemau gyda Evolution. Dylid uwchraddio'r gweinydd at fersiwn sydd "
 "wedi ei gynnal, i gael y canlyniadau gorau."
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:33
 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:32
+#: ../addressbook/addressbook.error.xml.h:34
 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:33 ../mail/em-vfolder-rule.c:511
+#: ../addressbook/addressbook.error.xml.h:35 ../mail/em-vfolder-rule.c:510
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:9
 #: ../widgets/table/e-table-config.glade.h:15
 msgid "_Add"
 msgstr "_Ychwanegu"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:36
 msgid "_Discard"
 msgstr "_Gwaredu"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:37
+msgid "_Do not save"
+msgstr "_Peidio â chadw"
+
+#: ../addressbook/addressbook.error.xml.h:38
+msgid "_Resize"
+msgstr "_Newid maint"
+
+#: ../addressbook/addressbook.error.xml.h:39
+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 addressbook was unable to parse this query."
+#: ../addressbook/addressbook.error.xml.h:41
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid "{0}"
 msgstr "{0}"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
+#: ../addressbook/addressbook.error.xml.h:43
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:300
+#: ../addressbook/conduit/address-conduit.c:298
 msgid "Default Sync Address:"
 msgstr "Cyfeiriad Cydamseru Rhagosod"
 
-#: ../addressbook/conduit/address-conduit.c:1241
-#: ../addressbook/conduit/address-conduit.c:1242
+#: ../addressbook/conduit/address-conduit.c:1315
+#: ../addressbook/conduit/address-conduit.c:1316
 msgid "Could not load addressbook"
 msgstr "Methwyd llwytho'r llyfr cyfeiriadau"
 
-#: ../addressbook/conduit/address-conduit.c:1310
-#: ../addressbook/conduit/address-conduit.c:1313
+#: ../addressbook/conduit/address-conduit.c:1393
+#: ../addressbook/conduit/address-conduit.c:1396
 msgid "Could not read pilot's Address application block"
 msgstr "Methu darllen bloc rhaglen Cyfeiriad y peilot"
 
@@ -590,9 +613,9 @@ msgstr "Cyfluniwch awto-gwblhau yma"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1332
-#: ../calendar/gui/calendar-component.c:268 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../addressbook/gui/component/addressbook-view.c:1338
+#: ../calendar/gui/calendar-component.c:272 ../calendar/gui/migration.c:402
+#: ../plugins/exchange-operations/exchange-folder.c:581
 msgid "Contacts"
 msgstr "Cysylltiadau"
 
@@ -630,13 +653,13 @@ msgstr "Trefnwch dystysgrifau S/MIME yma"
 
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:141
+#: ../addressbook/gui/component/addressbook-component.c:139
 #: ../addressbook/gui/component/addressbook-migrate.c:483
-#: ../calendar/gui/calendar-component.c:230
-#: ../calendar/gui/memos-component.c:195 ../calendar/gui/migration.c:474
-#: ../calendar/gui/migration.c:567 ../calendar/gui/migration.c:1075
-#: ../calendar/gui/tasks-component.c:190 ../mail/em-folder-tree-model.c:199
-#: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:299
+#: ../calendar/gui/calendar-component.c:231
+#: ../calendar/gui/memos-component.c:195 ../calendar/gui/migration.c:476
+#: ../calendar/gui/migration.c:572 ../calendar/gui/migration.c:1080
+#: ../calendar/gui/tasks-component.c:191 ../mail/em-folder-tree-model.c:199
+#: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:300
 #: ../mail/mail-vfolder.c:223
 msgid "On This Computer"
 msgstr "Ar y Cyfeiriadur Hwn"
@@ -646,54 +669,54 @@ msgstr "Ar y Cyfeiriadur Hwn"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:149
+#: ../addressbook/gui/component/addressbook-component.c:147
 #: ../addressbook/gui/component/addressbook-migrate.c:491
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/widgets/eab-contact-display.c:602
-#: ../calendar/gui/calendar-component.c:238
-#: ../calendar/gui/memos-component.c:203 ../calendar/gui/migration.c:482
-#: ../calendar/gui/migration.c:575 ../calendar/gui/migration.c:1083
-#: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../calendar/gui/calendar-component.c:241
+#: ../calendar/gui/memos-component.c:203 ../calendar/gui/migration.c:486
+#: ../calendar/gui/migration.c:580 ../calendar/gui/migration.c:1088
+#: ../calendar/gui/tasks-component.c:199 ../filter/filter-label.c:122
 #: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:104
 msgid "Personal"
 msgstr "Personol"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:159
+#: ../addressbook/gui/component/addressbook-component.c:157
 #: ../addressbook/gui/component/addressbook-migrate.c:501
 msgid "On LDAP Servers"
 msgstr "Ar Weinyddion LDAP"
 
-#: ../addressbook/gui/component/addressbook-component.c:227
+#: ../addressbook/gui/component/addressbook-component.c:224
 msgid "_Contact"
 msgstr "_Cyswllt"
 
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../addressbook/gui/component/addressbook-component.c:225
 msgid "Create a new contact"
 msgstr "Creu cyswllt newydd"
 
-#: ../addressbook/gui/component/addressbook-component.c:235
+#: ../addressbook/gui/component/addressbook-component.c:232
 msgid "Contact _List"
 msgstr "_Rhestr Gysylltiadau"
 
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../addressbook/gui/component/addressbook-component.c:233
 msgid "Create a new contact list"
 msgstr "Creu rhestr gysylltiadau newydd"
 
-#: ../addressbook/gui/component/addressbook-component.c:242
-#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/addressbook-component.c:239
+#: ../addressbook/gui/component/addressbook-config.c:1208
 msgid "New Address Book"
 msgstr "Llyfr Cyfeiriadau Newydd"
 
-#: ../addressbook/gui/component/addressbook-component.c:243
+#: ../addressbook/gui/component/addressbook-component.c:240
 msgid "Address _Book"
 msgstr "_Llyfr Cyfeiriadau"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-component.c:241
 msgid "Create a new address book"
 msgstr "Creu llyfr cyfeiriadau newydd"
 
-#: ../addressbook/gui/component/addressbook-component.c:406
+#: ../addressbook/gui/component/addressbook-component.c:404
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Methu wrth uwchraddio plygellau neu osodiadau'r Llyfr Cyfeiriadau."
 
@@ -702,8 +725,7 @@ msgid "Base"
 msgstr "Sail"
 
 #: ../addressbook/gui/component/addressbook-config.c:533
-#: ../calendar/gui/dialogs/calendar-setup.c:192
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
+#: ../calendar/gui/dialogs/calendar-setup.c:172
 msgid "_Type:"
 msgstr "_Math:"
 
@@ -714,17 +736,17 @@ msgstr "Copïwch gynnwys y llyfr yn lleol er mwyn ei ddefnyddio all-lein"
 #: ../addressbook/gui/component/addressbook-config.c:984
 #: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:365
+#: ../calendar/gui/dialogs/calendar-setup.c:376
+#: ../calendar/gui/dialogs/calendar-setup.c:387
 #: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:85
-#: ../plugins/itip-formatter/itip-formatter.c:2047
+#: ../plugins/itip-formatter/itip-formatter.c:2087
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Cyffredinol"
 
 #: ../addressbook/gui/component/addressbook-config.c:985
-#: ../addressbook/gui/widgets/e-addressbook-view.c:562
+#: ../addressbook/gui/widgets/e-addressbook-view.c:564
 #: ../mail/importers/pine-importer.c:392
 msgid "Address Book"
 msgstr "Llyfr Cyfeiriadau"
@@ -744,7 +766,7 @@ msgid "Details"
 msgstr "Manylion"
 
 #: ../addressbook/gui/component/addressbook-config.c:995
-#: ../mail/em-folder-browser.c:792
+#: ../mail/em-folder-browser.c:853
 msgid "Searching"
 msgstr "Chwilio"
 
@@ -752,18 +774,18 @@ msgstr "Chwilio"
 msgid "Downloading"
 msgstr "Yn Llwytho i Lawr"
 
-#: ../addressbook/gui/component/addressbook-config.c:1203
+#: ../addressbook/gui/component/addressbook-config.c:1206
 #: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "Priodweddau Llyfr Cyfeiriadau"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1202
 msgid "Migrating..."
 msgstr "Trosi..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1243
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Yn trosi `%s':"
@@ -845,13 +867,13 @@ msgstr "Llyfr Cyfeiriadau _Newydd"
 #. FIXME: need to disable for undeletable folders
 #: ../addressbook/gui/component/addressbook-view.c:957
 #: ../addressbook/gui/widgets/e-addressbook-view.c:978
-#: ../calendar/gui/calendar-component.c:580
-#: ../calendar/gui/e-calendar-table.c:1302
-#: ../calendar/gui/e-calendar-view.c:1720 ../calendar/gui/e-memo-table.c:918
-#: ../calendar/gui/memos-component.c:453 ../calendar/gui/tasks-component.c:443
-#: ../mail/em-folder-tree.c:2061 ../mail/em-folder-view.c:1126
+#: ../calendar/gui/calendar-component.c:584
+#: ../calendar/gui/e-calendar-table.c:1303
+#: ../calendar/gui/e-calendar-view.c:1701 ../calendar/gui/e-memo-table.c:919
+#: ../calendar/gui/memos-component.c:453 ../calendar/gui/tasks-component.c:444
+#: ../mail/em-folder-tree.c:2120 ../mail/em-folder-view.c:1151
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-list.xml.h:30 ../ui/evolution-memos.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Dileu"
@@ -861,12 +883,12 @@ msgid "Save As Vcard..."
 msgstr "Cadw fel VCard..."
 
 #: ../addressbook/gui/component/addressbook-view.c:961
-#: ../calendar/gui/calendar-component.c:581
-#: ../calendar/gui/memos-component.c:454 ../calendar/gui/tasks-component.c:444
+#: ../calendar/gui/calendar-component.c:585
+#: ../calendar/gui/memos-component.c:454 ../calendar/gui/tasks-component.c:445
 msgid "_Properties..."
 msgstr "_Priodweddau..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1343
+#: ../addressbook/gui/component/addressbook-view.c:1349
 msgid "Contact Source Selector"
 msgstr "Dewisydd Ffynhonnell Gyswllt"
 
@@ -875,12 +897,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Yn cyrchu'r gweinydd LDAP yn ddienw"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:499
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:511
 msgid "Failed to authenticate.\n"
 msgstr "Methwyd dilysu.\n"
 
 #: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:479
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Rhowch gyfrinair ar gyfer %s (defnyddiwr %s)"
@@ -924,7 +946,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "URI y blygell a ddefnyddiwyd diwethaf yn y ddeialog dewis enwau."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Vertical pane position"
 msgstr "Lleoliad cwarel fertigol"
 
@@ -953,7 +975,6 @@ msgid "636"
 msgstr "636"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:6
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
 msgid "<b>Authentication</b>"
 msgstr "<b>Dilysiad</b>"
 
@@ -1203,9 +1224,8 @@ msgid "_Login method:"
 msgstr "Dull _mewngofnodi:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:245
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
-#: ../mail/mail-config.glade.h:163
+#: ../calendar/gui/dialogs/calendar-setup.c:225
+#: ../mail/mail-config.glade.h:164
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "_Enw:"
@@ -1219,7 +1239,7 @@ msgid "_Search scope:"
 msgstr "Cwmpas _chwilio:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:171
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Gwasanaethwr:"
@@ -1238,10 +1258,9 @@ msgstr "cardiau"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:60
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
-#: ../mail/em-account-editor.c:2022
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
+#: ../mail/em-account-editor.c:2054
 #: ../plugins/calendar-http/calendar-http.c:286
 #: ../plugins/calendar-weather/calendar-weather.c:563
 msgid "minutes"
@@ -1284,23 +1303,23 @@ msgid "<b>Work</b>"
 msgstr "<b>Gwaith</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/widgets/eab-contact-display.c:551
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:274
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: ../addressbook/gui/widgets/e-minicard.c:193
+#: ../addressbook/gui/widgets/e-minicard.c:194
 msgid "Contact"
 msgstr "Cyswllt"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:552
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:567
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2417
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:566
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2419
 msgid "Contact Editor"
 msgstr "Golygydd Cysylltiadau"
 
@@ -1341,17 +1360,16 @@ msgstr "Ffôn"
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:585
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1054
+#: ../addressbook/gui/widgets/eab-contact-display.c:580
+#: ../filter/filter-label.c:121 ../mail/em-migrate.c:1054
 #: ../mail/mail-config.glade.h:153
 msgid "Work"
 msgstr "Gwaith"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
-msgid "_Address:"
+msgid "_Address: "
 msgstr "_Cyfeiriad:"
 
 # EFALLAI
@@ -1368,9 +1386,9 @@ msgid "_Birthday:"
 msgstr "_Pen-blwydd:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: ../calendar/gui/dialogs/event-page.c:875
+#: ../calendar/gui/dialogs/event-page.c:879
 #: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1707
+#: ../plugins/itip-formatter/itip-view.c:1716
 msgid "_Calendar:"
 msgstr "_Calendr:"
 
@@ -1463,25 +1481,25 @@ msgid "_Zip/Postal Code:"
 msgstr "Cod _Post/Zip:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../addressbook/gui/widgets/eab-contact-display.c:577
+#: ../addressbook/gui/widgets/eab-contact-display.c:592
 msgid "Address"
 msgstr "Cyfeiriad"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:144
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:302
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:188
-#: ../addressbook/gui/widgets/e-addressbook-model.c:310
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
+#: ../addressbook/gui/widgets/e-addressbook-model.c:312
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
 #: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:186
+#: ../addressbook/gui/widgets/e-minicard.c:187
 #: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1841 ../widgets/text/e-entry.c:1312
-#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3625
+#: ../widgets/table/e-cell-text.c:1830 ../widgets/text/e-entry.c:1263
+#: ../widgets/text/e-entry.c:1264 ../widgets/text/e-text.c:3625
 #: ../widgets/text/e-text.c:3626
 msgid "Editable"
 msgstr "Golygadwy"
@@ -2457,8 +2475,8 @@ msgstr "Zimbabwe"
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
 #: ../plugins/exchange-operations/exchange-delegates.c:934
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:42
-#: ../plugins/save-attachments/save-attachments.c:370
+#: ../plugins/plugin-manager/plugin-manager.c:52
+#: ../plugins/save-attachments/save-attachments.c:366
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "Enw"
@@ -2468,8 +2486,8 @@ msgid "AOL Instant Messenger"
 msgstr "Negesydd Sydyn AOL"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:559
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/widgets/eab-contact-display.c:554
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2482,8 +2500,8 @@ msgid "Gadu-Gadu Messenger"
 msgstr "Negesydd Gadu-Gadu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:558
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:553
 msgid "ICQ"
 msgstr "ICQ"
 
@@ -2503,76 +2521,76 @@ msgid "Username"
 msgstr "Enw Defnyddiwr"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Cartref"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
 msgid "Other"
 msgstr "Arall"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:561
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:562
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/widgets/eab-contact-display.c:557
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:555
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/eab-contact-display.c:557
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
+#: ../addressbook/gui/widgets/eab-contact-display.c:552
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:260
 msgid "Source Book"
 msgstr "Llyfr Tardd"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:267
 msgid "Target Book"
 msgstr "Llyfr Targed"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:281
 msgid "Is New Contact"
 msgstr "Cyswllt Newydd Ydyw"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:288
 msgid "Writable Fields"
 msgstr "Meysydd Ysgrifenadwy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:295
 msgid "Required Fields"
 msgstr "Meysydd Angenrheidiol"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:309
 msgid "Changed"
 msgstr "Newidiwyd"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:562
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2412
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:561
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2414
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Golygydd Cysylltiadau - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2792
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2794
 msgid "Please select an image for this contact"
 msgstr "Dewiswch ddelwedd ar gyfer y cyswllt hwn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2793
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2795
 msgid "_No image"
 msgstr "_Dim delwedd"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2580,43 +2598,43 @@ msgstr ""
 "Mae'r data cyswllt yn annilys:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3101
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3100
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "Mae gan '%s' ffurf annilys"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3107
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "Mae gan %s'%s' ffurf annilys"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3123
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3133
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "Mae %s'%s' yn wag"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3149
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3148
 msgid "Invalid contact."
 msgstr "Cyswllt annilys."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:292
 msgid "Contact Quick-Add"
 msgstr "Brys-Ychwanegu Cyswllt"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:295
 msgid "_Edit Full"
 msgstr "_Golygu Llawn"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:336
 msgid "_Full name"
 msgstr "_Enw llawn"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
 msgid "E_mail"
 msgstr "E_bost"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:359
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
 msgid "_Select Address Book"
 msgstr "_Dewis Llyfr Cyfeiriadau"
 
@@ -2670,6 +2688,10 @@ msgstr "_Gwlad:"
 msgid "Full Address"
 msgstr "Cyfeiriad Llawn"
 
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "_Address:"
+msgstr "_Cyfeiriad:"
+
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_ZIP Code:"
 msgstr "Cod Post/_ZIP:"
@@ -2683,7 +2705,7 @@ msgid "Esq."
 msgstr "Ysw."
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "Enw Llawn"
 
@@ -2755,7 +2777,7 @@ msgstr "Gwasanaeth _Negeseuo Cyflym:"
 #: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../plugins/calendar-weather/calendar-weather.c:409
 #: ../plugins/exchange-operations/exchange-calendar.c:242
-#: ../plugins/exchange-operations/exchange-contacts.c:235
+#: ../plugins/exchange-operations/exchange-contacts.c:234
 msgid "_Location:"
 msgstr "_Lleoliad:"
 
@@ -2801,9 +2823,9 @@ msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Teipiwch gyfeiriad e-bost neu llusgwch gyswllt i'r rhestr isod:"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
-#: ../addressbook/gui/widgets/e-addressbook-model.c:296
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:222
+#: ../addressbook/gui/widgets/e-addressbook-model.c:298
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:383
+#: ../addressbook/gui/widgets/e-addressbook-view.c:224
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
 #: ../addressbook/gui/widgets/e-minicard-view.c:508
 msgid "Book"
@@ -2858,27 +2880,44 @@ 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?"
 
+#: ../addressbook/gui/merging/eab-contact-merging.c:189
+msgid "Merge Contact"
+msgstr "Cyfuno Cyswllt"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:204
+msgid "Merge"
+msgstr "Cyfuno"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:257
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/eab-contact-display.c:535
+#: ../addressbook/gui/widgets/eab-contact-display.c:537
+#: ../addressbook/gui/widgets/eab-contact-display.c:780
+#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
+msgid "Email"
+msgstr "E-bost"
+
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
-#: ../calendar/gui/cal-search-bar.c:52
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../calendar/gui/cal-search-bar.c:60
 msgid "Any field contains"
 msgstr "Unrhyw faes yn cynnwys"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:170
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
 msgid "Email begins with"
 msgstr "E-bost yn dechrau gyda"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:169
+#: ../addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Name begins with"
 msgstr "Enw yn dechrau gyda"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:148
+#: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
 msgstr "Dim cysylltiadau"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:151
+#: ../addressbook/gui/widgets/e-addressbook-model.c:153
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
@@ -2886,55 +2925,54 @@ msgstr[0] "%d cyswllt"
 msgstr[1] "%d gyswllt"
 msgstr[2] "%d cyswllt"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:303
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:236
+#: ../addressbook/gui/widgets/e-addressbook-model.c:305
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
+#: ../addressbook/gui/widgets/e-addressbook-view.c:238
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
 #: ../addressbook/gui/widgets/e-minicard-view.c:515
 msgid "Query"
 msgstr "Ymholiad"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:446
+#: ../addressbook/gui/widgets/e-addressbook-model.c:448
 msgid "Error getting book view"
 msgstr "Gwall estyn golwg llyfr"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
 #: ../widgets/table/e-table-click-to-add.c:502
 #: ../widgets/table/e-table-selection-model.c:311
-#: ../widgets/table/e-table.c:3329
+#: ../widgets/table/e-table.c:3340
 #: ../widgets/table/e-tree-selection-model.c:825
-#: ../widgets/text/e-entry.c:1235 ../widgets/text/e-entry.c:1236
+#: ../widgets/text/e-entry.c:1207 ../widgets/text/e-entry.c:1208
 #: ../widgets/text/e-text.c:3489 ../widgets/text/e-text.c:3490
 msgid "Model"
 msgstr "Model:"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:104
 msgid "Error modifying card"
 msgstr "Gwall newid carden"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:229
+#: ../addressbook/gui/widgets/e-addressbook-view.c:231
 msgid "Source"
 msgstr "Tardd"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:243
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:11
+#: ../addressbook/gui/widgets/e-addressbook-view.c:245
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:486
+#: ../calendar/gui/e-meeting-list-view.c:500
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:6
 msgid "Type"
 msgstr "Math"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:833
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2066
+#: ../addressbook/gui/widgets/e-addressbook-view.c:835
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2072
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "Cadw fel VCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/dialogs/comp-editor.c:1098
-#: ../calendar/gui/e-calendar-table.c:1280
-#: ../calendar/gui/e-calendar-view.c:1698 ../calendar/gui/e-memo-table.c:901
+#: ../calendar/gui/dialogs/comp-editor.c:1121
+#: ../calendar/gui/e-calendar-table.c:1281
+#: ../calendar/gui/e-calendar-view.c:1679 ../calendar/gui/e-memo-table.c:902
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Agor"
@@ -2989,13 +3027,13 @@ msgid "Cu_t"
 msgstr "_Torri"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:976
-#: ../calendar/gui/calendar-component.c:579
-#: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c:1288
-#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:909
-#: ../calendar/gui/memos-component.c:452 ../calendar/gui/tasks-component.c:442
-#: ../composer/e-msg-composer.c:3152 ../mail/em-folder-tree.c:986
-#: ../mail/em-folder-view.c:1112 ../mail/message-list.c:1901
+#: ../calendar/gui/calendar-component.c:583
+#: ../calendar/gui/dialogs/comp-editor.c:463
+#: ../calendar/gui/e-calendar-table.c:1289
+#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:910
+#: ../calendar/gui/memos-component.c:452 ../calendar/gui/tasks-component.c:443
+#: ../composer/e-msg-composer.c:3177 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1136 ../mail/message-list.c:1961
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
@@ -3008,18 +3046,19 @@ msgid "P_aste"
 msgstr "_Gludo"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1602
-#: ../calendar/gui/cal-search-bar.c:356
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1659
+#: ../calendar/gui/cal-search-bar.c:428
 msgid "Any Category"
 msgstr "Unrhyw Gategori"
 
-#. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1801
-msgid "Print cards"
-msgstr "Argraffu cardiau"
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1853
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
+msgid "Other error"
+msgstr "Gwall arall"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
+#: ../addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Assistant"
 msgstr "Cynorthwywr"
 
@@ -3056,84 +3095,78 @@ msgid "Categories"
 msgstr "Categorïau"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-msgid "Company Phone"
-msgstr "Ffôn Cwmni"
+#: ../addressbook/gui/widgets/eab-contact-display.c:566
+msgid "Company"
+msgstr "Cwmni"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:785
-#: ../smime/lib/e-cert.c:827
-msgid "Email"
-msgstr "E-bost"
+msgid "Company Phone"
+msgstr "Ffôn Cwmni"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email 2"
 msgstr "E-bost 2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 3"
 msgstr "E-bost 3"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Family Name"
 msgstr "Cyfenw"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Ffeilio Fel"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Given Name"
 msgstr "Enw"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Fax"
 msgstr "Ffacs Cartref"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone"
 msgstr "Ffôn Cartref"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "Home Phone 2"
 msgstr "Ffôn Cartref 2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "ISDN Phone"
 msgstr "Ffôn ISDN"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Journal"
 msgstr "Dyddlyfr"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: ../addressbook/gui/widgets/eab-contact-display.c:570
 msgid "Manager"
 msgstr "Rheolwr"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:596
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/eab-contact-display.c:591
 msgid "Mobile Phone"
 msgstr "Ffôn Symudol"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:550
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "Nickname"
 msgstr "Llysenw"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/eab-contact-display.c:604
 msgid "Note"
 msgstr "Nodyn"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Swyddfa"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Organization"
-msgstr "Sefydliad"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Ffacs Arall"
@@ -3155,15 +3188,14 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:497
+#: ../calendar/gui/e-meeting-list-view.c:511
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
 msgid "Role"
 msgstr "Rôl"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:600
+#: ../addressbook/gui/widgets/eab-contact-display.c:595
 msgid "Spouse"
 msgstr "Priod"
 
@@ -3194,38 +3226,38 @@ msgid "Web Site"
 msgstr "Safle Gwe"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:149
+#: ../addressbook/gui/widgets/e-minicard.c:150
 #: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
 #: ../widgets/misc/e-reflow.c:1436 ../widgets/misc/e-reflow.c:1437
 #: ../widgets/table/e-table-click-to-add.c:516
 #: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:656
+#: ../widgets/table/e-table-field-chooser-item.c:658
 #: ../widgets/table/e-table-group-container.c:967
 #: ../widgets/table/e-table-group-container.c:968
 #: ../widgets/table/e-table-group-leaf.c:629
 #: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
+#: ../widgets/table/e-table-item.c:3024 ../widgets/table/e-table-item.c:3025
 #: ../widgets/text/e-text.c:3667 ../widgets/text/e-text.c:3668
 msgid "Width"
 msgstr "Lled"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:156
+#: ../addressbook/gui/widgets/e-minicard.c:157
 #: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
 #: ../widgets/misc/e-reflow.c:1444 ../widgets/misc/e-reflow.c:1445
 #: ../widgets/table/e-table-click-to-add.c:523
-#: ../widgets/table/e-table-field-chooser-item.c:663
+#: ../widgets/table/e-table-field-chooser-item.c:665
 #: ../widgets/table/e-table-group-container.c:960
 #: ../widgets/table/e-table-group-container.c:961
 #: ../widgets/table/e-table-group-leaf.c:622
 #: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
+#: ../widgets/table/e-table-item.c:3030 ../widgets/table/e-table-item.c:3031
 #: ../widgets/text/e-text.c:3675 ../widgets/text/e-text.c:3676
 msgid "Height"
 msgstr "Uchder"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:164
+#: ../addressbook/gui/widgets/e-minicard.c:165
 msgid "Has Focus"
 msgstr "Â Ffocws"
 
@@ -3301,242 +3333,232 @@ msgstr ""
 msgid "Adapter"
 msgstr "Addasydd"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:102
 msgid "Work Email"
 msgstr "E-bost Gwaith"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:103
 msgid "Home Email"
 msgstr "Ebost Cartref"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:104
 msgid "Other Email"
 msgstr "Ebost Arall"
 
-#: ../addressbook/gui/widgets/e-minicard.c:172
+#: ../addressbook/gui/widgets/e-minicard.c:173
 msgid "Selected"
 msgstr "Dewisedig"
 
-#: ../addressbook/gui/widgets/e-minicard.c:179
+#: ../addressbook/gui/widgets/e-minicard.c:180
 msgid "Has Cursor"
 msgstr "Â Chyrchwr"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:620
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:625
 msgid "_Open Link in Browser"
 msgstr "_Agor y Cyswllt Mewn Porwr"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:175
-#: ../mail/em-folder-view.c:2497
+#: ../addressbook/gui/widgets/eab-contact-display.c:173
+#: ../mail/em-folder-view.c:2548
 msgid "_Copy Link Location"
 msgstr "_Copïo Lleoliad y Cyswllt"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:176
-msgid "_Send New Message To ..."
-msgstr "_Danfon Neges Newydd At..."
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:626
+msgid "_Send New Message To..."
+msgstr "_Danfon Neges Newydd i..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:175
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
 msgid "Copy _Email Address"
 msgstr "_Copïo Cyfeiriad Ebost"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:301
-#: ../addressbook/gui/widgets/eab-contact-display.c:364
+#: ../addressbook/gui/widgets/eab-contact-display.c:296
+#: ../addressbook/gui/widgets/eab-contact-display.c:359
 msgid "(map)"
 msgstr "(map)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:311
-#: ../addressbook/gui/widgets/eab-contact-display.c:377
+#: ../addressbook/gui/widgets/eab-contact-display.c:306
+#: ../addressbook/gui/widgets/eab-contact-display.c:372
 msgid "map"
 msgstr "map"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:462
-#: ../addressbook/gui/widgets/eab-contact-display.c:763
+#: ../addressbook/gui/widgets/eab-contact-display.c:456
+#: ../addressbook/gui/widgets/eab-contact-display.c:758
 msgid "List Members"
 msgstr "Aelodau Rhestr"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
-#: ../addressbook/gui/widgets/eab-contact-display.c:542
-msgid "E-mail"
-msgstr "E-bost"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 msgid "Department"
 msgstr "Adran"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
+#: ../addressbook/gui/widgets/eab-contact-display.c:568
 msgid "Profession"
 msgstr "Proffesiwn"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
+#: ../addressbook/gui/widgets/eab-contact-display.c:569
 msgid "Position"
 msgstr "Safle"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
+#: ../addressbook/gui/widgets/eab-contact-display.c:572
 msgid "Video Chat"
 msgstr "Sgwrs Fideo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:578
-#: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/calendar-component.c:751
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2281
-#: ../plugins/exchange-operations/exchange-folder.c:569
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:388
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:419
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:598
-#: ../plugins/hula-account-setup/camel-hula-listener.c:379
-#: ../plugins/hula-account-setup/camel-hula-listener.c:408
+#: ../addressbook/gui/widgets/eab-contact-display.c:573
+#: ../calendar/gui/calendar-commands.c:99
+#: ../calendar/gui/calendar-component.c:755
+#: ../calendar/gui/dialogs/calendar-setup.c:366
+#: ../calendar/gui/gnome-cal.c:2306
+#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:400
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:431
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:544
+#: ../plugins/hula-account-setup/camel-hula-listener.c:381
+#: ../plugins/hula-account-setup/camel-hula-listener.c:410
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "Calendr"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:579
+#: ../addressbook/gui/widgets/eab-contact-display.c:574
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:591
+#: ../calendar/gui/dialogs/event-editor.c:370
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "Rhydd/Prysur"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:580
-#: ../addressbook/gui/widgets/eab-contact-display.c:595
+#: ../addressbook/gui/widgets/eab-contact-display.c:575
+#: ../addressbook/gui/widgets/eab-contact-display.c:590
 msgid "Phone"
 msgstr "Ffôn"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:576
 msgid "Fax"
 msgstr "Ffacs"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
+#: ../addressbook/gui/widgets/eab-contact-display.c:587
 msgid "Home Page"
 msgstr "Tudalen Cartref"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:593
+#: ../addressbook/gui/widgets/eab-contact-display.c:588
 msgid "Web Log"
 msgstr "Gweflog"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:598
+#: ../addressbook/gui/widgets/eab-contact-display.c:593
 msgid "Birthday"
 msgstr "Pen-blwydd"
 
 # EFALLAI
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Anniversary"
 msgstr "Cylchwyl"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:781
+#: ../addressbook/gui/widgets/eab-contact-display.c:776
 msgid "Job Title"
 msgstr "Teitl Swydd"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:812
+#: ../addressbook/gui/widgets/eab-contact-display.c:807
 msgid "Home page"
 msgstr "Tudalen cartref"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:820
+#: ../addressbook/gui/widgets/eab-contact-display.c:815
 msgid "Blog"
 msgstr "Blog"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:50
+#: ../addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Success"
 msgstr "Llwyddiant"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:52
+#: ../addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Backend busy"
 msgstr "Rhan gefn yn brysur"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
+#: ../addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Repository offline"
 msgstr "Ystorfa ddim ar-lein"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:54
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Address Book does not exist"
 msgstr "Nid yw'r Llyfr Cyfeiriadau yn bodoli"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:56
 msgid "No Self Contact defined"
 msgstr "Dim Hunan-Gyswllt wedi ei ddiffinio"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Permission denied"
 msgstr "Gwrthodwyd caniatâd"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Contact not found"
 msgstr "Cyswllt heb ei ganfod"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Contact ID already exists"
 msgstr "ID cyswllt yn bodoli eisoes"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Protocol not supported"
 msgstr "Protocol ni chynhelir"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:234
+#: ../calendar/gui/e-cal-component-preview.c:236
 #: ../calendar/gui/e-cal-model-tasks.c:349
-#: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/print.c:2385
+#: ../calendar/gui/e-cal-model-tasks.c:664
+#: ../calendar/gui/e-calendar-table.c:464 ../calendar/gui/print.c:2351
 msgid "Canceled"
 msgstr "Diddymwyd"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Could not cancel"
 msgstr "Methwyd diddymu"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
 #: ../calendar/gui/comp-editor-factory.c:433
 msgid "Authentication Failed"
 msgstr "Dilysiant Wedi Methu"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Authentication Required"
 msgstr "Angen Dilysiant"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "TLS not Available"
 msgstr "TLS Ddim ar Gael"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "No such source"
 msgstr "Dim ffynhonnell o'r fath"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "Not available in offline mode"
 msgstr "Ddim ar gael yn y modd all-lein"
 
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
-msgid "Other error"
-msgstr "Gwall arall"
-
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Invalid server version"
 msgstr "Fersiwn gweinydd annilys"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:94
+#: ../addressbook/gui/widgets/eab-gui-util.c:95
 msgid ""
 "We were unable to open this addressbook. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -3547,7 +3569,7 @@ msgstr ""
 "Llwythwch y llyfr cyfeiriadau unwaith yn y modd ar-lein er mwyn llwytho ei "
 "gynnwys i lawr."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:103
+#: ../addressbook/gui/widgets/eab-gui-util.c:104
 #, c-format
 msgid ""
 "We were unable to open this addressbook.  Please check that the path %s "
@@ -3556,7 +3578,7 @@ 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:112
+#: ../addressbook/gui/widgets/eab-gui-util.c:113
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -3564,7 +3586,7 @@ msgstr ""
 "Wedi methu agor y llyfr cyfeiriadau hwn. Un ai rydych wedi rhoi URI "
 "anghywir, neu mae'r gweinydd LDAP yn anghyraeddadwy."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:118
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -3574,7 +3596,7 @@ msgstr ""
 "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:124
+#: ../addressbook/gui/widgets/eab-gui-util.c:125
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -3582,7 +3604,7 @@ 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:147
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3595,7 +3617,7 @@ msgstr ""
 "ymholiad i fod yn fwy penodol neu codwch y cyfwng canlyniadau yn yr\n"
 "hoffterau gweinydd cyfeiriadur ar gyfer y llyfr cyfeiriadau hwn."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:153
+#: ../addressbook/gui/widgets/eab-gui-util.c:154
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -3607,45 +3629,45 @@ msgstr ""
 "ymholiad i fod yn fwy penodol neu codwch y cyfwng amser yn yr hoffterau\n"
 "gweinydd cyfeiriadur ar gyfer y llyfr cyfeiriadau hwn."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:159
+#: ../addressbook/gui/widgets/eab-gui-util.c:160
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Methodd rhan gefn y llyfr cyfeiriadau ramadegu'r ymholiad."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:162
+#: ../addressbook/gui/widgets/eab-gui-util.c:163
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Gwrthododd rhan gefn y llyfr cyfeiriadau weithredu'r ymholiad."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:165
+#: ../addressbook/gui/widgets/eab-gui-util.c:166
 msgid "This query did not complete successfully."
 msgstr "Nid oedd yr ymholiad wedi gorffen yn llwyddiannus"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:187
+#: ../addressbook/gui/widgets/eab-gui-util.c:188
 msgid "Error adding list"
 msgstr "Gwall wrth ychwanegu rhestr"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:187
-#: ../addressbook/gui/widgets/eab-gui-util.c:704
+#: ../addressbook/gui/widgets/eab-gui-util.c:188
+#: ../addressbook/gui/widgets/eab-gui-util.c:710
 msgid "Error adding contact"
 msgstr "Gwall wrth ychwanegu cyswllt"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:198
+#: ../addressbook/gui/widgets/eab-gui-util.c:199
 msgid "Error modifying list"
 msgstr "Gwall wrth newid rhestr"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:198
+#: ../addressbook/gui/widgets/eab-gui-util.c:199
 msgid "Error modifying contact"
 msgstr "Gwall wrth newid cyswllt"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:210
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
 msgid "Error removing list"
 msgstr "Gwall wrth dynnu rhestr"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:210
-#: ../addressbook/gui/widgets/eab-gui-util.c:657
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:660
 msgid "Error removing contact"
 msgstr "Gwall wrth dynnu cyswllt"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:292
+#: ../addressbook/gui/widgets/eab-gui-util.c:293
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3663,7 +3685,8 @@ msgstr[2] ""
 "Bydd agor %d cyswllt yn agor %d ffenest newydd hefyd.\n"
 "Ydych chi wir am ddangos yr holl gysylltiadau?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:323
+#. For Translators only: "it" refers to the filename %s.
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3672,15 +3695,15 @@ msgstr ""
 "%s yn bodoli eisoes\n"
 "Ydych chi wir am ei ddisodli?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:327
+#: ../addressbook/gui/widgets/eab-gui-util.c:329
 msgid "Overwrite"
 msgstr "Trosysgrifo"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:374
-#: ../addressbook/gui/widgets/eab-gui-util.c:377
+#: ../addressbook/gui/widgets/eab-gui-util.c:376
+#: ../addressbook/gui/widgets/eab-gui-util.c:379
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "cyswllt"
@@ -3688,49 +3711,49 @@ msgstr[1] "cysylltiadau"
 msgstr[2] "cysylltiadau"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:425
+#: ../addressbook/gui/widgets/eab-gui-util.c:427
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:462
+#: ../addressbook/gui/widgets/eab-gui-util.c:464
 msgid "Select Address Book"
 msgstr "Dewis Llyfr Cyfeiriadau Newydd"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:603
+#: ../addressbook/gui/widgets/eab-gui-util.c:605
 msgid "list"
 msgstr "rhestr"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:765
+#: ../addressbook/gui/widgets/eab-gui-util.c:771
 msgid "Move contact to"
 msgstr "Symud y cyswllt i"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:767
+#: ../addressbook/gui/widgets/eab-gui-util.c:773
 msgid "Copy contact to"
 msgstr "Copïo'r cyswllt i"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:770
+#: ../addressbook/gui/widgets/eab-gui-util.c:776
 msgid "Move contacts to"
 msgstr "Symud y cysylltiadau i"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:772
+#: ../addressbook/gui/widgets/eab-gui-util.c:778
 msgid "Copy contacts to"
 msgstr "Copïo'r cysylltiadau i"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:998
+#: ../addressbook/gui/widgets/eab-gui-util.c:1004
 msgid "Multiple VCards"
 msgstr "Mwy nag un vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1001
+#: ../addressbook/gui/widgets/eab-gui-util.c:1007
 #, c-format
 msgid "VCard for %s"
 msgstr "vCard ar gyfer %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1042
-#: ../addressbook/gui/widgets/eab-gui-util.c:1060
+#: ../addressbook/gui/widgets/eab-gui-util.c:1048
+#: ../addressbook/gui/widgets/eab-gui-util.c:1066
 msgid "Contact information"
 msgstr "Gwybodaeth gyswllt"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1062
+#: ../addressbook/gui/widgets/eab-gui-util.c:1068
 #, c-format
 msgid "Contact information for %s"
 msgstr "Gwybodaeth gyswllt ar gyfer %s"
@@ -3739,7 +3762,7 @@ msgstr "Gwybodaeth gyswllt ar gyfer %s"
 msgid "Querying Address Book..."
 msgstr "Ymholi Llyfr Cyfeiriadau..."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:139
+#: ../addressbook/gui/widgets/eab-vcard-control.c:143
 #, c-format
 msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
@@ -3747,16 +3770,16 @@ msgstr[0] "Mae un cyswllt arall."
 msgstr[1] "Mae %d gyswllt arall."
 msgstr[2] "Mae %d cyswllt arall."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:223
-#: ../addressbook/gui/widgets/eab-vcard-control.c:272
+#: ../addressbook/gui/widgets/eab-vcard-control.c:228
+#: ../addressbook/gui/widgets/eab-vcard-control.c:281
 msgid "Show Full VCard"
 msgstr "Dangos y VCard Llawn"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:227
+#: ../addressbook/gui/widgets/eab-vcard-control.c:232
 msgid "Show Compact VCard"
 msgstr "Dangos VCard Cryno"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:277
+#: ../addressbook/gui/widgets/eab-vcard-control.c:286
 msgid "Save in addressbook"
 msgstr "Cadw mewn llyfr cyfeiriadau"
 
@@ -3764,13 +3787,11 @@ msgstr "Cadw mewn llyfr cyfeiriadau"
 msgid "Card View"
 msgstr "Golwg Cerdyn"
 
-#: ../addressbook/gui/widgets/gal-view-factory-treeview.c:26
-msgid "GTK Tree View"
-msgstr "Golwg Goeden GTK"
-
 #: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../mail/importers/evolution-outlook-importer.c:264
-#: ../mail/importers/netscape-importer.c:1252
+#: ../addressbook/importers/evolution-ldif-importer.c:583
+#: ../addressbook/importers/evolution-vcard-importer.c:250
+#: ../calendar/importers/icalendar-importer.c:312
+#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Mewnforio..."
 
@@ -3798,13 +3819,6 @@ msgstr "CSV neu Tab Evolution (.csv, .tab)"
 msgid "Evolution CSV and Tab Importer"
 msgstr "Mewnforiwr CSV a Tab Evolution"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:583
-#: ../addressbook/importers/evolution-vcard-importer.c:250
-#: ../calendar/importers/icalendar-importer.c:312
-#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
-msgid "Importing ..."
-msgstr "Mewnforio..."
-
 #: ../addressbook/importers/evolution-ldif-importer.c:754
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Fformat Cyfnewid Data LDAP (.ldif)"
@@ -3821,20 +3835,6 @@ msgstr "VCard (.vcf, .gcrd)"
 msgid "Evolution VCard Importer"
 msgstr "Mewnforiwr VCard Evolution"
 
-#: ../addressbook/printing/e-contact-print-envelope.c:213
-#: ../addressbook/printing/e-contact-print-envelope.c:234
-msgid "Print envelope"
-msgstr "Argraffu amlen"
-
-#: ../addressbook/printing/e-contact-print.c:849
-msgid "Print contacts"
-msgstr "Argraffu cysylltiadau"
-
-#: ../addressbook/printing/e-contact-print.c:939
-#: ../addressbook/printing/e-contact-print.c:967
-msgid "Print contact"
-msgstr "Argraffu cyswllt"
-
 #: ../addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3878,9 +3878,9 @@ msgstr "Fformat"
 #: ../addressbook/printing/e-contact-print.glade.h:11
 #: ../widgets/table/e-table-click-to-add.c:495
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
-#: ../widgets/table/e-table-field-chooser-item.c:649
+#: ../widgets/table/e-table-field-chooser-item.c:651
 #: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1913
+#: ../widgets/table/e-table-header-item.c:1893
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "Pennawd"
@@ -3991,7 +3991,7 @@ msgstr "Graddliwio"
 #: ../addressbook/printing/e-contact-print.glade.h:36
 #: ../plugins/exchange-operations/exchange-account-setup.c:956
 #: ../plugins/exchange-operations/exchange-calendar.c:231
-#: ../plugins/exchange-operations/exchange-contacts.c:218
+#: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
 msgstr "Maint:"
 
@@ -4008,7 +4008,7 @@ msgid "Top:"
 msgstr "Brig:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:176
+#: ../calendar/gui/dialogs/calendar-setup.c:156
 msgid "Type:"
 msgstr "Math:"
 
@@ -4025,7 +4025,7 @@ msgid "Contact Print Style Editor Test"
 msgstr "Prawf Teclyn Golygu Arddull Argraffu Cyswllt"
 
 #: ../addressbook/printing/test-contact-print-style-editor.c:54
-#: ../addressbook/printing/test-print.c:53
+#: ../addressbook/printing/test-print.c:47
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Hawlfraint (C) 2000, Ximian, Inc."
 
@@ -4033,16 +4033,16 @@ msgstr "Hawlfraint (C) 2000, Ximian, Inc."
 msgid "This should test the contact print style editor widget"
 msgstr "Mi ddylai hwn brofi'r teclyn golygu arddull argraffu cyswllt"
 
-#: ../addressbook/printing/test-print.c:52
+#: ../addressbook/printing/test-print.c:46
 msgid "Contact Print Test"
 msgstr "Prawf Argraffu Cyswllt"
 
-#: ../addressbook/printing/test-print.c:55
+#: ../addressbook/printing/test-print.c:49
 msgid "This should test the contact print code"
 msgstr "Fe ddylai hyn brofi'r cod argraffu cyswllt"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:668
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:704
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
 msgid "Can not open file"
 msgstr "Ni ellir agor ffeil"
@@ -4055,76 +4055,65 @@ msgstr "Methwyd cael rhestr o lyfrau cyswllt"
 msgid "failed to open book"
 msgstr "methwyd agor llyfr"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "Specify the output file instead of standard output"
 msgstr "Penodi ffeil ar gyfer yr allbwn, yn hytrach nag allbwn i'r sgrin"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:50
 msgid "OUTPUTFILE"
 msgstr "FFEIL_ALLBWN"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:58
+#: ../addressbook/tools/evolution-addressbook-export.c:53
 msgid "List local addressbook folders"
 msgstr "Rhestru plygellau llyfr cyfeiriadau lleol"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Show cards as vcard or csv file"
 msgstr "Dangos cardiau fel vcard neu ffeil csv"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:57
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Export in asynchronous mode"
 msgstr "Allforio mewn modd anghydamserol"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid ""
-"The number of cards in one output file in asychronous mode, default size 100."
+"The number of cards in out output file in asynchronous mode, default size "
+"100."
 msgstr ""
-"Y nifer o gardiau mewn un ffeil allbwn yn y modd anghydamserol, 100 yw'r "
+"Y nifer o gardiau yn y ffeil allbwn yn y modd anghydamserol, 100 yw'r "
 "rhagosodiad."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:65
 msgid "NUMBER"
 msgstr "RHIF"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:91
+#: ../addressbook/tools/evolution-addressbook-export.c:102
 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:105
+#: ../addressbook/tools/evolution-addressbook-export.c:116
 msgid "Only support csv or vcard format."
 msgstr "Cynnal ffurfiau csv neu vcard yn unig."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:114
+#: ../addressbook/tools/evolution-addressbook-export.c:125
 msgid "In async mode, output must be file."
 msgstr "Yn y modd anghydamserol, rhaid i'r allbwn fod yn ffeil."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:122
+#: ../addressbook/tools/evolution-addressbook-export.c:133
 msgid "In normal mode, there is no need for the size option."
 msgstr "Yn y modd normal, does dim angen yr opsiwn maint."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:153
+#: ../addressbook/tools/evolution-addressbook-export.c:164
 msgid "Unhandled error"
 msgstr "Gwall heb ei drin"
 
-#: ../addressbook/tools/evolution-addressbook-import.c:46
-msgid "Error loading default addressbook."
-msgstr "Gwall wrth lwytho'r llyfr cyfeiriadau rhagosodedig."
-
-#: ../addressbook/tools/evolution-addressbook-import.c:67
-msgid "Input File"
-msgstr "Ffeil Mewnbwn"
-
-#: ../addressbook/tools/evolution-addressbook-import.c:82
-msgid "No filename provided."
-msgstr "Dim enw ffeil wedi ei roi."
-
 #: ../calendar/calendar.error.xml.h:1
 msgid ""
 "Adding a meaningful summary to your appointment will give your recipients an "
@@ -4486,12 +4475,12 @@ msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Ni fydd eich tasgau ar gael tan mae Evolution wedi ei ailgychwyn."
 
 #: ../calendar/calendar.error.xml.h:70
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:29
 msgid "_Discard Changes"
 msgstr "_Hepgor Newidiadau"
 
 #: ../calendar/calendar.error.xml.h:71 ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:53
+#: ../ui/evolution-message-composer.xml.h:59
 msgid "_Save"
 msgstr "_Cadw"
 
@@ -4500,7 +4489,7 @@ msgid "_Save Changes"
 msgstr "_Cadw Newidiadau"
 
 #: ../calendar/calendar.error.xml.h:73
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:132
+#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:139
 msgid "_Send"
 msgstr "_Anfon"
 
@@ -4512,60 +4501,59 @@ msgstr "Danfon _Hysbys"
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:323
-#: ../smime/gui/component.c:50
+#: ../calendar/common/authentication.c:49 ../smime/gui/component.c:50
 msgid "Enter password"
 msgstr "Rhowch gyfrinair"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:255
+#: ../calendar/conduits/calendar/calendar-conduit.c:253
 msgid "Split Multi-Day Events:"
 msgstr "Hollti Digwyddiadau Aml-Ddiwrnod:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1432
-#: ../calendar/conduits/calendar/calendar-conduit.c:1433
-#: ../calendar/conduits/memo/memo-conduit.c:854
-#: ../calendar/conduits/memo/memo-conduit.c:855
-#: ../calendar/conduits/todo/todo-conduit.c:1038
-#: ../calendar/conduits/todo/todo-conduit.c:1039
+#: ../calendar/conduits/calendar/calendar-conduit.c:1504
+#: ../calendar/conduits/calendar/calendar-conduit.c:1505
+#: ../calendar/conduits/memo/memo-conduit.c:930
+#: ../calendar/conduits/memo/memo-conduit.c:931
+#: ../calendar/conduits/todo/todo-conduit.c:1106
+#: ../calendar/conduits/todo/todo-conduit.c:1107
 msgid "Could not start evolution-data-server"
 msgstr "Methwyd cychwyn gweinydd evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1529
-#: ../calendar/conduits/calendar/calendar-conduit.c:1532
+#: ../calendar/conduits/calendar/calendar-conduit.c:1612
+#: ../calendar/conduits/calendar/calendar-conduit.c:1615
 msgid "Could not read pilot's Calendar application block"
 msgstr "Methu darllen bloc rhaglen Galendr y peilot"
 
-#: ../calendar/conduits/memo/memo-conduit.c:937
-#: ../calendar/conduits/memo/memo-conduit.c:940
+#: ../calendar/conduits/memo/memo-conduit.c:1024
+#: ../calendar/conduits/memo/memo-conduit.c:1027
 msgid "Could not read pilot's Memo application block"
 msgstr "Methu darllen bloc rhaglen Femo'r peilot"
 
-#: ../calendar/conduits/memo/memo-conduit.c:976
-#: ../calendar/conduits/memo/memo-conduit.c:979
+#: ../calendar/conduits/memo/memo-conduit.c:1071
+#: ../calendar/conduits/memo/memo-conduit.c:1074
 msgid "Could not write pilot's Memo application block"
 msgstr "Methu ysgrifennu bloc rhaglen Femo'r peilot"
 
-#: ../calendar/conduits/todo/todo-conduit.c:239
+#: ../calendar/conduits/todo/todo-conduit.c:237
 msgid "Default Priority:"
 msgstr "Blaenoriaeth Ragosodedig:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1112
-#: ../calendar/conduits/todo/todo-conduit.c:1115
+#: ../calendar/conduits/todo/todo-conduit.c:1190
+#: ../calendar/conduits/todo/todo-conduit.c:1193
 msgid "Could not read pilot's ToDo application block"
 msgstr "Methu darllen bloc rhaglen ToDo y peilot"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1151
-#: ../calendar/conduits/todo/todo-conduit.c:1154
+#: ../calendar/conduits/todo/todo-conduit.c:1235
+#: ../calendar/conduits/todo/todo-conduit.c:1238
 msgid "Could not write pilot's ToDo application block"
 msgstr "Methu ysgrifennu bloc rhaglen ToDo y peilot"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2038
+#: ../plugins/itip-formatter/itip-formatter.c:2078
 msgid "Calendar and Tasks"
 msgstr "Calendr a Thasgau"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1357
+#: ../calendar/gui/calendar-component.c:1361
 msgid "Calendars"
 msgstr "Calendrau"
 
@@ -4606,21 +4594,24 @@ msgid "Memo_s"
 msgstr "_Memos"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:323 ../calendar/gui/e-memos.c:1084
-#: ../calendar/gui/memos-component.c:531
-#: ../calendar/gui/memos-component.c:1006 ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/e-memo-table.c:324 ../calendar/gui/e-memos.c:1094
+#: ../calendar/gui/gnome-cal.c:1637 ../calendar/gui/memos-component.c:531
+#: ../calendar/gui/memos-component.c:1008 ../calendar/gui/memos-control.c:336
+#: ../calendar/gui/memos-control.c:352
 msgid "Memos"
 msgstr "Memos"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:526 ../calendar/gui/e-tasks.c:1348
-#: ../calendar/gui/print.c:1840 ../calendar/gui/tasks-component.c:521
-#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/e-calendar-table.c:527 ../calendar/gui/e-tasks.c:1357
+#: ../calendar/gui/gnome-cal.c:1509 ../calendar/gui/print.c:1809
+#: ../calendar/gui/tasks-component.c:522
+#: ../calendar/gui/tasks-component.c:1013 ../calendar/gui/tasks-control.c:478
+#: ../calendar/gui/tasks-control.c:494
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:581
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:389
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:599
+#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:401
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:545
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Tasgau"
@@ -4647,8 +4638,7 @@ msgstr[2] "munud"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
 #: ../plugins/calendar-http/calendar-http.c:287
 #: ../plugins/calendar-weather/calendar-weather.c:564
@@ -4669,10 +4659,10 @@ msgstr "Apwyntiadau"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1623
-#: ../calendar/gui/e-itip-control.c:1113
-#: ../plugins/itip-formatter/itip-view.c:934
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1641
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1647
+#: ../calendar/gui/e-itip-control.c:1145
+#: ../plugins/itip-formatter/itip-view.c:943
 msgid "Location:"
 msgstr "Lleoliad:"
 
@@ -4682,13 +4672,13 @@ msgstr "Amser _hepian:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:159
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
 #: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-message-composer.xml.h:46
+#: ../ui/evolution-message-composer.xml.h:52
 #: ../ui/evolution-signature-editor.xml.h:24
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
 #: ../ui/evolution.xml.h:41
@@ -4703,31 +4693,31 @@ msgstr "_Hepian"
 msgid "location of appointment"
 msgstr "lleoliad yr apwyntiad"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1473
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1623
 msgid "No summary available."
 msgstr "Dim crynodeb ar gael."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1482
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1484
 msgid "No description available."
 msgstr "Dim disgrifiad ar gael."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1492
 msgid "No location information available."
 msgstr "Dim gwybodaeth lleoliad ar gael."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1531
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1554
 #, c-format
 msgid "You have %d alarms"
 msgstr "Mae gennych %d larwm."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1697
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1725
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1753
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1701
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4739,7 +4729,7 @@ 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:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1759
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4756,7 +4746,7 @@ msgstr ""
 "\n"
 "Ydych chi'n siŵr eich bod am redeg y rhaglen?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1773
 msgid "Do not ask me about this program again."
 msgstr "Peidiwch â gofyn ynghylch y rhaglen hon eto."
 
@@ -4861,103 +4851,107 @@ msgid "Default reminder value"
 msgstr "Gwerth atgoffad rhagosodedig"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Directory for saving alarm audio files"
+msgstr "Ym mha gyfeiriadur i arbed ffeiliau sain larymau"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Event Gradient"
 msgstr "Graddiant Digwyddiad"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Event Transparency"
 msgstr "Tryloywder Digwyddiadau"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Free/busy server URLs"
 msgstr "LAU gweinyddion statws rhydd/prysur"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Free/busy template URL"
 msgstr "LAU templed statws rhydd/prysur"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Gradient of the events in calendar views."
 msgstr "Graddiant y digwyddiadau yn yr olwg galendr."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hide completed tasks"
 msgstr "Cuddio tasgau sydd wedi gorffen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Hide task units"
 msgstr "Cuddio unedau tasg"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Hide task value"
 msgstr "Cuddio gwerth tasg"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Horizontal pane position"
 msgstr "Lleoliad cwarel llorweddol"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "Awr diwedd dydd gwaith, ar ffurf cloc bedair awr ar hugain, 0 i 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "Awr cychwyn dydd gwaith, ar ffurf cloc bedair awr ar hugain, 0 i 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr ""
 "Yr ysbeidiau a ddangosir yng ngolygon Dydd ac Wythnos Waith, mewn munudau."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Last alarm time"
 msgstr "Amser larwm diweddaraf"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "List of server URLs for free/busy publishing."
 msgstr "Rhestr LAU gweinyddion i gyhoeddi gwybodaeth statws rhydd/prysur."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Marcus Bains Line"
 msgstr "Llinell Marcus Bains"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Lliw Llinell Marcus Bains - Golwg Dydd"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Lliw Llinell Marcus Bains - Bar amser"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Munud diwedd dydd gwaith, 0 i 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Munud cychwyn dydd gwaith, 0 i 59"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Month view horizontal pane position"
 msgstr "Lleoliad cwarel llorweddol golwg Mis"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 msgid "Month view vertical pane position"
 msgstr "Lleoliad cwarel fertigol golwg Mis"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 msgid "Number of units for determining a default reminder."
 msgstr "Nifer o unedau i'w pennu ar gyfer nodyn atgoffa rhagosodedig."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 msgid "Number of units for determining when to hide tasks."
 msgstr "Nifer o unedau i benderfynu pryd i guddio tasgau."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 msgid "Overdue tasks color"
 msgstr "Lliw tasgau hwyr"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -4965,7 +4959,7 @@ 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.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4973,7 +4967,7 @@ 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.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
@@ -4981,7 +4975,7 @@ msgstr ""
 "Lleoliad y cwarel fertigol, rhwng y rhestrau calendr a'r calendr llywio "
 "dyddiadau."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
@@ -4989,7 +4983,7 @@ msgstr ""
 "Lleoliad y cwarel fertigol, rhwng yr olwg tasgau a'r cwarel rhagolwg tasgau, "
 "mewn picseli."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4997,7 +4991,7 @@ 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.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 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."
@@ -5005,66 +4999,70 @@ 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.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Rhaglenni y caniateir eu rhedeg gan larymau."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+msgid "Save directory for alarm audio"
+msgstr "Cyfeiriadur cadw sain larwm"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Dangos y maes RSVP yn y golygydd digwyddiadau/tasgau/cyfarfodydd"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Dangos y maes Rôl yn y golygydd digwyddiadau/tasgau/cyfarfodydd"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Show appointment end times in week and month views"
 msgstr "Dangos amserau gorffen apwyntiad yn y golygon wythnos a mis"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Dangos y maes categorïau yn y golygydd digwyddiadau/tasgau/cyfarfodydd"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Show display alarms in notification tray"
 msgstr "Gweld larymau dangos yn y gilfach hysbysu"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Dangos y maes statws yn y golygydd digwyddiadau/tasgau/cyfarfodydd"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Show the \"Preview\" pane"
 msgstr "Dangos y cwarel \"Rhagolwg\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
-#: ../mail/evolution-mail.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Show the \"Preview\" pane."
 msgstr "Dangos y cwarel \"Rhagolwg\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 msgid "Show timezone field in the event/meeting editor"
 msgstr ""
 "Dangos y maes cylchfa amser yn y golygydd digwyddiadau/tasgau/cyfarfodydd"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Dangos y maes math yn y golygydd digwyddiadau/tasgau/cyfarfodydd"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Show week numbers in date navigator"
 msgstr "Dangos rhifau wythnos yn y llywiwr dyddiadau"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Tasks due today color"
 msgstr "Lliw tasgau i fod i ddod i ben heddiw"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Tasks vertical pane position"
 msgstr "Lleoliad fertigol cwarel Tasgau"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5074,7 +5072,7 @@ msgstr ""
 "Rhoddir rhan defnyddiwr y cyfeiriad e-bost yn lle %u, a'r enw parth yn lle %"
 "d."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5083,19 +5081,20 @@ msgstr ""
 "calendr, ar ffurf lleoliad cylchfa amser Olsen heb ei gyfieithu, fel "
 "\"Europe/London\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Time divisions"
 msgstr "Rhaniadau amser"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Time the last alarm ran, in time_t."
 msgstr "Yr amser ganodd y larwm diwethaf, ar ffurf time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../plugins/startup-wizard/startup-wizard.c:108
 msgid "Timezone"
 msgstr "Cylchfa amser"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
@@ -5103,43 +5102,43 @@ msgstr ""
 "Tryloywder y digwyddiadau yn yr olwg galendr, gwerth rhwng 0 (tryloyw) ac 1 "
 "(hollol anhryloyw)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Twenty four hour time format"
 msgstr "Ffurf cloc bedair awr ar hugain"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unedau nodyn atgoffa rhagosodedig, \"munudau\", \"oriau\" neu \"dyddiau\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 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.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 msgid "Week start"
 msgstr "Dechrau wythnos"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Y dydd mae'r wythnos yn cychwyn, o Ddydd Sul (0) i Ddydd Sadwrn (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "P'un ai i ddefnyddio'r hambwrdd hysbysu ar gyfer larymau gweledol."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "P'un ai i ofyn am gadarnhad cyn dileu apwyntiad neu dasg."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 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.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5147,119 +5146,122 @@ 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.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
 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."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
 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.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "A ddylid cuddio tasgau gorffenedig yn y golwg tasgau."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
 msgid "Whether to set a default reminder for appointments."
 msgstr "P'un ai i osod nodyn atgoffa rhagosodedig ar gyfer apwyntiadau."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "P'un ai i ddangos maes RSVP yn y golygydd digwyddiad/tasg/cyfarfod."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
 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."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "P'un ai i ddangos maes rôl yn y golygydd digwyddiad/tasg/cyfarfod."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
 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.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
 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.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 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."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "P'un ai i ddangos maes math yn y golygydd digwyddiad/tasg/cyfarfod."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:88
 msgid "Whether to show week numbers in the date navigator."
 msgstr "P'un ai i ddangos rhifau wythnos yn y llywiwr dyddiadau."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
 msgid "Whether to use daylight savings time while displaying events."
 msgstr "A ddylid defnyddio amser arbed golau dydd wrth ddangos digwyddiadau."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
 msgid "Work days"
 msgstr "Dyddiau gwaith"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:91
 msgid "Workday end hour"
 msgstr "Awr gorffen dydd gwaith"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:92
 msgid "Workday end minute"
 msgstr "Munud gorffen dydd gwaith"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:93
 msgid "Workday start hour"
 msgstr "Awr dechrau dydd gwaith"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:94
 msgid "Workday start minute"
 msgstr "Munud cychwyn dydd gwaith"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:95
 msgid "daylight savings time"
 msgstr "amser arbed golau dydd"
 
-#: ../calendar/gui/cal-search-bar.c:48
+#: ../calendar/gui/cal-search-bar.c:55
 msgid "Summary contains"
 msgstr "Crynodeb yn cynnwys"
 
-#: ../calendar/gui/cal-search-bar.c:49
+#: ../calendar/gui/cal-search-bar.c:56
 msgid "Description contains"
 msgstr "Disgrifiad yn cynnwys"
 
-#: ../calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:57
+msgid "Category is"
+msgstr "Categori yw"
+
+#: ../calendar/gui/cal-search-bar.c:58
 msgid "Comment contains"
 msgstr "Sylw yn cynnwys"
 
-#: ../calendar/gui/cal-search-bar.c:51
+#: ../calendar/gui/cal-search-bar.c:59
 msgid "Location contains"
 msgstr "Lleoliad yn cynnwys"
 
-#: ../calendar/gui/cal-search-bar.c:359
+#: ../calendar/gui/cal-search-bar.c:432
 msgid "Unmatched"
 msgstr "Heb gydweddu"
 
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2522
-#: ../ui/evolution-addressbook.xml.h:26 ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-memos.xml.h:11
-#: ../ui/evolution-tasks.xml.h:14
+#: ../calendar/gui/calendar-commands.c:99 ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Argraffu"
 
-#: ../calendar/gui/calendar-commands.c:348
+#: ../calendar/gui/calendar-commands.c:324
 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 "
@@ -5268,14 +5270,13 @@ 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:354
+#: ../calendar/gui/calendar-commands.c:330
 msgid "Purge events older than"
 msgstr "Gwaredu digwyddiadau sy'n hŷn na"
 
-#: ../calendar/gui/calendar-commands.c:359
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
-#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:288
+#: ../calendar/gui/calendar-commands.c:335
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
+#: ../plugins/calendar-http/calendar-http.c:288
 #: ../plugins/calendar-weather/calendar-weather.c:565
 #: ../widgets/misc/e-send-options.glade.h:38
 msgid "days"
@@ -5285,89 +5286,89 @@ msgstr "dyddiau"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:256
-#: ../calendar/gui/memos-component.c:222 ../calendar/gui/migration.c:501
-#: ../calendar/gui/migration.c:594 ../calendar/gui/migration.c:1102
-#: ../calendar/gui/tasks-component.c:217
+#: ../calendar/gui/calendar-component.c:260
+#: ../calendar/gui/memos-component.c:222 ../calendar/gui/migration.c:506
+#: ../calendar/gui/migration.c:599 ../calendar/gui/migration.c:1107
+#: ../calendar/gui/tasks-component.c:218
 msgid "On The Web"
 msgstr "Ar y We"
 
-#: ../calendar/gui/calendar-component.c:274 ../calendar/gui/migration.c:403
+#: ../calendar/gui/calendar-component.c:278 ../calendar/gui/migration.c:405
 msgid "Birthdays & Anniversaries"
 msgstr "Penblwyddi"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:280
+#: ../calendar/gui/calendar-component.c:284
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Tywydd"
 
-#: ../calendar/gui/calendar-component.c:578
+#: ../calendar/gui/calendar-component.c:582
 msgid "_New Calendar"
 msgstr "_Calendr Newydd"
 
-#: ../calendar/gui/calendar-component.c:895
+#: ../calendar/gui/calendar-component.c:899
 msgid "Failed upgrading calendars."
 msgstr "Methwyd uwchraddio calendrau."
 
-#: ../calendar/gui/calendar-component.c:1194
+#: ../calendar/gui/calendar-component.c:1198
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Methu agor y calendr '%s' er mwyn creu digwyddiadau a chyfarfodydd"
 
-#: ../calendar/gui/calendar-component.c:1210
+#: ../calendar/gui/calendar-component.c:1214
 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:1332
+#: ../calendar/gui/calendar-component.c:1336
 msgid "Calendar Source Selector"
 msgstr "Dewisydd Ffynhonnell Galendr"
 
-#: ../calendar/gui/calendar-component.c:1540
+#: ../calendar/gui/calendar-component.c:1544
 msgid "New appointment"
 msgstr "Apwyntiad newydd"
 
-#: ../calendar/gui/calendar-component.c:1541
+#: ../calendar/gui/calendar-component.c:1545
 msgid "_Appointment"
 msgstr "_Apwyntiad"
 
-#: ../calendar/gui/calendar-component.c:1542
+#: ../calendar/gui/calendar-component.c:1546
 msgid "Create a new appointment"
 msgstr "Creu apwyntiad newydd"
 
-#: ../calendar/gui/calendar-component.c:1548
+#: ../calendar/gui/calendar-component.c:1552
 msgid "New meeting"
 msgstr "Cyfarfod Newydd"
 
-#: ../calendar/gui/calendar-component.c:1549
+#: ../calendar/gui/calendar-component.c:1553
 msgid "M_eeting"
 msgstr "_Cyfarfod"
 
-#: ../calendar/gui/calendar-component.c:1550
+#: ../calendar/gui/calendar-component.c:1554
 msgid "Create a new meeting request"
 msgstr "Creu cais newydd am gyfarfod"
 
-#: ../calendar/gui/calendar-component.c:1556
+#: ../calendar/gui/calendar-component.c:1560
 msgid "New all day appointment"
 msgstr "Apwyntiad drwy'r diwrnod newydd"
 
-#: ../calendar/gui/calendar-component.c:1557
+#: ../calendar/gui/calendar-component.c:1561
 msgid "All Day A_ppointment"
 msgstr "Apwyntiad Drwy'r Diwrnod"
 
-#: ../calendar/gui/calendar-component.c:1558
+#: ../calendar/gui/calendar-component.c:1562
 msgid "Create a new all-day appointment"
 msgstr "Creu apwyntiad gydol-y-dydd newydd"
 
-#: ../calendar/gui/calendar-component.c:1564
+#: ../calendar/gui/calendar-component.c:1568
 msgid "New calendar"
 msgstr "Calendr newydd"
 
-#: ../calendar/gui/calendar-component.c:1565
+#: ../calendar/gui/calendar-component.c:1569
 msgid "Cale_ndar"
 msgstr "_Calendr"
 
-#: ../calendar/gui/calendar-component.c:1566
+#: ../calendar/gui/calendar-component.c:1570
 msgid "Create a new calendar"
 msgstr "Creu calendr newydd"
 
@@ -5399,11 +5400,11 @@ 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:439 ../shell/e-shell.c:1272
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1274
 msgid "Unknown error"
 msgstr "Gwall anhysbys"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:614
+#: ../calendar/gui/dialogs/alarm-dialog.c:615
 msgid "Edit Alarm"
 msgstr "Golygu Larwm"
 
@@ -5451,62 +5452,66 @@ msgid "Run a program"
 msgstr "Gweithredu rhaglen"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
+msgid "Select A File"
+msgstr "Dewis Ffeil"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
 msgid "Send To:"
 msgstr "Anfon at:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
 #: ../calendar/gui/e-alarm-list.c:454
 msgid "Send an email"
 msgstr "Anfon e-bost"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
 msgid "_Arguments:"
 msgstr "_Ymresymiadau:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
 msgid "_Program:"
 msgstr "_Rhaglen:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 msgid "_Repeat the alarm"
 msgstr "_Ail-adrodd y larwm"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
 msgid "_Sound:"
 msgstr "_Sain:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "wedi"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "cyn"
 
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "day(s)"
 msgstr "dydd(iau)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "diwedd yr apwyntiad"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
 msgid "extra times every"
 msgstr "amserau ychwanegol bob"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "awr/oriau"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "munud(au)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "dechrau'r apwyntiad"
 
@@ -5527,7 +5532,6 @@ msgstr "Larymau"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:97
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:116
-#: ../composer/e-msg-composer-attachment.glade.h:5
 #: ../composer/e-msg-composer-select-file.c:98
 #: ../composer/e-msg-composer-select-file.c:118
 msgid "_Suggest automatic display of attachment"
@@ -5537,7 +5541,7 @@ msgstr "_Awgrymu dangos atodiadau'n awtomatig"
 msgid "Attach file(s)"
 msgstr "Atodi ffeil(iau)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:486
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:479
 msgid "Selected Calendars for Alarms"
 msgstr "Calendrau a ddewiswyd ar gyfer Larymau"
 
@@ -5564,7 +5568,7 @@ msgstr ""
 "bost.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:7
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Rhybuddion</span>"
 
@@ -5573,7 +5577,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:10
-#: ../mail/mail-config.glade.h:17
+#: ../mail/mail-config.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Cyffredinol</span>"
@@ -5603,7 +5607,7 @@ msgid "Display"
 msgstr "Dangos"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/dialogs/recurrence-page.c:1091
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Friday"
 msgstr "Dydd Gwener"
@@ -5619,7 +5623,7 @@ msgstr ""
 "Diwrnodau"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1080
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
 #: ../calendar/gui/e-itip-control.c:726
 msgid "Monday"
 msgstr "Dydd Llun"
@@ -5643,7 +5647,6 @@ msgstr ""
 "Sul"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 #: ../mail/mail-config.glade.h:105
 msgid "Pick a color"
 msgstr "Dewiswch liw"
@@ -5654,7 +5657,7 @@ msgid "S_un"
 msgstr "S_ul"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/dialogs/recurrence-page.c:1092
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Saturday"
 msgstr "Dydd Sadwrn"
@@ -5672,7 +5675,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Dangos rhifau _wythnos yn y llywiwr dyddiadau"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1093
 #: ../calendar/gui/e-itip-control.c:725
 msgid "Sunday"
 msgstr "Dydd Sul"
@@ -5691,7 +5694,7 @@ msgid "Template:"
 msgstr "Templed:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/dialogs/recurrence-page.c:1090
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Thursday"
 msgstr "Dydd Iau"
@@ -5706,13 +5709,13 @@ msgid "Time format:"
 msgstr "Fformat amser:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1081
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
 #: ../calendar/gui/e-itip-control.c:727
 msgid "Tuesday"
 msgstr "Dydd Mawrth"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1082
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Wednesday"
 msgstr "Dydd Mercher"
@@ -5791,81 +5794,46 @@ msgstr "_Mer"
 msgid "before every appointment"
 msgstr "cyn bob apwyntiad"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:288
+#: ../calendar/gui/dialogs/calendar-setup.c:268
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "Copïo cynnwys y calendr yn _lleol er mwyn ei ddefnyddio all-lein"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
+#: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "Copïo _cynnwys y rhestr dasgau'n lleol er mwyn ei defnyddio all-lein"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "Copïo cynnwys y _rhestr femo'n lleol er mwyn ei defnyddio all-lein"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
+#: ../calendar/gui/dialogs/calendar-setup.c:342
 msgid "C_olor:"
 msgstr "_Lliw:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:377
 msgid "Task List"
 msgstr "Rhestr Dasgau"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:388
 msgid "Memo List"
 msgstr "Rhestr Femos"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:479
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "Calendar Properties"
 msgstr "Priodweddau Calendr"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:481
+#: ../calendar/gui/dialogs/calendar-setup.c:479
 msgid "New Calendar"
 msgstr "Calendr Newydd"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:566
+#: ../calendar/gui/dialogs/calendar-setup.c:564
 msgid "Task List Properties"
 msgstr "Enw Rhestr Dasgau"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:632
+#: ../calendar/gui/dialogs/calendar-setup.c:630
 msgid "New Memo List"
 msgstr "Rhestr Femo Newydd"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
-msgid "Add Calendar"
-msgstr "Ychwanegu Calendr"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Task List"
-msgstr "Ychwanegu Rhestr Dasgau"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "_Add Calendar"
-msgstr "_Ychwanegu Calendr"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Task List"
-msgstr "_Ychwanegu Rhestr Dasgau"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
-#: ../plugins/calendar-http/calendar-http.c:271
-#: ../plugins/calendar-weather/calendar-weather.c:548
-msgid "_Refresh:"
-msgstr "_Adnewyddu:"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
-#: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:133
-msgid "_URL:"
-msgstr "_LAU:"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:289
-#: ../plugins/calendar-weather/calendar-weather.c:566
-msgid "weeks"
-msgstr "wythnosau"
-
 #: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Mae'r digwyddiad hwn wedi ei ddileu."
@@ -5915,42 +5883,42 @@ msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 "%s Dydych chi ddim wedi gwneud unrhyw newidiadau. Diweddaru'r golygydd?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:515
+#: ../calendar/gui/dialogs/comp-editor-page.c:519
 #, c-format
 msgid "Validation error: %s"
 msgstr "Gwall dilysu: %s"
 
 # TRWSIO
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2280
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2179
 msgid " to "
 msgstr " i"
 
 # TRWSIO
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2284
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2183
 msgid " (Completed "
 msgstr " (Cyflawnwyd "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2286
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2185
 msgid "Completed "
 msgstr "Cyflawnwyd"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2291
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2190
 msgid " (Due "
 msgstr " (Amser Disgwyl "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2293
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2192
 msgid "Due "
 msgstr "Amser Disgwyl "
 
-#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2888
+#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2914
 #, c-format
 msgid "Attached message - %s"
 msgstr "Neges wedi'i hatodi - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:212
-#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2893
-#: ../composer/e-msg-composer.c:3089
+#: ../calendar/gui/dialogs/comp-editor.c:214
+#: ../calendar/gui/dialogs/comp-editor.c:393 ../composer/e-msg-composer.c:2919
+#: ../composer/e-msg-composer.c:3114
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
@@ -5958,22 +5926,22 @@ msgstr[0] "Neges wedi'i hatodi"
 msgstr[1] "%d neges wedi'u hatodi"
 msgstr[2] "%d neges wedi'u hatodi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3153
-#: ../mail/em-folder-tree.c:987 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1008 ../mail/message-list.c:1902
+#: ../calendar/gui/dialogs/comp-editor.c:464 ../composer/e-msg-composer.c:3178
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:1032 ../mail/message-list.c:1962
 msgid "_Move"
 msgstr "_Symud"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3155
-#: ../mail/em-folder-tree.c:989 ../mail/message-list.c:1904
+#: ../calendar/gui/dialogs/comp-editor.c:466 ../composer/e-msg-composer.c:3180
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:1964
 msgid "Cancel _Drag"
 msgstr "Diddymu _Llusgo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:802
+#: ../calendar/gui/dialogs/comp-editor.c:824
 msgid "Could not update object"
 msgstr "Methwyd diweddaru'r gwrthrych"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2501
+#: ../calendar/gui/dialogs/comp-editor.c:968 ../composer/e-msg-composer.c:2530
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -5981,103 +5949,98 @@ msgstr[0] "<b>%d</b> Ffeil wedi'i Atodi"
 msgstr[1] "<b>%d</b> Ffeil wedi'u Hatodi"
 msgstr[2] "<b>%d</b> Ffeil wedi'u Hatodi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:977
+#: ../calendar/gui/dialogs/comp-editor.c:1000
 msgid "Hide Attachment _Bar"
 msgstr "_Cuddio'r Bar Atodiadau"
 
-#: ../calendar/gui/dialogs/comp-editor.c:980
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1003
+#: ../calendar/gui/dialogs/comp-editor.c:1532
 msgid "Show Attachment _Bar"
 msgstr "_Dangos y Bar Atodiadau"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
-#: ../calendar/gui/dialogs/event-page.c:1895
-#: ../calendar/gui/dialogs/task-page.c:1198
-#: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3651
+#: ../calendar/gui/dialogs/comp-editor.c:1122
+#: ../calendar/gui/dialogs/event-page.c:1902
+#: ../calendar/gui/dialogs/task-page.c:1199 ../composer/e-msg-composer.c:3685
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:18
 msgid "_Remove"
 msgstr "_Tynnu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1100
-#: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3652 ../mail/em-folder-tree.c:2065
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
+#: ../calendar/gui/dialogs/comp-editor.c:1123
+#: ../composer/e-msg-composer.c:3686 ../mail/em-folder-tree.c:2127
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:35
 msgid "_Properties"
 msgstr "_Priodweddau"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1102
-#: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3654
+#: ../calendar/gui/dialogs/comp-editor.c:1125
+#: ../composer/e-msg-composer.c:3688
 msgid "_Add attachment..."
 msgstr "Ychwanegu _atodiad..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1489
-#: ../mail/em-format-html-display.c:2263
+#: ../calendar/gui/dialogs/comp-editor.c:1556
+#: ../mail/em-format-html-display.c:2314
 msgid "Show Attachments"
 msgstr "Dangos Atodiadau"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1557
 msgid "Press space key to toggle attachment bar"
 msgstr "Gwasgwch y bylchwr i doglu'r bar atodiadau"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2097
-#: ../calendar/gui/dialogs/comp-editor.c:2140
+#: ../calendar/gui/dialogs/comp-editor.c:2164
+#: ../calendar/gui/dialogs/comp-editor.c:2207
 msgid "Edit Appointment"
 msgstr "Golygu Apwyntiad"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2103
-#: ../calendar/gui/dialogs/comp-editor.c:2146
+#: ../calendar/gui/dialogs/comp-editor.c:2170
+#: ../calendar/gui/dialogs/comp-editor.c:2213
 #, c-format
 msgid "Meeting - %s"
 msgstr "Cyfarfod - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2105
-#: ../calendar/gui/dialogs/comp-editor.c:2148
+#: ../calendar/gui/dialogs/comp-editor.c:2172
+#: ../calendar/gui/dialogs/comp-editor.c:2215
 #, c-format
 msgid "Appointment - %s"
 msgstr "Apwyntiad - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2109
-#: ../calendar/gui/dialogs/comp-editor.c:2152
+#: ../calendar/gui/dialogs/comp-editor.c:2176
+#: ../calendar/gui/dialogs/comp-editor.c:2219
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tasg wedi Neilltuo - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2111
-#: ../calendar/gui/dialogs/comp-editor.c:2154
+#: ../calendar/gui/dialogs/comp-editor.c:2178
+#: ../calendar/gui/dialogs/comp-editor.c:2221
 #, c-format
 msgid "Task - %s"
 msgstr "Tasg - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2114
-#: ../calendar/gui/dialogs/comp-editor.c:2157
+#: ../calendar/gui/dialogs/comp-editor.c:2181
+#: ../calendar/gui/dialogs/comp-editor.c:2224
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Cofnod dyddlyfr - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2125
-#: ../calendar/gui/dialogs/comp-editor.c:2167
+#: ../calendar/gui/dialogs/comp-editor.c:2192
+#: ../calendar/gui/dialogs/comp-editor.c:2234
 msgid "No summary"
 msgstr "Dim crynodeb"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2677
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:518
-#: ../mail/em-utils.c:555 ../widgets/misc/e-attachment-bar.c:365
+#: ../calendar/gui/dialogs/comp-editor.c:2780 ../mail/em-utils.c:370
+#: ../widgets/misc/e-attachment-bar.c:350
 msgid "attachment"
 msgstr "atodiad"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2766
-#: ../calendar/gui/dialogs/comp-editor.c:2820
-#: ../calendar/gui/dialogs/comp-editor.c:2844
+#: ../calendar/gui/dialogs/comp-editor.c:2869
+#: ../calendar/gui/dialogs/comp-editor.c:2923
+#: ../calendar/gui/dialogs/comp-editor.c:2947
 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"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2868
+#: ../calendar/gui/dialogs/comp-editor.c:2976
 msgid "Unable to use current version!"
 msgstr "Ni ellir defnyddio'r fersiwn cyfredol!"
 
@@ -6158,21 +6121,21 @@ msgstr "Dirprwyo at:"
 msgid "Enter Delegate"
 msgstr "Rhowch ddirprwy"
 
-#: ../calendar/gui/dialogs/event-editor.c:564
+#: ../calendar/gui/dialogs/event-editor.c:602
 msgid "Appoint_ment"
 msgstr "_Apwyntiad"
 
-#: ../calendar/gui/dialogs/event-editor.c:568
+#: ../calendar/gui/dialogs/event-editor.c:606
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "Ail-ddigwyddiad"
 
-#: ../calendar/gui/dialogs/event-page.c:810
-#: ../calendar/gui/dialogs/event-page.c:2716
+#: ../calendar/gui/dialogs/event-page.c:814
+#: ../calendar/gui/dialogs/event-page.c:2721
 msgid "This event has alarms"
 msgstr "Mae gan yr apwyntiad larymau"
 
-#: ../calendar/gui/dialogs/event-page.c:882
+#: ../calendar/gui/dialogs/event-page.c:886
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
@@ -6180,68 +6143,68 @@ msgstr "Mae gan yr apwyntiad larymau"
 msgid "Or_ganizer:"
 msgstr "_Trefnydd:"
 
-#: ../calendar/gui/dialogs/event-page.c:920
+#: ../calendar/gui/dialogs/event-page.c:924
 msgid "_Delegatees"
 msgstr "_Cynrychiolwyr"
 
-#: ../calendar/gui/dialogs/event-page.c:922
+#: ../calendar/gui/dialogs/event-page.c:926
 msgid "Atte_ndees"
 msgstr "_Mynychwyr"
 
-#: ../calendar/gui/dialogs/event-page.c:1087
+#: ../calendar/gui/dialogs/event-page.c:1091
 msgid "Event with no start date"
 msgstr "Digwyddiad heb amser cychwyn"
 
-#: ../calendar/gui/dialogs/event-page.c:1090
+#: ../calendar/gui/dialogs/event-page.c:1094
 msgid "Event with no end date"
 msgstr "Digwyddiad heb amser gorffen"
 
-#: ../calendar/gui/dialogs/event-page.c:1258
-#: ../calendar/gui/dialogs/memo-page.c:684
-#: ../calendar/gui/dialogs/task-page.c:848
+#: ../calendar/gui/dialogs/event-page.c:1263
+#: ../calendar/gui/dialogs/memo-page.c:685
+#: ../calendar/gui/dialogs/task-page.c:849
 msgid "Start date is wrong"
 msgstr "Dyddiad cychwyn yn anghywir"
 
-#: ../calendar/gui/dialogs/event-page.c:1268
+#: ../calendar/gui/dialogs/event-page.c:1273
 msgid "End date is wrong"
 msgstr "Dyddiad gorffen yn anghywir"
 
-#: ../calendar/gui/dialogs/event-page.c:1291
+#: ../calendar/gui/dialogs/event-page.c:1296
 msgid "Start time is wrong"
 msgstr "Amser cychwyn yn anghywir"
 
-#: ../calendar/gui/dialogs/event-page.c:1298
+#: ../calendar/gui/dialogs/event-page.c:1303
 msgid "End time is wrong"
 msgstr "Amser gorffen yn anghywir"
 
-#: ../calendar/gui/dialogs/event-page.c:1453
-#: ../calendar/gui/dialogs/memo-page.c:719
-#: ../calendar/gui/dialogs/task-page.c:905
+#: ../calendar/gui/dialogs/event-page.c:1460
+#: ../calendar/gui/dialogs/memo-page.c:720
+#: ../calendar/gui/dialogs/task-page.c:906
 msgid "The organizer selected no longer has an account."
 msgstr "Does gan y trefnydd a ddewiswyd ddim cyfrif bellach."
 
-#: ../calendar/gui/dialogs/event-page.c:1459
-#: ../calendar/gui/dialogs/memo-page.c:725
-#: ../calendar/gui/dialogs/task-page.c:911
+#: ../calendar/gui/dialogs/event-page.c:1466
+#: ../calendar/gui/dialogs/memo-page.c:726
+#: ../calendar/gui/dialogs/task-page.c:912
 msgid "An organizer is required."
 msgstr "Mae gofyn am drefnydd."
 
-#: ../calendar/gui/dialogs/event-page.c:1474
-#: ../calendar/gui/dialogs/task-page.c:926
+#: ../calendar/gui/dialogs/event-page.c:1481
+#: ../calendar/gui/dialogs/task-page.c:927
 msgid "At least one attendee is required."
 msgstr "Mae eisiau un neu fwy o'r mynychwyr."
 
-#: ../calendar/gui/dialogs/event-page.c:1896
-#: ../calendar/gui/dialogs/task-page.c:1199
+#: ../calendar/gui/dialogs/event-page.c:1903
+#: ../calendar/gui/dialogs/task-page.c:1200
 msgid "_Add "
 msgstr "_Ychwanegu"
 
-#: ../calendar/gui/dialogs/event-page.c:2623
+#: ../calendar/gui/dialogs/event-page.c:2628
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Ni ellir agor y calendr '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:2926
+#: ../calendar/gui/dialogs/event-page.c:2934
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -6249,7 +6212,7 @@ msgstr[0] "%d dydd cyn yr apwyntiad"
 msgstr[1] "%d ddydd cyn yr apwyntiad"
 msgstr[2] "%d dydd cyn yr apwyntiad"
 
-#: ../calendar/gui/dialogs/event-page.c:2934
+#: ../calendar/gui/dialogs/event-page.c:2940
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -6257,32 +6220,32 @@ msgstr[0] "%d awr cyn yr apwyntiad"
 msgstr[1] "%d awr cyn yr apwyntiad"
 msgstr[2] "%d awr cyn yr apwyntiad"
 
-#: ../calendar/gui/dialogs/event-page.c:2942
+#: ../calendar/gui/dialogs/event-page.c:2946
 #, c-format
-msgid "%d minute before appointement"
+msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d funud cyn yr apwyntiad"
 msgstr[1] "%d funud cyn yr apwyntiad"
 msgstr[2] "%d munud cyn yr apwyntiad"
 
-#: ../calendar/gui/dialogs/event-page.c:2958
+#: ../calendar/gui/dialogs/event-page.c:2959
 msgid "Customize"
 msgstr "Addasu"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2963
+#: ../calendar/gui/dialogs/event-page.c:2964
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:649
-#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2293
-#: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:701
-#: ../mail/em-account-editor.c:1388 ../mail/em-account-prefs.c:475
+#: ../calendar/gui/e-cal-model-tasks.c:656
+#: ../calendar/gui/e-itip-control.c:1131 ../composer/e-msg-composer.c:2314
+#: ../filter/filter-rule.c:890 ../mail/em-account-editor.c:701
+#: ../mail/em-account-editor.c:1421 ../mail/em-account-prefs.c:475
 #: ../mail/em-junk-hook.c:78
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1735
-#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:1507
-#: ../widgets/misc/e-dateedit.c:1721
+#: ../plugins/itip-formatter/itip-formatter.c:1775
+#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1504
+#: ../widgets/misc/e-dateedit.c:1718
 msgid "None"
 msgstr "Dim"
 
@@ -6312,7 +6275,6 @@ msgid "Custom Alarm:"
 msgstr "Larwm Addasedig:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-#: ../calendar/gui/dialogs/task-page.glade.h:3
 msgid "D_escription:"
 msgstr "_Disgrifiad:"
 
@@ -6321,6 +6283,7 @@ msgid "Event Description"
 msgstr "Disgrifiad Digwyddiad"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/memo-page.glade.h:4
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "_Crynodeb:"
@@ -6347,56 +6310,6 @@ msgstr "ar gyfer"
 msgid "until"
 msgstr "hyd"
 
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:1
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Mynychwr"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:2
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "Cliciwch yma i ychwanegu mynychwr"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:3
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "Enw Cyffredin"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:4
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr "Dirprwywyd Oddi Wrth"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:5
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "Dirprwywyd i"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:6
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "Iaith"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:7
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "Aelodau"
-
-#. To translators: RSVP means "please reply"
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:509
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "RSVP"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:10
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:520
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:16
-msgid "Status"
-msgstr "Statws"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:1
 msgid "<b>Att_endees</b>"
 msgstr "<b>_Mynychwyr</b>"
@@ -6418,18 +6331,18 @@ msgstr "Trefnydd"
 msgid "Organizer:"
 msgstr "Trefnydd:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:220 ../calendar/gui/print.c:2321
+#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2287
 msgid "Memo"
 msgstr "Memo"
 
-#: ../calendar/gui/dialogs/memo-page.c:866
+#: ../calendar/gui/dialogs/memo-page.c:868
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Methu agor memos o fewn '%s'."
 
-#: ../calendar/gui/dialogs/memo-page.c:981 ../mail/em-format-html.c:1488
-#: ../mail/em-format-quote.c:200 ../mail/em-format.c:846
-#: ../mail/em-mailer-prefs.c:87 ../mail/message-list.etspec.h:18
+#: ../calendar/gui/dialogs/memo-page.c:1019 ../mail/em-format-html.c:1489
+#: ../mail/em-format-quote.c:200 ../mail/em-format.c:849
+#: ../mail/em-mailer-prefs.c:91 ../mail/message-list.etspec.h:18
 msgid "To"
 msgstr "I"
 
@@ -6438,60 +6351,20 @@ msgstr "I"
 msgid "Sta_rt date:"
 msgstr "Dyddiad c_ychwyn:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
-msgid "Su_mmary"
-msgstr "_Crynodeb"
-
 #: ../calendar/gui/dialogs/memo-page.glade.h:5
 msgid "T_o:"
 msgstr "_At:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:6
+msgid "_Description:"
+msgstr "_Disgrifiad:"
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:7
 #: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Grŵp"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
-msgid "_Memo Content:"
-msgstr "Cynnwys _Memos:"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
-msgid "<b>Calendar options</b>"
-msgstr "<b>Opsiynau calendr</b>"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:2
-msgid "Add New Calendar"
-msgstr "Ychwanegu Calendr Newydd"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:3
-msgid "Calendar Group"
-msgstr "Grŵp Calendr"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:4
-msgid "Calendar Location"
-msgstr "Lleoliad Calendr"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:5
-msgid "Calendar Name"
-msgstr "Enw Calendr"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
-msgid "<b>Task List Options</b>"
-msgstr "<b>Opsiynau Rhestr Dasgau</b>"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:2
-msgid "Add New Task List"
-msgstr "Ychwanegu Rhestr Dasgau Newydd"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:3
-msgid "Task List Group"
-msgstr "Grŵp Rhestr Dasgau"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:4
-msgid "Task List Name"
-msgstr "Enw Rhestr Dasgau"
-
 #: ../calendar/gui/dialogs/recur-comp.c:52
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr ""
@@ -6529,18 +6402,18 @@ msgstr "Hwn ac Enghreifftiau Dyfodol"
 msgid "All Instances"
 msgstr "Pob Enghraifft"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:494
+#: ../calendar/gui/dialogs/recurrence-page.c:498
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Mae'r apwyntiad yn cynnwys ail-ddigwyddiadau na all Evolution eu newid."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:815
+#: ../calendar/gui/dialogs/recurrence-page.c:819
 msgid "Recurrence date is invalid"
 msgstr "Dyddiad ail-ddigwydd yn annilys"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:928
+#: ../calendar/gui/dialogs/recurrence-page.c:932
 msgid "on"
 msgstr "ar"
 
@@ -6548,7 +6421,7 @@ msgstr "ar"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:992
+#: ../calendar/gui/dialogs/recurrence-page.c:996
 msgid "first"
 msgstr "cyntaf"
 
@@ -6557,7 +6430,7 @@ msgstr "cyntaf"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:998
+#: ../calendar/gui/dialogs/recurrence-page.c:1002
 msgid "second"
 msgstr "ail"
 
@@ -6565,7 +6438,7 @@ msgstr "ail"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:1007
 msgid "third"
 msgstr "trydydd"
 
@@ -6573,7 +6446,7 @@ msgstr "trydydd"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1008
+#: ../calendar/gui/dialogs/recurrence-page.c:1012
 msgid "fourth"
 msgstr "pedwerydd"
 
@@ -6581,13 +6454,13 @@ msgstr "pedwerydd"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1013
+#: ../calendar/gui/dialogs/recurrence-page.c:1017
 msgid "last"
 msgstr "olaf"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1043
 msgid "Other Date"
 msgstr "Dyddiad Arall"
 
@@ -6595,7 +6468,7 @@ msgstr "Dyddiad Arall"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/dialogs/recurrence-page.c:1051
 msgid "1st to 10th"
 msgstr "1af hyd 10fed"
 
@@ -6603,7 +6476,7 @@ msgstr "1af hyd 10fed"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1053
+#: ../calendar/gui/dialogs/recurrence-page.c:1057
 msgid "11th to 20th"
 msgstr "11eg hyd 20fed"
 
@@ -6611,26 +6484,45 @@ msgstr "11eg hyd 20fed"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1059
+#: ../calendar/gui/dialogs/recurrence-page.c:1063
 msgid "21st to 31st"
 msgstr "21ain hyd 31ain"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1079
+#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
+#. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
+#. the name of a week day (like 'Monday' or 'Friday') always follow.
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "day"
 msgstr "dydd"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1219
+#: ../calendar/gui/dialogs/recurrence-page.c:1226
 msgid "on the"
 msgstr "ar y"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1408
+#: ../calendar/gui/dialogs/recurrence-page.c:1419
 msgid "occurrences"
 msgstr "digwyddiadau"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2377
+#: ../calendar/gui/dialogs/recurrence-page.c:2157
+msgid "Add exception"
+msgstr "Ychwanegu eithriad"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2200
+msgid "Could not get a selection to modify."
+msgstr "Methu cael dewisiad i'w newid."
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2206
+msgid "Modify exception"
+msgstr "Newid eithriad"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2252
+msgid "Could not get a selection to delete."
+msgstr "Methu cael dewisiad i'w ddileu."
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2383
 msgid "Date/Time"
 msgstr "Dyddiad ac Amser"
 
@@ -6681,12 +6573,12 @@ msgstr "wythnos(au)"
 msgid "year(s)"
 msgstr "blwyddyn/blynyddoedd"
 
-#: ../calendar/gui/dialogs/task-details-page.c:411
-#: ../calendar/gui/dialogs/task-details-page.c:431
+#: ../calendar/gui/dialogs/task-details-page.c:410
+#: ../calendar/gui/dialogs/task-details-page.c:430
 msgid "Completed date is wrong"
 msgstr "Dyddiad Gorffen anghywir"
 
-#: ../calendar/gui/dialogs/task-details-page.c:518
+#: ../calendar/gui/dialogs/task-details-page.c:515
 msgid "Web Page"
 msgstr "Tudalen Gwe"
 
@@ -6701,48 +6593,48 @@ msgstr "<span weight=\"bold\">Statws</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:231
+#: ../calendar/gui/e-cal-component-preview.c:233
 #: ../calendar/gui/e-cal-model-tasks.c:347
-#: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/e-itip-control.c:891
+#: ../calendar/gui/e-cal-model-tasks.c:662
+#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/e-itip-control.c:923
 #: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
-#: ../calendar/gui/print.c:2382 ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/print.c:2348 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Cyflawnwyd"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-calendar-table.c:387 ../mail/message-list.c:1031
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1034
 msgid "High"
 msgstr "Uchel"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:228
+#: ../calendar/gui/e-cal-component-preview.c:230
 #: ../calendar/gui/e-cal-model-tasks.c:345
-#: ../calendar/gui/e-cal-model-tasks.c:653
-#: ../calendar/gui/e-cal-model-tasks.c:728
-#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2379
+#: ../calendar/gui/e-cal-model-tasks.c:660
+#: ../calendar/gui/e-cal-model-tasks.c:735
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2345
 msgid "In Progress"
 msgstr "Ar Waith"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-calendar-table.c:389 ../mail/message-list.c:1029
+#: ../calendar/gui/e-cal-component-preview.c:256
+#: ../calendar/gui/e-calendar-table.c:390 ../mail/message-list.c:1032
 msgid "Low"
 msgstr "Isel"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:924 ../calendar/gui/e-calendar-table.c:388
-#: ../mail/message-list.c:1030
+#: ../calendar/gui/e-cal-component-preview.c:254
+#: ../calendar/gui/e-cal-model.c:924 ../calendar/gui/e-calendar-table.c:389
+#: ../mail/message-list.c:1033
 msgid "Normal"
 msgstr "Arferol"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-cal-component-preview.c:240
 #: ../calendar/gui/e-cal-model-tasks.c:343
-#: ../calendar/gui/e-cal-model-tasks.c:651
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2376
+#: ../calendar/gui/e-cal-model-tasks.c:658
+#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2342
 msgid "Not Started"
 msgstr "Heb Gychwyn"
 
@@ -6755,7 +6647,7 @@ msgid "Stat_us:"
 msgstr "_Statws:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:391
 msgid "Undefined"
 msgstr "Anniffiniedig"
 
@@ -6772,20 +6664,20 @@ msgstr "_Blaenoriaeth:"
 msgid "_Web Page:"
 msgstr "_Tudalen Gwe:"
 
-#: ../calendar/gui/dialogs/task-editor.c:425
-#: ../calendar/gui/tasks-component.c:1171
+#: ../calendar/gui/dialogs/task-editor.c:424
+#: ../calendar/gui/tasks-component.c:1245
 msgid "_Task"
 msgstr "_Tasg"
 
-#: ../calendar/gui/dialogs/task-editor.c:429
+#: ../calendar/gui/dialogs/task-editor.c:428
 msgid "Task Details"
 msgstr "Manylion Tasg"
 
-#: ../calendar/gui/dialogs/task-page.c:821
+#: ../calendar/gui/dialogs/task-page.c:822
 msgid "Due date is wrong"
 msgstr "Dyddiad disgwyliedig yn anghywir"
 
-#: ../calendar/gui/dialogs/task-page.c:1649
+#: ../calendar/gui/dialogs/task-page.c:1648
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Methu agor tasgau o fewn '%s'."
@@ -6798,6 +6690,10 @@ msgstr "_Mynychwyr..."
 msgid "Categor_ies..."
 msgstr "_Categorïau..."
 
+#: ../calendar/gui/dialogs/task-page.glade.h:3
+msgid "De_scription:"
+msgstr "_Disgrifiad:"
+
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Or_ganiser:"
 msgstr "_Trefnydd:"
@@ -6810,49 +6706,6 @@ msgstr "Cylchfa amser:"
 msgid "_Due date:"
 msgstr "_Dyddiad disgwyl:"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "<b>Free/Busy C_alendars</b>"
-msgstr "<b>Calendrau Rhydd/Prysur</b>"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "<b>Publishing Frequency</b>"
-msgstr "<b>Amlder Cyhoeddi</b>"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "<b>Publishing _Location</b>"
-msgstr "<b>_Lleoliad Cyhoeddi</b>"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Publishing Settings"
-msgstr "Gosodiadau Cyhoeddi Statws Rhydd/Prysur"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "_Daily"
-msgstr "_Dyddiol"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "_Manual"
-msgstr "_Â llaw"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
-msgid "_Password:"
-msgstr "_Cyfrinair:"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
-msgid "_Remember password"
-msgstr "_Cofio'r cyfrinair"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
-msgid "_Username:"
-msgstr "_Enw Defnyddiwr:"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "_Weekly"
-msgstr "_Wythnosol"
-
 # #-#-#-#-#  cy2.po (evolution)  #-#-#-#-#
 # FIXME: lots of %d plural from here on down
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
@@ -6933,72 +6786,71 @@ msgstr "%s yn %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s am fath sbardun anhysbys"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2862
+#: ../calendar/gui/e-cal-component-memo-preview.c:74
+#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:2916
 #, c-format
 msgid "Click to open %s"
 msgstr "Cliciwch i agor %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:155
-#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
+#: ../calendar/gui/e-cal-component-memo-preview.c:157
+#: ../calendar/gui/e-cal-component-preview.c:157 ../filter/filter-rule.c:804
 msgid "Untitled"
 msgstr "Di-deitl"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:204
-#: ../calendar/gui/e-cal-component-preview.c:195
-#: ../calendar/gui/e-cal-component-preview.c:206
+#: ../calendar/gui/e-cal-component-memo-preview.c:208
+#: ../calendar/gui/e-cal-component-preview.c:197
+#: ../calendar/gui/e-cal-component-preview.c:208
 msgid "Start Date:"
 msgstr "Dyddiad Cychwyn:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:217
-#: ../calendar/gui/e-cal-component-preview.c:269
-#: ../calendar/gui/e-itip-control.c:1159
-#: ../calendar/gui/e-itip-control.glade.h:4
-#: ../composer/e-msg-composer-attachment.glade.h:2
-#: ../mail/mail-config.glade.h:68 ../widgets/misc/e-attachment.glade.h:2
+#: ../calendar/gui/e-cal-component-memo-preview.c:221
+#: ../calendar/gui/e-cal-component-preview.c:271
+#: ../calendar/gui/e-itip-control.c:1191
+#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:67
+#: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "Disgrifiad:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:250
-#: ../calendar/gui/e-cal-component-preview.c:301
+#: ../calendar/gui/e-cal-component-memo-preview.c:254
+#: ../calendar/gui/e-cal-component-preview.c:304
 msgid "Web Page:"
 msgstr "Tudalen Gwe:"
 
-#: ../calendar/gui/e-cal-component-preview.c:188
-#: ../calendar/gui/e-itip-control.c:1103
+#: ../calendar/gui/e-cal-component-preview.c:190
+#: ../calendar/gui/e-itip-control.c:1135
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "Crynodeb:"
 
-#: ../calendar/gui/e-cal-component-preview.c:217
+#: ../calendar/gui/e-cal-component-preview.c:219
 msgid "Due Date:"
 msgstr "Dyddiad Disgwyl:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:224
-#: ../calendar/gui/e-itip-control.c:1127
+#: ../calendar/gui/e-cal-component-preview.c:226
+#: ../calendar/gui/e-itip-control.c:1159
 #: ../plugins/exchange-operations/exchange-account-setup.c:269
-#: ../plugins/itip-formatter/itip-view.c:959
+#: ../plugins/itip-formatter/itip-view.c:968
 msgid "Status:"
 msgstr "Statws:"
 
-#: ../calendar/gui/e-cal-component-preview.c:248
+#: ../calendar/gui/e-cal-component-preview.c:250
 msgid "Priority:"
 msgstr "Blaenoriaeth:"
 
 #: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:365
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:366
 msgid "Public"
 msgstr "Cyhoeddus"
 
 #: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-calendar-table.c:367
 msgid "Private"
 msgstr "Preifat"
 
 #: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:367
+#: ../calendar/gui/e-calendar-table.c:368
 msgid "Confidential"
 msgstr "Cyfrinachol"
 
@@ -7019,17 +6871,17 @@ msgid "Summary"
 msgstr "Crynodeb"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-calendar-table.c:440
 msgid "Free"
 msgstr "Yn Rhydd"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:440
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-calendar-table.c:441
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Prysur"
 
-#: ../calendar/gui/e-cal-model-tasks.c:603
+#: ../calendar/gui/e-cal-model-tasks.c:610
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7039,7 +6891,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-cal-model-tasks.c:1012 ../calendar/gui/e-cal-model.c:930
 #: ../calendar/gui/e-meeting-list-view.c:193
 #: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
 #: ../calendar/gui/e-meeting-store.c:764
@@ -7047,7 +6899,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Ie"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-cal-model-tasks.c:1012 ../calendar/gui/e-cal-model.c:930
 #: ../calendar/gui/e-meeting-list-view.c:194
 #: ../calendar/gui/e-meeting-store.c:178
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
@@ -7057,15 +6909,15 @@ msgstr "Nage"
 #. This is the default filename used for temporary file creation
 #: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-popup.c:107
 #: ../calendar/gui/e-cal-popup.c:124 ../calendar/gui/e-cal-popup.c:171
-#: ../calendar/gui/e-itip-control.c:1144 ../calendar/gui/e-itip-control.c:1285
+#: ../calendar/gui/e-itip-control.c:1176 ../calendar/gui/e-itip-control.c:1317
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
 #: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1329
+#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1199
 #: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1760
-#: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:720
+#: ../plugins/itip-formatter/itip-formatter.c:1800
+#: ../plugins/plugin-manager/plugin-manager.c:77
+#: ../widgets/misc/e-attachment-bar.c:712
 #: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "Anhysbys"
@@ -7078,27 +6930,27 @@ msgstr "Ail-ddigwydd"
 msgid "Assigned"
 msgstr "Wedi Neilltuo"
 
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:412
+#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:417
 msgid "Save As..."
 msgstr "Cadw Fel..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2111
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2159
 msgid "Select folder to save selected attachments..."
 msgstr "Dewiswch blygell i gadw'r atodiadau sydd wedi'u dewis..."
 
-#: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:437
+#: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:442
 #, c-format
 msgid "untitled_image.%s"
 msgstr "delwedd_dideitl.%s"
 
-#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1282
-#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:903
-#: ../mail/em-folder-view.c:1122 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1283
+#: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:904
+#: ../mail/em-folder-view.c:1147 ../mail/em-popup.c:559 ../mail/em-popup.c:570
 msgid "_Save As..."
 msgstr "_Cadw Fel..."
 
-#: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:555
-#: ../mail/em-popup.c:566
+#: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:560
+#: ../mail/em-popup.c:571
 msgid "Set as _Background"
 msgstr "Gosodwch fel _Cefndir"
 
@@ -7106,84 +6958,84 @@ msgstr "Gosodwch fel _Cefndir"
 msgid "_Save Selected"
 msgstr "_Cadw'r Rhai wedi'u Dewis"
 
-#: ../calendar/gui/e-cal-popup.c:400 ../mail/em-popup.c:775
+#: ../calendar/gui/e-cal-popup.c:399 ../mail/em-popup.c:781
 #, c-format
 msgid "Open in %s..."
 msgstr "Agor yn %s..."
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:415
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:418
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:419
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:420
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:704
-#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:482
+#: ../calendar/gui/e-calendar-table.c:705
+#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:483
 msgid "Deleting selected objects"
 msgstr "Dileu gwrthrych dewisedig"
 
-#: ../calendar/gui/e-calendar-table.c:957
-#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:659
+#: ../calendar/gui/e-calendar-table.c:958
+#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:660
 msgid "Updating objects"
 msgstr "Diweddaru gwrthrychau"
 
-#: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1248 ../calendar/gui/e-memo-table.c:798
-#: ../composer/e-msg-composer.c:1348
+#: ../calendar/gui/e-calendar-table.c:1107
+#: ../calendar/gui/e-calendar-view.c:1229 ../calendar/gui/e-memo-table.c:799
+#: ../composer/e-msg-composer.c:1351
 msgid "Save as..."
 msgstr "Cadw fel..."
 
-#: ../calendar/gui/e-calendar-table.c:1277
-#: ../calendar/gui/e-calendar-view.c:1681
+#: ../calendar/gui/e-calendar-table.c:1278
+#: ../calendar/gui/e-calendar-view.c:1662
 msgid "New _Task"
 msgstr "_Tasg Newydd"
 
-#: ../calendar/gui/e-calendar-table.c:1281 ../calendar/gui/e-memo-table.c:902
+#: ../calendar/gui/e-calendar-table.c:1282 ../calendar/gui/e-memo-table.c:903
 msgid "Open _Web Page"
 msgstr "Agor Tudalen _Gwe"
 
-#: ../calendar/gui/e-calendar-table.c:1283
-#: ../calendar/gui/e-calendar-view.c:1684
-#: ../calendar/gui/e-calendar-view.c:1700 ../calendar/gui/e-memo-table.c:904
-#: ../mail/em-folder-view.c:1123
+#: ../calendar/gui/e-calendar-table.c:1284
+#: ../calendar/gui/e-calendar-view.c:1665
+#: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:905
+#: ../mail/em-folder-view.c:1148
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
@@ -7191,52 +7043,52 @@ msgstr "Agor Tudalen _Gwe"
 msgid "_Print..."
 msgstr "_Argraffu..."
 
-#: ../calendar/gui/e-calendar-table.c:1287
-#: ../calendar/gui/e-calendar-view.c:1704 ../calendar/gui/e-memo-table.c:908
+#: ../calendar/gui/e-calendar-table.c:1288
+#: ../calendar/gui/e-calendar-view.c:1685 ../calendar/gui/e-memo-table.c:909
 #: ../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:1289
-#: ../calendar/gui/e-calendar-view.c:1687
-#: ../calendar/gui/e-calendar-view.c:1706 ../calendar/gui/e-memo-table.c:910
+#: ../calendar/gui/e-calendar-table.c:1290
+#: ../calendar/gui/e-calendar-view.c:1668
+#: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:911
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Gludo"
 
-#: ../calendar/gui/e-calendar-table.c:1293 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1294 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Neilltuo Tasg"
 
-#: ../calendar/gui/e-calendar-table.c:1294 ../calendar/gui/e-memo-table.c:914
+#: ../calendar/gui/e-calendar-table.c:1295 ../calendar/gui/e-memo-table.c:915
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Gyrru ymlaen fel iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1295
+#: ../calendar/gui/e-calendar-table.c:1296
 msgid "_Mark as Complete"
 msgstr "_Marcio yn gyflawn"
 
-#: ../calendar/gui/e-calendar-table.c:1296
+#: ../calendar/gui/e-calendar-table.c:1297
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcio'r tasgau a ddewiswyd yn rai cyflawn"
 
-#: ../calendar/gui/e-calendar-table.c:1297
+#: ../calendar/gui/e-calendar-table.c:1298
 msgid "_Mark as Incomplete"
 msgstr "_Marcio heb eu gorffen"
 
-#: ../calendar/gui/e-calendar-table.c:1298
+#: ../calendar/gui/e-calendar-table.c:1299
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Marcio'r tasgau a ddewiswyd yn rai heb eu gorffen"
 
-#: ../calendar/gui/e-calendar-table.c:1303
+#: ../calendar/gui/e-calendar-table.c:1304
 msgid "_Delete Selected Tasks"
 msgstr "_Dileu'r tasgau a ddewiswyd"
 
-#: ../calendar/gui/e-calendar-table.c:1536
+#: ../calendar/gui/e-calendar-table.c:1537
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Cliciwch i ychwanegu tasg"
@@ -7246,7 +7098,7 @@ msgstr "Cliciwch i ychwanegu tasg"
 msgid "% Complete"
 msgstr "% Cyflawn"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:636
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:705
 msgid "Complete"
 msgstr "Cwblhau"
 
@@ -7267,105 +7119,112 @@ msgstr "Blaenoriaeth"
 msgid "Start date"
 msgstr "Dyddiad cychwyn"
 
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:534
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
+#: ../mail/message-list.etspec.h:16
+msgid "Status"
+msgstr "Statws"
+
 #: ../calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Trefnu Tasg"
 
-#: ../calendar/gui/e-calendar-view.c:1367
+#: ../calendar/gui/e-calendar-view.c:1348
 msgid "Moving items"
 msgstr "Symud eitemau"
 
-#: ../calendar/gui/e-calendar-view.c:1369
+#: ../calendar/gui/e-calendar-view.c:1350
 msgid "Copying items"
 msgstr "Copïo eitemau"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1659
 msgid "New _Appointment..."
 msgstr "_Apwyntiad Newydd..."
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1660
 msgid "New All Day _Event"
 msgstr "_Digwyddiad Newydd Drwy'r Dydd"
 
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1661
 msgid "New _Meeting"
 msgstr "_Cyfarfod Newydd"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1672
 msgid "_Current View"
 msgstr "Golwg _Cyfredol"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1674
 msgid "Select T_oday"
 msgstr "Dewis _Heddiw"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1675
 msgid "_Select Date..."
 msgstr "_Dewis Dyddiad..."
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1691
 msgid "Cop_y to Calendar..."
 msgstr "_Copïo i Galendr..."
 
-#: ../calendar/gui/e-calendar-view.c:1711
+#: ../calendar/gui/e-calendar-view.c:1692
 msgid "Mo_ve to Calendar..."
 msgstr "_Symud i Galendr..."
 
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1693
 msgid "_Delegate Meeting..."
 msgstr "_Dirprwyo Cyfarfod..."
 
-#: ../calendar/gui/e-calendar-view.c:1713
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "_Schedule Meeting..."
 msgstr "_Trefnu Cyfarfod..."
 
-#: ../calendar/gui/e-calendar-view.c:1714
+#: ../calendar/gui/e-calendar-view.c:1695
 msgid "_Forward as iCalendar..."
 msgstr "_Gyrru Ymlaen fel iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1715
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "_Reply"
 msgstr "_Ateb"
 
-#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1117
-#: ../mail/em-popup.c:559 ../mail/em-popup.c:570
+#: ../calendar/gui/e-calendar-view.c:1697 ../mail/em-folder-view.c:1141
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Ateb i _Bawb"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1702
 msgid "Make this Occurrence _Movable"
 msgstr "Galluogi _symud y digwyddiad hwn"
 
-#: ../calendar/gui/e-calendar-view.c:1722 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1703 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Dileu _digwyddiad hyn"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1704
 msgid "Delete _All Occurrences"
 msgstr "Dileu _Pob digwyddiadau"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2175
+#: ../calendar/gui/e-calendar-view.c:2156
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Trefnydd: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2179
+#: ../calendar/gui/e-calendar-view.c:2160
 #, c-format
 msgid "Organizer: %s"
 msgstr "Trefnydd: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2195 ../calendar/gui/print.c:2349
+#: ../calendar/gui/e-calendar-view.c:2176 ../calendar/gui/print.c:2316
 #, c-format
 msgid "Location: %s"
 msgstr "Lleoliad: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2226
+#: ../calendar/gui/e-calendar-view.c:2207
 #, c-format
 msgid "Time: %s %s"
 msgstr "Amser: %s %s"
@@ -7380,22 +7239,20 @@ msgstr "%a %d/%m/%Y %H:%M:%S"
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:124
+#: ../calendar/gui/e-cell-date-edit-text.c:127
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
-"\n"
 "%s"
 msgstr ""
 "Rhaid i'r dyddiad gael ei rhoi yn y ffurf: \n"
-"\n"
 "%s"
 
 #. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:808
+#: ../calendar/gui/e-day-view-time-item.c:807
 #, c-format
 msgid "%02i minute divisions"
 msgstr "Rhaniadau amser %02i munud"
@@ -7407,21 +7264,21 @@ msgstr "Rhaniadau amser %02i munud"
 #. order but don't change the specifiers or add
 #. anything.
 #: ../calendar/gui/e-day-view-top-item.c:1311
-#: ../calendar/gui/e-day-view.c:2087
+#: ../calendar/gui/e-day-view.c:2089
 #: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1538
+#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1503
 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:746 ../calendar/gui/e-day-view.c:1087
-#: ../calendar/gui/e-week-view.c:503 ../calendar/gui/print.c:858
+#: ../calendar/gui/e-day-view.c:746 ../calendar/gui/e-day-view.c:1089
+#: ../calendar/gui/e-week-view.c:503 ../calendar/gui/print.c:811
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:749 ../calendar/gui/e-day-view.c:1090
-#: ../calendar/gui/e-week-view.c:506 ../calendar/gui/print.c:860
+#: ../calendar/gui/e-day-view.c:749 ../calendar/gui/e-day-view.c:1092
+#: ../calendar/gui/e-week-view.c:506 ../calendar/gui/print.c:813
 msgid "pm"
 msgstr "pm"
 
@@ -7429,7 +7286,12 @@ msgstr "pm"
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ie. (Ail-ddigwyddiad cymhleth)"
 
-#: ../calendar/gui/e-itip-control.c:770
+#. For Translators: In this can also be translated as "With the period of %d
+#. day/days", where %d is a number. The entire sentence is of the form "Recurring:
+#. Every %d day/days"
+#. For Translators : 'Every day' is event Recurring every day
+#. For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit
+#: ../calendar/gui/e-itip-control.c:775
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
@@ -7437,7 +7299,12 @@ msgstr[0] "Bob dydd"
 msgstr[1] "Bob %d ddydd"
 msgstr[2] "Bob %d dydd"
 
-#: ../calendar/gui/e-itip-control.c:775
+#. For Translators: In this can also be translated as "With the period of %d
+#. week/weeks", where %d is a number. The entire sentence is of the form "Recurring:
+#. Every %d week/weeks"
+#. For Translators : 'Every week' is event Recurring every week
+#. For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit
+#: ../calendar/gui/e-itip-control.c:785
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
@@ -7445,7 +7312,9 @@ msgstr[0] "Bob wythnos"
 msgstr[1] "Bob %d wythnos"
 msgstr[2] "Bob %d wythnos"
 
-#: ../calendar/gui/e-itip-control.c:777
+#. For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname)
+#. For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit
+#: ../calendar/gui/e-itip-control.c:789
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7453,21 +7322,31 @@ msgstr[0] "Bob wythnos ar "
 msgstr[1] "Bob %d wythnos ar "
 msgstr[2] "Bob %d wythnos ar "
 
-#: ../calendar/gui/e-itip-control.c:785
+#. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
+#: ../calendar/gui/e-itip-control.c:798
 msgid " and "
 msgstr " ac "
 
-#: ../calendar/gui/e-itip-control.c:792
+#. For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.'
+#: ../calendar/gui/e-itip-control.c:806
 #, c-format
 msgid "The %s day of "
 msgstr "Y %s dydd o "
 
-#: ../calendar/gui/e-itip-control.c:805
+#. For Translators : 'The %s %s of' is part of the sentence 'event recurring on the (nth) (dayname) of every month.'
+#. eg,third monday of every month
+#: ../calendar/gui/e-itip-control.c:821
 #, c-format
 msgid "The %s %s of "
 msgstr "Y %s %s o "
 
-#: ../calendar/gui/e-itip-control.c:812
+#. For Translators: In this can also be translated as "With the period of %d
+#. month/months", where %d is a number. The entire sentence is of the form "Recurring:
+#. Every %d month/months"
+#. For Translators : 'every month' is part of the sentence 'event recurring on the (nth) day of every month.'
+#. For Translators : 'every %d months' is part of the sentence 'event recurring on the (nth) day of every %d months.'
+#. %d is a digit
+#: ../calendar/gui/e-itip-control.c:834
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
@@ -7475,7 +7354,12 @@ msgstr[0] "bob mis"
 msgstr[1] "bob %d fis"
 msgstr[2] "bob %d mis"
 
-#: ../calendar/gui/e-itip-control.c:816
+#. For Translators: In this can also be translated as "With the period of %d
+#. year/years", where %d is a number. The entire sentence is of the form "Recurring:
+#. Every %d year/years"
+#. For Translators : 'Every year' is event Recurring every year
+#. For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit
+#: ../calendar/gui/e-itip-control.c:843
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
@@ -7483,7 +7367,9 @@ msgstr[0] "Bob blwyddyn"
 msgstr[1] "Bob %d flynedd"
 msgstr[2] "Bob %d blynedd"
 
-#: ../calendar/gui/e-itip-control.c:827
+#. For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit
+#. For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit
+#: ../calendar/gui/e-itip-control.c:856
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -7491,45 +7377,48 @@ msgstr[0] "cyfanswm o %d gwaith"
 msgstr[1] "cyfanswm o %d waith"
 msgstr[2] "cyfanswm o %d gwaith"
 
-#: ../calendar/gui/e-itip-control.c:836
+#. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
+#: ../calendar/gui/e-itip-control.c:866
 msgid ", ending on "
 msgstr ", yn gorffen ar "
 
-#: ../calendar/gui/e-itip-control.c:857
+#. For Translators : 'starts' is starts:date implying a task starts on what date
+#: ../calendar/gui/e-itip-control.c:888
 msgid "Starts"
 msgstr "Cychwyn"
 
-#: ../calendar/gui/e-itip-control.c:870
+#. For Translators : 'ends' is ends:date implying a task ends on what date
+#: ../calendar/gui/e-itip-control.c:902
 msgid "Ends"
 msgstr "Gorffen"
 
-#: ../calendar/gui/e-itip-control.c:904
+#: ../calendar/gui/e-itip-control.c:936
 #: ../plugins/save-calendar/csv-format.c:395
 msgid "Due"
 msgstr "Yn Disgwyl"
 
-#: ../calendar/gui/e-itip-control.c:944 ../calendar/gui/e-itip-control.c:1001
+#: ../calendar/gui/e-itip-control.c:976 ../calendar/gui/e-itip-control.c:1033
 msgid "iCalendar Information"
 msgstr "Gwybodaeth iCalendar"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:961
+#: ../calendar/gui/e-itip-control.c:993
 msgid "iCalendar Error"
 msgstr "Gwall iCalendar"
 
-#: ../calendar/gui/e-itip-control.c:1033 ../calendar/gui/e-itip-control.c:1049
-#: ../calendar/gui/e-itip-control.c:1060 ../calendar/gui/e-itip-control.c:1077
-#: ../plugins/itip-formatter/itip-view.c:340
+#: ../calendar/gui/e-itip-control.c:1065 ../calendar/gui/e-itip-control.c:1081
+#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1109
 #: ../plugins/itip-formatter/itip-view.c:341
-#: ../plugins/itip-formatter/itip-view.c:408
+#: ../plugins/itip-formatter/itip-view.c:342
 #: ../plugins/itip-formatter/itip-view.c:409
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:410
 #: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:478
 msgid "An unknown person"
 msgstr "Person anhysbys"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1084
+#: ../calendar/gui/e-itip-control.c:1116
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -7537,290 +7426,289 @@ msgstr ""
 "<br> Rhowch olwg ar y wybodaeth sy'n dilyn, ac yna dewis gweithred o'r "
 "ddewislen isod."
 
-#: ../calendar/gui/e-itip-control.c:1132
+#: ../calendar/gui/e-itip-control.c:1164
 #: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/itip-utils.c:669
-#: ../plugins/itip-formatter/itip-formatter.c:1748
+#: ../calendar/gui/itip-utils.c:687
+#: ../plugins/itip-formatter/itip-formatter.c:1788
 msgid "Accepted"
 msgstr "Derbyniwyd"
 
-#: ../calendar/gui/e-itip-control.c:1136 ../calendar/gui/itip-utils.c:672
-#: ../plugins/itip-formatter/itip-formatter.c:1751
+#: ../calendar/gui/e-itip-control.c:1168 ../calendar/gui/itip-utils.c:690
+#: ../plugins/itip-formatter/itip-formatter.c:1791
 msgid "Tentatively Accepted"
 msgstr "Wedi derbyn yn betrus"
 
-#: ../calendar/gui/e-itip-control.c:1140
+#: ../calendar/gui/e-itip-control.c:1172
 #: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
-#: ../plugins/itip-formatter/itip-formatter.c:1754
+#: ../calendar/gui/itip-utils.c:693 ../calendar/gui/itip-utils.c:722
+#: ../plugins/itip-formatter/itip-formatter.c:1794
 msgid "Declined"
 msgstr "Gwrthododd"
 
-#: ../calendar/gui/e-itip-control.c:1224
+#: ../calendar/gui/e-itip-control.c:1256
 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:1226
+#: ../calendar/gui/e-itip-control.c:1258
 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:1305
+#: ../calendar/gui/e-itip-control.c:1337
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "Mae <b>%s</b> wedi cyhoeddi gwybodaeth cyfarfod:"
 
-#: ../calendar/gui/e-itip-control.c:1306
+#: ../calendar/gui/e-itip-control.c:1338
 msgid "Meeting Information"
 msgstr "Gwybodaeth Cyfarfod"
 
-#: ../calendar/gui/e-itip-control.c:1312
+#: ../calendar/gui/e-itip-control.c:1344
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "Mae <b>%s</b> am i %s fod yn bresennol mewn cyfarfod."
 
-#: ../calendar/gui/e-itip-control.c:1314
+#: ../calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "Mae <b>%s</b> am i chi fod yn bresennol mewn cyfarfod."
 
-#: ../calendar/gui/e-itip-control.c:1315
+#: ../calendar/gui/e-itip-control.c:1347
 msgid "Meeting Proposal"
 msgstr "Awgrymiad Cyfarfod"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1321
+#: ../calendar/gui/e-itip-control.c:1353
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting."
-msgstr "Mae <b>%s</b> am ychwanegu at gyfarfod sy'n bodoli'n barod."
+msgid "<b>%s</b> wishes to be added to an existing meeting."
+msgstr "Mae <b>%s</b> am gael ei ychwanegu at gyfarfod sy'n bodoli'n barod."
 
-#: ../calendar/gui/e-itip-control.c:1322
+#: ../calendar/gui/e-itip-control.c:1354
 msgid "Meeting Update"
 msgstr "Diweddariad Cyfarfod"
 
-#: ../calendar/gui/e-itip-control.c:1326
+#: ../calendar/gui/e-itip-control.c:1358
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "Mae <b>%s</b> am dderbyn y wybodaeth ddiweddaraf am gyfarfod."
 
-#: ../calendar/gui/e-itip-control.c:1327
+#: ../calendar/gui/e-itip-control.c:1359
 msgid "Meeting Update Request"
 msgstr "Cais Diweddariad Cyfarfod"
 
-#: ../calendar/gui/e-itip-control.c:1334
+#: ../calendar/gui/e-itip-control.c:1366
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "Mae <b>%s</b> wedi ymateb i gais cyfarfod."
 
-#: ../calendar/gui/e-itip-control.c:1335
+#: ../calendar/gui/e-itip-control.c:1367
 msgid "Meeting Reply"
 msgstr "Ymateb Cyfarfod"
 
-#: ../calendar/gui/e-itip-control.c:1342
+#: ../calendar/gui/e-itip-control.c:1374
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "Mae <b>%s</b> wedi canslo cyfarfod."
 
-#: ../calendar/gui/e-itip-control.c:1343
+#: ../calendar/gui/e-itip-control.c:1375
 msgid "Meeting Cancelation"
 msgstr "Canslo Cyfarfod"
 
-#: ../calendar/gui/e-itip-control.c:1353 ../calendar/gui/e-itip-control.c:1430
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1385 ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1502
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> wedi anfon neges amhosib ei deall."
 
-#: ../calendar/gui/e-itip-control.c:1354
+#: ../calendar/gui/e-itip-control.c:1386
 msgid "Bad Meeting Message"
 msgstr "Neges Gyfarfod Wael"
 
-#: ../calendar/gui/e-itip-control.c:1381
+#: ../calendar/gui/e-itip-control.c:1413
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "Mae <b>%s</b> wedi cyhoeddi gwybodaeth dasg."
 
-#: ../calendar/gui/e-itip-control.c:1382
+#: ../calendar/gui/e-itip-control.c:1414
 msgid "Task Information"
 msgstr "Gwybodaeth Dasg"
 
-#: ../calendar/gui/e-itip-control.c:1389
+#: ../calendar/gui/e-itip-control.c:1421
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "Mae <b>%s</b> am i %s gyflawni tasg."
 
-#: ../calendar/gui/e-itip-control.c:1391
+#: ../calendar/gui/e-itip-control.c:1423
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "Mae <b>%s</b> am i chi gyflawni tasg."
 
-#: ../calendar/gui/e-itip-control.c:1392
+#: ../calendar/gui/e-itip-control.c:1424
 msgid "Task Proposal"
 msgstr "Awgrymiad Tasg"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1398
+#: ../calendar/gui/e-itip-control.c:1430
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing task."
-msgstr "Mae <b>%s</b> am ychwanegu at dasg sy'n bodoli'n barod."
+msgid "<b>%s</b> wishes to be added to an existing task."
+msgstr "Mae <b>%s</b> am gael ei ychwanegu at dasg sy'n bodoli'n barod."
 
-#: ../calendar/gui/e-itip-control.c:1399
+#: ../calendar/gui/e-itip-control.c:1431
 msgid "Task Update"
 msgstr "Diweddariad Tasg"
 
-#: ../calendar/gui/e-itip-control.c:1403
+#: ../calendar/gui/e-itip-control.c:1435
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "Mae <b>%s</b> am dderbyn y wybodaeth ddiweddaraf am dasg."
 
-#: ../calendar/gui/e-itip-control.c:1404
+#: ../calendar/gui/e-itip-control.c:1436
 msgid "Task Update Request"
 msgstr "Cais Diweddariad Tasg"
 
-#: ../calendar/gui/e-itip-control.c:1411
+#: ../calendar/gui/e-itip-control.c:1443
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "Mae <b>%s</b> wedi ymateb i neilltuad tasg."
 
-#: ../calendar/gui/e-itip-control.c:1412
+#: ../calendar/gui/e-itip-control.c:1444
 msgid "Task Reply"
 msgstr "Ymateb Tasg"
 
-#: ../calendar/gui/e-itip-control.c:1419
+#: ../calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "Mae <b>%s</b> wedi canslo tasg."
 
-#: ../calendar/gui/e-itip-control.c:1420
+#: ../calendar/gui/e-itip-control.c:1452
 msgid "Task Cancelation"
 msgstr "Canslad Tasg"
 
-#: ../calendar/gui/e-itip-control.c:1431
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Bad Task Message"
 msgstr "Neges Dasg Wael"
 
-#: ../calendar/gui/e-itip-control.c:1455
+#: ../calendar/gui/e-itip-control.c:1487
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "Mae <b>%s</b> wedi cyhoeddi gwybodaeth statws rhydd/prysur."
 
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1488
 msgid "Free/Busy Information"
 msgstr "Gwybodaeth Statws Rhydd/Prysur"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1492
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "Mae <b>%s</b> yn ceisio'ch gwybodaeth statws rhydd/prysur."
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1493
 msgid "Free/Busy Request"
 msgstr "Cais am Statws Rhydd/Prysur"
 
-#: ../calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1497
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "Mae <b>%s</b> wedi ymateb i gais am statws rhydd/prysur."
 
-#: ../calendar/gui/e-itip-control.c:1466
+#: ../calendar/gui/e-itip-control.c:1498
 msgid "Free/Busy Reply"
 msgstr "Ymateb Statws Rhydd/Prysur"
 
-#: ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1503
 msgid "Bad Free/Busy Message"
 msgstr "Neges Statws Rhydd/Prysur Wael"
 
-#: ../calendar/gui/e-itip-control.c:1546
+#: ../calendar/gui/e-itip-control.c:1578
 msgid "The message does not appear to be properly formed"
 msgstr "Mae'n ymddangos nad yw'r neges wedi ei ffurfio'n gywir"
 
-#: ../calendar/gui/e-itip-control.c:1605
+#: ../calendar/gui/e-itip-control.c:1637
 msgid "The message contains only unsupported requests."
 msgstr "Mae'r neges ond yn cynnwys ceisiadau na gynhelir."
 
-#: ../calendar/gui/e-itip-control.c:1638
+#: ../calendar/gui/e-itip-control.c:1670
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Nid yw'r atodiad yn cynnwys neges galendr ddilys"
 
-#: ../calendar/gui/e-itip-control.c:1670
+#: ../calendar/gui/e-itip-control.c:1702
 msgid "The attachment has no viewable calendar items"
 msgstr "Nid yw'r atodiad yn cynnwys unrhyw eitemau calendr gweladwy"
 
-#: ../calendar/gui/e-itip-control.c:1904
+#: ../calendar/gui/e-itip-control.c:1944
 msgid "Update complete\n"
 msgstr "Diweddariad yn gyflawn\n"
 
-#: ../calendar/gui/e-itip-control.c:1932
+#: ../calendar/gui/e-itip-control.c:1977
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Gwrthrych yn annilys a methir ei ddiweddaru\n"
 
-#: ../calendar/gui/e-itip-control.c:1942
+#: ../calendar/gui/e-itip-control.c:1994
 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?"
 
-#: ../calendar/gui/e-itip-control.c:1954
+#: ../calendar/gui/e-itip-control.c:2012
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Methwyd diweddaru cyflwr mynychwr oherwydd cyflwr annilys!\n"
 
-#: ../calendar/gui/e-itip-control.c:1971
+#: ../calendar/gui/e-itip-control.c:2036
 msgid "Attendee status updated\n"
 msgstr "Cyflwr mynychwr wedi diweddaru\n"
 
-#: ../calendar/gui/e-itip-control.c:1974
-#: ../plugins/itip-formatter/itip-formatter.c:1100
+#: ../calendar/gui/e-itip-control.c:2043
+#: ../plugins/itip-formatter/itip-formatter.c:1108
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Methu"
 
-#: ../calendar/gui/e-itip-control.c:1998 ../calendar/gui/e-itip-control.c:2046
+#: ../calendar/gui/e-itip-control.c:2074 ../calendar/gui/e-itip-control.c:2131
 msgid "Item sent!\n"
 msgstr "Eitem wedi ei ddanfon!\n"
 
-#: ../calendar/gui/e-itip-control.c:2000 ../calendar/gui/e-itip-control.c:2050
+#: ../calendar/gui/e-itip-control.c:2080 ../calendar/gui/e-itip-control.c:2139
 msgid "The item could not be sent!\n"
 msgstr "Methwyd anfon yr eitem!\n"
 
-#: ../calendar/gui/e-itip-control.c:2130
+#: ../calendar/gui/e-itip-control.c:2220
 msgid "Choose an action:"
 msgstr "Dewis gweithred"
 
-#: ../calendar/gui/e-itip-control.c:2202
+#: ../calendar/gui/e-itip-control.c:2292
 msgid "Update"
 msgstr "Diweddaru"
 
-#: ../calendar/gui/e-itip-control.c:2230
+#: ../calendar/gui/e-itip-control.c:2320
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "Derbyn"
 
-#: ../calendar/gui/e-itip-control.c:2231
+#: ../calendar/gui/e-itip-control.c:2321
 msgid "Tentatively accept"
 msgstr "Derbyn yn betrus"
 
-#: ../calendar/gui/e-itip-control.c:2232
+#: ../calendar/gui/e-itip-control.c:2322
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "Gwrthod"
 
-#: ../calendar/gui/e-itip-control.c:2261
+#: ../calendar/gui/e-itip-control.c:2351
 msgid "Send Free/Busy Information"
 msgstr "Anfon Gwybodaeth Statws Rhydd/Prysur"
 
-#: ../calendar/gui/e-itip-control.c:2289
+#: ../calendar/gui/e-itip-control.c:2379
 msgid "Update respondent status"
 msgstr "Diweddaru cyflwr ymatebwr"
 
-#: ../calendar/gui/e-itip-control.c:2317
+#: ../calendar/gui/e-itip-control.c:2407
 msgid "Send Latest Information"
 msgstr "Anfon Gwybodaeth Ddiweddar"
 
-#: ../calendar/gui/e-itip-control.c:2345 ../calendar/gui/itip-utils.c:692
-#: ../mail/mail-send-recv.c:432 ../mail/mail-send-recv.c:485
+#: ../calendar/gui/e-itip-control.c:2435 ../calendar/gui/itip-utils.c:710
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Diddymu"
@@ -7854,7 +7742,6 @@ msgid "Chair Persons"
 msgstr "Cadeiryddion"
 
 #: ../calendar/gui/e-meeting-list-view.c:71
-#: ../calendar/gui/e-meeting-list-view.c:154
 msgid "Required Participants"
 msgstr "Cyfranogwyr Angenrheidiol"
 
@@ -7866,6 +7753,10 @@ msgstr "Cyfranogwyr Dewisol"
 msgid "Resources"
 msgstr "Adnoddau"
 
+#: ../calendar/gui/e-meeting-list-view.c:154
+msgid "Attendees"
+msgstr "Mynychwyr"
+
 #: ../calendar/gui/e-meeting-list-view.c:165
 #: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
 #: ../calendar/gui/e-meeting-store.c:758
@@ -7918,22 +7809,28 @@ msgstr "Angen Gweithred"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
 #: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "I'w gadarnhau"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
 #: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
-#: ../calendar/gui/itip-utils.c:678
-#: ../plugins/itip-formatter/itip-formatter.c:1757
+#: ../calendar/gui/itip-utils.c:696
+#: ../plugins/itip-formatter/itip-formatter.c:1797
 msgid "Delegated"
 msgstr "Dirprwywyd"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:470
+#: ../calendar/gui/e-meeting-list-view.c:484
 msgid "Attendee                          "
 msgstr "Mynychwr                          "
 
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-meeting-list-view.c:523
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
 msgid "In Process"
 msgstr "Mewn Proses"
@@ -7941,7 +7838,7 @@ msgstr "Mewn Proses"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:464
-#: ../calendar/gui/e-meeting-time-sel.c:2113
+#: ../calendar/gui/e-meeting-time-sel.c:2116
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B, %d, %Y"
 
@@ -7950,7 +7847,7 @@ msgstr "%A, %B, %d, %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:468
-#: ../calendar/gui/e-meeting-time-sel.c:2146
+#: ../calendar/gui/e-meeting-time-sel.c:2149
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -7960,11 +7857,11 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412
 msgid "Out of Office"
 msgstr "Allan o'r Swyddfa"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "Dim Gwybodaeth"
 
@@ -7972,63 +7869,91 @@ msgstr "Dim Gwybodaeth"
 msgid "A_ttendees..."
 msgstr "_Mynychwyr..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:449
 msgid "O_ptions"
 msgstr "_Opsiynau"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:466
 msgid "Show _only working hours"
 msgstr "Dangos oriau gweithio yn _unig"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:476
 msgid "Show _zoomed out"
 msgstr "Dangos wedi _crebachu"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:491
 msgid "_Update free/busy"
 msgstr "_Diweddaru rhydd/prysur"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:506
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:524
 msgid "_Autopick"
 msgstr "_Awtoddewis"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:539
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:556
 msgid "_All people and resources"
 msgstr "_Pob person ac adnodd"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:565
 msgid "All _people and one resource"
 msgstr "Pob _person ac un adnodd"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:574
 msgid "_Required people"
 msgstr "Pobl _angenrheidiol"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:583
 msgid "Required people and _one resource"
 msgstr "Pob person sydd _angen ac un atodiad"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:619
 msgid "_Start time:"
 msgstr "Amser _dechrau:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:646
 msgid "_End time:"
 msgstr "_Amser diwedd:"
 
-#: ../calendar/gui/e-memo-table.c:919
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr "Mynychwr"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr "Cliciwch yma i ychwanegu mynychwr"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "Enw Cyffredin"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr "Dirprwywyd Oddi Wrth"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr "Dirprwywyd i"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "Iaith"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "Aelodau"
+
+#: ../calendar/gui/e-memo-table.c:920
 msgid "_Delete Selected Memos"
 msgstr "_Dileu'r Memos a Ddewiswyd"
 
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1071 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Cliciwch i ychwanegu memo"
 
@@ -8036,8 +7961,8 @@ msgstr "Cliciwch i ychwanegu memo"
 msgid "Memo sort"
 msgstr "Trefnu memos"
 
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:837
-#: ../calendar/gui/gnome-cal.c:2743
+#: ../calendar/gui/e-memos.c:733 ../calendar/gui/e-tasks.c:844
+#: ../calendar/gui/gnome-cal.c:2778
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8046,38 +7971,33 @@ msgstr ""
 "Gwall ar %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:772
+#: ../calendar/gui/e-memos.c:782
 msgid "Loading memos"
 msgstr "Llwytho memos"
 
-#: ../calendar/gui/e-memos.c:853
+#: ../calendar/gui/e-memos.c:863
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Agor memos am %s"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1240
+#: ../calendar/gui/e-memos.c:1036 ../calendar/gui/e-tasks.c:1249
 msgid "Deleting selected objects..."
 msgstr "Dileu gwrthrychau dewisedig..."
 
-#: ../calendar/gui/e-pub-utils.c:322
-#, c-format
-msgid "Enter the password for %s"
-msgstr "Rhowch y cyfrinair ar gyfer %s"
-
-#: ../calendar/gui/e-tasks.c:885
+#: ../calendar/gui/e-tasks.c:894
 msgid "Loading tasks"
 msgstr "Llwytho tasgau"
 
-#: ../calendar/gui/e-tasks.c:972
+#: ../calendar/gui/e-tasks.c:981
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Agor tasgau am %s"
 
-#: ../calendar/gui/e-tasks.c:1217
+#: ../calendar/gui/e-tasks.c:1226
 msgid "Completing tasks..."
 msgstr "Cwblhau'r tasgau..."
 
-#: ../calendar/gui/e-tasks.c:1267
+#: ../calendar/gui/e-tasks.c:1276
 msgid "Expunging"
 msgstr "Yn dileu"
 
@@ -8089,7 +8009,7 @@ msgstr "Dewiswch Gylchfa Amser"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../calendar/gui/e-week-view-main-item.c:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1522
+#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1484
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -8097,39 +8017,39 @@ msgstr "%d %B"
 msgid "Updating query"
 msgstr "Diweddaru ymholiad"
 
-#: ../calendar/gui/gnome-cal.c:2404
+#: ../calendar/gui/gnome-cal.c:2429
 msgid "_Custom View"
 msgstr "Golwg _Addasedig"
 
-#: ../calendar/gui/gnome-cal.c:2405
+#: ../calendar/gui/gnome-cal.c:2430
 msgid "_Save Custom View"
 msgstr "_Cadw Golwg Addasedig"
 
-#: ../calendar/gui/gnome-cal.c:2410
+#: ../calendar/gui/gnome-cal.c:2435
 msgid "_Define Views..."
 msgstr "_Diffinio Golygon..."
 
-#: ../calendar/gui/gnome-cal.c:2574
+#: ../calendar/gui/gnome-cal.c:2601
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Yn llwytho tasgau am %s"
 
-#: ../calendar/gui/gnome-cal.c:2593
+#: ../calendar/gui/gnome-cal.c:2620
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Yn llwytho tasgau at %s"
 
-#: ../calendar/gui/gnome-cal.c:2602
+#: ../calendar/gui/gnome-cal.c:2629
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Llwytho memos yn %s"
 
-#: ../calendar/gui/gnome-cal.c:2708
+#: ../calendar/gui/gnome-cal.c:2737
 #, c-format
 msgid "Opening %s"
 msgstr "Yn agor %s"
 
-#: ../calendar/gui/gnome-cal.c:3636
+#: ../calendar/gui/gnome-cal.c:3673
 msgid "Purging"
 msgstr "Puro"
 
@@ -8198,48 +8118,48 @@ msgstr "Rhaid gosod trefnydd."
 msgid "At least one attendee is necessary"
 msgstr "Rhaid bod un neu fwy o fynychwyr"
 
-#: ../calendar/gui/itip-utils.c:631 ../calendar/gui/itip-utils.c:754
+#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:772
 msgid "Event information"
 msgstr "Gwybodaeth digwyddiad"
 
-#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:756
+#: ../calendar/gui/itip-utils.c:651 ../calendar/gui/itip-utils.c:774
 msgid "Task information"
 msgstr "Gwybodaeth Tasg"
 
-#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:758
+#: ../calendar/gui/itip-utils.c:653 ../calendar/gui/itip-utils.c:776
 msgid "Journal information"
 msgstr "Gwybodaeth dyddlyfr"
 
-#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:776
+#: ../calendar/gui/itip-utils.c:655 ../calendar/gui/itip-utils.c:794
 msgid "Free/Busy information"
 msgstr "Gwybodaeth statws Rhydd/Prysur"
 
-#: ../calendar/gui/itip-utils.c:639
+#: ../calendar/gui/itip-utils.c:657
 msgid "Calendar information"
 msgstr "Gwybodaeth Calendr"
 
-#: ../calendar/gui/itip-utils.c:688
+#: ../calendar/gui/itip-utils.c:706
 msgid "Updated"
 msgstr "Diweddarwyd"
 
-#: ../calendar/gui/itip-utils.c:696
+#: ../calendar/gui/itip-utils.c:714
 msgid "Refresh"
 msgstr "Adnewyddu"
 
-#: ../calendar/gui/itip-utils.c:700
+#: ../calendar/gui/itip-utils.c:718
 msgid "Counter-proposal"
 msgstr "Gwrthgynnig"
 
-#: ../calendar/gui/itip-utils.c:772
+#: ../calendar/gui/itip-utils.c:790
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Gwybodaeth statws Rhydd/Prysur (%s i %s)"
 
-#: ../calendar/gui/itip-utils.c:782
+#: ../calendar/gui/itip-utils.c:800
 msgid "iCalendar information"
 msgstr "Gwybodaeth iCalendr"
 
-#: ../calendar/gui/itip-utils.c:937
+#: ../calendar/gui/itip-utils.c:955
 msgid "You must be an attendee of the event."
 msgstr "Rhaid i chi fod yn mynychu'r digwyddiad."
 
@@ -8255,8 +8175,7 @@ msgstr[0] "%d memo"
 msgstr[1] "%d memo"
 msgstr[2] "%d memo"
 
-#: ../calendar/gui/memos-component.c:529 ../calendar/gui/tasks-component.c:519
-#: ../mail/mail-component.c:560
+#: ../calendar/gui/memos-component.c:529 ../calendar/gui/tasks-component.c:520
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -8268,61 +8187,61 @@ msgstr[2] ", %d wedi dewis"
 msgid "Failed upgrading memos."
 msgstr "Methwyd uwchraddio memos."
 
-#: ../calendar/gui/memos-component.c:872
+#: ../calendar/gui/memos-component.c:874
 #, 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"
 
-#: ../calendar/gui/memos-component.c:885
+#: ../calendar/gui/memos-component.c:887
 msgid "There is no calendar available for creating memos"
 msgstr "Does dim calendr ar gael er mwyn creu tasgau"
 
-#: ../calendar/gui/memos-component.c:981
+#: ../calendar/gui/memos-component.c:983
 msgid "Memo Source Selector"
 msgstr "Dewisydd Ffynhonnell Memo"
 
-#: ../calendar/gui/memos-component.c:1164
+#: ../calendar/gui/memos-component.c:1166
 msgid "New memo"
 msgstr "Memo Newydd"
 
-#: ../calendar/gui/memos-component.c:1165
+#: ../calendar/gui/memos-component.c:1167
 msgid "Mem_o"
 msgstr "Mem_o"
 
-#: ../calendar/gui/memos-component.c:1166
+#: ../calendar/gui/memos-component.c:1168
 msgid "Create a new memo"
 msgstr "Creu memo newydd"
 
-#: ../calendar/gui/memos-component.c:1172
+#: ../calendar/gui/memos-component.c:1174
 msgid "New shared memo"
 msgstr "Memo newydd wedi'i rannu"
 
-#: ../calendar/gui/memos-component.c:1173
+#: ../calendar/gui/memos-component.c:1175
 msgid "_Shared memo"
 msgstr "_Memo wedi rhannu"
 
-#: ../calendar/gui/memos-component.c:1174
+#: ../calendar/gui/memos-component.c:1176
 msgid "Create a shared new memo"
 msgstr "Creu memo newydd wedi'i rannu"
 
-#: ../calendar/gui/memos-component.c:1180
+#: ../calendar/gui/memos-component.c:1182
 msgid "New memo list"
 msgstr "Rhestr femo newydd"
 
-#: ../calendar/gui/memos-component.c:1181
+#: ../calendar/gui/memos-component.c:1183
 msgid "Memo li_st"
 msgstr "_Rhestr femos"
 
-#: ../calendar/gui/memos-component.c:1182
+#: ../calendar/gui/memos-component.c:1184
 msgid "Create a new memo list"
 msgstr "Creu rhestr femos newydd"
 
-#: ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/memos-control.c:336 ../calendar/gui/memos-control.c:352
 msgid "Print Memos"
 msgstr "Argraffu Memos"
 
-#: ../calendar/gui/migration.c:162
+#: ../calendar/gui/migration.c:164
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -8334,7 +8253,7 @@ msgstr ""
 "\n"
 "Byddwch yn amyneddgar nes i Evolution fudo'ch plygellau..."
 
-#: ../calendar/gui/migration.c:166
+#: ../calendar/gui/migration.c:168
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -8347,266 +8266,236 @@ msgstr ""
 "Byddwch yn amyneddgar nes i Evolution fudo'ch plygellau..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:765 ../calendar/gui/migration.c:933
+#: ../calendar/gui/migration.c:770 ../calendar/gui/migration.c:938
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Methu mudo hen osodiadau o evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:794
+#: ../calendar/gui/migration.c:799
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Methu mudo'r calendr `%s'"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:962
+#: ../calendar/gui/migration.c:967
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Methu mudo'r tasgau `%s'"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/migration.c:1211
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:402
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:433
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:546
+msgid "Notes"
+msgstr "Nodiadau"
+
+#: ../calendar/gui/print.c:513
 msgid "1st"
 msgstr "1af"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:513
 msgid "2nd"
 msgstr "2il"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:513
 msgid "3rd"
 msgstr "3ydd"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:513
 msgid "4th"
 msgstr "4ydd"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:513
 msgid "5th"
 msgstr "5ed"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:514
 msgid "6th"
 msgstr "6ed"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:514
 msgid "7th"
 msgstr "7fed"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:514
 msgid "8th"
 msgstr "8fed"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:514
 msgid "9th"
 msgstr "9fed"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:514
 msgid "10th"
 msgstr "10fed"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:515
 msgid "11th"
 msgstr "11eg"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:515
 msgid "12th"
 msgstr "12fed"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:515
 msgid "13th"
 msgstr "13eg"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:515
 msgid "14th"
 msgstr "14eg"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:515
 msgid "15th"
 msgstr "15fed"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:516
 msgid "16th"
 msgstr "16eg"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:516
 msgid "17th"
 msgstr "17eg"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:516
 msgid "18th"
 msgstr "18fed"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:516
 msgid "19th"
 msgstr "19eg"
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:516
 msgid "20th"
 msgstr "20fed"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:517
 msgid "21st"
 msgstr "21ain"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:517
 msgid "22nd"
 msgstr "22ain"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:517
 msgid "23rd"
 msgstr "23ain"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:517
 msgid "24th"
 msgstr "24ain"
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:517
 msgid "25th"
 msgstr "25ain"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:518
 msgid "26th"
 msgstr "26ain"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:518
 msgid "27th"
 msgstr "27ain"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:518
 msgid "28th"
 msgstr "28ain"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:518
 msgid "29th"
 msgstr "29ain"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:518
 msgid "30th"
 msgstr "30ain"
 
-#: ../calendar/gui/print.c:580
+#: ../calendar/gui/print.c:519
 msgid "31st"
 msgstr "31ain"
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
-#: ../calendar/gui/print.c:655
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
+#: ../calendar/gui/print.c:594
 msgid "Su"
 msgstr "Sul"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:594
 msgid "Mo"
 msgstr "Llu"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:594
 msgid "Tu"
 msgstr "Maw"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:594
 msgid "We"
 msgstr "Mer"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:595
 msgid "Th"
 msgstr "Iau"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:595
 msgid "Fr"
 msgstr "Gwe"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:595
 msgid "Sa"
 msgstr "Sad"
 
-#. Day
-#: ../calendar/gui/print.c:1936
-msgid "Selected day (%a %b %d %Y)"
-msgstr "Dydd dewisedig (%a %b %d %Y)"
-
-#: ../calendar/gui/print.c:1961 ../calendar/gui/print.c:1965
-msgid "%a %b %d"
-msgstr "%a %b %d"
-
-#: ../calendar/gui/print.c:1962
-msgid "%a %d %Y"
-msgstr "%a %d %Y"
-
-#: ../calendar/gui/print.c:1966 ../calendar/gui/print.c:1968
-#: ../calendar/gui/print.c:1969
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
-
-#: ../calendar/gui/print.c:1973
-#, c-format
-msgid "Selected week (%s - %s)"
-msgstr "Wythnos ddewisedig (%s - %s)"
-
-#. Month
-#: ../calendar/gui/print.c:1981
-msgid "Selected month (%b %Y)"
-msgstr "Mis dewisedig (%b %Y)"
-
-#. Year
-#: ../calendar/gui/print.c:1988
-msgid "Selected year (%Y)"
-msgstr "Blwyddyn ddewisedig (%Y)"
-
-#: ../calendar/gui/print.c:2317
+#: ../calendar/gui/print.c:2283
 msgid "Appointment"
 msgstr "Apwyntiad"
 
-#: ../calendar/gui/print.c:2319
+#: ../calendar/gui/print.c:2285
 msgid "Task"
 msgstr "Tasg"
 
-#: ../calendar/gui/print.c:2341
+#: ../calendar/gui/print.c:2307
 #, c-format
 msgid "Summary: %s"
 msgstr "Crynodeb: %s"
 
-#: ../calendar/gui/print.c:2392
+#: ../calendar/gui/print.c:2358
 #, c-format
 msgid "Status: %s"
 msgstr "Statws: %s"
 
-#: ../calendar/gui/print.c:2409
+#: ../calendar/gui/print.c:2375
 #, c-format
 msgid "Priority: %s"
 msgstr "Blaenoriaeth: %s"
 
-#: ../calendar/gui/print.c:2421
+#: ../calendar/gui/print.c:2387
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Canran wedi'i Gwblhau: %i"
 
-#: ../calendar/gui/print.c:2433
+#: ../calendar/gui/print.c:2399
 #, c-format
 msgid "URL: %s"
 msgstr "LAU: %s"
 
-#: ../calendar/gui/print.c:2447
+#: ../calendar/gui/print.c:2412
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorïau: %s"
 
-#: ../calendar/gui/print.c:2458
+#: ../calendar/gui/print.c:2423
 msgid "Contacts: "
 msgstr "Cysylltiadau: "
 
-#: ../calendar/gui/print.c:2601 ../calendar/gui/print.c:2691
-#: ../calendar/gui/print.c:2820 ../mail/em-format-html-print.c:178
-msgid "Print Preview"
-msgstr "Rhagolwg Argraffu"
-
-#: ../calendar/gui/print.c:2636
-msgid "Print Item"
-msgstr "Argraffu Eitem"
+#. TODO Allow the user to customize the title.
+#: ../calendar/gui/print.c:2524
+msgid "Upcoming Appointments"
+msgstr "Apwyntiadau i Ddod"
 
-#: ../calendar/gui/tasks-component.c:441
+#: ../calendar/gui/tasks-component.c:442
 msgid "_New Task List"
 msgstr "Rhestr _Femos Newydd"
 
 # #-#-#-#-#  cy2.po (evolution)  #-#-#-#-#
 # FIXME: lots of %d plural from here on down
-#: ../calendar/gui/tasks-component.c:517
+#: ../calendar/gui/tasks-component.c:518
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -8614,57 +8503,57 @@ msgstr[0] "%d tasg"
 msgstr[1] "%d dasg"
 msgstr[2] "%d tasg"
 
-#: ../calendar/gui/tasks-component.c:566
+#: ../calendar/gui/tasks-component.c:567
 msgid "Failed upgrading tasks."
 msgstr "Methwyd uwchraddio tasgau."
 
-#: ../calendar/gui/tasks-component.c:877
+#: ../calendar/gui/tasks-component.c:878
 #, 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"
 
-#: ../calendar/gui/tasks-component.c:890
+#: ../calendar/gui/tasks-component.c:891
 msgid "There is no calendar available for creating tasks"
 msgstr "Does dim calendr ar gael er mwyn creu tasgau"
 
-#: ../calendar/gui/tasks-component.c:987
+#: ../calendar/gui/tasks-component.c:988
 msgid "Task Source Selector"
 msgstr "Dewisydd Ffynhonnell Dasg"
 
-#: ../calendar/gui/tasks-component.c:1170
+#: ../calendar/gui/tasks-component.c:1244
 msgid "New task"
 msgstr "Tasg newydd"
 
-#: ../calendar/gui/tasks-component.c:1172
+#: ../calendar/gui/tasks-component.c:1246
 msgid "Create a new task"
 msgstr "Creu tasg newydd"
 
-#: ../calendar/gui/tasks-component.c:1178
+#: ../calendar/gui/tasks-component.c:1252
 msgid "New assigned task"
 msgstr "Tasg newydd wedi'i neilltuo"
 
-#: ../calendar/gui/tasks-component.c:1179
+#: ../calendar/gui/tasks-component.c:1253
 msgid "Assigne_d Task"
 msgstr "Tasg wedi'i _Neilltuo"
 
-#: ../calendar/gui/tasks-component.c:1180
+#: ../calendar/gui/tasks-component.c:1254
 msgid "Create a new assigned task"
 msgstr "Creu tasg newydd wedi'i neilltuo"
 
-#: ../calendar/gui/tasks-component.c:1186
+#: ../calendar/gui/tasks-component.c:1260
 msgid "New task list"
 msgstr "Rhestr dasgau newydd"
 
-#: ../calendar/gui/tasks-component.c:1187
+#: ../calendar/gui/tasks-component.c:1261
 msgid "Tas_k list"
 msgstr "Rhestr _dasgau"
 
-#: ../calendar/gui/tasks-component.c:1188
+#: ../calendar/gui/tasks-component.c:1262
 msgid "Create a new task list"
 msgstr "Creu rhestr dasgau newydd"
 
-#: ../calendar/gui/tasks-control.c:446
+#: ../calendar/gui/tasks-control.c:438
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8676,11 +8565,11 @@ msgstr ""
 "\n"
 "Dileu'r tasgau yma go iawn?"
 
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:441
 msgid "Do not ask me again."
 msgstr "Peidiwch â gofyn eto"
 
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:478 ../calendar/gui/tasks-control.c:494
 msgid "Print Tasks"
 msgstr "Argraffu Tasgau"
 
@@ -10256,61 +10145,6 @@ msgstr "Pasiffig/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pasiffig/Yap"
 
-#: ../composer/e-msg-composer-attachment-bar.c:105
-#: ../widgets/misc/e-attachment-bar.c:107
-#, c-format
-msgid "%.0fK"
-msgstr "%.0fC"
-
-#: ../composer/e-msg-composer-attachment-bar.c:108
-#: ../widgets/misc/e-attachment-bar.c:110
-#, c-format
-msgid "%.0fM"
-msgstr "%.0fM"
-
-#: ../composer/e-msg-composer-attachment-bar.c:111
-#: ../widgets/misc/e-attachment-bar.c:113
-#, c-format
-msgid "%.0fG"
-msgstr "%.0fG"
-
-#: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1024
-msgid "Attachment Bar"
-msgstr "Bar Atodiadau"
-
-#: ../composer/e-msg-composer-attachment.c:187
-#: ../composer/e-msg-composer-attachment.c:203
-#: ../composer/e-msg-composer-attachment.c:297
-#: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
-#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
-#, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "Methu atodi ffeil %s: %s"
-
-#: ../composer/e-msg-composer-attachment.c:195
-#: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
-#, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "Methu atodi'r ffeil %s: nid yw'n ffeil arferol"
-
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:1
-msgid "Attachment Properties"
-msgstr "Priodweddau atodiad"
-
-#: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../widgets/misc/e-attachment.glade.h:3
-msgid "File name:"
-msgstr "Enw'r ffeil:"
-
-#: ../composer/e-msg-composer-attachment.glade.h:4
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "MIME type:"
-msgstr "Math MIME:"
-
 #: ../composer/e-msg-composer-hdrs.c:570
 msgid "Posting destination"
 msgstr "Cyrchfan postio "
@@ -10319,7 +10153,7 @@ msgstr "Cyrchfan postio "
 msgid "Choose folders to post the message to."
 msgstr "Dewiswch blygellau i bostio'r neges ati."
 
-#: ../composer/e-msg-composer-hdrs.c:603
+#: ../composer/e-msg-composer-hdrs.c:602
 msgid "Click here for the address book"
 msgstr "Cliciwch yma ar gyfer y llyfr cyfeiriadau"
 
@@ -10330,45 +10164,45 @@ msgstr "Cliciwch yma ar gyfer y llyfr cyfeiriadau"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:635
+#: ../composer/e-msg-composer-hdrs.c:634
 msgid "_Reply-To:"
 msgstr "_Ateb at:"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:642
+#: ../composer/e-msg-composer-hdrs.c:641
 msgid "Fr_om:"
 msgstr "_Oddi wrth:"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:649
+#: ../composer/e-msg-composer-hdrs.c:648
 msgid "S_ubject:"
 msgstr "P_wnc:"
 
-#: ../composer/e-msg-composer-hdrs.c:658
+#: ../composer/e-msg-composer-hdrs.c:657
 msgid "_To:"
 msgstr "_At:"
 
-#: ../composer/e-msg-composer-hdrs.c:659
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "Enter the recipients of the message"
 msgstr "Rhowch dderbynwyr y neges"
 
-#: ../composer/e-msg-composer-hdrs.c:662
+#: ../composer/e-msg-composer-hdrs.c:661
 msgid "_Cc:"
 msgstr "_Copi i:"
 
-#: ../composer/e-msg-composer-hdrs.c:663
+#: ../composer/e-msg-composer-hdrs.c:662
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Rhowch y cyfeiriadau fydd yn derbyn copi carbon o'r neges"
 
-#: ../composer/e-msg-composer-hdrs.c:666
+#: ../composer/e-msg-composer-hdrs.c:665
 msgid "_Bcc:"
 msgstr "Copi _dall i:"
 
-#: ../composer/e-msg-composer-hdrs.c:667
+#: ../composer/e-msg-composer-hdrs.c:666
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10379,15 +10213,15 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:674
+#: ../composer/e-msg-composer-hdrs.c:673
 msgid "_Post To:"
 msgstr "_Postio at:"
 
-#: ../composer/e-msg-composer-hdrs.c:679
+#: ../composer/e-msg-composer-hdrs.c:678
 msgid "Click here to select folders to post to"
 msgstr "Cliciwch yma i ddewis plygellau i bostio atynt"
 
-#: ../composer/e-msg-composer-hdrs.c:684
+#: ../composer/e-msg-composer-hdrs.c:683
 msgid "Post To:"
 msgstr "Postio At:"
 
@@ -10399,14 +10233,14 @@ msgstr "_Atodi"
 msgid "Insert Attachment"
 msgstr "Mewnosod Atodiad"
 
-#: ../composer/e-msg-composer.c:827
+#: ../composer/e-msg-composer.c:830
 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:834
+#: ../composer/e-msg-composer.c:837
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10414,55 +10248,55 @@ msgstr ""
 "Methu amgryptio neges i'w hanfon: Dim tystysgrif amgryptio wedi'i phenodi ar "
 "gyfer y cyfrif"
 
-#: ../composer/e-msg-composer.c:1294 ../composer/e-msg-composer.c:2530
+#: ../composer/e-msg-composer.c:1297 ../composer/e-msg-composer.c:2559
 msgid "Hide _Attachment Bar"
 msgstr "Cuddio'r Bar _Atodiadau"
 
-#: ../composer/e-msg-composer.c:1297 ../composer/e-msg-composer.c:2533
-#: ../composer/e-msg-composer.c:3897
+#: ../composer/e-msg-composer.c:1300 ../composer/e-msg-composer.c:2562
+#: ../composer/e-msg-composer.c:3931
 msgid "Show _Attachment Bar"
 msgstr "Dangos y Bar _Atodiadau"
 
-#: ../composer/e-msg-composer.c:1329 ../composer/e-msg-composer.c:1363
+#: ../composer/e-msg-composer.c:1332 ../composer/e-msg-composer.c:1366
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "Rheswm anhysbys"
 
-#: ../composer/e-msg-composer.c:1401
+#: ../composer/e-msg-composer.c:1404
 msgid "Could not open file"
 msgstr "Methwyd agor ffeil"
 
-#: ../composer/e-msg-composer.c:1409
+#: ../composer/e-msg-composer.c:1412
 msgid "Unable to retrieve message from editor"
 msgstr "Methu cyrchu neges o'r golygydd"
 
-#: ../composer/e-msg-composer.c:1688
+#: ../composer/e-msg-composer.c:1697
 msgid "Untitled Message"
 msgstr "Neges Di-deitl"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1723
+#: ../composer/e-msg-composer.c:1732
 msgid "Open File"
 msgstr "Agor Ffeil"
 
-#: ../composer/e-msg-composer.c:2173 ../mail/em-account-editor.c:606
+#: ../composer/e-msg-composer.c:2194 ../mail/em-account-editor.c:606
 #: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
 msgid "Autogenerated"
 msgstr "Awtogynhyrchwyd"
 
-#: ../composer/e-msg-composer.c:2276
+#: ../composer/e-msg-composer.c:2297
 msgid "Si_gnature:"
 msgstr "_Llofnod:"
 
-#: ../composer/e-msg-composer.c:2544 ../composer/e-msg-composer.c:3779
-#: ../composer/e-msg-composer.c:3782
+#: ../composer/e-msg-composer.c:2573 ../composer/e-msg-composer.c:3813
+#: ../composer/e-msg-composer.c:3816
 msgid "Compose Message"
 msgstr "Cyfansoddi'r Neges"
 
-#: ../composer/e-msg-composer.c:5006
+#: ../composer/e-msg-composer.c:5041
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
+"<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>"
@@ -10494,7 +10328,7 @@ msgstr ""
 "bost gwahanol."
 
 #: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:19
 msgid "Because &quot;{1}&quot;."
 msgstr "Oherwydd &quot;{1}&quot;."
 
@@ -10554,11 +10388,23 @@ msgstr ""
 "adael."
 
 #: ../composer/mail-composer.error.xml.h:17
+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."
+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."
 
-#: ../composer/mail-composer.error.xml.h:18
+#: ../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."
@@ -10566,7 +10412,7 @@ 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:19
+#: ../composer/mail-composer.error.xml.h:21
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
@@ -10577,45 +10423,45 @@ msgstr ""
 "\n"
 "Gwnewch yn siŵr bod y fersiynau cywir o gtkhtml a libgtkhtml wedi'u gosod."
 
-#: ../composer/mail-composer.error.xml.h:22
+#: ../composer/mail-composer.error.xml.h:24
 msgid "Unable to activate the address selector control."
 msgstr "Methu ymgychwyn y rheolydd dewis cyfeiriadau."
 
-#: ../composer/mail-composer.error.xml.h:23
+#: ../composer/mail-composer.error.xml.h:25
 msgid "Unfinished messages found"
 msgstr "Negeseuon wedi'u canfod heb eu cwblhau"
 
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:26
 msgid "Warning: Modified Message"
 msgstr "Rhybudd: Neges wedi Newid"
 
-#: ../composer/mail-composer.error.xml.h:25
+#: ../composer/mail-composer.error.xml.h:27
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Fedrwch chi ddim atodi'r ffeil `{0}' at y neges hon."
 
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:28
 msgid "You need to configure an account before you can compose mail."
 msgstr "Rhaid i chi osod cyfrif cyn i chi fedru cyfansoddi e-bost."
 
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Do not Recover"
 msgstr "_Peidio ag Adfer"
 
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Recover"
 msgstr "_Adfer"
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Save Message"
 msgstr "C_adw'r Neges"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:522
+#: ../shell/main.c:508
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:575
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:584
 msgid "Groupware Suite"
 msgstr "Cyfres Meddalwedd Grŵp"
 
@@ -10631,129 +10477,6 @@ msgstr "cerdyn cyfeiriad"
 msgid "calendar information"
 msgstr "gwybodaeth calendr"
 
-#: ../designs/OOA/ooa.glade.h:1
-#: ../plugins/exchange-operations/exchange-oof.glade.h:1
-msgid ""
-"<b>Currently, your status is \"Out of the Office\". </b>\n"
-"\n"
-"Would you like to change your status to \"In the Office\"? "
-msgstr ""
-"<b>Ar hyn o bryd, eich statws yw \"Allan o'r Swyddfa\".</b>\n"
-"\n"
-"Hoffech chi newid eich statws i \"Yn y Swyddfa\"?"
-
-#: ../designs/OOA/ooa.glade.h:4
-#: ../plugins/exchange-operations/exchange-oof.glade.h:4
-msgid "<b>Out of Office Message:</b>"
-msgstr "<b>Neges Allan o'r Swyddfa</b>"
-
-#: ../designs/OOA/ooa.glade.h:5
-#: ../plugins/exchange-operations/exchange-oof.glade.h:5
-msgid "<b>Status:</b>"
-msgstr "<b>Statws:</b>"
-
-#: ../designs/OOA/ooa.glade.h:6
-#: ../plugins/exchange-operations/exchange-oof.glade.h:6
-msgid ""
-"<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"
-"e-bost atoch chi tra byddwch chi allan o'r swyddfa.</small>"
-
-#: ../designs/OOA/ooa.glade.h:8
-#: ../plugins/exchange-operations/exchange-oof.glade.h:8
-msgid "I am currently in the office"
-msgstr "Rydw i yn y swyddfa ar hyn o bryd"
-
-#: ../designs/OOA/ooa.glade.h:9
-#: ../plugins/exchange-operations/exchange-oof.glade.h:9
-msgid "I am currently out of the office"
-msgstr "Rydw i allan o'r swyddfa ar hyn o bryd"
-
-#: ../designs/OOA/ooa.glade.h:10
-msgid "No, Do not Change Status"
-msgstr "Na, Peidio â Newid Statws"
-
-#: ../designs/OOA/ooa.glade.h:12
-#: ../plugins/exchange-operations/exchange-oof.glade.h:11
-msgid "Out of Office Assistant"
-msgstr "Cynorthwyydd Allan o'r Swyddfa"
-
-#: ../designs/OOA/ooa.glade.h:13
-#: ../plugins/exchange-operations/exchange-oof.glade.h:12
-msgid "Yes, Change Status"
-msgstr "Ie, Newidiwch Gyflwr"
-
-# msgid ""
-# msgstr ""
-#: ../designs/read_receipts/read.glade.h:1
-msgid "<b>Receiving Email</b>"
-msgstr "<b>Derbyn E-bost</b>"
-
-#: ../designs/read_receipts/read.glade.h:2
-msgid "<b>Sending Email:</b>"
-msgstr "<b>Anfon E-bost</b>"
-
-#: ../designs/read_receipts/read.glade.h:3
-msgid ""
-"<small>This page allows you to choose if you want to be notified via a read "
-"receipt when a message you\n"
-"sent is read, and to specify what Evolution should do when someone requests "
-"a receipt from you.</small>"
-msgstr ""
-"<small>This page allows you to choose if you want to be notified via a read "
-"receipt when a message you\n"
-"sent is read, and to specify what Evolution should do when someone requests "
-"a receipt from you.</small>"
-
-#: ../designs/read_receipts/read.glade.h:5
-msgid "Always send back a read receipt"
-msgstr "Anfon hysbysiad darllen yn ôl bob tro"
-
-#: ../designs/read_receipts/read.glade.h:6
-msgid "Ask me if I want to send back a read receipt"
-msgstr "Gofyn i fi a ydw i am anfon hysbysiad darllen yn ôl"
-
-#: ../designs/read_receipts/read.glade.h:7
-msgid "Never send back a read receipt"
-msgstr "Peidio byth ag anfon hysbysiad darllen yn ôl"
-
-#: ../designs/read_receipts/read.glade.h:8
-msgid "Read Receipts"
-msgstr "Darllen Dychwelyd"
-
-#: ../designs/read_receipts/read.glade.h:9
-msgid "Request a read receipt for all messages I send"
-msgstr "Anfon cais am hysbysiad darllen ar gyfer bob neges rwy'n eu hanfon"
-
-#: ../designs/read_receipts/read.glade.h:10
-msgid "Unless the message is sent to a mailing list, and not to me personally"
-msgstr ""
-"Oni bai fod y neges wedi'i hanfon at restr e-bostio, ac nid ata i'n bersonol"
-
-#: ../designs/read_receipts/read.glade.h:11
-msgid ""
-"When you receive an email with a read receipt request, what should Evolution "
-"do?"
-msgstr ""
-"Wrth i chi dderbyn e-bost gyda chais am hysbysiad eich bod wedi ei darllen, "
-"beth ddylai Evolution ei wneud?"
-
-#: ../e-util/e-dialog-utils.c:283
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Mae ffeil gyda'r enw hynny'n bodoli eisoes.\n"
-"Ydych chi am ei throsysgrifo?"
-
-#: ../e-util/e-dialog-utils.c:285 ../e-util/e-system.error.xml.h:6
-msgid "Overwrite file?"
-msgstr "Trosysgrifo ffeil?"
-
 #: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
 msgid "Evolution Error"
 msgstr "Gwall Evolution"
@@ -10776,6 +10499,20 @@ msgstr "Ymholiad Evolution"
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Gwall mewnol: gwall anhysbys '%s' wedi ei geisio"
 
+#: ../e-util/e-print.c:115
+msgid "An error occurred while printing"
+msgstr "Roedd gwall wrth argraffu"
+
+#: ../e-util/e-print.c:122
+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:128
+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-system.error.xml.h:2
 msgid "Cannot open file &quot;{0}&quot;."
 msgstr "Methu agor ffeil &quot;{0}&quot;."
@@ -10792,7 +10529,11 @@ msgstr "A hoffech ei drosysgrifo?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "Ffeil &quot;{0}&quot; yn bodoli."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:131
+#: ../e-util/e-system.error.xml.h:6
+msgid "Overwrite file?"
+msgstr "Trosysgrifo ffeil?"
+
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:138
 msgid "_Overwrite"
 msgstr "_Trosysgrifo"
 
@@ -10800,7 +10541,7 @@ msgstr "_Trosysgrifo"
 msgid "The orientation of the tray."
 msgstr "Gogwydd y gilfach."
 
-#: ../filter/filter-datespec.c:78
+#: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
@@ -10808,7 +10549,15 @@ msgstr[0] "1 eiliad yn ôl"
 msgstr[1] "2 eiliad yn ôl"
 msgstr[2] "%d eiliad yn ôl"
 
-#: ../filter/filter-datespec.c:79
+#: ../filter/filter-datespec.c:80
+#, c-format
+msgid "1 second in the future"
+msgid_plural "%d seconds in the future"
+msgstr[0] "%d eiliad i'r dyfodol"
+msgstr[1] "%d eiliad i'r dyfodol"
+msgstr[2] "%d eiliad i'r dyfodol"
+
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
@@ -10816,7 +10565,15 @@ msgstr[0] "1 munud yn ôl"
 msgstr[1] "2 funud yn ôl"
 msgstr[2] "%d munud yn ôl"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
+#, c-format
+msgid "1 minute in the future"
+msgid_plural "%d minutes in the future"
+msgstr[0] "%d funud i'r dyfodol"
+msgstr[1] "%d funud i'r dyfodol"
+msgstr[2] "%d munud i'r dyfodol"
+
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
@@ -10824,7 +10581,15 @@ msgstr[0] "1 awr yn ôl"
 msgstr[1] "2 awr yn ôl"
 msgstr[2] "%d awr yn ôl"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
+#, c-format
+msgid "1 hour in the future"
+msgid_plural "%d hours in the future"
+msgstr[0] "%d awr i'r dyfodol"
+msgstr[1] "%d awr i'r dyfodol"
+msgstr[2] "%d awr i'r dyfodol"
+
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
@@ -10832,7 +10597,15 @@ msgstr[0] "1 dydd yn ôl"
 msgstr[1] "2 ddydd yn ôl"
 msgstr[2] "%d ddydd yn ôl"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
+#, c-format
+msgid "1 day in the future"
+msgid_plural "%d days in the future"
+msgstr[0] "%d diwrnod i'r dyfodol"
+msgstr[1] "%d ddiwrnod i'r dyfodol"
+msgstr[2] "%d diwrnod i'r dyfodol"
+
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
@@ -10840,7 +10613,15 @@ msgstr[0] "1 wythnos yn ôl"
 msgstr[1] "2 wythnos yn ôl"
 msgstr[2] "%d wythnos yn ôl"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
+#, c-format
+msgid "1 week in the future"
+msgid_plural "%d weeks in the future"
+msgstr[0] "%d wythnos i'r dyfodol"
+msgstr[1] "%d wythnos i'r dyfodol"
+msgstr[2] "%d wythnos i'r dyfodol"
+
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
@@ -10848,7 +10629,15 @@ msgstr[0] "1 mis yn ôl"
 msgstr[1] "2 fis yn ôl"
 msgstr[2] "%d mis yn ôl"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
+#, c-format
+msgid "1 month in the future"
+msgid_plural "%d months in the future"
+msgstr[0] "%d mis i'r dyfodol"
+msgstr[1] "%d fis i'r dyfodol"
+msgstr[2] "%d mis i'r dyfodol"
+
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
@@ -10856,40 +10645,49 @@ msgstr[0] "1 blwyddyn yn ôl"
 msgstr[1] "2 flwyddyn yn ôl"
 msgstr[2] "%d blwyddyn yn ôl"
 
-#: ../filter/filter-datespec.c:285
+#: ../filter/filter-datespec.c:86
+#, c-format
+msgid "1 year in the future"
+msgid_plural "%d years in the future"
+msgstr[0] "%d mlynedd i'r dyfodol"
+msgstr[1] "%d flynedd i'r dyfodol"
+msgstr[2] "%d mlynedd i'r dyfodol"
+
+#: ../filter/filter-datespec.c:287
 msgid "<click here to select a date>"
 msgstr "<cliciwch yma i ddewis dyddiad>"
 
-#: ../filter/filter-datespec.c:288 ../filter/filter-datespec.c:299
+#: ../filter/filter-datespec.c:290 ../filter/filter-datespec.c:301
+#: ../filter/filter-datespec.c:312
 msgid "now"
 msgstr "nawr"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:295
+#: ../filter/filter-datespec.c:297
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/filter-datespec.c:415
+#: ../filter/filter-datespec.c:449
 msgid "Select a time to compare against"
 msgstr "Dewiswch amser i'w gymharu ag ef"
 
-#: ../filter/filter-file.c:293 ../filter/filter-file.c:299
+#: ../filter/filter-file.c:296 ../filter/filter-file.c:302
 msgid "Choose a file"
 msgstr "Dewiswch ffeil"
 
-#: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:91
+#: ../filter/filter-label.c:120 ../mail/em-filter-i18n.h:26
+#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:90
 msgid "Important"
 msgstr "Pwysig"
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
+#: ../filter/filter-label.c:123 ../mail/em-migrate.c:1056
 #: ../mail/mail-config.glade.h:145
 msgid "To Do"
 msgstr "I'w wneud"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1057
 #: ../mail/mail-config.glade.h:95
 msgid "Later"
 msgstr "Hwyrach"
@@ -10915,35 +10713,35 @@ msgid "If any criteria are met"
 msgstr "Os bydd unrhyw faen prawf yn wir"
 
 #: ../filter/filter-rule.c:868
-msgid "Find items:"
-msgstr "Canfod eitemau:"
+msgid "_Find items:"
+msgstr "_Canfod eitemau:"
 
-#: ../filter/filter-rule.c:889
+#: ../filter/filter-rule.c:890
 msgid "All related"
 msgstr "Pob un sy'n perthyn"
 
-#: ../filter/filter-rule.c:889
+#: ../filter/filter-rule.c:890
 msgid "Replies"
 msgstr "Atebion"
 
-#: ../filter/filter-rule.c:889
+#: ../filter/filter-rule.c:890
 msgid "Replies and parents"
 msgstr "Atebion a rhieni"
 
-#: ../filter/filter-rule.c:889
+#: ../filter/filter-rule.c:890
 msgid "No reply or parent"
 msgstr "Dim ymateb na rhiant"
 
-#: ../filter/filter-rule.c:891
-msgid "Include threads"
-msgstr "Cynnwys edeifion"
+#: ../filter/filter-rule.c:892
+msgid "I_nclude threads"
+msgstr "_Cynnwys edafedd"
 
-#: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:328
+#: ../filter/filter-rule.c:988 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:307
 msgid "Incoming"
 msgstr "Dod I Mewn"
 
-#: ../filter/filter-rule.c:986 ../mail/em-utils.c:329
+#: ../filter/filter-rule.c:988 ../mail/em-utils.c:308
 msgid "Outgoing"
 msgstr "Mynd Allan"
 
@@ -10967,7 +10765,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:71
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:74
 msgid "Missing name."
 msgstr "Enw ar goll."
 
@@ -11035,23 +10833,32 @@ msgstr "amser o'i gymharu â'r amser presennol"
 msgid "ago"
 msgstr "yn ôl"
 
-#: ../filter/filter.glade.h:17
+#: ../filter/filter.glade.h:16
+msgid "in the future"
+msgstr "i'r dyfodol"
+
+#: ../filter/filter.glade.h:18
 msgid "months"
 msgstr "misoedd"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:179
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:180
 msgid "seconds"
 msgstr "eiliadau"
 
-#: ../filter/filter.glade.h:19
+#: ../filter/filter.glade.h:20
 msgid "the current time"
 msgstr "yr amser cyfredol"
 
-#: ../filter/filter.glade.h:20
+#: ../filter/filter.glade.h:21
 msgid "the time you specify"
 msgstr "yr amser a benodwch"
 
-#: ../filter/filter.glade.h:22
+#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:289
+#: ../plugins/calendar-weather/calendar-weather.c:566
+msgid "weeks"
+msgstr "wythnosau"
+
+#: ../filter/filter.glade.h:23
 msgid "years"
 msgstr "blynedd"
 
@@ -11112,11 +10919,10 @@ msgid "Evolution Mail preferences control"
 msgstr "Rheolaeth dewisiadau Ebost Evolution"
 
 # 48x48/emblems/emblem-mail.icon.in.h:1
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:523
-#: ../mail/importers/elm-importer.c:341
-#: ../mail/importers/netscape-importer.c:1903
-#: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
-#: ../mail/mail-component.c:579 ../mail/mail-component.c:701
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:525
+#: ../mail/importers/elm-importer.c:341 ../mail/importers/pine-importer.c:387
+#: ../mail/mail-component.c:582 ../mail/mail-component.c:583
+#: ../mail/mail-component.c:738
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Ebost"
@@ -11154,7 +10960,7 @@ msgstr ""
 "a thicio'r blwch i'w dderbyn\n"
 
 #: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:511
+#: ../mail/em-vfolder-rule.c:510
 msgid "Select Folder"
 msgstr "Dewiswch Blygell"
 
@@ -11162,46 +10968,46 @@ msgstr "Dewiswch Blygell"
 msgid "Ask for each message"
 msgstr "Gofyn am bob neges"
 
-#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1812 ../mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Hunaniaeth"
 
-#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1861 ../mail/mail-config.glade.h:117
 msgid "Receiving Email"
 msgstr "Derbyn Ebost"
 
-#: ../mail/em-account-editor.c:2014
+#: ../mail/em-account-editor.c:2046
 msgid "Automatically check for _new mail every"
 msgstr "Gwirio'n awtomatig am _e-bost newydd bob"
 
-#: ../mail/em-account-editor.c:2195 ../mail/mail-config.glade.h:129
+#: ../mail/em-account-editor.c:2227 ../mail/mail-config.glade.h:129
 msgid "Sending Email"
 msgstr "Anfon E-bost"
 
-#: ../mail/em-account-editor.c:2254 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2286 ../mail/mail-config.glade.h:65
 msgid "Defaults"
 msgstr "Rhagosodiadau"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2320 ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:2352 ../mail/mail-config.glade.h:123
 #: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "Diogelwch"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2357 ../mail/em-account-editor.c:2448
+#: ../mail/em-account-editor.c:2389 ../mail/em-account-editor.c:2480
 msgid "Receiving Options"
 msgstr "Gosodiadau Derbyn"
 
-#: ../mail/em-account-editor.c:2358 ../mail/em-account-editor.c:2449
+#: ../mail/em-account-editor.c:2390 ../mail/em-account-editor.c:2481
 msgid "Checking for New Mail"
 msgstr "Chwilio am Ebost Newydd"
 
-#: ../mail/em-account-editor.c:2800 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2832 ../mail/mail-config.glade.h:31
 msgid "Account Editor"
 msgstr "Golygydd Cyfrifon"
 
-#: ../mail/em-account-editor.c:2800 ../mail/mail-config.glade.h:79
+#: ../mail/em-account-editor.c:2832 ../mail/mail-config.glade.h:79
 msgid "Evolution Account Assistant"
 msgstr "Cynorthwyydd Cyfrifon Evolution"
 
@@ -11220,9 +11026,8 @@ msgstr "Galluogi"
 msgid "[Default]"
 msgstr "[Rhagosodedig]"
 
-#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../mail/em-account-prefs.c:519 ../mail/em-composer-prefs.c:930
-#: ../plugins/plugin-manager/plugin-manager.c:205
+#: ../mail/em-account-prefs.c:519 ../mail/em-composer-prefs.c:945
+#: ../plugins/plugin-manager/plugin-manager.c:261
 #: ../plugins/publish-calendar/publish-calendar.c:493
 msgid "Enabled"
 msgstr "Galluogwyd"
@@ -11235,20 +11040,20 @@ msgstr "Enw'r cyfrif"
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:999
+#: ../mail/em-composer-prefs.c:310 ../mail/em-composer-prefs.c:436
+#: ../mail/mail-config.c:1029
 msgid "Unnamed"
 msgstr "Dienw"
 
-#: ../mail/em-composer-prefs.c:936
+#: ../mail/em-composer-prefs.c:951
 msgid "Language(s)"
 msgstr "Iaith (ieithoedd)"
 
-#: ../mail/em-composer-prefs.c:979
+#: ../mail/em-composer-prefs.c:994
 msgid "Add signature script"
 msgstr "Ychwanegu sgript llofnod"
 
-#: ../mail/em-composer-prefs.c:999
+#: ../mail/em-composer-prefs.c:1014
 msgid "Signature(s)"
 msgstr "Llofnod(ion)"
 
@@ -11312,9 +11117,11 @@ msgstr "Dyddiad derbyniwyd"
 msgid "Date sent"
 msgstr "Dyddiad anfon"
 
-#: ../mail/em-filter-i18n.h:11 ../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
+#: ../mail/em-filter-i18n.h:11
+#: ../plugins/groupwise-features/share-folder.c:777
+#: ../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"
 
@@ -11406,7 +11213,7 @@ msgstr "ddim yn"
 msgid "is not Flagged"
 msgstr "ddim yn Fanerog"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:92
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Sothach"
@@ -11523,9 +11330,9 @@ msgstr "Dechrau gyda"
 msgid "Stop Processing"
 msgstr "Atal Prosesu"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1659
-#: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:17
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1660
+#: ../mail/em-format-quote.c:313 ../mail/em-format.c:852
+#: ../mail/em-mailer-prefs.c:94 ../mail/message-list.etspec.h:17
 #: ../mail/message-tag-followup.c:336
 #: ../plugins/groupwise-features/properties.glade.h:6
 #: ../smime/lib/e-cert.c:1132
@@ -11541,60 +11348,72 @@ msgstr "Dadosod Cyflwr"
 msgid "<b>Then</b>"
 msgstr "<b>Yna</b>"
 
-#: ../mail/em-folder-browser.c:162
+#: ../mail/em-folder-browser.c:169
 msgid "C_reate Search Folder From Search..."
 msgstr "Creu _Plygell Chwilio o'r Chwiliad..."
 
-#: ../mail/em-folder-browser.c:183
+#: ../mail/em-folder-browser.c:191
 msgid "All Messages"
 msgstr "Pob Neges"
 
-#: ../mail/em-folder-browser.c:184
+#: ../mail/em-folder-browser.c:192
 msgid "Unread Messages"
 msgstr "Negeseuon heb eu Darllen"
 
-#: ../mail/em-folder-browser.c:186
+#: ../mail/em-folder-browser.c:194
 msgid "No Label"
 msgstr "Dim Label"
 
-#: ../mail/em-folder-browser.c:193
+#: ../mail/em-folder-browser.c:201
 msgid "Read Messages"
 msgstr "Negeseuon wedi'u Darllen"
 
-#: ../mail/em-folder-browser.c:194
+#: ../mail/em-folder-browser.c:202
 msgid "Recent Messages"
 msgstr "Negeseuon Diweddar"
 
-#: ../mail/em-folder-browser.c:195
+#: ../mail/em-folder-browser.c:203
 msgid "Last 5 Days' Messages"
 msgstr "Negeseuon y 5 diwrnod olaf"
 
-#: ../mail/em-folder-browser.c:196
+#: ../mail/em-folder-browser.c:204
 msgid "Messages with Attachments"
 msgstr "Negeseuon ag Atodiadau"
 
-#: ../mail/em-folder-browser.c:197
+#: ../mail/em-folder-browser.c:205
+msgid "Important Messages"
+msgstr "Negeseuon Pwysig"
+
+#: ../mail/em-folder-browser.c:206
 msgid "Messages Not Junk"
 msgstr "Negeseuon Ddim yn Sothach"
 
-#. TODO: can this be done in a loop?
-#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:150
-msgid "Total messages:"
-msgid_plural "Total messages:"
-msgstr[0] "Cyfanswm neges:"
-msgstr[1] "Cyfanswm negeseuon:"
-msgstr[2] "Cyfanswm negeseuon:"
+#: ../mail/em-folder-browser.c:1029
+msgid "Account Search"
+msgstr "Chwilio Cyfrif"
+
+#: ../mail/em-folder-browser.c:1073
+msgid "All Account Search"
+msgstr "Chwilio Pob Cyfrif"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:163
+#: ../mail/em-folder-properties.c:149
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Neges heb ei darllen:"
 msgstr[1] "Negeseuon heb eu darllen:"
 msgstr[2] "Negeseuon heb eu darllen:"
 
-#: ../mail/em-folder-properties.c:316
+#. TODO: can this be done in a loop?
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:163
+msgid "Total messages:"
+msgid_plural "Total messages:"
+msgstr[0] "Cyfanswm neges:"
+msgstr[1] "Cyfanswm negeseuon:"
+msgstr[2] "Cyfanswm negeseuon:"
+
+#: ../mail/em-folder-properties.c:323
 #: ../plugins/groupwise-features/properties.glade.h:2
 msgid "Folder Properties"
 msgstr "Priodweddau Plygell"
@@ -11621,21 +11440,21 @@ msgstr "Plygellau Chwilio"
 msgid "UNMATCHED"
 msgstr "HEB GYDWEDDU"
 
-#: ../mail/em-folder-tree-model.c:484 ../mail/mail-component.c:151
+#: ../mail/em-folder-tree-model.c:484 ../mail/mail-component.c:152
 msgid "Drafts"
 msgstr "Drafftiau"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:151
+#: ../plugins/exchange-operations/exchange-folder.c:593
 msgid "Inbox"
 msgstr "Blwch Derbyn"
 
-#: ../mail/em-folder-tree-model.c:490 ../mail/mail-component.c:152
+#: ../mail/em-folder-tree-model.c:490 ../mail/mail-component.c:153
 msgid "Outbox"
 msgstr "Blwch Allan"
 
-#: ../mail/em-folder-tree-model.c:492 ../mail/mail-component.c:153
+#: ../mail/em-folder-tree-model.c:492 ../mail/mail-component.c:154
 msgid "Sent"
 msgstr "Wedi Anfon"
 
@@ -11643,77 +11462,105 @@ msgstr "Wedi Anfon"
 msgid "Loading..."
 msgstr "Yn Llwytho..."
 
-#: ../mail/em-folder-tree.c:701
+#. Translators: This is the string used for displaying the
+#. * folder names in folder trees. "%s" will be replaced by
+#. * the folder's name and "%u" will be replaced with the
+#. * number of unread messages in the folder.
+#. *
+#. * Most languages should translate this as "%s (%u)". The
+#. * languages that use localized digits (like Persian) may
+#. * need to replace "%u" with "%Iu". Right-to-left languages
+#. * (like Arabic and Hebrew) may need to add bidirectional
+#. * formatting codes to take care of the cases the folder
+#. * name appears in either direction.
+#. *
+#. * Do not translate the "folder-display|" part. Remove it
+#. * from your translation.
+#.
+#: ../mail/em-folder-tree.c:368
+#, c-format
+msgid "folder-display|%s (%u)"
+msgstr "%s (%u)"
+
+#: ../mail/em-folder-tree.c:720
 msgid "Mail Folder Tree"
 msgstr "Coeden Plygell Ebost"
 
-#: ../mail/em-folder-tree.c:861
+#: ../mail/em-folder-tree.c:880
 #, c-format
 msgid "Moving folder %s"
 msgstr "Symud plygell %s"
 
-#: ../mail/em-folder-tree.c:863
+#: ../mail/em-folder-tree.c:882
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copïo plygell %s"
 
-#: ../mail/em-folder-tree.c:870 ../mail/message-list.c:1806
+#: ../mail/em-folder-tree.c:889 ../mail/message-list.c:1866
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Symud ffeiliau i mewn i'r blygell %s"
 
-#: ../mail/em-folder-tree.c:872 ../mail/message-list.c:1808
+#: ../mail/em-folder-tree.c:891 ../mail/message-list.c:1868
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copïo ffeiliau i mewn i'r blygell %s"
 
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:907
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Methu gollwng neges(euon) i'r storfa level uchaf"
 
-#: ../mail/em-folder-tree.c:984 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Copïo i Blygell"
 
-#: ../mail/em-folder-tree.c:985 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Symud i Blygell"
 
-#: ../mail/em-folder-tree.c:1690 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1709 ../mail/mail-ops.c:1060
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Sganio plygellau o fewn \"%s\""
 
-#: ../mail/em-folder-tree.c:2049 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:29
+#: ../mail/em-folder-tree.c:2108 ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:32
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:53
 msgid "_View"
 msgstr "_Golwg"
 
-#: ../mail/em-folder-tree.c:2050
+#: ../mail/em-folder-tree.c:2109
 msgid "Open in _New Window"
 msgstr "Agor mewn Ffenestr _Newydd"
 
-#: ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-tree.c:2113
 msgid "_Copy..."
 msgstr "_Copïo..."
 
-#: ../mail/em-folder-tree.c:2055
+#: ../mail/em-folder-tree.c:2114
 msgid "_Move..."
 msgstr "_Symud..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2059
+#: ../mail/em-folder-tree.c:2118
 msgid "_New Folder..."
 msgstr "_Plygell Newydd..."
 
-#: ../mail/em-folder-tree.c:2062 ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2121 ../ui/evolution-mail-list.xml.h:36
 msgid "_Rename..."
 msgstr "_Ailenwi..."
 
-#: ../mail/em-folder-tree.c:2067 ../mail/mail.error.xml.h:128
+#: ../mail/em-folder-tree.c:2122
+msgid "Re_fresh"
+msgstr "_Adnewyddu"
+
+#: ../mail/em-folder-tree.c:2123
+msgid "Fl_ush Outbox"
+msgstr "_Gwacáu'r Blwch Allan"
+
+#: ../mail/em-folder-tree.c:2129 ../mail/mail.error.xml.h:135
 msgid "_Empty Trash"
 msgstr "_Taflu'r Sbwriel"
 
@@ -11722,14 +11569,13 @@ msgstr "_Taflu'r Sbwriel"
 msgid "Copying `%s' to `%s'"
 msgstr "Copïo `%s' i `%s'"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1008
-#: ../mail/em-folder-view.c:1023
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1032
+#: ../mail/em-folder-view.c:1047
 #: ../mail/importers/evolution-mbox-importer.c:86
-#: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "Dewis plygell"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1023
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1047
 msgid "C_opy"
 msgstr "C_opïo"
 
@@ -11751,180 +11597,200 @@ msgstr "Creu plygell"
 msgid "Specify where to create the folder:"
 msgstr "Penodwch ble i greu'r blygell:"
 
-#: ../mail/em-folder-view.c:1116 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:968 ../mail/mail.error.xml.h:67
+msgid "Mail Deletion Failed"
+msgstr "Methwyd Dileu E-bost"
+
+#: ../mail/em-folder-view.c:969 ../mail/mail.error.xml.h:122
+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."
+
+#: ../mail/em-folder-view.c:1140 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Ateb i'r Danfonwr"
 
-#: ../mail/em-folder-view.c:1118 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1142 ../mail/em-popup.c:566 ../mail/em-popup.c:577
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Ymlaen"
 
-#: ../mail/em-folder-view.c:1121 ../ui/evolution-mail-message.xml.h:107
+#. 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:1146 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "_Golygu fel Neges Newydd..."
 
-#: ../mail/em-folder-view.c:1127
+#: ../mail/em-folder-view.c:1152
 msgid "U_ndelete"
 msgstr "_Dad-ddileu"
 
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1153
 msgid "_Move to Folder..."
 msgstr "_Symud i Blygell..."
 
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1154
 msgid "_Copy to Folder..."
 msgstr "_Copïo i Blygell..."
 
-#: ../mail/em-folder-view.c:1132
+#: ../mail/em-folder-view.c:1157
 msgid "Mar_k as Read"
 msgstr "_Marcio Wedi Darllen"
 
-#: ../mail/em-folder-view.c:1133
+#: ../mail/em-folder-view.c:1158
 msgid "Mark as _Unread"
 msgstr "Marcio _heb ei ddarllen"
 
-#: ../mail/em-folder-view.c:1134
+#: ../mail/em-folder-view.c:1159
 msgid "Mark as _Important"
 msgstr "Marcio'n _Bwysig"
 
-#: ../mail/em-folder-view.c:1135
+#: ../mail/em-folder-view.c:1160
 msgid "Mark as Un_important"
 msgstr "Marcio _Ddim yn Bwysig"
 
-#: ../mail/em-folder-view.c:1136
+#: ../mail/em-folder-view.c:1161
 msgid "Mark as _Junk"
 msgstr "Marcio'n _Sothach"
 
-#: ../mail/em-folder-view.c:1137
+#: ../mail/em-folder-view.c:1162
 msgid "Mark as _Not Junk"
 msgstr "Marcio _Ddim yn Sothach"
 
-#: ../mail/em-folder-view.c:1138
+#: ../mail/em-folder-view.c:1163
 msgid "Mark for Follo_w Up..."
 msgstr "Marcio ar gyfer _Dilyniant..."
 
-#: ../mail/em-folder-view.c:1140
+#: ../mail/em-folder-view.c:1165
 msgid "_Label"
 msgstr "_Label"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1141 ../widgets/misc/e-dateedit.c:475
+#: ../mail/em-folder-view.c:1166 ../widgets/misc/e-dateedit.c:473
 msgid "_None"
 msgstr "_Dim"
 
-#: ../mail/em-folder-view.c:1146
+#: ../mail/em-folder-view.c:1171
 msgid "Fla_g Completed"
 msgstr "Gosod _Baner 'Wedi Cwblhau'"
 
-#: ../mail/em-folder-view.c:1147
+#: ../mail/em-folder-view.c:1172
 msgid "Cl_ear Flag"
 msgstr "_Clirio Baner"
 
-#: ../mail/em-folder-view.c:1150
+#: ../mail/em-folder-view.c:1175
 msgid "Crea_te Rule From Message"
 msgstr "Creu _Rheol o'r Neges"
 
-#: ../mail/em-folder-view.c:1151
+#: ../mail/em-folder-view.c:1176
 msgid "Search Folder from _Subject"
 msgstr "Plygell Chwilio ar y _Pwnc"
 
-#: ../mail/em-folder-view.c:1152
+#: ../mail/em-folder-view.c:1177
 msgid "Search Folder from Se_nder"
 msgstr "Plygell Chwilio ar y _Danfonwr"
 
-#: ../mail/em-folder-view.c:1153
+#: ../mail/em-folder-view.c:1178
 msgid "Search Folder from _Recipients"
 msgstr "Plygell Chwilio ar y _Derbynwyr"
 
-#: ../mail/em-folder-view.c:1154
+#: ../mail/em-folder-view.c:1179
 msgid "Search Folder from Mailing _List"
 msgstr "Plygell Chwilio ar y _Rhestr E-bostio"
 
-#: ../mail/em-folder-view.c:1158
+#: ../mail/em-folder-view.c:1183
 msgid "Filter on Sub_ject"
 msgstr "Hidlo ar _Bwnc"
 
-#: ../mail/em-folder-view.c:1159
+#: ../mail/em-folder-view.c:1184
 msgid "Filter on Sen_der"
 msgstr "Hidlo ar _Ddanfonwr"
 
-#: ../mail/em-folder-view.c:1160
+#: ../mail/em-folder-view.c:1185
 msgid "Filter on Re_cipients"
 msgstr "Hidlo ar _Dderbynyddion"
 
-#: ../mail/em-folder-view.c:1161
+#: ../mail/em-folder-view.c:1186
 msgid "Filter on _Mailing List"
 msgstr "Hidlydd ar y _Rhestr E-bostio"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2002 ../mail/em-folder-view.c:2046
+#: ../mail/em-folder-view.c:2055 ../mail/em-folder-view.c:2099
 msgid "Default"
 msgstr "Rhagosodiad"
 
-#: ../mail/em-folder-view.c:2145
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
-#: ../plugins/print-message/print-message.c:87
-msgid "Print Message"
-msgstr "Argraffu'r Neges"
-
-#: ../mail/em-folder-view.c:2301
+#: ../mail/em-folder-view.c:2312
 msgid "Unable to retrieve message"
 msgstr "Methu nôl y neges"
 
-#: ../mail/em-folder-view.c:2499
+#: ../mail/em-folder-view.c:2333
+msgid "<b>Retrieving Message...</b>"
+msgstr "<b>Wrthi'n Nôl Neges...</b>"
+
+#: ../mail/em-folder-view.c:2372
+msgid "Retrieving Message"
+msgstr "Wrthi'n Nôl Neges"
+
+#: ../mail/em-folder-view.c:2550
 msgid "Create _Search Folder"
 msgstr "Creu _Plygell Chwilio"
 
-#: ../mail/em-folder-view.c:2500
+#: ../mail/em-folder-view.c:2551
 msgid "_From this Address"
 msgstr "_O'r cyfeiriad hwn"
 
-#: ../mail/em-folder-view.c:2501
+#: ../mail/em-folder-view.c:2552
 msgid "_To this Address"
 msgstr "_I'r cyfeiriad hwn"
 
-#: ../mail/em-folder-view.c:2855
+#: ../mail/em-folder-view.c:2909
 #, c-format
 msgid "Click to mail %s"
 msgstr "Cliciwch i e-bostio %s"
 
-#: ../mail/em-folder-view.c:2860
+#: ../mail/em-folder-view.c:2914
 msgid "Click to hide/unhide addresses"
 msgstr "Cliciwch i ddangos/cuddio cyfeiriadau"
 
 # TRWSIO: dylai ddefnyddio ngettext?
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:503
+#: ../mail/em-format-html-display.c:514
 #, c-format
 msgid "Matches: %d"
 msgstr "Cydweddiadau: %d"
 
-#: ../mail/em-format-html-display.c:646
-msgid "Find:"
-msgstr "Canfod:"
+#: ../mail/em-format-html-display.c:657
+msgid "Fi_nd:"
+msgstr "_Canfod:"
+
+#. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
+#: ../mail/em-format-html-display.c:681
+msgid "_Previous"
+msgstr "_Blaenorol"
+
+#: ../mail/em-format-html-display.c:686
+msgid "_Next"
+msgstr "_Nesaf"
 
-#: ../mail/em-format-html-display.c:677
+#: ../mail/em-format-html-display.c:691
 msgid "M_atch case"
 msgstr "_Cydweddu llythrennau bach/mawr"
 
-#: ../mail/em-format-html-display.c:925 ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:937 ../mail/em-format-html.c:618
 msgid "Unsigned"
 msgstr "Di-lofnod"
 
-#: ../mail/em-format-html-display.c:925
+#: ../mail/em-format-html-display.c:937
 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:926 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:938 ../mail/em-format-html.c:619
 msgid "Valid signature"
 msgstr "Llofnod dilys"
 
-#: ../mail/em-format-html-display.c:926
+#: ../mail/em-format-html-display.c:938
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11932,11 +11798,11 @@ 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:927 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:939 ../mail/em-format-html.c:620
 msgid "Invalid signature"
 msgstr "Llofnod annilys"
 
-#: ../mail/em-format-html-display.c:927
+#: ../mail/em-format-html-display.c:939
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11944,11 +11810,11 @@ msgstr ""
 "Methu dilysu llofnod y neges hon: fe all fod wedi ei newid yn ystod ei "
 "thaith."
 
-#: ../mail/em-format-html-display.c:928
+#: ../mail/em-format-html-display.c:940
 msgid "Valid signature, cannot verify sender"
 msgstr "Llofnod dilys, methu dilysu'r anfonwr"
 
-#: ../mail/em-format-html-display.c:928
+#: ../mail/em-format-html-display.c:940
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11956,11 +11822,11 @@ msgstr ""
 "Mae'r neges wedi ei llofnodi â llofnod dilys, ond methwyd dilysu anfonwr y "
 "neges."
 
-#: ../mail/em-format-html-display.c:934 ../mail/em-format-html.c:626
+#: ../mail/em-format-html-display.c:946 ../mail/em-format-html.c:627
 msgid "Unencrypted"
 msgstr "Heb amgryptio"
 
-#: ../mail/em-format-html-display.c:934
+#: ../mail/em-format-html-display.c:946
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11968,11 +11834,11 @@ 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:935 ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:628
 msgid "Encrypted, weak"
 msgstr "Wedi amgryptio, yn wan"
 
-#: ../mail/em-format-html-display.c:935
+#: ../mail/em-format-html-display.c:947
 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 "
@@ -11982,11 +11848,11 @@ msgstr ""
 "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:936 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:629
 msgid "Encrypted"
 msgstr "Wedi amgryptio"
 
-#: ../mail/em-format-html-display.c:936
+#: ../mail/em-format-html-display.c:948
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11994,11 +11860,11 @@ 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:937 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:630
 msgid "Encrypted, strong"
 msgstr "Wedi amgryptio, yn gryf"
 
-#: ../mail/em-format-html-display.c:937
+#: ../mail/em-format-html-display.c:949
 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 "
@@ -12008,57 +11874,61 @@ msgstr ""
 "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:1038 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1050 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Gweld Tystysgrif"
 
-#: ../mail/em-format-html-display.c:1053
+#: ../mail/em-format-html-display.c:1065
 msgid "This certificate is not viewable"
 msgstr "Ni ellir gweld y dystysgrif"
 
-#: ../mail/em-format-html-display.c:1372
+#: ../mail/em-format-html-display.c:1384
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Wedi cwblhau ar %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1380
+#: ../mail/em-format-html-display.c:1392
 msgid "Overdue:"
 msgstr "Hwyr:"
 
-#: ../mail/em-format-html-display.c:1383
+#: ../mail/em-format-html-display.c:1395
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "gan %B %d, %Y %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1443
+#: ../mail/em-format-html-display.c:1455
 msgid "_View Inline"
 msgstr "_Gweld yn Fewnol"
 
-#: ../mail/em-format-html-display.c:1444
+#: ../mail/em-format-html-display.c:1456
 msgid "_Hide"
 msgstr "_Cuddio"
 
-#: ../mail/em-format-html-display.c:1445
+#: ../mail/em-format-html-display.c:1457
 msgid "_Fit to Width"
 msgstr "_Ffitio i'r Lled"
 
-#: ../mail/em-format-html-display.c:1446
+#: ../mail/em-format-html-display.c:1458
 msgid "Show _Original Size"
 msgstr "Dangos y _Maint Gwreiddiol"
 
-#: ../mail/em-format-html-display.c:1865 ../mail/mail-config.glade.h:44
-#: ../mail/message-list.etspec.h:1
+#: ../mail/em-format-html-display.c:1899 ../mail/em-format-html-display.c:2510
+#: ../mail/mail-config.glade.h:42 ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Atodiad"
 
-#: ../mail/em-format-html-display.c:2072
-msgid "Select folder to save all attachments..."
-msgstr "Dewis plygell i gadw pob atodiad..."
+#: ../mail/em-format-html-display.c:2113
+msgid "Save attachment as"
+msgstr "Lleoliad cadw atodiad"
 
-#: ../mail/em-format-html-display.c:2119
+#: ../mail/em-format-html-display.c:2117
+msgid "Select folder to save all attachments"
+msgstr "Dewis plygell i gadw pob atodiad"
+
+#: ../mail/em-format-html-display.c:2168
 msgid "_Save Selected..."
 msgstr "_Cadw'r rhai wedi dewis..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2186
+#: ../mail/em-format-html-display.c:2235
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
@@ -12066,19 +11936,39 @@ msgstr[0] "%d at_odiad"
 msgstr[1] "%d at_odiad"
 msgstr[2] "%d at_odiad"
 
-#: ../mail/em-format-html-display.c:2193 ../mail/em-format-html-display.c:2269
+#: ../mail/em-format-html-display.c:2242 ../mail/em-format-html-display.c:2320
 msgid "S_ave"
 msgstr "_Cadw"
 
-#: ../mail/em-format-html-display.c:2204
+#: ../mail/em-format-html-display.c:2253
 msgid "S_ave All"
 msgstr "Cadw _Pob Un"
 
-#: ../mail/em-format-html-display.c:2265
+#: ../mail/em-format-html-display.c:2316
 msgid "No Attachment"
 msgstr "Dim Atodiad"
 
-#: ../mail/em-format-html-print.c:130
+#: ../mail/em-format-html-display.c:2447 ../mail/em-format-html-display.c:2483
+msgid "View _Unformatted"
+msgstr "Gweld testun heb _Fformatio"
+
+#: ../mail/em-format-html-display.c:2449
+msgid "Hide _Unformatted"
+msgstr "Cuddio testun heb _Fformatio"
+
+#: ../mail/em-format-html-display.c:2502
+msgid "O_pen With"
+msgstr "Agor _Gyda"
+
+#: ../mail/em-format-html-display.c:2571
+msgid ""
+"Evolution cannot render this email as it is too large to handle. 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:128
 #, c-format
 msgid "Page %d of %d"
 msgstr "Tudalen %d o %d"
@@ -12088,138 +11978,153 @@ msgstr "Tudalen %d o %d"
 msgid "Retrieving `%s'"
 msgstr "Yn nôl `%s'"
 
-#: ../mail/em-format-html.c:620
+#: ../mail/em-format-html.c:621
 msgid "Valid signature but cannot verify sender"
 msgstr "Llofnod dilys ond yn methu dilysu'r anfonwr"
 
-#: ../mail/em-format-html.c:891
+#: ../mail/em-format-html.c:892
 msgid "Malformed external-body part."
 msgstr "Rhan corff allanol wedi ei gam-ffurfio."
 
-#: ../mail/em-format-html.c:921
+#: ../mail/em-format-html.c:922
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pwyntydd at safle FTP (%s)"
 
-#: ../mail/em-format-html.c:932
+#: ../mail/em-format-html.c:933
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Pwyntydd at ffeil leol (%s) sy'n ddilys ar y safle \"%s\""
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:935
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pwyntydd at ffeil leol (%s)"
 
-#: ../mail/em-format-html.c:955
+#: ../mail/em-format-html.c:956
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pwyntydd at wybodaeth bell (%s)"
 
-#: ../mail/em-format-html.c:966
+#: ../mail/em-format-html.c:967
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pwyntydd at ddata allanol anhysbys (math \"%s\")"
 
-#: ../mail/em-format-html.c:1193
+#: ../mail/em-format-html.c:1194
 msgid "Formatting message"
 msgstr "Fformatio neges"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
+#: ../mail/em-format-html.c:1489 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:89
 #: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
 msgid "From"
 msgstr "Oddi wrth"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
+#: ../mail/em-format-html.c:1489 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:90
 msgid "Reply-To"
 msgstr "Ateb-I"
 
 # Why are these two msgstr's in caps? Should they be?
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
+#: ../mail/em-format-html.c:1489 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:92
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
+#: ../mail/em-format-html.c:1489 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:851 ../mail/em-mailer-prefs.c:93
 msgid "Bcc"
 msgstr "Bcc"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1663 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1024
+#: ../mail/em-format-html.c:1664 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1174
 msgid "Mailer"
 msgstr "Ebostiwr"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1690
+#: ../mail/em-format-html.c:1691
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1693
+#: ../mail/em-format-html.c:1694
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1703 ../mail/em-format-quote.c:329
-#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
+#: ../mail/em-format-html.c:1704 ../mail/em-format-quote.c:329
+#: ../mail/em-format.c:853 ../mail/em-mailer-prefs.c:95
 #: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
 #: ../widgets/misc/e-dateedit.c:363
 msgid "Date"
 msgstr "Dyddiad"
 
-#: ../mail/em-format-html.c:1726 ../mail/em-format.c:851
-#: ../mail/em-mailer-prefs.c:92
+#: ../mail/em-format-html.c:1727 ../mail/em-format.c:854
+#: ../mail/em-mailer-prefs.c:96
 msgid "Newsgroups"
 msgstr "Grwpiau Newyddion"
 
-#: ../mail/em-format.c:1102
+#: ../mail/em-format.c:1118
 #, c-format
 msgid "%s attachment"
 msgstr "%s atodiad"
 
-#: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1591
+#: ../mail/em-format.c:1157 ../mail/em-format.c:1308 ../mail/em-format.c:1610
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Methu gramadegu neges S/MIME: Gwall anhysbys"
 
-#: ../mail/em-format.c:1271 ../mail/em-format.c:1427
+#: ../mail/em-format.c:1290 ../mail/em-format.c:1446
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Methu gramadegu neges MIME. Yn dangos ei ffynhonnell."
 
-#: ../mail/em-format.c:1279
+#: ../mail/em-format.c:1298
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Math amgryptio na gynhelir ar gyfer multipart/encrypted"
 
-#: ../mail/em-format.c:1446
+#: ../mail/em-format.c:1465
 msgid "Unsupported signature format"
 msgstr "Ffurf llofnod na gynhelir"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
+#: ../mail/em-format.c:1473 ../mail/em-format.c:1539
 msgid "Error verifying signature"
 msgstr "Gwall wrth wirio llofnod"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
+#: ../mail/em-format.c:1473 ../mail/em-format.c:1539
 msgid "Unknown error verifying signature"
 msgstr "Gwall anhysbys wrth wirio llofnod"
 
-#: ../mail/em-mailer-prefs.c:103
+#: ../mail/em-mailer-prefs.c:107
 msgid "Every time"
 msgstr "Bob tro"
 
-#: ../mail/em-mailer-prefs.c:104
+#: ../mail/em-mailer-prefs.c:108
 msgid "Once per day"
 msgstr "Unwaith y dydd"
 
-#: ../mail/em-mailer-prefs.c:105
+#: ../mail/em-mailer-prefs.c:109
 msgid "Once per week"
 msgstr "Unwaith bob wythnos"
 
-#: ../mail/em-mailer-prefs.c:106
+#: ../mail/em-mailer-prefs.c:110
 msgid "Once per month"
 msgstr "Unwaith bob mis"
 
+#: ../mail/em-mailer-prefs.c:778
+#, c-format
+msgid "%s plugin is available and the binary is installed."
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:786
+#, c-format
+msgid ""
+"%s plugin is not available. Please check whether the package is installed."
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:807
+msgid "No Junk plugin available"
+msgstr "Dim ategyn Sbwriel ar gael"
+
 #: ../mail/em-migrate.c:1210
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
@@ -12267,12 +12172,12 @@ msgstr "Methu copïo data POP3 `%s' i'w gadw ar y gweinydd: %s"
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Methu creu storfa e-bost lleol `%s': %s"
 
-#: ../mail/em-migrate.c:2713
+#: ../mail/em-migrate.c:2709
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Methu creu plygellau e-bost lleol yn `%s': %s"
 
-#: ../mail/em-migrate.c:2732
+#: ../mail/em-migrate.c:2728
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12280,67 +12185,63 @@ msgstr ""
 "Methu darllen gosodiadau'r Evolution blaenorol, nid yw `evolution/config."
 "xmldb' yn bodoli, neu mae wedi llygru."
 
-#: ../mail/em-popup.c:557 ../mail/em-popup.c:568
+#: ../mail/em-popup.c:562 ../mail/em-popup.c:573
 msgid "_Reply to sender"
 msgstr "_Ateb i'r danfonwr"
 
-#: ../mail/em-popup.c:558 ../mail/em-popup.c:569
+#: ../mail/em-popup.c:563 ../mail/em-popup.c:574
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Ateb i'r _Rhestr"
 
-#: ../mail/em-popup.c:621
-msgid "_Send New Message To..."
-msgstr "_Danfon Neges Newydd i..."
-
-#: ../mail/em-popup.c:622
+#: ../mail/em-popup.c:627
 msgid "_Add to Address Book"
 msgstr "_Ychwanegu i'r Llyfr Cyfeiriadau"
 
-#: ../mail/em-subscribe-editor.c:582
+#: ../mail/em-subscribe-editor.c:603
 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."
 
-#: ../mail/em-subscribe-editor.c:612
+#: ../mail/em-subscribe-editor.c:633
 msgid "Subscribed"
 msgstr "Wedi Tanysgrifio"
 
-#: ../mail/em-subscribe-editor.c:616
+#: ../mail/em-subscribe-editor.c:637
 msgid "Folder"
 msgstr "Plygell"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:814
+#: ../mail/em-subscribe-editor.c:835
 msgid "Please select a server."
 msgstr "Dewiswch weinydd."
 
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:856
 msgid "No server has been selected"
 msgstr "Does dim gweinydd wedi ei ddewis"
 
-#: ../mail/em-utils.c:141
+#: ../mail/em-utils.c:120
 msgid "Do not show this message again."
 msgstr "Peidiwch â dangos y neges hon eto."
 
-#: ../mail/em-utils.c:336
+#: ../mail/em-utils.c:315
 msgid "Message Filters"
 msgstr "Hidlyddion Negeseuon"
 
-#: ../mail/em-utils.c:516 ../mail/em-utils.c:553
+#: ../mail/em-utils.c:368
 msgid "message"
 msgstr "neges"
 
-#: ../mail/em-utils.c:688
+#: ../mail/em-utils.c:557
 msgid "Save Message..."
 msgstr "Cadw'r Neges..."
 
-#: ../mail/em-utils.c:737
+#: ../mail/em-utils.c:606
 msgid "Add address"
 msgstr "Ychwanegu cyfeiriad"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1221
+#: ../mail/em-utils.c:1090
 #, c-format
 msgid "Messages from %s"
 msgstr "Negeseuon o %s"
@@ -12349,43 +12250,47 @@ msgstr "Negeseuon o %s"
 msgid "Search _Folders"
 msgstr "_Plygellau Chwilio"
 
-#: ../mail/em-vfolder-rule.c:591
+#: ../mail/em-vfolder-rule.c:590
 msgid "Search Folder source"
 msgstr "Ffynhonnell Plygell Chwilio"
 
 #: ../mail/evolution-mail.schemas.in.in.h:1
+msgid "Allows evolution to display text part of limited size"
+msgstr "Gadael i evolution ddangos rhan destun o faint cyfyngedig"
+
+#: ../mail/evolution-mail.schemas.in.in.h:2
 msgid "Automatic link recognition"
 msgstr "Adnabod cysylltiadau'n awtomatig"
 
-#: ../mail/evolution-mail.schemas.in.in.h:2
+#: ../mail/evolution-mail.schemas.in.in.h:3
 msgid "Automatic smiley recognition"
 msgstr "Adnabod gwenogluniau'n awtomatig"
 
-#: ../mail/evolution-mail.schemas.in.in.h:3
+#: ../mail/evolution-mail.schemas.in.in.h:4
 msgid "Check incoming mail being junk"
 msgstr "Gwirio a yw'r e-bost sy'n dod i mewn yn sothach"
 
-#: ../mail/evolution-mail.schemas.in.in.h:4
+#: ../mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight color"
 msgstr "Lliw aroleuo dyfyniad"
 
-#: ../mail/evolution-mail.schemas.in.in.h:5
+#: ../mail/evolution-mail.schemas.in.in.h:6
 msgid "Citation highlight color."
 msgstr "Lliw aroleuo dyfyniad."
 
-#: ../mail/evolution-mail.schemas.in.in.h:6
+#: ../mail/evolution-mail.schemas.in.in.h:7
 msgid "Composer Window default height"
 msgstr "Uchder rhagosodedig Ffenest Gyfansoddi"
 
-#: ../mail/evolution-mail.schemas.in.in.h:7
+#: ../mail/evolution-mail.schemas.in.in.h:8
 msgid "Composer Window default width"
 msgstr "Lled rhagosodedig Ffenest Gyfansoddi"
 
-#: ../mail/evolution-mail.schemas.in.in.h:8
+#: ../mail/evolution-mail.schemas.in.in.h:9
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Cywasgu dangosiad cyfeiriadau yn yr olwg AT/CC/BCC"
 
-#: ../mail/evolution-mail.schemas.in.in.h:9
+#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -12393,77 +12298,94 @@ msgstr ""
 "Cywasgu dangosiad cyfeiriadau yn yr olwg AT/CC/BCC i'r nifer a benodir yn "
 "address_count."
 
-#: ../mail/evolution-mail.schemas.in.in.h:10
+#: ../mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to compose messages"
 msgstr "Set nodau ragosodedig er mwyn cyfansoddi negeseuon"
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.in.h:12
 msgid "Default charset in which to compose messages."
 msgstr "Set nodau ragosodedig er mwyn cyfansoddi negeseuon."
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.in.h:13
 msgid "Default charset in which to display messages"
 msgstr "Set nodau ragosodedig er mwyn dangos negeseuon"
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.in.h:14
 msgid "Default charset in which to display messages."
 msgstr "Set nodau ragosodedig er mwyn dangos negeseuon."
 
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.in.h:15
 msgid "Default forward style"
 msgstr "Arddull ragosodedig gyrru ymlaen"
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.in.h:16
 msgid "Default height of the Composer Window"
 msgstr "Uchder rhagosodedig y Ffenest Gyfansoddi"
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.in.h:17
 msgid "Default height of the Message Window"
 msgstr "Uchder rhagosodedig y Ffenest Neges"
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.in.h:18
 msgid "Default height of the Subscribe dialog"
 msgstr "Uchder rhagosodedig y ddeialog Tanysgrifio"
 
-#: ../mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.in.h:19
 msgid "Default reply style"
 msgstr "Arddull ateb rhagosod"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.in.h:20
+#, fuzzy
+msgid "Default value for thread expand state"
+msgstr "Pwnc rhagosodedig y neges."
+
+#: ../mail/evolution-mail.schemas.in.in.h:21
 msgid "Default width of the Composer Window"
 msgstr "Lled rhagosodedig y Ffenest Gyfansoddi"
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Default width of the Message Window"
 msgstr "Lled rhagosodedig y Ffenest Neges"
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Default width of the Subscribe dialog"
 msgstr "Lled rhagosodedig y ddeialog Tanysgrifio"
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.in.h:24
+msgid "Directory for saving mail component files"
+msgstr "Cyfeiriadur i gadw ffeiliau cydran e-bost"
+
+#: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Dangos marciau gwallau sillafu ar eiriau wrth i chi deipio."
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.in.h:26
+msgid "Empty Junk folders on exit"
+msgstr "Gwacáu plygellau Sbwriel wrth adael"
+
+#: ../mail/evolution-mail.schemas.in.in.h:27
 msgid "Empty Trash folders on exit"
 msgstr "Gwacáu plygellau Sbwriel wrth adael"
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.in.h:28
+msgid "Empty all Junk folders when exiting Evolution."
+msgstr "Gwacáu bob plygell Sbwriel wrth adael Evolution."
+
+#: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Gwagio bob plygell Sbwriel wrth adael Evolution."
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.in.h:30
 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."
 
-#: ../mail/evolution-mail.schemas.in.in.h:26
+#: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "Enable or disable type ahead search feature"
 msgstr "Galluogi neu analluogi'r nodwedd chwilio wrth deipio ymlaen"
 
-#: ../mail/evolution-mail.schemas.in.in.h:27
+#: ../mail/evolution-mail.schemas.in.in.h:32
 msgid ""
 "Enable side bar search feature so that you can start interactive searching "
 "by typing in the text. Use is that you can easily find a folder in that side "
@@ -12475,19 +12397,23 @@ msgstr ""
 "plygell o fewn y bar ochr hwnnw yn hawdd wrth deipio enw'r blygell, ac fe "
 "fydd y dewis yn neidio'n awtomatig at y blygell honno."
 
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:33
+msgid "Enable to render message text part of limited size."
+msgstr "Methu rendro'r rhan destun neges o faint cyfyngedig."
+
+#: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "Enable/disable caret mode"
 msgstr "Galluogi/analluogi'r modd caret"
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:35
 msgid "Height of the message-list pane"
 msgstr "Uchder y cwarel rhestr negeseuon"
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "Height of the message-list pane."
 msgstr "Uchder y cwarel rhestr negeseuon."
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:37
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12495,7 +12421,7 @@ 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.in.h:32
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -12503,7 +12429,7 @@ msgstr ""
 "Os yw'r panel \"Rhagolwg\" ar waith, ei ddangos ochr-yn-ochr yn hytrach na'n "
 "fertigol."
 
-#: ../mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.in.h:39
 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 "
@@ -12513,27 +12439,37 @@ msgstr ""
 "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.in.h:34
+#: ../mail/evolution-mail.schemas.in.in.h:40
+msgid ""
+"It disables the feature where repeated prompts to ask if offline sync is "
+"required."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr "Mae'n galluogi/analluogi'r prompt wrth farcio mwy nag un neges."
 
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:42
+msgid "Last time empty junk was run"
+msgstr "Y tro diwethaf rhedwyd y broses o wagio'r sbwriel"
+
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Last time empty trash was run"
 msgstr "Y tro diwethaf rhedwyd y broses o wagio'r sbwriel"
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "List of Labels and their associated colors"
 msgstr "Rhestr o Labeli a'r lliwiau sy'n gysylltiedig"
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "List of accepted licenses"
 msgstr "Rhestr trwyddedau wedi'u derbyn"
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "List of accounts"
 msgstr "Rhestr cyfrifon"
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12542,11 +12478,11 @@ msgstr ""
 "cynnwys llinynnau sy'n enwi is-blygellau perthynol i /apps/evolution/mail/"
 "accounts."
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "List of custom headers and whether they are enabled."
 msgstr "Rhestr o benawdau addasedig ac a ydynt wedi eu galluogi."
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:49
 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."
@@ -12555,19 +12491,19 @@ msgstr ""
 "cynnwys llinynnau sy'n cynnwys enw:lliw lle mae lliw yn defnyddio'r amgodiad "
 "hecs HTML."
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Rhestr o fathau mime i'w gwirio ar gyfer gwelyddion cydrannau bonobo"
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "List of protocol names whose license has been accepted."
 msgstr "Rhestr o enwau protocol y mae eu trwyddedau wedi eu derbyn."
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Load images for HTML messages over http"
 msgstr "Llwytho delweddau ar gyfer negeseuon HTML dros http"
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images in mail from contacts 2 - Always "
@@ -12577,98 +12513,110 @@ msgstr ""
 "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.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "Log filter actions"
 msgstr "Cofnodi gweithredoedd hidlo"
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Log filter actions to the specified log file."
 msgstr "Logio gweithredoedd hidlo yn y ffeil benodol."
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Logfile to log filter actions"
 msgstr "Ffeil i logio gweithredoedd hidlo"
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:57
 msgid "Logfile to log filter actions."
 msgstr "Ffeil i logio gweithredoedd hidlo."
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Mark as Seen after specified timeout"
 msgstr "Marcio wedi'u Gweld ar ôl amser penodol"
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Mark as Seen after specified timeout."
 msgstr "Marcio wedi'u Gweld ar ôl amser penodol."
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marcio dyfyniadau yn y neges \"Rhagolwg\""
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:61
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marcio dyfyniadau yn y neges \"Rhagolwg\"."
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Message Window default height"
 msgstr "Uchder rhagosodedig Ffenest Neges"
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Message Window default width"
 msgstr "Lled rhagosodedig Ffenest Neges"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Arddull dangos-neges (\"arferol\", \"penawdau llawn\", \"ffynhonnell\")"
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:65
+msgid "Minimum days between emptying the junk on exit"
+msgstr "Nifer lleiaf o ddyddiau rhwng gwacáu'r sbwriel wrth adael"
+
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Nifer lleiaf o ddyddiau rhwng gwagio'r sbwriel wrth adael"
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:67
+msgid "Minimum time between emptying the junk on exit, in days."
+msgstr "Lleiafswm amser rhwng gwacáu'r sbwriel wrth adael, mewn diwrnodau."
+
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Lleiafswm amser rhwng gwagio'r sbwriel wrth adael, mewn diwrnodau."
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "New Mail Notify sound file"
 msgstr "Ffeil sain hysbysu am e-bost newydd"
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "New Mail Notify type"
 msgstr "Math Hysbysu am Ebost Newydd"
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
+#: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Y nifer o gyfeiriadau i'w dangos yn yr olwg AT/CC/BCC"
 
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:72
 msgid "Prompt on empty subject"
 msgstr "Rhybuddio am bwnc gwag"
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:73
 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.in.h:64
+#: ../mail/evolution-mail.schemas.in.in.h:74
 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.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:75
+msgid "Prompt to check if the user wants to go offline immediately"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Prompt when user expunges"
 msgstr "Promptio pan mae'r defnyddiwr yn chwynnu"
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Prompt when user only fills Bcc"
 msgstr "Promptio pan mae'r defnyddiwr yn llenwi Bcc yn unig"
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:78
 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"
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -12676,58 +12624,62 @@ 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.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:80
 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:"
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Promptio pan mae'r defnyddiwr yn ceisio anfon HTML diofyn amdano"
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
+#: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "Prompt while marking multiple messages"
 msgstr "Promptio wrth farcio mwy nag un neges"
 
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "Recognize links in text and replace them."
 msgstr "Adnabod cysylltion o fewn y testun a'u hamnewid."
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.in.h:84
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Adnabod gwenogluniau o fewn y testun a'u hamnewid."
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Run junk test on incoming mail"
 msgstr "Rhedeg prawf sothach ar yr e-bost sy'n dod i mewn"
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:86
+msgid "Save directory"
+msgstr "Cyfeiriadur cadw"
+
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Send HTML mail by default"
 msgstr "Anfon e-bost HTML yn rhagosod"
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Send HTML mail by default."
 msgstr "Anfon e-bost HTML yn rhagosod."
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Show Animations"
 msgstr "Dangos Animeiddio"
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "Show animated images as animations."
 msgstr "Dangos delweddau animeiddiedig fel animeiddiadau."
 
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.in.h:91
 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."
 
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "Show deleted messages in the message-list"
 msgstr "Dangos negeseuon sydd wedi eu dileu o fewn y rhestr negeseuon."
 
-#: ../mail/evolution-mail.schemas.in.in.h:83
+#: ../mail/evolution-mail.schemas.in.in.h:95
 msgid ""
 "Show the email of the sender in the messages composite column in the message "
 "list"
@@ -12735,52 +12687,84 @@ msgstr ""
 "Dangos cyfeiriad e-bost yr anfonwr o fewn colofn gyfansawdd y negeseuon yn y "
 "rhestr negeseuon"
 
-#: ../mail/evolution-mail.schemas.in.in.h:84
+#: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Show the sender email in the messages column in the message list"
 msgstr ""
 "Dangos cyfeiriad e-bost yr anfonwr o fewn y golofn negeseuon yn y rhestr "
 "negeseuon"
 
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Sound file to play when new mail arrives."
 msgstr "Ffeil sain i'w chwarae pan fo e-bost newydd yn cyrraedd."
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 "Penodi'r math o nodyn Hysbysu am Ebost Newydd mae'r defnyddiwr am weld."
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "Spell check inline"
 msgstr "Gwirio sillafu'n fewnol"
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "Subscribe dialog default height"
 msgstr "Uchder rhagosodedig deialog Tanysgrifio"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "Subscribe dialog default width"
 msgstr "Lled rhagosodedig deialog Tanysgrifio"
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "Terminal font"
 msgstr "Ffont terfynell"
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:103
+msgid "Text message part limit"
+msgstr "Cyfyngiad rhan neges destun"
+
+#: ../mail/evolution-mail.schemas.in.in.h:104
+msgid "The default plugin for Junk hook"
+msgstr "Ategyn rhagosodedig i'r bachyn Sothach"
+
+#: ../mail/evolution-mail.schemas.in.in.h:105
+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."
+
+#: ../mail/evolution-mail.schemas.in.in.h:106
 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."
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "The terminal font for mail display"
 msgstr "Y ffont terfynell er mwyn dangos e-bost"
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.in.h:108
 msgid "The variable width font for mail display"
 msgstr "Y ffont lled newidiol er mwyn dangos e-bost"
 
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:109
+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 interms 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.in.h:110
+msgid ""
+"This is the default junk plugin, even though there are multiple plugins "
+"enabled. If the default listed plugin is disabled, then it wont 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.in.h:111
 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;"
@@ -12792,7 +12776,7 @@ msgstr ""
 "pennawd galluogwyd&gt; - gosodwch 'galluogwyd' os yw'r pennawd am gael ei "
 "ddangos yn yr olwg e-bost."
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
+#: ../mail/evolution-mail.schemas.in.in.h:112
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -12800,103 +12784,109 @@ 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.in.h:96
+#: ../mail/evolution-mail.schemas.in.in.h:113
+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.in.h:114
 msgid "Thread the message list."
 msgstr "Edafu'r rhestr negeseuon."
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:115
 msgid "Thread the message-list"
 msgstr "Edafu'r rhestr negeseuon"
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:116
 msgid "Thread the message-list based on Subject"
 msgstr "Creu edafedd o'r rhestr negeseuon, yn seiliedig ar y pynciau"
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:117
 msgid "Timeout for marking message as Seen"
 msgstr "Terfyn amser cyn marcio neges fel un wedi ei Gweld"
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:118
 msgid "Timeout for marking message as Seen."
 msgstr "Terfyn amser cyn marcio neges fel un wedi ei Gweld."
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:119
 msgid "UID string of the default account."
 msgstr "Llinyn UID y cyfrif rhagosodedig."
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
-msgid "Use Spamassassin daemon and client"
+#: ../mail/evolution-mail.schemas.in.in.h:120
+msgid "Use SpamAssassin daemon and client"
 msgstr "Defnyddio ellyll a chleient Spamassassin"
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
-msgid "Use Spamassassin daemon and client (spamc/spamd)"
+#: ../mail/evolution-mail.schemas.in.in.h:121
+msgid "Use SpamAssassin daemon and client (spamc/spamd)"
 msgstr "Defnyddio ellyll a chleient Spamassassin (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:122
 msgid "Use custom fonts"
 msgstr "Defnyddio ffontiau addasedig"
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:123
 msgid "Use custom fonts for displaying mail"
 msgstr "Defnyddio ffontiau addasedig i ddangos e-bost"
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.in.h:124
 msgid "Use only local spam tests."
 msgstr "Defnyddio dim ond y profion sothach lleol."
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:125
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Defnyddio dim ond y profion sothach lleol (dim DNS)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
+#: ../mail/evolution-mail.schemas.in.in.h:126
 msgid "Use side-by-side or wide layout"
 msgstr "Defnyddio cynllun ochr-yn-ochr neu gynllun llydan"
 
-#: ../mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.in.h:127
 msgid "Variable width font"
 msgstr "Ffont lled amrywiol"
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.in.h:128
 msgid "View/Bcc menu item is checked"
 msgstr "Eitem ddewislen Gweld/Bcc wedi ei thicio"
 
-#: ../mail/evolution-mail.schemas.in.in.h:111
+#: ../mail/evolution-mail.schemas.in.in.h:129
 msgid "View/Bcc menu item is checked."
 msgstr "Eitem ddewislen Gweld/Bcc wedi ei thicio."
 
-#: ../mail/evolution-mail.schemas.in.in.h:112
+#: ../mail/evolution-mail.schemas.in.in.h:130
 msgid "View/Cc menu item is checked"
 msgstr "Eitem ddewislen Gweld/Cc wedi ei thicio"
 
-#: ../mail/evolution-mail.schemas.in.in.h:113
+#: ../mail/evolution-mail.schemas.in.in.h:131
 msgid "View/Cc menu item is checked."
 msgstr "Eitem ddewislen Gweld/Cc wedi ei thicio."
 
-#: ../mail/evolution-mail.schemas.in.in.h:114
+#: ../mail/evolution-mail.schemas.in.in.h:132
 msgid "View/From menu item is checked"
 msgstr "Eitem ddewislen Gweld/I wedi ei thicio"
 
-#: ../mail/evolution-mail.schemas.in.in.h:115
+#: ../mail/evolution-mail.schemas.in.in.h:133
 msgid "View/From menu item is checked."
 msgstr "Eitem ddewislen Gweld/I wedi ei thicio."
 
-#: ../mail/evolution-mail.schemas.in.in.h:116
+#: ../mail/evolution-mail.schemas.in.in.h:134
 msgid "View/PostTo menu item is checked"
 msgstr "Eitem ddewislen Gweld/Postio I wedi ei thicio"
 
-#: ../mail/evolution-mail.schemas.in.in.h:117
+#: ../mail/evolution-mail.schemas.in.in.h:135
 msgid "View/PostTo menu item is checked."
 msgstr "Eitem ddewislen Gweld/Postio I wedi ei thicio."
 
-#: ../mail/evolution-mail.schemas.in.in.h:118
+#: ../mail/evolution-mail.schemas.in.in.h:136
 msgid "View/ReplyTo menu item is checked"
 msgstr "Eitem ddewislen Gweld/Ateb I wedi ei thicio"
 
-#: ../mail/evolution-mail.schemas.in.in.h:119
+#: ../mail/evolution-mail.schemas.in.in.h:137
 msgid "View/ReplyTo menu item is checked."
 msgstr "Eitem ddewislen Gweld/Ateb I wedi ei thicio."
 
-#: ../mail/evolution-mail.schemas.in.in.h:120
+#: ../mail/evolution-mail.schemas.in.in.h:138
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12904,11 +12894,11 @@ 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.in.h:121
+#: ../mail/evolution-mail.schemas.in.in.h:139
 msgid "Width of the message-list pane"
 msgstr "Lled y cwarel rhestr negeseuon"
 
-#: ../mail/evolution-mail.schemas.in.in.h:122
+#: ../mail/evolution-mail.schemas.in.in.h:140
 msgid "Width of the message-list pane."
 msgstr "Lled y cwarel rhestr negeseuon."
 
@@ -12925,12 +12915,10 @@ msgid "Import mail from Elm."
 msgstr "Mewnforio e-bost o Elm."
 
 #: ../mail/importers/evolution-mbox-importer.c:83
-#: ../mail/importers/evolution-outlook-importer.c:136
 msgid "Destination folder:"
 msgstr "Plygell gyrchfan:"
 
 #: ../mail/importers/evolution-mbox-importer.c:86
-#: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder to import into"
 msgstr "Dewiswch blygell i fewnforio iddi"
 
@@ -12942,112 +12930,20 @@ msgstr "Blwch E-bost ffurf Berkeley (mbox)"
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Mewnforio plygellau ffurf E-bost Berkeley (mbox)"
 
-#: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:529
-#, c-format
-msgid "Importing `%s'"
-msgstr "Mewnforio `%s'"
-
-#: ../mail/importers/evolution-outlook-importer.c:266
-#: ../mail/importers/netscape-importer.c:1254
-#: ../plugins/startup-wizard/startup-wizard.c:235
-#: ../shell/e-shell-importer.c:536
-msgid "Please wait"
-msgstr "Arhoswch os gwelwch yn dda"
-
-#: ../mail/importers/evolution-outlook-importer.c:310
 #: ../mail/importers/mail-importer.c:148
 msgid "Importing mailbox"
 msgstr "Mewnforio blwch e-bost"
 
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:515
+#, c-format
+msgid "Importing `%s'"
+msgstr "Mewnforio `%s'"
+
 #: ../mail/importers/mail-importer.c:376
 #, c-format
 msgid "Scanning %s"
 msgstr "Sganio %s"
 
-#: ../mail/importers/netscape-importer.c:74
-#, c-format
-msgid "Priority Filter \"%s\""
-msgstr "Hidlydd Blaenoriaeth \"%s\""
-
-#: ../mail/importers/netscape-importer.c:663
-msgid ""
-"Some of your Netscape email filters are based on\n"
-"email priorities, which are not used in Evolution.\n"
-"Instead, Evolution provides scores in the range of\n"
-"-3 to 3 that can be assigned to emails and filtered\n"
-"accordingly.\n"
-"\n"
-"As a workaround, a set of filters called \"Priority Filter\"\n"
-"was added that converts Netscape's email priorities into\n"
-"Evolution's scores, and the affected filters use scores instead\n"
-"of priorities. Check the imported filters to make sure\n"
-"everything still works as intended."
-msgstr ""
-"Mae rhai o'ch hidlyddion e-bost Netscape yn seiliedig ar\n"
-"flaenoriaethau e-bost. Ni ddefnyddir y rhain o fewn Evolution.\n"
-"Yn lle hynny, mae Evolution yn rhoi sgoriau sy'n amrywio o\n"
-"-3 i 3, y gellir eu neilltuo i negeseuon e-bost a'u hidlo'n\n"
-"briodol.\n"
-"\n"
-"I oresgyn y broblem, ychwanegwyd set o hidlyddion o'r enw\n"
-"\"Hidlyddion Blaenoriaeth\". Mae'r rhain yn trosi blaenoriaethau\n"
-"e-bost Netscape i mewn i sgoriau Evolution, ac mae'r hidlyddion\n"
-"sy'n cael eu heffeithio yn defnyddio sgoriau yn hytrach na\n"
-"blaenoriaethau. Gwiriwch yr hidlyddion gafodd eu heffeithio\n"
-"i wneud yn siŵr fod popeth yn gweithio fel y dylai."
-
-#: ../mail/importers/netscape-importer.c:687
-msgid ""
-"Some of your Netscape email filters use\n"
-"the \"Ignore Thread\" or \"Watch Thread\"\n"
-"feature, which is not supported in Evolution.\n"
-"These filters will be dropped."
-msgstr ""
-"Mae rhai o'ch hidlyddion e-bost Netscape yn\n"
-"defnyddio'r nodweddion \"Anwybyddu Trywydd\"\n"
-"neu \"Gwylio Trywydd\". Ni chynhelir y rhain o fewn\n"
-"Evolution. Fe fydd yr hidlyddion hynny'n cael eu gollwng."
-
-#: ../mail/importers/netscape-importer.c:704
-msgid ""
-"Some of your Netscape email filters test the\n"
-"body of emails for (in)equality to a given string,\n"
-"which is not supported in Evolution. Those filters\n"
-"were modified to test whether that string is or is not\n"
-"contained in the message body."
-msgstr ""
-"Mae rhai o'ch hidlyddion e-bost Netscape yn profi\n"
-"corff negeseuon e-bost i weld a ydynt yn gyfatebol\n"
-"(neu ddim) i linyn arbennig. Ni chynhelir hyn o fewn\n"
-"Evolution. Bydd yr hidlyddion yn cael eu haddasu\n"
-"er mwyn profi a yw'r llinyn wedi ei gynnwys ai peidio\n"
-"o fewn corff yr e-bost."
-
-#: ../mail/importers/netscape-importer.c:1251
-msgid "Evolution is importing your old Netscape data"
-msgstr "Mae Evolution yn mewnforio'ch hen ddata Netscape"
-
-#: ../mail/importers/netscape-importer.c:1708
-msgid "Importing Netscape data"
-msgstr "Mewnforio data Netscape"
-
-#: ../mail/importers/netscape-importer.c:1908
-msgid "Settings"
-msgstr "Gosodiadau"
-
-#: ../mail/importers/netscape-importer.c:1913
-msgid "Mail Filters"
-msgstr "Hidlyddion Ebost"
-
-#: ../mail/importers/netscape-importer.c:1934
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
-msgstr ""
-"Mae Evolution wedi canfod hen ffeiliau e-bost Netscape.\n"
-"Hoffech chi eu mewnforio i Evolution?"
-
 #: ../mail/importers/pine-importer.c:229
 msgid "Importing Pine data"
 msgstr "Mewnforio data Pine"
@@ -13084,7 +12980,7 @@ msgstr "rhestr e-bost %s"
 msgid "Add Filter Rule"
 msgstr "Ychwanegu Rheol Hidlydd"
 
-#: ../mail/mail-component.c:521
+#: ../mail/mail-component.c:524
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -13092,7 +12988,7 @@ msgstr[0] "%d wedi dileu"
 msgstr[1] "%d wedi dileu"
 msgstr[2] "%d wedi dileu"
 
-#: ../mail/mail-component.c:523
+#: ../mail/mail-component.c:526
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -13100,7 +12996,15 @@ msgstr[0] "%d sothach"
 msgstr[1] "%d sothach"
 msgstr[2] "%d sothach"
 
-#: ../mail/mail-component.c:546
+#: ../mail/mail-component.c:549
+#, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] "%d wedi dewis, "
+msgstr[1] "%d wedi dewis, "
+msgstr[2] "%d wedi dewis, "
+
+#: ../mail/mail-component.c:552
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -13108,7 +13012,7 @@ msgstr[0] "%d drafft"
 msgstr[1] "%d ddrafft"
 msgstr[2] "%d drafft"
 
-#: ../mail/mail-component.c:548
+#: ../mail/mail-component.c:554
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -13116,7 +13020,7 @@ msgstr[0] "%d wedi anfon"
 msgstr[1] "%d wedi anfon"
 msgstr[2] "%d wedi anfon"
 
-#: ../mail/mail-component.c:550
+#: ../mail/mail-component.c:556
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -13124,7 +13028,15 @@ msgstr[0] "%d heb ei anfon"
 msgstr[1] "%d heb eu hanfon"
 msgstr[2] "%d heb eu hanfon"
 
-#: ../mail/mail-component.c:554
+#: ../mail/mail-component.c:561
+#, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] "%d heb ei ddarllen, "
+msgstr[1] "%d heb eu darllen, "
+msgstr[2] "%d heb eu darllen, "
+
+#: ../mail/mail-component.c:562
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -13132,63 +13044,55 @@ msgstr[0] "%d yn gyfanswm"
 msgstr[1] "%d yn gyfanswm"
 msgstr[2] "%d yn gyfanswm"
 
-#: ../mail/mail-component.c:556
-#, c-format
-msgid ", %d unread"
-msgid_plural ", %d unread"
-msgstr[0] ", %d heb ei ddarllen"
-msgstr[1] ", %d heb eu darllen"
-msgstr[2] ", %d heb eu darllen"
-
-#: ../mail/mail-component.c:819
+#: ../mail/mail-component.c:889
 msgid "New Mail Message"
 msgstr "Neges Ebost Newydd"
 
-#: ../mail/mail-component.c:820
+#: ../mail/mail-component.c:890
 msgid "_Mail Message"
 msgstr "Neges _Ebost"
 
-#: ../mail/mail-component.c:821
+#: ../mail/mail-component.c:891
 msgid "Compose a new mail message"
 msgstr "Cyfansoddi neges e-bost newydd"
 
-#: ../mail/mail-component.c:827
+#: ../mail/mail-component.c:897
 msgid "New Mail Folder"
 msgstr "Plygell Ebost Newydd"
 
-#: ../mail/mail-component.c:828
+#: ../mail/mail-component.c:898
 msgid "Mail _Folder"
 msgstr "_Plygell Ebost"
 
-#: ../mail/mail-component.c:829
+#: ../mail/mail-component.c:899
 msgid "Create a new mail folder"
 msgstr "Creu plygell e-bost newydd"
 
-#: ../mail/mail-component.c:973
+#: ../mail/mail-component.c:1045
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Methu wrth uwchraddio plygellau neu osodiadau e-bost."
 
-#: ../mail/mail-config.c:85
+#: ../mail/mail-config.c:81
 msgid "I_mportant"
 msgstr "_Pwysig"
 
 #. red
-#: ../mail/mail-config.c:86
+#: ../mail/mail-config.c:82
 msgid "_Work"
 msgstr "_Gwaith"
 
 #. orange
-#: ../mail/mail-config.c:87
+#: ../mail/mail-config.c:83
 msgid "_Personal"
 msgstr "_Personol"
 
 #. forest green
-#: ../mail/mail-config.c:88
+#: ../mail/mail-config.c:84
 msgid "_To Do"
 msgstr "_I'w wneud"
 
 #. blue
-#: ../mail/mail-config.c:89
+#: ../mail/mail-config.c:85
 msgid "_Later"
 msgstr "_Hwyrach"
 
@@ -13209,204 +13113,195 @@ msgid "<b>_Languages</b>"
 msgstr "<b>_Ieithoedd</b>"
 
 #: ../mail/mail-config.glade.h:6
-msgid "<small>This will make the the filter more reliable, but slower</small>"
-msgstr ""
-"<small>Bydd hyn yn gwneud yr hidlydd yn fwy dibynnol, ond yn arafach</small>"
-
-#: ../mail/mail-config.glade.h:7
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Gwybodaeth Cyfrif</span>"
 
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">Math Dilysiant</span>"
 
-#: ../mail/mail-config.glade.h:10
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Dilysiant</span>"
 
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Cyfansoddi Negeseuon</span>"
 
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Cyfluniad</span>"
 
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Ymddygiad Rhagosodedig</span>"
 
-#: ../mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Dileu Ebost</span>"
 
-#: ../mail/mail-config.glade.h:15
+#: ../mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">Penawdau Ebost _Wedi'u Dangos </span>"
 
 #: ../mail/mail-config.glade.h:16
-msgid "<span weight=\"bold\">Filter Options</span>"
-msgstr "<span weight=\"bold\">Dewisiadau Hidlo</span>"
-
-#: ../mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Labeli a Lliwiau</span>"
 
-#: ../mail/mail-config.glade.h:19
+#: ../mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Llwytho Delweddau</span>"
 
-#: ../mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Dangos Negeseuon</span>"
 
-#: ../mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Ffontiau Negeseuon</span>"
 
-#: ../mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">Derbynwyr Negeseuon</span>"
 
-#: ../mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Hysbysiad Ebost Newydd</span>"
 
-#: ../mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:22
 #: ../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:23
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Dewisiadau</span>"
 
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:24
 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:25
 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:26
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Gwybodaeth Angenrheidiol</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">MIME Diogel (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Diogelwch</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:29
 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:32
+#: ../mail/mail-config.glade.h:30
 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:32
 msgid "Account Management"
 msgstr "Rheolaeth Cyfrifon"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:33
 msgid "Add Ne_w Signature..."
 msgstr "_Ychwanegu Llofnod Newydd..."
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:34
 msgid "Add _Script"
 msgstr "Ychwanegu _Sgript"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:35
 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:38
+#: ../mail/mail-config.glade.h:36
 msgid "Also encrypt to sel_f when sending encrypted mail"
 msgstr "Amgryptio'ch copi eich _hun hefyd wrth anfon e-bost wedi'i amgryptio"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:37
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "_Anfon copi-carbon (cc) bob amser at:"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:38
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "_Anfon copi-carbon dall (bcc) bob amser at:"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:39
 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:42
+#: ../mail/mail-config.glade.h:40
 msgid "Always encrypt to _myself when sending encrypted mail"
 msgstr "Amgryptio fy nghopi fy _hun hefyd wrth anfon e-bost wedi'i amgryptio"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:41
 msgid "Attach original message"
 msgstr "Atodi'r neges wreiddiol"
 
-#: ../mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:43
 msgid "Automatically insert _smiley images"
 msgstr "Rhoi delweddau _gwenoglun i mewn yn awtomatig"
 
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:44
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltig (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:45
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltig (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:46
 msgid "Beep w_hen new mail arrives"
 msgstr "Rhoi bîp pan fo _e-bost newydd yn cyrraedd"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:47
 msgid "C_haracter set:"
 msgstr "_Set nodau:"
 
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:48
 msgid "Ch_eck for Supported Types "
 msgstr "_Gwirio am Fathau Wedi'u Cynnal"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:49
 msgid "Check in_coming mail for junk"
 msgstr "_Gwirio'r e-bost sy'n dod i mewn ar gyfer sothach"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:50
 msgid "Check spelling while I _type"
 msgstr "Gwirio sillafu wrth i mi _deipio"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:51
 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:54
+#: ../mail/mail-config.glade.h:52
 msgid "Cle_ar"
 msgstr "C_lirio"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:53
 msgid "Clea_r"
 msgstr "Cl_irio"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:54
 msgid "Color for _misspelled words:"
 msgstr "Lliw'r geiriau _heb eu sillafu'n gywir:"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:55
 msgid "Colors"
 msgstr "Lliwiau"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:56
 msgid "Confirm _when expunging a folder"
 msgstr "_Cadarnhau wrth chwynnu plygell"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:57
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13422,18 +13317,28 @@ msgstr ""
 "\n"
 "Cliciwch \"Cymhwyso\" i gadw'ch gosodiadau."
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:63
 msgid "De_fault"
 msgstr "_Rhagosodiad"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:64
 msgid "Default character e_ncoding:"
 msgstr "_Amgodiad nodau rhagosod:"
 
-#: ../mail/mail-config.glade.h:69
+#: ../mail/mail-config.glade.h:66
+msgid "Delete junk mails on e_xit"
+msgstr "Dileu negeseuon sothach wrth _adael"
+
+#: ../mail/mail-config.glade.h:68
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Arwyddo'n ddigidol y negeseuon sy'n cael eu hanfon (fel rhagosodiad)"
 
+#: ../mail/mail-config.glade.h:69
+msgid "Do not format text contents in mails if the text si_ze exceeds"
+msgstr ""
+"Peidio â fformatio cynnwys testun o fewn e-bost os yw'r maint testun yn fwy "
+"na"
+
 #: ../mail/mail-config.glade.h:70
 msgid "Do not quote original message"
 msgstr "Peidio â dyfynnu'r neges wreiddiol"
@@ -13503,14 +13408,14 @@ msgstr "Penawdau"
 msgid "Highlight _quotations with"
 msgstr "Amlygu _dyfyniadau gyda"
 
-#: ../mail/mail-config.glade.h:89
-msgid "I_nclude remote tests"
-msgstr "Cynnwys profion pell"
-
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:91
 msgid "Inline"
 msgstr "Yn fewnol"
 
+#: ../mail/mail-config.glade.h:93
+msgid "KB"
+msgstr "KB"
+
 #: ../mail/mail-config.glade.h:94
 msgid "Languages Table"
 msgstr "Tabl Ieithoedd"
@@ -13739,81 +13644,85 @@ msgid "_Always load images from the Internet"
 msgstr "_Llwytho delweddau o'r Rhyngrwyd bob tro"
 
 #: ../mail/mail-config.glade.h:156
+msgid "_Default junk plugin:"
+msgstr "_Ategyn sbwriel rhagosodedig:"
+
+#: ../mail/mail-config.glade.h:157
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Peidio â'm hysbysu pan fo e-bost newydd yn cyrraedd"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:158
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr ""
 "_Peidio ag arwyddo ceisiadau am gyfarfodydd (er mwyn cydweddu ag Outlook)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:160
 msgid "_Forward style:"
 msgstr "Arddull yrru _ymlaen:"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:161
 msgid "_Load images in mail from contacts"
 msgstr "_Llwytho delweddau mewn negeseuon e-bost o gysylltiadau"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:162
 msgid "_Make this my default account"
 msgstr "Gwneud hon yn gyfrif rhagosodedig"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:163
 msgid "_Mark messages as read after"
 msgstr "_Marcio negeseuon fel rhai wedi eu darllen ar ôl"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:165
 msgid "_Never load images from the Internet"
 msgstr "_Peidio byth a llwytho delweddau o'r Rhyngrwyd"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:166
 msgid "_Path:"
 msgstr "_Llwybr:"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:167
 msgid "_Prompt when sending HTML messages to contacts that do not want them"
 msgstr ""
 "_Rhybuddio cyn anfon negeseuon HTML at gysylltiadau nad ydynt eu heisiau"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:168
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Rhybuddio cyn anfon negeseuon gyda _llinell bwnc wag"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "_Arddull ateb:"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr "_Sgript:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:173
 msgid "_Show image animations"
 msgstr "_Dangos delweddau wedi'u hanimeiddio"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:174
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Crebachu penawdau I / Cc / Bcc yn"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:175
 msgid "_Use Secure Connection:"
 msgstr "_Defnyddio cysylltiad diogel:"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:176
 msgid "_Use the same fonts as other applications"
 msgstr "_Defnyddio'r un ffontiau â rhaglenni eraill"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:177
 msgid "addresses"
 msgstr "cyfeiriadau"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:178
 msgid "color"
 msgstr "lliw"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:179
 msgid "description"
 msgstr "disgrifiad"
 
@@ -13850,7 +13759,7 @@ msgstr "Pob plygell leol"
 msgid "Case _sensitive"
 msgstr "_Cyfateb llythrennau bach/mawr"
 
-#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tags.glade.h:1
+#: ../mail/mail-dialogs.glade.h:9
 msgid "Co_mpleted"
 msgstr "_Cyflawnwyd"
 
@@ -13863,7 +13772,6 @@ msgid "Find in Message"
 msgstr "Canfod mewn Neges"
 
 #: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:297
-#: ../mail/message-tags.glade.h:2
 msgid "Flag to Follow Up"
 msgstr "Baner i Ddilyn Lan"
 
@@ -13891,7 +13799,7 @@ msgstr "Gwybodaeth Diogelwch"
 msgid "Specific folders"
 msgstr "Plygellau penodol"
 
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:3
+#: ../mail/mail-dialogs.glade.h:21
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13904,11 +13812,11 @@ msgstr ""
 msgid "_Accept License"
 msgstr "_Derbyn Trwydded"
 
-#: ../mail/mail-dialogs.glade.h:24 ../mail/message-tags.glade.h:5
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Due By:"
 msgstr "_Angen Erbyn:"
 
-#: ../mail/mail-dialogs.glade.h:25 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:25
 msgid "_Flag:"
 msgstr "_Baner"
 
@@ -13916,14 +13824,14 @@ msgstr "_Baner"
 msgid "_Tick this to accept the license agreement"
 msgstr "_Ticiwch hwn i dderbyn y cytundeb trwydded"
 
-#: ../mail/mail-folder-cache.c:858
+#: ../mail/mail-folder-cache.c:859
 #, c-format
 msgid "Pinging %s"
 msgstr "Yn pingio %s"
 
 #: ../mail/mail-ops.c:105
-msgid "Filtering Folder"
-msgstr "Hidlo Plygell"
+msgid "Filtering Selected Messages"
+msgstr "Wrthi'n Hidlo Negeseuon Ddewiswyd"
 
 #: ../mail/mail-ops.c:266
 msgid "Fetching Mail"
@@ -13960,7 +13868,7 @@ 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:632
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:703
 msgid "Canceled."
 msgstr "Diddymwyd."
 
@@ -14091,54 +13999,59 @@ msgstr "Datgysylltu o %s"
 msgid "Reconnecting to %s"
 msgstr "Ail-gysylltu â %s"
 
-#: ../mail/mail-ops.c:2379
+#: ../mail/mail-ops.c:2361
+#, fuzzy, c-format
+msgid "Preparing account '%s' for offline"
+msgstr "Cyfrif Exchange ddim ar-lein."
+
+#: ../mail/mail-ops.c:2444
 msgid "Checking Service"
 msgstr "Gwirio Gwasanaeth"
 
-#: ../mail/mail-send-recv.c:159
+#: ../mail/mail-send-recv.c:161
 msgid "Canceling..."
 msgstr "Diddymu..."
 
-#: ../mail/mail-send-recv.c:330
+#: ../mail/mail-send-recv.c:403
 msgid "Send & Receive Mail"
 msgstr "Anfon a Derbyn Ebost"
 
-#: ../mail/mail-send-recv.c:337
+#: ../mail/mail-send-recv.c:410
 msgid "Cancel _All"
 msgstr "Diddymu _Popeth"
 
-#: ../mail/mail-send-recv.c:434
+#: ../mail/mail-send-recv.c:516
 msgid "Updating..."
 msgstr "Diweddaru..."
 
-#: ../mail/mail-send-recv.c:434 ../mail/mail-send-recv.c:487
+#: ../mail/mail-send-recv.c:516 ../mail/mail-send-recv.c:583
 msgid "Waiting..."
 msgstr "Aros..."
 
-#: ../mail/mail-send-recv.c:718
+#: ../mail/mail-send-recv.c:791
 msgid "Checking for new mail"
 msgstr "Chwilio am Ebost Newydd"
 
-#: ../mail/mail-session.c:205
+#: ../mail/mail-session.c:200
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Rhowch Gymal Cyfrin ar gyfer %s"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:202
 msgid "Enter Passphrase"
 msgstr "Rhowch Gymal Cyfrin"
 
-#: ../mail/mail-session.c:210
+#: ../mail/mail-session.c:205
 #: ../plugins/exchange-operations/exchange-config-listener.c:711
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Rhowch Gyfrinair am %s"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:207
 msgid "Enter Password"
 msgstr "Rhowch Gyfrinair"
 
-#: ../mail/mail-session.c:250
+#: ../mail/mail-session.c:245
 msgid "User canceled operation."
 msgstr "Defnyddiwr wedi canslo'r weithred."
 
@@ -14205,11 +14118,17 @@ msgstr "Plygell Chwilio Newydd"
 
 #: ../mail/mail.error.xml.h:1
 msgid ""
+"A folder named &quot;{0}&quot; already exists. Please use a different name."
+msgstr ""
+"Mae plygell o'r enw &quot;{0}&quot; yn bodoli'n barod. Dewiswch enw gwahanol."
+
+#: ../mail/mail.error.xml.h:2
+msgid ""
 "A folder named &quot;{1}&quot; already exists. Please use a different name."
 msgstr ""
 "Mae plygell o'r enw &quot;{1}&quot; yn bodoli'n barod. Dewiswch enw arall."
 
-#: ../mail/mail.error.xml.h:2
+#: ../mail/mail.error.xml.h:3
 msgid ""
 "A non-empty folder at &quot;{1}&quot; already exists.\n"
 "\n"
@@ -14221,7 +14140,7 @@ msgstr ""
 "Gallwch ddewis anwybyddu'r blygell hon, trosysgrifo neu atodi at ei "
 "chynnwys, neu adael."
 
-#: ../mail/mail.error.xml.h:5
+#: ../mail/mail.error.xml.h:6
 msgid ""
 "A read receipt notification has been requested for &quot;{1}&quot;. Send the "
 "receipt notification to {0}?"
@@ -14229,14 +14148,14 @@ msgstr ""
 "Mae cais am nodyn cadarnhad darllen ar gyfer &quot;{1}&quot;.  Anfon y nodyn "
 "cadarnhad at {0}?"
 
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:7
 msgid ""
 "A signature already exists with the name &quot;{0}&quot;. 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:7
+#: ../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."
@@ -14244,24 +14163,24 @@ 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:8
+#: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account and 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:9
+#: ../mail/mail.error.xml.h:10
 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:10
+#: ../mail/mail.error.xml.h:11
 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:11
+#: ../mail/mail.error.xml.h:12
 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:12
+#: ../mail/mail.error.xml.h:13
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -14269,7 +14188,7 @@ 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:13
+#: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder &quot;{0}&quot;?"
@@ -14277,79 +14196,79 @@ msgstr ""
 "Ydych chi'n siŵr eich bod am waredu'n barhaol bob neges a ddilëwyd yn y "
 "blygell &quot;{0}&quot;?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Ydych chi'n siŵr eich bod am anfon neges ar ffurf HTML?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Ydych chi'n siŵr eich bod am anfon neges gyda dim ond derbynwyr BCC?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Ydych chi'n siŵr eich bod am anfon neges heb bwnc?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:18
 msgid "Because &quot;{0}&quot;."
 msgstr "Oherwydd &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:20
 msgid "Because &quot;{2}&quot;."
 msgstr "Oherwydd &quot;{2}&quot;."
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:21
 msgid "Blank Signature"
 msgstr "Llofnod Gwag"
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:22
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "Methu ychwanegu Plygell Chwilio &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Methu copïo plygell &quot;{0}&quot; i &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "Methu creu plygell &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create temporary save directory."
 msgstr "Ni ellir creu cyfeiriadur cadw dros dro."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "Methu creu'r cyfeiriadur cadw, o achos &quot;{1}&quot;"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "Methu dileu plygell &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "Methu dileu plygell system &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr "Methu golygu Plygell Chwilio &quot;{0}&quot; am nad yw'n bodoli."
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Methu symud plygell &quot;{0}&quot; i &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "Methu agor ffynhonnell &quot;{1}&quot;"
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "Methu agor ffynhonnell &quot;{2}&quot;."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "Methu agor targed &quot;{2}&quot;."
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:34
 msgid ""
 "Cannot read the license file &quot;{0}&quot;, due to an installation "
 "problem. You will not be able to use this provider until you can accept its "
@@ -14359,31 +14278,31 @@ msgstr ""
 "gosodiad.  Fedrwch chi ddim defnyddio'r darparwr hwn nes i chi dderbyn ei "
 "drwydded."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Methu ailenwi &quot;{0}&quot; i &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgstr "Methu ail-enwi neu symud plygell system &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot save changes to account."
 msgstr "Methu cadw'r newidiadau i'r cyfrif."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "Methu cadw at gyfeiriadur &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "Methu cadw at ffeil &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "Methu gosod sgript llofnod &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:41
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -14392,82 +14311,88 @@ msgstr ""
 "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:41
+#: ../mail/mail.error.xml.h:42
 msgid "Could not save signature file."
 msgstr "Methu cadw ffeil lofnod."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
 msgid "Delete &quot;{0}&quot;?"
 msgstr "Dileu &quot;{0}&quot;?"
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:44
 msgid "Delete account?"
 msgstr "Dileu'r cyfrif?"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:45
 msgid "Discard changes?"
 msgstr "Hepgor newidiadau?"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:46
 msgid "Do not delete"
 msgstr "Peidiwch â dileu"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:47
 msgid "Do not disable"
 msgstr "Peidiwch ag analluogi"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:48
 msgid "Do you want the operation to be performed in the subfolders?"
 msgstr "Ydych chi am i'r weithred gael ei pherfformio o fewn yr is-blygellau?"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
+msgid ""
+"Do you want to locally synchronize the folders that are marked for offline "
+"usage?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:50
 msgid "Do you want to mark all messages as read?"
 msgstr "Ydych chi am farcio'r holl negeseuon yn rhai wedi'u ddarllen?"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:51
 msgid "Do you wish to save your changes?"
 msgstr "A hoffech gadw eich newidiadau?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:52
 msgid "Enter password."
 msgstr "Rhowch gyfrinair."
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr "Gwall wrth lwytho diffiniadau hidlyddion."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:54
 msgid "Error while performing operation."
 msgstr "Gwall wrth wneud y weithred."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:55
 msgid "Error while {0}."
 msgstr "Gwall tra {0}."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:56
 msgid "File exists but cannot overwrite it."
 msgstr "Ffeil yn bodoli, ond methu ei throsysgrifo."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:57
 msgid "File exists but is not a regular file."
 msgstr "Ffeil yn bodoli ond nid yw'n ffeil arferol."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:58
 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:57
+#: ../mail/mail.error.xml.h:59
 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:58
+#: ../mail/mail.error.xml.h:60
 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."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:61
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14475,13 +14400,13 @@ msgstr ""
 "Os wnewch chi barhau, bydd y wybodaeth am y\n"
 "cyfrif a'i holl ddirprwyon yn cael ei ddileu'n barhaol."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:63
 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."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:64
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -14489,19 +14414,19 @@ 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:63
+#: ../mail/mail.error.xml.h:65
 msgid "Ignore"
 msgstr "Anwybyddu"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:66
 msgid "Invalid authentication"
 msgstr "Dilysiad annilys"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:68
 msgid "Mail filters automatically updated."
 msgstr "Hidlyddion e-bost wedi'u diweddaru'n awtomatig."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:69
 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 "
@@ -14513,39 +14438,39 @@ msgstr ""
 "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:67
+#: ../mail/mail.error.xml.h:70
 msgid "Mark all messages as read"
 msgstr "Marcio bob neges fel rhai wedi'u darllen"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:71
 msgid "Mark all messages in subfolders as read?"
 msgstr "Marcio bob neges yn yr isblygellau fel rhai wedi'u darllen?"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:72
 msgid "Mark as _Read"
 msgstr "_Marcio Wedi'u Darllen"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:73
 msgid "Missing folder."
 msgstr "Plygell coll."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:75
 msgid "No sources selected."
 msgstr "Dim ffynonellau wedi'u dewis."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:76
 msgid "Opening too many messages at once may take a long time."
 msgstr "Gall agor gormod o negeseuon ar yr un pryd gymryd cryn amser."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:77
 msgid "Please check your account settings and try again."
 msgstr "Gwiriwch osodiadau eich cyfrif cyn ail-geisio."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:78
 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:76
+#: ../mail/mail.error.xml.h:79
 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."
@@ -14553,7 +14478,7 @@ 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:77
+#: ../mail/mail.error.xml.h:80
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14565,47 +14490,56 @@ msgstr ""
 "{0}\n"
 "Anfon beth bynnag?"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "Rhowch enw unigryw er mwyn adnabod ar gyfer y llofnod."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "Arhoswch os gwelwch yn dda."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:85
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Problem wrth fudo'r hen blygell e-bost &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server"
 msgstr "Ymholi'r gweinydd"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:87
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Yn holi'r gweinydd am restr o'r dulliau dilysiant sydd wedi'u cynnal."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:88
 msgid "Read receipt requested."
 msgstr "Mae cais am anfon hysbys eich bod wedi darllen hwn."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:89
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "Dileu go iawn blygell &quot;{0}&quot; a'i holl is-blygellau?"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:90
 msgid "Search Folders automatically updated."
 msgstr "Plygellau Chwilio wedi'u diweddaru'n awtomatig."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:91
 msgid "Send Receipt"
 msgstr "Anfon Derbynneb"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:92
 msgid "Signature Already Exists"
 msgstr "Llofnod yn bodoli'n barod"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:93
+msgid "Synchronize"
+msgstr "Cysoni"
+
+#: ../mail/mail.error.xml.h:94
+#, fuzzy
+msgid "Synchronize folders locally for offline usage?"
+msgstr "Calendr heb ei farcio ar gyfer defnydd all-lein."
+
+#: ../mail/mail.error.xml.h:95
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -14613,7 +14547,7 @@ 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:91
+#: ../mail/mail.error.xml.h:96
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14630,7 +14564,7 @@ msgstr ""
 "dderbynwyr o fewn eich neges. I osgoi hyn, dylech ychwanegu o leiaf un "
 "derbyniwr At: neu CC:."
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14644,7 +14578,7 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "Diweddarwyd y Plygell(au) Chwilio."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14658,11 +14592,11 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "Diweddarwyd y rheol(au)."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:109
 msgid "The script file must exist and be executable."
 msgstr "Rhaid i'r ffeil sgript fodoli, a bod yn weithredadwy."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14670,7 +14604,7 @@ msgstr ""
 "Gall fod y blygell wedi ei hychwanegu ymhlyg ag eraill.\n"
 "Ewch i'r golygydd Plygell Chwilio i'w hychwanegu'n benodol, os oes angen."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:112
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -14678,12 +14612,12 @@ msgstr ""
 "Methu anfon y neges am nad yw'r cyfrif yr ydych am anfon drwyddo wedi ei "
 "alluogi"
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:113
 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:109
+#: ../mail/mail.error.xml.h:114
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14691,11 +14625,11 @@ 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:110
+#: ../mail/mail.error.xml.h:115
 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:111
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -14703,11 +14637,11 @@ msgstr ""
 "Marcio bob neges yn y blygell a ddewiswyd, a'r is-blygellau, fel rhai wedi'u "
 "darllen."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:117
 msgid "Unable to connect to the GroupWise server."
 msgstr "Methwyd cysylltu â'r gweinydd GroupWise."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:118
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14715,41 +14649,41 @@ msgstr ""
 "Methu agor y blygell ddrafftiau ar gyfer y cyfrif. Defnyddio plygell "
 "ddrafftiau'r system yn lle hynny?"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:119
 msgid "Unable to read license file."
 msgstr "Methu darllen y ffeil drwydded."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:120
 msgid "Use _Default"
 msgstr "Defnyddio'r _Rhagosodiad"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:121
 msgid "Use default drafts folder?"
 msgstr "Defnyddio plygell ddrafftiau rhagosodedig?"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:123
 msgid "You have not filled in all of the required information."
 msgstr "Dydych chi ddim wedi rhoi'r holl wybodaeth angenrheidiol."
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:124
 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?"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:125
 msgid "You may not create two accounts with the same name."
 msgstr "Fedrwch chi ddim creu dau gyfrif â'r un enw."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:126
 msgid "You must name this Search Folder."
 msgstr "Rhaid i chi enwi'r Blygell Chwilio."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:127
 msgid "You must specify a folder."
 msgstr "Rhaid i chi benodi plygell."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:128
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14759,98 +14693,102 @@ msgstr ""
 "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:124
+#: ../mail/mail.error.xml.h:130
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr "Methodd y mewngofnodi i weinydd &quot;{0}&quot; fel &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:131
 msgid "_Append"
 msgstr "_Atodi"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:132
 msgid "_Discard changes"
 msgstr "_Hepgor newidiadau"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:133
 msgid "_Do not Mark as Read"
 msgstr "Peidio â Marcio Wedi'u Darllen"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:134
+msgid "_Do not Synchronize"
+msgstr "_Peidio â Chysoni"
+
+#: ../mail/mail.error.xml.h:136
 msgid "_Expunge"
 msgstr "_Chwynnu"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:137
 msgid "_Open Messages"
 msgstr "_Agor Negeseuon"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1022
 msgid "Unseen"
 msgstr "Heb eu Gweld"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1023
 msgid "Seen"
 msgstr "Wedi'u Gweld"
 
-#: ../mail/message-list.c:1021
+#: ../mail/message-list.c:1024
 msgid "Answered"
 msgstr "Atebwyd"
 
-#: ../mail/message-list.c:1022
+#: ../mail/message-list.c:1025
 msgid "Multiple Unseen Messages"
 msgstr "Amryw Negeseuon Heb eu Gweld"
 
-#: ../mail/message-list.c:1023
+#: ../mail/message-list.c:1026
 msgid "Multiple Messages"
 msgstr "Amryw Negeseuon"
 
-#: ../mail/message-list.c:1027
+#: ../mail/message-list.c:1030
 msgid "Lowest"
 msgstr "Isaf"
 
-#: ../mail/message-list.c:1028
+#: ../mail/message-list.c:1031
 msgid "Lower"
 msgstr "Gostwng"
 
-#: ../mail/message-list.c:1032
+#: ../mail/message-list.c:1035
 msgid "Higher"
 msgstr "Uwch"
 
-#: ../mail/message-list.c:1033
+#: ../mail/message-list.c:1036
 msgid "Highest"
 msgstr "Uchaf"
 
-#: ../mail/message-list.c:1451 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1508 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1458 ../plugins/itip-formatter/itip-view.c:200
+#: ../mail/message-list.c:1515 ../plugins/itip-formatter/itip-view.c:201
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Heddiw %l:%M %p"
 
-#: ../mail/message-list.c:1467 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1524 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Ddoe %l:%M %p"
 
-#: ../mail/message-list.c:1479 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1536 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %l:$M %p"
 
-#: ../mail/message-list.c:1487 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1544 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1489 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1546 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2241 ../mail/message-list.etspec.h:9
+#: ../mail/message-list.c:2305 ../mail/message-list.etspec.h:9
 msgid "Messages"
 msgstr "Negeseuon"
 
-#: ../mail/message-list.c:3629
+#: ../mail/message-list.c:3751
 msgid "Generating message list"
 msgstr "Creu rhestr negeseuon"
 
@@ -14963,38 +14901,126 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr "Ategyn sain mewnol"
 
-#: ../plugins/backup-restore/backup-restore.c:51
-msgid "Select name of Evolution archive"
+#: ../plugins/backup-restore/backup-restore.c:96
+msgid "Select name of the Evolution archive"
 msgstr "Dewiswch enw archif Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:61
+#: ../plugins/backup-restore/backup-restore.c:120
 msgid "_Restart Evolution after backup"
 msgstr "_Ail-ddechrau Evolution ar ôl creu copïau wrth gefn"
 
-#: ../plugins/backup-restore/backup-restore.c:89
-msgid "Select Evolution archive to restore"
+#: ../plugins/backup-restore/backup-restore.c:139
+msgid "Select name of the Evolution archive to restore"
 msgstr "Dewiswch archif Evolution i'w hadfer"
 
-#: ../plugins/backup-restore/backup-restore.c:97
+#: ../plugins/backup-restore/backup-restore.c:163
 msgid "_Restart Evolution after restore"
 msgstr "_Ail-ddechrau Evolution ar ôl adfer"
 
+#: ../plugins/backup-restore/backup-restore.c:236
+msgid "Restore from backup"
+msgstr "Adfer o'r copi wrth gefn"
+
+#: ../plugins/backup-restore/backup-restore.c:238
+msgid ""
+"You can restore Evolution from your archive. It can restore all the Mails/"
+"Calendars/Tasks/Memos/Addressbook. \n"
+"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"
+"Mae hefyd yn adfer eich holl osodiadau personol, hidlyddion e-bost a.y.b."
+
+#: ../plugins/backup-restore/backup-restore.c:244
+msgid "_Restore Evolution from the backup archive"
+msgstr "_Ail-ddechrau Evolution o'r archif copïau wrth gefn"
+
+#: ../plugins/backup-restore/backup-restore.c:251
+msgid "Please select an Evolution Archive to restore:"
+msgstr "Dewiswch Archif Evolution i'w hadfer:"
+
+#: ../plugins/backup-restore/backup-restore.c:254
+msgid "Choose a file to restore"
+msgstr "Dewiswch ffeil i'w hadfer"
+
+#: ../plugins/backup-restore/backup.c:50 ../plugins/backup-restore/backup.c:90
+msgid "Shutting down Evolution"
+msgstr "Wrthi'n Cau Evolution"
+
+#: ../plugins/backup-restore/backup.c:55
+msgid "Backing Evolution accounts and settings"
+msgstr "Creu copi wrth gefn o ddata a gosodiadau Evolution"
+
+#: ../plugins/backup-restore/backup.c:60
+msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
+msgstr ""
+"Gwneud copi wrth gefn o ddata Evolution (E-bost, Cysylltiadau, Calendr, "
+"Tasgau, Memos)"
+
+#: ../plugins/backup-restore/backup.c:70
+msgid "Backup complete"
+msgstr "Wedi gorffen cadw copi wrth gefn"
+
+#: ../plugins/backup-restore/backup.c:75
+#: ../plugins/backup-restore/backup.c:116
+msgid "Restarting Evolution"
+msgstr "Wrthi'n ail-gychwyn Evolution"
+
+#: ../plugins/backup-restore/backup.c:94
+msgid "Backup current Evolution data"
+msgstr "Gwneud copi wrth gefn o ddata presennol Evolution"
+
+#: ../plugins/backup-restore/backup.c:99
+msgid "Extracting files from the archive"
+msgstr "Echdynnu ffeiliau o'r archif"
+
+#: ../plugins/backup-restore/backup.c:105
+msgid "Loading Evolution settings"
+msgstr "Llwytho gsodiadau Evolution"
+
 #: ../plugins/backup-restore/backup.c:109
+msgid "Removing temporary backup files"
+msgstr "Dileu ffeiliau dros dro o'r copïo wrth gefn"
+
+#: ../plugins/backup-restore/backup.c:214
 msgid "Backup Evolution directory"
 msgstr "Gwneud copi wrth gefn o gyfeiriadur Evolution"
 
-#: ../plugins/backup-restore/backup.c:111
+#: ../plugins/backup-restore/backup.c:216
 msgid "Restore Evolution directory"
 msgstr "Adfer cyfeiriadur Evolution"
 
-#: ../plugins/backup-restore/backup.c:113
+#: ../plugins/backup-restore/backup.c:218
 msgid "Check Evolution archive"
 msgstr "Chwilio archif Evolution"
 
-#: ../plugins/backup-restore/backup.c:115
+#: ../plugins/backup-restore/backup.c:220
 msgid "Restart Evolution"
 msgstr "Ail-gychwyn Evolution"
 
+#: ../plugins/backup-restore/backup.c:222
+msgid "With GUI"
+msgstr "Gyda GUI"
+
+#: ../plugins/backup-restore/backup.c:247
+#, c-format
+msgid "Backing up to %s"
+msgstr "Copi wrth gefn i %s"
+
+#: ../plugins/backup-restore/backup.c:252
+#, c-format
+msgid "Restoring from %s"
+msgstr "Cael copi wrth gefn o %s"
+
+#. Backup / Restore only can have GUI. We should restrict the rest
+#: ../plugins/backup-restore/backup.c:268
+msgid "Evolution Backup"
+msgstr "Copi wrth Gefn Evolution"
+
+#: ../plugins/backup-restore/backup.c:268
+msgid "Evolution Restore"
+msgstr "Adfer Evolution"
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
 msgstr ""
@@ -15005,52 +15031,94 @@ msgstr ""
 msgid "Backup and restore plugin"
 msgstr "Ategyn er mwyn creu copi wrth gefn, ac adfer data"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
-msgid "Backup Settings..."
-msgstr "_Gosodiadau Creu Copi wrth Gefn..."
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
+msgid "Are you sure you want to close Evolution?"
+msgstr "Ydych chi'n siŵr eich bod am gau Evolution?"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
+msgid "Are you sure you want to restore Evolution from the selected archive?"
+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."
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid "Invalid Evolution archive"
+msgstr "Archif Evolution annilys"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+msgid "Please select a valid archive file to restore."
+msgstr "Dewiswch ffeil archif ddilys i'w hadfer."
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+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
 msgid "Backup and restore Evolution data and settings"
 msgstr "Creu copi wrth gefn, ac adfer data a gosodiadau Evolution"
 
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+msgid "R_estore Settings..."
+msgstr "_Gosodiadau Adfer..."
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
-msgid "Restore Settings..."
-msgstr "Adfer Gosodiadau..."
+msgid "_Backup Settings..."
+msgstr "_Gosodiadau Creu Copi wrth Gefn..."
 
-#: ../plugins/bbdb/bbdb.c:430 ../plugins/bbdb/bbdb.c:439
+#: ../plugins/bbdb/bbdb.c:447 ../plugins/bbdb/bbdb.c:456
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Cysylltiadau Awtomatig"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:454
+#: ../plugins/bbdb/bbdb.c:471
 msgid ""
 "_Automatically create entries in the addressbook when responding to mail"
 msgstr ""
 "_Creu cofnodion yn awtomatig yn y llyfr cyfeiriadau wrth ymateb i e-bost"
 
-#: ../plugins/bbdb/bbdb.c:460
+#: ../plugins/bbdb/bbdb.c:477
 msgid "Select Address book for Automatic Contacts"
 msgstr "Dewis llyfr cyfeiriadau ar gyfer Cysylltiadau Awtomatig"
 
-#: ../plugins/bbdb/bbdb.c:475
+#: ../plugins/bbdb/bbdb.c:492
 msgid "Instant Messaging Contacts"
 msgstr "Cysylltiadau Negesu Sydyn"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:490
+#: ../plugins/bbdb/bbdb.c:507
 msgid ""
 "Periodically synchronize contact information and images from gaim buddy list"
 msgstr ""
 "Cysoni bob hyn a hyn y wybodaeth am gysylltion a'u delweddau o restr "
 "ffrindiau gaim"
 
-#: ../plugins/bbdb/bbdb.c:496
+#: ../plugins/bbdb/bbdb.c:513
 msgid "Select Address book for Gaim buddy list"
 msgstr "Dewis llyfr cyfeiriadau ar gyfer rhestr ffrindiau Gaim"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:507
+#: ../plugins/bbdb/bbdb.c:524
 msgid "Synchronize with _buddy list now"
 msgstr "Cysoni gyda'r _rhestr ffrindiau nawr"
 
@@ -15068,14 +15136,43 @@ msgstr ""
 msgid "BBDB"
 msgstr "BBDB"
 
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:302
+msgid "Convert mail text to _Unicode"
+msgstr "Trosi testun e-bost i _Unicode"
+
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.in.h:1
+msgid "Convert mail text to Unicode"
+msgstr "Trosi testun e-bost i Unicode"
+
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.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."
+
 #: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
 msgid "CalDAV"
 msgstr "CalDAV"
 
+#: ../plugins/caldav/caldav-source.c:247
+#: ../plugins/calendar-http/calendar-http.c:133
+msgid "_URL:"
+msgstr "_LAU:"
+
 #: ../plugins/caldav/caldav-source.c:269
 msgid "Use _SSL"
 msgstr "Defnyddio _SSL"
 
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
+msgid "CalDAV Calendar sources"
+msgstr "Ffynonellau calendr CalDAV"
+
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
+msgid "CalDAV sources"
+msgstr "Ffynonellau CalDAV"
+
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
 msgid "Local Calendars"
 msgstr "Calendrau lleol"
@@ -15084,6 +15181,11 @@ msgstr "Calendrau lleol"
 msgid "Provides core functionality for local calendars."
 msgstr "Darparu'r swyddogaethau craidd ar gyfer calendrau lleol."
 
+#: ../plugins/calendar-http/calendar-http.c:271
+#: ../plugins/calendar-weather/calendar-weather.c:548
+msgid "_Refresh:"
+msgstr "_Adnewyddu:"
+
 #: ../plugins/calendar-http/calendar-http.c:339
 msgid "_Secure connection"
 msgstr "_Cysylltiad diogel"
@@ -15195,8 +15297,8 @@ msgstr "Ffynonellau Rhagosodedig"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
 msgid ""
-"Provides functionallity for marking a calendar or addressbook as the default "
-"one."
+"Provides functionality for marking a calendar or an addressbook as the "
+"default one."
 msgstr ""
 "Darparu'r swyddogaethau er mwyn marcio calendr neu lyfr cyfeiriadau fel un "
 "rhagosodedig."
@@ -15281,7 +15383,7 @@ msgid "Manage the delegate settings for Exchange account"
 msgstr "Rheoli gosodiadau'r dirprwyon ar gyfer y cyfrif Exchange"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:337
-msgid "Delegation Assitant"
+msgid "Delegation Assistant"
 msgstr "Cynorthwyydd Dirprwyo"
 
 #. Miscelleneous settings
@@ -15319,8 +15421,19 @@ msgstr "Math Dilysiant"
 msgid "Ch_eck for Supported Types"
 msgstr "_Gwirio am Fathau wedi Cynnal"
 
+#: ../plugins/exchange-operations/exchange-account-setup.c:949
+#: ../plugins/exchange-operations/exchange-contacts.c:212
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:951
+#: ../plugins/exchange-operations/exchange-contacts.c:214
+msgid "0 KB"
+msgstr "0 KB"
+
 #: ../plugins/exchange-operations/exchange-calendar.c:191
-#: ../plugins/exchange-operations/exchange-contacts.c:166
+#: ../plugins/exchange-operations/exchange-contacts.c:165
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
@@ -15366,18 +15479,18 @@ msgid "Your password will expire in the next %d days"
 msgstr "Mae'ch cyfrinair yn dod i ben o fewn %d dydd"
 
 #. Custom
-#: ../plugins/exchange-operations/exchange-delegates-user.c:144
+#: ../plugins/exchange-operations/exchange-delegates-user.c:143
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
-#: ../widgets/table/e-table-header-item.c:1572
+#: ../widgets/table/e-table-header-item.c:1554
 msgid "Custom"
 msgstr "Addasedig"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:191
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "Caniatadau Dirprwy"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:202
+#: ../plugins/exchange-operations/exchange-delegates-user.c:201
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
 #, c-format
 msgid "Permissions for %s"
@@ -15475,7 +15588,7 @@ msgstr "_Blwch Derbyn:"
 msgid "_Tasks:"
 msgstr "_Tasgau:"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:58
+#: ../plugins/exchange-operations/exchange-folder-permission.c:61
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "Caniatadau..."
@@ -15498,23 +15611,71 @@ msgid "Exchange Folder Tree"
 msgstr "Coeden Plygell Exchange"
 
 #: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:229
-#: ../plugins/exchange-operations/exchange-folder.c:239
+#: ../plugins/exchange-operations/exchange-folder.c:235
+#: ../plugins/exchange-operations/exchange-folder.c:245
 msgid "Unsubscribe Folder..."
 msgstr "Dad-danysgrifio Plygell..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:459
-#: ../plugins/exchange-operations/exchange-folder.c:514
+#: ../plugins/exchange-operations/exchange-folder.c:465
+#: ../plugins/exchange-operations/exchange-folder.c:520
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Tanysgrifio go iawn o'r blygell \"%s\"?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:471
-#: ../plugins/exchange-operations/exchange-folder.c:526
+#: ../plugins/exchange-operations/exchange-folder.c:477
+#: ../plugins/exchange-operations/exchange-folder.c:532
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Dad-danysgrifio o'r blygell \"%s\""
 
+#: ../plugins/exchange-operations/exchange-oof.glade.h:1
+msgid ""
+"<b>Currently, your status is \"Out of the Office\". </b>\n"
+"\n"
+"Would you like to change your status to \"In the Office\"? "
+msgstr ""
+"<b>Ar hyn o bryd, eich statws yw \"Allan o'r Swyddfa\".</b>\n"
+"\n"
+"Hoffech chi newid eich statws i \"Yn y Swyddfa\"?"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:4
+msgid "<b>Out of Office Message:</b>"
+msgstr "<b>Neges Allan o'r Swyddfa</b>"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:5
+msgid "<b>Status:</b>"
+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"
+"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"
+"e-bost atoch chi tra byddwch chi allan o'r swyddfa.</small>"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:8
+msgid "I am currently in the office"
+msgstr "Rydw i yn y swyddfa ar hyn o bryd"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:9
+msgid "I am currently out of the office"
+msgstr "Rydw i allan o'r swyddfa ar hyn o bryd"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:10
+msgid "No, Don't Change Status"
+msgstr "Na, Peidio â Newid Statws"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:11
+msgid "Out of Office Assistant"
+msgstr "Cynorthwyydd Allan o'r Swyddfa"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:12
+msgid "Yes, Change Status"
+msgstr "Ie, Newidiwch Gyflwr"
+
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
 msgid "Password Expiry Warning..."
 msgstr "Rhybudd Cyfrinair yn Dod i Ben..."
@@ -15527,10 +15688,6 @@ msgstr "Mae'ch cyfrinair yn dod i ben o fewn 7 diwrnod..."
 msgid "_Change Password"
 msgstr "_Newid Cyfrinair"
 
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:4
-msgid "ok_button"
-msgstr "ok_button"
-
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
 msgid "(Permission denied.)"
 msgstr "(Gwrthodwyd caniatâd.)"
@@ -15599,15 +15756,61 @@ msgstr "Darllen eitemau"
 msgid "Role: "
 msgstr "Rôl:"
 
-#: ../plugins/exchange-operations/exchange-oof.glade.h:10
-msgid "No, Don't Change Status"
-msgstr "Na, Peidio â Newid Statws"
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:1
+msgid "<b>Message Settings</b>"
+msgstr "<b>Gosodiadau Neges</b>"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:2
+msgid "<b>Tracking Options</b>"
+msgstr "<b>Opsiynau Tracio</b>"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:3
+msgid "Exchange - Send Options"
+msgstr "Exchange - Opsiynau Anfon"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:4
+msgid "I_mportance: "
+msgstr "_Pwysigrwydd:"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:5
+msgid ""
+"Normal\n"
+"High\n"
+"Low"
+msgstr ""
+"Arferol\n"
+"Uchel\n"
+"Isel"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:144
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:8
+msgid ""
+"Normal\n"
+"Personal\n"
+"Private\n"
+"Confidential"
+msgstr ""
+"Arferol\n"
+"Personol\n"
+"Preifat\n"
+"Cyfrinachol"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:12
+msgid "Request a _delivery receipt for this message"
+msgstr "Anfon cais am _hysbysiad derbyn ar gyfer y neges hon"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:13
+msgid "Request a _read receipt for this message"
+msgstr "Anfon cais am hysbysiad _darllen ar gyfer y neges hon"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:14
+msgid "_Sensitivity: "
+msgstr "_Sensitifrwydd:"
+
+#: ../plugins/exchange-operations/exchange-user-dialog.c:143
 msgid "Select User"
 msgstr "Dewis Defnyddiwr"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:182
+#: ../plugins/exchange-operations/exchange-user-dialog.c:181
 msgid "Address Book..."
 msgstr "_Llyfr Cyfeiriadau..."
 
@@ -15763,7 +15966,7 @@ msgid "Folder offline"
 msgstr "Ffolder all-lein"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1270
+#: ../shell/e-shell.c:1272
 msgid "Generic error"
 msgstr "Gwall generig"
 
@@ -15816,7 +16019,7 @@ msgid "Password successfully changed."
 msgstr "Cyfrinair wedi ei newid yn llwyddiannus."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
-msgid "Please make sure the Global Catalog Sever name is correct."
+msgid "Please make sure the Global Catalog Server name is correct."
 msgstr "Gwnewch yn siŵr fod enw'r gweinydd Catalog cyffredinol yn gywir."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
@@ -15976,20 +16179,51 @@ msgstr "Dad-danysgrifio Plygellau"
 msgid "_Unsubscribe"
 msgstr "_Dad-danysgrifio"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:390
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:600
-msgid "Notes"
-msgstr "Nodiadau"
-
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
 msgid "Checklist"
 msgstr "Rhestr wirio"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
+msgid "A plugin to setup groupwise calendar and contacts sources."
+msgstr "Ategyn i osod calendr groupwise a ffynonellau cyswllt."
+
+#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
 msgid "Groupwise Account Setup"
 msgstr "Gosod Cyfrif Groupwise"
 
+#: ../plugins/groupwise-features/install-shared.c:215
+#, c-format
+msgid ""
+"The user '%s' has shared a folder with you\n"
+"\n"
+"Message from '%s'\n"
+"\n"
+"\n"
+"%s\n"
+"\n"
+"\n"
+"Click 'Forward' to install the shared folder\n"
+"\n"
+msgstr ""
+"Mae'r defnyddiwr '%s' wedi rhannu plygell gyda chi\n"
+"\n"
+"Neges oddi wrth '%s'\n"
+"\n"
+"\n"
+"%s\n"
+"\n"
+"\n"
+"Cliciwch 'Ymlaen' i osod y blygell wedi rhannu\n"
+"\n"
+
+#: ../plugins/groupwise-features/install-shared.c:220
+msgid "Install the shared folder"
+msgstr "Gosod y ffolder wedi rhannu"
+
+#: ../plugins/groupwise-features/install-shared.c:222
+msgid "Shared Folder Installation"
+msgstr "Gosod Plygell wedi Rhannu"
+
 #: ../plugins/groupwise-features/junk-mail-settings.c:77
 msgid "Junk Settings"
 msgstr "Gosodiadau Sothach"
@@ -16087,7 +16321,7 @@ msgid "_Not Shared"
 msgstr "_Heb ei Rannu"
 
 #: ../plugins/groupwise-features/properties.glade.h:14
-msgid "_Shared With ..."
+msgid "_Shared With..."
 msgstr "_Rhennir Gyda..."
 
 #: ../plugins/groupwise-features/properties.glade.h:15
@@ -16152,7 +16386,7 @@ msgid "Proxy Login"
 msgstr "Mewngofnodi Dirprwy"
 
 #: ../plugins/groupwise-features/proxy-login.c:220
-#: ../plugins/groupwise-features/proxy-login.c:263
+#: ../plugins/groupwise-features/proxy-login.c:262
 #: ../plugins/groupwise-features/proxy.c:503
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
@@ -16162,7 +16396,7 @@ msgstr "%sRhowch gyfrinair am %s (defnyddiwr %s)"
 #. 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
-#: ../plugins/groupwise-features/proxy-login.c:517
+#: ../plugins/groupwise-features/proxy-login.c:516
 msgid "_Proxy Login..."
 msgstr "_Mewngofnodi Dirprwy..."
 
@@ -16175,6 +16409,7 @@ msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Fydd y tab Dirprwy ddim ond ar gael wedi i'r cyfrif gael ei alluogi."
 
 #: ../plugins/groupwise-features/share-folder-common.c:322
+#: ../plugins/groupwise-features/share-folder.c:760
 msgid "Users"
 msgstr "Defnyddwyr"
 
@@ -16190,7 +16425,64 @@ msgstr "_Ffolder Newydd wedi ei Rhannu..."
 msgid "Sharing"
 msgstr "Rhannu"
 
-#: ../plugins/groupwise-features/status-track.c:242
+#: ../plugins/groupwise-features/share-folder.c:765
+msgid "Add   "
+msgstr "Ychwanegu"
+
+#: ../plugins/groupwise-features/share-folder.c:771
+msgid "Modify"
+msgstr "Newid"
+
+#: ../plugins/groupwise-features/status-track.c:103
+msgid "Message Status"
+msgstr "Statws Neges"
+
+#. Subject
+#: ../plugins/groupwise-features/status-track.c:117
+msgid "<b>Subject</b> :"
+msgstr "<b>Pwnc</b> :"
+
+#: ../plugins/groupwise-features/status-track.c:129
+msgid "<b>From</b> :"
+msgstr "<b>Oddi wrth</b> :"
+
+#: ../plugins/groupwise-features/status-track.c:142
+msgid "<b>Creation date</b> :"
+msgstr "<b>Dyddiad creu</b> :"
+
+#: ../plugins/groupwise-features/status-track.c:178
+msgid "Recipient: "
+msgstr "Derbynnydd:"
+
+#: ../plugins/groupwise-features/status-track.c:185
+msgid "Delivered: "
+msgstr "Anfonwyd:"
+
+#: ../plugins/groupwise-features/status-track.c:191
+msgid "Opened: "
+msgstr "Agorwyd:"
+
+#: ../plugins/groupwise-features/status-track.c:196
+msgid "Accepted: "
+msgstr "Derbyniwyd:"
+
+#: ../plugins/groupwise-features/status-track.c:201
+msgid "Deleted: "
+msgstr "Dilewyd:"
+
+#: ../plugins/groupwise-features/status-track.c:206
+msgid "Declined: "
+msgstr "Gwrthodwyd:"
+
+#: ../plugins/groupwise-features/status-track.c:211
+msgid "Completed: "
+msgstr "Cyflawnwyd:"
+
+#: ../plugins/groupwise-features/status-track.c:216
+msgid "Un-delivered: "
+msgstr "Heb anfon:"
+
+#: ../plugins/groupwise-features/status-track.c:241
 msgid "Track Message Status..."
 msgstr "Olrhain Statws Neges..."
 
@@ -16202,6 +16494,70 @@ msgstr "Ategyn i osod ffynonellau calendr hula."
 msgid "Hula Account Setup"
 msgstr "Gosod Cyfrif Hula"
 
+#: ../plugins/imap-features/imap-headers.c:133
+msgid "Custom Header"
+msgstr "Pennawd Addasedig"
+
+#: ../plugins/imap-features/imap-headers.c:245
+msgid "Custom Headers"
+msgstr "Penawdau Addasedig"
+
+#: ../plugins/imap-features/imap-headers.c:252
+msgid "IMAP Headers"
+msgstr "Penawdau IMAP"
+
+#: ../plugins/imap-features/imap-headers.glade.h:1
+msgid "<b>Custom Headers</b>"
+msgstr "<b>Penawdau Addasedig</b>"
+
+#: ../plugins/imap-features/imap-headers.glade.h:2
+msgid "<b>IMAP Headers </b>"
+msgstr "<b>Penawdau IMAP </b>"
+
+#: ../plugins/imap-features/imap-headers.glade.h:3
+msgid "Basic and _Mailing List Headers (Default)"
+msgstr "Sylfaenol a _Phenawdau Rhestrau E-bost (Rhagosodiad)"
+
+#: ../plugins/imap-features/imap-headers.glade.h:4
+msgid "Fetch A_ll Headers"
+msgstr "Cyrchu _Bob Pennawd"
+
+#: ../plugins/imap-features/imap-headers.glade.h:5
+msgid ""
+"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"
+"Os ydych chi'n dewis \"Pob Pennawd\", medrwch anwybyddu hyn."
+
+#: ../plugins/imap-features/imap-headers.glade.h:7
+msgid ""
+"Select your IMAP Header Preferences. \n"
+"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."
+
+#: ../plugins/imap-features/imap-headers.glade.h:9
+msgid ""
+"_Basic Headers - (Fastest) \n"
+"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"
+
+#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
+msgid "A plugin for the features in the IMAP accounts."
+msgstr "Ategyn i'r nodweddion yn y cyfrifon IMAP."
+
+#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
+msgid "IMAP Features"
+msgstr "Nodweddion IMAP"
+
 #: ../plugins/import-ics-attachments/icsimporter.c:83
 msgid "_Import to Calendar"
 msgstr "_Mewnforio i'r Calendr"
@@ -16210,25 +16566,46 @@ msgstr "_Mewnforio i'r Calendr"
 msgid "_Import to Tasks"
 msgstr "_Mewnforio i'r Tasgau"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:198
+#: ../plugins/import-ics-attachments/icsimporter.c:206
 msgid "Import ICS"
 msgstr "Mewnforio ICS"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:226
+#: ../plugins/import-ics-attachments/icsimporter.c:233
 msgid "Select Task List"
 msgstr "Dewis Rhestr Dasgau"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:230
+#: ../plugins/import-ics-attachments/icsimporter.c:237
 msgid "Select Calendar"
 msgstr "Dewis Calendr"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:261
-#: ../shell/e-shell-importer.c:714
+#: ../plugins/import-ics-attachments/icsimporter.c:267
+#: ../shell/e-shell-importer.c:700
 msgid "_Import"
 msgstr "_Mewnforio"
 
+#. the path to the shared library
+#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:2
+msgid "Import to Calendar"
+msgstr "Mewnforio i'r Calendr"
+
+#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:3
+msgid "Imports ICS attachments to calendar."
+msgstr "Mewnforio atodiadau ICS i'r calendr."
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:62
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Search for an iPod failed</span>\n"
+"\n"
+"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."
+
 #: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:149
+#: ../plugins/save-calendar/ical-format.c:194
 msgid "iCalendar format (.ics)"
 msgstr "Ffurf iCalendr (.ics)"
 
@@ -16244,139 +16621,102 @@ msgstr "Cysoni ag iPod"
 msgid "iPod Synchronization"
 msgstr "Cysoni iPod"
 
-#: ../plugins/ipod-sync/sync.c:158
-msgid "No output directory!"
-msgstr "Dim cyfeiriadur albwm!"
-
-#: ../plugins/ipod-sync/sync.c:159
-msgid ""
-"The output directory was not found on iPod! Please ensure that iPod has been "
-"correctly set up and try again."
-msgstr ""
-"Cyfeiriadur allbwn heb ei ganfod ar yr iPod! Gwnewch yn siŵr fod yr iPod "
-"wedi ei osod yn gywir a cheisiwch eto."
-
-#: ../plugins/ipod-sync/sync.c:174 ../plugins/ipod-sync/sync.c:202
-msgid "Could not export data!"
-msgstr "Methu allforio data!"
-
-#: ../plugins/ipod-sync/sync.c:203
-msgid "Exporting data failed."
-msgstr "Methodd yr allforio data."
-
-#: ../plugins/ipod-sync/sync.c:231
-msgid "Could not open addressbook!"
-msgstr "Methwyd agor y llyfr cyfeiriadau"
-
-#: ../plugins/ipod-sync/sync.c:232
-msgid "Could not open the Evolution addressbook to export data."
-msgstr "Methu agor y llyfr cyfeiriadau Evolution i allforio data."
-
-#: ../plugins/ipod-sync/sync.c:291
-msgid "Could not open calendar/todo!"
-msgstr "Methu agor y calendr/rhestr dasgau i'w gwneud!"
-
-#: ../plugins/ipod-sync/sync.c:292
-msgid "Could not open the Evolution calendar/todo list to export data."
-msgstr ""
-"Methu agor rhestr calendr/tasgau i'w gwneud Evolution er mwyn allforio data."
-
 #: ../plugins/itip-formatter/itip-formatter.c:274
-#: ../plugins/itip-formatter/itip-formatter.c:391
+#: ../plugins/itip-formatter/itip-formatter.c:395
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Methu llwytho'r calendr '%s'."
 
-#: ../plugins/itip-formatter/itip-formatter.c:411
+#: ../plugins/itip-formatter/itip-formatter.c:415
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Mae apwyntiad yn y calendr '%s' yn gwrthdaro â'r cyfarfod hwn"
 
-#: ../plugins/itip-formatter/itip-formatter.c:437
+#: ../plugins/itip-formatter/itip-formatter.c:441
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Wedi canfod yr apwyntiad yn y calendr '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:513
+#: ../plugins/itip-formatter/itip-formatter.c:517
 msgid "Unable to find any calendars"
 msgstr "Methu canfod unrhyw galendr"
 
-#: ../plugins/itip-formatter/itip-formatter.c:520
+#: ../plugins/itip-formatter/itip-formatter.c:524
 msgid "Unable to find this meeting in any calendar"
 msgstr "Methu canfod y cyfarfod hwn mewn unrhyw galendr"
 
-#: ../plugins/itip-formatter/itip-formatter.c:524
+#: ../plugins/itip-formatter/itip-formatter.c:528
 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:528
+#: ../plugins/itip-formatter/itip-formatter.c:532
 msgid "Unable to find this journal entry in any journal"
 msgstr "Methu canfod y cofnod dyddlyfr hwn mewn unrhyw ddyddlyfr"
 
-#: ../plugins/itip-formatter/itip-formatter.c:601
+#: ../plugins/itip-formatter/itip-formatter.c:605
 msgid "Searching for an existing version of this appointment"
 msgstr "Chwilio am fersiwn o'r apwyntiad sy'n bodoli'n barod"
 
-#: ../plugins/itip-formatter/itip-formatter.c:796
+#: ../plugins/itip-formatter/itip-formatter.c:801
 msgid "Unable to parse item"
 msgstr "Methu gramadegu eitem"
 
-#: ../plugins/itip-formatter/itip-formatter.c:853
+#: ../plugins/itip-formatter/itip-formatter.c:859
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Methu anfon eitem i galendr '%s'.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:864
+#: ../plugins/itip-formatter/itip-formatter.c:871
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Anfonwyd at galendr '%s' fel eitem wedi'i derbyn"
 
-#: ../plugins/itip-formatter/itip-formatter.c:868
+#: ../plugins/itip-formatter/itip-formatter.c:875
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Anfonwyd at galendr '%s' fel eitem wedi'i derbyn yn betrus"
 
-#: ../plugins/itip-formatter/itip-formatter.c:873
+#: ../plugins/itip-formatter/itip-formatter.c:880
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Anfonwyd at galendr '%s' fel eitem wedi'i gwrthod"
 
-#: ../plugins/itip-formatter/itip-formatter.c:878
+#: ../plugins/itip-formatter/itip-formatter.c:885
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Anfonwyd at galendr '%s' fel eitem wedi'i chanslo"
 
-#: ../plugins/itip-formatter/itip-formatter.c:971
+#: ../plugins/itip-formatter/itip-formatter.c:979
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Trefnydd wedi tynnu'r dirprwy %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:978
+#: ../plugins/itip-formatter/itip-formatter.c:986
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Wedi anfon neges ganslo at y mynychwr"
 
-#: ../plugins/itip-formatter/itip-formatter.c:980
+#: ../plugins/itip-formatter/itip-formatter.c:988
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Methu anfon y neges ganslo at y mynychwr"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1065
+#: ../plugins/itip-formatter/itip-formatter.c:1073
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Methwyd diweddaru cyflwr mynychwr am fod y statws yn annilys"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1092
+#: ../plugins/itip-formatter/itip-formatter.c:1100
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Methu diweddaru mynychwr. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1096
+#: ../plugins/itip-formatter/itip-formatter.c:1104
 msgid "Attendee status updated"
 msgstr "Statws mynychwr wedi diweddaru"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1223
+#: ../plugins/itip-formatter/itip-formatter.c:1231
 msgid "The calendar attached is not valid"
 msgstr "Mae'r calendr sydd wedi'i atodi yn annilys"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1224
+#: ../plugins/itip-formatter/itip-formatter.c:1232
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -16384,15 +16724,15 @@ 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:1259
-#: ../plugins/itip-formatter/itip-formatter.c:1277
-#: ../plugins/itip-formatter/itip-formatter.c:1355
+#: ../plugins/itip-formatter/itip-formatter.c:1267
+#: ../plugins/itip-formatter/itip-formatter.c:1285
+#: ../plugins/itip-formatter/itip-formatter.c:1363
 msgid "The item in the calendar is not valid"
 msgstr "Nid yw'r eitem yn y calendr yn ddilys"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1260
-#: ../plugins/itip-formatter/itip-formatter.c:1278
-#: ../plugins/itip-formatter/itip-formatter.c:1356
+#: ../plugins/itip-formatter/itip-formatter.c:1268
+#: ../plugins/itip-formatter/itip-formatter.c:1286
+#: ../plugins/itip-formatter/itip-formatter.c:1364
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -16400,11 +16740,11 @@ 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:1289
+#: ../plugins/itip-formatter/itip-formatter.c:1297
 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:1290
+#: ../plugins/itip-formatter/itip-formatter.c:1298
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -16412,273 +16752,273 @@ msgstr "I brosesu'r holl eitemau, dylid cadw'r ffeil a mewnforio'r calendr"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2063
+#: ../plugins/itip-formatter/itip-formatter.c:2103
 msgid "_Delete message after acting"
 msgstr "_Dileu'r neges ar ôl gweithredu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2073
-#: ../plugins/itip-formatter/itip-formatter.c:2105
+#: ../plugins/itip-formatter/itip-formatter.c:2113
+#: ../plugins/itip-formatter/itip-formatter.c:2145
 msgid "Conflict Search"
 msgstr "Chwilio am Wrthdaro"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2088
+#: ../plugins/itip-formatter/itip-formatter.c:2128
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Dewis y calendrau i'w chwilio ar gyfer cyfarfodydd sy'n gwrthdaro"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:186 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:241
+#: ../plugins/itip-formatter/itip-view.c:187 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:239
 msgid "Today"
 msgstr "Heddiw"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:191
+#: ../plugins/itip-formatter/itip-view.c:192
 msgid "Today %H:%M"
 msgstr "Heddiw %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M:%S"
 msgstr "Heddiw %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:204
+#: ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M:%S %p"
 msgstr "Heddiw %I:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:214
+#: ../plugins/itip-formatter/itip-view.c:215
 msgid "Tomorrow"
 msgstr "Yfory"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:219
+#: ../plugins/itip-formatter/itip-view.c:220
 msgid "Tomorrow %H:%M"
 msgstr "Yfory %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:223
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M:%S"
 msgstr "Yfory %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:229
 msgid "Tomorrow %l:%M %p"
 msgstr "Yfory %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Yfory %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:251
+#: ../plugins/itip-formatter/itip-view.c:252
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:256
+#: ../plugins/itip-formatter/itip-view.c:257
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:260
+#: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:266
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:269
+#: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:278
+#: ../plugins/itip-formatter/itip-view.c:279
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:284
+#: ../plugins/itip-formatter/itip-view.c:285
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:288
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:294
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:297
+#: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:303
+#: ../plugins/itip-formatter/itip-view.c:304
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:308
+#: ../plugins/itip-formatter/itip-view.c:309
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:312
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:318
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:321
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:347
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "Mae <b>%s</b>, trwy %s wedi cyhoeddi'r wybodaeth cyfarfod ganlynol:"
 
-#: ../plugins/itip-formatter/itip-view.c:348
+#: ../plugins/itip-formatter/itip-view.c:349
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "Mae <b>%s</b> wedi cyhoeddi'r wybodaeth cyfarfod ganlynol:"
 
-#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:354
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "Mae <b>%s</b> wedi dirprwyo'r cyfarfod canlynol atoch chi:"
 
-#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:357
 #, 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:"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:359
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "Mae <b>%s</b> am i chi fod yn bresennol yn y cyfarfod canlynol:"
 
-#: ../plugins/itip-formatter/itip-view.c:364
+#: ../plugins/itip-formatter/itip-view.c:365
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "Mae <b>%s</b>, trwy %s am ychwanegu at gyfarfod sydd eisoes yn bodoli:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "Mae <b>%s</b> am ychwanegu at neges sy'n bodoli'n barod:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:370
 #, 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:"
 
-#: ../plugins/itip-formatter/itip-view.c:372
+#: ../plugins/itip-formatter/itip-view.c:373
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "Mae <b>%s</b> wedi anfon yr ymateb canlynol yn ôl ynghylch cyfarfod:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:377
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "Mae <b>%s</b> drwy %s wedi canslo'r cyfarfod canlynol:"
 
-#: ../plugins/itip-formatter/itip-view.c:378
+#: ../plugins/itip-formatter/itip-view.c:379
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "Mae <b>%s</b> wedi canslo'r cyfarfod canlynol."
 
-#: ../plugins/itip-formatter/itip-view.c:381
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "Mae <b>%s</b> wedi awgrymu'r newidiadau cyfarfod canlynol."
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:386
 #, 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:"
 
-#: ../plugins/itip-formatter/itip-view.c:387
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "Mae <b>%s</b> wedi gwrthod y newidiadau cyfarfod canlynol."
 
-#: ../plugins/itip-formatter/itip-view.c:414
+#: ../plugins/itip-formatter/itip-view.c:415
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "Mae <b>%s</b> drwy %s wedi cyhoeddi'r dasg ganlynol:"
 
-#: ../plugins/itip-formatter/itip-view.c:416
+#: ../plugins/itip-formatter/itip-view.c:417
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "Mae <b>%s</b> wedi cyhoeddi'r dasg ganlynol:"
 
-#: ../plugins/itip-formatter/itip-view.c:421
+#: ../plugins/itip-formatter/itip-view.c:422
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "Mae <b>%s</b> am i %s gael ei neilltuo i'r dasg ganlynol:"
 
-#: ../plugins/itip-formatter/itip-view.c:424
+#: ../plugins/itip-formatter/itip-view.c:425
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "Mae <b>%s</b> drwy %s wedi neilltuo tasg i chi:"
 
-#: ../plugins/itip-formatter/itip-view.c:426
+#: ../plugins/itip-formatter/itip-view.c:427
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "Mae <b>%s</b> wedi neilltuo tasg newydd i chi:"
 
-#: ../plugins/itip-formatter/itip-view.c:432
+#: ../plugins/itip-formatter/itip-view.c:433
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "Mae <b>%s</b>, trwy %s am ychwanegu at dasg sydd eisoes yn bodoli:"
 
-#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:435
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "Mae <b>%s</b> am ychwanegu at dasg sy'n bodoli'n barod:"
 
-#: ../plugins/itip-formatter/itip-view.c:437
+#: ../plugins/itip-formatter/itip-view.c:438
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -16687,152 +17027,152 @@ msgstr ""
 "Mae <b>%s</b> am dderbyn y wybodaeth ddiweddaraf am y dasg ganlynol sydd "
 "wedi ei neilltuo:"
 
-#: ../plugins/itip-formatter/itip-view.c:440
+#: ../plugins/itip-formatter/itip-view.c:441
 #, 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:"
 
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:445
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "Mae <b>%s</b> drwy %s wedi diddymu'r dasg ganlynol gafodd ei neilltuo:"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "Mae <b>%s</b> wedi canslo'r dasg hon, gafodd ei neilltuo:"
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:450
 #, 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:"
 
-#: ../plugins/itip-formatter/itip-view.c:453
+#: ../plugins/itip-formatter/itip-view.c:454
 #, 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:"
 
-#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "Mae <b>%s</b> wedi gwrthod y dasg hon, gafodd ei neilltuo:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:483
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "Mae <b>%s</b> drwy %s wedi cyhoeddi'r memo canlynol:"
 
-#: ../plugins/itip-formatter/itip-view.c:484
+#: ../plugins/itip-formatter/itip-view.c:485
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "Mae <b>%s</b> wedi cyhoeddi'r memo canlynol:"
 
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:490
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "Mae <b>%s</b>, trwy %s am ychwanegu at femo sydd eisoes yn bodoli:"
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "Mae <b>%s</b> am ychwanegu at femo sy'n bodoli'n barod:"
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../plugins/itip-formatter/itip-view.c:496
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "Mae <b>%s</b> drwy %s wedi canslo'r memo canlynol oedd wedi'i rannu:"
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:498
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "Mae <b>%s</b> wedi canslo'r memo hwn oedd wedi'i rannu:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:753
+#: ../plugins/itip-formatter/itip-view.c:762
 msgid "_Open Calendar"
 msgstr "_Agor calendr"
 
-#: ../plugins/itip-formatter/itip-view.c:759
-#: ../plugins/itip-formatter/itip-view.c:763
-#: ../plugins/itip-formatter/itip-view.c:769
-#: ../plugins/itip-formatter/itip-view.c:786
-#: ../plugins/itip-formatter/itip-view.c:791
+#: ../plugins/itip-formatter/itip-view.c:768
+#: ../plugins/itip-formatter/itip-view.c:772
+#: ../plugins/itip-formatter/itip-view.c:778
+#: ../plugins/itip-formatter/itip-view.c:795
+#: ../plugins/itip-formatter/itip-view.c:800
 msgid "_Decline"
 msgstr "_Gwrthod"
 
-#: ../plugins/itip-formatter/itip-view.c:760
-#: ../plugins/itip-formatter/itip-view.c:765
-#: ../plugins/itip-formatter/itip-view.c:772
-#: ../plugins/itip-formatter/itip-view.c:788
-#: ../plugins/itip-formatter/itip-view.c:793
+#: ../plugins/itip-formatter/itip-view.c:769
+#: ../plugins/itip-formatter/itip-view.c:774
+#: ../plugins/itip-formatter/itip-view.c:781
+#: ../plugins/itip-formatter/itip-view.c:797
+#: ../plugins/itip-formatter/itip-view.c:802
 msgid "_Accept"
 msgstr "_Derbyn"
 
-#: ../plugins/itip-formatter/itip-view.c:763
+#: ../plugins/itip-formatter/itip-view.c:772
 msgid "_Decline all"
 msgstr "Gwrthod y _cyfan"
 
-#: ../plugins/itip-formatter/itip-view.c:764
+#: ../plugins/itip-formatter/itip-view.c:773
 msgid "_Tentative all"
 msgstr "_Pawb, I'w gadarnhau"
 
-#: ../plugins/itip-formatter/itip-view.c:764
-#: ../plugins/itip-formatter/itip-view.c:770
-#: ../plugins/itip-formatter/itip-view.c:787
-#: ../plugins/itip-formatter/itip-view.c:792
+#: ../plugins/itip-formatter/itip-view.c:773
+#: ../plugins/itip-formatter/itip-view.c:779
+#: ../plugins/itip-formatter/itip-view.c:796
+#: ../plugins/itip-formatter/itip-view.c:801
 msgid "_Tentative"
 msgstr "_I'w gadarnhau"
 
-#: ../plugins/itip-formatter/itip-view.c:765
+#: ../plugins/itip-formatter/itip-view.c:774
 msgid "_Accept all"
 msgstr "Derbyn y _cyfan"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:776
+#: ../plugins/itip-formatter/itip-view.c:785
 msgid "_Send Information"
 msgstr "Anfon _Gwybodaeth"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:780
+#: ../plugins/itip-formatter/itip-view.c:789
 msgid "_Update Attendee Status"
 msgstr "_Diweddaru cyflwr mynychwr"
 
-#: ../plugins/itip-formatter/itip-view.c:783
+#: ../plugins/itip-formatter/itip-view.c:792
 msgid "_Update"
 msgstr "_Diweddaru"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:942
+#: ../plugins/itip-formatter/itip-view.c:951
 msgid "Start time:"
 msgstr "Amser cychwyn:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:951
+#: ../plugins/itip-formatter/itip-view.c:960
 msgid "End time:"
 msgstr "Amser gorffen:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:967
-#: ../plugins/itip-formatter/itip-view.c:1017
+#: ../plugins/itip-formatter/itip-view.c:976
+#: ../plugins/itip-formatter/itip-view.c:1026
 msgid "Comment:"
 msgstr "Sylw:"
 
-#: ../plugins/itip-formatter/itip-view.c:1031
+#: ../plugins/itip-formatter/itip-view.c:1040
 msgid "Send u_pdates to attendees"
 msgstr "Anfon _diweddariadau at y mynychwyr"
 
-#: ../plugins/itip-formatter/itip-view.c:1040
+#: ../plugins/itip-formatter/itip-view.c:1049
 msgid "A_pply to all instances"
 msgstr "_Defnyddio ym mhob achos"
 
-#: ../plugins/itip-formatter/itip-view.c:1709
+#: ../plugins/itip-formatter/itip-view.c:1718
 msgid "_Tasks :"
 msgstr "_Tasgau :"
 
-#: ../plugins/itip-formatter/itip-view.c:1711
+#: ../plugins/itip-formatter/itip-view.c:1720
 msgid "Memos :"
 msgstr "Memos :"
 
@@ -16875,6 +17215,32 @@ msgstr "Caniatáu i gyfrifon gael eu hanalluogi."
 msgid "Disable Account"
 msgstr "Analluogi Cyfrif"
 
+#: ../plugins/mail-notification/mail-notification.c:108
+#, c-format
+msgid "You have received %d new message in %s."
+msgstr "Rydych chi wedi derbyn %d neges newydd yn %s."
+
+#: ../plugins/mail-notification/mail-notification.c:108
+#, c-format
+msgid "You have received %d new messages in %s."
+msgstr "Rydych chi wedi derbyn %d neges newydd yn %s."
+
+#: ../plugins/mail-notification/mail-notification.c:130
+msgid "New email"
+msgstr "E-bost newydd"
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
+msgid "Mail Notification"
+msgstr "Hysbysiad E-bost Newydd"
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+msgid ""
+"Notifies the user with tray icon and a notify message whenever a new message "
+"is arrived."
+msgstr ""
+"Hysbysu'r defnyddiwr gydag eicon yn y gilfach, a neges hysbysu pan fo neges "
+"newydd yn cyrraedd."
+
 #: ../plugins/mail-remote/client.c:30
 #, c-format
 msgid "System error: %s"
@@ -16958,11 +17324,10 @@ msgstr "_Rhestr E-bost"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
 msgid ""
-"Provide actions for common mailing list commands (subscribe, "
-"unsubscribe, ...)."
+"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
 msgstr ""
 "Darparu gweithredoedd cyffredin i restrau e-bost (tanysgrifio, dad-"
-"danysgrifio, ...)"
+"danysgrifio...)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
 msgid "_Post message to list"
@@ -17148,17 +17513,13 @@ msgstr "Creu neges D-BUS newydd pan fo e-bost newydd yn cyrraedd."
 msgid "New Mail Notification"
 msgstr "Hysbysiad E-bost Newydd"
 
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:3
-msgid "New mail notify"
-msgstr "Hysbysu am e-bost newydd"
-
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 msgid "A plugin for managing which plugins are enabled or disabled."
 msgstr "Ategyn i reoli pa ategion sydd wedi'u galluogi a'u hanalluogi."
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:180
+#: ../plugins/plugin-manager/plugin-manager.c:202
 msgid "Plugin Manager"
 msgstr "Rheolwr Ategion"
 
@@ -17170,22 +17531,22 @@ msgstr "Galluogi ac analluogi ategion"
 msgid "_Plugins"
 msgstr "_Ategion"
 
-#: ../plugins/plugin-manager/plugin-manager.c:43
+#: ../plugins/plugin-manager/plugin-manager.c:53
 msgid "Author(s)"
 msgstr "Awdur(on)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:44
+#: ../plugins/plugin-manager/plugin-manager.c:54
 #: ../widgets/table/e-table-config-no-group.glade.h:6
 #: ../widgets/table/e-table-config.glade.h:5
 msgid "Description"
 msgstr "Disgrifiad"
 
-#: ../plugins/plugin-manager/plugin-manager.c:193
+#: ../plugins/plugin-manager/plugin-manager.c:215
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Sylwer: Ni fydd rhai newidiadau'n dod i rym nes i chi ail-gychwyn"
 
-#: ../plugins/plugin-manager/plugin-manager.c:202
-#: ../plugins/plugin-manager/plugin-manager.c:262
+#: ../plugins/plugin-manager/plugin-manager.c:268
+#: ../plugins/plugin-manager/plugin-manager.c:327
 msgid "Plugin"
 msgstr "Ategyn"
 
@@ -17230,6 +17591,10 @@ msgstr "Modd HTML"
 msgid "Gives an option to print mail from composer"
 msgstr "Rhoi'r opsiwn i argraffu e-bost o fewn y cyfansoddwr"
 
+#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
+msgid "Print Message"
+msgstr "Argraffu'r Neges"
+
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
 #: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:21
 #: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:12
@@ -17325,10 +17690,22 @@ msgstr "_Math o wasanaeth:"
 msgid "_File:"
 msgstr "_Ffeil:"
 
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+msgid "_Password:"
+msgstr "_Cyfrinair:"
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:24
 msgid "_Publish as:"
 msgstr "_Cyhoeddi fel:"
 
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+msgid "_Remember password"
+msgstr "_Cofio'r cyfrinair"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+msgid "_Username:"
+msgstr "_Enw Defnyddiwr:"
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid ""
 "iCal\n"
@@ -17337,21 +17714,29 @@ msgstr ""
 "iCal\n"
 "Rhydd/Prysur"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:101
-msgid "Spamassassin (built-in)"
-msgstr "Spamassassin (yn fewnol)"
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:108
+msgid "SpamAssassin (built-in)"
+msgstr "SpamAssassin (yn fewnol)"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:848
+msgid "This will make Spamassasin more reliable, but slower"
+msgstr "Bydd hyn yn gwneud SpamAssassin yn fwy dibynnol, ond yn arafach"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:854
+msgid "I_nclude remote tests"
+msgstr "Cynnwys profion pell"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
 msgid ""
-"Filters junk messages using Spamassassin. This plugin requires Spamassassin "
+"Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
 "to be installed."
 msgstr ""
-"Hidlo negeseuon sothach drwy Spamassasin. Rhaid i Spamassassin gael ei osod "
+"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
-msgid "Spamassassin junk plugin"
-msgstr "Ategyn sothach Spamassassin"
+msgid "SpamAssassin junk plugin"
+msgstr "Ategyn sothach SpamAssassin"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
 msgid "A plugin for saving all attachments or parts of a message at once."
@@ -17359,27 +17744,28 @@ msgstr "Ategyn i gadw pob atodiad neu ran o neges ar unwaith."
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
+#: ../plugins/save-attachments/save-attachments.c:330
 msgid "Save attachments"
 msgstr "Cadw atodiadau"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
-msgid "Save Attachments ..."
+msgid "Save Attachments..."
 msgstr "Cadw Atodiadau..."
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
 msgid "Save all attachments"
 msgstr "Cadw pob atodiad"
 
-#: ../plugins/save-attachments/save-attachments.c:340
+#: ../plugins/save-attachments/save-attachments.c:336
 msgid "Select save base name"
 msgstr "Dewiswch enw bôn cadw"
 
-#: ../plugins/save-attachments/save-attachments.c:359
+#: ../plugins/save-attachments/save-attachments.c:355
 msgid "MIME Type"
 msgstr "Math MIME"
 
-#: ../plugins/save-attachments/save-attachments.c:367
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:19
+#: ../plugins/save-attachments/save-attachments.c:363
+#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:25
 msgid "Save"
 msgstr "Cadw"
 
@@ -17484,7 +17870,7 @@ msgstr "Cadw i'r _Ddisg"
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:396
+#: ../plugins/save-calendar/rdf-format.c:397
 msgid "RDF format (.rdf)"
 msgstr "Ffurf RDF (.rdf)"
 
@@ -17517,15 +17903,15 @@ msgstr "Ategyn sy'n delio â'r dewin Cychwyn."
 msgid "Startup wizard"
 msgstr "Dewin cychwyn"
 
-#: ../plugins/startup-wizard/startup-wizard.c:85
+#: ../plugins/startup-wizard/startup-wizard.c:84
 msgid "Evolution Setup Assistant"
 msgstr "Cynorthwyydd Gosod Evolution"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 msgid "Welcome"
 msgstr "Croeso"
 
-#: ../plugins/startup-wizard/startup-wizard.c:89
+#: ../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"
@@ -17537,22 +17923,31 @@ msgstr ""
 "\n"
 "Cliciwch y botwm \"Ymlaen\" i barhau."
 
-#: ../plugins/startup-wizard/startup-wizard.c:138
-#: ../shell/e-shell-importer.c:149
+#: ../plugins/startup-wizard/startup-wizard.c:134
+msgid "Importing files"
+msgstr "Wrthi'n mewnforio ffeiliau"
+
+#: ../plugins/startup-wizard/startup-wizard.c:136
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "Dewiswch y wybodaeth hoffech chi ei fewnforio:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../shell/e-shell-importer.c:411
+#: ../plugins/startup-wizard/startup-wizard.c:151
+#: ../shell/e-shell-importer.c:397
 #, c-format
 msgid "From %s:"
 msgstr "Oddi wrth %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:522
+#: ../plugins/startup-wizard/startup-wizard.c:231
+#: ../shell/e-shell-importer.c:508
 msgid "Importing data."
 msgstr "Mewnforio data."
 
+#: ../plugins/startup-wizard/startup-wizard.c:233
+#: ../shell/e-shell-importer.c:522
+msgid "Please wait"
+msgstr "Arhoswch os gwelwch yn dda"
+
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Indicates if threading of messages should fall back to subject."
 msgstr ""
@@ -17589,8 +17984,8 @@ msgid "Evolution Test component"
 msgstr "Cydran Profi Evolution"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:1
-msgid "A GNOME Print description of the current printer settings"
-msgstr "Disgrifiad GNOME Print o osodiadau'r argraffydd cyfredol"
+msgid "A string description of the current printer settings"
+msgstr "Disgrifiad ar ffurf llinyn o'r gosodiadau argraffu presennol"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:2
 msgid "Configuration version"
@@ -17628,26 +18023,22 @@ msgstr ""
 "lein"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:10
-msgid "Printer settings"
-msgstr "Gosodiad Argraffydd"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Sidebar is visible"
 msgstr "Bar ochr yn weladwy"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Skip development warning dialog"
 msgstr "Hepgor deialog rhybudd datblygiad"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:470
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:458
 msgid "Start in offline mode"
 msgstr "Dechreuwch ym modd all-lein"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "Statusbar is visible"
 msgstr "Bar statws yn weladwy"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -17655,19 +18046,19 @@ msgstr ""
 "Fersiwn cyfluniad Evolution, gyda lefel pennaf/lleiaf/cyfluniad (er "
 "enghraifft \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "Uchder rhagosodedig y brif ffenestr, mewn picseli"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "Lled rhagosodedig y brif ffenestr, mewn picseli"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "Lled rhagosodedig y bar ochr, mewn picseli"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -17675,7 +18066,7 @@ 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.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -17685,46 +18076,46 @@ msgstr ""
 "\"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.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Toolbar is visible"
 msgstr "Bar offer yn weladwy"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "A fydd Evolution yn cychwyn yn y modd all-lein yn lle'r modd ar-lein."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether or not the window should be maximized."
 msgstr "A ddylid mwyhau'r ffenestr ai peidio."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether the sidebar should be visible."
 msgstr "A ddylai'r bar ochr fod yn weladwy."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the status bar should be visible."
 msgstr "A ddylai'r bar statws fod yn weladwy."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid "Whether the toolbar should be visible."
 msgstr "A ddylai'r bar offer fod yn weladwy."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 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.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid "Whether the window buttons should be visible."
 msgstr "A ddylai botymau ffenestri fod yn weladwy."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
 msgid "Window button style"
 msgstr "Arddull botwm ffenest"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.in.h:29
 msgid "Window buttons are visible"
 msgstr "Botymau ffenestri yn weladwy"
 
@@ -17745,11 +18136,11 @@ msgstr "Cliciwch Iawn er mwyn cau'r cysylltiadau yma a mynd all-lein"
 msgid "(Untitled)"
 msgstr "(Heb Deitl)"
 
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "Dewiswch pa fath o fewnforiwr i'w redeg:"
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -17763,11 +18154,11 @@ msgstr ""
 "Gallwch chi ddewis \"Awtomatig\" os nad ydych chi'n gwybod, ac fe fydd "
 "Evolution yn ceisio ei ddatrys."
 
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "Dewiswch y gyrchfan ar gyfer y mewnforio"
 
-#: ../shell/e-shell-importer.c:152
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -17779,27 +18170,27 @@ msgstr ""
 "ddarganfuwyd unrhyw osodiadau i'w mewnforio. Os hoffech\n"
 "geisio eto, cliciwch y botwm \"Yn ôl\".\n"
 
-#: ../shell/e-shell-importer.c:291
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "_Enw ffeil:"
 
-#: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "Dewis ffeil"
 
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:299
 msgid "File _type:"
 msgstr "_Math o ffeil:"
 
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:335
 msgid "Import data and settings from _older programs"
 msgstr "Mewnforio data a gosodiadau o _raglenni hŷn"
 
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:338
 msgid "Import a _single file"
 msgstr "Mewnforio _ffeil unigol"
 
-#: ../shell/e-shell-settings-dialog.c:318
+#: ../shell/e-shell-settings-dialog.c:319
 msgid "Evolution Preferences"
 msgstr "Hoffterau Evolution"
 
@@ -17823,27 +18214,27 @@ msgstr "Ni all enw plygell gynnwys y nod \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "Mae '.' a '..' yn enwau plygellau arbennig sydd wedi'u gwarchod."
 
-#: ../shell/e-shell-window-commands.c:71
+#: ../shell/e-shell-window-commands.c:76
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Mae'n ymddangos nad yw offer GNOME Pilot wedi'i osod ar y system."
 
-#: ../shell/e-shell-window-commands.c:79
+#: ../shell/e-shell-window-commands.c:84
 #, c-format
 msgid "Error executing %s."
 msgstr "Gwall wrth weithredu %s."
 
-#: ../shell/e-shell-window-commands.c:128
+#: ../shell/e-shell-window-commands.c:132
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy heb ei osod."
 
-#: ../shell/e-shell-window-commands.c:136
+#: ../shell/e-shell-window-commands.c:135
 msgid "Bug buddy could not be run."
 msgstr "Methu rhedeg Gwall-Gyfaill (Bug Buddy)."
 
 #. The translator-credits string is for translators to list
-#. * per language credits for translation, displayed in the
-#. * about box
-#: ../shell/e-shell-window-commands.c:561
+#. * per-language credits for translation, displayed in the
+#. * about dialog.
+#: ../shell/e-shell-window-commands.c:575
 msgid "translator-credits"
 msgstr ""
 "Chris Jackson <chris@www.linux.org.uk>\n"
@@ -17852,69 +18243,70 @@ msgstr ""
 "Dafydd Harries <daf@muse.19inch.net>\n"
 "Rhys Jones <rhys@sucs.org>"
 
-#: ../shell/e-shell-window-commands.c:806
+#: ../shell/e-shell-window-commands.c:586
+msgid "Evolution Website"
+msgstr "Safle Gwe Evolution"
+
+#: ../shell/e-shell-window-commands.c:793
 msgid "_Work Online"
 msgstr "_Gweithio Ar-lein"
 
-#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:55
+#: ../shell/e-shell-window-commands.c:806 ../ui/evolution.xml.h:55
 msgid "_Work Offline"
 msgstr "_Gweithio All-lein"
 
-#: ../shell/e-shell-window-commands.c:832
+#: ../shell/e-shell-window-commands.c:819
 msgid "Work Offline"
 msgstr "Gweithio All-lein"
 
-#: ../shell/e-shell-window.c:371
+#: ../shell/e-shell-window.c:381
 msgid "Evolution is currently online. Click on this button to work offline."
 msgstr ""
 "Mae Evolution ar-lein ar hyn o bryd. Cliciwch y botwm hwn i weithio all-lein."
 
-#: ../shell/e-shell-window.c:379
+#: ../shell/e-shell-window.c:389
 msgid "Evolution is in the process of going offline."
 msgstr "Mae Evolution yn y broses o fynd all-lein."
 
-#: ../shell/e-shell-window.c:386
+#: ../shell/e-shell-window.c:396
 msgid "Evolution is currently offline. Click on this button to work online."
 msgstr ""
 "Mae Evolution all-lein ar hyn o bryd. Cliciwch y botwm hwn i weithio ar-lein."
 
-#: ../shell/e-shell-window.c:786
+#: ../shell/e-shell-window.c:820
 #, c-format
 msgid "Switch to %s"
 msgstr "Newid i %s"
 
-#: ../shell/e-shell.c:634
+#: ../shell/e-shell.c:636
 msgid "Uknown system error."
 msgstr "Gwall system anhysbys."
 
-#: ../shell/e-shell.c:830 ../shell/e-shell.c:831
+#: ../shell/e-shell.c:832 ../shell/e-shell.c:833
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1262 ../widgets/misc/e-cell-date-edit.c:257
+#: ../shell/e-shell.c:1264 ../widgets/misc/e-cell-date-edit.c:255
 msgid "OK"
 msgstr "Iawn"
 
-#: ../shell/e-shell.c:1264
+#: ../shell/e-shell.c:1266
 msgid "Invalid arguments"
 msgstr "Argiau annilys"
 
-#: ../shell/e-shell.c:1266
+#: ../shell/e-shell.c:1268
 msgid "Cannot register on OAF"
 msgstr "Methu cofrestru ar OAF"
 
-#: ../shell/e-shell.c:1268
+#: ../shell/e-shell.c:1270
 msgid "Configuration Database not found"
 msgstr "Cronfa Ddata Cyfluniad heb ei ganfod"
 
 #: ../shell/e-user-creatable-items-handler.c:678
 #: ../shell/e-user-creatable-items-handler.c:688
-msgid "New"
-msgstr "Newydd"
-
 #: ../shell/e-user-creatable-items-handler.c:693
-msgid " New "
+msgid "New"
 msgstr "Newydd"
 
 #: ../shell/evolution-test-component.c:140
@@ -17968,7 +18360,7 @@ msgstr ""
 "fewnforio ffeiliau allanol i mewn i Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:219
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -18003,7 +18395,7 @@ msgstr ""
 "Gobeithiwn y byddwch yn mwynhau ffrwyth ein llafur caled, ac edrychwn\n"
 "ymlaen yn eiddgar at dderbyn eich cyfraniadau!\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:243
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -18011,39 +18403,39 @@ msgstr ""
 "Diolch\n"
 "Y Tîm Evolution\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:250
 msgid "Do not tell me again"
 msgstr "Peidiwch â dweud wrthyf eto"
 
-#: ../shell/main.c:468
+#: ../shell/main.c:456
 msgid "Start Evolution activating the specified component"
 msgstr "Dechrau Evolution gan ymgychwyn y gydran benodol"
 
-#: ../shell/main.c:472
+#: ../shell/main.c:460
 msgid "Start in online mode"
 msgstr "Dechreuwch ym modd ar-lein"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:463
 msgid "Forcibly shut down all Evolution components"
 msgstr "Gorfodi pob cydran Evolution i gau i lawr"
 
-#: ../shell/main.c:479
+#: ../shell/main.c:467
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Gorfodi ail-fudo o Evolution 1.4"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:470
 msgid "Send the debugging output of all components to a file."
 msgstr "Anfon allbwn datnamu bob cydran at ffeil."
 
-#: ../shell/main.c:484
+#: ../shell/main.c:472
 msgid "Disable loading of any plugins."
 msgstr "Analluogi llwytho unrhyw ategyn."
 
-#: ../shell/main.c:515
+#: ../shell/main.c:501
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution, y Cleient Ebost a Threfnydd Gwybodaeth Bersonol"
 
-#: ../shell/main.c:526
+#: ../shell/main.c:512
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18217,39 +18609,57 @@ msgstr ""
 "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:144
-#: ../smime/gui/certificate-manager.c:375
-#: ../smime/gui/certificate-manager.c:383
-#: ../smime/gui/certificate-manager.c:595
-#: ../smime/gui/certificate-manager.c:603
+#: ../smime/gui/certificate-manager.c:138
+#: ../smime/gui/certificate-manager.c:156
+#: ../smime/gui/certificate-manager.c:389
+#: ../smime/gui/certificate-manager.c:407
+#: ../smime/gui/certificate-manager.c:621
+#: ../smime/gui/certificate-manager.c:639
 msgid "Select a certificate to import..."
 msgstr "Dewiswch dystysgrif i'w mewnforio..."
 
-#: ../smime/gui/certificate-manager.c:267
-#: ../smime/gui/certificate-manager.c:472
-#: ../smime/gui/certificate-manager.c:690
+#: ../smime/gui/certificate-manager.c:147
+msgid "All PKCS12 files"
+msgstr "Pob ffeil PKCS12"
+
+#: ../smime/gui/certificate-manager.c:152
+#: ../smime/gui/certificate-manager.c:403
+#: ../smime/gui/certificate-manager.c:635
+msgid "All files"
+msgstr "Pob ffeil"
+
+#: ../smime/gui/certificate-manager.c:279
+#: ../smime/gui/certificate-manager.c:496
+#: ../smime/gui/certificate-manager.c:726
 msgid "Certificate Name"
 msgstr "Enw'r Dystysgrif"
 
-#: ../smime/gui/certificate-manager.c:276
-#: ../smime/gui/certificate-manager.c:490
+#: ../smime/gui/certificate-manager.c:288
+#: ../smime/gui/certificate-manager.c:514
 msgid "Purposes"
 msgstr "Pwrpasau"
 
-#: ../smime/gui/certificate-manager.c:285 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/gui/certificate-manager.c:297 ../smime/gui/smime-ui.glade.h:37
 #: ../smime/lib/e-cert.c:570
 msgid "Serial Number"
 msgstr "Rhif Cyfresol"
 
-#: ../smime/gui/certificate-manager.c:293
+#: ../smime/gui/certificate-manager.c:305
 msgid "Expires"
 msgstr "Daw i ben"
 
-#: ../smime/gui/certificate-manager.c:481
+#: ../smime/gui/certificate-manager.c:398
+msgid "All email certificate files"
+msgstr "Pob ffeil tystysgrif e-bost"
+
+#: ../smime/gui/certificate-manager.c:505
 msgid "E-Mail Address"
 msgstr "Cyfeiriad Ebost"
 
+#: ../smime/gui/certificate-manager.c:630
+msgid "All CA certificate files"
+msgstr "Pob ffeil tystysgrif CA (Awdurdod Tystysgrifo)"
+
 #: ../smime/gui/certificate-viewer.c:341
 #, c-format
 msgid "Certificate Viewer: %s"
@@ -18653,30 +19063,6 @@ msgstr "Rhowch gyfrinair ar gyfer ffeil PKCS12:"
 msgid "Imported Certificate"
 msgstr "Tystysgrif wedi ei Fewnforio"
 
-#: ../tools/evolution-launch-composer.c:321
-msgid "An attachment to add."
-msgstr "Atodiad i'w ychwanegu."
-
-#: ../tools/evolution-launch-composer.c:322
-msgid "Content type of the attachment."
-msgstr "Math cynnwys yr atodiad."
-
-#: ../tools/evolution-launch-composer.c:323
-msgid "The filename to display in the mail."
-msgstr "Yr enw ffeil i'w ddangos yn yr e-bost."
-
-#: ../tools/evolution-launch-composer.c:324
-msgid "Description of the attachment."
-msgstr "Disgrifiad yr atodiad."
-
-#: ../tools/evolution-launch-composer.c:325
-msgid "Mark attachment to be shown inline by default."
-msgstr "Marcio'r atodiad yn un i'w ddangos, fel rhagosodiad, yn fewnol."
-
-#: ../tools/evolution-launch-composer.c:326
-msgid "Default subject for the message."
-msgstr "Pwnc rhagosodedig y neges."
-
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
@@ -19085,17 +19471,17 @@ msgstr "Cau"
 msgid "I_nsert"
 msgstr "_Mewnosod"
 
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:47
 msgid "_Attachment..."
 msgstr "_Atodiad..."
 
 #: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:50 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "_Cau"
 
 #: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-message-composer.xml.h:53
 #: ../ui/evolution-signature-editor.xml.h:25
 #: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
 msgid "_File"
@@ -19158,87 +19544,91 @@ msgid "R_ole Field"
 msgstr "Maes _Rôl"
 
 #: ../ui/evolution-event-editor.xml.h:16
+msgid "Send _Options"
+msgstr "Opsiynau _Anfon"
+
+#: ../ui/evolution-event-editor.xml.h:17
 msgid "Show time as _busy"
 msgstr "Dangos yr amser fel _prysur"
 
-#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:11
+#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
 msgid "Time _Zone"
 msgstr "_Cylchfa Amser"
 
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:12
+#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
 msgid "Toggles whether the Attendee Type field is displayed"
 msgstr "Toglu a yw'r maes Math Mynychwr wedi ei ddangos"
 
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:13
+#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Toglu a yw'r maes RSVP wedi ei ddangos"
 
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:14
+#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
 msgid "Toggles whether the Role field is displayed"
 msgstr "Toglu a yw'r maes Rôl wedi ei ddangos"
 
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:15
+#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
 msgid "Toggles whether the Status field is displayed"
 msgstr "Toglu a yw'r maes Statws wedi ei ddangos"
 
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:16
+#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
 msgid "Toggles whether the time zone is displayed"
 msgstr "Toglu a yw'r gylchfa amser wedi ei dangos"
 
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-memo-editor.xml.h:5
+#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
 #: ../ui/evolution-task-editor.xml.h:17
 msgid "Toggles whether to display categories"
 msgstr "Toglu p'un ai i ddangos categorïau ai peidio"
 
-#: ../ui/evolution-event-editor.xml.h:24
+#: ../ui/evolution-event-editor.xml.h:25
 msgid "Toggles whether to have All Day Event"
 msgstr "Toglu p'un ai i gael Digwyddiad Drwy'r Dydd"
 
-#: ../ui/evolution-event-editor.xml.h:25
+#: ../ui/evolution-event-editor.xml.h:26
 msgid "Toggles whether to show time as busy"
 msgstr "Toglu p'un ai i ddangos yr amser yn brysur"
 
-#: ../ui/evolution-event-editor.xml.h:26
+#: ../ui/evolution-event-editor.xml.h:27
 msgid "_Alarms"
 msgstr "_Larymau"
 
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
 #: ../ui/evolution-task-editor.xml.h:18
 msgid "_Categories"
 msgstr "_Categorïau"
 
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
+#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
 msgstr "_Dosbarthiad"
 
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:8
+#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
 #: ../ui/evolution-task-editor.xml.h:20
 msgid "_Confidential"
 msgstr "_Cyfrinachol"
 
-#: ../ui/evolution-event-editor.xml.h:30
+#: ../ui/evolution-event-editor.xml.h:31
 msgid "_Free/Busy"
 msgstr "_Rhydd/Prysur"
 
-#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-memo-editor.xml.h:9
+#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
 #: ../ui/evolution-task-editor.xml.h:21
 msgid "_Private"
 msgstr "_Preifat"
 
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:22
+#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../ui/evolution-event-editor.xml.h:33
+#: ../ui/evolution-event-editor.xml.h:34
 msgid "_Recurrence"
 msgstr "_Ail-ddigwyddiad"
 
-#: ../ui/evolution-event-editor.xml.h:34 ../ui/evolution-task-editor.xml.h:25
+#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
 msgid "_Status Field"
 msgstr "_Maes Statws"
 
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:26
+#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
 msgid "_Type Field"
 msgstr "_Maes Math"
 
@@ -19263,80 +19653,93 @@ msgid "Create or edit rules for filtering new mail"
 msgstr "Creu neu olygu rheolau ar gyfer hidlo e-bost newydd"
 
 #: ../ui/evolution-mail-global.xml.h:7
+msgid "Download messages for Offline"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:8
+#, fuzzy
+msgid "Download messages for offline"
+msgstr "Ffolder all-lein"
+
+#: ../ui/evolution-mail-global.xml.h:9
+msgid "Download messages of accounts/folders marked for offline"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Empty _Trash"
 msgstr "Gwagu'r Sbwriel"
 
-#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:11 ../ui/evolution-mail-list.xml.h:11
 #: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "_Plygell"
 
-#: ../ui/evolution-mail-global.xml.h:9
+#: ../ui/evolution-mail-global.xml.h:12
 msgid "Move the selected folder into another folder"
 msgstr "Symud y blygell a ddewiswyd i blygell arall"
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:14
 msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 "Tynnu'n barhaol, o bob plygell, pob neges sydd wedi marcio wedi'i ddileu"
 
-#: ../ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Search F_olders"
 msgstr "Chwilio _Plygellau"
 
-#: ../ui/evolution-mail-global.xml.h:13
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "Show Message _Preview"
 msgstr "Dangos _Rhagolwg Neges"
 
-#: ../ui/evolution-mail-global.xml.h:14
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "Show message preview below the message list"
 msgstr "Dangos rhagolwg neges islaw'r rhestr negeseuon"
 
-#: ../ui/evolution-mail-global.xml.h:15
+#: ../ui/evolution-mail-global.xml.h:18
 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:16
+#: ../ui/evolution-mail-global.xml.h:19
 msgid "Show message preview window"
 msgstr "Dangos ffenest rhagolwg neges"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:20
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Tanysgrifio neu dad-danysgrifio o blygellau ar weinyddion pell"
 
-#: ../ui/evolution-mail-global.xml.h:18
+#: ../ui/evolution-mail-global.xml.h:21
 msgid "_Classic View"
 msgstr "_Golwg Glasurol"
 
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:22
 msgid "_Copy Folder To..."
 msgstr "_Copïo Plygell i..."
 
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:23
 msgid "_Message Filters"
 msgstr "_Hidlyddion Negeseuon"
 
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:24
 msgid "_Move Folder To..."
 msgstr "_Symud Plygell i..."
 
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-mail-global.xml.h:25
 msgid "_New..."
 msgstr "_Newydd..."
 
-#: ../ui/evolution-mail-global.xml.h:23
+#: ../ui/evolution-mail-global.xml.h:26
 msgid "_Preview"
 msgstr "_Rhagolwg"
 
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
-#: ../ui/evolution-mail-global.xml.h:27
+#: ../ui/evolution-mail-global.xml.h:30
 msgid "_Subscriptions"
 msgstr "_Tanysgrifiadau"
 
-#: ../ui/evolution-mail-global.xml.h:28
+#: ../ui/evolution-mail-global.xml.h:31
 msgid "_Vertical View"
 msgstr "Golwg _Fertigol"
 
@@ -19414,52 +19817,60 @@ msgid "Permanently remove this folder"
 msgstr "Dileu'r blygell hon yn barhaol"
 
 #: ../ui/evolution-mail-list.xml.h:20
+msgid "Re_fresh..."
+msgstr "_Adnewyddu..."
+
+#: ../ui/evolution-mail-list.xml.h:21
+msgid "Refresh the folder"
+msgstr "Adnewyddu _plygell"
+
+#: ../ui/evolution-mail-list.xml.h:22
 msgid "Select Message _Thread"
 msgstr "Pob _Trywydd Neges"
 
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:23
 msgid "Select _All Messages"
 msgstr "Dewis _Bob Neges"
 
-#: ../ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:24
 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"
 
-#: ../ui/evolution-mail-list.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:25
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Dewis pob neges o fewn yr un trywydd â'r neges a ddewiswyd"
 
-#: ../ui/evolution-mail-list.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:26
 msgid "Select all visible messages"
 msgstr "Dewis bob neges weladwy"
 
-#: ../ui/evolution-mail-list.xml.h:25
-msgid "Sh_ow Hidden Messages"
+#: ../ui/evolution-mail-list.xml.h:27
+msgid "Show Hidde_n Messages"
 msgstr "_Dangos Negeseuon Cudd"
 
-#: ../ui/evolution-mail-list.xml.h:26
+#: ../ui/evolution-mail-list.xml.h:28
 msgid "Show messages that have been temporarily hidden"
 msgstr "Dangos negeseuon sydd wedi eu cuddio dros dro"
 
-#: ../ui/evolution-mail-list.xml.h:27
+#: ../ui/evolution-mail-list.xml.h:29
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Cuddio dros dro pob neges sydd eisoes wedi'i darllen"
 
-#: ../ui/evolution-mail-list.xml.h:28
+#: ../ui/evolution-mail-list.xml.h:30
 msgid "Temporarily hide the selected messages"
 msgstr "Cuddio dros dro'r negeseuon a ddewiswyd"
 
-#: ../ui/evolution-mail-list.xml.h:29
+#: ../ui/evolution-mail-list.xml.h:31
 msgid "Threaded Message list"
 msgstr "Rhestr Drywyddau Neges"
 
-#: ../ui/evolution-mail-list.xml.h:31
+#: ../ui/evolution-mail-list.xml.h:33
 msgid "_Group By Threads"
 msgstr "Grwpio mewn _Edafedd"
 
-#: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-list.xml.h:34 ../ui/evolution-mail-message.xml.h:116
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "_Neges"
@@ -19762,7 +20173,7 @@ msgid "Search Folder from Mailing _List..."
 msgstr "Plygell Chwilio ar sail _Rhestr E-bostio..."
 
 #: ../ui/evolution-mail-message.xml.h:87
-msgid "Search Folder from Recipients..."
+msgid "Search Folder from Recipien_ts..."
 msgstr "Plygell Chwilio ar sail _Derbynwyr..."
 
 #: ../ui/evolution-mail-message.xml.h:88
@@ -19989,152 +20400,181 @@ msgstr "Cael hysbysiad pan fo'ch neges yn cael ei darllen"
 msgid "HT_ML"
 msgstr "_HTML"
 
-#: ../ui/evolution-message-composer.xml.h:13
+#: ../ui/evolution-message-composer.xml.h:12
+msgid "Insert Send options"
+msgstr "Mewnosod opsiynau anfon"
+
+#: ../ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Agor ffeil"
 
-#: ../ui/evolution-message-composer.xml.h:14
+#: ../ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "PGP Amgryptio"
 
-#: ../ui/evolution-message-composer.xml.h:15
+#: ../ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "Arwydd PGP"
 
-#: ../ui/evolution-message-composer.xml.h:16
+#: ../ui/evolution-message-composer.xml.h:17
+msgid "PGP _Encrypt"
+msgstr "Amgryptio _PGP"
+
+#: ../ui/evolution-message-composer.xml.h:18
+msgid "PGP _Sign"
+msgstr "Arwyddo P_GP"
+
+#: ../ui/evolution-message-composer.xml.h:19
 msgid "R_equest Read Receipt"
 msgstr "_Gofyn am Dderbynneb Darllen"
 
-#: ../ui/evolution-message-composer.xml.h:17
+#: ../ui/evolution-message-composer.xml.h:20
+msgid "S/MIME En_crypt"
+msgstr "Amgryptio _S/MIME"
+
+#: ../ui/evolution-message-composer.xml.h:21
 msgid "S/MIME Encrypt"
 msgstr "S/MIME Amgryptio"
 
-#: ../ui/evolution-message-composer.xml.h:18
+#: ../ui/evolution-message-composer.xml.h:22
+msgid "S/MIME Sig_n"
+msgstr "Arwyddo S/_MIME"
+
+#: ../ui/evolution-message-composer.xml.h:23
 msgid "S/MIME Sign"
 msgstr "Arwydd PGP"
 
-#: ../ui/evolution-message-composer.xml.h:20
+#: ../ui/evolution-message-composer.xml.h:24
+msgid "S_end"
+msgstr "A_nfon"
+
+#: ../ui/evolution-message-composer.xml.h:26
 msgid "Save As"
 msgstr "Cadw Fel"
 
-#: ../ui/evolution-message-composer.xml.h:21
+#: ../ui/evolution-message-composer.xml.h:27
 msgid "Save Draft"
 msgstr "Cadw Drafft"
 
-#: ../ui/evolution-message-composer.xml.h:22
+#: ../ui/evolution-message-composer.xml.h:28
 msgid "Save _As..."
 msgstr "Cadw _Fel..."
 
-#: ../ui/evolution-message-composer.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:29
 msgid "Save _Draft"
 msgstr "Cadw _Drafft"
 
-#: ../ui/evolution-message-composer.xml.h:24
+#: ../ui/evolution-message-composer.xml.h:30
 msgid "Save as draft"
 msgstr "Cadw fel drafft"
 
-#: ../ui/evolution-message-composer.xml.h:25
+#: ../ui/evolution-message-composer.xml.h:31
 msgid "Save in folder..."
 msgstr "Cadw mewn plygell..."
 
-#: ../ui/evolution-message-composer.xml.h:26
+#: ../ui/evolution-message-composer.xml.h:32
 msgid "Save the current file"
 msgstr "Cadw'r ffeil cyfredol"
 
-#: ../ui/evolution-message-composer.xml.h:27
+#: ../ui/evolution-message-composer.xml.h:33
 msgid "Save the current file with a different name"
 msgstr "Cadw'r ffeil bresennol gydag enw gwahanol"
 
-#: ../ui/evolution-message-composer.xml.h:28
+#: ../ui/evolution-message-composer.xml.h:34
 msgid "Save the message in a specified folder"
 msgstr "Cadw'r neges mewn plygell benodol"
 
-#: ../ui/evolution-message-composer.xml.h:29
+#: ../ui/evolution-message-composer.xml.h:35
 msgid "Send"
 msgstr "Anfon"
 
-#: ../ui/evolution-message-composer.xml.h:30
+#: ../ui/evolution-message-composer.xml.h:36
 #: ../ui/evolution-signature-editor.xml.h:23
 msgid "Send the mail in HTML format"
 msgstr "Anfon yr e-bost ar ffurf HTML"
 
-#: ../ui/evolution-message-composer.xml.h:31
+#: ../ui/evolution-message-composer.xml.h:37
 msgid "Send this message"
 msgstr "Anfon y neges"
 
-#: ../ui/evolution-message-composer.xml.h:32
+#: ../ui/evolution-message-composer.xml.h:38
 msgid "Set the message priority to high"
 msgstr "Gosod blaenoriaeth y neges yn uchel"
 
-#: ../ui/evolution-message-composer.xml.h:33
+#: ../ui/evolution-message-composer.xml.h:39
 msgid "Sign this message with your PGP key"
 msgstr "Llofnodi'r neges gyda'ch allwedd PGP"
 
-#: ../ui/evolution-message-composer.xml.h:34
+#: ../ui/evolution-message-composer.xml.h:40
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Llofnodi'r neges gyda'ch Tystysgrif Llofnod S/MIME"
 
-#: ../ui/evolution-message-composer.xml.h:35
+#: ../ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Toglu a yw'r maes BCC wedi ei ddangos"
 
-#: ../ui/evolution-message-composer.xml.h:36
+#: ../ui/evolution-message-composer.xml.h:42
 msgid "Toggles whether the CC field is displayed"
 msgstr "Toglu a yw'r maes CC wedi ei ddangos"
 
-#: ../ui/evolution-message-composer.xml.h:37
+#: ../ui/evolution-message-composer.xml.h:43
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Toglu a yw'r dewisydd 'Oddi wrth' wedi ei ddangos"
 
-#: ../ui/evolution-message-composer.xml.h:38
+#: ../ui/evolution-message-composer.xml.h:44
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Toglu a yw'r maes Postio-i wedi ei ddangos"
 
-#: ../ui/evolution-message-composer.xml.h:39
+#: ../ui/evolution-message-composer.xml.h:45
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr " Toglu a yw'r maes 'Ateb i' wedi ei ddangos"
 
-#: ../ui/evolution-message-composer.xml.h:40
+#: ../ui/evolution-message-composer.xml.h:46
 msgid "Toggles whether the To field is displayed"
 msgstr "Toglu a yw'r maes 'At' wedi ei ddangos"
 
-#: ../ui/evolution-message-composer.xml.h:42
+#: ../ui/evolution-message-composer.xml.h:48
 msgid "_Bcc Field"
 msgstr "Maes _Bcc"
 
-#: ../ui/evolution-message-composer.xml.h:43
+#: ../ui/evolution-message-composer.xml.h:49
 msgid "_Cc Field"
 msgstr "Maes _Cc"
 
-#: ../ui/evolution-message-composer.xml.h:45
+#: ../ui/evolution-message-composer.xml.h:51
 msgid "_Delete all"
 msgstr "_Dileu'r cwbl"
 
-#: ../ui/evolution-message-composer.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:54
 msgid "_From Field"
 msgstr "Maes _Oddi wrth"
 
-#: ../ui/evolution-message-composer.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:55
 msgid "_Open..."
 msgstr "_Agor..."
 
-#: ../ui/evolution-message-composer.xml.h:50
+#: ../ui/evolution-message-composer.xml.h:56
 msgid "_Post-To Field"
 msgstr "Maes _Postio-i"
 
-#: ../ui/evolution-message-composer.xml.h:51
+#: ../ui/evolution-message-composer.xml.h:57
 msgid "_Prioritize Message"
 msgstr "_Gosod Blaenoriaeth y Neges"
 
-#: ../ui/evolution-message-composer.xml.h:52
+#: ../ui/evolution-message-composer.xml.h:58
 msgid "_Reply-To Field"
 msgstr "Maes _Ateb-i "
 
-#: ../ui/evolution-message-composer.xml.h:54
+#: ../ui/evolution-message-composer.xml.h:60
 msgid "_Security"
 msgstr "_Diogelwch"
 
-#: ../ui/evolution-message-composer.xml.h:55
+#: ../ui/evolution-message-composer.xml.h:61
+#: ../ui/evolution-task-editor.xml.h:23
+msgid "_Send Options"
+msgstr "_Opsiynau Anfon"
+
+#: ../ui/evolution-message-composer.xml.h:62
 msgid "_To Field"
 msgstr "Maes _At"
 
@@ -20203,10 +20643,6 @@ msgstr "Manylion Statws"
 msgid "Time Zone"
 msgstr "Cylchfa Amser"
 
-#: ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "_Opsiynau Anfon"
-
 #: ../ui/evolution-task-editor.xml.h:24
 msgid "_Status Details"
 msgstr "_Manylion Statws"
@@ -20322,7 +20758,7 @@ msgid "Import data from other programs"
 msgstr "Mewnforio data o raglenni eraill"
 
 #: ../ui/evolution.xml.h:16
-msgid "La_yout"
+msgid "Lay_out"
 msgstr "_Cynllun"
 
 #: ../ui/evolution.xml.h:18
@@ -20518,11 +20954,11 @@ msgid "With _Status"
 msgstr "Gyda _Statws"
 
 #. Put the ""UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:209
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:397
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:399
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:401
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:752
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:213
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:404
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:406
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:408
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:759
 msgid "UTC"
 msgstr "UTC"
 
@@ -20578,7 +21014,7 @@ msgid "_Edit..."
 msgstr "_Golygu..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1927
+#: ../widgets/table/e-table-header-item.c:1907
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
@@ -20602,7 +21038,7 @@ msgstr "_Disodli'r olwg bresennol"
 
 #. bonobo displays this string so it must be in locale
 #: ../widgets/menus/gal-view-instance.c:587
-#: ../widgets/menus/gal-view-menus.c:350
+#: ../widgets/menus/gal-view-menus.c:354
 msgid "Custom View"
 msgstr "Golwg _Addasedig"
 
@@ -20611,7 +21047,7 @@ msgid "Save Custom View"
 msgstr "Cadw Golwg Addasedig"
 
 #: ../widgets/menus/gal-view-instance.c:592
-#: ../widgets/menus/gal-view-menus.c:372
+#: ../widgets/menus/gal-view-menus.c:378
 msgid "Define Views..."
 msgstr "Diffinio Golygon..."
 
@@ -20619,10 +21055,27 @@ msgstr "Diffinio Golygon..."
 msgid "C_urrent View"
 msgstr "_Golwg Gyfredol"
 
+#: ../widgets/menus/gal-view-menus.c:315
+#, c-format
+msgid "Select View: %s"
+msgstr "Dewis Golwg: %s"
+
 #: ../widgets/menus/gal-view-menus.c:359
+msgid "Current view is a customized view"
+msgstr "Golwg addasedig yw'r olwg bresennol"
+
+#: ../widgets/menus/gal-view-menus.c:364
 msgid "Save Custom View..."
 msgstr "Cadw Golwg Addasedig..."
 
+#: ../widgets/menus/gal-view-menus.c:369
+msgid "Save current custom view"
+msgstr "Cadw'r olwg addasedig gyfredol"
+
+#: ../widgets/menus/gal-view-menus.c:383
+msgid "Create or edit views"
+msgstr "Creu neu olygu golygon"
+
 #: ../widgets/menus/gal-view-new-dialog.c:80
 msgid "Factory"
 msgstr "Ffatri"
@@ -20643,6 +21096,33 @@ msgstr "Math o olwg"
 msgid "Type of view:"
 msgstr "Math o olwg:"
 
+#: ../widgets/misc/e-attachment-bar.c:1019
+msgid "Attachment Bar"
+msgstr "Bar Atodiadau"
+
+#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
+#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
+#, c-format
+msgid "Cannot attach file %s: %s"
+msgstr "Methu atodi ffeil %s: %s"
+
+#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
+#, c-format
+msgid "Cannot attach file %s: not a regular file"
+msgstr "Methu atodi'r ffeil %s: nid yw'n ffeil arferol"
+
+#: ../widgets/misc/e-attachment.glade.h:1
+msgid "Attachment Properties"
+msgstr "Priodweddau atodiad"
+
+#: ../widgets/misc/e-attachment.glade.h:3
+msgid "File name:"
+msgstr "Enw'r ffeil:"
+
+#: ../widgets/misc/e-attachment.glade.h:4
+msgid "MIME type:"
+msgstr "Math MIME:"
+
 #: ../widgets/misc/e-attachment.glade.h:5
 msgid "Suggest automatic display of attachment"
 msgstr "Awgrymu dangos atodiadau'n awtomatig"
@@ -20654,8 +21134,8 @@ msgid "MTWTFSS"
 msgstr "LMMIGSS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1093
-#: ../widgets/misc/e-calendar-item.c:1746
+#: ../widgets/misc/e-calendar-item.c:1088
+#: ../widgets/misc/e-calendar-item.c:1742
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -20664,8 +21144,8 @@ msgid "Month Calendar"
 msgstr "Calendr Mis"
 
 #: ../widgets/misc/e-canvas-background.c:457
-#: ../widgets/misc/e-canvas-background.c:458 ../widgets/text/e-entry.c:1284
-#: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3581
+#: ../widgets/misc/e-canvas-background.c:458 ../widgets/text/e-entry.c:1235
+#: ../widgets/text/e-entry.c:1236 ../widgets/text/e-text.c:3581
 #: ../widgets/text/e-text.c:3582
 msgid "Fill color"
 msgstr "Lliw llenwi"
@@ -20673,17 +21153,17 @@ msgstr "Lliw llenwi"
 #: ../widgets/misc/e-canvas-background.c:464
 #: ../widgets/misc/e-canvas-background.c:465
 #: ../widgets/misc/e-canvas-background.c:471
-#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-entry.c:1291
-#: ../widgets/text/e-entry.c:1292 ../widgets/text/e-entry.c:1298
-#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3588
+#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-entry.c:1242
+#: ../widgets/text/e-entry.c:1243 ../widgets/text/e-entry.c:1249
+#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3588
 #: ../widgets/text/e-text.c:3589 ../widgets/text/e-text.c:3596
 #: ../widgets/text/e-text.c:3597
 msgid "GDK fill color"
 msgstr "Lliw llenwi GDK"
 
 #: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479 ../widgets/text/e-entry.c:1305
-#: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3603
+#: ../widgets/misc/e-canvas-background.c:479 ../widgets/text/e-entry.c:1256
+#: ../widgets/text/e-entry.c:1257 ../widgets/text/e-text.c:3603
 #: ../widgets/text/e-text.c:3604
 msgid "Fill stipple"
 msgstr "Llenwi dotwaith"
@@ -20711,14 +21191,14 @@ msgstr "Y2"
 #: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1429
 #: ../widgets/table/e-table-group-container.c:974
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3015
+#: ../widgets/table/e-table-item.c:3017
 msgid "Minimum width"
 msgstr "Lleiafswm lled"
 
 #: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1430
 #: ../widgets/table/e-table-group-container.c:975
 #: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3018
 msgid "Minimum Width"
 msgstr "Lleiafswm Lled"
 
@@ -20727,16 +21207,16 @@ msgstr "Lleiafswm Lled"
 msgid "Spacing"
 msgstr "Bylchu"
 
-#: ../widgets/misc/e-cell-date-edit.c:233
+#: ../widgets/misc/e-cell-date-edit.c:231
 msgid "Now"
 msgstr "Nawr"
 
-#: ../widgets/misc/e-cell-date-edit.c:793
+#: ../widgets/misc/e-cell-date-edit.c:795
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Rhaid i'r amser fod yn y fformat: %s"
 
-#: ../widgets/misc/e-cell-percent.c:76
+#: ../widgets/misc/e-cell-percent.c:79
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Rhaid i'r canran fod rhwng 0 a 100, yn gynwysedig."
 
@@ -20792,46 +21272,50 @@ msgstr "Gorllewin Ewrop"
 msgid "Western European, New"
 msgstr "Gorllewin Ewrop, Newydd"
 
-#: ../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:94 ../widgets/misc/e-charset-picker.c:95
+#: ../widgets/misc/e-charset-picker.c:96
 msgid "Traditional"
 msgstr "Traddodiadol"
 
-#: ../widgets/misc/e-charset-picker.c:96 ../widgets/misc/e-charset-picker.c:97
-#: ../widgets/misc/e-charset-picker.c:98 ../widgets/misc/e-charset-picker.c:99
+#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
+#: ../widgets/misc/e-charset-picker.c:99
+#: ../widgets/misc/e-charset-picker.c:100
 msgid "Simplified"
 msgstr "Symledig"
 
-#: ../widgets/misc/e-charset-picker.c:102
+#: ../widgets/misc/e-charset-picker.c:103
 msgid "Ukrainian"
 msgstr "Wcraneg"
 
-#: ../widgets/misc/e-charset-picker.c:105
+#: ../widgets/misc/e-charset-picker.c:106
 msgid "Visual"
 msgstr "Gweledol"
 
-#: ../widgets/misc/e-charset-picker.c:174
+#: ../widgets/misc/e-charset-picker.c:175
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Set nodau anhysbys: %s"
 
-#: ../widgets/misc/e-charset-picker.c:219
+#: ../widgets/misc/e-charset-picker.c:220
 msgid "Character Encoding"
 msgstr "Amgodiad Nodau "
 
-#: ../widgets/misc/e-charset-picker.c:234
+#: ../widgets/misc/e-charset-picker.c:235
 msgid "Enter the character set to use"
 msgstr "Rhowch y set nodau i'w defnyddio"
 
-#: ../widgets/misc/e-charset-picker.c:341
+#: ../widgets/misc/e-charset-picker.c:342
 msgid "Other..."
 msgstr "Arall..."
 
-#: ../widgets/misc/e-charset-picker.c:482
+#: ../widgets/misc/e-charset-picker.c:483
 msgid "Ch_aracter Encoding"
 msgstr "Amgodiad _Nodau "
 
-#: ../widgets/misc/e-clipped-label.c:111
+#. Translators: This is the string to draw when the label
+#. * of a fixed-size button is clipped, e.g. '...'.
+#.
+#: ../widgets/misc/e-clipped-label.c:114
 msgid "..."
 msgstr "..."
 
@@ -20855,23 +21339,21 @@ msgstr "Blwch combo i ddewis amser"
 msgid "Time"
 msgstr "Amser"
 
-#: ../widgets/misc/e-dateedit.c:461
+#: ../widgets/misc/e-dateedit.c:459
 msgid "No_w"
 msgstr "_Nawr"
 
-#: ../widgets/misc/e-dateedit.c:467
+#: ../widgets/misc/e-dateedit.c:465
 msgid "_Today"
 msgstr "_Heddiw"
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1765
-msgid "%H:%M"
-msgstr "%H:%M"
+#: ../widgets/misc/e-dateedit.c:1631
+msgid "Invalid Date Value"
+msgstr "Gwerth Dyddiad Annilys"
 
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: ../widgets/misc/e-dateedit.c:1441 ../widgets/misc/e-dateedit.c:1768
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
+#: ../widgets/misc/e-dateedit.c:1657
+msgid "Invalid Time Value"
+msgstr "Gwerth Amser Annilys"
 
 #: ../widgets/misc/e-expander.c:182
 msgid "Expanded"
@@ -20895,7 +21377,7 @@ msgid ""
 "for the mnemonic accelerator key"
 msgstr ""
 "A ddylid defnyddio tanlinellu yn y testun er mwyn dynodi y dylid defnyddio'r "
-"nod nesaf fel coflythyren bysell cyflymu"
+"nod nesaf fel cof-lythyren bysell cyflymu"
 
 #: ../widgets/misc/e-expander.c:207
 msgid "Space to put between the label and the child"
@@ -20909,11 +21391,11 @@ msgstr "Teclyn label"
 msgid "A widget to display in place of the usual expander label"
 msgstr "Teclyn i'w ddangos yn lle label arferol y chwyddwr"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3312
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3316
 msgid "Expander Size"
 msgstr "Maint Ehangwr"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3313
+#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3317
 msgid "Size of the expander arrow"
 msgstr "Maint y saeth ehangu"
 
@@ -20926,20 +21408,21 @@ msgid "Spacing around expander arrow"
 msgstr "Y gofod o amgylch y saeth chwyddo"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:164
+#: ../widgets/misc/e-filter-bar.c:129 ../widgets/misc/e-filter-bar.c:170
+#: ../widgets/misc/e-filter-bar.c:292 ../widgets/misc/e-filter-bar.c:728
 msgid "Advanced Search"
 msgstr "Chwilio Uwch"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:213
+#: ../widgets/misc/e-filter-bar.c:218
 msgid "Save Search"
 msgstr "Cadw Chwiliad"
 
-#: ../widgets/misc/e-filter-bar.c:247
+#: ../widgets/misc/e-filter-bar.c:252
 msgid "_Searches"
 msgstr "_Chwiliadau"
 
-#: ../widgets/misc/e-filter-bar.c:249
+#: ../widgets/misc/e-filter-bar.c:254
 msgid "Searches"
 msgstr "Chwiliadau"
 
@@ -20975,11 +21458,11 @@ msgstr "Neges Bresennol"
 msgid "Choose Image"
 msgstr "Dewiswch Ddelwedd"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "Map y Byd"
 
-#: ../widgets/misc/e-map.c:631
+#: ../widgets/misc/e-map.c:629
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should select the timezone from the below combo box instead."
@@ -21012,43 +21495,43 @@ msgstr "Ail-redeg model"
 msgid "Column width"
 msgstr "Lled colofn"
 
-#: ../widgets/misc/e-search-bar.c:527
+#: ../widgets/misc/e-search-bar.c:598
 msgid "_Search"
 msgstr "_Chwilio"
 
-#: ../widgets/misc/e-search-bar.c:533
+#: ../widgets/misc/e-search-bar.c:604
 msgid "_Find Now"
 msgstr "_Canfod Nawr"
 
-#: ../widgets/misc/e-search-bar.c:534
+#: ../widgets/misc/e-search-bar.c:605
 msgid "_Clear"
 msgstr "_Clirio"
 
-#: ../widgets/misc/e-search-bar.c:785
+#: ../widgets/misc/e-search-bar.c:856
 msgid "Item ID"
 msgstr "ID Eitem"
 
-#: ../widgets/misc/e-search-bar.c:792 ../widgets/text/e-entry.c:1249
-#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3503
+#: ../widgets/misc/e-search-bar.c:863 ../widgets/text/e-entry.c:1221
+#: ../widgets/text/e-entry.c:1222 ../widgets/text/e-text.c:3503
 #: ../widgets/text/e-text.c:3504
 msgid "Text"
 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:911
-msgid "Show: "
-msgstr "Dangos:"
+#: ../widgets/misc/e-search-bar.c:997
+msgid "Sho_w: "
+msgstr "_Dangos:"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:927
+#: ../widgets/misc/e-search-bar.c:1014
 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:939
+#: ../widgets/misc/e-search-bar.c:1026
 msgid " i_n "
 msgstr "o _fewn"
 
@@ -21206,12 +21689,15 @@ msgstr "_Pan yn gyfleus"
 msgid "_When opened:"
 msgstr "Ar ôl _agor:"
 
-#: ../widgets/misc/e-task-widget.c:208
+#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
+#: ../widgets/misc/e-task-widget.c:213
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: ../widgets/misc/e-task-widget.c:213
+#. 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
+#: ../widgets/misc/e-task-widget.c:219
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% yn gyflawn)"
@@ -21244,35 +21730,35 @@ msgstr "rhestr naidlenni"
 msgid "%l:%M %p"
 msgstr "%l:%M %p"
 
-#: ../widgets/table/e-cell-pixbuf.c:397
+#: ../widgets/table/e-cell-pixbuf.c:387
 msgid "Selected Column"
 msgstr "Colofn Wedi Dewis"
 
-#: ../widgets/table/e-cell-pixbuf.c:404
+#: ../widgets/table/e-cell-pixbuf.c:394
 msgid "Focused Column"
 msgstr "Colofn Wedi Ffocysu"
 
-#: ../widgets/table/e-cell-pixbuf.c:411
+#: ../widgets/table/e-cell-pixbuf.c:401
 msgid "Unselected Column"
 msgstr "Colofn Wedi Dad-Ddewis"
 
-#: ../widgets/table/e-cell-text.c:1813
+#: ../widgets/table/e-cell-text.c:1802
 msgid "Strikeout Column"
 msgstr "Colofn Wedi Taro Drwyddi"
 
-#: ../widgets/table/e-cell-text.c:1820
+#: ../widgets/table/e-cell-text.c:1809
 msgid "Underline Column"
 msgstr "Colofn Wedi Tanlinellu"
 
-#: ../widgets/table/e-cell-text.c:1827
+#: ../widgets/table/e-cell-text.c:1816
 msgid "Bold Column"
 msgstr "Colofn Fras"
 
-#: ../widgets/table/e-cell-text.c:1834
+#: ../widgets/table/e-cell-text.c:1823
 msgid "Color Column"
 msgstr "Lliw Colofn"
 
-#: ../widgets/table/e-cell-text.c:1848
+#: ../widgets/table/e-cell-text.c:1837
 msgid "BG Color Column"
 msgstr "Colofn Lliw Cefndir"
 
@@ -21287,7 +21773,7 @@ msgstr "Meysydd ar _Gael:"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:3
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1593
+#: ../widgets/table/e-table-header-item.c:1575
 msgid "Ascending"
 msgstr "Esgynnol"
 
@@ -21298,7 +21784,7 @@ msgstr "Clirio Pob Un"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:5
 #: ../widgets/table/e-table-config.glade.h:4
-#: ../widgets/table/e-table-header-item.c:1593
+#: ../widgets/table/e-table-header-item.c:1575
 msgid "Descending"
 msgstr "Disgynnol"
 
@@ -21322,7 +21808,7 @@ msgid "Sh_ow these fields in order:"
 msgstr "_Dangos y meysydd yma yn y drefn:"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:12
-#: ../widgets/table/e-table-config.c:563
+#: ../widgets/table/e-table-config.c:562
 #: ../widgets/table/e-table-config.glade.h:10
 msgid "Show Fields"
 msgstr "Dangos Meysydd"
@@ -21361,27 +21847,27 @@ msgstr "Meysydd a _Ddangosir..."
 msgid "_Sort..."
 msgstr "_Trefnu..."
 
-#: ../widgets/table/e-table-config.c:150
+#: ../widgets/table/e-table-config.c:149
 msgid "State"
 msgstr "Cyflwr"
 
-#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
+#: ../widgets/table/e-table-config.c:306 ../widgets/table/e-table-config.c:348
 msgid "(Ascending)"
 msgstr "(Esgynnol)"
 
-#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
+#: ../widgets/table/e-table-config.c:306 ../widgets/table/e-table-config.c:348
 msgid "(Descending)"
 msgstr "(Disgynnol)"
 
-#: ../widgets/table/e-table-config.c:314
+#: ../widgets/table/e-table-config.c:313
 msgid "Not sorted"
 msgstr "Heb eu trefnu"
 
-#: ../widgets/table/e-table-config.c:355
+#: ../widgets/table/e-table-config.c:354
 msgid "No grouping"
 msgstr "Dim dosbarthiad"
 
-#: ../widgets/table/e-table-config.c:584
+#: ../widgets/table/e-table-config.c:583
 msgid "Available Fields"
 msgstr "Meysydd ar Gael"
 
@@ -21394,16 +21880,16 @@ msgid "_Show these fields in order:"
 msgstr "_Dangos y meysydd yma yn y drefn:"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
-#: ../widgets/table/e-table-field-chooser-item.c:635
+#: ../widgets/table/e-table-field-chooser-item.c:637
 #: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1892
+#: ../widgets/table/e-table-header-item.c:1872
 msgid "DnD code"
 msgstr "Cod llusgo-a-gollwng"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
-#: ../widgets/table/e-table-field-chooser-item.c:642
+#: ../widgets/table/e-table-field-chooser-item.c:644
 #: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1906
+#: ../widgets/table/e-table-header-item.c:1886
 msgid "Full Header"
 msgstr "Pennawd Llawn"
 
@@ -21443,7 +21929,7 @@ msgstr[2] "%s (%d eitem)"
 #: ../widgets/table/e-table-group-container.c:898
 #: ../widgets/table/e-table-group-leaf.c:573
 #: ../widgets/table/e-table-group-leaf.c:574
-#: ../widgets/table/e-table-item.c:2973 ../widgets/table/e-table-item.c:2974
+#: ../widgets/table/e-table-item.c:2975 ../widgets/table/e-table-item.c:2976
 msgid "Alternating Row Colors"
 msgstr "Lliwiau Bob yn Ail Res"
 
@@ -21451,8 +21937,8 @@ msgstr "Lliwiau Bob yn Ail Res"
 #: ../widgets/table/e-table-group-container.c:905
 #: ../widgets/table/e-table-group-leaf.c:580
 #: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-item.c:2980 ../widgets/table/e-table-item.c:2981
-#: ../widgets/table/e-tree.c:3265 ../widgets/table/e-tree.c:3266
+#: ../widgets/table/e-table-item.c:2982 ../widgets/table/e-table-item.c:2983
+#: ../widgets/table/e-tree.c:3269 ../widgets/table/e-tree.c:3270
 msgid "Horizontal Draw Grid"
 msgstr "Grid Tynnu Llorweddol"
 
@@ -21460,8 +21946,8 @@ msgstr "Grid Tynnu Llorweddol"
 #: ../widgets/table/e-table-group-container.c:912
 #: ../widgets/table/e-table-group-leaf.c:587
 #: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-item.c:2987 ../widgets/table/e-table-item.c:2988
-#: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
+#: ../widgets/table/e-table-item.c:2989 ../widgets/table/e-table-item.c:2990
+#: ../widgets/table/e-tree.c:3275 ../widgets/table/e-tree.c:3276
 msgid "Vertical Draw Grid"
 msgstr "Grid Tynnu Fertigol"
 
@@ -21469,8 +21955,8 @@ msgstr "Grid Tynnu Fertigol"
 #: ../widgets/table/e-table-group-container.c:919
 #: ../widgets/table/e-table-group-leaf.c:594
 #: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-item.c:2994 ../widgets/table/e-table-item.c:2995
-#: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
+#: ../widgets/table/e-table-item.c:2996 ../widgets/table/e-table-item.c:2997
+#: ../widgets/table/e-tree.c:3281 ../widgets/table/e-tree.c:3282
 msgid "Draw focus"
 msgstr "Ffocws tynnu"
 
@@ -21478,7 +21964,7 @@ msgstr "Ffocws tynnu"
 #: ../widgets/table/e-table-group-container.c:926
 #: ../widgets/table/e-table-group-leaf.c:601
 #: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-item.c:3001 ../widgets/table/e-table-item.c:3002
+#: ../widgets/table/e-table-item.c:3003 ../widgets/table/e-table-item.c:3004
 msgid "Cursor mode"
 msgstr "Modd cyrchwr"
 
@@ -21486,7 +21972,7 @@ msgstr "Modd cyrchwr"
 #: ../widgets/table/e-table-group-container.c:933
 #: ../widgets/table/e-table-group-leaf.c:615
 #: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-item.c:2966 ../widgets/table/e-table-item.c:2967
+#: ../widgets/table/e-table-item.c:2968 ../widgets/table/e-table-item.c:2969
 msgid "Selection model"
 msgstr "Model Dewis"
 
@@ -21494,9 +21980,9 @@ msgstr "Model Dewis"
 #: ../widgets/table/e-table-group-container.c:940
 #: ../widgets/table/e-table-group-leaf.c:608
 #: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
-#: ../widgets/table/e-table.c:3301 ../widgets/table/e-tree.c:3259
-#: ../widgets/table/e-tree.c:3260
+#: ../widgets/table/e-table-item.c:3010 ../widgets/table/e-table-item.c:3011
+#: ../widgets/table/e-table.c:3312 ../widgets/table/e-tree.c:3263
+#: ../widgets/table/e-tree.c:3264
 msgid "Length Threshold"
 msgstr "Trothwy Hyd"
 
@@ -21504,9 +21990,9 @@ msgstr "Trothwy Hyd"
 #: ../widgets/table/e-table-group-container.c:947
 #: ../widgets/table/e-table-group-leaf.c:650
 #: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
-#: ../widgets/table/e-table.c:3308 ../widgets/table/e-tree.c:3291
-#: ../widgets/table/e-tree.c:3292
+#: ../widgets/table/e-table-item.c:3044 ../widgets/table/e-table-item.c:3045
+#: ../widgets/table/e-table.c:3319 ../widgets/table/e-tree.c:3295
+#: ../widgets/table/e-tree.c:3296
 msgid "Uniform row height"
 msgstr "Uchder cyson rhesi"
 
@@ -21517,188 +22003,167 @@ msgstr "Uchder cyson rhesi"
 msgid "Frozen"
 msgstr "Wedi rhewi"
 
-#: ../widgets/table/e-table-header-item.c:1471
+#: ../widgets/table/e-table-header-item.c:1453
 msgid "Customize Current View"
 msgstr "Addasu'r Olwg Bresennol"
 
-#: ../widgets/table/e-table-header-item.c:1491
-msgid "Sort Ascending"
-msgstr "Trefnu'n Esgynnol"
+#: ../widgets/table/e-table-header-item.c:1473
+msgid "Sort _Ascending"
+msgstr "Trefnu'n _Esgynnol"
 
-#: ../widgets/table/e-table-header-item.c:1492
-msgid "Sort Descending"
-msgstr "Trefnu'n Ddisgynnol"
+#: ../widgets/table/e-table-header-item.c:1474
+msgid "Sort _Descending"
+msgstr "Trefnu'n _Ddisgynnol"
 
-#: ../widgets/table/e-table-header-item.c:1493
-msgid "Unsort"
-msgstr "Dad-drefnu"
+#: ../widgets/table/e-table-header-item.c:1475
+msgid "_Unsort"
+msgstr "D_ad-drefnu"
 
-#: ../widgets/table/e-table-header-item.c:1495
-msgid "Group By This Field"
-msgstr "Grwpio wrth y Maes Hwn"
+#: ../widgets/table/e-table-header-item.c:1477
+msgid "Group By This _Field"
+msgstr "Grwpio wrth y _Maes Hwn"
 
-#: ../widgets/table/e-table-header-item.c:1496
-msgid "Group By Box"
-msgstr "Grwpio Wrth Focs"
+#: ../widgets/table/e-table-header-item.c:1478
+msgid "Group By _Box"
+msgstr "Grwpio Wrth _Focs"
 
-#: ../widgets/table/e-table-header-item.c:1498
-msgid "Remove This Column"
-msgstr "Tynnu'r Golofn"
+#: ../widgets/table/e-table-header-item.c:1480
+msgid "Remove This _Column"
+msgstr "_Tynnu'r Golofn"
 
-#: ../widgets/table/e-table-header-item.c:1499
-msgid "Add a Column..."
-msgstr "Ychwanegu Colofn..."
+#: ../widgets/table/e-table-header-item.c:1481
+msgid "Add a C_olumn..."
+msgstr "_Ychwanegu Colofn..."
 
-#: ../widgets/table/e-table-header-item.c:1501
-msgid "Alignment"
-msgstr "Aliniad"
+#: ../widgets/table/e-table-header-item.c:1483
+msgid "A_lignment"
+msgstr "_Aliniad"
 
-#: ../widgets/table/e-table-header-item.c:1502
-msgid "Best Fit"
-msgstr "Ffit Orau"
+#: ../widgets/table/e-table-header-item.c:1484
+msgid "B_est Fit"
+msgstr "_Ffit Orau"
 
-#: ../widgets/table/e-table-header-item.c:1503
-msgid "Format Columns..."
-msgstr "Fformatio Colofnau..."
+#: ../widgets/table/e-table-header-item.c:1485
+msgid "Format Column_s..."
+msgstr "_Fformatio Colofnau..."
 
-#: ../widgets/table/e-table-header-item.c:1505
-msgid "Customize Current View..."
-msgstr "Addasu'r Olwg Gyfredol..."
+#: ../widgets/table/e-table-header-item.c:1487
+msgid "Custo_mize Current View..."
+msgstr "A_ddasu'r Olwg Gyfredol..."
 
-#: ../widgets/table/e-table-header-item.c:1554
+#: ../widgets/table/e-table-header-item.c:1536
 msgid "Sort By"
 msgstr "Trefnu Fesul"
 
-#: ../widgets/table/e-table-header-item.c:1899 ../widgets/text/e-entry.c:1263
-#: ../widgets/text/e-entry.c:1264
-msgid "Fontset"
-msgstr "Set Ffontiau"
+#: ../widgets/table/e-table-header-item.c:1879
+msgid "Font Description"
+msgstr "Disgrifiad Ffont"
 
-#: ../widgets/table/e-table-header-item.c:1920
+#: ../widgets/table/e-table-header-item.c:1900
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "Manylion Trefnu"
 
-#: ../widgets/table/e-table-header-item.c:1934
+#: ../widgets/table/e-table-header-item.c:1914
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
 msgstr "Coeden"
 
-#: ../widgets/table/e-table-item.c:2952 ../widgets/table/e-table-item.c:2953
+#: ../widgets/table/e-table-item.c:2954 ../widgets/table/e-table-item.c:2955
 msgid "Table header"
 msgstr "Pennyn Tabl"
 
-#: ../widgets/table/e-table-item.c:2959 ../widgets/table/e-table-item.c:2960
+#: ../widgets/table/e-table-item.c:2961 ../widgets/table/e-table-item.c:2962
 msgid "Table model"
 msgstr "Model Tabl"
 
-#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
+#: ../widgets/table/e-table-item.c:3037 ../widgets/table/e-table-item.c:3038
 msgid "Cursor row"
 msgstr "Rhes Gyrchwr"
 
-#: ../widgets/table/e-table.c:3315 ../widgets/table/e-tree.c:3298
-#: ../widgets/table/e-tree.c:3299
+#: ../widgets/table/e-table.c:3326 ../widgets/table/e-tree.c:3302
+#: ../widgets/table/e-tree.c:3303
 msgid "Always search"
 msgstr "Chwilio o hyd"
 
-#: ../widgets/table/e-table.c:3322
+#: ../widgets/table/e-table.c:3333
 msgid "Use click to add"
 msgstr "Defnyddiwch glic i ychwanegu"
 
-#: ../widgets/table/e-tree.c:3284 ../widgets/table/e-tree.c:3285
+#: ../widgets/table/e-tree.c:3288 ../widgets/table/e-tree.c:3289
 msgid "ETree table adapter"
 msgstr "Addasydd tabl ETree"
 
-#: ../widgets/table/e-tree.c:3305
+#: ../widgets/table/e-tree.c:3309
 msgid "Retro Look"
 msgstr "Golwg Retro"
 
-#: ../widgets/table/e-tree.c:3306
+#: ../widgets/table/e-tree.c:3310
 msgid "Draw lines and +/- expanders."
 msgstr "Tynnu llinellau ac ehangwyr +/-."
 
-#: ../widgets/text/e-entry-test.c:49
-msgid "Minicard Test"
-msgstr "Prawf Mini-gerdyn"
-
-#: ../widgets/text/e-entry-test.c:50
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "Hawlfraint (C) 2000, Helix Code, Inc."
-
-#: ../widgets/text/e-entry-test.c:52
-msgid "This should test the minicard canvas item"
-msgstr "Fe ddylai hyn brofi digwyddiad mini-gerdyn y cynfas"
-
-#: ../widgets/text/e-entry.c:1242 ../widgets/text/e-entry.c:1243
+#: ../widgets/text/e-entry.c:1214 ../widgets/text/e-entry.c:1215
 #: ../widgets/text/e-text.c:3496 ../widgets/text/e-text.c:3497
 msgid "Event Processor"
 msgstr "Prosesydd Digwyddiadau"
 
-#: ../widgets/text/e-entry.c:1256 ../widgets/text/e-entry.c:1257
-msgid "Font"
-msgstr "Ffontiau"
-
-#: ../widgets/text/e-entry.c:1270 ../widgets/text/e-entry.c:1271
-msgid "GDKFont"
-msgstr "FfontGDK"
-
-#: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
+#: ../widgets/text/e-entry.c:1228 ../widgets/text/e-entry.c:1229
 #: ../widgets/text/e-text.c:3532 ../widgets/text/e-text.c:3533
 msgid "Justification"
 msgstr "Unioniad"
 
-#: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
+#: ../widgets/text/e-entry.c:1270 ../widgets/text/e-entry.c:1271
 #: ../widgets/text/e-text.c:3632 ../widgets/text/e-text.c:3633
 msgid "Use ellipsis"
 msgstr "Defnyddio marc colli geiriau"
 
-#: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
+#: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
 #: ../widgets/text/e-text.c:3639 ../widgets/text/e-text.c:3640
 msgid "Ellipsis"
 msgstr "Coll geiriau"
 
-#: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
+#: ../widgets/text/e-entry.c:1284 ../widgets/text/e-entry.c:1285
 #: ../widgets/text/e-text.c:3646 ../widgets/text/e-text.c:3647
 msgid "Line wrap"
 msgstr "Amlapio llinell"
 
-#: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
+#: ../widgets/text/e-entry.c:1291 ../widgets/text/e-entry.c:1292
 #: ../widgets/text/e-text.c:3653 ../widgets/text/e-text.c:3654
 msgid "Break characters"
 msgstr "Torri nodau"
 
-#: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
+#: ../widgets/text/e-entry.c:1298 ../widgets/text/e-entry.c:1299
 #: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
 msgid "Max lines"
 msgstr "Uchafswm llinellau"
 
-#: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
+#: ../widgets/text/e-entry.c:1305 ../widgets/text/e-entry.c:1306
 #: ../widgets/text/e-text.c:3689 ../widgets/text/e-text.c:3690
 msgid "Allow newlines"
 msgstr "Caniatáu llinellau newydd"
 
-#: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
+#: ../widgets/text/e-entry.c:1312 ../widgets/text/e-entry.c:1313
 #: ../widgets/text/e-text.c:3682 ../widgets/text/e-text.c:3683
 msgid "Draw borders"
 msgstr "Tynnu borderi"
 
-#: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
+#: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
 #: ../widgets/text/e-text.c:3696 ../widgets/text/e-text.c:3697
 msgid "Draw background"
 msgstr "Tynnu cefndir"
 
-#: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
+#: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
 #: ../widgets/text/e-text.c:3703 ../widgets/text/e-text.c:3704
 msgid "Draw button"
 msgstr "Tynnu botwm"
 
-#: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
+#: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
 #: ../widgets/text/e-text.c:3710 ../widgets/text/e-text.c:3711
 msgid "Cursor position"
 msgstr "Man y cyrchwr"
 
-#: ../widgets/text/e-entry.c:1389 ../widgets/text/e-entry.c:1390
+#: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
 msgid "Emulate label resize"
 msgstr "Efelychu ail-seisio labeli"
 
@@ -21758,561 +22223,264 @@ msgstr "Cyd-destun IM"
 msgid "Handle Popup"
 msgstr "Deliwr Naidlen"
 
-#~ msgid "Memo:"
-#~ msgstr "Memo:"
-
-#~ msgid "_Subscribe"
-#~ msgstr "_Tanysgrifio"
-
-#~ msgid "Mark all messages as read in the selected folder"
-#~ msgstr "_Marcio bob neges yn y blygell a ddewiswyd fel rhai wedi eu darllen"
-
-#~ msgid "*"
-#~ msgstr "*"
-
-#~ msgid "Category is"
-#~ msgstr "Categori yw"
-
-#~ msgid "Video Conferencing"
-#~ msgstr "Cynadledda Fideo"
-
-#~ msgid "work"
-#~ msgstr "gwaith"
-
-#~ msgid "WWW"
-#~ msgstr "WWW"
+#~ msgid "GTK Tree View"
+#~ msgstr "Golwg Goeden GTK"
 
-#~ msgid "personal"
-#~ msgstr "personol"
+#~ msgid "Error loading default addressbook."
+#~ msgstr "Gwall wrth lwytho'r llyfr cyfeiriadau rhagosodedig."
 
-#~ msgid "The calendar you have selected is read-only"
-#~ msgstr "Calendr darllen-yn-unig yw'r un rydych chi wedi ei ddewis"
+#~ msgid "Input File"
+#~ msgstr "Ffeil Mewnbwn"
 
-#~ msgid "Cale_ndar:"
-#~ msgstr "_Calendr:"
+#~ msgid "No filename provided."
+#~ msgstr "Dim enw ffeil wedi ei roi."
 
-#~ msgid "Locat_ion:"
-#~ msgstr "_Lleoliad:"
+#~ msgid "Add Calendar"
+#~ msgstr "Ychwanegu Calendr"
 
-#~ msgid "Dele_gatees"
-#~ msgstr "_Cynrychiolwyr"
+#~ msgid "Add Task List"
+#~ msgstr "Ychwanegu Rhestr Dasgau"
 
-#~ msgid "From:"
-#~ msgstr "Oddi wrth:"
+#~ msgid "_Add Calendar"
+#~ msgstr "_Ychwanegu Calendr"
 
-#~ msgid "%P %%"
-#~ msgstr "%P %%"
+#~ msgid "_Add Task List"
+#~ msgstr "_Ychwanegu Rhestr Dasgau"
 
-#~ msgid "date-end"
-#~ msgstr "dyddiad-diwedd"
+#~ msgid "<b>Calendar options</b>"
+#~ msgstr "<b>Opsiynau calendr</b>"
 
-#~ msgid "date-start"
-#~ msgstr "dyddiad-dechrau"
+#~ msgid "Add New Calendar"
+#~ msgstr "Ychwanegu Calendr Newydd"
 
-#~ msgid "Properties..."
-#~ msgstr "Priodweddau..."
+#~ msgid "Calendar Group"
+#~ msgstr "Grŵp Calendr"
 
-#~ msgid "_Memo"
-#~ msgstr "_Memo"
+#~ msgid "Calendar Location"
+#~ msgstr "Lleoliad Calendr"
 
-#~ msgid "      "
-#~ msgstr "      "
+#~ msgid "Calendar Name"
+#~ msgstr "Enw Calendr"
 
-#~ msgid ""
-#~ "Unable to create output file: %s\n"
-#~ " %s"
-#~ msgstr ""
-#~ "Methu creu ffeil allbwn: %s\n"
-#~ " %s"
-
-#~ msgid "Original Location"
-#~ msgstr "Lleoliad Gwreiddiol"
+#~ msgid "<b>Task List Options</b>"
+#~ msgstr "<b>Opsiynau Rhestr Dasgau</b>"
 
-#~ msgid "Search Type"
-#~ msgstr "Math Chwilio"
+#~ msgid "Add New Task List"
+#~ msgstr "Ychwanegu Rhestr Dasgau Newydd"
 
-#~ msgid "Subitem ID"
-#~ msgstr "ID Is-eitem"
+#~ msgid "Task List Group"
+#~ msgstr "Grŵp Rhestr Dasgau"
 
-#~ msgid "Find _Now"
-#~ msgstr "Chwilio _Nawr"
+#~ msgid "Task List Name"
+#~ msgstr "Enw Rhestr Dasgau"
 
-#~ msgid "C_lassification"
-#~ msgstr "_Dosbarthiad"
+#~ msgid "<b>Free/Busy C_alendars</b>"
+#~ msgstr "<b>Calendrau Rhydd/Prysur</b>"
 
-#~ msgid ""
-#~ "Public\n"
-#~ "Private\n"
-#~ "Confidential\n"
-#~ msgstr ""
-#~ "Cyhoeddus\n"
-#~ "Preifat\n"
-#~ "Cyfrinachol\n"
+#~ msgid "<b>Publishing Frequency</b>"
+#~ msgstr "<b>Amlder Cyhoeddi</b>"
 
-#~ msgid "%s : %s (%d items)"
-#~ msgstr "%s: %s (%d eitem)"
+#~ msgid "<b>Publishing _Location</b>"
+#~ msgstr "<b>_Lleoliad Cyhoeddi</b>"
 
-#~ msgid "%s (%d items)"
-#~ msgstr "%s (%d eitem)"
+#~ msgid "Free/Busy Publishing Settings"
+#~ msgstr "Gosodiadau Cyhoeddi Statws Rhydd/Prysur"
 
-#~ msgid "(%ld seconds)"
-#~ msgstr "(%ld eiliad)"
+#~ msgid "_Daily"
+#~ msgstr "_Dyddiol"
 
-#~ msgid "(%d %s %d %s)"
-#~ msgstr "(%d %s %d %s)"
+#~ msgid "_Manual"
+#~ msgstr "_Â llaw"
 
-#~ msgid "(%d %s)"
-#~ msgstr "(%d %s)"
+#~ msgid "_Weekly"
+#~ msgstr "_Wythnosol"
 
-#~ msgid " %u second"
-#~ msgstr " %u eiliad"
+#~ msgid "Enter the password for %s"
+#~ msgstr "Rhowch y cyfrinair ar gyfer %s"
 
-#~ msgid " %u seconds"
-#~ msgstr " %u eiliad"
+#~ msgid "%.0fK"
+#~ msgstr "%.0fC"
 
-#~ msgid " %u minute"
-#~ msgstr " %u funud"
+#~ msgid "%.0fM"
+#~ msgstr "%.0fM"
 
-#~ msgid " %u minutes"
-#~ msgstr " %u munud"
+#~ msgid "%.0fG"
+#~ msgstr "%.0fG"
 
-#~ msgid "%u hour"
-#~ msgstr "%u awr"
-
-#~ msgid "%u hours"
-#~ msgstr "%u awr"
-
-#~ msgid "(%d seconds)"
-#~ msgstr "(%d eiliad)"
+#~ msgid "Priority Filter \"%s\""
+#~ msgstr "Hidlydd Blaenoriaeth \"%s\""
 
 #~ msgid ""
-#~ "The message was sent via the &quot;sendmail&quot; external application. "
-#~ "Sendmail reports the following error: status 67: mail not sent.\n"
-#~ "The message is stored in the Outbox folder. Check the message for errors "
-#~ "and resend."
+#~ "Some of your Netscape email filters are based on\n"
+#~ "email priorities, which are not used in Evolution.\n"
+#~ "Instead, Evolution provides scores in the range of\n"
+#~ "-3 to 3 that can be assigned to emails and filtered\n"
+#~ "accordingly.\n"
+#~ "\n"
+#~ "As a workaround, a set of filters called \"Priority Filter\"\n"
+#~ "was added that converts Netscape's email priorities into\n"
+#~ "Evolution's scores, and the affected filters use scores instead\n"
+#~ "of priorities. Check the imported filters to make sure\n"
+#~ "everything still works as intended."
 #~ msgstr ""
-#~ "Anfonwyd eich neges drwy'r rhaglen allanol &quot;sendmail&quot;. Mae "
-#~ "Sendmail yn rhoi'r gwall canlynol: statws 67: e-bost heb ei anfon.\n"
-#~ "Mae'r neges wedi ei gadw yn y blygell Blwch Allan. Gwiriwch y neges am "
-#~ "wallau, ac ail-anfonwch."
-
-#~ msgid "Your message with the subject &quot;{0}&quot; was not delivered."
-#~ msgstr "Cafodd eich neges â'r pwnc &quot;{0}&quot; mo'i ddosbarthu."
-
-#~ msgid "_Insert"
-#~ msgstr "_Mewnosod"
-
-#~ msgid "Message _List As"
-#~ msgstr "Rhestr Negeseuon _Fel"
-
-#~ msgid "_New Search _Folder (FIXME)"
-#~ msgstr "_Plygell Chwilio Newydd"
-
-#~ msgid "Evolution _FAQ"
-#~ msgstr "_Cwestiynau Cyffredin Evolution"
+#~ "Mae rhai o'ch hidlyddion e-bost Netscape yn seiliedig ar\n"
+#~ "flaenoriaethau e-bost. Ni ddefnyddir y rhain o fewn Evolution.\n"
+#~ "Yn lle hynny, mae Evolution yn rhoi sgoriau sy'n amrywio o\n"
+#~ "-3 i 3, y gellir eu neilltuo i negeseuon e-bost a'u hidlo'n\n"
+#~ "briodol.\n"
+#~ "\n"
+#~ "I oresgyn y broblem, ychwanegwyd set o hidlyddion o'r enw\n"
+#~ "\"Hidlyddion Blaenoriaeth\". Mae'r rhain yn trosi blaenoriaethau\n"
+#~ "e-bost Netscape i mewn i sgoriau Evolution, ac mae'r hidlyddion\n"
+#~ "sy'n cael eu heffeithio yn defnyddio sgoriau yn hytrach na\n"
+#~ "blaenoriaethau. Gwiriwch yr hidlyddion gafodd eu heffeithio\n"
+#~ "i wneud yn siŵr fod popeth yn gweithio fel y dylai."
 
 #~ msgid ""
-#~ "Selecting this option means that Evolution will only try to use SSL/TLS "
-#~ "if you are in a insecure environment. For example, if you and your LDAP "
-#~ "server are behind a firewall at work, then Evolution doesn't need to use "
-#~ "SSL/TLS because your connection is already secure."
+#~ "Some of your Netscape email filters use\n"
+#~ "the \"Ignore Thread\" or \"Watch Thread\"\n"
+#~ "feature, which is not supported in Evolution.\n"
+#~ "These filters will be dropped."
 #~ msgstr ""
-#~ "Mae dewis yr opsiwn hwn yn golygu na fydd Evolution yn ceisio defnyddio "
-#~ "SSL/TLS oni bai eich bod mewn amgylchedd anniogel. Er enghraifft, os "
-#~ "ydych chi a'ch gweinydd LDAP y tu ôl i fur tân yn y gwaith, does dim "
-#~ "angen i Evolution ddefnyddio SSL/TLS gan fod eich cysylltiad yn ddiogel "
-#~ "yn barod."
-
-#~ msgid "The Evolution Groupware Suite"
-#~ msgstr "Cyfres Meddalwedd Grŵp Evolution"
-
-#~ msgid "_Show animated images"
-#~ msgstr "_Dangos delweddau animeiddiedig"
-
-#~ msgid "<b>%s (%s)</b> : %s"
-#~ msgstr "<b>%s (%s)</b> : %s"
-
-#~ msgid "<b>%s (%s)</b>"
-#~ msgstr "<b>%s (%s)</b>"
-
-#~ msgid "<b>%s</b> : %s"
-#~ msgstr "<b>%s</b> : %s"
-
-#~ msgid "<b>%s</b>"
-#~ msgstr "<b>%s</b>"
-
-#~ msgid "<span weight=\"bold\">Automatic Contacts</span>"
-#~ msgstr "<span weight=\"bold\">Cysylltiadau Awtomatig</span>"
-
-#~ msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
-#~ msgstr "<span weight=\"bold\">Cysylltiadau Awtomatig Negesu Chwim</span>"
-
-#~ msgid "<span weight=\"bold\">Conflict Search</span>"
-#~ msgstr "<span weight=\"bold\">Chwilio am Wrthdaro</span>"
-
-#~ msgid "Delete this Occurrence"
-#~ msgstr "Dileu'r Digwyddiad yma"
-
-#~ msgid "Task Table"
-#~ msgstr "Tabl Tasgau"
-
-#~ msgid "Removal Complete"
-#~ msgstr "Wedi gorffen Tynnu"
-
-#~ msgid "Con_tacts..."
-#~ msgstr "_Cysylltiadau..."
-
-#~ msgid "Memo Table"
-#~ msgstr "Tabl Memo"
-
-#~ msgid "Timezone Button"
-#~ msgstr "Botwm cylchfa amser"
-
-#~ msgid "Mail Accounts Table"
-#~ msgstr "Tabl Cyfrifon E-bost"
-
-#~ msgid "Attachment Button"
-#~ msgstr "Botwm atodiad"
-
-#~ msgid "Filters"
-#~ msgstr "Hidlyddion"
-
-#~ msgid "Alar_ms"
-#~ msgstr "_Larymau"
-
-#~ msgid "_All day Event"
-#~ msgstr "Digwyddiad _drwy'r dydd"
-
-#~ msgid "Previous Button"
-#~ msgstr "Botwm Blaenorol"
-
-#~ msgid "Text Date Entry"
-#~ msgstr "Rhoi Dyddiad ffurf Testun"
-
-#~ msgid "Date Button"
-#~ msgstr "Botwm Amser"
+#~ "Mae rhai o'ch hidlyddion e-bost Netscape yn\n"
+#~ "defnyddio'r nodweddion \"Anwybyddu Trywydd\"\n"
+#~ "neu \"Gwylio Trywydd\". Ni chynhelir y rhain o fewn\n"
+#~ "Evolution. Fe fydd yr hidlyddion hynny'n cael eu gollwng."
 
-#~ msgid "Time Combo Box"
-#~ msgstr "Blwch Combo Amser"
-
-#~ msgid "Search Text Entry"
-#~ msgstr "Cofnod Testun Chwilio"
-
-#~ msgid "Addressbook"
-#~ msgstr "Llyfr Cyfeiriadau"
-
-#~ msgid "Advanced..."
-#~ msgstr "Uwch..."
-
-#~ msgid "Select target addressbook."
-#~ msgstr "Dewiswch y llyfr cyfeiriadau targed."
-
-#~ msgid "(none)"
-#~ msgstr "(ddim)"
-
-#~ msgid "Primary Email"
-#~ msgstr "Prif Ebost"
-
-#~ msgid "Select an Action"
-#~ msgstr "Dewis Gweithred"
+#~ msgid ""
+#~ "Some of your Netscape email filters test the\n"
+#~ "body of emails for (in)equality to a given string,\n"
+#~ "which is not supported in Evolution. Those filters\n"
+#~ "were modified to test whether that string is or is not\n"
+#~ "contained in the message body."
+#~ msgstr ""
+#~ "Mae rhai o'ch hidlyddion e-bost Netscape yn profi\n"
+#~ "corff negeseuon e-bost i weld a ydynt yn gyfatebol\n"
+#~ "(neu ddim) i linyn arbennig. Ni chynhelir hyn o fewn\n"
+#~ "Evolution. Bydd yr hidlyddion yn cael eu haddasu\n"
+#~ "er mwyn profi a yw'r llinyn wedi ei gynnwys ai peidio\n"
+#~ "o fewn corff yr e-bost."
 
-#~ msgid "Create a new contact \"%s\""
-#~ msgstr "Creu cyswllt newydd \"%s\""
+#~ msgid "Evolution is importing your old Netscape data"
+#~ msgstr "Mae Evolution yn mewnforio'ch hen ddata Netscape"
 
-#~ msgid "Add address to existing contact \"%s\""
-#~ msgstr "Ychwanegu cyfeiriad i gysywllt presennol \"%s\""
+#~ msgid "Importing Netscape data"
+#~ msgstr "Mewnforio data Netscape"
 
-#~ msgid "Merge E-Mail Address"
-#~ msgstr "Cyfuno Cyfeiriad Ebost"
+#~ msgid "Settings"
+#~ msgstr "Gosodiadau"
 
-#~ msgid "Discard Changes"
-#~ msgstr "Taflu Newidiadau"
+#~ msgid "Mail Filters"
+#~ msgstr "Hidlyddion Ebost"
 
 #~ msgid ""
-#~ "<big><b>%s</b></big>\n"
-#~ "%s until %s"
+#~ "Evolution has found Netscape mail files.\n"
+#~ "Would you like them to be imported into Evolution?"
 #~ msgstr ""
-#~ "<big><b>%s</b></big>\n"
-#~ "%s tan %s"
+#~ "Mae Evolution wedi canfod hen ffeiliau e-bost Netscape.\n"
+#~ "Hoffech chi eu mewnforio i Evolution?"
 
-#~ msgid "description of appointment"
-#~ msgstr "disgrifiad yr apwyntiad"
-
-#~ msgid "Dismiss"
-#~ msgstr "Diddymu"
-
-#~ msgid "Dismiss All"
-#~ msgstr "Diddymu Popeth"
+#~ msgid "No output directory!"
+#~ msgstr "Dim cyfeiriadur albwm!"
 
 #~ msgid ""
-#~ "Alarm on %s\n"
-#~ "%s\n"
-#~ "Starting at %s\n"
-#~ "Ending at %s"
+#~ "The output directory was not found on iPod! Please ensure that iPod has "
+#~ "been correctly set up and try again."
 #~ msgstr ""
-#~ "Larwm ar %s\n"
-#~ "%s\n"
-#~ "Cychwyn am %s\n"
-#~ "Gorffen am %s"
-
-#~ msgid "Remove"
-#~ msgstr "Tynnu"
-
-#~ msgid "Don't Remove"
-#~ msgstr "Peidio â Thynnu"
-
-#~ msgid "05 minutes"
-#~ msgstr "05 munud"
-
-#~ msgid "10 minutes"
-#~ msgstr "10 munud"
-
-#~ msgid "15 minutes"
-#~ msgstr "15 munud"
-
-#~ msgid "30 minutes"
-#~ msgstr "30 munud"
-
-#~ msgid "60 minutes"
-#~ msgstr "60 munud"
-
-#~ msgid "<b>Alerts</b>"
-#~ msgstr "<b>Rhybuddion</b>"
-
-#~ msgid "<b>Default Free/Busy Server</b>"
-#~ msgstr "<b>Gweinydd Rhagosodedig Statws Rhydd/Prysur</b>"
-
-#~ msgid "<b>General</b>"
-#~ msgstr "<b>Cyffredinol</b>"
-
-#~ msgid "<b>Publishing</b>"
-#~ msgstr "<b>Cyhoeddi</b>"
-
-#~ msgid "<b>Task List</b>"
-#~ msgstr "<b>Rhestr Dasgau</b>"
-
-#~ msgid "<b>Time</b>"
-#~ msgstr "<b>Amser</b>"
-
-#~ msgid "<b>Work Week</b>"
-#~ msgstr "<b>Wythnos Waith</b>"
-
-#~ msgid "Calendar and Tasks Settings"
-#~ msgstr "Gosodiadau Calendr a Thasgau"
-
-#~ msgid "Color for overdue tasks"
-#~ msgstr "Lliw tasgau sy'n hwyr"
-
-#~ msgid "Color for tasks due today"
-#~ msgstr "Lliw tasgau sydd i fod i ddod i ben heddiw"
-
-#~ msgid "Days"
-#~ msgstr "Dyddiau"
-
-#~ msgid "Hours"
-#~ msgstr "Oriau"
-
-#~ msgid "Minutes"
-#~ msgstr "Munudau"
-
-#~ msgid "_Add URL"
-#~ msgstr "_Ychwanegu LAU"
-
-#~ msgid "option menu to choose reminder units"
-#~ msgstr "dewislen opsiwn i ddewis unedau nodyn atgoffa"
-
-#~ msgid "option menu to choose time units"
-#~ msgstr "dewislen opsiwn i ddewis unedau amser"
-
-#~ msgid "_Attachment Bar (drop attachments here)"
-#~ msgstr "_Bar Atodiadau (gollyngwch atodiadau fan hyn)"
+#~ "Cyfeiriadur allbwn heb ei ganfod ar yr iPod! Gwnewch yn siŵr fod yr iPod "
+#~ "wedi ei osod yn gywir a cheisiwch eto."
 
-#~ msgid "Scheduling"
-#~ msgstr "Amseru"
+#~ msgid "Could not export data!"
+#~ msgstr "Methu allforio data!"
 
-#~ msgid "Invitations"
-#~ msgstr "Gwahoddiadau"
+#~ msgid "Exporting data failed."
+#~ msgstr "Methodd yr allforio data."
 
-#~ msgid "<b>Date and Time</b>"
-#~ msgstr "<b>Dyddiad ac Amser</b>"
+#~ msgid "Could not open addressbook!"
+#~ msgstr "Methwyd agor y llyfr cyfeiriadau"
 
-#~ msgid "<b>Send Options</b>"
-#~ msgstr "<b>Opsiynau Danfon</b>"
+#~ msgid "Could not open the Evolution addressbook to export data."
+#~ msgstr "Methu agor y llyfr cyfeiriadau Evolution i allforio data."
 
-#~ msgid "Classi_fication:"
-#~ msgstr "_Dosbarthiad:"
+#~ msgid "Could not open calendar/todo!"
+#~ msgstr "Methu agor y calendr/rhestr dasgau i'w gwneud!"
 
-#~ msgid "This appointment has customized alarms"
-#~ msgstr "Mae gan yr apwyntiad larymau addasedig"
-
-#~ msgid "_Description:"
-#~ msgstr "_Disgrifiad:"
-
-#~ msgid "<b>Dele_gatees</b>"
-#~ msgstr "<b>_Cynrychiolwyr</b>"
-
-#~ msgid "<b>From:</b>"
-#~ msgstr "<b>Oddi wrth:</b>"
-
-#~ msgid "_Delegate To..."
-#~ msgstr "_Dirprwyo i..."
-
-#~ msgid "Assignment"
-#~ msgstr "Neilltuad"
-
-#~ msgid "_Publish Free/Busy Information"
-#~ msgstr "_Cyhoeddi Statws Rhydd/Prysur"
-
-#~ msgid "%a %m/%d/%Y %I:%M %p"
-#~ msgstr "%a %d/%m/%Y %I:%M %p"
-
-#~ msgid "%a %m/%d/%Y %H:%M"
-#~ msgstr "%a %d/%m/%Y %H:%M"
-
-#~ msgid "%a %m/%d/%Y %I %p"
-#~ msgstr "%a %d/%m/%Y %I %p"
-
-#~ msgid "%a %m/%d/%Y %H"
-#~ msgstr "%a %d/%m/%Y %H"
-
-#~ msgid "%m/%d/%Y %I:%M:%S %p"
-#~ msgstr "%d/%m/%Y %I:%M:%S %p"
-
-#~ msgid "%m/%d/%Y %H:%M:%S"
-#~ msgstr "%d/%m/%Y %H:%M:%S"
-
-#~ msgid "%m/%d/%Y %I:%M %p"
-#~ msgstr "%d/%m/%Y %i:%M %p"
-
-#~ msgid "%m/%d/%Y %H:%M"
-#~ msgstr "%d/%m/%Y %H:%M"
-
-#~ msgid "%m/%d/%Y %I %p"
-#~ msgstr "%d/%m/%Y %I %p"
-
-#~ msgid "%m/%d/%Y %H"
-#~ msgstr "%d/%m/%Y %H"
-
-#~ msgid "%I:%M:%S %p"
-#~ msgstr "%I:%M:%S %p"
-
-#~ msgid "%H:%M:%S"
-#~ msgstr "%H:%M:%S"
-
-#~ msgid "%I %p"
-#~ msgstr "%I %p"
-
-#~ msgid "_Rule name:"
-#~ msgstr "_Enw rheol:"
-
-#~ msgid "If"
-#~ msgstr "Os"
-
-#~ msgid "Execute actions"
-#~ msgstr "Gweithredu gweithredoedd"
-
-#~ msgid "Execute Command..."
-#~ msgstr "Gweithredu gorchymyn..."
-
-#~ msgid "T_erminal Font:"
-#~ msgstr "Ffont _Terfynell:"
-
-#~ msgid "Server: %s, Type: %s"
-#~ msgstr "Gweinydd: %s, Math: %s"
-
-#~ msgid "Path: %s, Type: %s"
-#~ msgstr "Llwybr: %s, Math: %s"
-
-#~ msgid "Type: %s"
-#~ msgstr "Math: %s"
-
-#~ msgid "Automatic contacts"
-#~ msgstr "Cysylltau Awtomatig"
-
-#~ msgid "Exchange Connector access error."
-#~ msgstr "Gwall mynediad Cysylltydd Exchange."
-
-#~ msgid "dialog1"
-#~ msgstr "dialog1"
-
-#~ msgid "Meetings and Tasks"
-#~ msgstr "Cyfarfodydd a Thasgau"
+#~ msgid "Could not open the Evolution calendar/todo list to export data."
+#~ msgstr ""
+#~ "Methu agor rhestr calendr/tasgau i'w gwneud Evolution er mwyn allforio "
+#~ "data."
 
-#~ msgid "Plugin manager"
-#~ msgstr "Rheolwr Ategion"
+#~ msgid "An attachment to add."
+#~ msgstr "Atodiad i'w ychwanegu."
 
-#~ msgid "Id"
-#~ msgstr "Id"
+#~ msgid "Content type of the attachment."
+#~ msgstr "Math cynnwys yr atodiad."
 
-#~ msgid "Path"
-#~ msgstr "Llwybr"
+#~ msgid "The filename to display in the mail."
+#~ msgstr "Yr enw ffeil i'w ddangos yn yr e-bost."
 
-#~ msgid "Sa junk-plugin"
-#~ msgstr "Ategyn sothach SpamAssassin"
+#~ msgid "Description of the attachment."
+#~ msgstr "Disgrifiad yr atodiad."
 
-#~ msgid "learns junk messages using spamd."
-#~ msgstr "Dysgu am negeseuon sothach gan ddefnyddio spamd."
+#~ msgid "Mark attachment to be shown inline by default."
+#~ msgstr "Marcio'r atodiad yn un i'w ddangos, fel rhagosodiad, yn fewnol."
 
-#~ msgid "Uid"
-#~ msgstr "Uid"
+#~ msgid "Print cards"
+#~ msgstr "Argraffu cardiau"
 
-#~ msgid "Url"
-#~ msgstr "Lau"
+#~ msgid "Organization"
+#~ msgstr "Sefydliad"
 
-#~ msgid ""
-#~ "The suggested filename extension of this filetype (%s) is unused in the "
-#~ "chosen filename. Do you want to continue?"
-#~ msgstr ""
-#~ "Nid yw'r estyniad awgrymir ar gyfer y ffurf ffeil yma (%s) wedi ei "
-#~ "ddefnyddio o fewn yr enw ffeil a ddewiswyd. Ydych chi am barhau?"
+#~ msgid "_Send New Message To ..."
+#~ msgstr "_Danfon Neges Newydd At..."
 
-#~ msgid "Evolution Settings"
-#~ msgstr "Gosodiadau Evolution"
+#~ msgid "E-mail"
+#~ msgstr "E-bost"
 
-#~ msgid "C"
-#~ msgstr "C"
+#~ msgid "Importing ..."
+#~ msgstr "Mewnforio..."
 
-#~ msgid "CN"
-#~ msgstr "CN"
+#~ msgid "Print envelope"
+#~ msgstr "Argraffu amlen"
 
-#~ msgid "OU"
-#~ msgstr "OU"
+#~ msgid "Print contacts"
+#~ msgstr "Argraffu cysylltiadau"
 
-#~ msgid "O"
-#~ msgstr "O"
+#~ msgid "Print contact"
+#~ msgstr "Argraffu cyswllt"
 
-#~ msgid "L"
-#~ msgstr "L"
+#~ msgid "Su_mmary"
+#~ msgstr "_Crynodeb"
 
-#~ msgid "DN"
-#~ msgstr "DN"
+#~ msgid "_Memo Content:"
+#~ msgstr "Cynnwys _Memos:"
 
-#~ msgid "DC"
-#~ msgstr "DC"
+#~ msgid "Selected day (%a %b %d %Y)"
+#~ msgstr "Dydd dewisedig (%a %b %d %Y)"
 
-#~ msgid "ST"
-#~ msgstr "ST"
+#~ msgid "%a %b %d"
+#~ msgstr "%a %b %d"
 
-#~ msgid "E"
-#~ msgstr "Dwy"
+#~ msgid "%a %d %Y"
+#~ msgstr "%a %d %Y"
 
-#~ msgid "_Preview Pane"
-#~ msgstr "Cwarel _Rhagolwg"
+#~ msgid "%a %b %d %Y"
+#~ msgstr "%a %b %d %Y"
 
-#~ msgid "_Select All"
-#~ msgstr "_Dewis Popeth"
+#~ msgid "Selected week (%s - %s)"
+#~ msgstr "Wythnos ddewisedig (%s - %s)"
 
-#~ msgid "Customize My Evolution"
-#~ msgstr "Addasu Fy Evolution"
+#~ msgid "Selected month (%b %Y)"
+#~ msgstr "Mis dewisedig (%b %Y)"
 
-#~ msgid "Move"
-#~ msgstr "Symud"
+#~ msgid "Selected year (%Y)"
+#~ msgstr "Blwyddyn ddewisedig (%Y)"
 
-#~ msgid "_About Evolution..."
-#~ msgstr "_Ynghylch Evolution..."
+#~ msgid "Print Preview"
+#~ msgstr "Rhagolwg Argraffu"
 
-#~ msgid "_Send / Receive"
-#~ msgstr "_Anfon / Derbyn"
+#~ msgid "Print Item"
+#~ msgstr "Argraffu Eitem"
 
-#~ msgid "Always Search"
-#~ msgstr "Chwilio o Hyd"
+#~ msgid "No, Do not Change Status"
+#~ msgstr "Na, Peidio â Newid Statws"
author	Rhys Jones <rhys@sucs.org>	2007-05-24 04:33:45 +0800
committer	Rhys James Jones <rhysj@src.gnome.org>	2007-05-24 04:33:45 +0800
commit	2f1de610ab8fcf524d2bc9e6d737d3124833eb0b (patch)
tree	02ab32314ab8b11056ad0b5701302a17b4a97fbc /po/cy.po
parent	089c025754234ab8535a9f84d675662dca0a2580 (diff)
download	gsoc2013-evolution-2f1de610ab8fcf524d2bc9e6d737d3124833eb0b.tar gsoc2013-evolution-2f1de610ab8fcf524d2bc9e6d737d3124833eb0b.tar.gz gsoc2013-evolution-2f1de610ab8fcf524d2bc9e6d737d3124833eb0b.tar.bz2 gsoc2013-evolution-2f1de610ab8fcf524d2bc9e6d737d3124833eb0b.tar.lz gsoc2013-evolution-2f1de610ab8fcf524d2bc9e6d737d3124833eb0b.tar.xz gsoc2013-evolution-2f1de610ab8fcf524d2bc9e6d737d3124833eb0b.tar.zst gsoc2013-evolution-2f1de610ab8fcf524d2bc9e6d737d3124833eb0b.zip