[evolution/kill-bonobo] Update Welsh translation

[Matthew Barnes <mbarnes src gnome org>]

commit eeb05e58d8af259d36bf1a22668a34219dcea847
Author: Iestyn Pryce <dylunio gmail com>
Date:   Tue Jul 28 19:20:41 2009 +0100

    Update Welsh translation

 po/cy.po |19387 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 10082 insertions(+), 9305 deletions(-)
---
diff --git a/po/cy.po b/po/cy.po
index 175be0a..cfb7df7 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -29,9 +29,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \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"
+"POT-Creation-Date: 2009-07-23 20:12+0100\n"
+"PO-Revision-Date: 2009-07-26 20:39+0100\n"
+"Last-Translator: Iestyn Pryce <dylunio gmail com>\n"
 "Language-Team: Cymraeg <gnome-cy pengwyn linux org uk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,21 +40,21 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
-msgid "evolution addressbook"
+#: ../a11y/addressbook/ea-minicard-view.c:178
+msgid "evolution address book"
 msgstr "llyfr cyfeiriadau evolution"
 
 #: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:223
+#: ../addressbook/gui/component/addressbook-component.c:208
 msgid "New Contact"
 msgstr "Cyswllt Newydd"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:231
+#: ../addressbook/gui/component/addressbook-component.c:216
 msgid "New Contact List"
 msgstr "Rhestr Gysylltiadau Newydd"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -63,79 +63,79 @@ 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:13
 msgid "Open"
 msgstr "Agor"
 
 #: ../a11y/addressbook/ea-minicard.c:141
 msgid "Contact List: "
-msgstr "Rhestr Gyswllt:"
+msgstr "Rhestr Gyswllt: "
 
 #: ../a11y/addressbook/ea-minicard.c:142
 msgid "Contact: "
-msgstr "Cyswllt:"
+msgstr "Cyswllt: "
 
 #: ../a11y/addressbook/ea-minicard.c:168
 msgid "evolution minicard"
-msgstr "cerdyn bychan Evolution"
+msgstr "cerdyn bychan evolution"
 
-#: ../a11y/calendar/ea-cal-view-event.c:266
+#: ../a11y/calendar/ea-cal-view-event.c:263
 msgid "It has alarms."
 msgstr "Mae ganddo larymau."
 
-#: ../a11y/calendar/ea-cal-view-event.c:269
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has recurrences."
 msgstr "Mae'n ail-ddigwydd."
 
-#: ../a11y/calendar/ea-cal-view-event.c:272
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It is a meeting."
 msgstr "Mae'n gyfarfod."
 
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:275
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Digwyddiad Calendr: Crynodeb yw %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:280
+#: ../a11y/calendar/ea-cal-view-event.c:277
 msgid "Calendar Event: It has no summary."
 msgstr "Digwyddiad Calendr: Does ganddo ddim crynodeb."
 
-#: ../a11y/calendar/ea-cal-view-event.c:300
+#: ../a11y/calendar/ea-cal-view-event.c:297
 msgid "calendar view event"
 msgstr "gweld digwyddiad calendr"
 
-#: ../a11y/calendar/ea-cal-view-event.c:529
+#: ../a11y/calendar/ea-cal-view-event.c:525
 msgid "Grab Focus"
 msgstr "Cipio Ffocws"
 
-#: ../a11y/calendar/ea-cal-view.c:302
+#: ../a11y/calendar/ea-cal-view.c:299
 msgid "New Appointment"
-msgstr "_Apwyntiad Newydd"
+msgstr "Apwyntiad Newydd"
 
-#: ../a11y/calendar/ea-cal-view.c:303
+#: ../a11y/calendar/ea-cal-view.c:300
 msgid "New All Day Event"
 msgstr "Digwyddiad drwy'r diwrnod newydd"
 
-#: ../a11y/calendar/ea-cal-view.c:304
+#: ../a11y/calendar/ea-cal-view.c:301
 msgid "New Meeting"
 msgstr "Cyfarfod Newydd"
 
-#: ../a11y/calendar/ea-cal-view.c:305
+#: ../a11y/calendar/ea-cal-view.c:302
 msgid "Go to Today"
 msgstr "Ewch i Heddiw"
 
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:303
 msgid "Go to Date"
 msgstr "Ewch i'r Dyddiad"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:299
-#: ../a11y/calendar/ea-week-view-main-item.c:301
+#: ../a11y/calendar/ea-day-view-main-item.c:300
+#: ../a11y/calendar/ea-week-view-main-item.c:297
 msgid "a table to view and select the current time range"
-msgstr "Tabl i weld ac i ddewis yr amrediad amser presennol"
+msgstr "tabl i weld ac i ddewis yr amrediad amser presennol"
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:150
+#: ../a11y/calendar/ea-day-view.c:148
+#: ../a11y/calendar/ea-week-view.c:147
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -145,14 +145,15 @@ msgstr[2] "Mae ganddo %d digwyddiad."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:155 ../a11y/calendar/ea-week-view.c:152
+#: ../a11y/calendar/ea-day-view.c:152
+#: ../a11y/calendar/ea-week-view.c:149
 msgid "It has no events."
 msgstr "Does ganddo ddim digwyddiad."
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:162
+#: ../a11y/calendar/ea-day-view.c:159
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Golwg Wythnos Gweithio: %s. %s"
@@ -160,21 +161,21 @@ msgstr "Golwg Wythnos Gweithio: %s. %s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:168
+#: ../a11y/calendar/ea-day-view.c:165
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Golwg Dydd: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:196
 msgid "calendar view for a work week"
 msgstr "gwybodaeth galendr am wythnos waith"
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:198
 msgid "calendar view for one or more days"
 msgstr "golwg galendr am un diwrnod neu fwy"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:707
+#: ../a11y/calendar/ea-gnome-calendar.c:186
+#: ../calendar/gui/calendar-component.c:771
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -184,32 +185,31 @@ 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:191
-#: ../calendar/gui/calendar-component.c:710
-#: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../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
+#: ../a11y/calendar/ea-gnome-calendar.c:189
+#: ../calendar/gui/calendar-component.c:774
+#: ../calendar/gui/e-day-view-top-item.c:848
+#: ../calendar/gui/e-day-view.c:1587
+#: ../calendar/gui/e-week-view-main-item.c:368
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:193
+#: ../a11y/calendar/ea-gnome-calendar.c:191
+#: ../a11y/calendar/ea-gnome-calendar.c:196
 #: ../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
+#: ../calendar/gui/calendar-component.c:776
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:783
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:217
-#: ../a11y/calendar/ea-gnome-calendar.c:223
+#: ../a11y/calendar/ea-gnome-calendar.c:215
+#: ../a11y/calendar/ea-gnome-calendar.c:221
+#: ../a11y/calendar/ea-gnome-calendar.c:227
 #: ../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
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:802
+#: ../calendar/gui/calendar-component.c:808
+#: ../calendar/gui/calendar-component.c:810
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -218,384 +218,345 @@ 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:221
-#: ../calendar/gui/calendar-component.c:736
-#: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../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
+#: ../a11y/calendar/ea-gnome-calendar.c:219
+#: ../calendar/gui/calendar-component.c:800
+#: ../calendar/gui/e-day-view-top-item.c:852
+#: ../calendar/gui/e-day-view.c:1603
+#: ../calendar/gui/e-week-view-main-item.c:382
 msgid "%d %b"
 msgstr "%d %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:248
-#: ../a11y/calendar/ea-gnome-calendar.c:256
-#: ../calendar/importers/icalendar-importer.c:772
+#: ../a11y/calendar/ea-gnome-calendar.c:245
+#: ../a11y/calendar/ea-gnome-calendar.c:253
+#: ../calendar/importers/icalendar-importer.c:782
 msgid "Gnome Calendar"
 msgstr "Calendr Gnome"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:288
 msgid "search bar"
 msgstr "bar chwilio"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:292
+#: ../a11y/calendar/ea-gnome-calendar.c:289
 msgid "evolution calendar search bar"
 msgstr "bar chwilio calendr evolution"
 
-#: ../a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:146
 msgid "Jump button"
-msgstr "Botwm Naid"
+msgstr "Botwm naid"
 
-#: ../a11y/calendar/ea-jump-button.c:158
+#: ../a11y/calendar/ea-jump-button.c:155
 msgid "Click here, you can find more events."
 msgstr "Cliciwch yma, gallwch ganfod rhagor o ddigwyddiadau."
 
-#: ../a11y/calendar/ea-week-view.c:157
+#: ../a11y/calendar/ea-week-view.c:154
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Golwg Mis: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:161
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Golwg Wythnos: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:189
 msgid "calendar view for a month"
 msgstr "gwybodaeth galendr am fis"
 
-#: ../a11y/calendar/ea-week-view.c:194
+#: ../a11y/calendar/ea-week-view.c:191
 msgid "calendar view for one or more weeks"
 msgstr "golwg galendr am un wythnos neu fwy"
 
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
 msgid "popup"
 msgstr "naidlen"
 
 #. action name
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:125
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:122
 msgid "popup a child"
 msgstr "dangos naidlen plentyn"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:614
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:616
 msgid "edit"
 msgstr "golygu"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:615
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:617
 msgid "begin editing this cell"
 msgstr "dechrau golygu'r gell"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:151
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:169
 msgid "toggle"
 msgstr "toglu"
 
 #. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:152
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:170
 msgid "toggle the cell"
 msgstr "toglu'r gell"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:192
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:210
 msgid "expand"
 msgstr "ehangu"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:193
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:211
 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:198
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:216
 msgid "collapse"
 msgstr "ymgwympo"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:199
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:217
 msgid "collapses the row in the ETree containing this cell"
 msgstr "ymgwympo'r rhes yn yr ETree sy'n cynnwys y gell"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:107
+#: ../a11y/e-table/gal-a11y-e-cell.c:120
 msgid "Table Cell"
 msgstr "Cell Tabl"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c:574
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:58
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/e-table-click-to-add.c:578
 msgid "click to add"
 msgstr "cliciwch i ychwanegu"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:53
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:67
 msgid "click"
 msgstr "clic"
 
-#: ../a11y/e-table/gal-a11y-e-table-column-header.c:135
+#: ../a11y/e-table/gal-a11y-e-table-column-header.c:152
 msgid "sort"
 msgstr "trefnu"
 
-#: ../a11y/widgets/ea-calendar-item.c:298
-#: ../a11y/widgets/ea-calendar-item.c:304
+#: ../a11y/widgets/ea-calendar-item.c:295
+#: ../a11y/widgets/ea-calendar-item.c:301
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
-#: ../a11y/widgets/ea-calendar-item.c:306
+#: ../a11y/widgets/ea-calendar-item.c:303
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "Calendr: o %s i %s"
 
-#: ../a11y/widgets/ea-calendar-item.c:341
+#: ../a11y/widgets/ea-calendar-item.c:338
 msgid "evolution calendar item"
 msgstr "eitem galendr evolution"
 
-#: ../a11y/widgets/ea-combo-button.c:40
+#: ../a11y/widgets/ea-combo-button.c:56
 msgid "Combo Button"
 msgstr "Botwm Combo"
 
-#: ../a11y/widgets/ea-combo-button.c:50
+#: ../a11y/widgets/ea-combo-button.c:66
 msgid "Activate Default"
 msgstr "Defnyddio'r Rhagosodiad"
 
-#: ../a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:68
 msgid "Popup Menu"
 msgstr "Naidlen"
 
-#: ../a11y/widgets/ea-expander.c:40
-msgid "Toggle Attachment Bar"
-msgstr "Toglu'r Bar Atodiadau"
-
-#: ../a11y/widgets/ea-expander.c:50
-msgid "activate"
-msgstr "gweithredu"
+#. For Translators: {0} is the name of the address book source
+#: ../addressbook/addressbook.error.xml.h:2
+msgid "'{0}' is a read-only address book and cannot be modified. Please select a different address book from the side bar in the Contacts view."
+msgstr "Mae '{0}' yn llyfr cyfeiriadau darllen-yn-unig a methu cael ei newid. Dewiswch lyfr cyfeiriadau gwahanol o'r bar ochor yn y golwg Cysylltiadau os gwelwch yn dda."
 
-#: ../addressbook/addressbook.error.xml.h:1
-msgid ""
-"A contact already exists with this address. Would you like to add a new card "
-"with the same address anyway?"
-msgstr ""
-"Mae cyswllt gyda'r cyfeiriad hwn yn bodoli'n barod. Ydych chi am ychwanegu "
-"cerdyn newydd gyda'r un cyfeiriad beth bynnag?"
+#: ../addressbook/addressbook.error.xml.h:3
+msgid "A contact already exists with this address. Would you like to add a new card with the same address anyway?"
+msgstr "Mae cyswllt gyda'r cyfeiriad hwn yn bodoli'n barod. Ydych chi am ychwanegu cerdyn newydd gyda'r un cyfeiriad beth bynnag?"
 
-#: ../addressbook/addressbook.error.xml.h:2
+#: ../addressbook/addressbook.error.xml.h:4
 msgid "Address '{0}' already exists."
 msgstr "Cyfeiriad '{0}' yn bodoli'n barod."
 
-#: ../addressbook/addressbook.error.xml.h:3
+#: ../addressbook/addressbook.error.xml.h:5
+msgid "Cannot add new contact"
+msgstr "Methu creu cyswllt newydd"
+
+#: ../addressbook/addressbook.error.xml.h:6
 msgid "Cannot move contact."
 msgstr "Ni ellir symud cyswllt."
 
-#: ../addressbook/addressbook.error.xml.h:4
+#: ../addressbook/addressbook.error.xml.h:7
 msgid "Category editor not available."
 msgstr "Nid yw'r golygydd categori."
 
-#: ../addressbook/addressbook.error.xml.h:5
-msgid ""
-"Check to make sure your password is spelled correctly and that you are using "
-"a supported login method. Remember that many passwords are case sensitive; "
-"your caps lock might be on."
-msgstr ""
-"Gwiriwch fod eich cyfrinair wedi ei sillafu'n gywir a'ch bod yn defnyddio "
-"dull mewngofnodi sy'n cael ei gynnal. Cofiwch fod rhaid cydweddu llythrennau "
-"bach a mawr mewn nifer o gyfrineiriau; gall fod eich 'caps lock' ymlaen."
+#: ../addressbook/addressbook.error.xml.h:8
+msgid "Check to make sure your password is spelled correctly and that you are using a supported login method. Remember that many passwords are case sensitive; your caps lock might be on."
+msgstr "Gwiriwch fod eich cyfrinair wedi ei sillafu'n gywir a'ch bod yn defnyddio dull mewngofnodi sy'n cael ei gynnal. Cofiwch fod rhaid cydweddu llythrennau bach a mawr mewn nifer o gyfrineiriau; gall fod eich 'caps lock' ymlaen."
 
-#: ../addressbook/addressbook.error.xml.h:6
+#: ../addressbook/addressbook.error.xml.h:9
 msgid "Could not get schema information for LDAP server."
 msgstr "Methwyd cyrchu gwybodaeth sgema ar gyfer gweinydd LDAP."
 
-#: ../addressbook/addressbook.error.xml.h:7
-msgid "Could not remove addressbook."
+#: ../addressbook/addressbook.error.xml.h:10
+msgid "Could not remove address book."
 msgstr "Methwyd tynnu'r llyfr cyfeiriadau."
 
-#: ../addressbook/addressbook.error.xml.h:8
-msgid ""
-"Currently you can access only GroupWise System Address Book from Evolution. "
-"Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and Groupwise Personal Contacts folders."
-msgstr ""
-"Ar hyn o bryd, dim ond Llyfr Cyfeiriadau System GroupWise fedrwch chi ei "
-"gyrchu o Evolution. Defnyddiwch gleient e-bost GroupWise gwahanol am un "
-"waith, er mwyn cael eich plygellau Cysylltiadau Aml GroupWise a "
-"Chysylltiadau Personol GroupWise."
+#: ../addressbook/addressbook.error.xml.h:11
+#, fuzzy
+msgid "Currently you can only access the GroupWise System Address Book from Evolution. Please use some other GroupWise mail client once to get your GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
+msgstr "Ar hyn o bryd, dim ond Llyfr Cyfeiriadau System GroupWise fedrwch chi ei gyrchu o Evolution. Defnyddiwch gleient e-bost GroupWise gwahanol am un waith, er mwyn cael eich plygellau Cysylltiadau Aml GroupWise a Chysylltiadau Personol GroupWise."
 
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
 msgstr "Dileu'r llyfr cyfeiriadau '{0}'?"
 
-#: ../addressbook/addressbook.error.xml.h:10
-msgid "Error loading addressbook."
-msgstr "Gwall wrth lwytho llyfr cyfeiriadau."
+#: ../addressbook/addressbook.error.xml.h:13
+msgid "Error loading address book."
+msgstr "Gwall wrth lwytho'r llyfr cyfeiriadau."
 
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Gwall wrth gadw {0} i {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:15
 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
+#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1743
 msgid "Failed to delete contact"
 msgstr "Methu dileu'r cyswllt"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "GroupWise Address book creation:"
 msgstr "Creu Llyfr Cyfeiriadau GroupWise:"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:18
 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:16
-msgid "Permission Denied."
-msgstr "Gwrthodwyd Caniatâd."
-
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:54
 msgid "Server Version"
 msgstr "Fersiwn Gweinydd"
 
-#: ../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:19
-msgid "The Evolution addressbook has quit unexpectedly."
-msgstr "Mae'r llyfr cyfeiriadau Evolution wedi terfynu'n annisgwyl."
-
 #: ../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?"
+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: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 "
-"supported search bases."
-msgstr ""
-"Mae'n bosib fod y gweinydd LDAP yn defnyddio fersiwn hynach o LDAP, nad yw'n "
-"cynnal y weithred, neu gall fod y gweinydd wedi ei gam-gyflunio. Gofynnwch "
-"i'ch gweinyddwr pa fonion chwilio sy'n cael eu cynnal."
+msgid "The Evolution address book has quit unexpectedly."
+msgstr "Mae'r llyfr cyfeiriadau Evolution wedi terfynu'n annisgwyl."
 
 #: ../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."
+msgid "The image you have selected is large. Do you want to resize and store it?"
+msgstr "Mae'r ddelwedd ddewisoch chi'n fawr. Ydych chi am newid ei maint a'i chadw?"
 
 #: ../addressbook/addressbook.error.xml.h:23
-msgid "This addressbook could not be opened."
-msgstr "Methwyd agor y llyfr cyfeiriadau yma."
+msgid "This LDAP server may use an older version of LDAP, which does not support this functionality or it may be misconfigured. Ask your administrator for supported search bases."
+msgstr "Mae'n bosib fod y gweinydd LDAP yn defnyddio fersiwn hynach o LDAP, nad yw'n cynnal y weithred, neu gall fod y gweinydd wedi ei gam-gyflunio. Gofynnwch i'ch gweinyddwr pa fonion chwilio sy'n cael eu cynnal."
 
 #: ../addressbook/addressbook.error.xml.h:24
-msgid "This addressbook server does not have any suggested search bases."
-msgstr ""
-"Does dim sail chwilio wedi ei awgrymu gan y gweinydd llyfr cyfeiriadau."
+msgid "This address book could not be opened."
+msgstr "Methwyd agor y llyfr cyfeiriadau yma."
 
 #: ../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."
-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."
+#, fuzzy
+msgid "This address book server does not have any suggested search bases."
+msgstr "Does dim sail chwilio wedi ei awgrymu gan y gweinydd llyfr cyfeiriadau."
 
 #: ../addressbook/addressbook.error.xml.h:26
+#, fuzzy
+msgid "This address book server might be unreachable or the server name may be misspelled or your network connection could be down."
+msgstr "Mae'n bosib na ellir cyrraedd y gweinydd cyfeiriadau, neu mae'n bosib fod enw'r gweinydd wedi ei gamsillafu neu fod y cysylltiad rhwydwaith â nam."
+
+#: ../addressbook/addressbook.error.xml.h:27
+msgid "This address book will be removed permanently."
+msgstr "Bydd y llyfr cyfeiriadau yn cael ei ddileu am byth."
+
+#: ../addressbook/addressbook.error.xml.h:28
 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:27
-msgid "Unable to open addressbook"
+#: ../addressbook/addressbook.error.xml.h:29
+msgid "Unable to open address book"
 msgstr "Wedi methu agor llyfr cyfeiriadau"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to perform search."
 msgstr "Ni ellir chwilio."
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Unable to save {0}."
 msgstr "Methu cadw {0}."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Would you like to save your changes?"
 msgstr "A hoffech gadw eich newidiadau?"
 
-#: ../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?"
-msgstr ""
-"Rydych yn ceisio symud cyswllt o un llyfr cyfeiriadau i'r llall, ond ni "
-"ellir ei dynnu o'r man gwreiddiol. Yn lle gwneud hynny, ydych chi am gadw "
-"copi?"
+#: ../addressbook/addressbook.error.xml.h:33
+#, fuzzy
+msgid "You are attempting to move a contact from one address book to another but it cannot be removed from the source. Do you want to save a copy instead?"
+msgstr "Rydych yn ceisio symud cyswllt o un llyfr cyfeiriadau i'r llall, ond ni ellir ei dynnu o'r man gwreiddiol. Yn lle gwneud hynny, ydych chi am gadw copi?"
 
-#: ../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 "
-"a supported version"
-msgstr ""
-"Rydych yn cysylltu â gweinydd GroupWise sydd heb ei gynnal. Hwyrach y cewch "
-"chi broblemau gyda Evolution. Dylid uwchraddio'r gweinydd at fersiwn sydd "
-"wedi ei gynnal, i gael y canlyniadau gorau."
+#: ../addressbook/addressbook.error.xml.h:34
+msgid "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results the server should be upgraded to a supported version"
+msgstr "Rydych yn cysylltu â gweinydd GroupWise sydd heb ei gynnal. Hwyrach y cewch chi broblemau gyda Evolution. Dylid uwchraddio'r gweinydd at fersiwn sydd wedi ei gynnal, i gael y canlyniadau gorau."
 
-#: ../addressbook/addressbook.error.xml.h:33
-msgid ""
-"You have made modifications to this contact. Do you want to save these "
-"changes?"
+#: ../addressbook/addressbook.error.xml.h:35
+#, fuzzy
+msgid "You do not have permission to delete contacts in this address book."
+msgstr "Does gennych chi mo'r caniatâd i ddileu'r e-bost hwn."
+
+#: ../addressbook/addressbook.error.xml.h:36
+msgid "You have made modifications to this contact. Do you want to save these changes?"
 msgstr "Rydych wedi gwneud newidiadau i'r cyswllt. Ydych chi am eu cadw?"
 
-#: ../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:37
+msgid "Your contacts for {0} will not be available until Evolution is restarted."
+msgstr "Ni fydd eich cysylltiadau ar gyfer {0} ar gael tan y caiff Evolution ei ailgychwyn."
 
-#: ../addressbook/addressbook.error.xml.h:35 ../mail/em-vfolder-rule.c:510
+#: ../addressbook/addressbook.error.xml.h:38
+#: ../mail/em-vfolder-rule.c:513
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:9
-#: ../widgets/table/e-table-config.glade.h:15
+#: ../plugins/groupwise-features/properties.glade.h:10
+#: ../widgets/table/e-table-config.glade.h:18
 msgid "_Add"
 msgstr "_Ychwanegu"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Discard"
 msgstr "_Gwaredu"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "_Do not save"
 msgstr "_Peidio â chadw"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:41
 msgid "_Resize"
 msgstr "_Newid maint"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:42
 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
+#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
+#: ../addressbook/addressbook.error.xml.h:44
+#: ../mail/mail.error.xml.h:143
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0}"
 msgstr "{0}"
 
 #. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:43
+#: ../addressbook/addressbook.error.xml.h:46
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:590
 msgid "Default Sync Address:"
-msgstr "Cyfeiriad Cydamseru Rhagosod"
+msgstr "Cyfeiriad Cydamseru Rhagosod:"
 
-#: ../addressbook/conduit/address-conduit.c:1315
-#: ../addressbook/conduit/address-conduit.c:1316
-msgid "Could not load addressbook"
+#: ../addressbook/conduit/address-conduit.c:1613
+#: ../addressbook/conduit/address-conduit.c:1614
+msgid "Could not load address book"
 msgstr "Methwyd llwytho'r llyfr cyfeiriadau"
 
-#: ../addressbook/conduit/address-conduit.c:1393
-#: ../addressbook/conduit/address-conduit.c:1396
+#: ../addressbook/conduit/address-conduit.c:1691
+#: ../addressbook/conduit/address-conduit.c:1694
 msgid "Could not read pilot's Address application block"
 msgstr "Methu darllen bloc rhaglen Cyfeiriad y peilot"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#: ../addressbook/gui/component/autocompletion-config.c:173
 msgid "Autocompletion"
 msgstr "Awto-gwblhau"
 
@@ -613,9 +574,11 @@ 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:1338
-#: ../calendar/gui/calendar-component.c:272 ../calendar/gui/migration.c:402
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../addressbook/gui/component/addressbook-view.c:1213
+#: ../calendar/gui/calendar-component.c:193
+#: ../calendar/gui/migration.c:395
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:579
 msgid "Contacts"
 msgstr "Cysylltiadau"
 
@@ -624,7 +587,8 @@ msgid "Evolution Address Book"
 msgstr "Llyfr Cyfeiriadau Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address pop-up"
+#, fuzzy
+msgid "Evolution Address Book address popup"
 msgstr "Naidlen cyfeiriad Llyfr Cyfeiriadau Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
@@ -640,8 +604,9 @@ msgid "Evolution Address Book component"
 msgstr "Cydran Llyfr Cyfeiriadau Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Rheolaeth Tystysgrifau S/Mime Evolution"
+#, fuzzy
+msgid "Evolution S/MIME Certificate Management Control"
+msgstr "Rheolaeth Tystysgrifau S/MIME Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution folder settings configuration control"
@@ -653,164 +618,211 @@ 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:139
-#: ../addressbook/gui/component/addressbook-migrate.c:483
-#: ../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
+#: ../addressbook/gui/component/addressbook-component.c:97
+#: ../addressbook/gui/component/addressbook-migrate.c:499
+#: ../calendar/gui/calendar-component.c:192
+#: ../calendar/gui/memos-component.c:151
+#: ../calendar/gui/migration.c:474
+#: ../calendar/gui/migration.c:576
+#: ../calendar/gui/migration.c:1090
+#: ../calendar/gui/tasks-component.c:148
+#: ../mail/em-folder-tree-model.c:191
+#: ../mail/em-folder-tree-model.c:193
+#: ../mail/em-migrate.c:2890
+#: ../mail/mail-component.c:320
+#: ../mail/mail-vfolder.c:217
+#: ../mail/message-list.c:1515
 msgid "On This Computer"
 msgstr "Ar y Cyfeiriadur Hwn"
 
+#. Create the LDAP source group
+#: ../addressbook/gui/component/addressbook-component.c:98
+#: ../addressbook/gui/component/addressbook-migrate.c:517
+msgid "On LDAP Servers"
+msgstr "Ar Weinyddion LDAP"
+
+#. ensure the source name is in current locale, not read from configuration
+#. Create the default Person addressbook
+#. ensure the source name is in current locale, not read from configuration
+#. Create the default Person addressbook
+#. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person task list
+#. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. orange
-#: ../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: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
+#: ../addressbook/gui/component/addressbook-component.c:135
+#: ../addressbook/gui/component/addressbook-component.c:138
+#: ../addressbook/gui/component/addressbook-migrate.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../calendar/gui/calendar-component.c:232
+#: ../calendar/gui/calendar-component.c:238
+#: ../calendar/gui/memos-component.c:189
+#: ../calendar/gui/memos-component.c:193
+#: ../calendar/gui/migration.c:484
+#: ../calendar/gui/migration.c:584
+#: ../calendar/gui/migration.c:1098
+#: ../calendar/gui/tasks-component.c:186
+#: ../calendar/gui/tasks-component.c:190
+#: ../mail/em-migrate.c:960
+#: ../plugins/email-custom-header/email-custom-header.c:337
 msgid "Personal"
 msgstr "Personol"
 
-#. Create the LDAP source group
-#: ../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:224
+#: ../addressbook/gui/component/addressbook-component.c:209
+msgctxt "New"
 msgid "_Contact"
 msgstr "_Cyswllt"
 
-#: ../addressbook/gui/component/addressbook-component.c:225
+#: ../addressbook/gui/component/addressbook-component.c:210
 msgid "Create a new contact"
 msgstr "Creu cyswllt newydd"
 
-#: ../addressbook/gui/component/addressbook-component.c:232
+#: ../addressbook/gui/component/addressbook-component.c:217
+msgctxt "New"
 msgid "Contact _List"
 msgstr "_Rhestr Gysylltiadau"
 
-#: ../addressbook/gui/component/addressbook-component.c:233
+#: ../addressbook/gui/component/addressbook-component.c:218
 msgid "Create a new contact list"
 msgstr "Creu rhestr gysylltiadau newydd"
 
-#: ../addressbook/gui/component/addressbook-component.c:239
-#: ../addressbook/gui/component/addressbook-config.c:1208
+#: ../addressbook/gui/component/addressbook-component.c:224
+#: ../addressbook/gui/component/addressbook-config.c:1245
 msgid "New Address Book"
 msgstr "Llyfr Cyfeiriadau Newydd"
 
-#: ../addressbook/gui/component/addressbook-component.c:240
+#: ../addressbook/gui/component/addressbook-component.c:225
+msgctxt "New"
 msgid "Address _Book"
 msgstr "_Llyfr Cyfeiriadau"
 
-#: ../addressbook/gui/component/addressbook-component.c:241
+#: ../addressbook/gui/component/addressbook-component.c:226
 msgid "Create a new address book"
 msgstr "Creu llyfr cyfeiriadau newydd"
 
-#: ../addressbook/gui/component/addressbook-component.c:404
+#: ../addressbook/gui/component/addressbook-component.c:389
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Methu wrth uwchraddio plygellau neu osodiadau'r Llyfr Cyfeiriadau."
 
-#: ../addressbook/gui/component/addressbook-config.c:332
+#: ../addressbook/gui/component/addressbook-config.c:217
+msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL."
+msgstr "Mae dewis yr opsiwn hwn yn golygu na fydd Evolution yn cysylltu â'ch gweinydd LDAP oni bai ei fod yn cynnal SSL."
+
+#: ../addressbook/gui/component/addressbook-config.c:219
+msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports TLS."
+msgstr "Mae dewis yr opsiwn hwn yn golygu na fydd Evolution yn cysylltu â'ch gweinydd LDAP oni bai ei fod yn cynnal TLS."
+
+#: ../addressbook/gui/component/addressbook-config.c:221
+msgid "Selecting this option means that your server does not support either SSL or TLS. This means that your connection will be insecure, and that you will be vulnerable to security exploits."
+msgstr "Mae dewis yr opsiwn hwn yn golygu nad yw eich gweinydd yn cynnal SSL na TLS. Bydd eich cysylltiad, felly, yn anniogel, a byddwch yn agored i ymosodiadau diogelwch."
+
+#: ../addressbook/gui/component/addressbook-config.c:346
 msgid "Base"
 msgstr "Sail"
 
-#: ../addressbook/gui/component/addressbook-config.c:533
-#: ../calendar/gui/dialogs/calendar-setup.c:172
+#: ../addressbook/gui/component/addressbook-config.c:547
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "_Type:"
 msgstr "_Math:"
 
-#: ../addressbook/gui/component/addressbook-config.c:635
-msgid "Copy book content locally for offline operation"
-msgstr "Copïwch gynnwys y llyfr yn lleol er mwyn ei ddefnyddio all-lein"
+#: ../addressbook/gui/component/addressbook-config.c:648
+msgid "Copy _book content locally for offline operation"
+msgstr "Copïwch gynnwys y _llyfr yn lleol er mwyn ei ddefnyddio all-lein"
 
-#: ../addressbook/gui/component/addressbook-config.c:984
-#: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../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:2087
+#: ../addressbook/gui/component/addressbook-config.c:759
+msgid "This is the port on the LDAP server that Evolution will try to connect to. A list of standard ports has been provided. Ask your system administrator what port you should specify."
+msgstr "Dyma'r porth y bydd Evolution yn ceisio cysylltu iddo ar y gweinydd LDAP. Mae rhestr o byrth safonol wedi ei ddarparu. Gofynnwch i'ch gweinyddwr systemau pa borth ddylech chi ei benodi."
+
+#: ../addressbook/gui/component/addressbook-config.c:837
+#, fuzzy
+msgid "This is the method Evolution will use to authenticate you.  Note that setting this to \"Email Address\" requires anonymous access to your LDAP server."
+msgstr "Dyma'r dull y bydd Evolution yn ei ddefnyddio i'ch dilysu. Sylwch y bydd rhaid cael mynediad dienw i'ch gweinydd LDAP os am osod hwn fel \"Cyfeiriad E-bost\"."
+
+#: ../addressbook/gui/component/addressbook-config.c:916
+msgid "The search scope defines how deep you would like the search to extend down the directory tree. A search scope of \"sub\" will include all entries below your search base. A search scope of \"one\" will only include the entries one level beneath your base."
+msgstr "Mae'r cwmpas chwilio yn penderfynu ba ddyfnder islaw'r goeden cyfeiriaduron yr ydych am i'r chwilio ymestyn. Mae cwmpas chwilio o \"sub\" yn cynnwys bob cofnod islaw'ch bôn chwilio. Mae cwmpas chwilio o \"one\" ond yn cynnwys y cofnodion un lefel islaw'ch bôn."
+
+#: ../addressbook/gui/component/addressbook-config.c:1020
+#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../mail/em-folder-properties.c:283
+#: ../mail/mail-config.glade.h:95
+#: ../plugins/itip-formatter/itip-formatter.c:2558
 #: ../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:564
-#: ../mail/importers/pine-importer.c:392
+#: ../addressbook/gui/component/addressbook-config.c:1021
+#: ../addressbook/gui/widgets/e-addressbook-view.c:553
+#: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "Llyfr Cyfeiriadau"
 
-#: ../addressbook/gui/component/addressbook-config.c:989
+#: ../addressbook/gui/component/addressbook-config.c:1025
 msgid "Server Information"
 msgstr "Gwybodaeth Gweinydd"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:1027
 msgid "Authentication"
 msgstr "Dilysiant"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
-#: ../addressbook/gui/component/ldap-config.glade.h:17
-#: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
+#: ../addressbook/gui/component/addressbook-config.c:1030
+#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Manylion"
 
-#: ../addressbook/gui/component/addressbook-config.c:995
-#: ../mail/em-folder-browser.c:853
+#: ../addressbook/gui/component/addressbook-config.c:1031
+#: ../mail/em-folder-browser.c:1021
 msgid "Searching"
 msgstr "Chwilio"
 
-#: ../addressbook/gui/component/addressbook-config.c:997
+#: ../addressbook/gui/component/addressbook-config.c:1033
 msgid "Downloading"
 msgstr "Yn Llwytho i Lawr"
 
-#: ../addressbook/gui/component/addressbook-config.c:1206
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/addressbook-config.c:1243
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "Address Book Properties"
 msgstr "Priodweddau Llyfr Cyfeiriadau"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1202
+#: ../addressbook/gui/component/addressbook-migrate.c:74
+#: ../calendar/gui/migration.c:148
+#: ../mail/em-migrate.c:1109
 msgid "Migrating..."
 msgstr "Trosi..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1243
+#: ../addressbook/gui/component/addressbook-migrate.c:126
+#: ../calendar/gui/migration.c:195
+#: ../mail/em-migrate.c:1168
 #, c-format
-msgid "Migrating `%s':"
-msgstr "Yn trosi `%s':"
+msgid "Migrating '%s':"
+msgstr "Yn trosi '%s':"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:629
+#: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
 msgstr "Gweinyddion LDAP"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:744
+#: ../addressbook/gui/component/addressbook-migrate.c:760
 msgid "Autocompletion Settings"
 msgstr "Gosodiadau Awto-gwblhau"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1119
+#: ../addressbook/gui/component/addressbook-migrate.c:1136
 msgid ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution contact folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Mae lleoliad a strwythur plygellau cysylltiadau Evolution wedi newid ers "
-"Evolution 1.x\n"
+"Mae lleoliad a strwythur plygellau cysylltiadau Evolution wedi newid ers Evolution 1.x\n"
 "\n"
 "Byddwch yn amyneddgar nes i Evolution fudo'ch plygellau..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1133
+#: ../addressbook/gui/component/addressbook-migrate.c:1150
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -820,7 +832,7 @@ msgstr ""
 "\n"
 "Byddwch yn amyneddgar nes i Evolution fudo'ch plygellau..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1142
+#: ../addressbook/gui/component/addressbook-migrate.c:1159
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -830,7 +842,7 @@ msgstr ""
 "\n"
 "Byddwch yn amyneddgar nes i Evolution fudo'ch plygellau..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1152
+#: ../addressbook/gui/component/addressbook-migrate.c:1169
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -840,429 +852,309 @@ msgstr ""
 "\n"
 "Byddwch yn amyneddgar nes i Evolution fudo'ch data Pilot Sync..."
 
-#: ../addressbook/gui/component/addressbook-view.c:434
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:422
+#: ../mail/em-folder-utils.c:453
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Ail-enwi'r blygell \"%s\" i:"
 
-#: ../addressbook/gui/component/addressbook-view.c:437
-#: ../mail/em-folder-utils.c:505
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:455
 msgid "Rename Folder"
 msgstr "Ailenwi Plygell"
 
-#: ../addressbook/gui/component/addressbook-view.c:442
-#: ../mail/em-folder-utils.c:511
+#: ../addressbook/gui/component/addressbook-view.c:430
+#: ../mail/em-folder-utils.c:461
 msgid "Folder names cannot contain '/'"
 msgstr "Ni all enwau plygellau gynnwys '/'"
 
-#: ../addressbook/gui/component/addressbook-view.c:445
-msgid "A Folder with this name already exists"
-msgstr "Plygell â'r un enw yn bodoli'n barod"
-
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:949
 msgid "_New Address Book"
 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: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:32 ../ui/evolution-memos.xml.h:16
+#: ../addressbook/gui/component/addressbook-view.c:950
+msgid "Save As vCard..."
+msgstr "Cadw Fel VCard..."
+
+#: ../addressbook/gui/component/addressbook-view.c:951
+#: ../calendar/gui/calendar-component.c:628
+#: ../calendar/gui/memos-component.c:479
+#: ../calendar/gui/tasks-component.c:472
+#: ../mail/em-folder-tree.c:2122
+#: ../ui/evolution-mail-list.xml.h:39
+msgid "_Rename..."
+msgstr "_Ailenwi..."
+
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../calendar/gui/calendar-component.c:631
+#: ../calendar/gui/e-calendar-table.c:1608
+#: ../calendar/gui/e-calendar-view.c:1826
+#: ../calendar/gui/e-memo-table.c:944
+#: ../calendar/gui/memos-component.c:482
+#: ../calendar/gui/tasks-component.c:475
+#: ../mail/em-folder-tree.c:2119
+#: ../mail/em-folder-view.c:1340
+#: ../ui/evolution-addressbook.xml.h:49
+#: ../ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-mail-list.xml.h:35
+#: ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Dileu"
 
-#: ../addressbook/gui/component/addressbook-view.c:959
-msgid "Save As Vcard..."
-msgstr "Cadw fel VCard..."
-
-#: ../addressbook/gui/component/addressbook-view.c:961
-#: ../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:957
+#: ../calendar/gui/calendar-component.c:636
+#: ../calendar/gui/memos-component.c:487
+#: ../calendar/gui/tasks-component.c:480
+#: ../mail/em-folder-tree.c:2127
+#: ../ui/evolution-addressbook.xml.h:59
+#: ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "_Priodweddau"
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1223
 msgid "Contact Source Selector"
 msgstr "Dewisydd Ffynhonnell Gyswllt"
 
-#: ../addressbook/gui/component/addressbook.c:99
+#: ../addressbook/gui/component/addressbook.c:102
 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:511
+#: ../addressbook/gui/component/addressbook.c:207
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:529
 msgid "Failed to authenticate.\n"
 msgstr "Methwyd dilysu.\n"
 
-#: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
+#: ../addressbook/gui/component/addressbook.c:214
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:509
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Rhowch gyfrinair ar gyfer %s (defnyddiwr %s)"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+#: ../addressbook/gui/component/addressbook.c:222
+#: ../calendar/common/authentication.c:51
+#: ../plugins/google-account-setup/google-source.c:500
+#: ../plugins/publish-calendar/publish-calendar.c:216
+#: ../smime/gui/component.c:49
+msgid "Enter password"
+msgstr "Rhowch gyfrinair"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
 msgid "Autocomplete length"
 msgstr "Hyd awto-gwblhau"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:2
 msgid "EFolderList XML for the list of completion URIs"
 msgstr "XML EFolderList am y rhestr cwblhau URIau"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:3
 msgid "EFolderList XML for the list of completion URIs."
 msgstr "XML EFolderList am y rhestr cwblhau URIau."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
-msgid ""
-"Position of the vertical pane, between the card and list views and the "
-"preview pane, in pixels."
-msgstr ""
-"Lleoliad y cwarel fertigol, rhwng y golygon cerdyn a rhestr a'r cwarel "
-"rhagolwg, mewn picseli."
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:4
+msgid "Position of the vertical pane, between the card and list views and the preview pane, in pixels."
+msgstr "Lleoliad y cwarel fertigol, rhwng y golygon cerdyn a rhestr a'r cwarel rhagolwg, mewn picseli."
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
+msgid "Show autocompleted name with an address"
+msgstr "Dangos enw wedi'i awto-gwblhau gyda cyfeiriad"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
 msgid "Show preview pane"
 msgstr "Dangos cwarel rhagolwg"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
-msgid ""
-"The number of characters that must be typed before Evolution will attempt to "
-"autocomplete."
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
+msgid "The number of characters that must be typed before Evolution will attempt to autocomplete."
 msgstr "Y nifer o nodau rhaid eu teipio cyn i Evolution geisio awto-gwblhau."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
 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:8
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
 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:70
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Vertical pane position"
 msgstr "Lleoliad cwarel fertigol"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:11
+msgid "Whether force showing the mail address with the name of the autocompleted contact in the entry."
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:12
 msgid "Whether to show the preview pane."
 msgstr "P'un ai i ddangos y cwarel rhagolwg."
 
+#: ../addressbook/gui/component/autocompletion-config.c:175
+msgid "Always _show address of the autocompleted contact"
+msgstr "Pob tro dango_s cyfeiriad y cyswllt sydd wedi'i awto-gwblhau"
+
+#: ../addressbook/gui/component/autocompletion-config.c:180
+#, fuzzy
+msgid "Look up in address books"
+msgstr "llyfr cyfeiriadau evolution"
+
 #: ../addressbook/gui/component/ldap-config.glade.h:1
 msgid "1"
 msgstr "1"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:2
-msgid "3268"
-msgstr "3268"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:3
-msgid "389"
-msgstr "389"
+msgid ""
+"389\n"
+"636\n"
+"3268"
+msgstr ""
+"389\n"
+"636\n"
+"3268"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "5"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:5
-msgid "636"
-msgstr "636"
-
 #: ../addressbook/gui/component/ldap-config.glade.h:6
 msgid "<b>Authentication</b>"
 msgstr "<b>Dilysiad</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Display</b>"
-msgstr "<b>Dangos</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Downloading</b>"
 msgstr "<b>Llwytho i Lawr</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Searching</b>"
 msgstr "<b>Yn Chwilio</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "<b>Server Information</b>"
-msgstr "<b>Gwybodaeth Gweinydd</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:11
-msgid "<b>Type:</b>"
-msgstr "<b>Math:</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:12
-msgid "Add Address Book"
-msgstr "Ychwanegu Llyfr Cyfeiriadau"
+#, fuzzy
+msgid ""
+"Anonymously\n"
+"Using email address\n"
+"Using distinguished name (DN)"
+msgstr "Yn defnyddio enw unigryw (distinguished name: DN)"
 
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
 #: ../addressbook/gui/component/ldap-config.glade.h:14
-#: ../mail/em-account-editor.c:777
-msgid "Always"
-msgstr "Bob tro"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:15
-msgid "Anonymously"
-msgstr "Dienw"
+msgid "B_rowse this book until limit reached"
+msgstr ""
 
 #: ../addressbook/gui/component/ldap-config.glade.h:16
-msgid "Basic"
-msgstr "Sylfaenol"
+msgid "Evolution will use this email address to authenticate you with the server."
+msgstr "Fe fydd Evolution yn defnyddio'r cyfeiriad e-bost yma i'ch dilysu gyda'r gweinydd."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:18
-msgid "Distinguished name"
-msgstr "Enw Gwahaniaethol"
+msgid "Lo_gin:"
+msgstr "_Mewngofnod:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:19
-msgid "Email address"
-msgstr "Cyfeiriad e-bost"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#, fuzzy
 msgid ""
-"Evolution will use this email address to authenticate you with the server."
-msgstr ""
-"Fe fydd Evolution yn defnyddio'r cyfeiriad e-bost yma i'ch dilysu gyda'r "
-"gweinydd."
+"One\n"
+"Sub"
+msgstr "Un"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:21
-msgid "Find Possible Search Bases"
-msgstr "Canfod Bonion Chwilio Posib"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:23
-msgid "Lo_gin:"
-msgstr "_Mewngofnod:"
+msgid ""
+"SSL encryption\n"
+"TLS encryption\n"
+"No encryption"
+msgstr ""
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:776
-msgid "Never"
-msgstr "Byth"
+msgid "Search Filter"
+msgstr "Hidlydd Chwilio"
 
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. It will not use an encrypted connection.
 #: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:304
-msgid "No encryption"
-msgstr "Dim amgryptio"
+msgid "Search _base:"
+msgstr "_Sail chwilio:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:26
-msgid "One"
-msgstr "Un"
+msgid "Search _filter:"
+msgstr "Hidlydd _chwilio:"
 
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
-#. abbreviation.
 #: ../addressbook/gui/component/ldap-config.glade.h:27
-#: ../mail/em-account-editor.c:312
-msgid "SSL encryption"
-msgstr "Amgryptio SSL"
+#, fuzzy
+msgid "Search filter is the type of object to be searched for. If this is not modified, the default search will be performed on the type \"person\"."
+msgstr "Mae'r hidlydd chwilio yn penodi'r math o wrthrychau sy'n cael eu chwilio amdanynt. Os na chaiff hwn ei newid, y rhagosodiad yw chwilio am wrthrychau o'r dosbarth \"person\"."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:28
-msgid "Search Filter"
-msgstr "Hidlydd Chwilio"
+msgid "Supported Search Bases"
+msgstr "Bonion Chwilio a Gynhelir"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:29
-msgid "Search _base:"
-msgstr "_Sail chwilio:"
+msgid "The search base is the distinguished name (DN) of the entry where your searches will begin. If you leave this blank, the search will begin at the root of the directory tree."
+msgstr "Y bôn chwilio yw'r enw unigryw (distinguished name: DN) ar y cofnod lle bydd eich chwilota'n cychwyn. Os gadewch hwn yn wag, bydd y chwilota'n cychwyn ar wraidd eich coeden cyfeiriaduron."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:30
-msgid "Search _filter:"
-msgstr "Hidlydd _chwilio:"
+#, fuzzy
+msgid "This is the full name of your LDAP server. For example, \"ldap.mycompany.com\"."
+msgstr "Dyma enw llawn eich gweinydd LDAP. Er enghraifft, \"ldap.fynghwmni.com\""
 
 #: ../addressbook/gui/component/ldap-config.glade.h:31
-msgid "Search filter"
-msgstr "Hidlydd chwilio"
+msgid "This is the maximum number of entries to download. Setting this number to be too large will slow down your address book."
+msgstr "Dyma uchafswm nifer y cofnodion i'w llwytho i lawr. Gall ei osod yn rhy uchel beri i'ch llyfr cyfeiriadau arafu."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:32
-msgid ""
-"Search filter is the type of the objects searched for, while performing the "
-"search. If this is not modified, by  default search will be performed on "
-"objectclass of the type \"person\"."
-msgstr ""
-"Mae'r hidlydd chwilio yn penodi'r math o wrthrychau sy'n cael eu chwilio "
-"amdanynt. Os na chaiff hwn ei newid, y rhagosodiad yw chwilio am wrthrychau "
-"o'r dosbarth \"person\"."
+msgid "This is the name for this server that will appear in your Evolution folder list. It is for display purposes only. "
+msgstr "Dyma enw'r gweinydd fydd yn ymddangos yn eich rhestr plygellau Evolution. Mae hwn at bwrpas dangos ar y sgrin yn unig."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:33
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
-msgstr ""
-"Mae dewis yr opsiwn hwn yn golygu na fydd Evolution yn cysylltu â'ch "
-"gweinydd LDAP oni bai ei fod yn cynnal SSL."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:34
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
-msgstr ""
-"Mae dewis yr opsiwn hwn yn golygu na fydd Evolution yn cysylltu â'ch "
-"gweinydd LDAP oni bai ei fod yn cynnal TLS."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:35
-msgid ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS. This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits."
-msgstr ""
-"Mae dewis yr opsiwn hwn yn golygu nad yw eich gweinydd yn cynnal SSL na TLS. "
-"Bydd eich cysylltiad, felly, yn anniogel, a byddwch yn agored i ymosodiadau "
-"diogelwch."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:36
-msgid "Sub"
-msgstr "Is"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:37
-msgid "Supported Search Bases"
-msgstr "Bonion Chwilio a Gynhelir"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. TLS (Transport Layer Security) is commonly known by
-#. this abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:38
-#: ../mail/em-account-editor.c:308
-msgid "TLS encryption"
-msgstr "Amgryptio TLS"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:39
-msgid ""
-"The search base is the distinguished name (DN) of the entry where your "
-"searches will begin. If you leave this blank, the search will begin at the "
-"root of the directory tree."
-msgstr ""
-"Y bôn chwilio yw'r enw unigryw (distinguished name: DN) ar y cofnod lle bydd "
-"eich chwilota'n cychwyn. Os gadewch hwn yn wag, bydd y chwilota'n cychwyn ar "
-"wraidd eich coeden cyfeiriaduron."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:40
-msgid ""
-"The search scope defines how deep you would like the search to extend down "
-"the directory tree. A search scope of \"sub\" will include all entries below "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
-msgstr ""
-"Mae'r cwmpas chwilio yn penderfynu ba ddyfnder islaw'r goeden cyfeiriaduron "
-"yr ydych am i'r chwilio ymestyn. Mae cwmpas chwilio o \"sub\" yn cynnwys bob "
-"cofnod islaw'ch bôn chwilio. Mae cwmpas chwilio o \"one\" ond yn cynnwys y "
-"cofnodion un lefel islaw'ch bôn."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:41
-msgid ""
-"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
-"\"."
-msgstr ""
-"Dyma enw llawn eich gweinydd LDAP. Er enghraifft, \"ldap.fynghwmni.com\""
-
-#: ../addressbook/gui/component/ldap-config.glade.h:42
-msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"too large will slow down your address book."
-msgstr ""
-"Dyma uchafswm nifer y cofnodion i'w llwytho i lawr. Gall ei osod yn rhy "
-"uchel beri i'ch llyfr cyfeiriadau arafu."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:43
-msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
-"server."
-msgstr ""
-"Dyma'r dull y bydd Evolution yn ei ddefnyddio i'ch dilysu. Sylwch y bydd "
-"rhaid cael mynediad dienw i'ch gweinydd ldap os am osod hwn fel \"Cyfeiriad "
-"E-bost\"."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:44
-msgid ""
-"This is the name for this server that will appear in your Evolution folder "
-"list. It is for display purposes only. "
-msgstr ""
-"Dyma enw'r gweinydd fydd yn ymddangos yn eich rhestr plygellau Evolution. "
-"Mae hwn at bwrpas dangos ar y sgrin yn unig."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:45
-msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"list of standard ports has been provided. Ask your system administrator what "
-"port you should specify."
-msgstr ""
-"Dyma'r porth y bydd Evolution yn ceisio cysylltu iddo ar y gweinydd LDAP. "
-"Mae rhestr o byrth safonol wedi ei ddarparu. Gofynnwch i'ch gweinyddwr "
-"systemau pa borth ddylech chi ei benodi."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:46
-msgid "Using distinguished name (DN)"
-msgstr "Yn defnyddio enw unigryw (distinguished name: DN)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:47
-msgid "Using email address"
-msgstr "Defnyddio cyfeiriad e-bost"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:48
-msgid "Whenever Possible"
-msgstr "Pob Amser Bosib"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:49
-msgid "_Add Address Book"
-msgstr "_Ychwanegu Llyfr Cyfeiriadau"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Download limit:"
 msgstr "Cyfwng _llwytho i lawr:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid "_Find Possible Search Bases"
 msgstr "_Canfod Seiliau Chwilio Posib"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid "_Login method:"
 msgstr "Dull _mewngofnodi:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:225
-#: ../mail/mail-config.glade.h:164
+#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:175
+#: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "_Enw:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "_Port:"
 msgstr "_Porth:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid "_Search scope:"
 msgstr "Cwmpas _chwilio:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:171
-#: ../plugins/publish-calendar/publish-calendar.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../mail/mail-config.glade.h:184
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Server:"
 msgstr "_Gwasanaethwr:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid "_Timeout:"
 msgstr "_Goramser:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid "_Use secure connection:"
 msgstr "_Defnyddio cysylltiad diogel:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:59
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid "cards"
 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: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
+#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
+#: ../calendar/gui/dialogs/event-page.glade.h:23
+#: ../plugins/caldav/caldav-source.c:448
+#: ../plugins/calendar-http/calendar-http.c:323
+#: ../plugins/calendar-weather/calendar-weather.c:523
+#: ../plugins/google-account-setup/google-source.c:720
+#: ../plugins/google-account-setup/google-contacts-source.c:330
 msgid "minutes"
 msgstr "munudau"
 
@@ -1287,1310 +1179,305 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>Amrywiol</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+msgid "<b>Notes</b>"
+msgstr "<b>Nodiadau</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Other</b>"
 msgstr "<b>Eraill</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Telephone</b>"
 msgstr "<b>Ffôn</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Web Addresses</b>"
 msgstr "<b>Cyfeiriadau Gwe</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 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: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: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:194
+#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/memo-page.glade.h:1
+msgid "Ca_tegories..."
+msgstr "_Categorïau..."
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Cyswllt"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../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
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2442
 msgid "Contact Editor"
 msgstr "Golygydd Cysylltiadau"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
 msgstr "_Enw Llawn..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Image"
 msgstr "Delwedd"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
-msgid "MSN Messenger"
-msgstr "Negeseuwr MSN"
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "Mailing Address"
 msgstr "Cyfeiriad Post"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "Ni_ckname:"
+msgid "Nic_kname:"
 msgstr "_Llysenw:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
-msgid "Novell Groupwise"
-msgstr "Novell Groupwise"
+#: ../calendar/gui/migration.c:1225
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:451
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:564
+msgid "Notes"
+msgstr "Nodiadau"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "Personal Information"
 msgstr "Gwybodaeth Bersonol"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Telephone"
 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:203
-#: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../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
-msgid "_Address: "
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+msgid "_Address:"
 msgstr "_Cyfeiriad:"
 
 # EFALLAI
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Anniversary:"
 msgstr "_Cylchwyl:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Assistant:"
 msgstr "_Cynorthwyydd:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Birthday:"
 msgstr "_Pen-blwydd:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: ../calendar/gui/dialogs/event-page.c:879
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1716
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../calendar/gui/dialogs/event-page.c:805
+#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../plugins/itip-formatter/itip-view.c:1910
 msgid "_Calendar:"
 msgstr "_Calendr:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Categories..."
-msgstr "_Categorïau..."
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_City:"
 msgstr "_Dinas:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Company:"
 msgstr "_Cwmni:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Country:"
 msgstr "_Gwlad:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Department:"
 msgstr "_Adran:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_File under:"
 msgstr "_Ffeilio islaw:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Free/Busy:"
 msgstr "_Rhydd/Prysur:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Home Page:"
 msgstr "_Tudalen Cartref:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Manager:"
 msgstr "_Rheolwr:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
-msgid "_Notes:"
-msgstr "_Nodiadau:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr "_Swyddfa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_PO Box:"
 msgstr "_Blwch PO:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Profession:"
 msgstr "_Proffesiwn:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Spouse:"
 msgstr "_Priod:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_State/Province:"
 msgstr "_Talaith:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/fullname.glade.h:19
 msgid "_Title:"
 msgstr "_Teitl"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 msgid "_Video Chat:"
 msgstr "_Sgwrsio Fideo:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Wants to receive HTML mail"
 msgstr "_Eisiau derbyn e-bost HTML"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Web Log:"
 msgstr "_Gwelog:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "_Ble:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 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:577
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
-msgid "Address"
-msgstr "Cyfeiriad"
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
+#: ../mail/em-mailer-prefs.c:472
+#: ../plugins/exchange-operations/exchange-delegates.c:951
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:697
+#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../widgets/menus/gal-define-views-dialog.c:344
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+#: ../widgets/menus/gal-view-new-dialog.c:61
+msgid "Name"
+msgstr "Enw"
 
-#: ../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:302
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:188
-#: ../addressbook/gui/widgets/e-addressbook-model.c:312
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
+#: ../addressbook/gui/widgets/e-addressbook-model.c:324
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:417
 #: ../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:187
-#: ../widgets/menus/gal-define-views-model.c:181
-#: ../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
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
+#: ../addressbook/gui/widgets/e-minicard.c:191
+#: ../widgets/menus/gal-define-views-model.c:178
+#: ../widgets/table/e-cell-text.c:1816
+#: ../widgets/text/e-text.c:3674
+#: ../widgets/text/e-text.c:3675
 msgid "Editable"
 msgstr "Golygadwy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
-msgid "United States"
-msgstr "Yr Unol Daleithiau"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
-msgid "Afghanistan"
-msgstr "Afghanistan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
-msgid "Albania"
-msgstr "Albania"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
-msgid "Algeria"
-msgstr "Algeria"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
-msgid "American Samoa"
-msgstr "American Samoa"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
-msgid "Andorra"
-msgstr "Andorra"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
-msgid "Angola"
-msgstr "Angola"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
-msgid "Anguilla"
-msgstr "Anguilla"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
-msgid "Antarctica"
-msgstr "Antarctica"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
-msgid "Antigua And Barbuda"
-msgstr "Antigua a Barbuda"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
-msgid "Argentina"
-msgstr "Yr Ariannin"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
-msgid "Armenia"
-msgstr "Armenia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
-msgid "Aruba"
-msgstr "Aruba"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
-msgid "Australia"
-msgstr "Awstralia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
-msgid "Austria"
-msgstr "Awstria"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
-msgid "Azerbaijan"
-msgstr "Azerbaijan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
-msgid "Bahamas"
-msgstr "Bahamas"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
-msgid "Bahrain"
-msgstr "Bahrain"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
-msgid "Bangladesh"
-msgstr "Bangladesh"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
-msgid "Barbados"
-msgstr "Barbados"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
-msgid "Belarus"
-msgstr "Belarus"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
-msgid "Belgium"
-msgstr "Gwlad Belg"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
-msgid "Belize"
-msgstr "Belize"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
-msgid "Benin"
-msgstr "Benin"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
-msgid "Bermuda"
-msgstr "Bermuda"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
-msgid "Bhutan"
-msgstr "Bhutan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
-msgid "Bolivia"
-msgstr "Bolifia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
-msgid "Bosnia And Herzegowina"
-msgstr "Bosnia a Herzegovina"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
-msgid "Botswana"
-msgstr "Botswana"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
-msgid "Bouvet Island"
-msgstr "Ynys Bouvet"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
-msgid "Brazil"
-msgstr "Brasil"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
-msgid "British Indian Ocean Territory"
-msgstr "British Indian Ocean Territory"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
-msgid "Brunei Darussalam"
-msgstr "Brunei Darussalam"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
-msgid "Bulgaria"
-msgstr "Bwlgaria"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
-msgid "Burkina Faso"
-msgstr "Burkina Faso"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
-msgid "Burundi"
-msgstr "Burundi"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
-msgid "Cambodia"
-msgstr "Cambodia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
-msgid "Cameroon"
-msgstr "Cameroon"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
-msgid "Canada"
-msgstr "Canada"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
-msgid "Cape Verde"
-msgstr "Cape Verde"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
-msgid "Cayman Islands"
-msgstr "Ynysoedd y Cayman"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
-msgid "Central African Republic"
-msgstr "Gweriniaeth Ganol Affrica"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
-msgid "Chad"
-msgstr "Chad"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
-msgid "Chile"
-msgstr "Chile"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
-msgid "China"
-msgstr "Tsieina"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
-msgid "Christmas Island"
-msgstr "Ynys y Nadolig"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
-msgid "Cocos (Keeling) Islands"
-msgstr "Ynysoedd Cocos (Keeling)"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
-msgid "Colombia"
-msgstr "Colombia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
-msgid "Comoros"
-msgstr "Comoros"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
-msgid "Congo"
-msgstr "Congo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
-msgid "Congo, The Democratic Republic Of The"
-msgstr "Congo, Gweriniaeth Ddemocratig Y"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
-msgid "Cook Islands"
-msgstr "Ynysoedd Cook"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
-msgid "Costa Rica"
-msgstr "Costa Rica"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
-msgid "Cote d'Ivoire"
-msgstr "Cote d'Ivoire"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
-msgid "Croatia"
-msgstr "Croatia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
-msgid "Cuba"
-msgstr "Ciwba"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
-msgid "Cyprus"
-msgstr "Cyprus"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
-msgid "Czech Republic"
-msgstr "Gweriniaeth Tsiec"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
-msgid "Denmark"
-msgstr "Denmarc"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
-msgid "Djibouti"
-msgstr "Djibouti"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
-msgid "Dominica"
-msgstr "Dominica"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
-msgid "Dominican Republic"
-msgstr "Gweriniaeth Dominica"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
-msgid "Ecuador"
-msgstr "Ecuador"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
-msgid "Egypt"
-msgstr "Yr Aifft"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
-msgid "El Salvador"
-msgstr "El Salvador"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
-msgid "Equatorial Guinea"
-msgstr "Equatorial Guinea"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
-msgid "Eritrea"
-msgstr "Eritrea"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
-msgid "Estonia"
-msgstr "Estonia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
-msgid "Ethiopia"
-msgstr "Ethiopia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
-msgid "Falkland Islands"
-msgstr "Ynysoedd y Falklands"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
-msgid "Faroe Islands"
-msgstr "Ynysoedd y Ffaro"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
-msgid "Fiji"
-msgstr "Ffiji"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
-msgid "Finland"
-msgstr "Y Ffindir"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
-msgid "France"
-msgstr "Ffrainc"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
-msgid "French Guiana"
-msgstr "Guiana Ffrangeg"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
-msgid "French Polynesia"
-msgstr "Polynesia Ffrangeg"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
-msgid "French Southern Territories"
-msgstr "French Southern Territories"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
-msgid "Gabon"
-msgstr "Gabon"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
-msgid "Gambia"
-msgstr "Gambia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
-msgid "Georgia"
-msgstr "Georgia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
-msgid "Germany"
-msgstr "Yr Almaen"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
-msgid "Ghana"
-msgstr "Ghana"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
-msgid "Gibraltar"
-msgstr "Gibraltar"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
-msgid "Greece"
-msgstr "Groeg"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
-msgid "Greenland"
-msgstr "Greenland"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
-msgid "Grenada"
-msgstr "Grenada"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
-msgid "Guadeloupe"
-msgstr "Guadeloupe"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
-msgid "Guam"
-msgstr "Guam"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
-msgid "Guatemala"
-msgstr "Guatemala"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
-msgid "Guernsey"
-msgstr "Guernsey"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
-msgid "Guinea"
-msgstr "Guinea"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Guinea-bissau"
-msgstr "Guinea-Bissau"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
-msgid "Guyana"
-msgstr "Guyana"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
-msgid "Haiti"
-msgstr "Haiti"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
-msgid "Heard And McDonald Islands"
-msgstr "Ynys Heard ac Ynysoedd McDonald"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
-msgid "Holy See"
-msgstr "Gwladwriaeth Ddinesig"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
-msgid "Honduras"
-msgstr "Honduras"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
-msgid "Hong Kong"
-msgstr "Hong Kong"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
-msgid "Hungary"
-msgstr "Hwngari"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
-msgid "Iceland"
-msgstr "Gwlad yr Iâ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
-msgid "India"
-msgstr "India"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
-msgid "Indonesia"
-msgstr "Indonesia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
-msgid "Iran"
-msgstr "Iran"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
-msgid "Iraq"
-msgstr "Irac"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
-msgid "Ireland"
-msgstr "Iwerddon"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
-msgid "Isle of Man"
-msgstr "Ynys Manaw"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
-msgid "Israel"
-msgstr "Israel"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
-msgid "Italy"
-msgstr "Yr Eidal"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
-msgid "Jamaica"
-msgstr "Jamaica"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
-msgid "Japan"
-msgstr "Siapan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
-msgid "Jersey"
-msgstr "Jersey"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
-msgid "Jordan"
-msgstr "Yr Iorddonen"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
-msgid "Kazakhstan"
-msgstr "Kazakhstan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
-msgid "Kenya"
-msgstr "Kenya"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
-msgid "Kiribati"
-msgstr "Kiribati"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
-msgid "Korea, Democratic People's Republic Of"
-msgstr "Corea, Gweriniaeth Ddemocratig y Bobl"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
-msgid "Korea, Republic Of"
-msgstr "Gweriniaeth Corea"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
-msgid "Kuwait"
-msgstr "Kuwait"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
-msgid "Kyrgyzstan"
-msgstr "Kyrgyzstan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
-msgid "Laos"
-msgstr "Laos"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
-msgid "Latvia"
-msgstr "Latfia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
-msgid "Lebanon"
-msgstr "Libanus"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
-msgid "Lesotho"
-msgstr "Lesotho"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
-msgid "Liberia"
-msgstr "Liberia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
-msgid "Libya"
-msgstr "Libya"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
-msgid "Liechtenstein"
-msgstr "Liechtenstein"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
-msgid "Lithuania"
-msgstr "Lithuania"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
-msgid "Luxembourg"
-msgstr "Luxembourg"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
-msgid "Macao"
-msgstr "Macao"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
-msgid "Macedonia"
-msgstr "Macedonia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
-msgid "Madagascar"
-msgstr "Madagascar"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
-msgid "Malawi"
-msgstr "Malawi"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
-msgid "Malaysia"
-msgstr "Malaysia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
-msgid "Maldives"
-msgstr "Maldives"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
-msgid "Mali"
-msgstr "Mali"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
-msgid "Malta"
-msgstr "Malta"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
-msgid "Marshall Islands"
-msgstr "Ynysoedd Marshall"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
-msgid "Martinique"
-msgstr "Martinique"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
-msgid "Mauritania"
-msgstr "Mauritania"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
-msgid "Mauritius"
-msgstr "Mauritius"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
-msgid "Mayotte"
-msgstr "Mayotte"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
-msgid "Mexico"
-msgstr "Mecsico"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
-msgid "Micronesia"
-msgstr "Micronesia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
-msgid "Moldova, Republic Of"
-msgstr "Gweriniaeth Moldova"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
-msgid "Monaco"
-msgstr "Monaco"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
-msgid "Mongolia"
-msgstr "Mongolia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
-msgid "Montserrat"
-msgstr "Montserrat"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
-msgid "Morocco"
-msgstr "Morocco"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
-msgid "Mozambique"
-msgstr "Mozambique"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
-msgid "Myanmar"
-msgstr "Myanmar"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
-msgid "Namibia"
-msgstr "Namibia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
-msgid "Nauru"
-msgstr "Nauru"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
-msgid "Nepal"
-msgstr "Nepal"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
-msgid "Netherlands"
-msgstr "Yr Iseldiroedd"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
-msgid "Netherlands Antilles"
-msgstr "Netherlands Antilles"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
-msgid "New Caledonia"
-msgstr "Caledonia Newydd"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
-msgid "New Zealand"
-msgstr "Seland Newydd"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
-msgid "Nicaragua"
-msgstr "Nicaragua"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
-msgid "Niger"
-msgstr "Niger"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
-msgid "Nigeria"
-msgstr "Nigeria"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
-msgid "Niue"
-msgstr "Niue"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
-msgid "Norfolk Island"
-msgstr "Ynys Norfolk"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
-msgid "Northern Mariana Islands"
-msgstr "Ynysoedd Northern Mariana"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
-msgid "Norway"
-msgstr "Norwy"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
-msgid "Oman"
-msgstr "Oman"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
-msgid "Pakistan"
-msgstr "Pacistan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
-msgid "Palau"
-msgstr "Palau"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
-msgid "Palestinian Territory"
-msgstr "Palestinia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
-msgid "Panama"
-msgstr "Panama"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
-msgid "Papua New Guinea"
-msgstr "Papua Guinea Newydd"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
-msgid "Paraguay"
-msgstr "Paraguay"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
-msgid "Peru"
-msgstr "Periw"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
-msgid "Philippines"
-msgstr "Philippines"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
-msgid "Pitcairn"
-msgstr "Pitcairn"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
-msgid "Poland"
-msgstr "Gwlad Pwyl"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
-msgid "Portugal"
-msgstr "Portiwgal"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
-msgid "Puerto Rico"
-msgstr "Puerto Rico"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
-msgid "Qatar"
-msgstr "Qatar"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
-msgid "Reunion"
-msgstr "Reunion"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
-msgid "Romania"
-msgstr "Rwmania"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
-msgid "Russian Federation"
-msgstr "Ffederasiwn Rwsia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
-msgid "Rwanda"
-msgstr "Rwanda"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
-msgid "Saint Kitts And Nevis"
-msgstr "Saint Kitts a Nevis"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
-msgid "Saint Lucia"
-msgstr "Saint Lucia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
-msgid "Saint Vincent And The Grenadines"
-msgstr "Sant Vincent a'r Grenadines"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
-msgid "Samoa"
-msgstr "Samoa"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
-msgid "San Marino"
-msgstr "San Marino"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
-msgid "Sao Tome And Principe"
-msgstr "Sao Tome a Principe"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
-msgid "Saudi Arabia"
-msgstr "Saudi Arabia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
-msgid "Senegal"
-msgstr "Senegal"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
-msgid "Serbia And Montenegro"
-msgstr "Serbia a Montenegro"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
-msgid "Seychelles"
-msgstr "Seychelles"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
-msgid "Sierra Leone"
-msgstr "Sierra Leone"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
-msgid "Singapore"
-msgstr "Singapore"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
-msgid "Slovakia"
-msgstr "Slofacia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
-msgid "Slovenia"
-msgstr "Slofenia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
-msgid "Solomon Islands"
-msgstr "Ynysoedd Solomon"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
-msgid "Somalia"
-msgstr "Somalia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
-msgid "South Africa"
-msgstr "De Affrica"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
-msgid "South Georgia And The South Sandwich Islands"
-msgstr "De Georgia ac Ynysoedd De Sandwich"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
-msgid "Spain"
-msgstr "Sbaen"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
-msgid "Sri Lanka"
-msgstr "Sri Lanka"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
-msgid "St. Helena"
-msgstr "St. Helena"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
-msgid "St. Pierre And Miquelon"
-msgstr "St. Pierre a Miquelon"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
-msgid "Sudan"
-msgstr "Swdan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
-msgid "Suriname"
-msgstr "Suriname"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
-msgid "Svalbard And Jan Mayen Islands"
-msgstr "Ynysoedd Svalbard a'r Jan Mayen"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
-msgid "Swaziland"
-msgstr "Swaziland"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
-msgid "Sweden"
-msgstr "Sweden"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
-msgid "Switzerland"
-msgstr "Y Swisdir"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
-msgid "Syria"
-msgstr "Syria"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
-msgid "Taiwan"
-msgstr "Taiwan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
-msgid "Tajikistan"
-msgstr "Tajikistan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
-msgid "Tanzania, United Republic Of"
-msgstr "Tanzania, Gwerinaieth Unedig"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
-msgid "Thailand"
-msgstr "Gwlad Thai"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
-msgid "Timor-Leste"
-msgstr "Timor-Leste"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
-msgid "Togo"
-msgstr "Togo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
-msgid "Tokelau"
-msgstr "Tokelau"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
-msgid "Tonga"
-msgstr "Tonga"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
-msgid "Trinidad And Tobago"
-msgstr "Trinidad a Tobago"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
-msgid "Tunisia"
-msgstr "Tunisia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
-msgid "Turkey"
-msgstr "Twrci"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
-msgid "Turkmenistan"
-msgstr "Turkmenistan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
-msgid "Turks And Caicos Islands"
-msgstr "Ynysoedd Turks a'r Caicos"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
-msgid "Tuvalu"
-msgstr "Tuvalu"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
-msgid "Uganda"
-msgstr "Uganda"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
-msgid "Ukraine"
-msgstr "Wcrain"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
-msgid "United Arab Emirates"
-msgstr "Emiradau Arabaidd Unedig"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
-msgid "United Kingdom"
-msgstr "Y Deyrnas Unedig"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
-msgid "United States Minor Outlying Islands"
-msgstr "United States Minor Outlying Islands"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
-msgid "Uruguay"
-msgstr "Uruguay"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
-msgid "Uzbekistan"
-msgstr "Wsbecistan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
-msgid "Vanuatu"
-msgstr "Vanuatu"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
-msgid "Venezuela"
-msgstr "Venezuela"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
-msgid "Viet Nam"
-msgstr "Fietnam"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
-msgid "Virgin Islands, British"
-msgstr "Ynysoedd Virgin, Prydeinig"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
-msgid "Virgin Islands, U.S."
-msgstr "Ynysoedd Virgin, U.D.A."
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
-msgid "Wallis And Futuna Islands"
-msgstr "Ynysoedd Wallis a'r Futuna"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
-msgid "Western Sahara"
-msgstr "Western Sahara"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
-msgid "Yemen"
-msgstr "Yemen"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
-msgid "Zambia"
-msgstr "Zambia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
-msgid "Zimbabwe"
-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:52
-#: ../plugins/save-attachments/save-attachments.c:366
-#: ../widgets/menus/gal-view-new-dialog.c:73
-msgid "Name"
-msgstr "Enw"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
-msgid "AOL Instant Messenger"
-msgstr "Negesydd Sydyn AOL"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-display.c:603
+msgid "AIM"
+msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:554
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:606
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
-msgid "Yahoo Messenger"
-msgstr "Negesydd Sydyn Yahoo"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
+msgid "Yahoo"
+msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
-msgid "Gadu-Gadu Messenger"
-msgstr "Negesydd Gadu-Gadu"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:553
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:607
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:605
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
-msgid "Service"
-msgstr "Gwasanaeth"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:604
+msgid "GroupWise"
+msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:8
-#: ../plugins/publish-calendar/publish-calendar.c:497
-#: ../plugins/save-calendar/csv-format.c:400
-msgid "Location"
-msgstr "Lleoliad"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
+msgid "Skype"
+msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
-msgid "Username"
-msgstr "Enw Defnyddiwr"
+#. red
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:57
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../mail/em-migrate.c:959
+msgid "Work"
+msgstr "Gwaith"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
 #: ../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:205
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
+#: ../addressbook/gui/widgets/eab-contact-display.c:516
+#: ../calendar/gui/e-calendar-view.c:2287
 msgid "Other"
 msgstr "Arall"
 
-#: ../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:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:557
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
-
-#: ../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:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:552
-msgid "GroupWise"
-msgstr "GroupWise"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
 msgid "Source Book"
 msgstr "Llyfr Tardd"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:254
 msgid "Target Book"
 msgstr "Llyfr Targed"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
 msgid "Is New Contact"
 msgstr "Cyswllt Newydd Ydyw"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
 msgid "Writable Fields"
 msgstr "Meysydd Ysgrifenadwy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
 msgid "Required Fields"
 msgstr "Meysydd Angenrheidiol"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
 msgid "Changed"
 msgstr "Newidiwyd"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:561
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2414
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2437
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Golygydd Cysylltiadau - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2794
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2832
 msgid "Please select an image for this contact"
 msgstr "Dewiswch ddelwedd ar gyfer y cyswllt hwn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2795
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2833
 msgid "_No image"
 msgstr "_Dim delwedd"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3104
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2598,47 +1485,47 @@ msgstr ""
 "Mae'r data cyswllt yn annilys:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3100
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "Mae gan '%s' ffurf annilys"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3107
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "Mae gan %s'%s' ffurf annilys"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3133
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3130
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "Mae %s'%s' yn wag"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3148
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3154
 msgid "Invalid contact."
 msgstr "Cyswllt annilys."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:292
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:323
 msgid "Contact Quick-Add"
 msgstr "Brys-Ychwanegu Cyswllt"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:295
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:326
 msgid "_Edit Full"
 msgstr "_Golygu Llawn"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:336
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:400
 msgid "_Full name"
 msgstr "_Enw llawn"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
 msgid "E_mail"
 msgstr "E_bost"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:422
 msgid "_Select Address Book"
 msgstr "_Dewis Llyfr Cyfeiriadau"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:322
+#: ../addressbook/gui/contact-editor/eab-editor.c:323
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2647,7 +1534,7 @@ msgstr ""
 "Ydych chi'n siŵr eich bod\n"
 "am ddileu'r rhestr gysylltiadau (%s) ?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:325
+#: ../addressbook/gui/contact-editor/eab-editor.c:326
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2655,7 +1542,7 @@ msgstr ""
 "Ydych chi'n siŵr eich bod\n"
 "am ddileu'r rhestrau cysylltiadau hyn?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:330
+#: ../addressbook/gui/contact-editor/eab-editor.c:331
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2664,7 +1551,7 @@ msgstr ""
 "Ydych chi'n siŵr eich bod\n"
 "am ddileu'r cyswllt (%s) ?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:333
+#: ../addressbook/gui/contact-editor/eab-editor.c:334
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2672,177 +1559,104 @@ msgstr ""
 "Ydych chi'n siŵr eich bod\n"
 "am ddileu'r cysylltiadau hyn?"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "Cyfeiriad _2:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
-msgid "Ci_ty:"
-msgstr "_Dinas:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
-msgid "Countr_y:"
-msgstr "_Gwlad:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
-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:"
-
 #: ../addressbook/gui/contact-editor/fullname.glade.h:1
-msgid "Dr."
-msgstr "Dr."
+msgid ""
+"\n"
+"Mr.\n"
+"Mrs.\n"
+"Ms.\n"
+"Miss\n"
+"Dr."
+msgstr ""
+"\n"
+"Mr.\n"
+"Mrs.\n"
+"Ms.\n"
+"Miss\n"
+"Dr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
-msgid "Esq."
-msgstr "Ysw."
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+msgid ""
+"\n"
+"Sr.\n"
+"Jr.\n"
+"I\n"
+"II\n"
+"III\n"
+"Esq."
+msgstr ""
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "Enw Llawn"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:4
-msgid "I"
-msgstr "I"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
-msgid "II"
-msgstr "II"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
-msgid "III"
-msgstr "III"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
-msgid "Jr."
-msgstr "Jr."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
-msgid "Miss"
-msgstr "Miss"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
-msgid "Mr."
-msgstr "Mr."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
-msgid "Mrs."
-msgstr "Mrs."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
-msgid "Ms."
-msgstr "Ms."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
-msgid "Sr."
-msgstr "Sr."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_First:"
 msgstr "_Cyntaf:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Last:"
 msgstr "_Olaf:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Middle:"
 msgstr "C_anol:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Suffix:"
 msgstr "Ã?_l-ddodiad:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:1
-msgid "Add IM Account"
-msgstr "Ychwanegu Cyfrif Negeseuo Cyflym"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:2
-msgid "_Account name:"
-msgstr "_Enw cyfrif:"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:3
-msgid "_IM Service:"
-msgstr "Gwasanaeth _Negeseuo Cyflym:"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:4
-#: ../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:234
-msgid "_Location:"
-msgstr "_Lleoliad:"
-
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-msgid "\n"
-msgstr "\n"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-msgid "Add an email to the List"
-msgstr "Ychwanegu e-bost at y Rhestr"
+msgid "<b>Members</b>"
+msgstr "<b>Aelodau</b>"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:938
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:668
 msgid "Contact List Editor"
 msgstr "Golygydd Rhestr Gysylltiadau"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-msgid "Insert email addresses from Address Book"
-msgstr "Mewnosod cyfeiriadau e-bost o'r Llyfr Cyfeiriadau"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-msgid "Members"
-msgstr "Aelodau"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-msgid "Remove an email address from the List"
-msgstr "Tynnu cyfeiriad e-bost o'r Rhestr"
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:211
+#: ../calendar/gui/e-day-view-time-item.c:812
+#: ../calendar/gui/e-timezone-entry.c:118
+msgid "Select..."
+msgstr "Dewis..."
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Cuddio cyfeiriadau wrth anfon e-bost at y rhestr"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "_List name:"
 msgstr "Enw _rhestr:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
-msgid "_Select"
-msgstr "_Dewis"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 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: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
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:761
+msgid "Contact List Members"
+msgstr "Aelodau Rhestr Gyswllt"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1239
+msgid "_Members"
+msgstr "_Aelodau"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
+#: ../addressbook/gui/widgets/e-addressbook-model.c:310
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:403
+#: ../addressbook/gui/widgets/e-addressbook-view.c:210
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
 msgstr "Llyfr"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:181
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1168
 msgid "Is New List"
 msgstr "Yn Rhestr Newydd"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
-msgid "_Members"
-msgstr "_Aelodau"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:762
-msgid "Contact List Members"
-msgstr "Aelodau Rhestr Gyswllt"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Cyswllt Newid:  "
@@ -2857,11 +1671,10 @@ msgid "Duplicate Contact Detected"
 msgstr "Wedi Canfod Cyswllt Dyblyg"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
+#, fuzzy
+msgid "The name or email of this contact already exists in this folder.  Would you like to add it anyway?"
 msgstr ""
-"Mae'r enw neu gyfeiriad e-bost, wedi ei newid, yn bodoli eisoes\n"
+"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-duplicate-detected.glade.h:2
@@ -2880,44 +1693,49 @@ 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
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:213
+msgid "_Merge"
+msgstr "_Cyfuno"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:198
 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/merging/eab-contact-merging.c:266
 #: ../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
+#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:586
+#: ../addressbook/gui/widgets/eab-contact-display.c:589
+#: ../addressbook/gui/widgets/eab-contact-display.c:868
+#: ../plugins/groupwise-features/junk-settings.c:420
+#: ../smime/lib/e-cert.c:808
 msgid "Email"
 msgstr "E-bost"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:172
-#: ../calendar/gui/cal-search-bar.c:60
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../calendar/gui/cal-search-bar.c:79
+#: ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
 msgid "Any field contains"
 msgstr "Unrhyw faes yn cynnwys"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../addressbook/gui/widgets/e-addressbook-view.c:158
 msgid "Email begins with"
 msgstr "E-bost yn dechrau gyda"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:170
-msgid "Name begins with"
-msgstr "Enw yn dechrau gyda"
+msgid "Name contains"
+msgstr "Enw'n cynnwys"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:150
+#: ../addressbook/gui/widgets/e-addressbook-model.c:162
 msgid "No contacts"
 msgstr "Dim cysylltiadau"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:153
+#: ../addressbook/gui/widgets/e-addressbook-model.c:165
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
@@ -2925,140 +1743,146 @@ msgstr[0] "%d cyswllt"
 msgstr[1] "%d gyswllt"
 msgstr[2] "%d cyswllt"
 
-#: ../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
+#: ../addressbook/gui/widgets/e-addressbook-model.c:317
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:410
+#: ../addressbook/gui/widgets/e-addressbook-view.c:224
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "Ymholiad"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:448
+#: ../addressbook/gui/widgets/e-addressbook-model.c:460
 msgid "Error getting book view"
 msgstr "Gwall estyn golwg llyfr"
 
-#: ../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:3340
-#: ../widgets/table/e-tree-selection-model.c:825
-#: ../widgets/text/e-entry.c:1207 ../widgets/text/e-entry.c:1208
-#: ../widgets/text/e-text.c:3489 ../widgets/text/e-text.c:3490
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:424
+#: ../widgets/table/e-table-click-to-add.c:507
+#: ../widgets/table/e-table-selection-model.c:302
+#: ../widgets/table/e-table.c:3344
+#: ../widgets/table/e-tree-selection-model.c:817
+#: ../widgets/text/e-text.c:3541
+#: ../widgets/text/e-text.c:3542
 msgid "Model"
 msgstr "Model:"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:104
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "Gwall newid carden"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:231
+#: ../addressbook/gui/widgets/e-addressbook-view.c:157
+msgid "Name begins with"
+msgstr "Enw yn dechrau gyda"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:217
 msgid "Source"
 msgstr "Tardd"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:245
-#: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:500
+#: ../addressbook/gui/widgets/e-addressbook-view.c:231
+#: ../calendar/gui/e-calendar-table.etspec.h:14
+#: ../calendar/gui/e-meeting-list-view.c:564
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:7
+#: ../widgets/misc/e-attachment-tree-view.c:554
 msgid "Type"
 msgstr "Math"
 
-#: ../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:811
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1962
+msgid "Save as vCard..."
+msgstr "Cadw fel vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../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
+#: ../addressbook/gui/widgets/e-addressbook-view.c:931
+#: ../calendar/gui/e-calendar-table.c:1586
+#: ../calendar/gui/e-calendar-view.c:1804
+#: ../calendar/gui/e-memo-table.c:927
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Agor"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:958
+#: ../addressbook/gui/widgets/e-addressbook-view.c:933
 msgid "_New Contact..."
 msgstr "Cyswllt _Newydd..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
 msgid "New Contact _List..."
 msgstr "_Rhestr Gyswllt Newydd..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:962
-msgid "_Save as VCard..."
-msgstr "_Cadw fel VCard..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+msgid "_Save as vCard..."
+msgstr "_Cadw fel vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:963
+#: ../addressbook/gui/widgets/e-addressbook-view.c:938
 msgid "_Forward Contact"
 msgstr "Gyrru Cyswllt _ymlaen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Forward Contacts"
 msgstr "Gyrru _Cysylltiadau ymlaen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "Send _Message to Contact"
 msgstr "Anfon _Neges I'r Cyswllt"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "Send _Message to List"
 msgstr "Anfon Neges at _Restr"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:967
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contacts"
 msgstr "Anfon Neges at _Gysylltiadau"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "_Print"
 msgstr "_Argraffu"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
 msgid "Cop_y to Address Book..."
 msgstr "_Copïo i'r Llyfr Cyfeiriadau..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:972
+#: ../addressbook/gui/widgets/e-addressbook-view.c:947
 msgid "Mo_ve to Address Book..."
 msgstr "_Symud i'r Llyfr Cyfeiriadau..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:975
-#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
 msgid "Cu_t"
 msgstr "_Torri"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:976
-#: ../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
+#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../calendar/gui/e-calendar-table.c:1594
+#: ../calendar/gui/e-calendar-view.c:1811
+#: ../calendar/gui/e-memo-table.c:935
+#: ../mail/em-folder-tree.c:991
+#: ../mail/em-folder-view.c:1325
+#: ../mail/message-list.c:2103
+#: ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:40
+#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Copïo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
 msgid "P_aste"
 msgstr "_Gludo"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1659
-#: ../calendar/gui/cal-search-bar.c:428
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1525
+#: ../calendar/gui/cal-search-bar.c:624
+#: ../calendar/gui/cal-search-bar.c:667
+#: ../calendar/gui/cal-search-bar.c:686
 msgid "Any Category"
 msgstr "Unrhyw Gategori"
 
-#. 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.c:1528
+#: ../calendar/gui/cal-search-bar.c:628
+#: ../calendar/gui/cal-search-bar.c:671
+#: ../calendar/gui/cal-search-bar.c:690
+msgid "Unmatched"
+msgstr "Heb gydweddu"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:571
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
 msgid "Assistant"
 msgstr "Cynorthwywr"
 
@@ -3088,6 +1912,7 @@ msgstr "Ffôn Car"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3095,7 +1920,7 @@ msgid "Categories"
 msgstr "Categorïau"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:566
+#: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Company"
 msgstr "Cwmni"
 
@@ -3144,22 +1969,22 @@ msgid "Journal"
 msgstr "Dyddlyfr"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:570
+#: ../addressbook/gui/widgets/eab-contact-display.c:623
 msgid "Manager"
 msgstr "Rheolwr"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
+#: ../addressbook/gui/widgets/eab-contact-display.c:644
 msgid "Mobile Phone"
 msgstr "Ffôn Symudol"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:545
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
 msgid "Nickname"
 msgstr "Llysenw"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:604
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
 msgid "Note"
 msgstr "Nodyn"
 
@@ -3188,14 +2013,14 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:511
+#: ../calendar/gui/e-meeting-list-view.c:576
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:701
 msgid "Role"
 msgstr "Rôl"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:595
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
 msgid "Spouse"
 msgstr "Priod"
 
@@ -3226,38 +2051,44 @@ msgid "Web Site"
 msgstr "Safle Gwe"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../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
+#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../widgets/misc/e-canvas-vbox.c:83
+#: ../widgets/misc/e-canvas-vbox.c:84
+#: ../widgets/misc/e-reflow.c:1421
+#: ../widgets/misc/e-reflow.c:1422
+#: ../widgets/table/e-table-click-to-add.c:521
 #: ../widgets/table/e-table-col.c:98
-#: ../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:3024 ../widgets/table/e-table-item.c:3025
-#: ../widgets/text/e-text.c:3667 ../widgets/text/e-text.c:3668
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-container.c:995
+#: ../widgets/table/e-table-group-leaf.c:642
+#: ../widgets/table/e-table-group-leaf.c:643
+#: ../widgets/table/e-table-item.c:3069
+#: ../widgets/table/e-table-item.c:3070
+#: ../widgets/text/e-text.c:3716
+#: ../widgets/text/e-text.c:3717
 msgid "Width"
 msgstr "Lled"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../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: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:3030 ../widgets/table/e-table-item.c:3031
-#: ../widgets/text/e-text.c:3675 ../widgets/text/e-text.c:3676
+#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../widgets/misc/e-canvas-vbox.c:95
+#: ../widgets/misc/e-canvas-vbox.c:96
+#: ../widgets/misc/e-reflow.c:1428
+#: ../widgets/misc/e-reflow.c:1429
+#: ../widgets/table/e-table-click-to-add.c:528
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-container.c:988
+#: ../widgets/table/e-table-group-leaf.c:635
+#: ../widgets/table/e-table-group-leaf.c:636
+#: ../widgets/table/e-table-item.c:3075
+#: ../widgets/table/e-table-item.c:3076
+#: ../widgets/text/e-text.c:3723
+#: ../widgets/text/e-text.c:3724
 msgid "Height"
 msgstr "Uchder"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:165
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "Ã? Ffocws"
 
@@ -3277,11 +2108,22 @@ msgstr "Model Testun"
 msgid "Max field name length"
 msgstr "Uchafswm hyd enw'r maes"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
 msgid "Column Width"
 msgstr "Lled Colofn"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+"Chwilio am y Cyswllt."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3295,7 +2137,7 @@ msgstr ""
 "\n"
 "neu rhowch glic-ddwbl fan hyn i greu Cyswllt newydd."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3309,7 +2151,7 @@ msgstr ""
 "\n"
 "Rhowch glic-ddwbl fan hyn i greu Cyswllt newydd."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3319,7 +2161,7 @@ msgstr ""
 "\n"
 "Chwilio am y Cyswllt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3329,345 +2171,351 @@ msgstr ""
 "\n"
 "Does dim eitemau i'w dangos yn yr olwg hon."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "Addasydd"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "E-bost Gwaith"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "Ebost Cartref"
 
-#: ../addressbook/gui/widgets/e-minicard.c:104
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:825
 msgid "Other Email"
 msgstr "Ebost Arall"
 
-#: ../addressbook/gui/widgets/e-minicard.c:173
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "Dewisedig"
 
-#: ../addressbook/gui/widgets/e-minicard.c:180
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "Ã? Chyrchwr"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:625
+#: ../addressbook/gui/widgets/eab-contact-display.c:169
+#: ../mail/em-popup.c:545
 msgid "_Open Link in Browser"
 msgstr "_Agor y Cyswllt Mewn Porwr"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2548
+#: ../addressbook/gui/widgets/eab-contact-display.c:170
+#: ../mail/em-folder-view.c:2694
 msgid "_Copy Link Location"
 msgstr "_Copïo Lleoliad y Cyswllt"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:626
+#: ../addressbook/gui/widgets/eab-contact-display.c:171
+#: ../mail/em-popup.c:546
 msgid "_Send New Message To..."
 msgstr "_Danfon Neges Newydd i..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:172
 #: ../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:296
-#: ../addressbook/gui/widgets/eab-contact-display.c:359
+#: ../addressbook/gui/widgets/eab-contact-display.c:286
+#: ../addressbook/gui/widgets/eab-contact-display.c:360
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "(map)"
 msgstr "(map)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:306
-#: ../addressbook/gui/widgets/eab-contact-display.c:372
+#: ../addressbook/gui/widgets/eab-contact-display.c:296
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
+#: ../addressbook/gui/widgets/eab-contact-display.c:391
 msgid "map"
 msgstr "map"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:456
-#: ../addressbook/gui/widgets/eab-contact-display.c:758
+#: ../addressbook/gui/widgets/eab-contact-display.c:475
+#: ../addressbook/gui/widgets/eab-contact-display.c:835
 msgid "List Members"
 msgstr "Aelodau Rhestr"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:567
+#: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Department"
 msgstr "Adran"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:568
+#: ../addressbook/gui/widgets/eab-contact-display.c:621
 msgid "Profession"
 msgstr "Proffesiwn"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:569
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
 msgid "Position"
 msgstr "Safle"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
+#: ../addressbook/gui/widgets/eab-contact-display.c:625
 msgid "Video Chat"
 msgstr "Sgwrs Fideo"
 
-#: ../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
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../calendar/gui/calendar-commands.c:89
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/gnome-cal.c:2545
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:572
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:419
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:449
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:562
+#: ../plugins/hula-account-setup/camel-hula-listener.c:372
+#: ../plugins/hula-account-setup/camel-hula-listener.c:400
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "Calendr"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:370
-#: ../ui/evolution-event-editor.xml.h:8
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/event-editor.c:116
 msgid "Free/Busy"
 msgstr "Rhydd/Prysur"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
-#: ../addressbook/gui/widgets/eab-contact-display.c:590
+#: ../addressbook/gui/widgets/eab-contact-display.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
 msgid "Phone"
 msgstr "Ffôn"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
 msgid "Fax"
 msgstr "Ffacs"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:587
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:645
+msgid "Address"
+msgstr "Cyfeiriad"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:640
 msgid "Home Page"
 msgstr "Tudalen Cartref"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:588
+#: ../addressbook/gui/widgets/eab-contact-display.c:641
 msgid "Web Log"
 msgstr "Gweflog"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:593
+#: ../addressbook/gui/widgets/eab-contact-display.c:646
+#: ../calendar/gui/e-calendar-view.c:2578
 msgid "Birthday"
 msgstr "Pen-blwydd"
 
 # EFALLAI
-#: ../addressbook/gui/widgets/eab-contact-display.c:594
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
+#: ../calendar/gui/e-calendar-view.c:2579
 msgid "Anniversary"
 msgstr "Cylchwyl"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:776
+#: ../addressbook/gui/widgets/eab-contact-display.c:853
 msgid "Job Title"
 msgstr "Teitl Swydd"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:807
+#: ../addressbook/gui/widgets/eab-contact-display.c:889
 msgid "Home page"
 msgstr "Tudalen cartref"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:815
+#: ../addressbook/gui/widgets/eab-contact-display.c:897
 msgid "Blog"
 msgstr "Blog"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:51
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Success"
 msgstr "Llwyddiant"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Backend busy"
 msgstr "Rhan gefn yn brysur"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:54
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Repository offline"
 msgstr "Ystorfa ddim ar-lein"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 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:56
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 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:59
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Permission denied"
 msgstr "Gwrthodwyd caniatâd"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact not found"
 msgstr "Cyswllt heb ei ganfod"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Contact ID already exists"
 msgstr "ID cyswllt yn bodoli eisoes"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "Protocol not supported"
 msgstr "Protocol ni chynhelir"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
-#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:236
-#: ../calendar/gui/e-cal-model-tasks.c:349
-#: ../calendar/gui/e-cal-model-tasks.c:664
-#: ../calendar/gui/e-calendar-table.c:464 ../calendar/gui/print.c:2351
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../calendar/gui/e-cal-component-preview.c:248
+#: ../calendar/gui/e-cal-model-tasks.c:363
+#: ../calendar/gui/e-cal-model-tasks.c:679
+#: ../calendar/gui/e-calendar-table.c:237
+#: ../calendar/gui/e-calendar-table.c:660
+#: ../calendar/gui/print.c:2548
 msgid "Canceled"
 msgstr "Diddymwyd"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "Could not cancel"
 msgstr "Methwyd diddymu"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../calendar/gui/comp-editor-factory.c:433
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../calendar/gui/comp-editor-factory.c:432
 msgid "Authentication Failed"
 msgstr "Dilysiant Wedi Methu"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../calendar/gui/comp-editor-factory.c:426
 msgid "Authentication Required"
 msgstr "Angen Dilysiant"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 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:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "No such source"
 msgstr "Dim ffynhonnell o'r fath"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
 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:78
+msgid "Other error"
+msgstr "Gwall arall"
+
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
 msgid "Invalid server version"
 msgstr "Fersiwn gweinydd annilys"
 
-#: ../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 "
-"load the addressbook once in online mode to download its contents"
-msgstr ""
-"Methwyd agor y llyfr cyfeiriadau. Gall fod y llyfr heb ei farcio ar gyfer "
-"defnydd all-lein, neu heb ei lwytho i lawr ar gyfer defnydd all-lein. "
-"Llwythwch y llyfr cyfeiriadau unwaith yn y modd ar-lein er mwyn llwytho ei "
-"gynnwys i lawr."
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:80
+#, fuzzy
+msgid "Unsupported authentication method"
+msgstr "Gweithred heb ei chynnal"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:104
-#, c-format
-msgid ""
-"We were unable to open this addressbook.  Please check that the path %s "
-"exists and that you have permission to access it."
-msgstr ""
-"Wedi methu agor y llyfr cyfeiriadau hwn. Gwiriwch fodolaeth y llwybr %s, a "
-"bod gennych ganiatâd i'w gyrchu."
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#, fuzzy
+msgid "This address book cannot be opened. This either means this book is not marked for offline usage or not yet downloaded for offline usage. Please load the address book once in online mode to download its contents."
+msgstr "Methwyd agor y llyfr cyfeiriadau. Gall fod y llyfr heb ei farcio ar gyfer defnydd all-lein, neu heb ei lwytho i lawr ar gyfer defnydd all-lein. Llwythwch y llyfr cyfeiriadau unwaith yn y modd ar-lein er mwyn llwytho ei gynnwys i lawr."
 
-#: ../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."
-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:119
+#, fuzzy, c-format
+msgid "This address book cannot be opened.  Please check that the path %s exists and that permissions are set to access it."
+msgstr "Wedi methu agor y llyfr cyfeiriadau hwn. Gwiriwch fodolaeth y llwybr %s, a bod gennych ganiatâd i'w gyrchu."
 
-#: ../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 "
-"Evolution package."
-msgstr ""
-"Dyw cynhaliaeth LDAP ddim wedi ei grynhoi yn y fersiwn hwn o Evolution. Os "
-"ydych chi am ddefnyddio LDAP o fewn Evolution, rhaid i chi osod pecyn "
-"Evolution â LDAP wedi ei alluogi."
+#: ../addressbook/gui/widgets/eab-gui-util.c:131
+#, fuzzy
+msgid "This version of Evolution does not have LDAP support compiled in to it.  To use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
+msgstr "Dyw cynhaliaeth LDAP ddim wedi ei grynhoi yn y fersiwn hwn o Evolution. Os ydych chi am ddefnyddio LDAP o fewn Evolution, rhaid i chi osod pecyn Evolution â LDAP wedi ei alluogi."
 
-#: ../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."
-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:140
+#, fuzzy
+msgid "This address book cannot be opened.  This either means that an incorrect URI was entered, or the server is unreachable."
+msgstr "Wedi methu agor y llyfr cyfeiriadau hwn. Un ai rydych wedi rhoi URI anghywir, neu mae'r gweinydd yn anghyraeddadwy."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:148
+#, fuzzy
+msgid "Detailed error message:"
+msgstr "Cyfanswm neges:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:171
+#, fuzzy
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
 "Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
+"the directory server preferences for this address book."
 msgstr ""
 "Y mae mwy o gardiau wedi cydweddu'r ymholiad na mae'r gweinydd wedi ei\n"
-"gyflunio i'w hanfon neu na mae Evolution wedi'i gyflunio i'w dangos. "
-"Newidiwch eich\n"
+"gyflunio i'w hanfon neu na mae Evolution wedi'i gyflunio i'w dangos. Newidiwch eich\n"
 "ymholiad i fod yn fwy penodol neu codwch y cyfwng canlyniadau yn yr\n"
 "hoffterau gweinydd cyfeiriadur ar gyfer y llyfr cyfeiriadau hwn."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#, fuzzy
 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"
+"configured for this address book.  Please make your search\n"
 "more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
+"preferences for this address book."
 msgstr ""
 "Mae'r amser i redeg yr ymholiad hwn yn fwy na chyfwng y gweinydd neu'r\n"
 "cyfwng rydych wedi gosod ar gyfer y llyfr cyfeiriadau hwn. Newidiwch eich\n"
 "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:160
-msgid "The backend for this addressbook was unable to parse this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
+#, fuzzy
+msgid "The backend for this address book was unable to parse this query."
 msgstr "Methodd rhan gefn y llyfr cyfeiriadau ramadegu'r ymholiad."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:163
-msgid "The backend for this addressbook refused to perform this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
+#, fuzzy
+msgid "The backend for this address book refused to perform this query."
 msgstr "Gwrthododd rhan gefn y llyfr cyfeiriadau weithredu'r ymholiad."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:166
+#: ../addressbook/gui/widgets/eab-gui-util.c:189
 msgid "This query did not complete successfully."
 msgstr "Nid oedd yr ymholiad wedi gorffen yn llwyddiannus"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:188
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
 msgid "Error adding list"
 msgstr "Gwall wrth ychwanegu rhestr"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:188
-#: ../addressbook/gui/widgets/eab-gui-util.c:710
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:685
 msgid "Error adding contact"
 msgstr "Gwall wrth ychwanegu cyswllt"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:199
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying list"
 msgstr "Gwall wrth newid rhestr"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:199
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying contact"
 msgstr "Gwall wrth newid cyswllt"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Error removing list"
 msgstr "Gwall wrth dynnu rhestr"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:660
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
+#: ../addressbook/gui/widgets/eab-gui-util.c:635
 msgid "Error removing contact"
 msgstr "Gwall wrth dynnu cyswllt"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:293
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3685,8 +2533,16 @@ msgstr[2] ""
 "Bydd agor %d cyswllt yn agor %d ffenest newydd hefyd.\n"
 "Ydych chi wir am ddangos yr holl gysylltiadau?"
 
-#. For Translators only: "it" refers to the filename %s.
+#: ../addressbook/gui/widgets/eab-gui-util.c:324
+msgid "_Don't Display"
+msgstr "_Peidio Dangos"
+
 #: ../addressbook/gui/widgets/eab-gui-util.c:325
+msgid "Display _All Contacts"
+msgstr "Dangos _Pob Cyswllt"
+
+#. For Translators only: "it" refers to the filename %s.
+#: ../addressbook/gui/widgets/eab-gui-util.c:350
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3695,15 +2551,15 @@ msgstr ""
 "%s yn bodoli eisoes\n"
 "Ydych chi wir am ei ddisodli?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:329
+#: ../addressbook/gui/widgets/eab-gui-util.c:354
 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:376
-#: ../addressbook/gui/widgets/eab-gui-util.c:379
+#: ../addressbook/gui/widgets/eab-gui-util.c:394
+#: ../addressbook/gui/widgets/eab-gui-util.c:397
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "cyswllt"
@@ -3711,849 +2567,600 @@ msgstr[1] "cysylltiadau"
 msgstr[2] "cysylltiadau"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:427
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:464
+#: ../addressbook/gui/widgets/eab-gui-util.c:480
 msgid "Select Address Book"
 msgstr "Dewis Llyfr Cyfeiriadau Newydd"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:605
+#: ../addressbook/gui/widgets/eab-gui-util.c:594
 msgid "list"
 msgstr "rhestr"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:771
+#: ../addressbook/gui/widgets/eab-gui-util.c:746
 msgid "Move contact to"
 msgstr "Symud y cyswllt i"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:773
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Copy contact to"
 msgstr "Copïo'r cyswllt i"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:776
+#: ../addressbook/gui/widgets/eab-gui-util.c:751
 msgid "Move contacts to"
 msgstr "Symud y cysylltiadau i"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:778
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
 msgid "Copy contacts to"
 msgstr "Copïo'r cysylltiadau i"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1004
-msgid "Multiple VCards"
+#: ../addressbook/gui/widgets/eab-gui-util.c:901
+msgid "Multiple vCards"
 msgstr "Mwy nag un vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1007
+#: ../addressbook/gui/widgets/eab-gui-util.c:908
 #, c-format
-msgid "VCard for %s"
+msgid "vCard for %s"
 msgstr "vCard ar gyfer %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1048
-#: ../addressbook/gui/widgets/eab-gui-util.c:1066
+#: ../addressbook/gui/widgets/eab-gui-util.c:920
+#: ../addressbook/gui/widgets/eab-gui-util.c:946
+#, c-format
 msgid "Contact information"
 msgstr "Gwybodaeth gyswllt"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1068
+#: ../addressbook/gui/widgets/eab-gui-util.c:948
 #, c-format
 msgid "Contact information for %s"
 msgstr "Gwybodaeth gyswllt ar gyfer %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
+#: ../addressbook/gui/widgets/eab-popup-control.c:291
 msgid "Querying Address Book..."
 msgstr "Ymholi Llyfr Cyfeiriadau..."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:143
-#, c-format
-msgid "There is one other contact."
-msgid_plural "There are %d other contacts."
-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: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:232
-msgid "Show Compact VCard"
-msgstr "Dangos VCard Cryno"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:286
-msgid "Save in addressbook"
-msgstr "Cadw mewn llyfr cyfeiriadau"
-
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "Golwg Cerdyn"
 
-#: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../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
+#: ../addressbook/importers/evolution-csv-importer.c:660
+#: ../addressbook/importers/evolution-ldif-importer.c:512
+#: ../addressbook/importers/evolution-vcard-importer.c:252
+#: ../calendar/importers/icalendar-importer.c:310
+#: ../calendar/importers/icalendar-importer.c:687
+#: ../shell/shell.error.xml.h:7
 msgid "Importing..."
 msgstr "Mewnforio..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "CSV neu Tab Outlook (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:827
+#: ../addressbook/importers/evolution-csv-importer.c:862
 msgid "Outlook CSV and Tab Importer"
 msgstr "Mewnforiwr CSV a Tab Outlook"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "CSV neu Tab Mozilla (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:836
+#: ../addressbook/importers/evolution-csv-importer.c:871
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Teclyn mewnforio CSV neu Tab Mozilla"
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "CSV neu Tab Evolution (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:845
+#: ../addressbook/importers/evolution-csv-importer.c:880
 msgid "Evolution CSV and Tab Importer"
 msgstr "Mewnforiwr CSV a Tab Evolution"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:754
+#: ../addressbook/importers/evolution-ldif-importer.c:679
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Fformat Cyfnewid Data LDAP (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:755
+#: ../addressbook/importers/evolution-ldif-importer.c:680
 msgid "Evolution LDIF importer"
 msgstr "Mewnforiwr LDIF Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:547
-msgid "VCard (.vcf, .gcrd)"
-msgstr "VCard (.vcf, .gcrd)"
-
 #: ../addressbook/importers/evolution-vcard-importer.c:548
-msgid "Evolution VCard Importer"
-msgstr "Mewnforiwr VCard Evolution"
-
-#: ../addressbook/printing/e-contact-print.glade.h:1
-msgid "10 pt. Tahoma"
-msgstr "10 pt. Tahoma"
-
-#: ../addressbook/printing/e-contact-print.glade.h:2
-msgid "8 pt. Tahoma"
-msgstr "8 pt. Tahoma"
-
-#: ../addressbook/printing/e-contact-print.glade.h:3
-msgid "Blank forms at end:"
-msgstr "Ffurflenni gwag ar y diwedd:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:4
-msgid "Body"
-msgstr "Corff"
-
-#: ../addressbook/printing/e-contact-print.glade.h:5
-msgid "Bottom:"
-msgstr "Gwaelod:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:6
-msgid "Dimensions:"
-msgstr "Dimensiynau:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:7
-msgid "F_ont..."
-msgstr "_Ffont..."
-
-#: ../addressbook/printing/e-contact-print.glade.h:8
-msgid "Fonts"
-msgstr "Ffontiau"
-
-#: ../addressbook/printing/e-contact-print.glade.h:9
-msgid "Footer:"
-msgstr "Troedyn:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:10
-msgid "Format"
-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:651
-#: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1893
-#: ../widgets/table/e-table-selection-model.c:318
-msgid "Header"
-msgstr "Pennawd"
-
-#: ../addressbook/printing/e-contact-print.glade.h:12
-msgid "Header/Footer"
-msgstr "Pennawd/Troedyn"
-
-#: ../addressbook/printing/e-contact-print.glade.h:13
-msgid "Headings"
-msgstr "Penawdau"
-
-#: ../addressbook/printing/e-contact-print.glade.h:14
-msgid "Headings for each letter"
-msgstr "Penawdau ar gyfer bob llythyren"
-
-#: ../addressbook/printing/e-contact-print.glade.h:15
-msgid "Height:"
-msgstr "Uchder:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:16
-msgid "Immediately follow each other"
-msgstr "Yn dilyn ei gilydd yn syth"
-
-#: ../addressbook/printing/e-contact-print.glade.h:17
-msgid "Include:"
-msgstr "Cynnwys:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:18
-msgid "Landscape"
-msgstr "Tirlun"
-
-#: ../addressbook/printing/e-contact-print.glade.h:19
-msgid "Left:"
-msgstr "Chwith:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:20
-msgid "Letter tabs on side"
-msgstr "Tabiau llythrennau ar yr ochr"
-
-#: ../addressbook/printing/e-contact-print.glade.h:21
-msgid "Margins"
-msgstr "Ymylau"
-
-#: ../addressbook/printing/e-contact-print.glade.h:22
-msgid "Number of columns:"
-msgstr "Nifer y colofnau:"
+msgid "vCard (.vcf, .gcrd)"
+msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/printing/e-contact-print.glade.h:23
-msgid "Options"
-msgstr "Opsiynau"
+#: ../addressbook/importers/evolution-vcard-importer.c:549
+msgid "Evolution vCard Importer"
+msgstr "Mewnforiwr vCard Evolution"
 
-#: ../addressbook/printing/e-contact-print.glade.h:24
-#: ../e-util/eggtrayicon.c:120
-msgid "Orientation"
-msgstr "Gogwydd"
-
-# #-#-#-#-#  cy6.po (evolution)  #-#-#-#-#
-# #-#-#-#-#  cy5.po (evolution)  #-#-#-#-#
-# #-#-#-#-#  cy2.po (evolution)  #-#-#-#-#
-# #-#-#-#-#  cy.po (nautilus)  #-#-#-#-#
-# 48x48/emblems/emblem-package.icon.in.h:1
-#: ../addressbook/printing/e-contact-print.glade.h:25
-msgid "Page"
-msgstr "Tudalen"
-
-#: ../addressbook/printing/e-contact-print.glade.h:26
-msgid "Page Setup:"
-msgstr "Gosodiad Tudalen:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:27
-msgid "Paper"
-msgstr "Papur"
-
-#: ../addressbook/printing/e-contact-print.glade.h:28
-msgid "Paper source:"
-msgstr "Ffynhonnell papur:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:29
-msgid "Portrait"
-msgstr "Darlun"
-
-#: ../addressbook/printing/e-contact-print.glade.h:30
-msgid "Preview:"
-msgstr "Rhagolwg:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:31
-msgid "Print using gray shading"
-msgstr "Argraffu gan ddefnyddio graddliwio llwyd"
-
-#: ../addressbook/printing/e-contact-print.glade.h:32
-msgid "Reverse on even pages"
-msgstr "Gwrthdroi ar dudalennau eilrif"
-
-#: ../addressbook/printing/e-contact-print.glade.h:33
-msgid "Right:"
-msgstr "De:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:34
-msgid "Sections:"
-msgstr "Adrannau:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:35
-msgid "Shading"
-msgstr "Graddliwio"
-
-#. FIXME: Take care of i18n
-#: ../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:217
-msgid "Size:"
-msgstr "Maint:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:37
-msgid "Start on a new page"
-msgstr "Cychwyn ar dudalen newydd"
-
-#: ../addressbook/printing/e-contact-print.glade.h:38
-msgid "Style name:"
-msgstr "Enw'r Arddull:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:39
-msgid "Top:"
-msgstr "Brig:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:156
-msgid "Type:"
-msgstr "Math:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:41
-msgid "Width:"
-msgstr "Lled:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:42
-msgid "_Font..."
-msgstr "_Ffont..."
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:53
-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:47
-msgid "Copyright (C) 2000, Ximian, Inc."
-msgstr "Hawlfraint (C) 2000, Ximian, Inc."
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:56
-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:46
-msgid "Contact Print Test"
-msgstr "Prawf Argraffu Cyswllt"
-
-#: ../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:668
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:704
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
 msgid "Can not open file"
 msgstr "Ni ellir agor ffeil"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
-msgid "Couldn't get list of addressbooks"
-msgstr "Methwyd cael rhestr o lyfrau cyswllt"
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:42
+msgid "Couldn't get list of address books"
+msgstr "Methwyd cael rhestr o lyfrau cyfeiriadau"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:70
 msgid "failed to open book"
 msgstr "methwyd agor llyfr"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:45
 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:50
+#: ../addressbook/tools/evolution-addressbook-export.c:46
 msgid "OUTPUTFILE"
 msgstr "FFEIL_ALLBWN"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:53
-msgid "List local addressbook folders"
+#: ../addressbook/tools/evolution-addressbook-export.c:49
+#, fuzzy
+msgid "List local address book folders"
 msgstr "Rhestru plygellau llyfr cyfeiriadau lleol"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:52
 msgid "Show cards as vcard or csv file"
 msgstr "Dangos cardiau fel vcard neu ffeil csv"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:53
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Export in asynchronous mode"
 msgstr "Allforio mewn modd anghydamserol"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
-msgid ""
-"The number of cards in out output file in asynchronous mode, default size "
-"100."
-msgstr ""
-"Y nifer o gardiau yn y ffeil allbwn yn y modd anghydamserol, 100 yw'r "
-"rhagosodiad."
+#: ../addressbook/tools/evolution-addressbook-export.c:59
+#, fuzzy
+msgid "The number of cards in one output file in asynchronous mode, default size 100."
+msgstr "Y nifer o gardiau yn y ffeil allbwn yn y modd anghydamserol, 100 yw'r rhagosodiad."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:65
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "NUMBER"
 msgstr "RHIF"
 
-#: ../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:99
+msgid "Command line arguments error, please use --help option to see the usage."
+msgstr "Gwall argiau ar y llinell orchymyn: defnyddiwch yr opsiwn --help i weld y defnydd."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:116
+#: ../addressbook/tools/evolution-addressbook-export.c:113
 msgid "Only support csv or vcard format."
 msgstr "Cynnal ffurfiau csv neu vcard yn unig."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:125
+#: ../addressbook/tools/evolution-addressbook-export.c:122
 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:133
+#: ../addressbook/tools/evolution-addressbook-export.c:130
 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:164
+#: ../addressbook/tools/evolution-addressbook-export.c:161
 msgid "Unhandled error"
 msgstr "Gwall heb ei drin"
 
-#: ../calendar/calendar.error.xml.h:1
-msgid ""
-"Adding a meaningful summary to your appointment will give your recipients an "
-"idea of what your appointment is about."
-msgstr ""
-"Mae ychwanegu crynodeb pwrpasol at eich apwyntiad yn rhoi gwell syniad i'r "
-"derbynwyr o'r hyn i'w ddisgwyl."
-
+#. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
-msgid ""
-"Adding a meaningful summary to your task will give your recipients an idea "
-"of what your task is about."
-msgstr ""
-"Mae ychwanegu crynodeb pwrpasol at eich tasg yn rhoi gwell syniad i'r "
-"derbynwyr o'r hyn mae'r dasg yn ei olygu."
-
-#: ../calendar/calendar.error.xml.h:3
-msgid ""
-"All information in these journal entries will be deleted and can not be "
-"restored."
-msgstr ""
-"Bydd yr holl wybodaeth o fewn y cofnodion dyddlyfr yn cael ei ddileu, ac ni "
-"ellir ei adfer."
+msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar from the side bar in the Calendar view."
+msgstr "Mae '{0}' yn calendr darllen-yn-unig a methu cael ei newid. Dewiswch calendr gwahanol o'r bar ochor yn y golwg Calendr os gwelwch yn dda."
 
+#. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
-msgid ""
-"All information in this journal will be deleted and can not be restored."
-msgstr ""
-"Bydd yr holl wybodaeth o fewn y dyddlyfr yn cael ei ddileu, ac ni ellir ei "
-"adfer."
+#, fuzzy
+msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar that can accept appointments."
+msgstr "Ffynhonnell calendr darllen-yn-unig sydd wedi'i dewis gennych. Ewch i'r Olwg Galendr a dewiswch galendr fedr dderbyn apwyntiadau."
 
 #: ../calendar/calendar.error.xml.h:5
-msgid ""
-"All information on these appointments will be deleted and can not be "
-"restored."
-msgstr ""
-"Bydd yr holl wybodaeth am yr apwyntiadau yn cael ei ddileu, ac ni ellir ei "
-"adfer."
+msgid "Adding a meaningful summary to your appointment will give your recipients an idea of what your appointment is about."
+msgstr "Mae ychwanegu crynodeb pwrpasol at eich apwyntiad yn rhoi gwell syniad i'r derbynwyr o'r hyn i'w ddisgwyl."
 
 #: ../calendar/calendar.error.xml.h:6
-msgid "All information on these tasks will be deleted and can not be restored."
-msgstr ""
-"Bydd yr holl wybodaeth am y tasgau yn cael ei ddileu, ac ni ellir ei adfer."
+msgid "Adding a meaningful summary to your task will give your recipients an idea of what your task is about."
+msgstr "Mae ychwanegu crynodeb pwrpasol at eich tasg yn rhoi gwell syniad i'r derbynwyr o'r hyn mae'r dasg yn ei olygu."
 
 #: ../calendar/calendar.error.xml.h:7
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
-msgstr ""
-"Bydd yr holl wybodaeth am yr apwyntiad yn cael ei ddileu, ac ni ellir ei "
-"adfer."
+#, fuzzy
+msgid "All information in these memos will be deleted and can not be restored."
+msgstr "Bydd yr holl wybodaeth am y tasgau yn cael ei ddileu, ac ni ellir ei adfer."
 
 #: ../calendar/calendar.error.xml.h:8
-msgid ""
-"All information on this journal entry will be deleted and can not be "
-"restored."
-msgstr ""
-"Bydd yr holl wybodaeth am y cofnod dyddlyfr yn cael ei ddileu, ac ni ellir "
-"ei adfer."
+#, fuzzy
+msgid "All information in this memo will be deleted and can not be restored."
+msgstr "Bydd yr holl wybodaeth o fewn y dyddlyfr yn cael ei ddileu, ac ni ellir ei adfer."
 
 #: ../calendar/calendar.error.xml.h:9
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
-msgstr ""
-"Bydd yr holl wybodaeth am y cyfarfod yn cael ei ddileu, ac ni ellir ei adfer."
+msgid "All information on these appointments will be deleted and can not be restored."
+msgstr "Bydd yr holl wybodaeth am yr apwyntiadau yn cael ei ddileu, ac ni ellir ei adfer."
 
 #: ../calendar/calendar.error.xml.h:10
-msgid "All information on this task will be deleted and can not be restored."
-msgstr ""
-"Bydd yr holl wybodaeth am y dasg yn cael ei ddileu, ac ni ellir ei adfer."
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr "Bydd yr holl wybodaeth am y tasgau yn cael ei ddileu, ac ni ellir ei adfer."
 
 #: ../calendar/calendar.error.xml.h:11
+msgid "All information on this appointment will be deleted and can not be restored."
+msgstr "Bydd yr holl wybodaeth am yr apwyntiad yn cael ei ddileu, ac ni ellir ei adfer."
+
+#: ../calendar/calendar.error.xml.h:12
+msgid "All information on this meeting will be deleted and can not be restored."
+msgstr "Bydd yr holl wybodaeth am y cyfarfod yn cael ei ddileu, ac ni ellir ei adfer."
+
+#: ../calendar/calendar.error.xml.h:13
+#, fuzzy
+msgid "All information on this memo will be deleted and can not be restored."
+msgstr "Bydd yr holl wybodaeth am y cyfarfod yn cael ei ddileu, ac ni ellir ei adfer."
+
+#: ../calendar/calendar.error.xml.h:14
+msgid "All information on this task will be deleted and can not be restored."
+msgstr "Bydd yr holl wybodaeth am y dasg yn cael ei ddileu, ac ni ellir ei adfer."
+
+#: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "Ydych chi'n siŵr eich bod am ddileu'r dasg '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:12
+#: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "Ydych chi'n siŵr eich bod am ddileu'r apwyntiad o'r enw '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:13
-msgid "Are you sure you want to delete the journal entry '{0}'?"
-msgstr "Ydych chi'n siŵr eich bod am ddileu'r cofnod dyddlyfr '{0}'?"
+#: ../calendar/calendar.error.xml.h:17
+#, fuzzy
+msgid "Are you sure you want to delete the memo '{0}'?"
+msgstr "Ydych chi'n siŵr eich bod am ddileu'r dasg '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Ydych chi'n siŵr eich bod am ddileu'r {0} apwyntiad hyn?"
 
-#: ../calendar/calendar.error.xml.h:15
-msgid "Are you sure you want to delete these {0} journal entries?"
-msgstr "Ydych chi'n siŵr eich bod am ddileu'r {0} o gofnodion dyddlyfr hyn?"
+#: ../calendar/calendar.error.xml.h:19
+#, fuzzy
+msgid "Are you sure you want to delete these {0} memos?"
+msgstr "Ydych chi'n siŵr eich bod am ddileu'r {0} o dasgau hyn?"
 
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "Ydych chi'n siŵr eich bod am ddileu'r {0} o dasgau hyn?"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete this appointment?"
 msgstr "Ydych chi'n siŵr eich bod am ddileu'r apwyntiad hwn?"
 
-#: ../calendar/calendar.error.xml.h:18
-#: ../calendar/gui/dialogs/delete-comp.c:189
-msgid "Are you sure you want to delete this journal entry?"
-msgstr "Ydych chi'n siŵr eich bod am ddileu'r cofnod dyddlyfr hwn?"
-
-#: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
+#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/gui/dialogs/delete-comp.c:182
+#, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Ydych chi'n siŵr eich bod am ddileu'r cyfarfod?"
 
-#: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:188
+#, fuzzy, c-format
+msgid "Are you sure you want to delete this memo?"
+msgstr "Ydych chi'n siŵr eich bod am ddileu'r cyfarfod?"
+
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:185
+#, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Ydych chi'n siŵr eich bod am ddileu'r dasg?"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:25
+#, fuzzy
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "Ydych chi'n siŵr eich bod am anfon y dasg heb grynodeb?"
+
+#: ../calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "Ydych chi'n siŵr eich bod am anfon yr apwyntiad heb grynodeb?"
 
-#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "Ydych chi'n siŵr eich bod am anfon y dasg heb grynodeb?"
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:28
+msgid "Calendar repository is offline."
+msgstr "Ystorfa calendr ddim ar-lein"
+
+#: ../calendar/calendar.error.xml.h:29
 msgid "Cannot create a new event"
 msgstr "Methu creu tasg newydd"
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:30
+msgid "Cannot save event"
+msgstr "Methu cadw digwyddiad"
+
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
 msgstr "Dileu calendr '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
 msgstr "Dileu'r rhestr femos '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
 msgstr "Dileu'r rhestr dasgau '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:34
 msgid "Do _not Send"
 msgstr "Peidio â _Danfon"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Wrthi'n llwytho i lawr. Ydych chi am gadw'r apwyntiad?"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Wrthi'n llwytho i lawr. Ydych chi am gadw'r dasg?"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:37
 msgid "Editor could not be loaded."
 msgstr "Methwyd llwytho'r golygydd."
 
-#: ../calendar/calendar.error.xml.h:31
-msgid ""
-"Email invitations will be sent to all participants and allow them to accept "
-"this task."
-msgstr ""
-"Bydd gwahoddiadau yn cael eu hanfon at bob cyfrannwr dros e-bost, fydd yn "
-"gadael iddyn nhw dderbyn y dasg."
+#: ../calendar/calendar.error.xml.h:38
+msgid "Email invitations will be sent to all participants and allow them to accept this task."
+msgstr "Bydd gwahoddiadau yn cael eu hanfon at bob cyfrannwr dros e-bost, fydd yn gadael iddyn nhw dderbyn y dasg."
 
-#: ../calendar/calendar.error.xml.h:32
-msgid ""
-"Email invitations will be sent to all participants and allow them to reply."
-msgstr ""
-"Bydd gwahoddiadau yn cael eu hanfon at bob cyfrannwr dros e-bost, fydd yn "
-"gadael iddyn nhw ymateb."
+#: ../calendar/calendar.error.xml.h:39
+msgid "Email invitations will be sent to all participants and allow them to reply."
+msgstr "Bydd gwahoddiadau yn cael eu hanfon at bob cyfrannwr dros e-bost, fydd yn gadael iddyn nhw ymateb."
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading calendar"
 msgstr "Gwall wrth lwytho calendr"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading memo list"
 msgstr "Gwall wrth lwytho rhestr femos"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading task list"
 msgstr "Gwall wrth lwytho rhestr dasgau"
 
-#: ../calendar/calendar.error.xml.h:36
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the journal has been deleted."
-msgstr ""
-"Os na anfonwch chi neges ganslo, mae'n bosib na fydd yr holl gyfranwyr yn "
-"gwybod fod y dyddlyfr wedi ei ganslo."
+#. For Translators: {0} is specify the backend server
+#: ../calendar/calendar.error.xml.h:44
+#, fuzzy
+msgid "Error on '{0}'"
+msgstr "Gwall tra {0}."
 
-#: ../calendar/calendar.error.xml.h:37
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the meeting is canceled."
-msgstr ""
-"Os na anfonwch chi neges ganslo, mae'n bosib na fydd yr holl gyfranwyr yn "
-"gwybod fod y cyfarfod wedi ei ganslo."
+#: ../calendar/calendar.error.xml.h:45
+msgid "If you do not send a cancelation notice, the other participants may not know the meeting is canceled."
+msgstr "Os na anfonwch chi neges ganslo, mae'n bosib na fydd yr holl gyfranwyr yn gwybod fod y cyfarfod wedi ei ganslo."
 
-#: ../calendar/calendar.error.xml.h:38
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the task has been deleted."
-msgstr ""
-"Os na anfonwch chi neges ganslo, mae'n bosib na fydd yr holl gyfranwyr yn "
-"gwybod fod y dasg wedi ei chanslo."
+#: ../calendar/calendar.error.xml.h:46
+#, fuzzy
+msgid "If you do not send a cancelation notice, the other participants may not know the memo has been deleted."
+msgstr "Os na anfonwch chi neges ganslo, mae'n bosib na fydd yr holl gyfranwyr yn gwybod fod y dasg wedi ei chanslo."
 
-#: ../calendar/calendar.error.xml.h:39
-msgid ""
-"Sending updated information allows other participants to keep their "
-"calendars up to date."
-msgstr ""
-"Mae anfon gwybodaeth wedi'i ddiweddaru yn gadael i gyfranwyr eraill gadw eu "
-"calendrau'n gyfredol."
+#: ../calendar/calendar.error.xml.h:47
+msgid "If you do not send a cancelation notice, the other participants may not know the task has been deleted."
+msgstr "Os na anfonwch chi neges ganslo, mae'n bosib na fydd yr holl gyfranwyr yn gwybod fod y dasg wedi ei chanslo."
 
-#: ../calendar/calendar.error.xml.h:40
-msgid ""
-"Sending updated information allows other participants to keep their task "
-"lists up to date."
-msgstr ""
-"Mae anfon gwybodaeth wedi'i ddiweddaru yn gadael i eraill gadw eu rhestr "
-"tasgau'n gyfredol."
+#: ../calendar/calendar.error.xml.h:48
+msgid "No response from the server."
+msgstr "Dim ymateb gan y gweinydd."
 
-#: ../calendar/calendar.error.xml.h:41
-msgid ""
-"Some attachments are being downloaded. Saving the appointment would result "
-"in the loss of these attachments."
-msgstr ""
-"Mae rhai atodiadau'n cael eu llwytho i lawr. Bydd cadw'r apwyntiad nawr yn "
-"golygu colli'r atodiadau hynny."
+#: ../calendar/calendar.error.xml.h:49
+msgid "Save Appointment"
+msgstr "Cadw Apwyntiad"
 
-#: ../calendar/calendar.error.xml.h:42
-msgid ""
-"Some attachments are being downloaded. Saving the task would result in the "
-"loss of these attachments."
-msgstr ""
-"Mae rhai atodiadau'n cael eu llwytho i lawr. Bydd cadw'r dasg nawr yn golygu "
-"colli'r atodiadau hynny."
+#: ../calendar/calendar.error.xml.h:50
+msgid "Save Memo"
+msgstr "Cadw Memo"
+
+#: ../calendar/calendar.error.xml.h:51
+msgid "Save Task"
+msgstr "Cadw Tasg"
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:52
+msgid "Sending updated information allows other participants to keep their calendars up to date."
+msgstr "Mae anfon gwybodaeth wedi'i ddiweddaru yn gadael i gyfranwyr eraill gadw eu calendrau'n gyfredol."
+
+#: ../calendar/calendar.error.xml.h:53
+msgid "Sending updated information allows other participants to keep their task lists up to date."
+msgstr "Mae anfon gwybodaeth wedi'i ddiweddaru yn gadael i eraill gadw eu rhestr tasgau'n gyfredol."
+
+#: ../calendar/calendar.error.xml.h:55
+msgid "Some attachments are being downloaded. Saving the appointment would result in the loss of these attachments."
+msgstr "Mae rhai atodiadau'n cael eu llwytho i lawr. Bydd cadw'r apwyntiad nawr yn golygu colli'r atodiadau hynny."
+
+#: ../calendar/calendar.error.xml.h:56
+msgid "Some attachments are being downloaded. Saving the task would result in the loss of these attachments."
+msgstr "Mae rhai atodiadau'n cael eu llwytho i lawr. Bydd cadw'r dasg nawr yn golygu colli'r atodiadau hynny."
+
+#: ../calendar/calendar.error.xml.h:57
 msgid "Some features may not work properly with your current server."
-msgstr ""
-"Efallai na fydd rhai nodweddion yn gweithio'n gywir gyda'ch gweinydd "
-"presennol."
+msgstr "Efallai na fydd rhai nodweddion yn gweithio'n gywir gyda'ch gweinydd presennol."
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:58
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Mae'r calendr Evolution wedi terfynu'n annisgwyl"
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:59
+#, fuzzy
+msgid "The Evolution calendars have quit unexpectedly."
+msgstr "Mae'r calendr Evolution wedi terfynu'n annisgwyl"
+
+#: ../calendar/calendar.error.xml.h:60
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Mae memo Evolution wedi terfynu'n annisgwyl."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:61
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Mae'r tasgau Evolution wedi terfynu'n annisgwyl"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:62
 msgid "The calendar is not marked for offline usage."
 msgstr "Calendr heb ei farcio ar gyfer defnydd all-lein."
 
-#: ../calendar/calendar.error.xml.h:48
-msgid "The memo list is not marked for offline usage"
+#: ../calendar/calendar.error.xml.h:63
+#, fuzzy
+msgid "The memo list is not marked for offline usage."
 msgstr "Rhestr femos heb ei marcio ar gyfer defnydd all-lein."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:64
 msgid "The task list is not marked for offline usage."
 msgstr "Rhestr dasgau heb ei marcio ar gyfer defnydd all-lein."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:65
 msgid "This calendar will be removed permanently."
 msgstr "Bydd y calendr yn cael ei ddileu'n barhaol."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:66
 msgid "This memo list will be removed permanently."
 msgstr "Bydd y rhestr femos yn cael ei dileu'n barhaol."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:67
 msgid "This task list will be removed permanently."
 msgstr "Bydd y rhestr dasgau'n cael ei dileu'n barhaol."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:68
+#, fuzzy
+msgid "Unable to load the calendar"
+msgstr "Methu llwytho'r calendr '%s'."
+
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Ydych chi am gadw'r newidiadau i'r apwyntiad hwn?"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to save your changes to this memo?"
 msgstr "Ydych chi am gadw'r newidiadau i'r memo hwn?"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to save your changes to this task?"
 msgstr "Ydych chi am gadw'r newidiadau i'r dasg hon?"
 
-#: ../calendar/calendar.error.xml.h:56
-msgid "Would you like to send a cancelation notice for this journal entry?"
+#: ../calendar/calendar.error.xml.h:72
+#, fuzzy
+msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Ydych chi am anfon neges ganslo ynglŷn â'r cofnod dyddlyfr hwn?"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:73
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Ydych chi am anfon neges ganslo at yr holl gyfranwyr?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Ydych chi am anfon gwahoddiadau cyfarfod at gyfranwyr?"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:75
 msgid "Would you like to send this task to participants?"
 msgstr "Ydych chi am anfon y dasg hon at bob cyfrannwr?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:76
 msgid "Would you like to send updated meeting information to participants?"
-msgstr ""
-"Ydych chi am anfon y wybodaeth ddiweddaraf ynglŷn â'r cyfarfod at y "
-"cyfranwyr?"
+msgstr "Ydych chi am anfon y wybodaeth ddiweddaraf ynglŷn â'r cyfarfod at y cyfranwyr?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:77
 msgid "Would you like to send updated task information to participants?"
-msgstr ""
-"Ydych chi am anfon gwybodaeth wedi'i ddiweddaru ynglŷn â'r dasg at y "
-"cyfranwyr?"
+msgstr "Ydych chi am anfon gwybodaeth wedi'i ddiweddaru ynglŷn â'r dasg at y cyfranwyr?"
 
-#: ../calendar/calendar.error.xml.h:62
-msgid ""
-"You are connecting to an unsupported GroupWise server and may encounter "
-"problems using Evolution. For best results, the server should be upgraded to "
-"a supported version."
-msgstr ""
-"Rydych yn cysylltu â gweinydd GroupWise sydd heb ei gynnal. Hwyrach y cewch "
-"chi broblemau gyda Evolution. Dylid uwchraddio'r gweinydd at fersiwn sydd "
-"wedi ei gynnal, i gael y canlyniadau gorau."
+#: ../calendar/calendar.error.xml.h:78
+msgid "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results, the server should be upgraded to a supported version."
+msgstr "Rydych yn cysylltu â gweinydd GroupWise sydd heb ei gynnal. Hwyrach y cewch chi broblemau gyda Evolution. Dylid uwchraddio'r gweinydd at fersiwn sydd wedi ei gynnal, i gael y canlyniadau gorau."
 
-#: ../calendar/calendar.error.xml.h:63
-msgid ""
-"You have a read-only calendar source selected. Change to Calendar View and "
-"highlight a calendar that can accept appointments."
-msgstr ""
-"Ffynhonnell calendr darllen-yn-unig sydd wedi'i dewis gennych. Ewch i'r Olwg "
-"Galendr a dewiswch galendr fedr dderbyn apwyntiadau."
-
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:79
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Rydych chi wedi gwneud newidiadau i'r apwyntiad hwn, ond heb eu cadw."
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:80
 msgid "You have changed this task, but not yet saved it."
 msgstr "Rydych chi wedi gwneud newidiadau i'r dasg hon, ond heb eu cadw."
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:81
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Rydych chi wedi gwneud newidiadau i'r memo hwn, ond heb eu cadw."
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:82
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "Ni fydd eich calendrau ar gael tan mae Evolution wedi ei ailgychwyn."
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:83
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "Ni fydd eich memos ar gael tan i chi ail-gychwyn Evolution."
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:84
 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:29
+#: ../calendar/calendar.error.xml.h:85
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "_Hepgor Newidiadau"
 
-#: ../calendar/calendar.error.xml.h:71 ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:59
+#: ../calendar/calendar.error.xml.h:86
+#: ../composer/e-composer-actions.c:343
 msgid "_Save"
 msgstr "_Cadw"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:87
 msgid "_Save Changes"
 msgstr "_Cadw Newidiadau"
 
-#: ../calendar/calendar.error.xml.h:73
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:139
+#: ../calendar/calendar.error.xml.h:88
+#: ../composer/mail-composer.error.xml.h:34
+#: ../mail/mail.error.xml.h:142
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "_Anfon"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:89
 msgid "_Send Notice"
 msgstr "Danfon _Hysbys"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:90
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/common/authentication.c:49 ../smime/gui/component.c:50
-msgid "Enter password"
-msgstr "Rhowch gyfrinair"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:253
+#: ../calendar/conduits/calendar/calendar-conduit.c:248
 msgid "Split Multi-Day Events:"
 msgstr "Hollti Digwyddiadau Aml-Ddiwrnod:"
 
-#: ../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
+#: ../calendar/conduits/calendar/calendar-conduit.c:1513
+#: ../calendar/conduits/calendar/calendar-conduit.c:1514
+#: ../calendar/conduits/memo/memo-conduit.c:807
+#: ../calendar/conduits/memo/memo-conduit.c:808
+#: ../calendar/conduits/todo/todo-conduit.c:1007
+#: ../calendar/conduits/todo/todo-conduit.c:1008
 msgid "Could not start evolution-data-server"
 msgstr "Methwyd cychwyn gweinydd evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1612
-#: ../calendar/conduits/calendar/calendar-conduit.c:1615
+#: ../calendar/conduits/calendar/calendar-conduit.c:1621
+#: ../calendar/conduits/calendar/calendar-conduit.c:1624
 msgid "Could not read pilot's Calendar application block"
 msgstr "Methu darllen bloc rhaglen Galendr y peilot"
 
-#: ../calendar/conduits/memo/memo-conduit.c:1024
-#: ../calendar/conduits/memo/memo-conduit.c:1027
+#: ../calendar/conduits/memo/memo-conduit.c:901
+#: ../calendar/conduits/memo/memo-conduit.c:904
 msgid "Could not read pilot's Memo application block"
 msgstr "Methu darllen bloc rhaglen Femo'r peilot"
 
-#: ../calendar/conduits/memo/memo-conduit.c:1071
-#: ../calendar/conduits/memo/memo-conduit.c:1074
+#: ../calendar/conduits/memo/memo-conduit.c:948
+#: ../calendar/conduits/memo/memo-conduit.c:951
 msgid "Could not write pilot's Memo application block"
 msgstr "Methu ysgrifennu bloc rhaglen Femo'r peilot"
 
-#: ../calendar/conduits/todo/todo-conduit.c:237
+#: ../calendar/conduits/todo/todo-conduit.c:227
 msgid "Default Priority:"
 msgstr "Blaenoriaeth Ragosodedig:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1190
-#: ../calendar/conduits/todo/todo-conduit.c:1193
+#: ../calendar/conduits/todo/todo-conduit.c:1091
+#: ../calendar/conduits/todo/todo-conduit.c:1094
 msgid "Could not read pilot's ToDo application block"
 msgstr "Methu darllen bloc rhaglen ToDo y peilot"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1235
-#: ../calendar/conduits/todo/todo-conduit.c:1238
+#: ../calendar/conduits/todo/todo-conduit.c:1136
+#: ../calendar/conduits/todo/todo-conduit.c:1139
 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:2078
+#: ../plugins/itip-formatter/itip-formatter.c:2549
 msgid "Calendar and Tasks"
 msgstr "Calendr a Thasgau"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1361
+#: ../calendar/gui/calendar-component.c:819
+#: ../calendar/gui/calendar-component.c:1238
 msgid "Calendars"
 msgstr "Calendrau"
 
@@ -4594,24 +3201,31 @@ msgid "Memo_s"
 msgstr "_Memos"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../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
+#: ../calendar/gui/e-memo-table.c:288
+#: ../calendar/gui/e-memos.c:1123
+#: ../calendar/gui/gnome-cal.c:1843
+#: ../calendar/gui/memos-component.c:564
+#: ../calendar/gui/memos-component.c:882
+#: ../calendar/gui/memos-control.c:386
+#: ../calendar/gui/memos-control.c:402
 msgid "Memos"
 msgstr "Memos"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c: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:587
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:401
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:545
+#: ../calendar/gui/e-calendar-table.c:720
+#: ../calendar/gui/e-tasks.c:1426
+#: ../calendar/gui/gnome-cal.c:1711
+#: ../calendar/gui/print.c:1973
+#: ../calendar/gui/tasks-component.c:557
+#: ../calendar/gui/tasks-component.c:879
+#: ../calendar/gui/tasks-control.c:524
+#: ../calendar/gui/tasks-control.c:540
+#: ../calendar/importers/icalendar-importer.c:76
+#: ../calendar/importers/icalendar-importer.c:751
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:586
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:563
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Tasgau"
@@ -4620,7 +3234,9 @@ msgstr "Tasgau"
 msgid "_Calendars"
 msgstr "_Calendrau"
 
+#. Tasks
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
+#: ../plugins/pst-import/pst-importer.c:329
 #: ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Tasgau"
@@ -4629,26 +3245,28 @@ msgstr "_Tasgau"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Gwasanaeth hysbysu larymau Calendr Evolution"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:100
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "funud"
 msgstr[1] "funud"
 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: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
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:22
+#: ../plugins/caldav/caldav-source.c:449
+#: ../plugins/calendar-http/calendar-http.c:324
+#: ../plugins/calendar-weather/calendar-weather.c:524
+#: ../plugins/google-account-setup/google-source.c:721
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "awr"
 msgstr[1] "oriau"
 msgstr[2] "oriau"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:293
 msgid "Start time"
 msgstr "Amser cychwyn"
 
@@ -4657,67 +3275,78 @@ msgstr "Amser cychwyn"
 msgid "Appointments"
 msgstr "Apwyntiadau"
 
-#. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../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 "Dismiss _All"
+msgstr "Diystyru _Popeth"
+
+#. Location
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
+#: ../calendar/gui/e-itip-control.c:1164
+#: ../plugins/itip-formatter/itip-view.c:1023
 msgid "Location:"
 msgstr "Lleoliad:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
 msgid "Snooze _time:"
 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:159
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+msgid "_Dismiss"
+msgstr "_Diystyru"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/dialogs/comp-editor.c:1028
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
+#: ../filter/filter.glade.h:11
+#: ../mail/mail-config.glade.h:167
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
-#: ../plugins/publish-calendar/publish-calendar.glade.h: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: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
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+#: ../ui/evolution-addressbook.xml.h:51
+#: ../ui/evolution-calendar.xml.h:43
+#: ../ui/evolution-mail-messagedisplay.xml.h:5
+#: ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-tasks.xml.h:25
+#: ../ui/evolution.xml.h:42
+#: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "_Golygu"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
 msgid "_Snooze"
 msgstr "_Hepian"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
 msgid "location of appointment"
 msgstr "lleoliad yr apwyntiad"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1473
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1623
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1458
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
 msgid "No summary available."
 msgstr "Dim crynodeb ar gael."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1482
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1484
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1467
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1469
 msgid "No description available."
 msgstr "Dim disgrifiad ar gael."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1492
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1477
 msgid "No location information available."
 msgstr "Dim gwybodaeth lleoliad ar gael."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1554
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1522
 #, c-format
 msgid "You have %d alarms"
 msgstr "Mae gennych %d larwm."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1725
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1753
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1682
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1710
+#: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1686
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4729,42 +3358,42 @@ 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:1759
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is "
-"configured to run the following program:\n"
+"An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
 "\n"
 "        %s\n"
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
-"Mae nodyn atgoffa Calendr Evolution bron â chychwyn. Mae'r nodyn atgoffa "
-"wedi ei gyflunio i redeg y rhaglen ganlynol:\n"
+"Mae nodyn atgoffa Calendr Evolution bron â chychwyn. Mae'r nodyn atgoffa wedi ei gyflunio i redeg y rhaglen ganlynol:\n"
 "\n"
 "        %s\n"
 "\n"
 "Ydych chi'n siŵr eich bod am redeg y rhaglen?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1773
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1730
 msgid "Do not ask me about this program again."
 msgstr "Peidiwch â gofyn ynghylch y rhaglen hon eto."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:140
+#: ../calendar/gui/alarm-notify/notify-main.c:141
 msgid "Could not initialize Bonobo"
 msgstr "Methwyd cychwyn Bonobo"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:153
-msgid "Could not create the alarm notify service factory"
+#: ../calendar/gui/alarm-notify/notify-main.c:154
+#, fuzzy
+msgid "Could not create the alarm notify service factory, maybe it's already running..."
 msgstr "Methu creu ffatri gwasanaeth hysbysu am larymau"
 
-#: ../calendar/gui/alarm-notify/util.c:41
+#: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "amser annilys"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:408
-#: ../calendar/gui/misc.c:113
+#: ../calendar/gui/alarm-notify/util.c:69
+#: ../calendar/gui/e-alarm-list.c:406
+#: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -4773,8 +3402,9 @@ msgstr[1] "%d awr"
 msgstr[2] "%d awr"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
-#: ../calendar/gui/misc.c:119
+#: ../calendar/gui/alarm-notify/util.c:75
+#: ../calendar/gui/e-alarm-list.c:412
+#: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4785,8 +3415,9 @@ msgstr[2] "%d munud"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:420
-#: ../calendar/gui/misc.c:123
+#: ../calendar/gui/alarm-notify/util.c:79
+#: ../calendar/gui/e-alarm-list.c:418
+#: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -4794,620 +3425,840 @@ msgstr[0] "%d eiliad"
 msgstr[1] "%d eiliad"
 msgstr[2] "%d eiliad"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
 msgid "Alarm programs"
 msgstr "Rhaglenni larwm"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:6
+msgid "Amount of time in seconds the error should be shown on the status bar."
+msgstr "Yr hyd mewn eiliadau dylai'r gwall cael ei arddangos yn y bar statws."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
 msgid "Ask for confirmation when deleting items"
 msgstr "Gofyn am gadarnhad cyn dileu eitemau"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
-msgstr ""
-"Lliw cefndir tasgau sydd i fod i ddod i ben heddiw, ar ffurf \"#rrggbb\"."
+msgstr "Lliw cefndir tasgau sydd i fod i ddod i ben heddiw, ar ffurf \"#rrggbb\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "Lliw cefndir tasgau sy'n hwyr, ar ffurf \"#rrggbb\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
 msgid "Calendars to run alarms for"
 msgstr "Calendrau i redeg larymau ar eu cyfer"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
+msgid "Check this to use system timezone in Evolution."
 msgstr ""
-"Y lliw i'w ddefnyddio i dynnu llinell Marcus Bains yn y bar Amser (yn wag "
-"fel rhagosodiad)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgstr "Y lliw i'w ddefnyddio i dynnu llinell Marcus Bains yn y bar Amser (yn wag fel rhagosodiad)"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "Y lliw i'w ddefnyddio i dynnu llinell Marcus Bains yn yr olwg Dydd."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Compress weekends in month view"
 msgstr "Cywasgu penwythnosau yn yr olwg mis"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Confirm expunge"
 msgstr "Cadarnhau chwynnu"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "Diwrnodau pryd y dylid dangos dechrau a diwedd oriau gwaith."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default appointment reminder"
 msgstr "atgoffad apwyntiad rhagosodedig"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default reminder units"
 msgstr "Unedau atgoffa rhagosodedig"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder value"
 msgstr "Gwerth atgoffad rhagosodedig"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 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
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Event Gradient"
 msgstr "Graddiant Digwyddiad"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Event Transparency"
 msgstr "Tryloywder Digwyddiadau"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Free/busy server URLs"
 msgstr "LAU gweinyddion statws rhydd/prysur"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Free/busy template URL"
 msgstr "LAU templed statws rhydd/prysur"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 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:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide completed tasks"
 msgstr "Cuddio tasgau sydd wedi gorffen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide task units"
 msgstr "Cuddio unedau tasg"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide task value"
 msgstr "Cuddio gwerth tasg"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Horizontal pane position"
 msgstr "Lleoliad cwarel llorweddol"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 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:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 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:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Intervals shown in Day and Work Week views, in minutes."
-msgstr ""
-"Yr ysbeidiau a ddangosir yng ngolygon Dydd ac Wythnos Waith, mewn munudau."
+msgstr "Yr ysbeidiau a ddangosir yng ngolygon Dydd ac Wythnos Waith, mewn munudau."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "Last alarm time"
 msgstr "Amser larwm diweddaraf"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:72
+msgid "Level beyond which the message should be logged."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+msgid "List of recently used second time zones in a Day View."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 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:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "Marcus Bains Line"
 msgstr "Llinell Marcus Bains"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Lliw Llinell Marcus Bains - Golwg Dydd"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Lliw Llinell Marcus Bains - Bar amser"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+msgid "Maximum number of recently used timezones to remember in a 'day_second_zones' list."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+msgid "Maximum number of recently used timezones to remember."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 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:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 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:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid "Month view horizontal pane position"
 msgstr "Lleoliad cwarel llorweddol golwg Mis"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Month view vertical pane position"
 msgstr "Lleoliad cwarel fertigol golwg Mis"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 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:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 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:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid "Overdue tasks color"
 msgstr "Lliw tasgau hwyr"
 
-#: ../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."
-msgstr ""
-"Lleoliad y cwarel llorweddol, rhwng y calendr llywio dyddiadau a'r rhestr "
-"dasgau pan ddim yn yr olwg mis, mewn picseli."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+msgid "Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels."
+msgstr "Lleoliad y cwarel llorweddol, rhwng y calendr llywio dyddiadau a'r rhestr dasgau pan ddim yn yr olwg mis, mewn picseli."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.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."
-msgstr ""
-"Lleoliad y cwarel llorweddol, rhwng yr olwg a'r calendr llywio dyddiadau a'r "
-"rhestr dasgau pan yn yr olwg mis, mewn picseli."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+msgid "Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels."
+msgstr "Lleoliad y cwarel llorweddol, rhwng yr olwg a'r calendr llywio dyddiadau a'r rhestr dasgau pan yn yr olwg mis, mewn picseli."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
-msgstr ""
-"Lleoliad y cwarel fertigol, rhwng y rhestrau calendr a'r calendr llywio "
-"dyddiadau."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+msgid "Position of the vertical pane, between the calendar lists and the date navigator calendar."
+msgstr "Lleoliad y cwarel fertigol, rhwng y rhestrau calendr a'r calendr llywio dyddiadau."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
-msgid ""
-"Position of the vertical pane, between the task list and the task preview "
-"pane, in pixels."
-msgstr ""
-"Lleoliad y cwarel fertigol, rhwng yr olwg tasgau a'r cwarel rhagolwg tasgau, "
-"mewn picseli."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+msgid "Position of the vertical pane, between the task list and the task preview pane, in pixels."
+msgstr "Lleoliad y cwarel fertigol, rhwng yr olwg tasgau a'r cwarel rhagolwg tasgau, mewn picseli."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.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."
-msgstr ""
-"Lleoliad y cwarel fertigol, rhwng yr olwg a'r calendr llywio dyddiadau a'r "
-"rhestr dasgau pan yn yr olwg mis, mewn picseli"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+msgid "Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels."
+msgstr "Lleoliad y cwarel fertigol, rhwng yr olwg a'r calendr llywio dyddiadau a'r rhestr dasgau pan yn yr olwg mis, mewn picseli"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.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."
-msgstr ""
-"Lleoliad y cwarel fertigol, rhwng y calendr llywio dyddiadau a'r rhestr "
-"dasgau pan ddim yn yr olwg mis, mewn picseli."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+msgid "Position of the vertical pane, between the view and the date navigator calendar and task list when not in the month view, in pixels."
+msgstr "Lleoliad y cwarel fertigol, rhwng y calendr llywio dyddiadau a'r rhestr dasgau pan ddim yn yr olwg mis, mewn picseli."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 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:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+msgid "Recently used second time zones in a Day View"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
 msgid "Save directory for alarm audio"
 msgstr "Cyfeiriadur cadw sain larwm"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+msgid "Scroll Month View by a week"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 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:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 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:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 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:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 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:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid "Show display alarms in notification tray"
 msgstr "Gweld larymau dangos yn y gilfach hysbysu"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 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:53
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Show the \"Preview\" pane"
 msgstr "Dangos y cwarel \"Rhagolwg\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Show the \"Preview\" pane."
 msgstr "Dangos y cwarel \"Rhagolwg\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Show timezone field in the event/meeting editor"
-msgstr ""
-"Dangos y maes cylchfa amser yn y golygydd digwyddiadau/tasgau/cyfarfodydd"
+msgstr "Dangos y maes cylchfa amser yn y golygydd digwyddiadau/tasgau/cyfarfodydd"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 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:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#, fuzzy
+msgid "Show week number in Day and Work Week View"
+msgstr "Dangos rhifau wythnos yn y llywiwr dyddiadau"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Show week numbers in date navigator"
 msgstr "Dangos rhifau wythnos yn y llywiwr dyddiadau"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+msgid "Shows the second time zone in a Day View, if set. Value is similar to one used in a 'timezone' key."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Tasks due today color"
 msgstr "Lliw tasgau i fod i ddod i ben heddiw"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Tasks vertical pane position"
 msgstr "Lleoliad fertigol cwarel Tasgau"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 #, no-c-format
-msgid ""
-"The URL template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain."
+msgid "The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain."
+msgstr "Patrymlun LAU i'w ddefnyddio wrth gefn ar gyfer gwybodaeth rydd/prysur. Rhoddir rhan defnyddiwr y cyfeiriad e-bost yn lle %u, a'r enw parth yn lle %d."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+msgid "The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like \"America/New York\"."
+msgstr "Y gylchfa amser ragosodedig i'w defnyddio ar gyfer amserau a dyddiadau yn y calendr, ar ffurf lleoliad cylchfa amser Olsen heb ei gyfieithu, fel \"Europe/London\"."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+msgid "The second timezone for a Day View"
 msgstr ""
-"Patrymlun LAU i'w ddefnyddio wrth gefn ar gyfer gwybodaeth rydd/prysur. "
-"Rhoddir rhan defnyddiwr y cyfeiriad e-bost yn lle %u, a'r enw parth yn lle %"
-"d."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.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\"."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+msgid "This can have three possible values. 0 for errors. 1 for warnings. 2 for debug messages."
 msgstr ""
-"Y gylchfa amser ragosodedig i'w defnyddio ar gyfer amserau a dyddiadau yn y "
-"calendr, ar ffurf lleoliad cylchfa amser Olsen heb ei gyfieithu, fel "
-"\"Europe/London\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Time divisions"
 msgstr "Rhaniadau amser"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 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:65
-#: ../plugins/startup-wizard/startup-wizard.c:108
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Timezone"
 msgstr "Cylchfa amser"
 
-#: ../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)."
-msgstr ""
-"Tryloywder y digwyddiadau yn yr olwg galendr, gwerth rhwng 0 (tryloyw) ac 1 "
-"(hollol anhryloyw)."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+msgid "Transparency of the events in calendar views, a value between 0 (transparent) and 1 (opaque)."
+msgstr "Tryloywder y digwyddiadau yn yr olwg galendr, gwerth rhwng 0 (tryloyw) ac 1 (hollol anhryloyw)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Twenty four hour time format"
 msgstr "Ffurf cloc bedair awr ar hugain"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
-"Unedau nodyn atgoffa rhagosodedig, \"munudau\", \"oriau\" neu \"dyddiau\"."
+msgstr "Unedau nodyn atgoffa rhagosodedig, \"munudau\", \"oriau\" neu \"dyddiau\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.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.h:81
+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:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+msgid "Use system timezone"
+msgstr "Defnyddio cyrchfa amser y system"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Week start"
 msgstr "Dechrau wythnos"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 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:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 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:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 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:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 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:76
-msgid ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday."
-msgstr ""
-"P'un ai i gywasgu penwythnosau yn yr olwg mis, fydd yn rhoi Dydd Sadwrn a "
-"Dydd Sul yng ngofod un diwrnod."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+msgid "Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday."
+msgstr "P'un ai i gywasgu penwythnosau yn yr olwg mis, fydd yn rhoi Dydd Sadwrn a Dydd Sul yng ngofod un diwrnod."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Whether to display the end time of events in the week and month views."
-msgstr ""
-"P'un ai i ddangos amser gorffen digwyddiadau yng ngolygon wythnos a mis."
+msgstr "P'un ai i ddangos amser gorffen digwyddiadau yng ngolygon wythnos a mis."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.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.h:91
+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:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 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:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+msgid "Whether to scroll a Month View by a week, not by a month."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 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:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 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:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "Whether to show categories field in the event/meeting editor"
-msgstr ""
-"P'un ai i ddangos maes categorïau yn y golygydd digwyddiad/tasg/cyfarfod."
+msgstr "P'un ai i ddangos maes categorïau yn y golygydd digwyddiad/tasg/cyfarfod."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 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:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 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: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.h:99
+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:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Whether to show timezone field in the event/meeting editor"
-msgstr ""
-"P'un ai i ddangos maes cylchfa amser yn y golygydd digwyddiad/tasg/cyfarfod."
+msgstr "P'un ai i ddangos maes cylchfa amser yn y golygydd digwyddiad/tasg/cyfarfod."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 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:88
-msgid "Whether to show week numbers in the date navigator."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#, fuzzy
+msgid "Whether to show week number in the Day and Work Week View."
 msgstr "P'un ai i ddangos rhifau wythnos yn y llywiwr dyddiadau."
 
-#: ../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.h:103
+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:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Work days"
 msgstr "Dyddiau gwaith"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Workday end hour"
 msgstr "Awr gorffen dydd gwaith"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Workday end minute"
 msgstr "Munud gorffen dydd gwaith"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid "Workday start hour"
 msgstr "Awr dechrau dydd gwaith"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid "Workday start minute"
 msgstr "Munud cychwyn dydd gwaith"
 
-#: ../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:55
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Summary contains"
 msgstr "Crynodeb yn cynnwys"
 
-#: ../calendar/gui/cal-search-bar.c:56
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Description contains"
 msgstr "Disgrifiad yn cynnwys"
 
-#: ../calendar/gui/cal-search-bar.c:57
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Category is"
 msgstr "Categori yw"
 
-#: ../calendar/gui/cal-search-bar.c:58
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Comment contains"
 msgstr "Sylw yn cynnwys"
 
-#: ../calendar/gui/cal-search-bar.c:59
+#: ../calendar/gui/cal-search-bar.c:78
 msgid "Location contains"
 msgstr "Lleoliad yn cynnwys"
 
-#: ../calendar/gui/cal-search-bar.c:432
-msgid "Unmatched"
-msgstr "Heb gydweddu"
+#: ../calendar/gui/cal-search-bar.c:636
+msgid "Next 7 Days' Tasks"
+msgstr "Tasgau'r 7 Diwrnod Nesaf"
+
+#: ../calendar/gui/cal-search-bar.c:640
+#, fuzzy
+msgid "Active Tasks"
+msgstr "Tasg wedi'i _Neilltuo"
+
+#: ../calendar/gui/cal-search-bar.c:644
+#, fuzzy
+msgid "Overdue Tasks"
+msgstr "_Tasgau sy'n hwyr:"
+
+#: ../calendar/gui/cal-search-bar.c:648
+msgid "Completed Tasks"
+msgstr "Tasgau Cyflawnwyd"
+
+#: ../calendar/gui/cal-search-bar.c:652
+#, fuzzy
+msgid "Tasks with Attachments"
+msgstr "Negeseuon ag Atodiadau"
+
+#: ../calendar/gui/cal-search-bar.c:698
+#, fuzzy
+msgid "Active Appointments"
+msgstr "Apwyntiadau"
+
+#: ../calendar/gui/cal-search-bar.c:702
+msgid "Next 7 Days' Appointments"
+msgstr "Apwyntiadau'r 7 Diwrnod Nesaf"
 
-#: ../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
+#: ../calendar/gui/calendar-commands.c:89
+#: ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-calendar.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-memos.xml.h:11
+#: ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Argraffu"
 
-#: ../calendar/gui/calendar-commands.c: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 "
-"events."
-msgstr ""
-"Bydd y weithred yn dileu'n barhaol pob digwyddiad sy'n hynach na'r amser a "
-"ddewiswyd. Os wnewch chi barhau, fedrwch chi ddim adfer y digwyddiadau."
+#: ../calendar/gui/calendar-commands.c:312
+msgid "This operation will permanently erase all events older than the selected amount of time. If you continue, you will not be able to recover these events."
+msgstr "Bydd y weithred yn dileu'n barhaol pob digwyddiad sy'n hynach na'r amser a ddewiswyd. Os wnewch chi barhau, fedrwch chi ddim adfer y digwyddiadau."
 
-#: ../calendar/gui/calendar-commands.c:330
+#: ../calendar/gui/calendar-commands.c:318
 msgid "Purge events older than"
 msgstr "Gwaredu digwyddiadau sy'n hÅ·n na"
 
-#: ../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
+#: ../calendar/gui/calendar-commands.c:323
+#: ../plugins/caldav/caldav-source.c:450
+#: ../plugins/calendar-http/calendar-http.c:325
+#: ../plugins/calendar-weather/calendar-weather.c:525
+#: ../plugins/google-account-setup/google-source.c:722
+#: ../plugins/google-account-setup/google-contacts-source.c:332
+#: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "dyddiau"
 
-#. Create the On the web source group
-#. Create the LDAP source group
 #. Create the Webcal source group
-#. Create the LDAP source group
-#: ../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
+#: ../calendar/gui/calendar-component.c:194
+#: ../calendar/gui/memos-component.c:152
+#: ../calendar/gui/migration.c:504
+#: ../calendar/gui/migration.c:603
+#: ../calendar/gui/migration.c:1117
+#: ../calendar/gui/tasks-component.c:149
 msgid "On The Web"
 msgstr "Ar y We"
 
-#: ../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:284
-#: ../plugins/calendar-weather/calendar-weather.c:100
+#: ../calendar/gui/calendar-component.c:195
+#: ../plugins/calendar-weather/calendar-weather.c:126
 msgid "Weather"
 msgstr "Tywydd"
 
-#: ../calendar/gui/calendar-component.c:582
+#. ensure the source name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:289
+#: ../calendar/gui/calendar-component.c:291
+#: ../calendar/gui/migration.c:398
+msgid "Birthdays & Anniversaries"
+msgstr "Penblwyddi"
+
+#: ../calendar/gui/calendar-component.c:626
 msgid "_New Calendar"
 msgstr "_Calendr Newydd"
 
-#: ../calendar/gui/calendar-component.c:899
+#: ../calendar/gui/calendar-component.c:627
+#: ../calendar/gui/memos-component.c:478
+#: ../calendar/gui/tasks-component.c:471
+#: ../mail/em-folder-tree.c:2114
+msgid "_Copy..."
+msgstr "_Copïo..."
+
+#: ../calendar/gui/calendar-component.c:632
+#: ../calendar/gui/memos-component.c:483
+#: ../calendar/gui/tasks-component.c:476
+#, fuzzy
+msgid "_Make available for offline use"
+msgstr "_Marcio'r Calendr at ddefnydd all-lein"
+
+#: ../calendar/gui/calendar-component.c:633
+#: ../calendar/gui/memos-component.c:484
+#: ../calendar/gui/tasks-component.c:477
+#, fuzzy
+msgid "_Do not make available for offline use"
+msgstr "_Peidio â gwneud hwn ar gael all-lein"
+
+#: ../calendar/gui/calendar-component.c:961
 msgid "Failed upgrading calendars."
 msgstr "Methwyd uwchraddio calendrau."
 
-#: ../calendar/gui/calendar-component.c:1198
+#: ../calendar/gui/calendar-component.c:1089
 #, 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:1214
+#: ../calendar/gui/calendar-component.c:1105
 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:1336
+#: ../calendar/gui/calendar-component.c:1218
 msgid "Calendar Source Selector"
 msgstr "Dewisydd Ffynhonnell Galendr"
 
-#: ../calendar/gui/calendar-component.c:1544
+#: ../calendar/gui/calendar-component.c:1433
 msgid "New appointment"
 msgstr "Apwyntiad newydd"
 
-#: ../calendar/gui/calendar-component.c:1545
+#: ../calendar/gui/calendar-component.c:1434
+msgctxt "New"
 msgid "_Appointment"
 msgstr "_Apwyntiad"
 
-#: ../calendar/gui/calendar-component.c:1546
+#: ../calendar/gui/calendar-component.c:1435
 msgid "Create a new appointment"
 msgstr "Creu apwyntiad newydd"
 
-#: ../calendar/gui/calendar-component.c:1552
+#: ../calendar/gui/calendar-component.c:1441
 msgid "New meeting"
 msgstr "Cyfarfod Newydd"
 
-#: ../calendar/gui/calendar-component.c:1553
+#: ../calendar/gui/calendar-component.c:1442
+msgctxt "New"
 msgid "M_eeting"
 msgstr "_Cyfarfod"
 
-#: ../calendar/gui/calendar-component.c:1554
+#: ../calendar/gui/calendar-component.c:1443
 msgid "Create a new meeting request"
 msgstr "Creu cais newydd am gyfarfod"
 
-#: ../calendar/gui/calendar-component.c:1560
+#: ../calendar/gui/calendar-component.c:1449
 msgid "New all day appointment"
 msgstr "Apwyntiad drwy'r diwrnod newydd"
 
-#: ../calendar/gui/calendar-component.c:1561
+#: ../calendar/gui/calendar-component.c:1450
+msgctxt "New"
 msgid "All Day A_ppointment"
-msgstr "Apwyntiad Drwy'r Diwrnod"
+msgstr "A_pwyntiad Drwy'r Diwrnod"
 
-#: ../calendar/gui/calendar-component.c:1562
+#: ../calendar/gui/calendar-component.c:1451
 msgid "Create a new all-day appointment"
 msgstr "Creu apwyntiad gydol-y-dydd newydd"
 
-#: ../calendar/gui/calendar-component.c:1568
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New calendar"
 msgstr "Calendr newydd"
 
-#: ../calendar/gui/calendar-component.c:1569
+#: ../calendar/gui/calendar-component.c:1458
+msgctxt "New"
 msgid "Cale_ndar"
 msgstr "_Calendr"
 
-#: ../calendar/gui/calendar-component.c:1570
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new calendar"
 msgstr "Creu calendr newydd"
 
-#: ../calendar/gui/calendar-view-factory.c:109
+#: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
 msgstr "Golwg Dydd"
 
-#: ../calendar/gui/calendar-view-factory.c:112
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Work Week View"
 msgstr "Golwg Wythnos Waith"
 
-#: ../calendar/gui/calendar-view-factory.c:115
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Week View"
 msgstr "Golwg Wythnos"
 
-#: ../calendar/gui/calendar-view-factory.c:118
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Month View"
 msgstr "Golwg Mis"
 
-#: ../calendar/gui/comp-editor-factory.c:415
+#: ../calendar/gui/caltypes.xml.h:1
+#: ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/tasktypes.xml.h:3
+msgid "Any Field"
+msgstr "Unrhyw Faes"
+
+#: ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:5
+#: ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Atodiadau"
+
+#: ../calendar/gui/caltypes.xml.h:4
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:6
+msgid "Attendee"
+msgstr "Mynychwr"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:8
+msgid "Category"
+msgstr "Categori"
+
+#: ../calendar/gui/caltypes.xml.h:6
+#: ../calendar/gui/memotypes.xml.h:5
+msgid "Classification"
+msgstr "Dosbarthiad"
+
+#: ../calendar/gui/caltypes.xml.h:7
+#: ../calendar/gui/e-cal-list-view.c:248
+#: ../calendar/gui/e-cal-model.c:351
+#: ../calendar/gui/e-calendar-table.c:564
+#: ../calendar/gui/memotypes.xml.h:6
+#: ../plugins/email-custom-header/email-custom-header.c:340
+msgid "Confidential"
+msgstr "Cyfrinachol"
+
+#: ../calendar/gui/caltypes.xml.h:8
+#: ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:10
+#: ../plugins/plugin-manager/plugin-manager.c:59
+#: ../widgets/misc/e-attachment-tree-view.c:496
+#: ../widgets/table/e-table-config.glade.h:6
+msgid "Description"
+msgstr "Disgrifiad"
+
+#: ../calendar/gui/caltypes.xml.h:9
+#: ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/tasktypes.xml.h:11
+#, fuzzy
+msgid "Description Contains"
+msgstr "Disgrifiad yn cynnwys"
+
+#: ../calendar/gui/caltypes.xml.h:10
+#: ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+#: ../mail/em-filter-i18n.h:22
+msgid "Do Not Exist"
+msgstr "Ddim yn bodoli"
+
+#: ../calendar/gui/caltypes.xml.h:11
+#: ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:13
+#: ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr "Bodoli"
+
+#: ../calendar/gui/caltypes.xml.h:12
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../mail/message-list.etspec.h:9
+#: ../plugins/publish-calendar/publish-calendar.c:718
+#: ../plugins/save-calendar/csv-format.c:371
+msgid "Location"
+msgstr "Lleoliad"
+
+#: ../calendar/gui/caltypes.xml.h:13
+#: ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:19
+msgid "Organizer"
+msgstr "Trefnydd"
+
+#: ../calendar/gui/caltypes.xml.h:14
+#: ../calendar/gui/e-cal-list-view.c:247
+#: ../calendar/gui/e-cal-model.c:349
+#: ../calendar/gui/e-calendar-table.c:563
+#: ../calendar/gui/memotypes.xml.h:12
+msgid "Private"
+msgstr "Preifat"
+
+#: ../calendar/gui/caltypes.xml.h:15
+#: ../calendar/gui/e-cal-list-view.c:246
+#: ../calendar/gui/e-cal-model.c:340
+#: ../calendar/gui/e-cal-model.c:347
+#: ../calendar/gui/e-calendar-table.c:562
+#: ../calendar/gui/memotypes.xml.h:13
+msgid "Public"
+msgstr "Cyhoeddus"
+
+#: ../calendar/gui/caltypes.xml.h:16
+#: ../calendar/gui/dialogs/event-editor.c:304
+msgid "Recurrence"
+msgstr "Ail-ddigwyddiad"
+
+#: ../calendar/gui/caltypes.xml.h:17
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:13
+#: ../calendar/gui/e-memo-table.etspec.h:6
+#: ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:22
+#: ../plugins/save-calendar/csv-format.c:357
+msgid "Summary"
+msgstr "Crynodeb"
+
+#: ../calendar/gui/caltypes.xml.h:18
+#: ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:23
+#, fuzzy
+msgid "Summary Contains"
+msgstr "Crynodeb yn cynnwys"
+
+#: ../calendar/gui/caltypes.xml.h:19
+#: ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:25
+#: ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "cynnwys"
+
+#: ../calendar/gui/caltypes.xml.h:20
+#: ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:26
+#: ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "Ddim yn cynnwys"
+
+#: ../calendar/gui/caltypes.xml.h:21
+#: ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:27
+#: ../mail/em-filter-i18n.h:31
+msgid "is"
+msgstr "yn"
+
+#: ../calendar/gui/caltypes.xml.h:22
+#: ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30
+#: ../mail/em-filter-i18n.h:37
+msgid "is not"
+msgstr "ddim yn"
+
+#: ../calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
 msgstr "Gwall wrth agor y calendr"
 
-#: ../calendar/gui/comp-editor-factory.c:421
+#: ../calendar/gui/comp-editor-factory.c:414
 msgid "Method not supported when opening the calendar"
 msgstr "Dull heb ei gynnal wrth agor y calendr"
 
-#: ../calendar/gui/comp-editor-factory.c:427
+#: ../calendar/gui/comp-editor-factory.c:420
 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:1274
+#: ../calendar/gui/comp-editor-factory.c:438
+#: ../plugins/mail-to-task/mail-to-task.c:455
+#: ../shell/e-shell.c:1261
 msgid "Unknown error"
 msgstr "Gwall anhysbys"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:615
+#: ../calendar/gui/dialogs/alarm-dialog.c:611
 msgid "Edit Alarm"
 msgstr "Golygu Larwm"
 
+#: ../calendar/gui/dialogs/alarm-dialog.c:796
+#: ../calendar/gui/e-alarm-list.c:448
+msgid "Pop up an alert"
+msgstr "Dangos rhybudd mewn naidlen"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:797
+#: ../calendar/gui/e-alarm-list.c:444
+msgid "Play a sound"
+msgstr "Chwarae sain"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:798
+#: ../calendar/gui/e-alarm-list.c:456
+msgid "Run a program"
+msgstr "Gweithredu rhaglen"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:799
+#: ../calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
+msgstr "Anfon e-bost"
+
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
 msgid "<b>Alarm</b>"
 msgstr "<b>Larwm</b>"
@@ -5437,85 +4288,67 @@ msgid "Mes_sage:"
 msgstr "_Neges:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:446
-msgid "Play a sound"
-msgstr "Chwarae sain"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:450
-msgid "Pop up an alert"
-msgstr "Dangos rhybudd mewn naidlen"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:458
-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
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
 msgid "Send To:"
 msgstr "Anfon at:"
 
-#: ../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:14
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
 msgid "_Arguments:"
 msgstr "_Ymresymiadau:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "_Program:"
 msgstr "_Rhaglen:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
 msgid "_Repeat the alarm"
 msgstr "_Ail-adrodd y larwm"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
 msgid "_Sound:"
 msgstr "_Sain:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
-msgid "after"
-msgstr "wedi"
-
-#: ../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:20
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "day(s)"
-msgstr "dydd(iau)"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
-msgid "end of appointment"
-msgstr "diwedd yr apwyntiad"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+msgid ""
+"before\n"
+"after"
+msgstr ""
+"cyn\n"
+"wedyn"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 msgid "extra times every"
 msgstr "amserau ychwanegol bob"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-msgid "hour(s)"
-msgstr "awr/oriau"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+msgid ""
+"minute(s)\n"
+"hour(s)\n"
+"day(s)"
+msgstr ""
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-msgid "minute(s)"
-msgstr "munud(au)"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
+#, fuzzy
+msgid ""
+"minutes\n"
+"hours\n"
+"days"
+msgstr ""
+"Munudau\n"
+"Oriau\n"
+"Diwrnodau"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:28
-msgid "start of appointment"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+#, fuzzy
+msgid ""
+"start of appointment\n"
+"end of appointment"
 msgstr "dechrau'r apwyntiad"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:235
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
 msgstr "Gweithred/Sbardun"
 
@@ -5524,28 +4357,56 @@ msgid "A_dd"
 msgstr "_Ychwanegu"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 #: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "Larymau"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:97
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:116
-#: ../composer/e-msg-composer-select-file.c:98
-#: ../composer/e-msg-composer-select-file.c:118
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:80
+#: ../widgets/misc/e-attachment-dialog.c:371
+#: ../widgets/misc/e-attachment-store.c:553
 msgid "_Suggest automatic display of attachment"
 msgstr "_Awgrymu dangos atodiadau'n awtomatig"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:141
 msgid "Attach file(s)"
 msgstr "Atodi ffeil(iau)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:479
+#. an empty string is the same as 'None'
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:135
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:184
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/event-page.c:2959
+#: ../calendar/gui/e-cal-model-tasks.c:671
+#: ../calendar/gui/e-day-view-time-item.c:785
+#: ../calendar/gui/e-itip-control.c:1150
+#: ../filter/filter-rule.c:942
+#: ../mail/em-account-editor.c:706
+#: ../mail/em-account-editor.c:1435
+#: ../mail/em-account-prefs.c:435
+#: ../mail/em-junk-hook.c:93
+#: ../plugins/calendar-weather/calendar-weather.c:333
+#: ../plugins/calendar-weather/calendar-weather.c:387
+#: ../plugins/email-custom-header/email-custom-header.c:394
+#: ../plugins/exchange-operations/exchange-delegates-user.c:179
+#: ../plugins/itip-formatter/itip-formatter.c:2208
+#: ../widgets/misc/e-cell-date-edit.c:312
+#: ../widgets/misc/e-dateedit.c:1463
+#: ../widgets/misc/e-dateedit.c:1674
+#: ../widgets/misc/e-signature-combo-box.c:74
+msgid "None"
+msgstr "Dim"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:647
 msgid "Selected Calendars for Alarms"
 msgstr "Calendrau a ddewiswyd ar gyfer Larymau"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#, fuzzy
+msgid "(Shown in a Day View)"
+msgstr "Dangos maes mewn Golwg"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid ""
 "60 minutes\n"
 "30 minutes\n"
@@ -5559,60 +4420,63 @@ msgstr ""
 "10 munud\n"
 "05 munud"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 #, no-c-format
-msgid ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
-msgstr ""
-"<i>Caiff %u a %d eu hamnewid gan ddefnyddiwr a pharth-enw o'r cyfeiriad e-"
-"bost.</i>"
+msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgstr "<i>Caiff %u a %d eu hamnewid gan ddefnyddiwr a pharth-enw o'r cyfeiriad e-bost.</i>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: ../mail/mail-config.glade.h:7
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<span weight=\"bold\">Alarms</span>"
+msgstr "<span weight=\"bold\">Rhybuddion</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Rhybuddion</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 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:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../mail/mail-config.glade.h:17
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Cyffredinol</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "<span weight=\"bold\">Task List</span>"
 msgstr "<span weight=\"bold\">Rhestr Dasgau</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "<span weight=\"bold\">Time</span>"
 msgstr "<span weight=\"bold\">Amser</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">Wythnos Waith</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Adjust for daylight sa_ving time"
-msgstr "Addasu ar gyfer amser _arbed golau dydd"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Day _ends:"
 msgstr "Dydd yn _gorffen:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Display"
 msgstr "Dangos"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1091
-#: ../calendar/gui/e-itip-control.c:730
+#, fuzzy
+msgid "Display alarms in _notification area only"
+msgstr "Gweld larymau dangos yn y gilfach hysbysu"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/recurrence-page.c:1107
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Friday"
 msgstr "Dydd Gwener"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5622,13 +4486,13 @@ msgstr ""
 "Oriau\n"
 "Diwrnodau"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
-#: ../calendar/gui/e-itip-control.c:726
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: ../calendar/gui/dialogs/recurrence-page.c:1103
+#: ../calendar/gui/e-itip-control.c:727
 msgid "Monday"
 msgstr "Dydd Llun"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5646,465 +4510,597 @@ msgstr ""
 "Sadwrn\n"
 "Sul"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:105
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../mail/mail-config.glade.h:118
 msgid "Pick a color"
 msgstr "Dewiswch liw"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "S_un"
 msgstr "S_ul"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1092
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/recurrence-page.c:1108
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Saturday"
 msgstr "Dydd Sadwrn"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+msgid "Sc_roll Month View by a week"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#, fuzzy
+msgid "Se_cond zone:"
+msgstr "Anfon at:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Select the calendars for alarm notification"
 msgstr "Dewis y calendrau ar gyfer hysbysiad larwm"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Sh_ow a reminder"
 msgstr "Dangos _Atgof"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#, fuzzy
+msgid "Show a _reminder"
+msgstr "Dangos _Atgof"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 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:1093
-#: ../calendar/gui/e-itip-control.c:725
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "Show week n_umber in Day and Work Week View"
+msgstr "Dangos rhifau wythnos yn y llywiwr dyddiadau"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/recurrence-page.c:1109
+#: ../calendar/gui/e-itip-control.c:726
 msgid "Sunday"
 msgstr "Dydd Sul"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "T_asks due today:"
 msgstr "_Tasgau i fod i ddod i ben heddiw:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "T_hu"
 msgstr "_Iau"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "Template:"
 msgstr "Templed:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/recurrence-page.c:1106
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Thursday"
 msgstr "Dydd Iau"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Time _zone:"
 msgstr "_Cylchfa amser:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "Time format:"
 msgstr "Fformat amser:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
-#: ../calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/recurrence-page.c:1104
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Tuesday"
 msgstr "Dydd Mawrth"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+msgid "Use s_ystem time zone"
+msgstr "Defnyddio cyrchfa amser y s_ystem"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/recurrence-page.c:1105
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Wednesday"
 msgstr "Dydd Mercher"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "Wee_k starts on:"
 msgstr "_Wythnos yn cychwyn:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "Work days:"
 msgstr "Dyddiau gwaith:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_12 hour (AM/PM)"
 msgstr "_12 awr (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_24 hour"
 msgstr "_24 awr"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Gofyn am gadarnhad wrth ddileu eitemau"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Compress weekends in month view"
 msgstr "_Cywasgu wythnosau yn yr olwg mis"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Day begins:"
 msgstr "_Dydd yn cychwyn:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
 msgid "_Fri"
 msgstr "_Gwe"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Hide completed tasks after"
 msgstr "_Cuddio tasgau gorffenedig ar ôl"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
 msgid "_Mon"
 msgstr "_Llu"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
 msgid "_Overdue tasks:"
 msgstr "_Tasgau sy'n hwyr:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:74
 msgid "_Sat"
 msgstr "_Sad"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
 msgid "_Show appointment end times in week and month view"
 msgstr "_Dangos amserau diwedd apwyntiad yn y golygon wythnos a mis"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
 msgid "_Time divisions:"
 msgstr "_Rhaniadau amser:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:78
 msgid "_Tue"
 msgstr "_Maw"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:80
 msgid "_Wed"
 msgstr "_Mer"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:82
+msgid "before every anniversary/birthday"
+msgstr "cyd pob dathliad/penblwydd"
+
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:84
 msgid "before every appointment"
 msgstr "cyn bob apwyntiad"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:268
+#: ../calendar/gui/dialogs/calendar-setup.c:153
+msgid "Type:"
+msgstr "Math:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:270
 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:270
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 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:272
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 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:342
-msgid "C_olor:"
+#: ../calendar/gui/dialogs/calendar-setup.c:344
+msgid "Colo_r:"
 msgstr "_Lliw:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:377
+#: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
 msgstr "Rhestr Dasgau"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:388
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "Rhestr Femos"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "Calendar Properties"
 msgstr "Priodweddau Calendr"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:479
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "New Calendar"
 msgstr "Calendr Newydd"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:564
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "Task List Properties"
 msgstr "Enw Rhestr Dasgau"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:630
+#: ../calendar/gui/dialogs/calendar-setup.c:531
+msgid "New Task List"
+msgstr "Rhestr Tasgau Newydd"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:587
+#, fuzzy
+msgid "Memo List Properties"
+msgstr "Enw Rhestr Dasgau"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "New Memo List"
 msgstr "Rhestr Femo Newydd"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "Mae'r digwyddiad hwn wedi ei ddileu."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "Mae'r dasg hon wedi ei dileu."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
-msgid "This journal entry has been deleted."
-msgstr "Mae'r cofnod dyddlyfr wedi ei ddileu."
+#: ../calendar/gui/dialogs/changed-comp.c:67
+msgid "This memo has been deleted."
+msgstr "Mae'r memo hwn wedi ei ddileu."
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
-msgstr ""
-"%s  Rydych chi wedi gwneud newidiadau. Hepgor y newidiadau hynny a chau'r "
-"golygydd?"
+msgstr "%s  Rydych chi wedi gwneud newidiadau. Hepgor y newidiadau hynny a chau'r golygydd?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s Dydych chi ddim wedi gwneud unrhyw newidiadau. Cau'r golygydd?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "Mae'r digwyddiad hwn wedi ei newid."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "Mae'r dasg hon wedi ei newid."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
-msgid "This journal entry has been changed."
-msgstr "Mae'r cofnod dyddlyfr wedi cael ei newid."
+#: ../calendar/gui/dialogs/changed-comp.c:91
+msgid "This memo has been changed."
+msgstr "Mae'r memo hwn wedi ei newid."
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr ""
-"%s  Rydych chi wedi gwneud newidiadau. Hepgor y newidiadau hynny a "
-"diweddaru'r golygydd?"
+msgstr "%s  Rydych chi wedi gwneud newidiadau. Hepgor y newidiadau hynny a diweddaru'r golygydd?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
-msgstr ""
-"%s Dydych chi ddim wedi gwneud unrhyw newidiadau. Diweddaru'r golygydd?"
+msgstr "%s Dydych chi ddim wedi gwneud unrhyw newidiadau. Diweddaru'r golygydd?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:519
+#: ../calendar/gui/dialogs/comp-editor-page.c:448
 #, c-format
 msgid "Validation error: %s"
 msgstr "Gwall dilysu: %s"
 
 # TRWSIO
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2179
+#: ../calendar/gui/dialogs/comp-editor-util.c:188
+#: ../calendar/gui/print.c:2349
 msgid " to "
 msgstr " i"
 
 # TRWSIO
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2183
+#: ../calendar/gui/dialogs/comp-editor-util.c:192
+#: ../calendar/gui/print.c:2353
 msgid " (Completed "
 msgstr " (Cyflawnwyd "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2185
+#: ../calendar/gui/dialogs/comp-editor-util.c:194
+#: ../calendar/gui/print.c:2355
 msgid "Completed "
 msgstr "Cyflawnwyd"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2190
+#: ../calendar/gui/dialogs/comp-editor-util.c:199
+#: ../calendar/gui/print.c:2360
 msgid " (Due "
 msgstr " (Amser Disgwyl "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2192
+#: ../calendar/gui/dialogs/comp-editor-util.c:201
+#: ../calendar/gui/print.c:2362
 msgid "Due "
 msgstr "Amser Disgwyl "
 
-#: ../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"
+#: ../calendar/gui/dialogs/comp-editor.c:221
+msgid "Could not save attachments"
+msgstr "Methu cadw atodiadau"
 
-#. translators, this count will always be >1
-#: ../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"
-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: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: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:824
+#: ../calendar/gui/dialogs/comp-editor.c:483
 msgid "Could not update object"
 msgstr "Methwyd diweddaru'r gwrthrych"
 
-#: ../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"
-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:1000
-msgid "Hide Attachment _Bar"
-msgstr "_Cuddio'r Bar Atodiadau"
-
-#: ../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: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: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:1125
-#: ../composer/e-msg-composer.c:3688
-msgid "_Add attachment..."
-msgstr "Ychwanegu _atodiad..."
-
-#: ../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:1557
-msgid "Press space key to toggle attachment bar"
-msgstr "Gwasgwch y bylchwr i doglu'r bar atodiadau"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2164
-#: ../calendar/gui/dialogs/comp-editor.c:2207
+#: ../calendar/gui/dialogs/comp-editor.c:572
 msgid "Edit Appointment"
 msgstr "Golygu Apwyntiad"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2170
-#: ../calendar/gui/dialogs/comp-editor.c:2213
+#: ../calendar/gui/dialogs/comp-editor.c:579
 #, c-format
 msgid "Meeting - %s"
 msgstr "Cyfarfod - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2172
-#: ../calendar/gui/dialogs/comp-editor.c:2215
+#: ../calendar/gui/dialogs/comp-editor.c:581
 #, c-format
 msgid "Appointment - %s"
 msgstr "Apwyntiad - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2176
-#: ../calendar/gui/dialogs/comp-editor.c:2219
+#: ../calendar/gui/dialogs/comp-editor.c:587
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tasg wedi Neilltuo - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2178
-#: ../calendar/gui/dialogs/comp-editor.c:2221
+#: ../calendar/gui/dialogs/comp-editor.c:589
 #, c-format
 msgid "Task - %s"
 msgstr "Tasg - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2181
-#: ../calendar/gui/dialogs/comp-editor.c:2224
+#: ../calendar/gui/dialogs/comp-editor.c:594
 #, c-format
-msgid "Journal entry - %s"
-msgstr "Cofnod dyddlyfr - %s"
+msgid "Memo - %s"
+msgstr "Memo - %s"
 
-#: ../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:610
+msgid "No Summary"
+msgstr "Dim Crynodeb"
 
-#: ../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:752
+msgid "Keep original item?"
+msgstr "Cadw eitem gwreiddiol?"
+
+#: ../calendar/gui/dialogs/comp-editor.c:958
+msgid "Click here to close the current window"
+msgstr "Cliciwch yma i gau'r ffenest bresennol"
+
+#: ../calendar/gui/dialogs/comp-editor.c:965
+msgid "Copy selected text to the clipboard"
+msgstr "Copïo'r testun a ddewiswyd i'r clipfwrdd"
+
+#: ../calendar/gui/dialogs/comp-editor.c:972
+msgid "Cut selected text to the clipboard"
+msgstr "Torri'r testun a ddewiswyd i'r clipfwrdd"
+
+#: ../calendar/gui/dialogs/comp-editor.c:979
+msgid "Click here to view help available"
+msgstr "Cliciwch yma i weld yr help sydd ar gael"
+
+#: ../calendar/gui/dialogs/comp-editor.c:986
+msgid "Paste text from the clipboard"
+msgstr "Gludo'r testun sydd ar y clipfwrdd"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1007
+msgid "Click here to save the current window"
+msgstr "Cliciwch yma i gadw'r ffenest bresennol"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1014
+msgid "Select all text"
+msgstr "Dewis y holl destun"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1021
+msgid "_Classification"
+msgstr "_Dosbarthiad"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1035
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution.xml.h:43
+msgid "_File"
+msgstr "_Ffeil"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1042
+#: ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr "_Cymorth"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1049
+msgid "_Insert"
+msgstr "_Mewnosod"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1056
+msgid "_Options"
+msgstr "_Opsiynau"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1063
+#: ../mail/em-folder-tree.c:2106
+#: ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8
+#: ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:55
+msgid "_View"
+msgstr "_Golwg"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1073
+#: ../composer/e-composer-actions.c:315
+msgid "_Attachment..."
+msgstr "_Atodiad..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1075
+msgid "Click here to attach a file"
+msgstr "Cliciwch yma er mwyn atodi ffeil"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1083
+msgid "_Categories"
+msgstr "_Categorïau"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1085
+msgid "Toggles whether to display categories"
+msgstr "Toglu p'un ai i ddangos categorïau ai peidio"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1091
+msgid "Time _Zone"
+msgstr "_Cylchfa Amser"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1093
+msgid "Toggles whether the time zone is displayed"
+msgstr "Toglu a yw'r gylchfa amser wedi ei dangos"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1102
+msgid "Pu_blic"
+msgstr "_Cyhoeddus"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2869
-#: ../calendar/gui/dialogs/comp-editor.c:2923
-#: ../calendar/gui/dialogs/comp-editor.c:2947
+#: ../calendar/gui/dialogs/comp-editor.c:1104
+msgid "Classify as public"
+msgstr "Categoreiddio yn eitem gyhoeddus"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1109
+msgid "_Private"
+msgstr "_Preifat"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1111
+#, fuzzy
+msgid "Classify as private"
+msgstr "Categoreiddio yn eitem breifat"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1116
+msgid "_Confidential"
+msgstr "_Cyfrinachol"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1118
+#, fuzzy
+msgid "Classify as confidential"
+msgstr "Categoreiddio'n Gyfrinachol"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1126
+msgid "R_ole Field"
+msgstr "Maes _Rôl"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1128
+msgid "Toggles whether the Role field is displayed"
+msgstr "Toglu a yw'r maes Rôl wedi ei ddangos"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1134
+msgid "_RSVP"
+msgstr "_RSVP"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1136
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Toglu a yw'r maes RSVP wedi ei ddangos"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1142
+msgid "_Status Field"
+msgstr "_Maes Statws"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1144
+msgid "Toggles whether the Status field is displayed"
+msgstr "Toglu a yw'r maes Statws wedi ei ddangos"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1150
+msgid "_Type Field"
+msgstr "_Maes Math"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1152
+#, fuzzy
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "Toglu a yw'r maes Math Mynychwr wedi ei ddangos"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1176
+#: ../composer/e-composer-private.c:66
+msgid "Recent _Documents"
+msgstr "_Dogfennau Diweddar"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1602
+#: ../composer/e-composer-actions.c:518
+msgid "Attach"
+msgstr "Atodi"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1864
+#: ../calendar/gui/dialogs/comp-editor.c:1913
+#: ../calendar/gui/dialogs/comp-editor.c:2760
 msgid "Changes made to this item may be discarded if an update arrives"
-msgstr ""
-"Efallai bydd y newidiadau wnaed i'r eitem yn cael eu tynnu os wnaiff "
-"diweddariad gyrraedd"
+msgstr "Efallai bydd y newidiadau wnaed i'r eitem yn cael eu tynnu os wnaiff diweddariad gyrraedd"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2729
+#: ../mail/em-utils.c:371
+#: ../plugins/prefer-plain/prefer-plain.c:91
+msgid "attachment"
+msgstr "atodiad"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2976
+#: ../calendar/gui/dialogs/comp-editor.c:2789
 msgid "Unable to use current version!"
 msgstr "Ni ellir defnyddio'r fersiwn cyfredol!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:64
 msgid "Could not open source"
 msgstr "Methwyd agor y ffynhonnell"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:72
 msgid "Could not open destination"
 msgstr "Methwyd agor y cyrchfan"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:81
 msgid "Destination is read only"
 msgstr "Cyrchfan darllen-yn-unig"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
+#: ../calendar/gui/dialogs/delete-comp.c:205
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_Dileu'r eitem hon o flychau e-bost bob derbyniwr arall?"
 
-#: ../calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The event could not be deleted due to a corba error"
 msgstr "Methwyd dileu'r digwyddiad oherwydd gwall corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The task could not be deleted due to a corba error"
 msgstr "Methwyd dileu'r dasg oherwydd gwall corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:60
-msgid "The journal entry could not be deleted due to a corba error"
-msgstr "Methwyd dileu'r cofnod dyddlyfr oherwydd gwall corba"
+#: ../calendar/gui/dialogs/delete-error.c:61
+#, fuzzy
+msgid "The memo could not be deleted due to a corba error"
+msgstr "Methwyd dileu'r eitem oherwydd gwall corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:64
 msgid "The item could not be deleted due to a corba error"
 msgstr "Methwyd dileu'r eitem oherwydd gwall corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The event could not be deleted because permission was denied"
 msgstr "Methwyd dileu'r digwyddiad oherwydd gwrthodwyd caniatâd"
 
-#: ../calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The task could not be deleted because permission was denied"
 msgstr "Methwyd dileu'r dasg oherwydd gwrthodwyd caniatâd"
 
-#: ../calendar/gui/dialogs/delete-error.c:76
-msgid "The journal entry could not be deleted because permission was denied"
-msgstr "Methwyd dileu'r cofnod dyddlyfr oherwydd gwrthodwyd caniatâd"
+#: ../calendar/gui/dialogs/delete-error.c:77
+#, fuzzy
+msgid "The memo could not be deleted because permission was denied"
+msgstr "Methwyd dileu'r eitem oherwydd gwrthodwyd caniatâd"
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:80
 msgid "The item could not be deleted because permission was denied"
 msgstr "Methwyd dileu'r eitem oherwydd gwrthodwyd caniatâd"
 
-#: ../calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The event could not be deleted due to an error"
 msgstr "Methwyd dileu'r digwyddiad oherwydd gwall"
 
-#: ../calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The task could not be deleted due to an error"
 msgstr "Methwyd dileu'r dasg oherwydd gwall"
 
-#: ../calendar/gui/dialogs/delete-error.c:92
-msgid "The journal entry could not be deleted due to an error"
-msgstr "Methwyd dileu'r cofnod dyddlyfr oherwydd gwall"
+#: ../calendar/gui/dialogs/delete-error.c:93
+#, fuzzy
+msgid "The memo could not be deleted due to an error"
+msgstr "Methwyd dileu eitem oherwydd gwall"
 
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:96
 msgid "The item could not be deleted due to an error"
 msgstr "Methwyd dileu eitem oherwydd gwall"
 
@@ -6113,7 +5109,7 @@ msgid "Contacts..."
 msgstr "Cysylltiadau..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:416
 msgid "Delegate To:"
 msgstr "Dirprwyo at:"
 
@@ -6121,90 +5117,151 @@ msgstr "Dirprwyo at:"
 msgid "Enter Delegate"
 msgstr "Rhowch ddirprwy"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:202
+msgid "_Alarms"
+msgstr "_Larymau"
+
+#: ../calendar/gui/dialogs/event-editor.c:204
+msgid "Click here to set or unset alarms for this event"
+msgstr "Cliciwch yma i osod neu ddadosod larymau ar gyfer y digwyddiad"
+
+#: ../calendar/gui/dialogs/event-editor.c:209
+msgid "_Recurrence"
+msgstr "_Ail-ddigwyddiad"
+
+#: ../calendar/gui/dialogs/event-editor.c:211
+msgid "Make this a recurring event"
+msgstr "Gwneud hyn yn ddigwyddiad sy'n ail-ddigwydd"
+
+#: ../calendar/gui/dialogs/event-editor.c:216
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../plugins/groupwise-features/send-options.c:212
+#: ../widgets/misc/e-send-options.glade.h:18
+msgid "Send Options"
+msgstr "Opsiynau Anfon"
+
+#: ../calendar/gui/dialogs/event-editor.c:218
+#: ../calendar/gui/dialogs/task-editor.c:125
+msgid "Insert advanced send options"
+msgstr "Mewnosod opsiynau anfon uwch"
+
+#: ../calendar/gui/dialogs/event-editor.c:226
+msgid "All _Day Event"
+msgstr "_Digwyddiad drwy'r dydd"
+
+#: ../calendar/gui/dialogs/event-editor.c:228
+msgid "Toggles whether to have All Day Event"
+msgstr "Toglu p'un ai i gael Digwyddiad Drwy'r Dydd"
+
+#: ../calendar/gui/dialogs/event-editor.c:234
+#, fuzzy
+msgid "Show Time as _Busy"
+msgstr "Dangos yr amser fel _prysur"
+
+#: ../calendar/gui/dialogs/event-editor.c:236
+msgid "Toggles whether to show time as busy"
+msgstr "Toglu p'un ai i ddangos yr amser yn brysur"
+
+#: ../calendar/gui/dialogs/event-editor.c:245
+msgid "_Free/Busy"
+msgstr "_Rhydd/Prysur"
+
+#: ../calendar/gui/dialogs/event-editor.c:247
+msgid "Query free / busy information for the attendees"
+msgstr "Ymholi Gwybodaeth Statws Rhydd/Prysur ar gyfer y mynychwyr"
+
+#: ../calendar/gui/dialogs/event-editor.c:301
 msgid "Appoint_ment"
 msgstr "_Apwyntiad"
 
-#: ../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:814
-#: ../calendar/gui/dialogs/event-page.c:2721
+#: ../calendar/gui/dialogs/event-page.c:749
+#: ../calendar/gui/dialogs/event-page.c:2735
 msgid "This event has alarms"
 msgstr "Mae gan yr apwyntiad larymau"
 
-#: ../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/event-page.c:812
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
-#: ../calendar/gui/dialogs/task-page.c:441
 msgid "Or_ganizer:"
 msgstr "_Trefnydd:"
 
-#: ../calendar/gui/dialogs/event-page.c:924
+#: ../calendar/gui/dialogs/event-page.c:859
 msgid "_Delegatees"
 msgstr "_Cynrychiolwyr"
 
-#: ../calendar/gui/dialogs/event-page.c:926
+#: ../calendar/gui/dialogs/event-page.c:861
 msgid "Atte_ndees"
 msgstr "_Mynychwyr"
 
-#: ../calendar/gui/dialogs/event-page.c:1091
+#: ../calendar/gui/dialogs/event-page.c:1046
 msgid "Event with no start date"
 msgstr "Digwyddiad heb amser cychwyn"
 
-#: ../calendar/gui/dialogs/event-page.c:1094
+#: ../calendar/gui/dialogs/event-page.c:1049
 msgid "Event with no end date"
 msgstr "Digwyddiad heb amser gorffen"
 
-#: ../calendar/gui/dialogs/event-page.c:1263
-#: ../calendar/gui/dialogs/memo-page.c:685
-#: ../calendar/gui/dialogs/task-page.c:849
+#: ../calendar/gui/dialogs/event-page.c:1218
+#: ../calendar/gui/dialogs/memo-page.c:639
+#: ../calendar/gui/dialogs/task-page.c:814
 msgid "Start date is wrong"
 msgstr "Dyddiad cychwyn yn anghywir"
 
-#: ../calendar/gui/dialogs/event-page.c:1273
+#: ../calendar/gui/dialogs/event-page.c:1228
 msgid "End date is wrong"
 msgstr "Dyddiad gorffen yn anghywir"
 
-#: ../calendar/gui/dialogs/event-page.c:1296
+#: ../calendar/gui/dialogs/event-page.c:1251
 msgid "Start time is wrong"
 msgstr "Amser cychwyn yn anghywir"
 
-#: ../calendar/gui/dialogs/event-page.c:1303
+#: ../calendar/gui/dialogs/event-page.c:1258
 msgid "End time is wrong"
 msgstr "Amser gorffen yn anghywir"
 
-#: ../calendar/gui/dialogs/event-page.c:1460
-#: ../calendar/gui/dialogs/memo-page.c:720
-#: ../calendar/gui/dialogs/task-page.c:906
+#: ../calendar/gui/dialogs/event-page.c:1420
+#: ../calendar/gui/dialogs/memo-page.c:680
+#: ../calendar/gui/dialogs/task-page.c:874
 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:1466
-#: ../calendar/gui/dialogs/memo-page.c:726
-#: ../calendar/gui/dialogs/task-page.c:912
+#: ../calendar/gui/dialogs/event-page.c:1426
+#: ../calendar/gui/dialogs/memo-page.c:686
+#: ../calendar/gui/dialogs/task-page.c:880
 msgid "An organizer is required."
 msgstr "Mae gofyn am drefnydd."
 
-#: ../calendar/gui/dialogs/event-page.c:1481
-#: ../calendar/gui/dialogs/task-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:1451
+#: ../calendar/gui/dialogs/task-page.c:904
 msgid "At least one attendee is required."
 msgstr "Mae eisiau un neu fwy o'r mynychwyr."
 
-#: ../calendar/gui/dialogs/event-page.c:1903
+#: ../calendar/gui/dialogs/event-page.c:1890
 #: ../calendar/gui/dialogs/task-page.c:1200
+#: ../plugins/groupwise-features/junk-settings.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:21
+msgid "_Remove"
+msgstr "_Tynnu"
+
+#: ../calendar/gui/dialogs/event-page.c:1891
+#: ../calendar/gui/dialogs/task-page.c:1201
 msgid "_Add "
 msgstr "_Ychwanegu"
 
-#: ../calendar/gui/dialogs/event-page.c:2628
+#: ../calendar/gui/dialogs/event-page.c:2611
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Ni ellir agor y calendr '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:2934
+#: ../calendar/gui/dialogs/event-page.c:2655
+#: ../calendar/gui/dialogs/memo-page.c:895
+#: ../calendar/gui/dialogs/task-page.c:1806
+#, c-format
+msgid "You are acting on behalf of %s"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:2933
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -6212,7 +5269,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:2940
+#: ../calendar/gui/dialogs/event-page.c:2939
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -6220,7 +5277,7 @@ 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:2946
+#: ../calendar/gui/dialogs/event-page.c:2945
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
@@ -6228,121 +5285,99 @@ 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:2959
+#: ../calendar/gui/dialogs/event-page.c:2958
 msgid "Customize"
 msgstr "Addasu"
 
-#. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2964
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../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: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"
-
 #: ../calendar/gui/dialogs/event-page.glade.h:1
-msgid "1 day before appointment"
-msgstr "1 dydd cyn yr apwyntiad"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:2
-msgid "1 hour before appointment"
-msgstr "1 awr cyn yr apwyntiad"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:3
-msgid "15 minutes before appointment"
-msgstr "15 munud cyn apwyntiad"
+msgid ""
+"15 minutes before appointment\n"
+"1 hour before appointment\n"
+"1 day before appointment"
+msgstr ""
+"15 munud cyn apwyntiad\n"
+"1 awr cyn apwyntiad\n"
+"1 diwrnod cyn apwyntiad"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
 msgid "Attendee_s..."
 msgstr "_Mynychwyr..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:6
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
-msgid "Ca_tegories..."
-msgstr "_Categorïau..."
-
 #: ../calendar/gui/dialogs/event-page.glade.h:8
 msgid "Custom Alarm:"
 msgstr "Larwm Addasedig:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-msgid "D_escription:"
-msgstr "_Disgrifiad:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "Disgrifiad Digwyddiad"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/memo-page.glade.h:4
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "_Crynodeb:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "_Alarm"
 msgstr "_Larwm"
 
+#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/memo-page.glade.h:6
+#: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../widgets/misc/e-attachment-dialog.c:345
+msgid "_Description:"
+msgstr "_Disgrifiad:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:16
+#: ../plugins/calendar-weather/calendar-weather.c:372
+#: ../plugins/exchange-operations/exchange-calendar.c:247
+#: ../plugins/exchange-operations/exchange-contacts.c:239
+msgid "_Location:"
+msgstr "_Lleoliad:"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "_Amser:"
 
-#. 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/event-page.glade.h:18
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:16
-msgid "for"
-msgstr "ar gyfer"
+#: ../calendar/gui/dialogs/memo-page.glade.h:8
+#: ../calendar/gui/dialogs/task-page.glade.h:10
+#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-dialogs.glade.h:21
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:5
+#: ../smime/gui/smime-ui.glade.h:49
+msgid ""
+"a\n"
+"b"
+msgstr ""
+"a\n"
+"b"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][until][2006/01/01]' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/event-page.glade.h:21
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:25
-msgid "until"
+#: ../calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid ""
+"for\n"
+"until"
 msgstr "hyd"
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:1
-msgid "<b>Att_endees</b>"
-msgstr "<b>_Mynychwyr</b>"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "C_hange Organizer"
-msgstr "_Newid Trefnydd"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Co_ntacts..."
-msgstr "C_ysylltiadau..."
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "Trefnydd"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
-msgid "Organizer:"
-msgstr "Trefnydd:"
-
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2287
+#: ../calendar/gui/dialogs/memo-editor.c:111
+#: ../calendar/gui/print.c:2469
 msgid "Memo"
 msgstr "Memo"
 
-#: ../calendar/gui/dialogs/memo-page.c:868
+#: ../calendar/gui/dialogs/memo-page.c:856
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Methu agor memos o fewn '%s'."
 
-#: ../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
+#: ../calendar/gui/dialogs/memo-page.c:1011
+#: ../mail/em-format-html.c:1565
+#: ../mail/em-format-html.c:1623
+#: ../mail/em-format-html.c:1648
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:925
+#: ../mail/em-mailer-prefs.c:77
+#: ../mail/message-list.etspec.h:20
 msgid "To"
 msgstr "I"
 
@@ -6355,65 +5390,63 @@ msgstr "Dyddiad c_ychwyn:"
 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.c:365
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Grŵp"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:53
+#, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
-msgstr ""
-"Rydych chi'n newid digwyddiad sy'n ail-ddigwydd. Beth hoffech chi newid?"
+msgstr "Rydych chi'n newid digwyddiad sy'n ail-ddigwydd. Beth hoffech chi newid?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:55
+#, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
-msgstr ""
-"Rydych chi'n dirprwyo digwyddiad sy'n ail-ddigwydd. Beth hoffech chi ei "
-"ddirprwyo?"
+msgstr "Rydych chi'n dirprwyo digwyddiad sy'n ail-ddigwydd. Beth hoffech chi ei ddirprwyo?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:58
+#: ../calendar/gui/dialogs/recur-comp.c:59
+#, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Rydych chi'n newid tasg sy'n ail-ddigwydd. Beth hoffech chi newid?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:62
-msgid ""
-"You are modifying a recurring journal entry. What would you like to modify?"
-msgstr ""
-"Rydych chi'n newid cofnod dyddlyfr sy'n ailddigwydd. Beth hoffech chi newid?"
+#: ../calendar/gui/dialogs/recur-comp.c:63
+#, fuzzy, c-format
+msgid "You are modifying a recurring memo. What would you like to modify?"
+msgstr "Rydych chi'n newid digwyddiad sy'n ail-ddigwydd. Beth hoffech chi newid?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:90
+#: ../calendar/gui/dialogs/recur-comp.c:87
 msgid "This Instance Only"
 msgstr "Enghreifftiau hyn yn unig"
 
-#: ../calendar/gui/dialogs/recur-comp.c:94
+#: ../calendar/gui/dialogs/recur-comp.c:91
 msgid "This and Prior Instances"
 msgstr "Hwn ac Enghreifftiau Cynt"
 
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:97
 msgid "This and Future Instances"
 msgstr "Hwn ac Enghreifftiau Dyfodol"
 
-#: ../calendar/gui/dialogs/recur-comp.c:105
+#: ../calendar/gui/dialogs/recur-comp.c:102
 msgid "All Instances"
 msgstr "Pob Enghraifft"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:498
+#: ../calendar/gui/dialogs/recurrence-page.c:559
 msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-"Mae'r apwyntiad yn cynnwys ail-ddigwyddiadau na all Evolution eu newid."
+msgstr "Mae'r apwyntiad yn cynnwys ail-ddigwyddiadau na all Evolution eu newid."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:819
+#: ../calendar/gui/dialogs/recurrence-page.c:888
 msgid "Recurrence date is invalid"
 msgstr "Dyddiad ail-ddigwydd yn annilys"
 
+#: ../calendar/gui/dialogs/recurrence-page.c:928
+msgid "End time of the recurrence was before event's start"
+msgstr ""
+
 #. 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:932
+#: ../calendar/gui/dialogs/recurrence-page.c:957
 msgid "on"
 msgstr "ar"
 
@@ -6421,7 +5454,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:996
+#: ../calendar/gui/dialogs/recurrence-page.c:1014
 msgid "first"
 msgstr "cyntaf"
 
@@ -6430,7 +5463,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:1002
+#: ../calendar/gui/dialogs/recurrence-page.c:1020
 msgid "second"
 msgstr "ail"
 
@@ -6438,7 +5471,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:1007
+#: ../calendar/gui/dialogs/recurrence-page.c:1025
 msgid "third"
 msgstr "trydydd"
 
@@ -6446,7 +5479,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:1012
+#: ../calendar/gui/dialogs/recurrence-page.c:1030
 msgid "fourth"
 msgstr "pedwerydd"
 
@@ -6454,13 +5487,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:1017
+#: ../calendar/gui/dialogs/recurrence-page.c:1035
 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:1043
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 msgid "Other Date"
 msgstr "Dyddiad Arall"
 
@@ -6468,7 +5501,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:1051
+#: ../calendar/gui/dialogs/recurrence-page.c:1065
 msgid "1st to 10th"
 msgstr "1af hyd 10fed"
 
@@ -6476,7 +5509,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:1057
+#: ../calendar/gui/dialogs/recurrence-page.c:1071
 msgid "11th to 20th"
 msgstr "11eg hyd 20fed"
 
@@ -6484,45 +5517,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:1063
+#: ../calendar/gui/dialogs/recurrence-page.c:1077
 msgid "21st to 31st"
 msgstr "21ain hyd 31ain"
 
 #. 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
+#: ../calendar/gui/dialogs/recurrence-page.c:1102
 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:1226
+#: ../calendar/gui/dialogs/recurrence-page.c:1231
 msgid "on the"
 msgstr "ar y"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1419
+#: ../calendar/gui/dialogs/recurrence-page.c:1401
 msgid "occurrences"
 msgstr "digwyddiadau"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2157
+#: ../calendar/gui/dialogs/recurrence-page.c:2096
 msgid "Add exception"
 msgstr "Ychwanegu eithriad"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2200
+#: ../calendar/gui/dialogs/recurrence-page.c:2137
 msgid "Could not get a selection to modify."
 msgstr "Methu cael dewisiad i'w newid."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2206
+#: ../calendar/gui/dialogs/recurrence-page.c:2143
 msgid "Modify exception"
 msgstr "Newid eithriad"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2252
+#: ../calendar/gui/dialogs/recurrence-page.c:2187
 msgid "Could not get a selection to delete."
 msgstr "Methu cael dewisiad i'w ddileu."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2383
+#: ../calendar/gui/dialogs/recurrence-page.c:2311
 msgid "Date/Time"
 msgstr "Dyddiad ac Amser"
 
@@ -6531,7 +5564,7 @@ msgid "<b>Exceptions</b>"
 msgstr "<b>Eithriadau</b>"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:2
+#: ../mail/mail-config.glade.h:3
 msgid "<b>Preview</b>"
 msgstr "<b>Rhagolwg</b>"
 
@@ -6539,46 +5572,45 @@ msgstr "<b>Rhagolwg</b>"
 msgid "<b>Recurrence</b>"
 msgstr "<b>Ail-ddigwyddiad</b>"
 
-#. 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/recurrence-page.glade.h:6
+#. 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/recurrence-page.glade.h:5
 msgid "Every"
 msgstr "Pob"
 
-#. 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/recurrence-page.glade.h:9
+#. 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/recurrence-page.glade.h:7
 msgid "This appointment rec_urs"
 msgstr "Mae'r apwyntiad yn _ail-ddigwydd"
 
 #. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][forever]' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:19
-msgid "forever"
-msgstr "am byth"
-
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][month(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:22
-msgid "month(s)"
-msgstr "mis(oedd)"
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
+msgid ""
+"day(s)\n"
+"week(s)\n"
+"month(s)\n"
+"year(s)"
+msgstr ""
 
 #. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][week(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:28
-msgid "week(s)"
-msgstr "wythnos(au)"
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid ""
+"for\n"
+"until\n"
+"forever"
+msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:29
-msgid "year(s)"
-msgstr "blwyddyn/blynyddoedd"
+#: ../calendar/gui/dialogs/send-comp.c:116
+msgid "Send my alarms with this event"
+msgstr ""
 
-#: ../calendar/gui/dialogs/task-details-page.c:410
-#: ../calendar/gui/dialogs/task-details-page.c:430
+#: ../calendar/gui/dialogs/task-details-page.c:376
+#: ../calendar/gui/dialogs/task-details-page.c:396
 msgid "Completed date is wrong"
 msgstr "Dyddiad Gorffen anghywir"
 
-#: ../calendar/gui/dialogs/task-details-page.c:515
+#: ../calendar/gui/dialogs/task-details-page.c:481
 msgid "Web Page"
 msgstr "Tudalen Gwe"
 
@@ -6590,73 +5622,36 @@ msgstr "<span weight=\"bold\">Amrywiol</span>"
 msgid "<span weight=\"bold\">Status</span>"
 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:233
-#: ../calendar/gui/e-cal-model-tasks.c:347
-#: ../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: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: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:230
-#: ../calendar/gui/e-cal-model-tasks.c:345
-#: ../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:3
+msgid ""
+"High\n"
+"Normal\n"
+"Low\n"
+"Undefined"
+msgstr ""
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../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: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:240
-#: ../calendar/gui/e-cal-model-tasks.c:343
-#: ../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"
+msgid ""
+"Not Started\n"
+"In Progress\n"
+"Completed\n"
+"Canceled"
+msgstr ""
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:10
+#: ../calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "P_ercent complete:"
 msgstr "_Canran wedi'i gwblhau:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Stat_us:"
 msgstr "_Statws:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:391
-msgid "Undefined"
-msgstr "Anniffiniedig"
-
 #: ../calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Date completed:"
 msgstr "_Dyddiad gorffen:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:14
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_Priority:"
 msgstr "_Blaenoriaeth:"
 
@@ -6664,20 +5659,38 @@ msgstr "_Blaenoriaeth:"
 msgid "_Web Page:"
 msgstr "_Tudalen Gwe:"
 
-#: ../calendar/gui/dialogs/task-editor.c:424
-#: ../calendar/gui/tasks-component.c:1245
+#: ../calendar/gui/dialogs/task-editor.c:113
+msgid "_Status Details"
+msgstr "_Manylion Statws"
+
+#: ../calendar/gui/dialogs/task-editor.c:115
+#, fuzzy
+msgid "Click to change or view the status details of the task"
+msgstr "Cliciwch i newid / gweld manylion statws y dasg"
+
+#: ../calendar/gui/dialogs/task-editor.c:123
+#: ../composer/e-composer-actions.c:371
+msgid "_Send Options"
+msgstr "_Opsiynau Anfon"
+
+#: ../calendar/gui/dialogs/task-editor.c:317
 msgid "_Task"
 msgstr "_Tasg"
 
-#: ../calendar/gui/dialogs/task-editor.c:428
+#: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
 msgstr "Manylion Tasg"
 
-#: ../calendar/gui/dialogs/task-page.c:822
+#: ../calendar/gui/dialogs/task-page.c:373
+#: ../calendar/gui/dialogs/task-page.glade.h:4
+msgid "Organi_zer:"
+msgstr "Trefn_ydd:"
+
+#: ../calendar/gui/dialogs/task-page.c:787
 msgid "Due date is wrong"
 msgstr "Dyddiad disgwyliedig yn anghywir"
 
-#: ../calendar/gui/dialogs/task-page.c:1648
+#: ../calendar/gui/dialogs/task-page.c:1763
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Methu agor tasgau o fewn '%s'."
@@ -6691,25 +5704,18 @@ 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:"
+#, fuzzy
+msgid "D_ue date:"
+msgstr "_Dyddiad disgwyl:"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "Cylchfa amser:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-msgid "_Due date:"
-msgstr "_Dyddiad disgwyl:"
-
 # #-#-#-#-#  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"
-#: ../calendar/gui/e-alarm-list.c:396
+#: ../calendar/gui/e-alarm-list.c:394
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -6718,7 +5724,7 @@ msgstr[1] "%d ddiwrnod"
 msgstr[2] "%d diwrnod"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:402
+#: ../calendar/gui/e-alarm-list.c:400
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -6726,162 +5732,233 @@ msgstr[0] "%d wythnos"
 msgstr[1] "%d wythnos"
 msgstr[2] "%d wythnos"
 
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Gweithred anhysbys i'w pherfformio"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:476
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s cyn dechrau'r apwyntiad"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:483
+#: ../calendar/gui/e-alarm-list.c:481
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s wedi dechrau'r apwyntiad"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:490
+#: ../calendar/gui/e-alarm-list.c:488
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s ar ddechrau'r apwyntiad"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:501
+#: ../calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s cyn diwedd yr apwyntiad"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:506
+#: ../calendar/gui/e-alarm-list.c:504
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s wedi diwedd yr apwyntiad"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:513
+#: ../calendar/gui/e-alarm-list.c:511
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s ar ddiwedd yr apwyntiad"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:537
+#: ../calendar/gui/e-alarm-list.c:535
 #, c-format
 msgid "%s at %s"
 msgstr "%s yn %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:545
+#: ../calendar/gui/e-alarm-list.c:543
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s am fath sbardun anhysbys"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:2916
+#: ../calendar/gui/e-attachment-handler-calendar.c:258
+msgid "I_mport"
+msgstr "_Mewnforio"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:340
+msgid "Select a Calendar"
+msgstr "Dewis Calendr"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:367
+msgid "Select a Task List"
+msgstr "Dewis Rhestr Dasgau"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:377
+msgid "I_mport to Calendar"
+msgstr "_Mewnforio i'r Calendr"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:384
+msgid "I_mport to Tasks"
+msgstr "_Mewnforio i'r Tasgau"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:68
+#: ../calendar/gui/e-cal-component-preview.c:67
+#: ../mail/em-folder-view.c:3210
 #, c-format
 msgid "Click to open %s"
 msgstr "Cliciwch i agor %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:157
-#: ../calendar/gui/e-cal-component-preview.c:157 ../filter/filter-rule.c:804
+#: ../calendar/gui/e-cal-component-memo-preview.c:127
+#: ../calendar/gui/e-cal-component-preview.c:170
+#: ../filter/filter-rule.c:859
 msgid "Untitled"
 msgstr "Di-deitl"
 
-#: ../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
+#: ../calendar/gui/e-cal-component-memo-preview.c:178
+#: ../calendar/gui/e-cal-component-preview.c:209
+#: ../calendar/gui/e-cal-component-preview.c:220
 msgid "Start Date:"
 msgstr "Dyddiad Cychwyn:"
 
-#: ../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
+#: ../calendar/gui/e-cal-component-memo-preview.c:191
+#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-itip-control.glade.h:4
+#: ../mail/mail-config.glade.h:75
 msgid "Description:"
 msgstr "Disgrifiad:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:254
-#: ../calendar/gui/e-cal-component-preview.c:304
+#: ../calendar/gui/e-cal-component-memo-preview.c:215
+#: ../calendar/gui/e-cal-component-preview.c:309
 msgid "Web Page:"
 msgstr "Tudalen Gwe:"
 
-#: ../calendar/gui/e-cal-component-preview.c:190
-#: ../calendar/gui/e-itip-control.c:1135
+#: ../calendar/gui/e-cal-component-preview.c:202
+#: ../calendar/gui/e-itip-control.c:1154
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "Crynodeb:"
 
-#: ../calendar/gui/e-cal-component-preview.c:219
+#: ../calendar/gui/e-cal-component-preview.c:231
 msgid "Due Date:"
 msgstr "Dyddiad Disgwyl:"
 
 #. write status
 #. Status
-#: ../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:968
+#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-itip-control.c:1178
+#: ../plugins/exchange-operations/exchange-account-setup.c:283
+#: ../plugins/itip-formatter/itip-view.c:1054
 msgid "Status:"
 msgstr "Statws:"
 
-#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-cal-component-preview.c:242
+#: ../calendar/gui/e-cal-model-tasks.c:359
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-cal-model-tasks.c:752
+#: ../calendar/gui/e-calendar-table.c:233
+#: ../calendar/gui/e-calendar-table.c:658
+#: ../calendar/gui/print.c:2542
+msgid "In Progress"
+msgstr "Ar Waith"
+
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
+#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-model-tasks.c:361
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-calendar-table.c:235
+#: ../calendar/gui/e-calendar-table.c:659
+#: ../calendar/gui/e-itip-control.c:939
+#: ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:202
+#: ../calendar/gui/print.c:2545
+#: ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Completed"
+msgstr "Cyflawnwyd"
+
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-cal-model-tasks.c:357
+#: ../calendar/gui/e-cal-model-tasks.c:673
+#: ../calendar/gui/e-calendar-table.c:231
+#: ../calendar/gui/e-calendar-table.c:657
+#: ../calendar/gui/print.c:2539
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Not Started"
+msgstr "Heb Gychwyn"
+
+#: ../calendar/gui/e-cal-component-preview.c:262
 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:366
-msgid "Public"
-msgstr "Cyhoeddus"
+#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-calendar-table.c:584
+#: ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1064
+msgid "High"
+msgstr "Uchel"
 
-#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:367
-msgid "Private"
-msgstr "Preifat"
+#: ../calendar/gui/e-cal-component-preview.c:266
+#: ../calendar/gui/e-cal-model.c:1057
+#: ../calendar/gui/e-calendar-table.c:585
+#: ../calendar/gui/tasktypes.xml.h:17
+#: ../mail/message-list.c:1063
+msgid "Normal"
+msgstr "Arferol"
 
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:368
-msgid "Confidential"
-msgstr "Cyfrinachol"
+#: ../calendar/gui/e-cal-component-preview.c:268
+#: ../calendar/gui/e-calendar-table.c:586
+#: ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1062
+msgid "Low"
+msgstr "Isel"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
+#: ../calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../plugins/save-calendar/csv-format.c:362
+msgid "Created"
+msgstr "Crëwyd"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 msgid "End Date"
 msgstr "Dyddiad Gorffen"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-calendar-table.etspec.h:9
 #: ../calendar/gui/e-memo-table.etspec.h:4
+msgid "Last modified"
+msgstr "Newidiwyd diwethaf"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "Dyddiad Dechrau"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:386
-msgid "Summary"
-msgstr "Crynodeb"
-
-#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:440
+#: ../calendar/gui/e-cal-model-calendar.c:187
+#: ../calendar/gui/e-calendar-table.c:636
 msgid "Free"
 msgstr "Yn Rhydd"
 
-#: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:441
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-cal-model-calendar.c:190
+#: ../calendar/gui/e-calendar-table.c:637
+#: ../calendar/gui/e-meeting-time-sel.c:391
 msgid "Busy"
 msgstr "Prysur"
 
-#: ../calendar/gui/e-cal-model-tasks.c:610
+#: ../calendar/gui/e-cal-model-tasks.c:625
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6891,204 +5968,224 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../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
+#: ../calendar/gui/e-cal-model-tasks.c:1027
+#: ../calendar/gui/e-cal-model.c:1063
+#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:161
+#: ../calendar/gui/e-meeting-store.c:742
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Ie"
 
-#: ../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
+#: ../calendar/gui/e-cal-model-tasks.c:1027
+#: ../calendar/gui/e-cal-model.c:1063
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:163
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 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: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:1199
-#: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../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
+#: ../calendar/gui/e-cal-model.c:353
+#: ../calendar/gui/e-itip-control.c:1195
+#: ../calendar/gui/e-itip-control.c:1333
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:109
+#: ../calendar/gui/e-meeting-store.c:144
+#: ../calendar/gui/e-meeting-store.c:207
+#: ../calendar/gui/print.c:978
+#: ../calendar/gui/print.c:995
+#: ../mail/em-utils.c:1339
+#: ../plugins/itip-formatter/itip-formatter.c:449
+#: ../plugins/itip-formatter/itip-formatter.c:2233
+#: ../plugins/plugin-manager/plugin-manager.c:89
+#: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "Anhysbys"
 
-#: ../calendar/gui/e-cal-model.c:926
+#: ../calendar/gui/e-cal-model.c:1059
 msgid "Recurring"
 msgstr "Ail-ddigwydd"
 
-#: ../calendar/gui/e-cal-model.c:928
+#: ../calendar/gui/e-cal-model.c:1061
 msgid "Assigned"
 msgstr "Wedi Neilltuo"
 
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:417
-msgid "Save As..."
-msgstr "Cadw Fel..."
+#: ../calendar/gui/e-calendar-table.c:334
+msgid "* No Summary *"
+msgstr "* Dim Crynodeb *"
 
-#: ../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:442
+#. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
+#: ../calendar/gui/e-calendar-table.c:370
+#: ../calendar/gui/e-calendar-view.c:2427
 #, c-format
-msgid "untitled_image.%s"
-msgstr "delwedd_dideitl.%s"
+msgid "Organizer: %s <%s>"
+msgstr "Trefnydd: %s <%s>"
 
-#: ../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..."
+#. With SunOne accounts, there may be no ':' in organiser.value
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-table.c:373
+#: ../calendar/gui/e-calendar-view.c:2431
+#, c-format
+msgid "Organizer: %s"
+msgstr "Trefnydd: %s"
 
-#: ../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"
+#: ../calendar/gui/e-calendar-table.c:404
+msgid "Start: "
+msgstr "Cychwyn:"
 
-#: ../calendar/gui/e-cal-popup.c:278
-msgid "_Save Selected"
-msgstr "_Cadw'r Rhai wedi'u Dewis"
+#: ../calendar/gui/e-calendar-table.c:416
+#, fuzzy
+msgid "Due: "
+msgstr "Amser Disgwyl "
 
-#: ../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:587
+#: ../calendar/gui/tasktypes.xml.h:24
+msgid "Undefined"
+msgstr "Anniffiniedig"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:606
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:607
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:608
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:609
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:610
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:611
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:612
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:613
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:614
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:615
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:420
+#: ../calendar/gui/e-calendar-table.c:616
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:705
-#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:483
+#: ../calendar/gui/e-calendar-table.c:892
+#: ../calendar/gui/e-calendar-view.c:657
+#: ../calendar/gui/e-memo-table.c:444
 msgid "Deleting selected objects"
 msgstr "Dileu gwrthrych dewisedig"
 
-#: ../calendar/gui/e-calendar-table.c:958
-#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:660
+#: ../calendar/gui/e-calendar-table.c:1171
+#: ../calendar/gui/e-calendar-view.c:871
+#: ../calendar/gui/e-memo-table.c:649
 msgid "Updating objects"
 msgstr "Diweddaru gwrthrychau"
 
-#: ../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
+#: ../calendar/gui/e-calendar-table.c:1359
+#: ../calendar/gui/e-calendar-view.c:1331
+#: ../calendar/gui/e-memo-table.c:823
+#: ../composer/e-composer-actions.c:219
 msgid "Save as..."
 msgstr "Cadw fel..."
 
-#: ../calendar/gui/e-calendar-table.c:1278
-#: ../calendar/gui/e-calendar-view.c:1662
+#: ../calendar/gui/e-calendar-table.c:1583
+#: ../calendar/gui/e-calendar-view.c:1787
 msgid "New _Task"
 msgstr "_Tasg Newydd"
 
-#: ../calendar/gui/e-calendar-table.c:1282 ../calendar/gui/e-memo-table.c:903
+#: ../calendar/gui/e-calendar-table.c:1587
+#: ../calendar/gui/e-memo-table.c:928
 msgid "Open _Web Page"
 msgstr "Agor Tudalen _Gwe"
 
-#: ../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
-#: ../ui/evolution-tasks.xml.h:29
-msgid "_Print..."
+#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-calendar-view.c:1805
+#: ../calendar/gui/e-memo-table.c:929
+#: ../mail/em-folder-view.c:1336
+#: ../mail/em-popup.c:494
+msgid "_Save As..."
+msgstr "_Cadw Fel..."
+
+#: ../calendar/gui/e-calendar-table.c:1589
+#: ../calendar/gui/e-calendar-view.c:1790
+#: ../calendar/gui/e-memo-table.c:930
+msgid "P_rint..."
 msgstr "_Argraffu..."
 
-#: ../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
+#: ../calendar/gui/e-calendar-table.c:1593
+#: ../calendar/gui/e-calendar-view.c:1810
+#: ../calendar/gui/e-memo-table.c:934
+#: ../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: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
+#: ../calendar/gui/e-calendar-table.c:1595
+#: ../calendar/gui/e-calendar-view.c:1793
+#: ../calendar/gui/e-calendar-view.c:1812
+#: ../calendar/gui/e-memo-table.c:936
+#: ../ui/evolution-addressbook.xml.h:57
+#: ../ui/evolution-calendar.xml.h:46
+#: ../ui/evolution-memos.xml.h:19
+#: ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Gludo"
 
-#: ../calendar/gui/e-calendar-table.c:1294 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1599
+#: ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Neilltuo Tasg"
 
-#: ../calendar/gui/e-calendar-table.c:1295 ../calendar/gui/e-memo-table.c:915
+#: ../calendar/gui/e-calendar-table.c:1600
+#: ../calendar/gui/e-memo-table.c:940
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Gyrru ymlaen fel iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1296
+#: ../calendar/gui/e-calendar-table.c:1601
 msgid "_Mark as Complete"
 msgstr "_Marcio yn gyflawn"
 
-#: ../calendar/gui/e-calendar-table.c:1297
+#: ../calendar/gui/e-calendar-table.c:1602
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcio'r tasgau a ddewiswyd yn rai cyflawn"
 
-#: ../calendar/gui/e-calendar-table.c:1298
+#: ../calendar/gui/e-calendar-table.c:1603
 msgid "_Mark as Incomplete"
 msgstr "_Marcio heb eu gorffen"
 
-#: ../calendar/gui/e-calendar-table.c:1299
+#: ../calendar/gui/e-calendar-table.c:1604
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Marcio'r tasgau a ddewiswyd yn rai heb eu gorffen"
 
-#: ../calendar/gui/e-calendar-table.c:1304
+#: ../calendar/gui/e-calendar-table.c:1609
 msgid "_Delete Selected Tasks"
 msgstr "_Dileu'r tasgau a ddewiswyd"
 
-#: ../calendar/gui/e-calendar-table.c:1537
+#: ../calendar/gui/e-calendar-table.c:1844
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Cliciwch i ychwanegu tasg"
@@ -7098,7 +6195,7 @@ msgstr "Cliciwch i ychwanegu tasg"
 msgid "% Complete"
 msgstr "% Cyflawn"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:705
+#: ../calendar/gui/e-calendar-table.etspec.h:5
 msgid "Complete"
 msgstr "Cwblhau"
 
@@ -7106,140 +6203,176 @@ msgstr "Cwblhau"
 msgid "Completion date"
 msgstr "Dyddiad cwblhad"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due date"
 msgstr "Dyddiad disgwyl"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:20
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Priority"
 msgstr "Blaenoriaeth"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-calendar-table.etspec.h:11
 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
+#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+#. Status: Accepted: X   Declined: Y   ...
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-calendar-view.c:2335
+#: ../calendar/gui/e-meeting-list-view.c:601
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/em-filter-i18n.h:72
+#: ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "Statws"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-msgid "Task sort"
-msgstr "Trefnu Tasg"
-
-#: ../calendar/gui/e-calendar-view.c:1348
+#: ../calendar/gui/e-calendar-view.c:1476
 msgid "Moving items"
 msgstr "Symud eitemau"
 
-#: ../calendar/gui/e-calendar-view.c:1350
+#: ../calendar/gui/e-calendar-view.c:1478
 msgid "Copying items"
 msgstr "Copïo eitemau"
 
-#: ../calendar/gui/e-calendar-view.c:1659
+#: ../calendar/gui/e-calendar-view.c:1784
 msgid "New _Appointment..."
 msgstr "_Apwyntiad Newydd..."
 
-#: ../calendar/gui/e-calendar-view.c:1660
+#: ../calendar/gui/e-calendar-view.c:1785
 msgid "New All Day _Event"
 msgstr "_Digwyddiad Newydd Drwy'r Dydd"
 
-#: ../calendar/gui/e-calendar-view.c:1661
+#: ../calendar/gui/e-calendar-view.c:1786
 msgid "New _Meeting"
 msgstr "_Cyfarfod Newydd"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1672
+#: ../calendar/gui/e-calendar-view.c:1797
 msgid "_Current View"
 msgstr "Golwg _Cyfredol"
 
-#: ../calendar/gui/e-calendar-view.c:1674
+#: ../calendar/gui/e-calendar-view.c:1799
 msgid "Select T_oday"
 msgstr "Dewis _Heddiw"
 
-#: ../calendar/gui/e-calendar-view.c:1675
+#: ../calendar/gui/e-calendar-view.c:1800
 msgid "_Select Date..."
 msgstr "_Dewis Dyddiad..."
 
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1806
+msgid "Pri_nt..."
+msgstr "_Argraffu..."
+
+#: ../calendar/gui/e-calendar-view.c:1816
 msgid "Cop_y to Calendar..."
 msgstr "_Copïo i Galendr..."
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1817
 msgid "Mo_ve to Calendar..."
 msgstr "_Symud i Galendr..."
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1818
 msgid "_Delegate Meeting..."
 msgstr "_Dirprwyo Cyfarfod..."
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1819
 msgid "_Schedule Meeting..."
 msgstr "_Trefnu Cyfarfod..."
 
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1820
 msgid "_Forward as iCalendar..."
 msgstr "_Gyrru Ymlaen fel iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1821
 msgid "_Reply"
 msgstr "_Ateb"
 
-#: ../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
+#: ../calendar/gui/e-calendar-view.c:1822
+#: ../mail/e-attachment-handler-mail.c:140
+#: ../mail/em-folder-view.c:1330
+#: ../mail/em-popup.c:499
+#: ../ui/evolution-mail-message.xml.h:78
 msgid "Reply to _All"
 msgstr "Ateb i _Bawb"
 
-#: ../calendar/gui/e-calendar-view.c:1702
+#: ../calendar/gui/e-calendar-view.c:1827
 msgid "Make this Occurrence _Movable"
 msgstr "Galluogi _symud y digwyddiad hwn"
 
-#: ../calendar/gui/e-calendar-view.c:1703 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1828
+#: ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Dileu _digwyddiad hyn"
 
-#: ../calendar/gui/e-calendar-view.c:1704
+#: ../calendar/gui/e-calendar-view.c:1829
 msgid "Delete _All Occurrences"
 msgstr "Dileu _Pob digwyddiadau"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:2156
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "Trefnydd: %s <%s>"
+#: ../calendar/gui/e-calendar-view.c:2282
+#: ../calendar/gui/e-itip-control.c:1183
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:171
+#: ../calendar/gui/e-meeting-store.c:194
+#: ../plugins/itip-formatter/itip-formatter.c:2221
+msgid "Accepted"
+msgstr "Derbyniwyd"
 
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2160
-#, c-format
-msgid "Organizer: %s"
-msgstr "Trefnydd: %s"
+#: ../calendar/gui/e-calendar-view.c:2283
+#: ../calendar/gui/e-itip-control.c:1191
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:173
+#: ../calendar/gui/e-meeting-store.c:196
+#: ../plugins/itip-formatter/itip-formatter.c:2227
+msgid "Declined"
+msgstr "Gwrthododd"
+
+#: ../calendar/gui/e-calendar-view.c:2284
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/e-meeting-time-sel.c:390
+msgid "Tentative"
+msgstr "I'w gadarnhau"
+
+#: ../calendar/gui/e-calendar-view.c:2285
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:177
+#: ../calendar/gui/e-meeting-store.c:200
+#: ../plugins/itip-formatter/itip-formatter.c:2230
+msgid "Delegated"
+msgstr "Dirprwywyd"
+
+#: ../calendar/gui/e-calendar-view.c:2286
+msgid "Needs action"
+msgstr "Angen gweithred"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2176 ../calendar/gui/print.c:2316
+#: ../calendar/gui/e-calendar-view.c:2447
+#: ../calendar/gui/print.c:2501
 #, c-format
 msgid "Location: %s"
 msgstr "Lleoliad: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2207
+#: ../calendar/gui/e-calendar-view.c:2478
 #, c-format
 msgid "Time: %s %s"
 msgstr "Amser: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:116
+#: ../calendar/gui/e-cell-date-edit-text.c:105
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:119
+#: ../calendar/gui/e-cell-date-edit-text.c:108
 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:127
+#: ../calendar/gui/e-cell-date-edit-text.c:116
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7252,45 +6385,53 @@ msgstr ""
 #. * 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:807
+#: ../calendar/gui/e-day-view-time-item.c:747
 #, c-format
 msgid "%02i minute divisions"
 msgstr "Rhaniadau amser %02i munud"
 
+#: ../calendar/gui/e-day-view-time-item.c:768
+#, fuzzy
+msgid "Show the second time zone"
+msgstr "Dangos y cwarel \"Rhagolwg\""
+
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
 #. strftime format %A = full weekday name, %d = day of
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:1311
-#: ../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:1503
+#: ../calendar/gui/e-day-view-top-item.c:844
+#: ../calendar/gui/e-day-view.c:1570
+#: ../calendar/gui/e-week-view-main-item.c:359
+#: ../calendar/gui/print.c:1666
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:746 ../calendar/gui/e-day-view.c:1089
-#: ../calendar/gui/e-week-view.c:503 ../calendar/gui/print.c:811
+#: ../calendar/gui/e-day-view.c:799
+#: ../calendar/gui/e-week-view.c:541
+#: ../calendar/gui/print.c:825
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:749 ../calendar/gui/e-day-view.c:1092
-#: ../calendar/gui/e-week-view.c:506 ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:802
+#: ../calendar/gui/e-week-view.c:544
+#: ../calendar/gui/print.c:827
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:759
+#. To Translators: the %d stands for a week number, it's value between 1 and 52/53
+#: ../calendar/gui/e-day-view.c:2301
+#, c-format
+msgid "Week %d"
+msgstr "Wythnos %d"
+
+#: ../calendar/gui/e-itip-control.c:758
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ie. (Ail-ddigwyddiad cymhleth)"
 
-#. 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"
@@ -7299,12 +6440,7 @@ msgstr[0] "Bob dydd"
 msgstr[1] "Bob %d ddydd"
 msgstr[2] "Bob %d dydd"
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:788
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
@@ -7312,9 +6448,7 @@ msgstr[0] "Bob wythnos"
 msgstr[1] "Bob %d wythnos"
 msgstr[2] "Bob %d wythnos"
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7323,30 +6457,21 @@ msgstr[1] "Bob %d wythnos ar "
 msgstr[2] "Bob %d wythnos ar "
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:798
+#: ../calendar/gui/e-itip-control.c:806
 msgid " and "
 msgstr " ac "
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:815
 #, c-format
 msgid "The %s day of "
 msgstr "Y %s dydd o "
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:831
 #, c-format
 msgid "The %s %s of "
 msgstr "Y %s %s o "
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:842
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
@@ -7354,12 +6479,7 @@ msgstr[0] "bob mis"
 msgstr[1] "bob %d fis"
 msgstr[2] "bob %d mis"
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:854
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
@@ -7367,348 +6487,334 @@ msgstr[0] "Bob blwyddyn"
 msgstr[1] "Bob %d flynedd"
 msgstr[2] "Bob %d blynedd"
 
-#. 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
+#: ../calendar/gui/e-itip-control.c:867
+#, fuzzy, c-format
 msgid "a total of %d time"
-msgid_plural " a total of %d times"
+msgid_plural "a total of %d times"
 msgstr[0] "cyfanswm o %d gwaith"
 msgstr[1] "cyfanswm o %d waith"
 msgstr[2] "cyfanswm o %d gwaith"
 
 #. 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
+#: ../calendar/gui/e-itip-control.c:878
 msgid ", ending on "
 msgstr ", yn gorffen ar "
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:888
+#: ../calendar/gui/e-itip-control.c:900
 msgid "Starts"
 msgstr "Cychwyn"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:902
+#: ../calendar/gui/e-itip-control.c:914
 msgid "Ends"
 msgstr "Gorffen"
 
-#: ../calendar/gui/e-itip-control.c:936
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../calendar/gui/e-itip-control.c:954
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Due"
 msgstr "Yn Disgwyl"
 
-#: ../calendar/gui/e-itip-control.c:976 ../calendar/gui/e-itip-control.c:1033
+#: ../calendar/gui/e-itip-control.c:995
+#: ../calendar/gui/e-itip-control.c:1052
 msgid "iCalendar Information"
 msgstr "Gwybodaeth iCalendar"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:993
+#: ../calendar/gui/e-itip-control.c:1012
 msgid "iCalendar Error"
 msgstr "Gwall iCalendar"
 
-#: ../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:342
-#: ../plugins/itip-formatter/itip-view.c:409
-#: ../plugins/itip-formatter/itip-view.c:410
-#: ../plugins/itip-formatter/itip-view.c:477
-#: ../plugins/itip-formatter/itip-view.c:478
+#: ../calendar/gui/e-itip-control.c:1084
+#: ../calendar/gui/e-itip-control.c:1100
+#: ../calendar/gui/e-itip-control.c:1111
+#: ../calendar/gui/e-itip-control.c:1128
+#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:522
+#: ../plugins/itip-formatter/itip-view.c:523
 msgid "An unknown person"
 msgstr "Person anhysbys"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1116
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-msgstr ""
-"<br> Rhowch olwg ar y wybodaeth sy'n dilyn, ac yna dewis gweithred o'r "
-"ddewislen isod."
-
-#: ../calendar/gui/e-itip-control.c: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:687
-#: ../plugins/itip-formatter/itip-formatter.c:1788
-msgid "Accepted"
-msgstr "Derbyniwyd"
+#: ../calendar/gui/e-itip-control.c:1135
+msgid "<br> Please review the following information, and then select an action from the menu below."
+msgstr "<br> Rhowch olwg ar y wybodaeth sy'n dilyn, ac yna dewis gweithred o'r ddewislen isod."
 
-#: ../calendar/gui/e-itip-control.c:1168 ../calendar/gui/itip-utils.c:690
-#: ../plugins/itip-formatter/itip-formatter.c:1791
+#: ../calendar/gui/e-itip-control.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:2224
 msgid "Tentatively Accepted"
 msgstr "Wedi derbyn yn betrus"
 
-#: ../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:693 ../calendar/gui/itip-utils.c:722
-#: ../plugins/itip-formatter/itip-formatter.c:1794
-msgid "Declined"
-msgstr "Gwrthododd"
-
-#: ../calendar/gui/e-itip-control.c:1256
-msgid ""
-"The meeting has been canceled, however it could not be found in your "
-"calendars"
+#: ../calendar/gui/e-itip-control.c:1274
+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:1258
-msgid ""
-"The task has been canceled, however it could not be found in your task lists"
+#: ../calendar/gui/e-itip-control.c:1276
+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:1337
+#: ../calendar/gui/e-itip-control.c:1353
 #, 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:1338
+#: ../calendar/gui/e-itip-control.c:1354
 msgid "Meeting Information"
 msgstr "Gwybodaeth Cyfarfod"
 
-#: ../calendar/gui/e-itip-control.c:1344
+#: ../calendar/gui/e-itip-control.c:1360
 #, 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:1346
+#: ../calendar/gui/e-itip-control.c:1362
 #, 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:1347
+#: ../calendar/gui/e-itip-control.c:1363
 msgid "Meeting Proposal"
 msgstr "Awgrymiad Cyfarfod"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1353
+#: ../calendar/gui/e-itip-control.c:1369
 #, c-format
 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:1354
+#: ../calendar/gui/e-itip-control.c:1370
 msgid "Meeting Update"
 msgstr "Diweddariad Cyfarfod"
 
-#: ../calendar/gui/e-itip-control.c:1358
+#: ../calendar/gui/e-itip-control.c:1374
 #, 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:1359
+#: ../calendar/gui/e-itip-control.c:1375
 msgid "Meeting Update Request"
 msgstr "Cais Diweddariad Cyfarfod"
 
-#: ../calendar/gui/e-itip-control.c:1366
+#: ../calendar/gui/e-itip-control.c:1382
 #, 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:1367
+#: ../calendar/gui/e-itip-control.c:1383
 msgid "Meeting Reply"
 msgstr "Ymateb Cyfarfod"
 
-#: ../calendar/gui/e-itip-control.c:1374
+#: ../calendar/gui/e-itip-control.c:1390
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "Mae <b>%s</b> wedi canslo cyfarfod."
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1391
 msgid "Meeting Cancelation"
 msgstr "Canslo Cyfarfod"
 
-#: ../calendar/gui/e-itip-control.c:1385 ../calendar/gui/e-itip-control.c:1462
-#: ../calendar/gui/e-itip-control.c:1502
+#: ../calendar/gui/e-itip-control.c:1401
+#: ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> wedi anfon neges amhosib ei deall."
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1402
 msgid "Bad Meeting Message"
 msgstr "Neges Gyfarfod Wael"
 
-#: ../calendar/gui/e-itip-control.c:1413
+#: ../calendar/gui/e-itip-control.c:1429
 #, 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:1414
+#: ../calendar/gui/e-itip-control.c:1430
 msgid "Task Information"
 msgstr "Gwybodaeth Dasg"
 
-#: ../calendar/gui/e-itip-control.c:1421
+#: ../calendar/gui/e-itip-control.c:1437
 #, 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:1423
+#: ../calendar/gui/e-itip-control.c:1439
 #, 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:1424
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Proposal"
 msgstr "Awgrymiad Tasg"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1430
+#: ../calendar/gui/e-itip-control.c:1446
 #, c-format
 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:1431
+#: ../calendar/gui/e-itip-control.c:1447
 msgid "Task Update"
 msgstr "Diweddariad Tasg"
 
-#: ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1451
 #, 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:1436
+#: ../calendar/gui/e-itip-control.c:1452
 msgid "Task Update Request"
 msgstr "Cais Diweddariad Tasg"
 
-#: ../calendar/gui/e-itip-control.c:1443
+#: ../calendar/gui/e-itip-control.c:1459
 #, 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:1444
+#: ../calendar/gui/e-itip-control.c:1460
 msgid "Task Reply"
 msgstr "Ymateb Tasg"
 
-#: ../calendar/gui/e-itip-control.c:1451
+#: ../calendar/gui/e-itip-control.c:1467
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "Mae <b>%s</b> wedi canslo tasg."
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Task Cancelation"
 msgstr "Canslad Tasg"
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1479
 msgid "Bad Task Message"
 msgstr "Neges Dasg Wael"
 
-#: ../calendar/gui/e-itip-control.c:1487
+#: ../calendar/gui/e-itip-control.c:1503
 #, 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:1488
+#: ../calendar/gui/e-itip-control.c:1504
 msgid "Free/Busy Information"
 msgstr "Gwybodaeth Statws Rhydd/Prysur"
 
-#: ../calendar/gui/e-itip-control.c:1492
+#: ../calendar/gui/e-itip-control.c:1508
 #, 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:1493
+#: ../calendar/gui/e-itip-control.c:1509
 msgid "Free/Busy Request"
 msgstr "Cais am Statws Rhydd/Prysur"
 
-#: ../calendar/gui/e-itip-control.c:1497
+#: ../calendar/gui/e-itip-control.c:1513
 #, 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:1498
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Reply"
 msgstr "Ymateb Statws Rhydd/Prysur"
 
-#: ../calendar/gui/e-itip-control.c:1503
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Bad Free/Busy Message"
 msgstr "Neges Statws Rhydd/Prysur Wael"
 
-#: ../calendar/gui/e-itip-control.c:1578
+#: ../calendar/gui/e-itip-control.c:1595
 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:1637
+#: ../calendar/gui/e-itip-control.c:1654
 msgid "The message contains only unsupported requests."
 msgstr "Mae'r neges ond yn cynnwys ceisiadau na gynhelir."
 
-#: ../calendar/gui/e-itip-control.c:1670
+#: ../calendar/gui/e-itip-control.c:1687
 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:1702
+#: ../calendar/gui/e-itip-control.c:1725
 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:1944
+#: ../calendar/gui/e-itip-control.c:1967
 msgid "Update complete\n"
 msgstr "Diweddariad yn gyflawn\n"
 
-#: ../calendar/gui/e-itip-control.c:1977
+#: ../calendar/gui/e-itip-control.c:2001
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Gwrthrych yn annilys a methir ei ddiweddaru\n"
 
-#: ../calendar/gui/e-itip-control.c:1994
+#: ../calendar/gui/e-itip-control.c:2018
 msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr ""
-"Dyw'r ymateb ddim oddi wrth rywun sy'n mynychu'r cyfarfod ar hyn o bryd.  "
-"Ychwanegu'r person fel mynychwr?"
+msgstr "Dyw'r ymateb ddim oddi wrth rywun sy'n mynychu'r cyfarfod ar hyn o bryd.  Ychwanegu'r person fel mynychwr?"
 
-#: ../calendar/gui/e-itip-control.c:2012
+#: ../calendar/gui/e-itip-control.c:2036
 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:2036
+#: ../calendar/gui/e-itip-control.c:2060
 msgid "Attendee status updated\n"
 msgstr "Cyflwr mynychwr wedi diweddaru\n"
 
-#: ../calendar/gui/e-itip-control.c:2043
-#: ../plugins/itip-formatter/itip-formatter.c:1108
+#: ../calendar/gui/e-itip-control.c:2067
+#: ../plugins/itip-formatter/itip-formatter.c:1385
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Methu"
 
-#: ../calendar/gui/e-itip-control.c:2074 ../calendar/gui/e-itip-control.c:2131
+#: ../calendar/gui/e-itip-control.c:2098
+#: ../calendar/gui/e-itip-control.c:2155
 msgid "Item sent!\n"
 msgstr "Eitem wedi ei ddanfon!\n"
 
-#: ../calendar/gui/e-itip-control.c:2080 ../calendar/gui/e-itip-control.c:2139
+#: ../calendar/gui/e-itip-control.c:2104
+#: ../calendar/gui/e-itip-control.c:2163
 msgid "The item could not be sent!\n"
 msgstr "Methwyd anfon yr eitem!\n"
 
-#: ../calendar/gui/e-itip-control.c:2220
+#: ../calendar/gui/e-itip-control.c:2281
 msgid "Choose an action:"
 msgstr "Dewis gweithred"
 
-#: ../calendar/gui/e-itip-control.c:2292
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-itip-control.c:2310
+#: ../calendar/gui/e-meeting-list-view.c:589
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: ../calendar/gui/e-itip-control.c:2350
 msgid "Update"
 msgstr "Diweddaru"
 
-#: ../calendar/gui/e-itip-control.c:2320
-#: ../plugins/groupwise-features/process-meeting.c:48
+#: ../calendar/gui/e-itip-control.c:2374
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept"
 msgstr "Derbyn"
 
-#: ../calendar/gui/e-itip-control.c:2321
+#: ../calendar/gui/e-itip-control.c:2375
 msgid "Tentatively accept"
 msgstr "Derbyn yn betrus"
 
-#: ../calendar/gui/e-itip-control.c:2322
-#: ../plugins/groupwise-features/process-meeting.c:50
+#: ../calendar/gui/e-itip-control.c:2376
+#: ../plugins/groupwise-features/process-meeting.c:54
 msgid "Decline"
 msgstr "Gwrthod"
 
-#: ../calendar/gui/e-itip-control.c:2351
+#: ../calendar/gui/e-itip-control.c:2401
 msgid "Send Free/Busy Information"
 msgstr "Anfon Gwybodaeth Statws Rhydd/Prysur"
 
-#: ../calendar/gui/e-itip-control.c:2379
+#: ../calendar/gui/e-itip-control.c:2425
 msgid "Update respondent status"
 msgstr "Diweddaru cyflwr ymatebwr"
 
-#: ../calendar/gui/e-itip-control.c:2407
+#: ../calendar/gui/e-itip-control.c:2449
 msgid "Send Latest Information"
 msgstr "Anfon Gwybodaeth Ddiweddar"
 
-#: ../calendar/gui/e-itip-control.c:2435 ../calendar/gui/itip-utils.c:710
+#: ../calendar/gui/e-itip-control.c:2473
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Diddymu"
@@ -7733,112 +6839,114 @@ msgstr "Yn Llwytho Calendr"
 msgid "Loading calendar..."
 msgstr "Yn Llwytho calendr..."
 
+#: ../calendar/gui/e-itip-control.glade.h:7
+msgid "Organizer:"
+msgstr "Trefnydd:"
+
 #: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Server Message:"
 msgstr "Neges Gweinydd:"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Chair Persons"
 msgstr "Cadeiryddion"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Required Participants"
 msgstr "Cyfranogwyr Angenrheidiol"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Optional Participants"
 msgstr "Cyfranogwyr Dewisol"
 
-#: ../calendar/gui/e-meeting-list-view.c:73
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Resources"
 msgstr "Adnoddau"
 
-#: ../calendar/gui/e-meeting-list-view.c:154
+#: ../calendar/gui/e-meeting-list-view.c:151
 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
+#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-store.c:84
+#: ../calendar/gui/e-meeting-store.c:101
+#: ../calendar/gui/e-meeting-store.c:736
+#: ../calendar/gui/print.c:974
 msgid "Individual"
 msgstr "Unigol"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
-#: ../widgets/table/e-table-config-no-group.glade.h:7
-#: ../widgets/table/e-table-config.glade.h:6
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:86
+#: ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/print.c:975
+#: ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Grŵp"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:88
+#: ../calendar/gui/e-meeting-store.c:105
+#: ../calendar/gui/print.c:976
 msgid "Resource"
 msgstr "Adnodd"
 
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:90
+#: ../calendar/gui/e-meeting-store.c:107
+#: ../calendar/gui/print.c:977
 msgid "Room"
 msgstr "Ystafell"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:136
+#: ../calendar/gui/print.c:991
 msgid "Chair"
 msgstr "Cadeirydd"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:761
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:121
+#: ../calendar/gui/e-meeting-store.c:138
+#: ../calendar/gui/e-meeting-store.c:739
+#: ../calendar/gui/print.c:992
 msgid "Required Participant"
 msgstr "Cyfranogwyr Angenrheidiol"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:123
+#: ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/print.c:993
 msgid "Optional Participant"
 msgstr "Cyfranwyr Dewisol"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:125
+#: ../calendar/gui/e-meeting-store.c:142
+#: ../calendar/gui/print.c:994
 msgid "Non-Participant"
 msgstr "Ddim yn Cyfrannu"
 
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/e-meeting-store.c:771
+#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-meeting-store.c:169
+#: ../calendar/gui/e-meeting-store.c:192
+#: ../calendar/gui/e-meeting-store.c:749
 msgid "Needs Action"
 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: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: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:484
+#: ../calendar/gui/e-meeting-list-view.c:544
 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
+#: ../calendar/gui/e-meeting-store.c:181
+#: ../calendar/gui/e-meeting-store.c:204
 msgid "In Process"
 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:2116
+#: ../calendar/gui/e-meeting-time-sel-item.c:458
+#: ../calendar/gui/e-meeting-time-sel.c:2083
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B, %d, %Y"
 
@@ -7846,85 +6954,81 @@ msgstr "%A, %B, %d, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. 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:2149
+#: ../calendar/gui/e-meeting-time-sel-item.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:2114
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:472
+#: ../calendar/gui/e-meeting-time-sel-item.c:466
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-meeting-time-sel.c:392
 msgid "Out of Office"
 msgstr "Allan o'r Swyddfa"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-meeting-time-sel.c:393
 msgid "No Information"
 msgstr "Dim Gwybodaeth"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:408
 msgid "A_ttendees..."
 msgstr "_Mynychwyr..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:449
+#: ../calendar/gui/e-meeting-time-sel.c:429
 msgid "O_ptions"
 msgstr "_Opsiynau"
 
-#: ../calendar/gui/e-meeting-time-sel.c:466
+#: ../calendar/gui/e-meeting-time-sel.c:446
 msgid "Show _only working hours"
 msgstr "Dangos oriau gweithio yn _unig"
 
-#: ../calendar/gui/e-meeting-time-sel.c:476
+#: ../calendar/gui/e-meeting-time-sel.c:456
 msgid "Show _zoomed out"
 msgstr "Dangos wedi _crebachu"
 
-#: ../calendar/gui/e-meeting-time-sel.c:491
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "_Update free/busy"
 msgstr "_Diweddaru rhydd/prysur"
 
-#: ../calendar/gui/e-meeting-time-sel.c:506
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:524
+#: ../calendar/gui/e-meeting-time-sel.c:504
 msgid "_Autopick"
 msgstr "_Awtoddewis"
 
-#: ../calendar/gui/e-meeting-time-sel.c:539
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:556
+#: ../calendar/gui/e-meeting-time-sel.c:536
 msgid "_All people and resources"
 msgstr "_Pob person ac adnodd"
 
-#: ../calendar/gui/e-meeting-time-sel.c:565
+#: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "All _people and one resource"
 msgstr "Pob _person ac un adnodd"
 
-#: ../calendar/gui/e-meeting-time-sel.c:574
+#: ../calendar/gui/e-meeting-time-sel.c:554
 msgid "_Required people"
 msgstr "Pobl _angenrheidiol"
 
-#: ../calendar/gui/e-meeting-time-sel.c:583
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "Required people and _one resource"
 msgstr "Pob person sydd _angen ac un atodiad"
 
-#: ../calendar/gui/e-meeting-time-sel.c:619
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "_Start time:"
 msgstr "Amser _dechrau:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:646
+#: ../calendar/gui/e-meeting-time-sel.c:626
 msgid "_End time:"
 msgstr "_Amser diwedd:"
 
-#: ../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"
@@ -7949,20 +7053,17 @@ msgstr "Iaith"
 msgid "Member"
 msgstr "Aelodau"
 
-#: ../calendar/gui/e-memo-table.c:920
+#: ../calendar/gui/e-memo-table.c:945
 msgid "_Delete Selected Memos"
 msgstr "_Dileu'r Memos a Ddewiswyd"
 
-#: ../calendar/gui/e-memo-table.c:1071 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1094
+#: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Cliciwch i ychwanegu memo"
 
-#: ../calendar/gui/e-memo-table.etspec.h:3
-msgid "Memo sort"
-msgstr "Trefnu memos"
-
-#: ../calendar/gui/e-memos.c:733 ../calendar/gui/e-tasks.c:844
-#: ../calendar/gui/gnome-cal.c:2778
+#: ../calendar/gui/e-memos.c:754
+#: ../calendar/gui/e-tasks.c:902
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7971,203 +7072,247 @@ msgstr ""
 "Gwall ar %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:782
+#: ../calendar/gui/e-memos.c:806
 msgid "Loading memos"
 msgstr "Llwytho memos"
 
-#: ../calendar/gui/e-memos.c:863
+#: ../calendar/gui/e-memos.c:897
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Agor memos am %s"
 
-#: ../calendar/gui/e-memos.c:1036 ../calendar/gui/e-tasks.c:1249
+#: ../calendar/gui/e-memos.c:1066
+#: ../calendar/gui/e-tasks.c:1318
 msgid "Deleting selected objects..."
 msgstr "Dileu gwrthrychau dewisedig..."
 
-#: ../calendar/gui/e-tasks.c:894
+#: ../calendar/gui/e-tasks.c:955
 msgid "Loading tasks"
 msgstr "Llwytho tasgau"
 
-#: ../calendar/gui/e-tasks.c:981
+#: ../calendar/gui/e-tasks.c:1052
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Agor tasgau am %s"
 
-#: ../calendar/gui/e-tasks.c:1226
+#: ../calendar/gui/e-tasks.c:1295
 msgid "Completing tasks..."
 msgstr "Cwblhau'r tasgau..."
 
-#: ../calendar/gui/e-tasks.c:1276
+#: ../calendar/gui/e-tasks.c:1345
 msgid "Expunging"
 msgstr "Yn dileu"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:124
 msgid "Select Timezone"
 msgstr "Dewiswch Gylchfa Amser"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1484
+#: ../calendar/gui/e-week-view-main-item.c:376
+#: ../calendar/gui/print.c:1647
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:820
-msgid "Updating query"
-msgstr "Diweddaru ymholiad"
-
-#: ../calendar/gui/gnome-cal.c:2429
+#: ../calendar/gui/gnome-cal.c:2670
 msgid "_Custom View"
 msgstr "Golwg _Addasedig"
 
-#: ../calendar/gui/gnome-cal.c:2430
+#: ../calendar/gui/gnome-cal.c:2671
 msgid "_Save Custom View"
 msgstr "_Cadw Golwg Addasedig"
 
-#: ../calendar/gui/gnome-cal.c:2435
+#: ../calendar/gui/gnome-cal.c:2676
 msgid "_Define Views..."
 msgstr "_Diffinio Golygon..."
 
-#: ../calendar/gui/gnome-cal.c:2601
+#: ../calendar/gui/gnome-cal.c:2913
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Yn llwytho tasgau am %s"
 
-#: ../calendar/gui/gnome-cal.c:2620
+#: ../calendar/gui/gnome-cal.c:2928
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Yn llwytho tasgau at %s"
 
-#: ../calendar/gui/gnome-cal.c:2629
+#: ../calendar/gui/gnome-cal.c:2937
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Llwytho memos yn %s"
 
-#: ../calendar/gui/gnome-cal.c:2737
+#: ../calendar/gui/gnome-cal.c:3049
 #, c-format
 msgid "Opening %s"
 msgstr "Yn agor %s"
 
-#: ../calendar/gui/gnome-cal.c:3673
+#: ../calendar/gui/gnome-cal.c:4009
 msgid "Purging"
 msgstr "Puro"
 
 #: ../calendar/gui/goto-dialog.glade.h:1
-msgid "April"
-msgstr "Ebrill"
-
-#: ../calendar/gui/goto-dialog.glade.h:2
-msgid "August"
-msgstr "Awst"
-
-#: ../calendar/gui/goto-dialog.glade.h:3
-msgid "December"
-msgstr "Rhagfyr"
-
-#: ../calendar/gui/goto-dialog.glade.h:4
-msgid "February"
-msgstr "Chwefror"
-
-#: ../calendar/gui/goto-dialog.glade.h:5
-msgid "January"
-msgstr "Ionawr"
-
-#: ../calendar/gui/goto-dialog.glade.h:6
-msgid "July"
-msgstr "Gorffennaf"
-
-#: ../calendar/gui/goto-dialog.glade.h:7
-msgid "June"
-msgstr "Mehefin"
-
-#: ../calendar/gui/goto-dialog.glade.h:8
-msgid "March"
-msgstr "Mawrth"
-
-#: ../calendar/gui/goto-dialog.glade.h:9
-msgid "May"
-msgstr "Mai"
-
-#: ../calendar/gui/goto-dialog.glade.h:10
-msgid "November"
-msgstr "Tachwedd"
-
-#: ../calendar/gui/goto-dialog.glade.h:11
-msgid "October"
-msgstr "Hydref"
+msgid ""
+"January\n"
+"February\n"
+"March\n"
+"April\n"
+"May\n"
+"June\n"
+"July\n"
+"August\n"
+"September\n"
+"October\n"
+"November\n"
+"December"
+msgstr ""
+"Ionawr\n"
+"Chwefror\n"
+"Mawrth\n"
+"Ebrill\n"
+"Mai\n"
+"Mehefin\n"
+"Gorffenaf\n"
+"Awst\n"
+"Medi\n"
+"Hydref\n"
+"Tachwedd\n"
+"Rhagfyr"
 
-#: ../calendar/gui/goto-dialog.glade.h:12
+#: ../calendar/gui/goto-dialog.glade.h:13
 msgid "Select Date"
 msgstr "Dewis Dyddiad"
 
-#: ../calendar/gui/goto-dialog.glade.h:13
-msgid "September"
-msgstr "Medi"
-
 #: ../calendar/gui/goto-dialog.glade.h:14
 msgid "_Select Today"
 msgstr "Dewis _Heddiw"
 
-#: ../calendar/gui/itip-utils.c:412 ../calendar/gui/itip-utils.c:461
-#: ../calendar/gui/itip-utils.c:563
+#: ../calendar/gui/itip-utils.c:409
+#: ../calendar/gui/itip-utils.c:460
+#: ../calendar/gui/itip-utils.c:548
 msgid "An organizer must be set."
 msgstr "Rhaid gosod trefnydd."
 
-#: ../calendar/gui/itip-utils.c:448
+#: ../calendar/gui/itip-utils.c:452
 msgid "At least one attendee is necessary"
 msgstr "Rhaid bod un neu fwy o fynychwyr"
 
-#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:772
+#: ../calendar/gui/itip-utils.c:630
+#: ../calendar/gui/itip-utils.c:776
 msgid "Event information"
 msgstr "Gwybodaeth digwyddiad"
 
-#: ../calendar/gui/itip-utils.c:651 ../calendar/gui/itip-utils.c:774
+#: ../calendar/gui/itip-utils.c:632
+#: ../calendar/gui/itip-utils.c:779
 msgid "Task information"
 msgstr "Gwybodaeth Tasg"
 
-#: ../calendar/gui/itip-utils.c:653 ../calendar/gui/itip-utils.c:776
-msgid "Journal information"
-msgstr "Gwybodaeth dyddlyfr"
+#: ../calendar/gui/itip-utils.c:634
+#: ../calendar/gui/itip-utils.c:782
+msgid "Memo information"
+msgstr "Gwybodaeth memo"
 
-#: ../calendar/gui/itip-utils.c:655 ../calendar/gui/itip-utils.c:794
+#: ../calendar/gui/itip-utils.c:636
+#: ../calendar/gui/itip-utils.c:800
 msgid "Free/Busy information"
 msgstr "Gwybodaeth statws Rhydd/Prysur"
 
-#: ../calendar/gui/itip-utils.c:657
+#: ../calendar/gui/itip-utils.c:638
 msgid "Calendar information"
 msgstr "Gwybodaeth Calendr"
 
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:672
+msgctxt "Meeting"
+msgid "Accepted"
+msgstr "Derbyniwyd"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Tentatively Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:679
+#, fuzzy
+msgctxt "Meeting"
+msgid "Tentatively Accepted"
+msgstr "Wedi derbyn yn betrus"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Declined: Meeting Name".
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Declined: Meeting Name".
+#: ../calendar/gui/itip-utils.c:686
+#: ../calendar/gui/itip-utils.c:734
+msgctxt "Meeting"
+msgid "Declined"
+msgstr "Gwrthododd"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Delegated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:693
+msgctxt "Meeting"
+msgid "Delegated"
+msgstr "Dirprwywyd"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Updated: Meeting Name".
 #: ../calendar/gui/itip-utils.c:706
+msgctxt "Meeting"
 msgid "Updated"
 msgstr "Diweddarwyd"
 
-#: ../calendar/gui/itip-utils.c:714
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Cancel: Meeting Name".
+#: ../calendar/gui/itip-utils.c:713
+msgctxt "Meeting"
+msgid "Cancel"
+msgstr "Diddymu"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Refresh: Meeting Name".
+#: ../calendar/gui/itip-utils.c:720
+msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Adnewyddu"
 
-#: ../calendar/gui/itip-utils.c:718
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Counter-proposal: Meeting Name".
+#: ../calendar/gui/itip-utils.c:727
+#, fuzzy
+msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Gwrthgynnig"
 
-#: ../calendar/gui/itip-utils.c:790
+#: ../calendar/gui/itip-utils.c:797
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Gwybodaeth statws Rhydd/Prysur (%s i %s)"
 
-#: ../calendar/gui/itip-utils.c:800
+#: ../calendar/gui/itip-utils.c:805
 msgid "iCalendar information"
 msgstr "Gwybodaeth iCalendr"
 
-#: ../calendar/gui/itip-utils.c:955
+#: ../calendar/gui/itip-utils.c:976
 msgid "You must be an attendee of the event."
 msgstr "Rhaid i chi fod yn mynychu'r digwyddiad."
 
-#: ../calendar/gui/memos-component.c:451
+#: ../calendar/gui/memos-component.c:477
 msgid "_New Memo List"
 msgstr "_Rhestr Femo Newydd"
 
-#: ../calendar/gui/memos-component.c:527
+#: ../calendar/gui/memos-component.c:560
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
@@ -8175,7 +7320,8 @@ msgstr[0] "%d memo"
 msgstr[1] "%d memo"
 msgstr[2] "%d memo"
 
-#: ../calendar/gui/memos-component.c:529 ../calendar/gui/tasks-component.c:520
+#: ../calendar/gui/memos-component.c:562
+#: ../calendar/gui/tasks-component.c:555
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -8183,319 +7329,311 @@ msgstr[0] ", %d wedi dewis"
 msgstr[1] ", %d wedi dewis"
 msgstr[2] ", %d wedi dewis"
 
-#: ../calendar/gui/memos-component.c:576
+#: ../calendar/gui/memos-component.c:609
 msgid "Failed upgrading memos."
 msgstr "Methwyd uwchraddio memos."
 
-#: ../calendar/gui/memos-component.c:874
+#: ../calendar/gui/memos-component.c:739
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
-msgstr ""
-"Methu agor y rhestr dasgau '%s' er mwyn creu cyfarfodydd a digwyddiadau"
+msgstr "Methu agor y rhestr dasgau '%s' er mwyn creu cyfarfodydd a digwyddiadau"
 
-#: ../calendar/gui/memos-component.c:887
+#: ../calendar/gui/memos-component.c:752
 msgid "There is no calendar available for creating memos"
 msgstr "Does dim calendr ar gael er mwyn creu tasgau"
 
-#: ../calendar/gui/memos-component.c:983
+#: ../calendar/gui/memos-component.c:862
 msgid "Memo Source Selector"
 msgstr "Dewisydd Ffynhonnell Memo"
 
-#: ../calendar/gui/memos-component.c:1166
+#: ../calendar/gui/memos-component.c:1041
 msgid "New memo"
 msgstr "Memo Newydd"
 
-#: ../calendar/gui/memos-component.c:1167
+#: ../calendar/gui/memos-component.c:1042
+msgctxt "New"
 msgid "Mem_o"
 msgstr "Mem_o"
 
-#: ../calendar/gui/memos-component.c:1168
+#: ../calendar/gui/memos-component.c:1043
 msgid "Create a new memo"
 msgstr "Creu memo newydd"
 
-#: ../calendar/gui/memos-component.c:1174
+#: ../calendar/gui/memos-component.c:1049
 msgid "New shared memo"
 msgstr "Memo newydd wedi'i rannu"
 
-#: ../calendar/gui/memos-component.c:1175
+#: ../calendar/gui/memos-component.c:1050
+msgctxt "New"
 msgid "_Shared memo"
 msgstr "_Memo wedi rhannu"
 
-#: ../calendar/gui/memos-component.c:1176
+#: ../calendar/gui/memos-component.c:1051
 msgid "Create a shared new memo"
 msgstr "Creu memo newydd wedi'i rannu"
 
-#: ../calendar/gui/memos-component.c:1182
+#: ../calendar/gui/memos-component.c:1057
 msgid "New memo list"
 msgstr "Rhestr femo newydd"
 
-#: ../calendar/gui/memos-component.c:1183
+#: ../calendar/gui/memos-component.c:1058
+msgctxt "New"
 msgid "Memo li_st"
 msgstr "_Rhestr femos"
 
-#: ../calendar/gui/memos-component.c:1184
+#: ../calendar/gui/memos-component.c:1059
 msgid "Create a new memo list"
 msgstr "Creu rhestr femos newydd"
 
-#: ../calendar/gui/memos-control.c:336 ../calendar/gui/memos-control.c:352
+#: ../calendar/gui/memos-control.c:386
+#: ../calendar/gui/memos-control.c:402
 msgid "Print Memos"
 msgstr "Argraffu Memos"
 
-#: ../calendar/gui/migration.c:164
+#: ../calendar/gui/migration.c:157
 msgid ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
+"The location and hierarchy of the Evolution task folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Mae lleoliad a strwythur plygellau tasgau Evolution wedi newid ers Evolution "
-"1.x\n"
+"Mae lleoliad a strwythur plygellau tasgau Evolution wedi newid ers Evolution 1.x\n"
 "\n"
 "Byddwch yn amyneddgar nes i Evolution fudo'ch plygellau..."
 
-#: ../calendar/gui/migration.c:168
+#: ../calendar/gui/migration.c:161
 msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed "
-"since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution calendar folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Mae lleoliad a strwythur plygellau calendr Evolution wedi newid ers "
-"Evolution 1.x\n"
+"Mae lleoliad a strwythur plygellau calendr Evolution wedi newid ers Evolution 1.x\n"
 "\n"
 "Byddwch yn amyneddgar nes i Evolution fudo'ch plygellau..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:770 ../calendar/gui/migration.c:938
+#: ../calendar/gui/migration.c:774
+#: ../calendar/gui/migration.c:942
+#, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Methu mudo hen osodiadau o evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:799
+#: ../calendar/gui/migration.c:803
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Methu mudo'r calendr `%s'"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:967
+#: ../calendar/gui/migration.c:971
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Methu mudo'r tasgau `%s'"
 
-#: ../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
+#: ../calendar/gui/print.c:511
 msgid "1st"
 msgstr "1af"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:511
 msgid "2nd"
 msgstr "2il"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:511
 msgid "3rd"
 msgstr "3ydd"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:511
 msgid "4th"
 msgstr "4ydd"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:511
 msgid "5th"
 msgstr "5ed"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:512
 msgid "6th"
 msgstr "6ed"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:512
 msgid "7th"
 msgstr "7fed"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:512
 msgid "8th"
 msgstr "8fed"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:512
 msgid "9th"
 msgstr "9fed"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:512
 msgid "10th"
 msgstr "10fed"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:513
 msgid "11th"
 msgstr "11eg"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:513
 msgid "12th"
 msgstr "12fed"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:513
 msgid "13th"
 msgstr "13eg"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:513
 msgid "14th"
 msgstr "14eg"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:513
 msgid "15th"
 msgstr "15fed"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:514
 msgid "16th"
 msgstr "16eg"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:514
 msgid "17th"
 msgstr "17eg"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:514
 msgid "18th"
 msgstr "18fed"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:514
 msgid "19th"
 msgstr "19eg"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:514
 msgid "20th"
 msgstr "20fed"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:515
 msgid "21st"
 msgstr "21ain"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:515
 msgid "22nd"
 msgstr "22ain"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:515
 msgid "23rd"
 msgstr "23ain"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:515
 msgid "24th"
 msgstr "24ain"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:515
 msgid "25th"
 msgstr "25ain"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:516
 msgid "26th"
 msgstr "26ain"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:516
 msgid "27th"
 msgstr "27ain"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:516
 msgid "28th"
 msgstr "28ain"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:516
 msgid "29th"
 msgstr "29ain"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:516
 msgid "30th"
 msgstr "30ain"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:517
 msgid "31st"
 msgstr "31ain"
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:593
 msgid "Su"
 msgstr "Sul"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:593
 msgid "Mo"
 msgstr "Llu"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:593
 msgid "Tu"
 msgstr "Maw"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:593
 msgid "We"
 msgstr "Mer"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:594
 msgid "Th"
 msgstr "Iau"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:594
 msgid "Fr"
 msgstr "Gwe"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:594
 msgid "Sa"
 msgstr "Sad"
 
-#: ../calendar/gui/print.c:2283
+#: ../calendar/gui/print.c:2465
 msgid "Appointment"
 msgstr "Apwyntiad"
 
-#: ../calendar/gui/print.c:2285
+#: ../calendar/gui/print.c:2467
 msgid "Task"
 msgstr "Tasg"
 
-#: ../calendar/gui/print.c:2307
+#: ../calendar/gui/print.c:2492
 #, c-format
 msgid "Summary: %s"
 msgstr "Crynodeb: %s"
 
-#: ../calendar/gui/print.c:2358
+#: ../calendar/gui/print.c:2515
+msgid "Attendees: "
+msgstr "Mynychwyr:"
+
+#: ../calendar/gui/print.c:2555
 #, c-format
 msgid "Status: %s"
 msgstr "Statws: %s"
 
-#: ../calendar/gui/print.c:2375
+#: ../calendar/gui/print.c:2569
 #, c-format
 msgid "Priority: %s"
 msgstr "Blaenoriaeth: %s"
 
-#: ../calendar/gui/print.c:2387
+#: ../calendar/gui/print.c:2584
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Canran wedi'i Gwblhau: %i"
 
-#: ../calendar/gui/print.c:2399
+#: ../calendar/gui/print.c:2595
 #, c-format
 msgid "URL: %s"
 msgstr "LAU: %s"
 
-#: ../calendar/gui/print.c:2412
+#: ../calendar/gui/print.c:2608
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorïau: %s"
 
-#: ../calendar/gui/print.c:2423
+#: ../calendar/gui/print.c:2619
 msgid "Contacts: "
 msgstr "Cysylltiadau: "
 
-#. 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:442
+#: ../calendar/gui/tasks-component.c:470
 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:518
+#: ../calendar/gui/tasks-component.c:553
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -8503,1844 +7641,2008 @@ msgstr[0] "%d tasg"
 msgstr[1] "%d dasg"
 msgstr[2] "%d tasg"
 
-#: ../calendar/gui/tasks-component.c:567
+#: ../calendar/gui/tasks-component.c:602
 msgid "Failed upgrading tasks."
 msgstr "Methwyd uwchraddio tasgau."
 
-#: ../calendar/gui/tasks-component.c:878
+#: ../calendar/gui/tasks-component.c:735
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr ""
-"Methu agor y rhestr dasgau '%s' er mwyn creu cyfarfodydd a digwyddiadau"
+msgstr "Methu agor y rhestr dasgau '%s' er mwyn creu cyfarfodydd a digwyddiadau"
 
-#: ../calendar/gui/tasks-component.c:891
+#: ../calendar/gui/tasks-component.c:748
 msgid "There is no calendar available for creating tasks"
 msgstr "Does dim calendr ar gael er mwyn creu tasgau"
 
-#: ../calendar/gui/tasks-component.c:988
+#: ../calendar/gui/tasks-component.c:859
 msgid "Task Source Selector"
 msgstr "Dewisydd Ffynhonnell Dasg"
 
-#: ../calendar/gui/tasks-component.c:1244
+#: ../calendar/gui/tasks-component.c:1113
 msgid "New task"
 msgstr "Tasg newydd"
 
-#: ../calendar/gui/tasks-component.c:1246
+#: ../calendar/gui/tasks-component.c:1114
+msgctxt "New"
+msgid "_Task"
+msgstr "_Tasg"
+
+#: ../calendar/gui/tasks-component.c:1115
 msgid "Create a new task"
 msgstr "Creu tasg newydd"
 
-#: ../calendar/gui/tasks-component.c:1252
+#: ../calendar/gui/tasks-component.c:1121
 msgid "New assigned task"
 msgstr "Tasg newydd wedi'i neilltuo"
 
-#: ../calendar/gui/tasks-component.c:1253
+#: ../calendar/gui/tasks-component.c:1122
+#, fuzzy
+msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Tasg wedi'i _Neilltuo"
 
-#: ../calendar/gui/tasks-component.c:1254
+#: ../calendar/gui/tasks-component.c:1123
 msgid "Create a new assigned task"
 msgstr "Creu tasg newydd wedi'i neilltuo"
 
-#: ../calendar/gui/tasks-component.c:1260
+#: ../calendar/gui/tasks-component.c:1129
 msgid "New task list"
 msgstr "Rhestr dasgau newydd"
 
-#: ../calendar/gui/tasks-component.c:1261
+#: ../calendar/gui/tasks-component.c:1130
+msgctxt "New"
 msgid "Tas_k list"
 msgstr "Rhestr _dasgau"
 
-#: ../calendar/gui/tasks-component.c:1262
+#: ../calendar/gui/tasks-component.c:1131
 msgid "Create a new task list"
 msgstr "Creu rhestr dasgau newydd"
 
-#: ../calendar/gui/tasks-control.c:438
+#: ../calendar/gui/tasks-control.c:484
 msgid ""
-"This operation will permanently erase all tasks marked as completed. If you "
-"continue, you will not be able to recover these tasks.\n"
+"This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"Bydd y weithred hon yn dileu'n barhaol bob tasg sydd wedi'i marcio wedi'i "
-"chwblhau. Os wnewch chi barhau, fedrwch chi ddim adfer y tasgau yma.\n"
+"Bydd y weithred hon yn dileu'n barhaol bob tasg sydd wedi'i marcio wedi'i chwblhau. Os wnewch chi barhau, fedrwch chi ddim adfer y tasgau yma.\n"
 "\n"
 "Dileu'r tasgau yma go iawn?"
 
-#: ../calendar/gui/tasks-control.c:441
+#: ../calendar/gui/tasks-control.c:487
+#: ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "Peidiwch â gofyn eto"
 
-#: ../calendar/gui/tasks-control.c:478 ../calendar/gui/tasks-control.c:494
+#: ../calendar/gui/tasks-control.c:524
+#: ../calendar/gui/tasks-control.c:540
 msgid "Print Tasks"
 msgstr "Argraffu Tasgau"
 
-#. The first letter of each day of the week starting with Sunday
-#: ../calendar/gui/weekday-picker.c:319
-msgid "SMTWTFS"
-msgstr "SLMMIGS"
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% Cyflawn"
+
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Cancelled"
+msgstr "Diddymwyd"
+
+#: ../calendar/gui/tasktypes.xml.h:15
+msgid "In progress"
+msgstr "Ar waith"
 
-#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/gui/tasktypes.xml.h:28
+#: ../mail/em-filter-i18n.h:35
+msgid "is greater than"
+msgstr "yn fwy na"
+
+#: ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/em-filter-i18n.h:36
+msgid "is less than"
+msgstr "yn llai na"
+
+#: ../calendar/importers/icalendar-importer.c:75
 msgid "Appointments and Meetings"
 msgstr "Cyfarfodydd a Thasgau"
 
-#: ../calendar/importers/icalendar-importer.c:337
-#: ../calendar/importers/icalendar-importer.c:620
+#: ../calendar/importers/icalendar-importer.c:335
+#: ../calendar/importers/icalendar-importer.c:630
+#: ../plugins/itip-formatter/itip-formatter.c:1728
 msgid "Opening calendar"
 msgstr "Agor calendr"
 
-#: ../calendar/importers/icalendar-importer.c:444
+#: ../calendar/importers/icalendar-importer.c:442
 msgid "iCalendar files (.ics)"
 msgstr "Ffeiliau iCalendr (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:445
+#: ../calendar/importers/icalendar-importer.c:443
 msgid "Evolution iCalendar importer"
 msgstr "Mewnforydd Evolution iCalendar"
 
-#: ../calendar/importers/icalendar-importer.c:521
+#: ../calendar/importers/icalendar-importer.c:531
 msgid "Reminder!"
 msgstr "Atgof!"
 
-#: ../calendar/importers/icalendar-importer.c:573
+#: ../calendar/importers/icalendar-importer.c:583
 msgid "vCalendar files (.vcf)"
 msgstr "Ffeiliau iCalendr (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:574
+#: ../calendar/importers/icalendar-importer.c:584
 msgid "Evolution vCalendar importer"
 msgstr "Mewnforydd Evolution vCalendar"
 
-#: ../calendar/importers/icalendar-importer.c:736
+#: ../calendar/importers/icalendar-importer.c:746
 msgid "Calendar Events"
 msgstr "Digwyddiadau Calendr"
 
-#: ../calendar/importers/icalendar-importer.c:773
+#: ../calendar/importers/icalendar-importer.c:783
 msgid "Evolution Calendar intelligent importer"
 msgstr "Mewnforiwr deallus Calendr Evolution"
 
 #.
+#. *
+#. * This program is free software; you can redistribute it and/or
+#. * modify it under the terms of the GNU Lesser General Public
+#. * License as published by the Free Software Foundation; either
+#. * version 2 of the License, or (at your option) version 3.
+#. *
+#. * This program is distributed in the hope that it will be useful,
+#. * but WITHOUT ANY WARRANTY; without even the implied warranty of
+#. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#. * Lesser General Public License for more details.
+#. *
+#. * You should have received a copy of the GNU Lesser General Public
+#. * License along with the program; if not, see <http://www.gnu.org/licenses/>
+#. *
+#. *
+#. * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+#. *
+#.
+#.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
 #. * Don't include in any C files.
 #.
-#: ../calendar/zones.h:7
+#: ../calendar/zones.h:26
 msgid "Africa/Abidjan"
 msgstr "Affrica/Abidjan"
 
-#: ../calendar/zones.h:8
+#: ../calendar/zones.h:27
 msgid "Africa/Accra"
 msgstr "Affrica/Accra"
 
-#: ../calendar/zones.h:9
+#: ../calendar/zones.h:28
 msgid "Africa/Addis_Ababa"
 msgstr "Affrica/Addis_Ababa"
 
-#: ../calendar/zones.h:10
+#: ../calendar/zones.h:29
 msgid "Africa/Algiers"
 msgstr "Affrica/Algiers"
 
-#: ../calendar/zones.h:11
+#: ../calendar/zones.h:30
 msgid "Africa/Asmera"
 msgstr "Affrica/Asmera"
 
-#: ../calendar/zones.h:12
+#: ../calendar/zones.h:31
 msgid "Africa/Bamako"
 msgstr "Affrica/Bamako"
 
-#: ../calendar/zones.h:13
+#: ../calendar/zones.h:32
 msgid "Africa/Bangui"
 msgstr "Affrica/Bangui"
 
-#: ../calendar/zones.h:14
+#: ../calendar/zones.h:33
 msgid "Africa/Banjul"
 msgstr "Affrica/Banjul"
 
-#: ../calendar/zones.h:15
+#: ../calendar/zones.h:34
 msgid "Africa/Bissau"
 msgstr "Affrica/Bissau"
 
-#: ../calendar/zones.h:16
+#: ../calendar/zones.h:35
 msgid "Africa/Blantyre"
 msgstr "Affrica/Blantyre"
 
-#: ../calendar/zones.h:17
+#: ../calendar/zones.h:36
 msgid "Africa/Brazzaville"
 msgstr "Affrica/Brazzaville"
 
-#: ../calendar/zones.h:18
+#: ../calendar/zones.h:37
 msgid "Africa/Bujumbura"
 msgstr "Affrica/Bujumbura"
 
-#: ../calendar/zones.h:19
+#: ../calendar/zones.h:38
 msgid "Africa/Cairo"
 msgstr "Affrica/Cairo"
 
-#: ../calendar/zones.h:20
+#: ../calendar/zones.h:39
 msgid "Africa/Casablanca"
 msgstr "Affrica/Casablanca"
 
-#: ../calendar/zones.h:21
+#: ../calendar/zones.h:40
 msgid "Africa/Ceuta"
 msgstr "Affrica/Ceuta"
 
-#: ../calendar/zones.h:22
+#: ../calendar/zones.h:41
 msgid "Africa/Conakry"
 msgstr "Affrica/Conakry"
 
-#: ../calendar/zones.h:23
+#: ../calendar/zones.h:42
 msgid "Africa/Dakar"
 msgstr "Affrica/Dakar"
 
-#: ../calendar/zones.h:24
+#: ../calendar/zones.h:43
 msgid "Africa/Dar_es_Salaam"
 msgstr "Affrica/Dar_es_Salaam"
 
-#: ../calendar/zones.h:25
+#: ../calendar/zones.h:44
 msgid "Africa/Djibouti"
 msgstr "Affrica/Djibouti"
 
-#: ../calendar/zones.h:26
+#: ../calendar/zones.h:45
 msgid "Africa/Douala"
 msgstr "Affrica/Douala"
 
-#: ../calendar/zones.h:27
+#: ../calendar/zones.h:46
 msgid "Africa/El_Aaiun"
 msgstr "Affrica/El_Aaiun"
 
-#: ../calendar/zones.h:28
+#: ../calendar/zones.h:47
 msgid "Africa/Freetown"
 msgstr "Affrica/Freetown"
 
-#: ../calendar/zones.h:29
+#: ../calendar/zones.h:48
 msgid "Africa/Gaborone"
 msgstr "Affrica/Gaborone"
 
-#: ../calendar/zones.h:30
+#: ../calendar/zones.h:49
 msgid "Africa/Harare"
 msgstr "Affrica/Harare"
 
-#: ../calendar/zones.h:31
+#: ../calendar/zones.h:50
 msgid "Africa/Johannesburg"
 msgstr "Affrica/Johannesburg"
 
-#: ../calendar/zones.h:32
+#: ../calendar/zones.h:51
 msgid "Africa/Kampala"
 msgstr "Affrica/Kampala"
 
-#: ../calendar/zones.h:33
+#: ../calendar/zones.h:52
 msgid "Africa/Khartoum"
 msgstr "Affrica/Khartoum"
 
-#: ../calendar/zones.h:34
+#: ../calendar/zones.h:53
 msgid "Africa/Kigali"
 msgstr "Affrica/Kigali"
 
-#: ../calendar/zones.h:35
+#: ../calendar/zones.h:54
 msgid "Africa/Kinshasa"
 msgstr "Affrica/Kinshasa"
 
-#: ../calendar/zones.h:36
+#: ../calendar/zones.h:55
 msgid "Africa/Lagos"
 msgstr "Affrica/Lagos"
 
-#: ../calendar/zones.h:37
+#: ../calendar/zones.h:56
 msgid "Africa/Libreville"
 msgstr "Affrica/Libreville"
 
-#: ../calendar/zones.h:38
+#: ../calendar/zones.h:57
 msgid "Africa/Lome"
 msgstr "Affrica/Lome"
 
-#: ../calendar/zones.h:39
+#: ../calendar/zones.h:58
 msgid "Africa/Luanda"
 msgstr "Affrica/Luanda"
 
-#: ../calendar/zones.h:40
+#: ../calendar/zones.h:59
 msgid "Africa/Lubumbashi"
 msgstr "Affrica/Lubumbashi"
 
-#: ../calendar/zones.h:41
+#: ../calendar/zones.h:60
 msgid "Africa/Lusaka"
 msgstr "Affrica/Lusaka"
 
-#: ../calendar/zones.h:42
+#: ../calendar/zones.h:61
 msgid "Africa/Malabo"
 msgstr "Affrica/Malabo"
 
-#: ../calendar/zones.h:43
+#: ../calendar/zones.h:62
 msgid "Africa/Maputo"
 msgstr "Affrica/Maputo"
 
-#: ../calendar/zones.h:44
+#: ../calendar/zones.h:63
 msgid "Africa/Maseru"
 msgstr "Affrica/Maseru"
 
-#: ../calendar/zones.h:45
+#: ../calendar/zones.h:64
 msgid "Africa/Mbabane"
 msgstr "Affrica/Mbabane"
 
-#: ../calendar/zones.h:46
+#: ../calendar/zones.h:65
 msgid "Africa/Mogadishu"
 msgstr "Affrica/Mogadishu"
 
-#: ../calendar/zones.h:47
+#: ../calendar/zones.h:66
 msgid "Africa/Monrovia"
 msgstr "Affrica/Monrovia"
 
-#: ../calendar/zones.h:48
+#: ../calendar/zones.h:67
 msgid "Africa/Nairobi"
 msgstr "Affrica/Nairobi"
 
-#: ../calendar/zones.h:49
+#: ../calendar/zones.h:68
 msgid "Africa/Ndjamena"
 msgstr "Affrica/Ndjamena"
 
-#: ../calendar/zones.h:50
+#: ../calendar/zones.h:69
 msgid "Africa/Niamey"
 msgstr "Affrica/Niamey"
 
-#: ../calendar/zones.h:51
+#: ../calendar/zones.h:70
 msgid "Africa/Nouakchott"
 msgstr "Affrica/Nouakchott"
 
-#: ../calendar/zones.h:52
+#: ../calendar/zones.h:71
 msgid "Africa/Ouagadougou"
 msgstr "Affrica/Ouagadougou"
 
-#: ../calendar/zones.h:53
+#: ../calendar/zones.h:72
 msgid "Africa/Porto-Novo"
 msgstr "Affrica/Porto-Novo"
 
-#: ../calendar/zones.h:54
+#: ../calendar/zones.h:73
 msgid "Africa/Sao_Tome"
 msgstr "Affrica/Sao_Tome"
 
-#: ../calendar/zones.h:55
+#: ../calendar/zones.h:74
 msgid "Africa/Timbuktu"
 msgstr "Affrica/Timbuktu"
 
-#: ../calendar/zones.h:56
+#: ../calendar/zones.h:75
 msgid "Africa/Tripoli"
 msgstr "Affrica/Tripoli"
 
-#: ../calendar/zones.h:57
+#: ../calendar/zones.h:76
 msgid "Africa/Tunis"
 msgstr "Affrica/Tunis"
 
-#: ../calendar/zones.h:58
+#: ../calendar/zones.h:77
 msgid "Africa/Windhoek"
 msgstr "Affrica/Windhoek"
 
-#: ../calendar/zones.h:59
+#: ../calendar/zones.h:78
 msgid "America/Adak"
 msgstr "America/Adak"
 
-#: ../calendar/zones.h:60
+#: ../calendar/zones.h:79
 msgid "America/Anchorage"
 msgstr "America/Anchorage"
 
-#: ../calendar/zones.h:61
+#: ../calendar/zones.h:80
 msgid "America/Anguilla"
 msgstr "America/Anguilla"
 
-#: ../calendar/zones.h:62
+#: ../calendar/zones.h:81
 msgid "America/Antigua"
 msgstr "America/Antigua"
 
-#: ../calendar/zones.h:63
+#: ../calendar/zones.h:82
 msgid "America/Araguaina"
 msgstr "America/Araguaina"
 
-#: ../calendar/zones.h:64
+#: ../calendar/zones.h:83
 msgid "America/Aruba"
 msgstr "America/Aruba"
 
-#: ../calendar/zones.h:65
+#: ../calendar/zones.h:84
 msgid "America/Asuncion"
 msgstr "America/Asuncion"
 
-#: ../calendar/zones.h:66
+#: ../calendar/zones.h:85
 msgid "America/Barbados"
 msgstr "America/Barbados"
 
-#: ../calendar/zones.h:67
+#: ../calendar/zones.h:86
 msgid "America/Belem"
 msgstr "America/Belem"
 
-#: ../calendar/zones.h:68
+#: ../calendar/zones.h:87
 msgid "America/Belize"
 msgstr "America/Belize"
 
-#: ../calendar/zones.h:69
+#: ../calendar/zones.h:88
 msgid "America/Boa_Vista"
 msgstr "America/Boa_Vista"
 
-#: ../calendar/zones.h:70
+#: ../calendar/zones.h:89
 msgid "America/Bogota"
 msgstr "America/Bogota"
 
-#: ../calendar/zones.h:71
+#: ../calendar/zones.h:90
 msgid "America/Boise"
 msgstr "America/Boise"
 
-#: ../calendar/zones.h:72
+#: ../calendar/zones.h:91
 msgid "America/Buenos_Aires"
 msgstr "America/Buenos_Aires"
 
-#: ../calendar/zones.h:73
+#: ../calendar/zones.h:92
 msgid "America/Cambridge_Bay"
 msgstr "America/Cambridge_Bay"
 
-#: ../calendar/zones.h:74
+#: ../calendar/zones.h:93
 msgid "America/Cancun"
 msgstr "America/Cancun"
 
-#: ../calendar/zones.h:75
+#: ../calendar/zones.h:94
 msgid "America/Caracas"
 msgstr "America/Caracas"
 
-#: ../calendar/zones.h:76
+#: ../calendar/zones.h:95
 msgid "America/Catamarca"
 msgstr "America/Catamarca"
 
-#: ../calendar/zones.h:77
+#: ../calendar/zones.h:96
 msgid "America/Cayenne"
 msgstr "America/Cayenne"
 
-#: ../calendar/zones.h:78
+#: ../calendar/zones.h:97
 msgid "America/Cayman"
 msgstr "America/Cayman"
 
-#: ../calendar/zones.h:79
+#: ../calendar/zones.h:98
 msgid "America/Chicago"
 msgstr "America/Chicago"
 
-#: ../calendar/zones.h:80
+#: ../calendar/zones.h:99
 msgid "America/Chihuahua"
 msgstr "America/Chihuahua"
 
-#: ../calendar/zones.h:81
+#: ../calendar/zones.h:100
 msgid "America/Cordoba"
 msgstr "America/Cordoba"
 
-#: ../calendar/zones.h:82
+#: ../calendar/zones.h:101
 msgid "America/Costa_Rica"
 msgstr "America/Costa_Rica"
 
-#: ../calendar/zones.h:83
+#: ../calendar/zones.h:102
 msgid "America/Cuiaba"
 msgstr "America/Cuiaba"
 
-#: ../calendar/zones.h:84
+#: ../calendar/zones.h:103
 msgid "America/Curacao"
 msgstr "America/Curacao"
 
-#: ../calendar/zones.h:85
+#: ../calendar/zones.h:104
 msgid "America/Danmarkshavn"
 msgstr "America/Danmarkshavn"
 
-#: ../calendar/zones.h:86
+#: ../calendar/zones.h:105
 msgid "America/Dawson"
 msgstr "America/Dawson"
 
-#: ../calendar/zones.h:87
+#: ../calendar/zones.h:106
 msgid "America/Dawson_Creek"
 msgstr "America/Dawson_Creek"
 
-#: ../calendar/zones.h:88
+#: ../calendar/zones.h:107
 msgid "America/Denver"
 msgstr "America/Denver"
 
-#: ../calendar/zones.h:89
+#: ../calendar/zones.h:108
 msgid "America/Detroit"
 msgstr "America/Detroit"
 
-#: ../calendar/zones.h:90
+#: ../calendar/zones.h:109
 msgid "America/Dominica"
 msgstr "America/Dominica"
 
-#: ../calendar/zones.h:91
+#: ../calendar/zones.h:110
 msgid "America/Edmonton"
 msgstr "America/Edmonton"
 
-#: ../calendar/zones.h:92
+#: ../calendar/zones.h:111
 msgid "America/Eirunepe"
 msgstr "America/Eirunepe"
 
-#: ../calendar/zones.h:93
+#: ../calendar/zones.h:112
 msgid "America/El_Salvador"
 msgstr "America/El_Salvador"
 
-#: ../calendar/zones.h:94
+#: ../calendar/zones.h:113
 msgid "America/Fortaleza"
 msgstr "America/Fortaleza"
 
-#: ../calendar/zones.h:95
+#: ../calendar/zones.h:114
 msgid "America/Glace_Bay"
 msgstr "America/Glace_Bay"
 
-#: ../calendar/zones.h:96
+#: ../calendar/zones.h:115
 msgid "America/Godthab"
 msgstr "America/Godthab"
 
-#: ../calendar/zones.h:97
+#: ../calendar/zones.h:116
 msgid "America/Goose_Bay"
 msgstr "America/Goose_Bay"
 
-#: ../calendar/zones.h:98
+#: ../calendar/zones.h:117
 msgid "America/Grand_Turk"
 msgstr "America/Grand_Turk"
 
-#: ../calendar/zones.h:99
+#: ../calendar/zones.h:118
 msgid "America/Grenada"
 msgstr "America/Grenada"
 
-#: ../calendar/zones.h:100
+#: ../calendar/zones.h:119
 msgid "America/Guadeloupe"
 msgstr "America/Guadeloupe"
 
-#: ../calendar/zones.h:101
+#: ../calendar/zones.h:120
 msgid "America/Guatemala"
 msgstr "America/Guatemala"
 
-#: ../calendar/zones.h:102
+#: ../calendar/zones.h:121
 msgid "America/Guayaquil"
 msgstr "America/Guayaquil"
 
-#: ../calendar/zones.h:103
+#: ../calendar/zones.h:122
 msgid "America/Guyana"
 msgstr "America/Guyana"
 
-#: ../calendar/zones.h:104
+#: ../calendar/zones.h:123
 msgid "America/Halifax"
 msgstr "America/Halifax"
 
-#: ../calendar/zones.h:105
+#: ../calendar/zones.h:124
 msgid "America/Havana"
 msgstr "America/Havana"
 
-#: ../calendar/zones.h:106
+#: ../calendar/zones.h:125
 msgid "America/Hermosillo"
 msgstr "America/Hermosillo"
 
-#: ../calendar/zones.h:107
+#: ../calendar/zones.h:126
 msgid "America/Indiana/Indianapolis"
 msgstr "America/Indiana/Indianapolis"
 
-#: ../calendar/zones.h:108
+#: ../calendar/zones.h:127
 msgid "America/Indiana/Knox"
 msgstr "America/Indiana/Knox"
 
-#: ../calendar/zones.h:109
+#: ../calendar/zones.h:128
 msgid "America/Indiana/Marengo"
 msgstr "America/Indiana/Marengo"
 
-#: ../calendar/zones.h:110
+#: ../calendar/zones.h:129
 msgid "America/Indiana/Vevay"
 msgstr "America/Indiana/Vevay"
 
-#: ../calendar/zones.h:111
+#: ../calendar/zones.h:130
 msgid "America/Indianapolis"
 msgstr "America/Indianapolis"
 
-#: ../calendar/zones.h:112
+#: ../calendar/zones.h:131
 msgid "America/Inuvik"
 msgstr "America/Inuvik"
 
-#: ../calendar/zones.h:113
+#: ../calendar/zones.h:132
 msgid "America/Iqaluit"
 msgstr "America/Iqaluit"
 
-#: ../calendar/zones.h:114
+#: ../calendar/zones.h:133
 msgid "America/Jamaica"
 msgstr "America/Jamaica"
 
-#: ../calendar/zones.h:115
+#: ../calendar/zones.h:134
 msgid "America/Jujuy"
 msgstr "America/Jujuy"
 
-#: ../calendar/zones.h:116
+#: ../calendar/zones.h:135
 msgid "America/Juneau"
 msgstr "America/Juneau"
 
-#: ../calendar/zones.h:117
+#: ../calendar/zones.h:136
 msgid "America/Kentucky/Louisville"
 msgstr "America/Kentucky/Louisville"
 
-#: ../calendar/zones.h:118
+#: ../calendar/zones.h:137
 msgid "America/Kentucky/Monticello"
 msgstr "America/Kentucky/Monticello"
 
-#: ../calendar/zones.h:119
+#: ../calendar/zones.h:138
 msgid "America/La_Paz"
 msgstr "America/La_Paz"
 
-#: ../calendar/zones.h:120
+#: ../calendar/zones.h:139
 msgid "America/Lima"
 msgstr "America/Lima"
 
-#: ../calendar/zones.h:121
+#: ../calendar/zones.h:140
 msgid "America/Los_Angeles"
 msgstr "America/Los_Angeles"
 
-#: ../calendar/zones.h:122
+#: ../calendar/zones.h:141
 msgid "America/Louisville"
 msgstr "America/Louisville"
 
-#: ../calendar/zones.h:123
+#: ../calendar/zones.h:142
 msgid "America/Maceio"
 msgstr "America/Maceio"
 
-#: ../calendar/zones.h:124
+#: ../calendar/zones.h:143
 msgid "America/Managua"
 msgstr "America/Managua"
 
-#: ../calendar/zones.h:125
+#: ../calendar/zones.h:144
 msgid "America/Manaus"
 msgstr "America/Manaus"
 
-#: ../calendar/zones.h:126
+#: ../calendar/zones.h:145
 msgid "America/Martinique"
 msgstr "America/Martinique"
 
-#: ../calendar/zones.h:127
+#: ../calendar/zones.h:146
 msgid "America/Mazatlan"
 msgstr "America/Mazatlan"
 
-#: ../calendar/zones.h:128
+#: ../calendar/zones.h:147
 msgid "America/Mendoza"
 msgstr "America/Mendoza"
 
-#: ../calendar/zones.h:129
+#: ../calendar/zones.h:148
 msgid "America/Menominee"
 msgstr "America/Menominee"
 
-#: ../calendar/zones.h:130
+#: ../calendar/zones.h:149
 msgid "America/Merida"
 msgstr "America/Merida"
 
-#: ../calendar/zones.h:131
+#: ../calendar/zones.h:150
 msgid "America/Mexico_City"
 msgstr "America/Mexico_City"
 
-#: ../calendar/zones.h:132
+#: ../calendar/zones.h:151
 msgid "America/Miquelon"
 msgstr "America/Miquelon"
 
-#: ../calendar/zones.h:133
+#: ../calendar/zones.h:152
 msgid "America/Monterrey"
 msgstr "America/Monterrey"
 
-#: ../calendar/zones.h:134
+#: ../calendar/zones.h:153
 msgid "America/Montevideo"
 msgstr "America/Montevideo"
 
-#: ../calendar/zones.h:135
+#: ../calendar/zones.h:154
 msgid "America/Montreal"
 msgstr "America/Montreal"
 
-#: ../calendar/zones.h:136
+#: ../calendar/zones.h:155
 msgid "America/Montserrat"
 msgstr "America/Montserrat"
 
-#: ../calendar/zones.h:137
+#: ../calendar/zones.h:156
 msgid "America/Nassau"
 msgstr "America/Nassau"
 
-#: ../calendar/zones.h:138
+#: ../calendar/zones.h:157
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "America/New_York"
 msgstr "America/New_York"
 
-#: ../calendar/zones.h:139
+#: ../calendar/zones.h:158
 msgid "America/Nipigon"
 msgstr "America/Nipigon"
 
-#: ../calendar/zones.h:140
+#: ../calendar/zones.h:159
 msgid "America/Nome"
 msgstr "America/Nome"
 
-#: ../calendar/zones.h:141
+#: ../calendar/zones.h:160
 msgid "America/Noronha"
 msgstr "America/Noronha"
 
-#: ../calendar/zones.h:142
+#: ../calendar/zones.h:161
 msgid "America/North_Dakota/Center"
 msgstr "America/North_Dakota/Center"
 
-#: ../calendar/zones.h:143
+#: ../calendar/zones.h:162
 msgid "America/Panama"
 msgstr "America/Panama"
 
-#: ../calendar/zones.h:144
+#: ../calendar/zones.h:163
 msgid "America/Pangnirtung"
 msgstr "America/Pangnirtung"
 
-#: ../calendar/zones.h:145
+#: ../calendar/zones.h:164
 msgid "America/Paramaribo"
 msgstr "America/Paramaribo"
 
-#: ../calendar/zones.h:146
+#: ../calendar/zones.h:165
 msgid "America/Phoenix"
 msgstr "America/Phoenix"
 
-#: ../calendar/zones.h:147
+#: ../calendar/zones.h:166
 msgid "America/Port-au-Prince"
 msgstr "America/Port-au-Prince"
 
-#: ../calendar/zones.h:148
+#: ../calendar/zones.h:167
 msgid "America/Port_of_Spain"
 msgstr "America/Port_of_Spain"
 
-#: ../calendar/zones.h:149
+#: ../calendar/zones.h:168
 msgid "America/Porto_Velho"
 msgstr "America/Porto_Velho"
 
-#: ../calendar/zones.h:150
+#: ../calendar/zones.h:169
 msgid "America/Puerto_Rico"
 msgstr "America/Puerto_Rico"
 
-#: ../calendar/zones.h:151
+#: ../calendar/zones.h:170
 msgid "America/Rainy_River"
 msgstr "America/Rainy_River"
 
-#: ../calendar/zones.h:152
+#: ../calendar/zones.h:171
 msgid "America/Rankin_Inlet"
 msgstr "America/Rankin_Inlet"
 
-#: ../calendar/zones.h:153
+#: ../calendar/zones.h:172
 msgid "America/Recife"
 msgstr "America/Recife"
 
-#: ../calendar/zones.h:154
+#: ../calendar/zones.h:173
 msgid "America/Regina"
 msgstr "America/Regina"
 
-#: ../calendar/zones.h:155
+#: ../calendar/zones.h:174
 msgid "America/Rio_Branco"
 msgstr "America/Rio_Branco"
 
-#: ../calendar/zones.h:156
+#: ../calendar/zones.h:175
 msgid "America/Rosario"
 msgstr "America/Rosario"
 
-#: ../calendar/zones.h:157
+#: ../calendar/zones.h:176
 msgid "America/Santiago"
 msgstr "America/Santiago"
 
-#: ../calendar/zones.h:158
+#: ../calendar/zones.h:177
 msgid "America/Santo_Domingo"
 msgstr "America/Santo_Domingo"
 
-#: ../calendar/zones.h:159
+#: ../calendar/zones.h:178
 msgid "America/Sao_Paulo"
 msgstr "America/Sao_Paulo"
 
-#: ../calendar/zones.h:160
+#: ../calendar/zones.h:179
 msgid "America/Scoresbysund"
 msgstr "America/Scoresbysund"
 
-#: ../calendar/zones.h:161
+#: ../calendar/zones.h:180
 msgid "America/Shiprock"
 msgstr "America/Shiprock"
 
-#: ../calendar/zones.h:162
+#: ../calendar/zones.h:181
 msgid "America/St_Johns"
 msgstr "America/St_Johns"
 
-#: ../calendar/zones.h:163
+#: ../calendar/zones.h:182
 msgid "America/St_Kitts"
 msgstr "America/St_Kitts"
 
-#: ../calendar/zones.h:164
+#: ../calendar/zones.h:183
 msgid "America/St_Lucia"
 msgstr "America/St_Lucia"
 
-#: ../calendar/zones.h:165
+#: ../calendar/zones.h:184
 msgid "America/St_Thomas"
 msgstr "America/St_Thomas"
 
-#: ../calendar/zones.h:166
+#: ../calendar/zones.h:185
 msgid "America/St_Vincent"
 msgstr "America/St_Vincent"
 
-#: ../calendar/zones.h:167
+#: ../calendar/zones.h:186
 msgid "America/Swift_Current"
 msgstr "America/Swift_Current"
 
-#: ../calendar/zones.h:168
+#: ../calendar/zones.h:187
 msgid "America/Tegucigalpa"
 msgstr "America/Tegucigalpa"
 
-#: ../calendar/zones.h:169
+#: ../calendar/zones.h:188
 msgid "America/Thule"
 msgstr "America/Thule"
 
-#: ../calendar/zones.h:170
+#: ../calendar/zones.h:189
 msgid "America/Thunder_Bay"
 msgstr "America/Thunder_Bay"
 
-#: ../calendar/zones.h:171
+#: ../calendar/zones.h:190
 msgid "America/Tijuana"
 msgstr "America/Tijuana"
 
-#: ../calendar/zones.h:172
+#: ../calendar/zones.h:191
 msgid "America/Tortola"
 msgstr "America/Tortola"
 
-#: ../calendar/zones.h:173
+#: ../calendar/zones.h:192
 msgid "America/Vancouver"
 msgstr "America/Vancouver"
 
-#: ../calendar/zones.h:174
+#: ../calendar/zones.h:193
 msgid "America/Whitehorse"
 msgstr "America/Whitehorse"
 
-#: ../calendar/zones.h:175
+#: ../calendar/zones.h:194
 msgid "America/Winnipeg"
 msgstr "America/Winnipeg"
 
-#: ../calendar/zones.h:176
+#: ../calendar/zones.h:195
 msgid "America/Yakutat"
 msgstr "America/Yakutat"
 
-#: ../calendar/zones.h:177
+#: ../calendar/zones.h:196
 msgid "America/Yellowknife"
 msgstr "America/Yellowknife"
 
-#: ../calendar/zones.h:178
+#: ../calendar/zones.h:197
 msgid "Antarctica/Casey"
 msgstr "Antarctica/Casey"
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:198
 msgid "Antarctica/Davis"
 msgstr "Antarctica/Davis"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:199
 msgid "Antarctica/DumontDUrville"
 msgstr "Antarctica/DumontDUrville"
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:200
 msgid "Antarctica/Mawson"
 msgstr "Antarctica/Mawson"
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:201
 msgid "Antarctica/McMurdo"
 msgstr "Antarctica/McMurdo"
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:202
 msgid "Antarctica/Palmer"
 msgstr "Antarctica/Palmer"
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:203
 msgid "Antarctica/South_Pole"
 msgstr "Antarctica/Pegwn_Y_De"
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:204
 msgid "Antarctica/Syowa"
 msgstr "Antarctica/Syowa"
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:205
 msgid "Antarctica/Vostok"
 msgstr "Antarctica/Vostok"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:206
 msgid "Arctic/Longyearbyen"
 msgstr "Arctig/Longyearbyen"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:207
 msgid "Asia/Aden"
 msgstr "Asia/Aden"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:208
 msgid "Asia/Almaty"
 msgstr "Asia/Almaty"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:209
 msgid "Asia/Amman"
 msgstr "Asia/Amman"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:210
 msgid "Asia/Anadyr"
 msgstr "Asia/Anadyr"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtau"
 msgstr "Asia/Aqtau"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:212
 msgid "Asia/Aqtobe"
 msgstr "Asia/Aqtobe"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:213
 msgid "Asia/Ashgabat"
 msgstr "Asia/Ashgabat"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:214
 msgid "Asia/Baghdad"
 msgstr "Asia/Baghdad"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:215
 msgid "Asia/Bahrain"
 msgstr "Asia/Bahrain"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:216
 msgid "Asia/Baku"
 msgstr "Asia/Baku"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:217
 msgid "Asia/Bangkok"
 msgstr "Asia/Bangkok"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:218
 msgid "Asia/Beirut"
 msgstr "Asia/Beirut"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:219
 msgid "Asia/Bishkek"
 msgstr "Asia/Bishkek"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:220
 msgid "Asia/Brunei"
 msgstr "Asia/Brunei"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:221
 msgid "Asia/Calcutta"
 msgstr "Asia/Calcutta"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:222
 msgid "Asia/Choibalsan"
 msgstr "Asia/Choibalsan"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:223
 msgid "Asia/Chongqing"
 msgstr "Asia/Chongqing"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:224
 msgid "Asia/Colombo"
 msgstr "Asia/Colombo"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:225
 msgid "Asia/Damascus"
 msgstr "Asia/Damascus"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:226
 msgid "Asia/Dhaka"
 msgstr "Asia/Dhaka"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:227
 msgid "Asia/Dili"
 msgstr "Asia/Dili"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:228
 msgid "Asia/Dubai"
 msgstr "Asia/Dubai"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:229
 msgid "Asia/Dushanbe"
 msgstr "Asia/Dushanbe"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:230
 msgid "Asia/Gaza"
 msgstr "Asia/Gaza"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:231
 msgid "Asia/Harbin"
 msgstr "Asia/Harbin"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:232
 msgid "Asia/Hong_Kong"
 msgstr "Asia/Hong_Kong"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:233
 msgid "Asia/Hovd"
 msgstr "Asia/Hovd"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:234
 msgid "Asia/Irkutsk"
 msgstr "Asia/Irkutsk"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:235
 msgid "Asia/Istanbul"
 msgstr "Asia/Istanbul"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:236
 msgid "Asia/Jakarta"
 msgstr "Asia/Jakarta"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:237
 msgid "Asia/Jayapura"
 msgstr "Asia/Jayapura"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:238
 msgid "Asia/Jerusalem"
 msgstr "Asia/Jerusalem"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:239
 msgid "Asia/Kabul"
 msgstr "Asia/Kabul"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:240
 msgid "Asia/Kamchatka"
 msgstr "Asia/Kamchatka"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:241
 msgid "Asia/Karachi"
 msgstr "Asia/Karachi"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:242
 msgid "Asia/Kashgar"
 msgstr "Asia/Kashgar"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:243
 msgid "Asia/Katmandu"
 msgstr "Asia/Katmandu"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:244
 msgid "Asia/Krasnoyarsk"
 msgstr "Asia/Krasnoyarsk"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:245
 msgid "Asia/Kuala_Lumpur"
 msgstr "Asia/Kuala_Lumpur"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:246
 msgid "Asia/Kuching"
 msgstr "Asia/Kuching"
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:247
 msgid "Asia/Kuwait"
 msgstr "Asia/Kuwait"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:248
 msgid "Asia/Macao"
 msgstr "Asia/Macao"
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:249
 msgid "Asia/Macau"
 msgstr "Asia/Macau"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:250
 msgid "Asia/Magadan"
 msgstr "Asia/Magadan"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:251
 msgid "Asia/Makassar"
 msgstr "Asia/Makassar"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:252
 msgid "Asia/Manila"
 msgstr "Asia/Manila"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:253
 msgid "Asia/Muscat"
 msgstr "Asia/Muscat"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:254
 msgid "Asia/Nicosia"
 msgstr "Asia/Nicosia"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:255
 msgid "Asia/Novosibirsk"
 msgstr "Asia/Novosibirsk"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:256
 msgid "Asia/Omsk"
 msgstr "Asia/Omsk"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:257
 msgid "Asia/Oral"
 msgstr "Asia/Oral"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:258
 msgid "Asia/Phnom_Penh"
 msgstr "Asia/Phnom_Penh"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:259
 msgid "Asia/Pontianak"
 msgstr "Asia/Pontianak"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:260
 msgid "Asia/Pyongyang"
 msgstr "Asia/Pyongyang"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:261
 msgid "Asia/Qatar"
 msgstr "Asia/Qatar"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:262
 msgid "Asia/Qyzylorda"
 msgstr "Asia/Qyzylorda"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:263
 msgid "Asia/Rangoon"
 msgstr "Asia/Rangoon"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:264
 msgid "Asia/Riyadh"
 msgstr "Asia/Riyadh"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:265
 msgid "Asia/Saigon"
 msgstr "Asia/Saigon"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:266
 msgid "Asia/Sakhalin"
 msgstr "Asia/Sakhalin"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:267
 msgid "Asia/Samarkand"
 msgstr "Asia/Samarkand"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:268
 msgid "Asia/Seoul"
 msgstr "Asia/Seoul"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:269
 msgid "Asia/Shanghai"
 msgstr "Asia/Shanghai"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:270
 msgid "Asia/Singapore"
 msgstr "Asia/Singapore"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:271
 msgid "Asia/Taipei"
 msgstr "Asia/Taipei"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:272
 msgid "Asia/Tashkent"
 msgstr "Asia/Tashkent"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:273
 msgid "Asia/Tbilisi"
 msgstr "Asia/Tbilisi"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:274
 msgid "Asia/Tehran"
 msgstr "Asia/Tehran"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:275
 msgid "Asia/Thimphu"
 msgstr "Asia/Thimphu"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:276
 msgid "Asia/Tokyo"
 msgstr "Asia/Tokyo"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:277
 msgid "Asia/Ujung_Pandang"
 msgstr "Asia/Ujung_Pandang"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:278
 msgid "Asia/Ulaanbaatar"
 msgstr "Asia/Ulaanbaatar"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:279
 msgid "Asia/Urumqi"
 msgstr "Asia/Urumqi"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:280
 msgid "Asia/Vientiane"
 msgstr "Asia/Vientiane"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:281
 msgid "Asia/Vladivostok"
 msgstr "Asia/Vladivostok"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:282
 msgid "Asia/Yakutsk"
 msgstr "Asia/Yakutsk"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:283
 msgid "Asia/Yekaterinburg"
 msgstr "Asia/Yekaterinburg"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:284
 msgid "Asia/Yerevan"
 msgstr "Asia/Yerevan"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:285
 msgid "Atlantic/Azores"
 msgstr "Atlantaidd/Azores"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:286
 msgid "Atlantic/Bermuda"
 msgstr "Atlantaidd/Bermuda"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:287
 msgid "Atlantic/Canary"
 msgstr "Atlantaidd/Canary"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:288
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantaidd/Cape_Verde"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:289
 msgid "Atlantic/Faeroe"
 msgstr "Atlantaidd/Faeroe"
 
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:290
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantaidd/Jan_Mayen"
 
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:291
 msgid "Atlantic/Madeira"
 msgstr "Atlantaidd/Madeira"
 
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:292
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantaidd/Reykjavik"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:293
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantaidd/South_Georgia"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:294
 msgid "Atlantic/St_Helena"
 msgstr "Atlantaidd/St_Helena"
 
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:295
 msgid "Atlantic/Stanley"
 msgstr "Atlantaidd/Stanley"
 
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:296
 msgid "Australia/Adelaide"
 msgstr "Awstralia/Adelaide"
 
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:297
 msgid "Australia/Brisbane"
 msgstr "Awstralia/Brisbane"
 
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:298
 msgid "Australia/Broken_Hill"
 msgstr "Awstralia/Broken Hill"
 
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:299
 msgid "Australia/Darwin"
 msgstr "Awstralia/Darwin"
 
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:300
 msgid "Australia/Hobart"
 msgstr "Awstralia/Hobart"
 
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:301
 msgid "Australia/Lindeman"
 msgstr "Awstralia/Lindeman"
 
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:302
 msgid "Australia/Lord_Howe"
 msgstr "Awstralia/Lord Howe"
 
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:303
 msgid "Australia/Melbourne"
 msgstr "Awstralia/Melbourne"
 
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:304
 msgid "Australia/Perth"
 msgstr "Awstralia/Perth"
 
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:305
 msgid "Australia/Sydney"
 msgstr "Awstralia/Sydney"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:306
 msgid "Europe/Amsterdam"
 msgstr "Ewrop/Amsterdam"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:307
 msgid "Europe/Andorra"
 msgstr "Ewrop/Andorra"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:308
 msgid "Europe/Athens"
 msgstr "Ewrop/Athens"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:309
 msgid "Europe/Belfast"
 msgstr "Ewrop/Belfast"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:310
 msgid "Europe/Belgrade"
 msgstr "Ewrop/Belgrade"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:311
 msgid "Europe/Berlin"
 msgstr "Ewrop/Berlin"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:312
 msgid "Europe/Bratislava"
 msgstr "Ewrop/Bratislava"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:313
 msgid "Europe/Brussels"
 msgstr "Ewrop/Brussels"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:314
 msgid "Europe/Bucharest"
 msgstr "Ewrop/Bucharest"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:315
 msgid "Europe/Budapest"
 msgstr "Ewrop/Budapest"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:316
 msgid "Europe/Chisinau"
 msgstr "Ewrop/Chisinau"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:317
 msgid "Europe/Copenhagen"
 msgstr "Ewrop/Copenhagen"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:318
 msgid "Europe/Dublin"
 msgstr "Ewrop/Dulyn"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:319
 msgid "Europe/Gibraltar"
 msgstr "Ewrop/Gibraltar"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:320
 msgid "Europe/Helsinki"
 msgstr "Ewrop/Helsinki"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:321
 msgid "Europe/Istanbul"
 msgstr "Ewrop/Istanbul"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:322
 msgid "Europe/Kaliningrad"
 msgstr "Ewrop/Kaliningrad"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:323
 msgid "Europe/Kiev"
 msgstr "Ewrop/Kiev"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:324
 msgid "Europe/Lisbon"
 msgstr "Ewrop/Lisbon"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:325
 msgid "Europe/Ljubljana"
 msgstr "Ewrop/Ljubljana"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:326
 msgid "Europe/London"
 msgstr "Ewrop/Llundain"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:327
 msgid "Europe/Luxembourg"
 msgstr "Ewrop/Luxembourg"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:328
 msgid "Europe/Madrid"
 msgstr "Ewrop/Madrid"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:329
 msgid "Europe/Malta"
 msgstr "Ewrop/Malta"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:330
 msgid "Europe/Minsk"
 msgstr "Ewrop/Minsk"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:331
 msgid "Europe/Monaco"
 msgstr "Ewrop/Monaco"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:332
 msgid "Europe/Moscow"
 msgstr "Ewrop/Moscow"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:333
 msgid "Europe/Nicosia"
 msgstr "Ewrop/Nicosia"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:334
 msgid "Europe/Oslo"
 msgstr "Ewrop/Oslo"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:335
 msgid "Europe/Paris"
 msgstr "Ewrop/Paris"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:336
 msgid "Europe/Prague"
 msgstr "Ewrop/Prague"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:337
 msgid "Europe/Riga"
 msgstr "Ewrop/Riga"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:338
 msgid "Europe/Rome"
 msgstr "Ewrop/Rhufain"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:339
 msgid "Europe/Samara"
 msgstr "Ewrop/Samara"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:340
 msgid "Europe/San_Marino"
 msgstr "Ewrop/San_Marino"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:341
 msgid "Europe/Sarajevo"
 msgstr "Ewrop/Sarajevo"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:342
 msgid "Europe/Simferopol"
 msgstr "Ewrop/Simferopol"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:343
 msgid "Europe/Skopje"
 msgstr "Ewrop/Skopje"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:344
 msgid "Europe/Sofia"
 msgstr "Ewrop/Sofia"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:345
 msgid "Europe/Stockholm"
 msgstr "Ewrop/Stockholm"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:346
 msgid "Europe/Tallinn"
 msgstr "Ewrop/Tallinn"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:347
 msgid "Europe/Tirane"
 msgstr "Ewrop/Tirane"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:348
 msgid "Europe/Uzhgorod"
 msgstr "Ewrop/Uzhgorod"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:349
 msgid "Europe/Vaduz"
 msgstr "Ewrop/Vaduz"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:350
 msgid "Europe/Vatican"
 msgstr "Ewrop/Fatican"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:351
 msgid "Europe/Vienna"
 msgstr "Ewrop/Fienna"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:352
 msgid "Europe/Vilnius"
 msgstr "Ewrop/Vilnius"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:353
 msgid "Europe/Warsaw"
 msgstr "Ewrop/Warsaw"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:354
 msgid "Europe/Zagreb"
 msgstr "Ewrop/Zagreb"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:355
 msgid "Europe/Zaporozhye"
 msgstr "Ewrop/Zaporozhye"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:356
 msgid "Europe/Zurich"
 msgstr "Ewrop/Zurich"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:357
 msgid "Indian/Antananarivo"
 msgstr "Indiaidd/Antananarivo"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:358
 msgid "Indian/Chagos"
 msgstr "Indiaidd/Chagos"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:359
 msgid "Indian/Christmas"
 msgstr "Indiaidd/Nadolig"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:360
 msgid "Indian/Cocos"
 msgstr "Indiaidd/Cocos"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:361
 msgid "Indian/Comoro"
 msgstr "Indiaidd/Comoro"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:362
 msgid "Indian/Kerguelen"
 msgstr "Indiaidd/Kerguelen"
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:363
 msgid "Indian/Mahe"
 msgstr "Indiaidd/Mahe"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:364
 msgid "Indian/Maldives"
 msgstr "Indiaidd/Maldives"
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:365
 msgid "Indian/Mauritius"
 msgstr "Indiaidd/Mauritius"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:366
 msgid "Indian/Mayotte"
 msgstr "Indiaidd/Mayotte"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:367
 msgid "Indian/Reunion"
 msgstr "Indiaidd/Reunion"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:368
 msgid "Pacific/Apia"
 msgstr "Pasiffig/Apia"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:369
 msgid "Pacific/Auckland"
 msgstr "Pasiffig/Auckland"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:370
 msgid "Pacific/Chatham"
 msgstr "Pasiffig/Chatham"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:371
 msgid "Pacific/Easter"
 msgstr "Pasiffig/Pasg"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:372
 msgid "Pacific/Efate"
 msgstr "Pasiffig/Efate"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:373
 msgid "Pacific/Enderbury"
 msgstr "Pasiffig/Enderbury"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:374
 msgid "Pacific/Fakaofo"
 msgstr "Pasiffig/Fakaofo"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:375
 msgid "Pacific/Fiji"
 msgstr "Pasiffig/Fiji"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:376
 msgid "Pacific/Funafuti"
 msgstr "Pasiffig/Funafuti"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:377
 msgid "Pacific/Galapagos"
 msgstr "Pasiffig/Galapagos"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:378
 msgid "Pacific/Gambier"
 msgstr "Pasiffig/Gambier"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:379
 msgid "Pacific/Guadalcanal"
 msgstr "Pasiffig/Guadalcanal"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:380
 msgid "Pacific/Guam"
 msgstr "Pasiffig/Guam"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:381
 msgid "Pacific/Honolulu"
 msgstr "Pasiffig/Honolulu"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:382
 msgid "Pacific/Johnston"
 msgstr "Pasiffig/Johnston"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:383
 msgid "Pacific/Kiritimati"
 msgstr "Pasiffig/Kiritimati"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:384
 msgid "Pacific/Kosrae"
 msgstr "Pasiffig/Kosrae"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:385
 msgid "Pacific/Kwajalein"
 msgstr "Pasiffig/Kwajalein"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:386
 msgid "Pacific/Majuro"
 msgstr "Pasiffig/Majuro"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:387
 msgid "Pacific/Marquesas"
 msgstr "Pasiffig/Marquesas"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:388
 msgid "Pacific/Midway"
 msgstr "Pasiffig/Midway"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:389
 msgid "Pacific/Nauru"
 msgstr "Pasiffig/Nauru"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:390
 msgid "Pacific/Niue"
 msgstr "Pasiffig/Niue"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:391
 msgid "Pacific/Norfolk"
 msgstr "Pasiffig/Norfolk"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:392
 msgid "Pacific/Noumea"
 msgstr "Pasiffig/Noumea"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:393
 msgid "Pacific/Pago_Pago"
 msgstr "Pasiffig/Pago_Pago"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:394
 msgid "Pacific/Palau"
 msgstr "Pasiffig/Palau"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:395
 msgid "Pacific/Pitcairn"
 msgstr "Pasiffig/Pitcairn"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:396
 msgid "Pacific/Ponape"
 msgstr "Pasiffig/Ponape"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:397
 msgid "Pacific/Port_Moresby"
 msgstr "Pasiffig/Port_Moresby"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:398
 msgid "Pacific/Rarotonga"
 msgstr "Pasiffig/Rarotonga"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:399
 msgid "Pacific/Saipan"
 msgstr "Pasiffig/Saipan"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:400
 msgid "Pacific/Tahiti"
 msgstr "Pasiffig/Tahiti"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:401
 msgid "Pacific/Tarawa"
 msgstr "Pasiffig/Tarawa"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:402
 msgid "Pacific/Tongatapu"
 msgstr "Pasiffig/Tongatapu"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:403
 msgid "Pacific/Truk"
 msgstr "Pasiffig/Truk"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:404
 msgid "Pacific/Wake"
 msgstr "Pasiffig/Wake"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:405
 msgid "Pacific/Wallis"
 msgstr "Pasiffig/Wallis"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:406
 msgid "Pacific/Yap"
 msgstr "Pasiffig/Yap"
 
-#: ../composer/e-msg-composer-hdrs.c:570
-msgid "Posting destination"
-msgstr "Cyrchfan postio "
+#: ../composer/e-composer-autosave.c:273
+#, fuzzy
+msgid "Could not open autosave file"
+msgstr "Methwyd agor ffeil"
 
-#: ../composer/e-msg-composer-hdrs.c:571
-msgid "Choose folders to post the message to."
-msgstr "Dewiswch blygellau i bostio'r neges ati."
+#: ../composer/e-composer-autosave.c:280
+msgid "Unable to retrieve message from editor"
+msgstr "Methu cyrchu neges o'r golygydd"
 
-#: ../composer/e-msg-composer-hdrs.c:602
-msgid "Click here for the address book"
-msgstr "Cliciwch yma ar gyfer y llyfr cyfeiriadau"
+#: ../composer/e-composer-actions.c:84
+msgid "Untitled Message"
+msgstr "Neges Di-deitl"
 
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: ../composer/e-msg-composer-hdrs.c:634
-msgid "_Reply-To:"
-msgstr "_Ateb at:"
+#: ../composer/e-composer-actions.c:317
+#: ../widgets/misc/e-attachment-view.c:328
+msgid "Attach a file"
+msgstr "Atodi Ffeil"
 
-#.
-#. * From
-#.
-#: ../composer/e-msg-composer-hdrs.c:641
-msgid "Fr_om:"
-msgstr "_Oddi wrth:"
+#: ../composer/e-composer-actions.c:322
+#: ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+msgid "_Close"
+msgstr "_Cau"
 
-#.
-#. * Subject
-#.
-#: ../composer/e-msg-composer-hdrs.c:648
-msgid "S_ubject:"
-msgstr "P_wnc:"
+#: ../composer/e-composer-actions.c:324
+msgid "Close the current file"
+msgstr "Cau'r ffeil cyfredol"
 
-#: ../composer/e-msg-composer-hdrs.c:657
-msgid "_To:"
-msgstr "_At:"
+#: ../composer/e-composer-actions.c:329
+#: ../mail/em-folder-view.c:1337
+#: ../ui/evolution-addressbook.xml.h:58
+#: ../ui/evolution-calendar.xml.h:47
+#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-tasks.xml.h:29
+msgid "_Print..."
+msgstr "_Argraffu..."
+
+#: ../composer/e-composer-actions.c:336
+#: ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-calendar.xml.h:21
+#: ../ui/evolution-mail-message.xml.h:72
+#: ../ui/evolution-memos.xml.h:12
+#: ../ui/evolution-tasks.xml.h:15
+msgid "Print Pre_view"
+msgstr "_Rhagolwg Argraffu"
+
+#: ../composer/e-composer-actions.c:345
+msgid "Save the current file"
+msgstr "Cadw'r ffeil cyfredol"
+
+#: ../composer/e-composer-actions.c:350
+msgid "Save _As..."
+msgstr "Cadw _Fel..."
+
+#: ../composer/e-composer-actions.c:352
+msgid "Save the current file with a different name"
+msgstr "Cadw'r ffeil bresennol gydag enw gwahanol"
+
+#: ../composer/e-composer-actions.c:357
+msgid "Save as _Draft"
+msgstr "Cadw fel _Drafft"
+
+#: ../composer/e-composer-actions.c:359
+msgid "Save as draft"
+msgstr "Cadw fel drafft"
+
+#: ../composer/e-composer-actions.c:364
+#: ../composer/e-composer-private.c:186
+msgid "S_end"
+msgstr "A_nfon"
+
+#: ../composer/e-composer-actions.c:366
+msgid "Send this message"
+msgstr "Anfon y neges"
+
+#: ../composer/e-composer-actions.c:373
+msgid "Insert Send options"
+msgstr "Mewnosod opsiynau anfon"
+
+#: ../composer/e-composer-actions.c:378
+msgid "New _Message"
+msgstr "_Neges Newydd"
+
+#: ../composer/e-composer-actions.c:380
+#, fuzzy
+msgid "Open New Message window"
+msgstr "_Danfon Neges Newydd i..."
+
+#: ../composer/e-composer-actions.c:387
+#, fuzzy
+msgid "Character _Encoding"
+msgstr "Amgodiad Nodau "
+
+#: ../composer/e-composer-actions.c:394
+msgid "_Security"
+msgstr "_Diogelwch"
+
+#: ../composer/e-composer-actions.c:404
+msgid "PGP _Encrypt"
+msgstr "Amgryptio _PGP"
+
+#: ../composer/e-composer-actions.c:406
+msgid "Encrypt this message with PGP"
+msgstr "Amgryptio'r neges gyda PGP"
+
+#: ../composer/e-composer-actions.c:412
+msgid "PGP _Sign"
+msgstr "Arwyddo P_GP"
+
+#: ../composer/e-composer-actions.c:414
+msgid "Sign this message with your PGP key"
+msgstr "Llofnodi'r neges gyda'ch allwedd PGP"
+
+#: ../composer/e-composer-actions.c:420
+msgid "_Prioritize Message"
+msgstr "_Gosod Blaenoriaeth y Neges"
+
+#: ../composer/e-composer-actions.c:422
+msgid "Set the message priority to high"
+msgstr "Gosod blaenoriaeth y neges yn uchel"
+
+#: ../composer/e-composer-actions.c:428
+#, fuzzy
+msgid "Re_quest Read Receipt"
+msgstr "_Gofyn am Dderbynneb Darllen"
+
+#: ../composer/e-composer-actions.c:430
+msgid "Get delivery notification when your message is read"
+msgstr "Cael hysbysiad pan fo'ch neges yn cael ei darllen"
+
+#: ../composer/e-composer-actions.c:436
+msgid "S/MIME En_crypt"
+msgstr "Amgryptio _S/MIME"
+
+#: ../composer/e-composer-actions.c:438
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr "Amgryptio'r neges gyda'ch Tystysgrif Amgryptiad S/MIME"
+
+#: ../composer/e-composer-actions.c:444
+msgid "S/MIME Sig_n"
+msgstr "Arwyddo S/_MIME"
+
+#: ../composer/e-composer-actions.c:446
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Llofnodi'r neges gyda'ch Tystysgrif Llofnod S/MIME"
+
+#: ../composer/e-composer-actions.c:452
+msgid "_Bcc Field"
+msgstr "Maes _Bcc"
 
-#: ../composer/e-msg-composer-hdrs.c:658
+#: ../composer/e-composer-actions.c:454
+msgid "Toggles whether the BCC field is displayed"
+msgstr "Toglu a yw'r maes BCC wedi ei ddangos"
+
+#: ../composer/e-composer-actions.c:460
+msgid "_Cc Field"
+msgstr "Maes _Cc"
+
+#: ../composer/e-composer-actions.c:462
+msgid "Toggles whether the CC field is displayed"
+msgstr "Toglu a yw'r maes CC wedi ei ddangos"
+
+#: ../composer/e-composer-actions.c:468
+msgid "_From Field"
+msgstr "Maes _Oddi wrth"
+
+#: ../composer/e-composer-actions.c:470
+msgid "Toggles whether the From chooser is displayed"
+msgstr "Toglu a yw'r dewisydd 'Oddi wrth' wedi ei ddangos"
+
+#: ../composer/e-composer-actions.c:476
+msgid "_Reply-To Field"
+msgstr "Maes _Ateb-i "
+
+#: ../composer/e-composer-actions.c:478
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr " Toglu a yw'r maes 'Ateb i' wedi ei ddangos"
+
+#: ../composer/e-composer-actions.c:521
+msgid "Save Draft"
+msgstr "Cadw Drafft"
+
+#: ../composer/e-composer-header.c:120
+msgid "Show"
+msgstr "Dangos"
+
+#: ../composer/e-composer-header.c:123
+msgid "Hide"
+msgstr "Cuddio"
+
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "Rhowch dderbynwyr y neges"
 
-#: ../composer/e-msg-composer-hdrs.c:661
-msgid "_Cc:"
-msgstr "_Copi i:"
-
-#: ../composer/e-msg-composer-hdrs.c:662
+#: ../composer/e-composer-header-table.c:43
 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:665
-msgid "_Bcc:"
-msgstr "Copi _dall i:"
+#: ../composer/e-composer-header-table.c:46
+#, fuzzy
+msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message"
+msgstr "Rhowch y cyfeiriadau fydd yn derbyn copi carbon o'r neges heb ymddangos yn rhestr derbynwyr y neges."
 
-#: ../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."
-msgstr ""
-"Rhowch y cyfeiriadau fydd yn derbyn copi carbon o'r neges heb ymddangos yn "
-"rhestr derbynwyr y neges."
+#: ../composer/e-composer-header-table.c:945
+msgid "Fr_om:"
+msgstr "_Oddi wrth:"
 
-#.
-#. * Post-To
-#.
-#: ../composer/e-msg-composer-hdrs.c:673
-msgid "_Post To:"
-msgstr "_Postio at:"
+#: ../composer/e-composer-header-table.c:945
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:923
+#: ../mail/em-mailer-prefs.c:75
+#: ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:296
+msgid "From"
+msgstr "Oddi wrth"
 
-#: ../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-composer-header-table.c:954
+msgid "_Reply-To:"
+msgstr "_Ateb at:"
 
-#: ../composer/e-msg-composer-hdrs.c:683
-msgid "Post To:"
-msgstr "Postio At:"
+#: ../composer/e-composer-header-table.c:959
+msgid "_To:"
+msgstr "_At:"
 
-#: ../composer/e-msg-composer-select-file.c:82
-msgid "A_ttach"
-msgstr "_Atodi"
+#: ../composer/e-composer-header-table.c:965
+msgid "_Cc:"
+msgstr "_Copi i:"
 
-#: ../composer/e-msg-composer-select-file.c:243
-msgid "Insert Attachment"
-msgstr "Mewnosod Atodiad"
+#: ../composer/e-composer-header-table.c:965
+#: ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "CC"
 
-#: ../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-composer-header-table.c:971
+msgid "_Bcc:"
+msgstr "Copi _dall i:"
 
-#: ../composer/e-msg-composer.c:837
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-"Methu amgryptio neges i'w hanfon: Dim tystysgrif amgryptio wedi'i phenodi ar "
-"gyfer y cyfrif"
+#: ../composer/e-composer-header-table.c:971
+#: ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "BCC"
 
-#: ../composer/e-msg-composer.c:1297 ../composer/e-msg-composer.c:2559
-msgid "Hide _Attachment Bar"
-msgstr "Cuddio'r Bar _Atodiadau"
+#: ../composer/e-composer-header-table.c:976
+msgid "_Post To:"
+msgstr "_Postio at:"
 
-#: ../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-composer-header-table.c:980
+msgid "S_ubject:"
+msgstr "P_wnc:"
 
-#: ../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-composer-header-table.c:989
+msgid "Si_gnature:"
+msgstr "_Llofnod:"
 
-#: ../composer/e-msg-composer.c:1404
-msgid "Could not open file"
-msgstr "Methwyd agor ffeil"
+#: ../composer/e-composer-name-header.c:116
+msgid "Click here for the address book"
+msgstr "Cliciwch yma ar gyfer y llyfr cyfeiriadau"
 
-#: ../composer/e-msg-composer.c:1412
-msgid "Unable to retrieve message from editor"
-msgstr "Methu cyrchu neges o'r golygydd"
+#: ../composer/e-composer-post-header.c:137
+msgid "Posting destination"
+msgstr "Cyrchfan postio "
 
-#: ../composer/e-msg-composer.c:1697
-msgid "Untitled Message"
-msgstr "Neges Di-deitl"
+#: ../composer/e-composer-post-header.c:138
+msgid "Choose folders to post the message to."
+msgstr "Dewiswch blygellau i bostio'r neges ati."
 
-#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1732
-msgid "Open File"
-msgstr "Agor Ffeil"
+#: ../composer/e-composer-post-header.c:172
+msgid "Click here to select folders to post to"
+msgstr "Cliciwch yma i ddewis plygellau i bostio atynt"
 
-#: ../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-composer-private.c:203
+msgid "Save draft"
+msgstr "Cadw drafft"
 
-#: ../composer/e-msg-composer.c:2297
-msgid "Si_gnature:"
-msgstr "_Llofnod:"
+#: ../composer/e-msg-composer.c:807
+msgid "Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "Methu llofnodi neges i'w hanfon: Dim tystysgrif llofnodi wedi'i phenodi ar gyfer y cyfrif"
 
-#: ../composer/e-msg-composer.c:2573 ../composer/e-msg-composer.c:3813
-#: ../composer/e-msg-composer.c:3816
+#: ../composer/e-msg-composer.c:814
+msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
+msgstr "Methu amgryptio neges i'w hanfon: Dim tystysgrif amgryptio wedi'i phenodi ar gyfer y cyfrif"
+
+#: ../composer/e-msg-composer.c:1331
+#: ../composer/e-msg-composer.c:2170
 msgid "Compose Message"
 msgstr "Cyfansoddi'r Neges"
 
-#: ../composer/e-msg-composer.c:5041
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)</"
-"b>"
-msgstr ""
-"<b>(Mae'r cyfansoddwr yn cynnwys corff neges nad yw'n destun, na ellir mo'i "
-"olygu.)</b>"
+#: ../composer/e-msg-composer.c:3328
+msgid "<b>(The composer contains a non-text message body, which cannot be edited.)</b>"
+msgstr "<b>(Mae'r cyfansoddwr yn cynnwys corff neges nad yw'n destun, na ellir mo'i olygu.)</b>"
 
 #: ../composer/mail-composer.error.xml.h:1
-msgid ""
-" There are few attachments getting downloaded. Sending the mail will cause "
-"the mail to be sent without those pending attachments "
-msgstr ""
-"Mae rhai atodiadau'n cael eu llwytho i lawr. Bydd anfon yr e-bost nawr yn ei "
-"anfon heb yr atodiadau hynny sydd i ddod"
+msgid " There are few attachments getting downloaded. Sending the mail will cause the mail to be sent without those pending attachments "
+msgstr "Mae rhai atodiadau'n cael eu llwytho i lawr. Bydd anfon yr e-bost nawr yn ei anfon heb yr atodiadau hynny sydd i ddod"
 
 #: ../composer/mail-composer.error.xml.h:2
 msgid "All accounts have been removed."
 msgstr "Pob cyfrif wedi ei ddileu."
 
 #: ../composer/mail-composer.error.xml.h:3
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr ""
-"Ydych chi'n siŵr eich bod am waredu'r neges, â'r teitl '{0}', yr ydych yn ei "
-"gyfansoddi?"
+msgid "Are you sure you want to discard the message, titled '{0}', you are composing?"
+msgstr "Ydych chi'n siŵr eich bod am waredu'r neges, â'r teitl '{0}', yr ydych yn ei gyfansoddi?"
 
 #: ../composer/mail-composer.error.xml.h:4
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
-msgstr ""
-"Oherwydd &quot;{0}&quot;, mae'n bosib fydd rhaid i chi ddewis opsiynau e-"
-"bost gwahanol."
+msgstr "Oherwydd &quot;{0}&quot;, mae'n bosib fydd rhaid i chi ddewis opsiynau e-bost gwahanol."
 
-#: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:5
 msgid "Because &quot;{1}&quot;."
 msgstr "Oherwydd &quot;{1}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:6
-msgid ""
-"Closing this composer window will discard the message permanently, unless "
-"you choose to save the message in your Drafts folder. This will allow you to "
-"continue the message at a later date."
-msgstr ""
-"Bydd cau'r ffenestr gyfansoddi yma yn gwaredu'r neges am byth, oni bai eich "
-"bod yn dewis cadw'r neges yn eich plygell Drafftiau. Bydd gwneud hynny'n "
-"gadael i chi barhau'r neges yn hwyrach."
+msgid "Closing this composer window will discard the message permanently, unless you choose to save the message in your Drafts folder. This will allow you to continue the message at a later date."
+msgstr "Bydd cau'r ffenestr gyfansoddi yma yn gwaredu'r neges am byth, oni bai eich bod yn dewis cadw'r neges yn eich plygell Drafftiau. Bydd gwneud hynny'n gadael i chi barhau'r neges yn hwyrach."
 
 #: ../composer/mail-composer.error.xml.h:7
 msgid "Could not create composer window."
@@ -10379,21 +9681,13 @@ msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "Gwall wrth gadw i ffeil awto-gadw o achos &quot;{1}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:16
-msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
-msgstr ""
-"Gwnaeth Evolution derfynu'n annisgwyl wrth i chi gyfansoddi neges newydd. "
-"Bydd adfer y neges yn gadael i chi barhau'r neges yn y man wnaethoch ei "
-"adael."
+msgid "Evolution quit unexpectedly while you were composing a new message. Recovering the message will allow you to continue where you left off."
+msgstr "Gwnaeth Evolution derfynu'n annisgwyl wrth i chi gyfansoddi neges newydd. Bydd adfer y neges yn gadael i chi barhau'r neges yn y man wnaethoch ei adael."
 
 #: ../composer/mail-composer.error.xml.h:17
-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."
+#, fuzzy
+msgid "Send options available only for Novell GroupWise and Microsoft Exchange accounts."
+msgstr "Opsiynau anfon sydd ond ar gael i gyfrifon Novell Groupwise a Microsoft Exchange."
 
 #: ../composer/mail-composer.error.xml.h:18
 msgid "Send options not available."
@@ -10401,23 +9695,17 @@ msgstr "Opsiynau anfon ddim ar gael."
 
 #: ../composer/mail-composer.error.xml.h:19
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
-msgstr ""
-"Nid yw'r ffeil `{0}' yn un gyffredin ac ni ellir ei hanfon o fewn neges."
+msgstr "Nid yw'r ffeil `{0}' yn un gyffredin ac ni ellir ei hanfon o fewn neges."
 
 #: ../composer/mail-composer.error.xml.h:20
-msgid ""
-"To attach the contents of this directory, either attach the files in this "
-"directory individually, or create an archive of the directory and attach it."
-msgstr ""
-"I atodi cynnwys y blygell, dylech naill ai atodi bob ffeil yn y blygell yn "
-"unigol, neu greu archif o'r blygell ac atodi'r archif."
+msgid "To attach the contents of this directory, either attach the files in this directory individually, or create an archive of the directory and attach it."
+msgstr "I atodi cynnwys y blygell, dylech naill ai atodi bob ffeil yn y blygell yn unigol, neu greu archif o'r blygell ac atodi'r archif."
 
 #: ../composer/mail-composer.error.xml.h:21
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
-"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
-"installed."
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml installed."
 msgstr ""
 "Methu gweithredu'r rheolwr golygydd HTML.\n"
 "\n"
@@ -10443,31 +9731,35 @@ msgstr "Fedrwch chi ddim atodi'r ffeil `{0}' at y neges hon."
 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:30
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "_Parhau i Olygu"
+
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr "_Peidio ag Adfer"
 
-#: ../composer/mail-composer.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Recover"
 msgstr "_Adfer"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Message"
-msgstr "C_adw'r Neges"
+#: ../composer/mail-composer.error.xml.h:33
+msgid "_Save Draft"
+msgstr "_Cadw Drafft"
 
 #: ../data/evolution.desktop.in.in.h:1
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:508
-msgid "Evolution"
-msgstr "Evolution"
+msgid "Evolution Mail and Calendar"
+msgstr "Ebost a Chalendr Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:584
+#: ../data/evolution.desktop.in.in.h:2
+#: ../shell/e-shell-window-commands.c:947
 msgid "Groupware Suite"
 msgstr "Cyfres Meddalwedd Grŵp"
 
 #: ../data/evolution.desktop.in.in.h:3
-msgid "The Evolution PIM and Email Client"
-msgstr "Evolution, Cleient Ebost a Threfnydd Gwybodaeth Bersonol"
+#, fuzzy
+msgid "Manage your email, contacts and schedule"
+msgstr "Cyfluniwch eich cyfrifon e-bost fan hyn"
 
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
@@ -10477,71 +9769,221 @@ msgstr "cerdyn cyfeiriad"
 msgid "calendar information"
 msgstr "gwybodaeth calendr"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:78
+#: ../e-util/e-error.c:79
+#: ../e-util/e-error.c:121
 msgid "Evolution Error"
 msgstr "Gwall Evolution"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:80
+#: ../e-util/e-error.c:81
+#: ../e-util/e-error.c:119
 msgid "Evolution Warning"
 msgstr "Rhybudd Evolution"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:118
 msgid "Evolution Information"
 msgstr "Gwybodaeth Evolution"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:120
 msgid "Evolution Query"
 msgstr "Ymholiad Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:448
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Gwall mewnol: gwall anhysbys '%s' wedi ei geisio"
 
-#: ../e-util/e-print.c:115
+#: ../e-util/e-logger.c:161
+#, fuzzy
+msgid "Component"
+msgstr "Cwblhau"
+
+#: ../e-util/e-logger.c:162
+msgid "Name of the component being logged"
+msgstr ""
+
+#: ../e-util/e-non-intrusive-error-dialog.c:190
+#, fuzzy
+msgid "Debug Logs"
+msgstr "Gweflog"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:204
+msgid "Show _errors in the status bar for"
+msgstr "Dangos _gwallau yn y bar statws ar gyfer"
+
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../e-util/e-non-intrusive-error-dialog.c:222
+msgid "second(s)."
+msgstr "eiliad"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:228
+#, fuzzy
+msgid "Log Messages:"
+msgstr "Negeseuon"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:273
+msgid "Log Level"
+msgstr ""
+
+#: ../e-util/e-non-intrusive-error-dialog.c:281
+#: ../widgets/misc/e-dateedit.c:380
+msgid "Time"
+msgstr "Amser"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:291
+#: ../mail/message-list.c:2521
+#: ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "Negeseuon"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:300
+#: ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "_Cau'r ffenestr hon"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Error"
+msgstr "Gwall"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Errors"
+msgstr "Gwallau"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:41
+msgid "Warnings and Errors"
+msgstr "Rhybyddion a Gwallau"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:42
+msgid "Debug"
+msgstr "Dadnamu"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:42
+msgid "Error, Warnings and Debug messages"
+msgstr "Negeseuon Gwallau, Rhybyddion a Dadnamu"
+
+#: ../e-util/e-plugin.c:308
+#: ../filter/rule-editor.c:798
+#: ../mail/em-account-prefs.c:477
+#: ../mail/em-composer-prefs.c:943
+#: ../plugins/plugin-manager/plugin-manager.c:355
+#: ../plugins/publish-calendar/publish-calendar.c:714
+msgid "Enabled"
+msgstr "Galluogwyd"
+
+#: ../e-util/e-plugin.c:309
+#, fuzzy
+msgid "Whether the plugin is enabled"
+msgstr "A yw'r chwyddwr wedi ei chwyddo ai peidio"
+
+#: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "Roedd gwall wrth argraffu"
 
-#: ../e-util/e-print.c:122
+#: ../e-util/e-print.c:167
 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-print.c:173
+msgid "The printing system did not report any additional details about the error."
+msgstr "Wnaeth y system argraffu ddim adrodd unrhyw fanylion ychwanegol am y gwall."
+
+#: ../e-util/e-system.error.xml.h:1
+#: ../mail/mail.error.xml.h:19
+msgid "Because \"{1}\"."
+msgstr "Oherwydd \"{1}\"."
 
 #: ../e-util/e-system.error.xml.h:2
-msgid "Cannot open file &quot;{0}&quot;."
-msgstr "Methu agor ffeil &quot;{0}&quot;."
+msgid "Cannot open file \"{0}\"."
+msgstr "Ni ellir agor ffeil \"{0}\"."
 
 #: ../e-util/e-system.error.xml.h:3
-msgid "Cannot save file &quot;{0}&quot;."
-msgstr "Methu cadw ffeil &quot;{0}&quot;."
+msgid "Cannot save file \"{0}\"."
+msgstr "Methu cadw ffeil \"{0}\"."
 
 #: ../e-util/e-system.error.xml.h:4
 msgid "Do you wish to overwrite it?"
 msgstr "A hoffech ei drosysgrifo?"
 
 #: ../e-util/e-system.error.xml.h:5
-msgid "File exists &quot;{0}&quot;."
-msgstr "Ffeil &quot;{0}&quot; yn bodoli."
+msgid "File exists \"{0}\"."
+msgstr "Ffeil \"{0}\" yn bodoli."
 
 #: ../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
+#: ../e-util/e-system.error.xml.h:7
+#: ../mail/mail.error.xml.h:141
 msgid "_Overwrite"
 msgstr "_Trosysgrifo"
 
-#: ../e-util/eggtrayicon.c:121
-msgid "The orientation of the tray."
-msgstr "Gogwydd y gilfach."
+#: ../e-util/e-util.c:133
+msgid "Could not open the link."
+msgstr "Methwyd agor y cyswllt."
 
-#: ../filter/filter-datespec.c:80
+#: ../e-util/e-util.c:183
+#, fuzzy
+msgid "Could not display help for Evolution."
+msgstr "Methu diweddaru caniatadau plygell."
+
+#: ../e-util/e-util-labels.c:45
+msgid "I_mportant"
+msgstr "_Pwysig"
+
+#. red
+#: ../e-util/e-util-labels.c:46
+msgid "_Work"
+msgstr "_Gwaith"
+
+#. orange
+#: ../e-util/e-util-labels.c:47
+msgid "_Personal"
+msgstr "_Personol"
+
+#. green
+#: ../e-util/e-util-labels.c:48
+msgid "_To Do"
+msgstr "_I'w wneud"
+
+#. blue
+#: ../e-util/e-util-labels.c:49
+msgid "_Later"
+msgstr "_Hwyrach"
+
+#: ../e-util/e-util-labels.c:320
+msgid "Label _Name:"
+msgstr "_Enw Label:"
+
+#: ../e-util/e-util-labels.c:343
+msgid "Edit Label"
+msgstr "Golygu Label"
+
+#: ../e-util/e-util-labels.c:343
+msgid "Add Label"
+msgstr "Ychwanegu Label"
+
+#: ../e-util/e-util-labels.c:362
+msgid "Label name cannot be empty."
+msgstr "Ni all enw label bod yn wag."
+
+#: ../e-util/e-util-labels.c:367
+msgid "A label having the same tag already exists on the server. Please rename your label."
+msgstr ""
+
+#: ../e-util/gconf-bridge.c:1222
+#, c-format
+msgid "GConf error: %s"
+msgstr "Gwall GConf: %s"
+
+#: ../e-util/gconf-bridge.c:1233
+msgid "All further errors shown only on terminal."
+msgstr ""
+
+#: ../filter/filter-datespec.c:73
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
@@ -10549,7 +9991,7 @@ msgstr[0] "1 eiliad yn ôl"
 msgstr[1] "2 eiliad yn ôl"
 msgstr[2] "%d eiliad yn ôl"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
@@ -10557,7 +9999,7 @@ 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
+#: ../filter/filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
@@ -10565,7 +10007,7 @@ msgstr[0] "1 munud yn ôl"
 msgstr[1] "2 funud yn ôl"
 msgstr[2] "%d munud yn ôl"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:76
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
@@ -10573,7 +10015,7 @@ 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
+#: ../filter/filter-datespec.c:77
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
@@ -10581,7 +10023,7 @@ msgstr[0] "1 awr yn ôl"
 msgstr[1] "2 awr yn ôl"
 msgstr[2] "%d awr yn ôl"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:78
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
@@ -10589,7 +10031,7 @@ 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
+#: ../filter/filter-datespec.c:79
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
@@ -10597,7 +10039,7 @@ msgstr[0] "1 dydd yn ôl"
 msgstr[1] "2 ddydd yn ôl"
 msgstr[2] "%d ddydd yn ôl"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
@@ -10605,7 +10047,7 @@ 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
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
@@ -10613,7 +10055,7 @@ msgstr[0] "1 wythnos yn ôl"
 msgstr[1] "2 wythnos yn ôl"
 msgstr[2] "%d wythnos yn ôl"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
@@ -10621,7 +10063,7 @@ 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
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
@@ -10629,7 +10071,7 @@ msgstr[0] "1 mis yn ôl"
 msgstr[1] "2 fis yn ôl"
 msgstr[2] "%d mis yn ôl"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
@@ -10637,7 +10079,7 @@ 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
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
@@ -10653,95 +10095,87 @@ 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
+#: ../filter/filter-datespec.c:294
 msgid "<click here to select a date>"
 msgstr "<cliciwch yma i ddewis dyddiad>"
 
-#: ../filter/filter-datespec.c:290 ../filter/filter-datespec.c:301
-#: ../filter/filter-datespec.c:312
+#: ../filter/filter-datespec.c:297
+#: ../filter/filter-datespec.c:308
+#: ../filter/filter-datespec.c:319
 msgid "now"
 msgstr "nawr"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:297
+#: ../filter/filter-datespec.c:304
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/filter-datespec.c:449
+#: ../filter/filter-datespec.c:447
 msgid "Select a time to compare against"
 msgstr "Dewiswch amser i'w gymharu ag ef"
 
-#: ../filter/filter-file.c:296 ../filter/filter-file.c:302
+#: ../filter/filter-file.c:281
 msgid "Choose a file"
 msgstr "Dewiswch ffeil"
 
-#: ../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:123 ../mail/em-migrate.c:1056
-#: ../mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "I'w wneud"
-
-#. blue
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1057
-#: ../mail/mail-config.glade.h:95
-msgid "Later"
-msgstr "Hwyrach"
-
-#: ../filter/filter-part.c:532 ../shell/GNOME_Evolution_Test.server.in.in.h:3
+#: ../filter/filter-part.c:528
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Prawf"
 
-#: ../filter/filter-rule.c:799
-msgid "_Search name:"
-msgstr "_Chwilio enwau:"
+#: ../filter/filter-rule.c:854
+msgid "R_ule name:"
+msgstr "Enw _rheol"
 
-#: ../filter/filter-rule.c:827
-msgid "Find items that meet the following criteria"
+#: ../filter/filter-rule.c:882
+#, fuzzy
+msgid "Find items that meet the following conditions"
 msgstr "Canfod eitemau sy'n cytuno â'r meini prawf canlynol"
 
-#: ../filter/filter-rule.c:866
-msgid "If all criteria are met"
+#: ../filter/filter-rule.c:916
+msgid "A_dd Condition"
+msgstr ""
+
+#: ../filter/filter-rule.c:922
+msgid "If all conditions are met"
 msgstr "Os bydd bob maen prawf yn wir"
 
-#: ../filter/filter-rule.c:866
-msgid "If any criteria are met"
+#: ../filter/filter-rule.c:922
+msgid "If any conditions are met"
 msgstr "Os bydd unrhyw faen prawf yn wir"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:924
 msgid "_Find items:"
 msgstr "_Canfod eitemau:"
 
-#: ../filter/filter-rule.c:890
+#: ../filter/filter-rule.c:942
 msgid "All related"
 msgstr "Pob un sy'n perthyn"
 
-#: ../filter/filter-rule.c:890
+#: ../filter/filter-rule.c:942
 msgid "Replies"
 msgstr "Atebion"
 
-#: ../filter/filter-rule.c:890
+#: ../filter/filter-rule.c:942
 msgid "Replies and parents"
 msgstr "Atebion a rhieni"
 
-#: ../filter/filter-rule.c:890
+#: ../filter/filter-rule.c:942
 msgid "No reply or parent"
 msgstr "Dim ymateb na rhiant"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "I_nclude threads"
 msgstr "_Cynnwys edafedd"
 
-#: ../filter/filter-rule.c:988 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:307
+#: ../filter/filter-rule.c:1038
+#: ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "Dod I Mewn"
 
-#: ../filter/filter-rule.c:988 ../mail/em-utils.c:308
+#: ../filter/filter-rule.c:1038
+#: ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "Mynd Allan"
 
@@ -10765,7 +10199,8 @@ msgstr "Dyddiad ar goll."
 msgid "Missing file name."
 msgstr "Enw ffeil ar goll."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:74
+#: ../filter/filter.error.xml.h:6
+#: ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "Enw ar goll."
 
@@ -10826,51 +10261,47 @@ msgstr ""
 "amser presennol pan mae hidlo'n digwydd."
 
 #: ../filter/filter.glade.h:12
-msgid "a time relative to the current time"
-msgstr "amser o'i gymharu â'r amser presennol"
-
-#: ../filter/filter.glade.h:13
-msgid "ago"
-msgstr "yn ôl"
-
-#: ../filter/filter.glade.h:16
-msgid "in the future"
+#, fuzzy
+msgid ""
+"ago\n"
+"in the future"
 msgstr "i'r dyfodol"
 
-#: ../filter/filter.glade.h:18
-msgid "months"
-msgstr "misoedd"
-
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:180
-msgid "seconds"
-msgstr "eiliadau"
-
-#: ../filter/filter.glade.h:20
-msgid "the current time"
-msgstr "yr amser cyfredol"
+#: ../filter/filter.glade.h:14
+msgid ""
+"seconds\n"
+"minutes\n"
+"hours\n"
+"days\n"
+"weeks\n"
+"months\n"
+"years"
+msgstr ""
+"eiliadau\n"
+"munudau\n"
+"oriau\n"
+"dyddiau\n"
+"wythnosau\n"
+"misoedd\n"
+"blynyddoedd"
 
 #: ../filter/filter.glade.h:21
-msgid "the time you specify"
-msgstr "yr amser a benodwch"
-
-#: ../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"
+#, fuzzy
+msgid ""
+"the current time\n"
+"the time you specify\n"
+"a time relative to the current time"
+msgstr "amser o'i gymharu â'r amser presennol"
 
-#: ../filter/rule-editor.c:378
+#: ../filter/rule-editor.c:381
 msgid "Add Rule"
 msgstr "Ychwanegu Rheolau"
 
-#: ../filter/rule-editor.c:454
+#: ../filter/rule-editor.c:462
 msgid "Edit Rule"
 msgstr "Golygu Rheol"
 
-#: ../filter/rule-editor.c:732
+#: ../filter/rule-editor.c:808
 msgid "Rule name"
 msgstr "Enw Rheol"
 
@@ -10879,74 +10310,196 @@ msgid "Composer Preferences"
 msgstr "Hoffterau Cyfansoddwr"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Cyfluniwch eich hoffterau e-bost, gan gynnwys diogelwch a dangos negeseuon, "
-"fan hyn"
+msgid "Configure mail preferences, including security and message display, here"
+msgstr "Cyfluniwch eich hoffterau e-bost, gan gynnwys diogelwch a dangos negeseuon, fan hyn"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-"Cyfluniwch y gwirydd sillafu, llofnodion, a'r cyfansoddwr negeseuon fan hyn"
+msgstr "Cyfluniwch y gwirydd sillafu, llofnodion, a'r cyfansoddwr negeseuon fan hyn"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure your email accounts here"
 msgstr "Cyfluniwch eich cyfrifon e-bost fan hyn"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Configure your network connection settings here"
+msgstr "Cyfluniwch eich cyfrifon e-bost fan hyn"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
 msgstr "Ebost Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Evolution Mail accounts configuration control"
 msgstr "Rheolaeth gosodiadau cyfrifon Ebost Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail component"
 msgstr "Cydran Ebost Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer"
 msgstr "Cyfansoddwr Ebost Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution Mail composer configuration control"
 msgstr "Rheolaeth gosodiadau cyfansoddwr Ebost Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
 msgid "Evolution Mail preferences control"
 msgstr "Rheolaeth dewisiadau Ebost Evolution"
 
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+#, fuzzy
+msgid "Evolution Network configuration control"
+msgstr "Rheolaeth gosodiadau Calendr Evolution"
+
 # 48x48/emblems/emblem-mail.icon.in.h:1
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h: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
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: ../mail/em-folder-view.c:602
+#: ../mail/importers/elm-importer.c:327
+#: ../mail/importers/pine-importer.c:378
+#: ../mail/mail-component.c:620
+#: ../mail/mail-component.c:621
+#: ../mail/mail-component.c:793
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Ebost"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:532
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/em-account-prefs.c:490
 msgid "Mail Accounts"
 msgstr "Cyfrifon Ebost"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:98
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
+#: ../mail/mail-config.glade.h:108
 msgid "Mail Preferences"
 msgstr "Hoffterau Ebost"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
+msgid "Network Preferences"
+msgstr "Hoffterau Rhwydwaith"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
+#: ../plugins/pst-import/pst-importer.c:298
 msgid "_Mail"
 msgstr "_Ebost"
 
-#: ../mail/em-account-editor.c:403
+#: ../mail/e-attachment-handler-mail.c:133
+#: ../mail/em-folder-view.c:1331
+#: ../mail/em-popup.c:501
+#: ../ui/evolution-mail-message.xml.h:105
+msgid "_Forward"
+msgstr "_Ymlaen"
+
+#: ../mail/e-attachment-handler-mail.c:147
+#: ../mail/em-folder-view.c:1329
+#: ../ui/evolution-mail-message.xml.h:123
+msgid "_Reply to Sender"
+msgstr "_Ateb i'r Danfonwr"
+
+#. Translators: This is only for multiple messages.
+#: ../mail/e-attachment-handler-mail.c:334
+#, c-format
+msgid "%d attached messages"
+msgstr "%d neges wedi'i hatodi"
+
+#: ../mail/e-mail-attachment-bar.c:122
+#: ../mail/em-format-html-display.c:1653
+#: ../mail/message-list.etspec.h:1
+#: ../widgets/misc/e-attachment-paned.c:141
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Atodiad"
+msgstr[1] "Atodiadau"
+msgstr[2] "Atodiadau"
+
+#: ../mail/e-mail-attachment-bar.c:615
+#: ../widgets/misc/e-attachment-paned.c:601
+#, fuzzy
+msgid "Icon View"
+msgstr "Golwg Mis"
+
+#: ../mail/e-mail-attachment-bar.c:616
+#: ../widgets/misc/e-attachment-paned.c:602
+msgid "List View"
+msgstr "Golwg Rhestr"
+
+# TRWSIO: dylai ddefnyddio ngettext?
+#: ../mail/e-mail-search-bar.c:76
+#, c-format
+msgid "Matches: %d"
+msgstr "Cydweddiadau: %d"
+
+#: ../mail/e-mail-search-bar.c:520
+#, fuzzy
+msgid "Close the find bar"
+msgstr "_Cau'r ffenestr hon"
+
+#: ../mail/e-mail-search-bar.c:528
+msgid "Fin_d:"
+msgstr "_Canfod:"
+
+#: ../mail/e-mail-search-bar.c:540
+#, fuzzy
+msgid "Clear the search"
+msgstr "Chwilio o hyd"
+
+#: ../mail/e-mail-search-bar.c:559
+msgid "_Previous"
+msgstr "_Blaenorol"
+
+#: ../mail/e-mail-search-bar.c:565
+msgid "Find the previous occurrence of the phrase"
+msgstr ""
+
+#: ../mail/e-mail-search-bar.c:573
+msgid "_Next"
+msgstr "_Nesaf"
+
+#: ../mail/e-mail-search-bar.c:579
+msgid "Find the next occurrence of the phrase"
+msgstr ""
+
+#: ../mail/e-mail-search-bar.c:587
+msgid "Mat_ch case"
+msgstr "_Cydweddu llythrennau bach/mawr"
+
+#: ../mail/e-mail-search-bar.c:615
+msgid "Reached bottom of page, continued from top"
+msgstr ""
+
+#: ../mail/e-mail-search-bar.c:637
+msgid "Reached top of page, continued from bottom"
+msgstr ""
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. It will not use an encrypted connection.
+#: ../mail/em-account-editor.c:309
+msgid "No encryption"
+msgstr "Dim amgryptio"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. TLS (Transport Layer Security) is commonly known by
+#. this abbreviation.
+#: ../mail/em-account-editor.c:313
+msgid "TLS encryption"
+msgstr "Amgryptio TLS"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
+#. abbreviation.
+#: ../mail/em-account-editor.c:317
+msgid "SSL encryption"
+msgstr "Amgryptio SSL"
+
+#: ../mail/em-account-editor.c:408
 #, c-format
 msgid "%s License Agreement"
 msgstr "Cytundeb Trwydded %s"
 
-#: ../mail/em-account-editor.c:410
+#: ../mail/em-account-editor.c:415
 #, c-format
 msgid ""
 "\n"
@@ -10959,124 +10512,149 @@ msgstr ""
 "ar gyfer %s a ddangosir isod\n"
 "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:510
+#: ../mail/em-account-editor.c:487
+#: ../mail/em-filter-folder-element.c:258
+#: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Dewiswch Blygell"
 
-#: ../mail/em-account-editor.c:778
+#: ../mail/em-account-editor.c:611
+#: ../mail/em-account-editor.c:656
+#: ../mail/em-account-editor.c:723
+#: ../widgets/misc/e-signature-combo-box.c:102
+msgid "Autogenerated"
+msgstr "Awtogynhyrchwyd"
+
+#: ../mail/em-account-editor.c:781
+msgid "Never"
+msgstr "Byth"
+
+#: ../mail/em-account-editor.c:782
+msgid "Always"
+msgstr "Bob tro"
+
+#: ../mail/em-account-editor.c:783
 msgid "Ask for each message"
 msgstr "Gofyn am bob neges"
 
-#: ../mail/em-account-editor.c:1812 ../mail/mail-config.glade.h:89
+#: ../mail/em-account-editor.c:1861
+#: ../mail/mail-config.glade.h:100
 msgid "Identity"
 msgstr "Hunaniaeth"
 
-#: ../mail/em-account-editor.c:1861 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1912
+#: ../mail/mail-config.glade.h:127
 msgid "Receiving Email"
 msgstr "Derbyn Ebost"
 
-#: ../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:2184
+msgid "Check for _new messages every"
+msgstr "Gwirio am neges ebost _newydd pob"
+
+#: ../mail/em-account-editor.c:2192
+msgid "minu_tes"
+msgstr "munu_dau"
 
-#: ../mail/em-account-editor.c:2227 ../mail/mail-config.glade.h:129
+#: ../mail/em-account-editor.c:2382
+#: ../mail/mail-config.glade.h:138
 msgid "Sending Email"
 msgstr "Anfon E-bost"
 
-#: ../mail/em-account-editor.c:2286 ../mail/mail-config.glade.h:65
+#: ../mail/em-account-editor.c:2441
+#: ../mail/mail-config.glade.h:73
 msgid "Defaults"
 msgstr "Rhagosodiadau"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2352 ../mail/mail-config.glade.h:123
-#: ../plugins/exchange-operations/exchange-account-setup.c:317
+#: ../mail/em-account-editor.c:2507
+#: ../mail/mail-config.glade.h:133
+#: ../plugins/exchange-operations/exchange-account-setup.c:329
 msgid "Security"
 msgstr "Diogelwch"
 
+#. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2389 ../mail/em-account-editor.c:2480
+#: ../mail/em-account-editor.c:2544
+#: ../mail/em-account-editor.c:2639
 msgid "Receiving Options"
 msgstr "Gosodiadau Derbyn"
 
-#: ../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:2545
+#: ../mail/em-account-editor.c:2640
+msgid "Checking for New Messages"
+msgstr "Chwilio am Negeseuon Newydd"
 
-#: ../mail/em-account-editor.c:2832 ../mail/mail-config.glade.h:31
+#: ../mail/em-account-editor.c:3107
+#: ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Golygydd Cyfrifon"
 
-#: ../mail/em-account-editor.c:2832 ../mail/mail-config.glade.h:79
+#: ../mail/em-account-editor.c:3107
+#: ../mail/mail-config.glade.h:89
 msgid "Evolution Account Assistant"
 msgstr "Cynorthwyydd Cyfrifon Evolution"
 
-#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
-#: ../mail/em-account-prefs.c:409
-msgid "Disable"
-msgstr "Analluogi"
-
-#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
-#: ../mail/em-account-prefs.c:411
-msgid "Enable"
-msgstr "Galluogi"
-
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:466
+#: ../mail/em-account-prefs.c:426
 msgid "[Default]"
 msgstr "[Rhagosodedig]"
 
-#: ../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"
-
-#: ../mail/em-account-prefs.c:525
+#: ../mail/em-account-prefs.c:483
 msgid "Account name"
 msgstr "Enw'r cyfrif"
 
-#: ../mail/em-account-prefs.c:527
+#: ../mail/em-account-prefs.c:485
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../mail/em-composer-prefs.c:310 ../mail/em-composer-prefs.c:436
-#: ../mail/mail-config.c:1029
+#: ../mail/em-composer-prefs.c:303
+#: ../mail/em-composer-prefs.c:438
+#: ../mail/mail-config.c:1160
+#: ../mail/mail-signature-editor.c:478
 msgid "Unnamed"
 msgstr "Dienw"
 
-#: ../mail/em-composer-prefs.c:951
+#: ../mail/em-composer-prefs.c:947
 msgid "Language(s)"
 msgstr "Iaith (ieithoedd)"
 
-#: ../mail/em-composer-prefs.c:994
+#: ../mail/em-composer-prefs.c:980
 msgid "Add signature script"
 msgstr "Ychwanegu sgript llofnod"
 
-#: ../mail/em-composer-prefs.c:1014
+#: ../mail/em-composer-prefs.c:1022
 msgid "Signature(s)"
 msgstr "Llofnod(ion)"
 
-#: ../mail/em-composer-utils.c:874 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:1116
+#: ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Neges Yrrwyd Ymlaen --------"
 
-#: ../mail/em-composer-utils.c:1665
+#: ../mail/em-composer-utils.c:1569
+msgid "No destination address provided, forward of the message has been cancelled."
+msgstr ""
+
+#: ../mail/em-composer-utils.c:1575
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr ""
+
+#: ../mail/em-composer-utils.c:2042
 msgid "an unknown sender"
 msgstr "danfonwr anhysbys"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1712
-msgid ""
-"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
-"${TimeZone}, ${Sender} wrote:"
-msgstr ""
-"Ar ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} am ${24Hour}:${Minute} "
-"${TimeZone}, ysgrifennodd ${Sender}:"
+#: ../mail/em-composer-utils.c:2089
+msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
+msgstr "Ar ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} am ${24Hour}:${Minute} ${TimeZone}, ysgrifennodd ${Sender}:"
 
-#: ../mail/em-filter-editor.c:155
+#: ../mail/em-composer-utils.c:2232
+msgid "-----Original Message-----"
+msgstr "-------- Neges Wreiddiol --------"
+
+#: ../mail/em-filter-editor.c:172
 msgid "_Filter Rules"
 msgstr "_Rheolau Hidlydd"
 
@@ -11093,311 +10671,326 @@ msgstr "Neilltuo'r Lliw"
 msgid "Assign Score"
 msgstr "Neilltuo'r Sgôr"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "Atodiadau"
-
-#: ../mail/em-filter-i18n.h:6
+#: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "Bîp"
 
-#: ../mail/em-filter-i18n.h:7
-msgid "contains"
-msgstr "cynnwys"
+#: ../mail/em-filter-i18n.h:9
+#, fuzzy
+msgid "Completed On"
+msgstr "Cyflawnwyd"
 
-#: ../mail/em-filter-i18n.h:8
+#: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Copïo i Blygell"
 
-#: ../mail/em-filter-i18n.h:9
+#: ../mail/em-filter-i18n.h:12
 msgid "Date received"
 msgstr "Dyddiad derbyniwyd"
 
-#: ../mail/em-filter-i18n.h:10
+#: ../mail/em-filter-i18n.h:13
 msgid "Date sent"
 msgstr "Dyddiad anfon"
 
-#: ../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
+#: ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:765
+#: ../ui/evolution-addressbook.xml.h:15
+#: ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:25
+#: ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Dileu"
 
-#: ../mail/em-filter-i18n.h:12
+#: ../mail/em-filter-i18n.h:15
 msgid "Deleted"
 msgstr "Wedi dileu"
 
-#: ../mail/em-filter-i18n.h:13
-msgid "does not contain"
-msgstr "Ddim yn cynnwys"
-
-#: ../mail/em-filter-i18n.h:14
+#: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "Ddim yn gorffen gyda"
 
-#: ../mail/em-filter-i18n.h:15
+#: ../mail/em-filter-i18n.h:18
 msgid "does not exist"
 msgstr "Ddim yn bodoli"
 
-#: ../mail/em-filter-i18n.h:16
+#: ../mail/em-filter-i18n.h:19
 msgid "does not return"
 msgstr "Ddim yn dychwelyd"
 
-#: ../mail/em-filter-i18n.h:17
+#: ../mail/em-filter-i18n.h:20
 msgid "does not sound like"
 msgstr "Ddim yn swnio fel"
 
-#: ../mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:21
 msgid "does not start with"
 msgstr "Ddim yn dechrau gyda"
 
-#: ../mail/em-filter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Ddim yn bodoli"
-
-#: ../mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "Drafft"
 
-#: ../mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:24
 msgid "ends with"
 msgstr "yn gorffen gyda"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Exist"
-msgstr "Bodoli"
-
-#: ../mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "bodoli"
 
-#: ../mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:27
 msgid "Expression"
 msgstr "Mynegiant"
 
-#: ../mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:28
 msgid "Follow Up"
 msgstr "Dilynol"
 
-#: ../mail/em-filter-i18n.h:27
-msgid "is"
-msgstr "yn"
+#: ../mail/em-filter-i18n.h:29
+msgid "Forward to"
+msgstr "Gyrru ymlaen at"
 
-#: ../mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-migrate.c:958
+msgid "Important"
+msgstr "Pwysig"
+
+#: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "yn dod ar ôl"
 
-#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:33
 msgid "is before"
 msgstr "yn dod o flaen"
 
-#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:34
 msgid "is Flagged"
 msgstr "yn Fanerog"
 
-#: ../mail/em-filter-i18n.h:31
-msgid "is greater than"
-msgstr "yn fwy na"
-
-#: ../mail/em-filter-i18n.h:32
-msgid "is less than"
-msgstr "yn llai na"
-
-#: ../mail/em-filter-i18n.h:33
-msgid "is not"
-msgstr "ddim yn"
-
-#: ../mail/em-filter-i18n.h:34
+#: ../mail/em-filter-i18n.h:38
 msgid "is not Flagged"
 msgstr "ddim yn Fanerog"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:92
+#: ../mail/em-filter-i18n.h:39
+msgid "is not set"
+msgstr "heb ei osod"
+
+#: ../mail/em-filter-i18n.h:40
+msgid "is set"
+msgstr "wedi'i osod"
+
+#: ../mail/em-filter-i18n.h:41
+#: ../mail/mail-config.glade.h:102
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Sothach"
 
-#: ../mail/em-filter-i18n.h:36
+#: ../mail/em-filter-i18n.h:42
 msgid "Junk Test"
 msgstr "Prawf Sothach"
 
-#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:43
 msgid "Label"
 msgstr "Label"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:44
 msgid "Mailing list"
 msgstr "Rhestr E-bostio"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:45
 msgid "Match All"
 msgstr "Cydweddu Popeth"
 
-#: ../mail/em-filter-i18n.h:40
+#: ../mail/em-filter-i18n.h:46
 msgid "Message Body"
 msgstr "Corff Neges"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:47
 msgid "Message Header"
 msgstr "Pennawd Neges"
 
-#: ../mail/em-filter-i18n.h:42
+#: ../mail/em-filter-i18n.h:48
 msgid "Message is Junk"
 msgstr "Neges yn Sothach"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:49
 msgid "Message is not Junk"
 msgstr "Neges Ddim yn Sothach"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:50
+msgid "Message Location"
+msgstr "Lleoliad Neges"
+
+#: ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Symud i Blygell"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:52
 msgid "Pipe to Program"
 msgstr "Piblinio at Raglen"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:53
 msgid "Play Sound"
 msgstr "Chwarae Sain"
 
-#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:81
+#. Translators: "Read" as in "has been read" (message-tag-followup.c)
+#: ../mail/em-filter-i18n.h:54
+#: ../mail/message-tag-followup.c:61
 msgid "Read"
 msgstr "Darllen"
 
-#: ../mail/em-filter-i18n.h:48 ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:55
+#: ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "Derbynwyr"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:56
 msgid "Regex Match"
 msgstr "Cydweddu Mynegiant Rheolaidd"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:57
 msgid "Replied to"
 msgstr "Atebwyd i"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:58
 msgid "returns"
 msgstr "yn dychwelyd"
 
-#: ../mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:59
 msgid "returns greater than"
 msgstr "yn dychwelyd 'yn fwy na'"
 
-#: ../mail/em-filter-i18n.h:53
+#: ../mail/em-filter-i18n.h:60
 msgid "returns less than"
 msgstr "yn dychwelyd 'yn llai na'"
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:61
 msgid "Run Program"
 msgstr "Gweithredu Rhaglen"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:62
+#: ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "Sgôr"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:63
+#: ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "Danfonwr"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:64
+#, fuzzy
+msgid "Sender or Recipients"
+msgstr "Hidlo ar _Dderbynyddion"
+
+#: ../mail/em-filter-i18n.h:65
+msgid "Set Label"
+msgstr "Gosod Label"
+
+#: ../mail/em-filter-i18n.h:66
 msgid "Set Status"
 msgstr "Gosod Cyflwr"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:67
 msgid "Size (kB)"
 msgstr "Maint (kB)"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:68
 msgid "sounds like"
 msgstr "yn swnio'n debyg i"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:69
 msgid "Source Account"
 msgstr "Tardd Cyfrif"
 
-#: ../mail/em-filter-i18n.h:61
+#: ../mail/em-filter-i18n.h:70
 msgid "Specific header"
 msgstr "Pennawd penodol"
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:71
 msgid "starts with"
 msgstr "Dechrau gyda"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:73
 msgid "Stop Processing"
 msgstr "Atal Prosesu"
 
-#: ../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
+#: ../mail/em-filter-i18n.h:74
+#: ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:928
+#: ../mail/em-mailer-prefs.c:80
+#: ../mail/message-list.etspec.h:18
+#: ../mail/message-tag-followup.c:300
+#: ../plugins/groupwise-features/properties.glade.h:7
+#: ../smime/lib/e-cert.c:1112
 msgid "Subject"
 msgstr "Pwnc"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:75
 msgid "Unset Status"
 msgstr "Dadosod Cyflwr"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:488
-msgid "<b>Then</b>"
-msgstr "<b>Yna</b>"
+#: ../mail/em-filter-rule.c:521
+#, fuzzy
+msgid "Then"
+msgstr "Yna Wrth"
 
-#: ../mail/em-folder-browser.c:169
+#: ../mail/em-filter-rule.c:549
+#, fuzzy
+msgid "Add Ac_tion"
+msgstr "Ychwanegu eithriad"
+
+#: ../mail/em-folder-browser.c:194
 msgid "C_reate Search Folder From Search..."
 msgstr "Creu _Plygell Chwilio o'r Chwiliad..."
 
-#: ../mail/em-folder-browser.c:191
+#: ../mail/em-folder-browser.c:219
 msgid "All Messages"
 msgstr "Pob Neges"
 
-#: ../mail/em-folder-browser.c:192
+#: ../mail/em-folder-browser.c:220
 msgid "Unread Messages"
 msgstr "Negeseuon heb eu Darllen"
 
-#: ../mail/em-folder-browser.c:194
+#: ../mail/em-folder-browser.c:222
 msgid "No Label"
 msgstr "Dim Label"
 
-#: ../mail/em-folder-browser.c:201
+#: ../mail/em-folder-browser.c:229
 msgid "Read Messages"
 msgstr "Negeseuon wedi'u Darllen"
 
-#: ../mail/em-folder-browser.c:202
+#: ../mail/em-folder-browser.c:230
 msgid "Recent Messages"
 msgstr "Negeseuon Diweddar"
 
-#: ../mail/em-folder-browser.c:203
+#: ../mail/em-folder-browser.c:231
 msgid "Last 5 Days' Messages"
 msgstr "Negeseuon y 5 diwrnod olaf"
 
-#: ../mail/em-folder-browser.c:204
+#: ../mail/em-folder-browser.c:232
 msgid "Messages with Attachments"
 msgstr "Negeseuon ag Atodiadau"
 
-#: ../mail/em-folder-browser.c:205
+#: ../mail/em-folder-browser.c:233
 msgid "Important Messages"
 msgstr "Negeseuon Pwysig"
 
-#: ../mail/em-folder-browser.c:206
+#: ../mail/em-folder-browser.c:234
 msgid "Messages Not Junk"
 msgstr "Negeseuon Ddim yn Sothach"
 
-#: ../mail/em-folder-browser.c:1029
+#: ../mail/em-folder-browser.c:1194
 msgid "Account Search"
 msgstr "Chwilio Cyfrif"
 
-#: ../mail/em-folder-browser.c:1073
+#: ../mail/em-folder-browser.c:1256
 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:149
+#: ../mail/em-folder-properties.c:174
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Neges heb ei darllen:"
@@ -11406,1581 +10999,1816 @@ msgstr[2] "Negeseuon heb eu darllen:"
 
 #. 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
+#: ../mail/em-folder-properties.c:178
 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
+#: ../mail/em-folder-properties.c:196
+#, fuzzy, c-format
+msgid "Quota usage (%s):"
+msgstr "Cyfanswm neges:"
+
+#: ../mail/em-folder-properties.c:198
+#, fuzzy, c-format
+msgid "Quota usage"
+msgstr "Cyfanswm neges:"
+
+#. translators: standard local mailbox names
+#: ../mail/em-folder-properties.c:359
+#: ../mail/em-folder-tree-model.c:517
+#: ../mail/em-folder-tree.c:2602
+#: ../mail/mail-component.c:168
+#: ../mail/mail-component.c:608
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:593
+msgid "Inbox"
+msgstr "Blwch Derbyn"
+
+#: ../mail/em-folder-properties.c:390
+#: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Priodweddau Plygell"
 
-#: ../mail/em-folder-selection-button.c:123
+#: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "<cliciwch yma er mwyn dewis plygell>"
 
-#: ../mail/em-folder-selector.c:261
-msgid "Create"
-msgstr "Creu"
+#: ../mail/em-folder-selector.c:249
+msgid "C_reate"
+msgstr "C_reu"
 
-#: ../mail/em-folder-selector.c:265
+#: ../mail/em-folder-selector.c:253
 msgid "Folder _name:"
 msgstr "Enw'r _plygell:"
 
-#: ../mail/em-folder-tree-model.c:203 ../mail/em-folder-tree-model.c:205
-#: ../mail/mail-vfolder.c:911 ../mail/mail-vfolder.c:984
+#. load store to mail component
+#: ../mail/em-folder-tree-model.c:195
+#: ../mail/em-folder-tree-model.c:197
+#: ../mail/mail-vfolder.c:960
+#: ../mail/mail-vfolder.c:1028
 msgid "Search Folders"
 msgstr "Plygellau Chwilio"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:209 ../mail/em-folder-tree-model.c:211
+#: ../mail/em-folder-tree-model.c:201
+#: ../mail/em-folder-tree-model.c:203
 msgid "UNMATCHED"
 msgstr "HEB GYDWEDDU"
 
-#: ../mail/em-folder-tree-model.c:484 ../mail/mail-component.c:152
+#: ../mail/em-folder-tree-model.c:510
+#: ../mail/mail-component.c:169
 msgid "Drafts"
 msgstr "Drafftiau"
 
-#. translators: standard local mailbox names
-#: ../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:513
+#: ../mail/mail-component.c:172
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+#, fuzzy
+msgid "Templates"
+msgstr "Templed:"
 
-#: ../mail/em-folder-tree-model.c:490 ../mail/mail-component.c:153
+#: ../mail/em-folder-tree-model.c:520
+#: ../mail/mail-component.c:170
 msgid "Outbox"
 msgstr "Blwch Allan"
 
-#: ../mail/em-folder-tree-model.c:492 ../mail/mail-component.c:154
+#: ../mail/em-folder-tree-model.c:522
+#: ../mail/mail-component.c:171
 msgid "Sent"
 msgstr "Wedi Anfon"
 
-#: ../mail/em-folder-tree-model.c:514 ../mail/em-folder-tree-model.c:818
+#: ../mail/em-folder-tree-model.c:580
+#: ../mail/em-folder-tree-model.c:889
 msgid "Loading..."
 msgstr "Yn Llwytho..."
 
 #. 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.
+#. * folder names in folder trees. The first "%s" will be
+#. * replaced by the folder's name and "%u" will be replaced
+#. * with the number of unread messages in the folder. The
+#. * second %s will be replaced with a "+" letter for collapsed
+#. * folders with unread messages in some subfolder too,
+#. * or with an empty string for other cases.
 #. *
-#. * Most languages should translate this as "%s (%u)". The
+#. * Most languages should translate this as "%s (%u%s)". 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
+#: ../mail/em-folder-tree.c:318
 #, c-format
-msgid "folder-display|%s (%u)"
-msgstr "%s (%u)"
+msgctxt "folder-display"
+msgid "%s (%u%s)"
+msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:720
+#: ../mail/em-folder-tree.c:727
 msgid "Mail Folder Tree"
 msgstr "Coeden Plygell Ebost"
 
-#: ../mail/em-folder-tree.c:880
+#: ../mail/em-folder-tree.c:886
 #, c-format
 msgid "Moving folder %s"
 msgstr "Symud plygell %s"
 
-#: ../mail/em-folder-tree.c:882
+#: ../mail/em-folder-tree.c:888
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copïo plygell %s"
 
-#: ../mail/em-folder-tree.c:889 ../mail/message-list.c:1866
+#: ../mail/em-folder-tree.c:895
+#: ../mail/message-list.c:2012
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Symud ffeiliau i mewn i'r blygell %s"
 
-#: ../mail/em-folder-tree.c:891 ../mail/message-list.c:1868
+#: ../mail/em-folder-tree.c:897
+#: ../mail/message-list.c:2014
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copïo ffeiliau i mewn i'r blygell %s"
 
-#: ../mail/em-folder-tree.c:907
+#: ../mail/em-folder-tree.c:912
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Methu gollwng neges(euon) i'r storfa level uchaf"
 
-#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:989
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "_Copy to Folder"
 msgstr "_Copïo i Blygell"
 
-#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:990
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Move to Folder"
 msgstr "_Symud i Blygell"
 
-#: ../mail/em-folder-tree.c:1709 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:992
+#: ../mail/em-folder-utils.c:362
+#: ../mail/em-folder-view.c:1186
+#: ../mail/message-list.c:2104
+msgid "_Move"
+msgstr "_Symud"
+
+#: ../mail/em-folder-tree.c:994
+#: ../mail/message-list.c:2106
+msgid "Cancel _Drag"
+msgstr "Diddymu _Llusgo"
+
+#: ../mail/em-folder-tree.c:1702
+#: ../mail/mail-ops.c:1063
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Sganio plygellau o fewn \"%s\""
 
-#: ../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:63 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:53
-msgid "_View"
-msgstr "_Golwg"
-
-#: ../mail/em-folder-tree.c:2109
+#: ../mail/em-folder-tree.c:2107
 msgid "Open in _New Window"
 msgstr "Agor mewn Ffenestr _Newydd"
 
-#: ../mail/em-folder-tree.c:2113
-msgid "_Copy..."
-msgstr "_Copïo..."
-
-#: ../mail/em-folder-tree.c:2114
-msgid "_Move..."
-msgstr "_Symud..."
-
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2118
+#: ../mail/em-folder-tree.c:2112
 msgid "_New Folder..."
 msgstr "_Plygell Newydd..."
 
-#: ../mail/em-folder-tree.c:2121 ../ui/evolution-mail-list.xml.h:36
-msgid "_Rename..."
-msgstr "_Ailenwi..."
+#: ../mail/em-folder-tree.c:2115
+msgid "_Move..."
+msgstr "_Symud..."
 
-#: ../mail/em-folder-tree.c:2122
+#: ../mail/em-folder-tree.c:2123
+#: ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh"
 msgstr "_Adnewyddu"
 
-#: ../mail/em-folder-tree.c:2123
+#: ../mail/em-folder-tree.c:2124
 msgid "Fl_ush Outbox"
 msgstr "_Gwacáu'r Blwch Allan"
 
-#: ../mail/em-folder-tree.c:2129 ../mail/mail.error.xml.h:135
+#: ../mail/em-folder-tree.c:2129
+#: ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "_Taflu'r Sbwriel"
 
-#: ../mail/em-folder-utils.c:104
+#: ../mail/em-folder-tree.c:2232
+#, fuzzy
+msgid "_Unread Search Folder"
+msgstr "Creu _Plygell Chwilio"
+
+#: ../mail/em-folder-utils.c:99
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Copïo `%s' i `%s'"
 
-#: ../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/em-folder-utils.c:362
+#: ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-view.c:1201
+#: ../mail/importers/evolution-mbox-importer.c:82
+#: ../plugins/pst-import/pst-importer.c:303
 msgid "Select folder"
 msgstr "Dewis plygell"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1047
+#: ../mail/em-folder-utils.c:362
+#: ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "C_opïo"
 
-#: ../mail/em-folder-utils.c:581
-#: ../plugins/groupwise-features/share-folder-common.c:145
+#: ../mail/em-folder-utils.c:537
+#: ../plugins/groupwise-features/share-folder-common.c:144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Creu plygell `%s'"
 
-#: ../mail/em-folder-utils.c:730
-#: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:388
+#: ../mail/em-folder-utils.c:695
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Create folder"
 msgstr "Creu plygell"
 
-#: ../mail/em-folder-utils.c:730
-#: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:388
+#: ../mail/em-folder-utils.c:695
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Specify where to create the folder:"
 msgstr "Penodwch ble i greu'r blygell:"
 
-#: ../mail/em-folder-view.c:968 ../mail/mail.error.xml.h:67
+#: ../mail/em-folder-view.c:1089
+#: ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Methwyd Dileu E-bost"
 
-#: ../mail/em-folder-view.c:969 ../mail/mail.error.xml.h:122
+#: ../mail/em-folder-view.c:1090
+#: ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Does gennych chi mo'r caniatâd i ddileu'r e-bost hwn."
 
-#: ../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:1142 ../mail/em-popup.c:566 ../mail/em-popup.c:577
-#: ../ui/evolution-mail-message.xml.h:110
-msgid "_Forward"
-msgstr "_Ymlaen"
-
 #. 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
+#: ../mail/em-folder-view.c:1335
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "_Edit as New Message..."
 msgstr "_Golygu fel Neges Newydd..."
 
-#: ../mail/em-folder-view.c:1152
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "_Dad-ddileu"
 
-#: ../mail/em-folder-view.c:1153
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "_Symud i Blygell..."
 
-#: ../mail/em-folder-view.c:1154
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "_Copïo i Blygell..."
 
-#: ../mail/em-folder-view.c:1157
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "_Marcio Wedi Darllen"
 
-#: ../mail/em-folder-view.c:1158
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "Marcio _heb ei ddarllen"
 
-#: ../mail/em-folder-view.c:1159
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "Marcio'n _Bwysig"
 
-#: ../mail/em-folder-view.c:1160
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "Marcio _Ddim yn Bwysig"
 
-#: ../mail/em-folder-view.c:1161
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "Marcio'n _Sothach"
 
-#: ../mail/em-folder-view.c:1162
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "Marcio _Ddim yn Sothach"
 
-#: ../mail/em-folder-view.c:1163
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr "Marcio ar gyfer _Dilyniant..."
 
-#: ../mail/em-folder-view.c:1165
+#: ../mail/em-folder-view.c:1354
 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:1166 ../widgets/misc/e-dateedit.c:473
+#: ../mail/em-folder-view.c:1355
+#: ../widgets/misc/e-dateedit.c:469
 msgid "_None"
 msgstr "_Dim"
 
-#: ../mail/em-folder-view.c:1171
+#: ../mail/em-folder-view.c:1358
+msgid "_New Label"
+msgstr "Label _Newydd"
+
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "Gosod _Baner 'Wedi Cwblhau'"
 
-#: ../mail/em-folder-view.c:1172
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "_Clirio Baner"
 
-#: ../mail/em-folder-view.c:1175
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "Creu _Rheol o'r Neges"
 
-#: ../mail/em-folder-view.c:1176
-msgid "Search Folder from _Subject"
+#. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
+#: ../mail/em-folder-view.c:1368
+#, fuzzy
+msgid "Search Folder based on _Subject"
 msgstr "Plygell Chwilio ar y _Pwnc"
 
-#: ../mail/em-folder-view.c:1177
-msgid "Search Folder from Se_nder"
+#: ../mail/em-folder-view.c:1369
+#, fuzzy
+msgid "Search Folder based on Se_nder"
 msgstr "Plygell Chwilio ar y _Danfonwr"
 
-#: ../mail/em-folder-view.c:1178
-msgid "Search Folder from _Recipients"
+#: ../mail/em-folder-view.c:1370
+#, fuzzy
+msgid "Search Folder based on _Recipients"
 msgstr "Plygell Chwilio ar y _Derbynwyr"
 
-#: ../mail/em-folder-view.c:1179
-msgid "Search Folder from Mailing _List"
+#: ../mail/em-folder-view.c:1371
+#, fuzzy
+msgid "Search Folder based on Mailing _List"
 msgstr "Plygell Chwilio ar y _Rhestr E-bostio"
 
-#: ../mail/em-folder-view.c:1183
-msgid "Filter on Sub_ject"
+#. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
+#: ../mail/em-folder-view.c:1376
+#, fuzzy
+msgid "Filter based on Sub_ject"
 msgstr "Hidlo ar _Bwnc"
 
-#: ../mail/em-folder-view.c:1184
-msgid "Filter on Sen_der"
+#: ../mail/em-folder-view.c:1377
+#, fuzzy
+msgid "Filter based on Sen_der"
 msgstr "Hidlo ar _Ddanfonwr"
 
-#: ../mail/em-folder-view.c:1185
-msgid "Filter on Re_cipients"
+#: ../mail/em-folder-view.c:1378
+#, fuzzy
+msgid "Filter based on Re_cipients"
 msgstr "Hidlo ar _Dderbynyddion"
 
-#: ../mail/em-folder-view.c:1186
-msgid "Filter on _Mailing List"
+#: ../mail/em-folder-view.c:1379
+#, fuzzy
+msgid "Filter based on _Mailing List"
 msgstr "Hidlydd ar y _Rhestr E-bostio"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2055 ../mail/em-folder-view.c:2099
+#. we changed user, thus reset the chosen calendar combo too, because
+#. other user means other calendars subscribed
+#: ../mail/em-folder-view.c:2232
+#: ../mail/em-folder-view.c:2275
+#: ../plugins/google-account-setup/google-source.c:303
+#: ../plugins/google-account-setup/google-source.c:593
+#: ../plugins/google-account-setup/google-source.c:764
 msgid "Default"
 msgstr "Rhagosodiad"
 
-#: ../mail/em-folder-view.c:2312
+#: ../mail/em-folder-view.c:2493
 msgid "Unable to retrieve message"
 msgstr "Methu nôl y neges"
 
-#: ../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
+#: ../mail/em-folder-view.c:2696
 msgid "Create _Search Folder"
 msgstr "Creu _Plygell Chwilio"
 
-#: ../mail/em-folder-view.c:2551
+#: ../mail/em-folder-view.c:2697
 msgid "_From this Address"
 msgstr "_O'r cyfeiriad hwn"
 
-#: ../mail/em-folder-view.c:2552
+#: ../mail/em-folder-view.c:2698
 msgid "_To this Address"
 msgstr "_I'r cyfeiriad hwn"
 
-#: ../mail/em-folder-view.c:2909
+#: ../mail/em-folder-view.c:3191
 #, c-format
 msgid "Click to mail %s"
 msgstr "Cliciwch i e-bostio %s"
 
-#: ../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:514
+#: ../mail/em-folder-view.c:3203
 #, c-format
-msgid "Matches: %d"
-msgstr "Cydweddiadau: %d"
+msgid "Click to call %s"
+msgstr "Cliciwch i alw %s"
 
-#: ../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:691
-msgid "M_atch case"
-msgstr "_Cydweddu llythrennau bach/mawr"
+#: ../mail/em-folder-view.c:3208
+msgid "Click to hide/unhide addresses"
+msgstr "Cliciwch i ddangos/cuddio cyfeiriadau"
 
-#: ../mail/em-format-html-display.c:937 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:569
+#: ../mail/em-format-html.c:653
 msgid "Unsigned"
 msgstr "Di-lofnod"
 
-#: ../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:569
+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:938 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:570
+#: ../mail/em-format-html.c:654
 msgid "Valid signature"
 msgstr "Llofnod dilys"
 
-#: ../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."
-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:570
+msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
+msgstr "Mae'r neges hon wedi ei llofnodi ac yn ddilys, sy'n golygu ei bod hi'n ddigon tebyg fod y neges yn un dilys."
 
-#: ../mail/em-format-html-display.c:939 ../mail/em-format-html.c:620
+#: ../mail/em-format-html-display.c:571
+#: ../mail/em-format-html.c:655
 msgid "Invalid signature"
 msgstr "Llofnod annilys"
 
-#: ../mail/em-format-html-display.c:939
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
-"Methu dilysu llofnod y neges hon: fe all fod wedi ei newid yn ystod ei "
-"thaith."
+#: ../mail/em-format-html-display.c:571
+msgid "The signature of this message cannot be verified, it may have been altered in transit."
+msgstr "Methu dilysu llofnod y neges hon: fe all fod wedi ei newid yn ystod ei thaith."
 
-#: ../mail/em-format-html-display.c:940
-msgid "Valid signature, cannot verify sender"
-msgstr "Llofnod dilys, methu dilysu'r anfonwr"
+#: ../mail/em-format-html-display.c:572
+#: ../mail/em-format-html.c:656
+msgid "Valid signature, but cannot verify sender"
+msgstr "Llofnod dilys, ond yn methu dilysu'r anfonwr"
 
-#: ../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."
-msgstr ""
-"Mae'r neges wedi ei llofnodi â llofnod dilys, ond methwyd dilysu anfonwr y "
-"neges."
+#: ../mail/em-format-html-display.c:572
+msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
+msgstr "Mae'r neges wedi ei llofnodi â llofnod dilys, ond methwyd dilysu anfonwr y neges."
+
+#: ../mail/em-format-html-display.c:573
+#: ../mail/em-format-html.c:657
+msgid "Signature exists, but need public key"
+msgstr "Llofnod yn bodoli, ond angen allwedd cyhoeddus"
 
-#: ../mail/em-format-html-display.c:946 ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:573
+#, fuzzy
+msgid "This message is signed with a signature, but there is no corresponding public key."
+msgstr "Mae'r neges wedi ei llofnodi â llofnod dilys, ond methwyd dilysu anfonwr y neges."
+
+#: ../mail/em-format-html-display.c:580
+#: ../mail/em-format-html.c:663
 msgid "Unencrypted"
 msgstr "Heb amgryptio"
 
-#: ../mail/em-format-html-display.c:946
-msgid ""
-"This message is not encrypted. Its content may be viewed in transit across "
-"the Internet."
-msgstr ""
-"Nid yw'r neges hon wedi ei hamgryptio. Gellir darllen ei chynnwys wrth iddi "
-"deithio ar draws y Rhyngrwyd."
+#: ../mail/em-format-html-display.c:580
+msgid "This message is not encrypted. Its content may be viewed in transit across the Internet."
+msgstr "Nid yw'r neges hon wedi ei hamgryptio. Gellir darllen ei chynnwys wrth iddi deithio ar draws y Rhyngrwyd."
 
-#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:581
+#: ../mail/em-format-html.c:664
 msgid "Encrypted, weak"
 msgstr "Wedi amgryptio, yn wan"
 
-#: ../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 "
-"message in a practical amount of time."
-msgstr ""
-"Mae'r neges hon wedi ei hamgryptio, ond gydag algorithm amgryptio gwan.  Fe "
-"fyddai hi'n anodd, ond nid yn amhosib, i rywun o'r tu allan weld cynnwys y "
-"neges hon ymhen cyfnod ymarferol o amser."
+#: ../mail/em-format-html-display.c:581
+msgid "This message is encrypted, but with a weak encryption algorithm. It would be difficult, but not impossible for an outsider to view the content of this message in a practical amount of time."
+msgstr "Mae'r neges hon wedi ei hamgryptio, ond gydag algorithm amgryptio gwan.  Fe fyddai hi'n anodd, ond nid yn amhosib, i rywun o'r tu allan weld cynnwys y neges hon ymhen cyfnod ymarferol o amser."
 
-#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:582
+#: ../mail/em-format-html.c:665
 msgid "Encrypted"
 msgstr "Wedi amgryptio"
 
-#: ../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."
-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:582
+msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
+msgstr "Mae'r neges hon wedi ei hamgryptio.  Fe fyddai hi'n anodd i rywun o'r tu allan weld cynnwys y neges hon."
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:630
+#: ../mail/em-format-html-display.c:583
+#: ../mail/em-format-html.c:666
 msgid "Encrypted, strong"
 msgstr "Wedi amgryptio, yn gryf"
 
-#: ../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 "
-"practical amount of time."
-msgstr ""
-"Mae'r neges hon wedi ei hamgryptio, gydag algorithm amgryptio cryf.  Fe "
-"fyddai hi'n anodd iawn i rywun o'r tu allan weld cynnwys y neges hon mewn "
-"cyfnod ymarferol o amser."
+#: ../mail/em-format-html-display.c:583
+msgid "This message is encrypted, with a strong encryption algorithm. It would be very difficult for an outsider to view the content of this message in a practical amount of time."
+msgstr "Mae'r neges hon wedi ei hamgryptio, gydag algorithm amgryptio cryf.  Fe fyddai hi'n anodd iawn i rywun o'r tu allan weld cynnwys y neges hon mewn cyfnod ymarferol o amser."
 
-#: ../mail/em-format-html-display.c:1050 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:684
+#: ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Gweld Tystysgrif"
 
-#: ../mail/em-format-html-display.c:1065
+#: ../mail/em-format-html-display.c:699
 msgid "This certificate is not viewable"
 msgstr "Ni ellir gweld y dystysgrif"
 
-#: ../mail/em-format-html-display.c:1384
+#: ../mail/em-format-html-display.c:991
 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:1392
+#: ../mail/em-format-html-display.c:999
 msgid "Overdue:"
 msgstr "Hwyr:"
 
-#: ../mail/em-format-html-display.c:1395
+#: ../mail/em-format-html-display.c:1002
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "gan %B %d, %Y %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1455
+#: ../mail/em-format-html-display.c:1082
+#: ../widgets/misc/e-attachment-view.c:357
 msgid "_View Inline"
 msgstr "_Gweld yn Fewnol"
 
-#: ../mail/em-format-html-display.c:1456
+#: ../mail/em-format-html-display.c:1083
+#: ../widgets/misc/e-attachment-view.c:350
 msgid "_Hide"
 msgstr "_Cuddio"
 
-#: ../mail/em-format-html-display.c:1457
+#: ../mail/em-format-html-display.c:1084
 msgid "_Fit to Width"
 msgstr "_Ffitio i'r Lled"
 
-#: ../mail/em-format-html-display.c:1458
+#: ../mail/em-format-html-display.c:1085
 msgid "Show _Original Size"
 msgstr "Dangos y _Maint Gwreiddiol"
 
-#: ../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:2113
-msgid "Save attachment as"
-msgstr "Lleoliad cadw atodiad"
-
-#: ../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:2235
-#, c-format
-msgid "%d at_tachment"
-msgid_plural "%d at_tachments"
-msgstr[0] "%d at_odiad"
-msgstr[1] "%d at_odiad"
-msgstr[2] "%d at_odiad"
-
-#: ../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:2253
-msgid "S_ave All"
-msgstr "Cadw _Pob Un"
-
-#: ../mail/em-format-html-display.c:2316
-msgid "No Attachment"
-msgstr "Dim Atodiad"
-
-#: ../mail/em-format-html-display.c:2447 ../mail/em-format-html-display.c:2483
+#: ../mail/em-format-html-display.c:1586
+#: ../mail/em-format-html-display.c:1625
 msgid "View _Unformatted"
 msgstr "Gweld testun heb _Fformatio"
 
-#: ../mail/em-format-html-display.c:2449
+#: ../mail/em-format-html-display.c:1588
 msgid "Hide _Unformatted"
 msgstr "Cuddio testun heb _Fformatio"
 
-#: ../mail/em-format-html-display.c:2502
+#: ../mail/em-format-html-display.c:1645
 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-display.c:1722
+#, fuzzy
+msgid "Evolution cannot render this email as it is too large to process. You can view it unformatted or with an external text editor."
+msgstr "Ni all Evolution rendro'r e-bost hwn am ei fod yn rhy fawr i'w drin. Gallwch ei weld heb y fformatio neu gan ddefnyddio golygydd testun allanol."
 
-#: ../mail/em-format-html-print.c:128
+#: ../mail/em-format-html-print.c:157
 #, c-format
 msgid "Page %d of %d"
 msgstr "Tudalen %d o %d"
 
-#: ../mail/em-format-html.c:483 ../mail/em-format-html.c:485
+#: ../mail/em-format-html.c:504
+#: ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Yn nôl `%s'"
 
-#: ../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:928
+#, fuzzy
+msgid "Unknown external-body part."
+msgstr "Rhan corff allanol wedi ei gam-ffurfio."
 
-#: ../mail/em-format-html.c:892
+#: ../mail/em-format-html.c:936
 msgid "Malformed external-body part."
 msgstr "Rhan corff allanol wedi ei gam-ffurfio."
 
-#: ../mail/em-format-html.c:922
+#: ../mail/em-format-html.c:966
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pwyntydd at safle FTP (%s)"
 
-#: ../mail/em-format-html.c:933
+#: ../mail/em-format-html.c:977
 #, 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:935
+#: ../mail/em-format-html.c:979
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pwyntydd at ffeil leol (%s)"
 
-#: ../mail/em-format-html.c:956
+#: ../mail/em-format-html.c:1000
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pwyntydd at wybodaeth bell (%s)"
 
-#: ../mail/em-format-html.c:967
+#: ../mail/em-format-html.c:1011
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pwyntydd at ddata allanol anhysbys (math \"%s\")"
 
-#: ../mail/em-format-html.c:1194
+#: ../mail/em-format-html.c:1239
 msgid "Formatting message"
 msgstr "Fformatio neges"
 
-#: ../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:1489 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:90
-msgid "Reply-To"
-msgstr "Ateb-I"
+#: ../mail/em-format-html.c:1413
+msgid "Formatting Message..."
+msgstr "Fformatio Neges..."
 
 # Why are these two msgstr's in caps? Should they be?
-#: ../mail/em-format-html.c:1489 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:92
+#: ../mail/em-format-html.c:1566
+#: ../mail/em-format-html.c:1630
+#: ../mail/em-format-html.c:1651
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:926
+#: ../mail/em-mailer-prefs.c:78
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1489 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:851 ../mail/em-mailer-prefs.c:93
+#: ../mail/em-format-html.c:1567
+#: ../mail/em-format-html.c:1636
+#: ../mail/em-format-html.c:1654
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:927
+#: ../mail/em-mailer-prefs.c:79
 msgid "Bcc"
 msgstr "Bcc"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1664 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1174
+#: ../mail/em-format-html.c:1746
+#: ../mail/em-format-quote.c:352
+#: ../mail/em-mailer-prefs.c:1434
 msgid "Mailer"
 msgstr "Ebostiwr"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1691
-msgid "<I> (%a, %R %Z)</I>"
-msgstr "<I> (%a, %R %Z)</I>"
+#: ../mail/em-format-html.c:1773
+msgid " (%a, %R %Z)"
+msgstr "(%a, %R %Z)"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1694
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
-#: ../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
+#: ../mail/em-format-html.c:1778
+msgid " (%R %Z)"
+msgstr "(%R %Z)"
+
+#. To translators: This message suggests to the receipients that the sender of the mail is
+#. different from the one listed in From field.
+#.
+#: ../mail/em-format-html.c:1914
+#, c-format
+msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
+msgstr ""
+
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:924
+#: ../mail/em-mailer-prefs.c:76
+msgid "Reply-To"
+msgstr "Ateb-I"
+
+#: ../mail/em-format.c:929
+#: ../mail/em-mailer-prefs.c:81
+#: ../mail/message-list.etspec.h:2
+#: ../widgets/misc/e-dateedit.c:316
+#: ../widgets/misc/e-dateedit.c:338
 msgid "Date"
 msgstr "Dyddiad"
 
-#: ../mail/em-format-html.c:1727 ../mail/em-format.c:854
-#: ../mail/em-mailer-prefs.c:96
+#: ../mail/em-format.c:930
+#: ../mail/em-mailer-prefs.c:82
 msgid "Newsgroups"
 msgstr "Grwpiau Newyddion"
 
-#: ../mail/em-format.c:1118
+#: ../mail/em-format.c:931
+#: ../mail/em-mailer-prefs.c:83
+#: ../plugins/face/org-gnome-face.eplug.xml.h:4
+msgid "Face"
+msgstr "Gwyneb"
+
+#: ../mail/em-format.c:1201
 #, c-format
 msgid "%s attachment"
 msgstr "%s atodiad"
 
-#: ../mail/em-format.c:1157 ../mail/em-format.c:1308 ../mail/em-format.c:1610
+#: ../mail/em-format.c:1239
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Methu gramadegu neges S/MIME: Gwall anhysbys"
 
-#: ../mail/em-format.c:1290 ../mail/em-format.c:1446
+#: ../mail/em-format.c:1376
+#: ../mail/em-format.c:1533
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Methu gramadegu neges MIME. Yn dangos ei ffynhonnell."
 
-#: ../mail/em-format.c:1298
+#: ../mail/em-format.c:1384
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Math amgryptio na gynhelir ar gyfer multipart/encrypted"
 
-#: ../mail/em-format.c:1465
+#: ../mail/em-format.c:1394
+#, fuzzy
+msgid "Could not parse PGP/MIME message"
+msgstr "Methu gramadegu neges S/MIME: Gwall anhysbys"
+
+#: ../mail/em-format.c:1394
+#, fuzzy
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr "Methu gramadegu neges S/MIME: Gwall anhysbys"
+
+#: ../mail/em-format.c:1552
 msgid "Unsupported signature format"
 msgstr "Ffurf llofnod na gynhelir"
 
-#: ../mail/em-format.c:1473 ../mail/em-format.c:1539
+#: ../mail/em-format.c:1560
+#: ../mail/em-format.c:1698
 msgid "Error verifying signature"
 msgstr "Gwall wrth wirio llofnod"
 
-#: ../mail/em-format.c:1473 ../mail/em-format.c:1539
+#: ../mail/em-format.c:1560
+#: ../mail/em-format.c:1689
+#: ../mail/em-format.c:1698
 msgid "Unknown error verifying signature"
 msgstr "Gwall anhysbys wrth wirio llofnod"
 
-#: ../mail/em-mailer-prefs.c:107
+#: ../mail/em-format.c:1772
+msgid "Could not parse PGP message"
+msgstr "Methu gramadegu neges PGP"
+
+#: ../mail/em-format.c:1772
+#, fuzzy
+msgid "Could not parse PGP message: Unknown error"
+msgstr "Methu gramadegu neges S/MIME: Gwall anhysbys"
+
+#: ../mail/em-mailer-prefs.c:94
 msgid "Every time"
 msgstr "Bob tro"
 
-#: ../mail/em-mailer-prefs.c:108
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per day"
 msgstr "Unwaith y dydd"
 
-#: ../mail/em-mailer-prefs.c:109
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per week"
 msgstr "Unwaith bob wythnos"
 
-#: ../mail/em-mailer-prefs.c:110
+#: ../mail/em-mailer-prefs.c:97
 msgid "Once per month"
 msgstr "Unwaith bob mis"
 
-#: ../mail/em-mailer-prefs.c:778
+#: ../mail/em-mailer-prefs.c:331
+#, fuzzy
+msgid "Add Custom Junk Header"
+msgstr "Pennawd Addasedig"
+
+#: ../mail/em-mailer-prefs.c:335
+msgid "Header Name:"
+msgstr "Enw Pennawd:"
+
+#: ../mail/em-mailer-prefs.c:336
+msgid "Header Value Contains:"
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:437
+#: ../widgets/table/e-table-click-to-add.c:500
+#: ../widgets/table/e-table-selection-model.c:309
+msgid "Header"
+msgstr "Pennawd"
+
+#: ../mail/em-mailer-prefs.c:441
+msgid "Contains Value"
+msgstr "Yn Cynnwys Gwerth "
+
+#: ../mail/em-mailer-prefs.c:464
+msgid "Color"
+msgstr "Lliw"
+
+#: ../mail/em-mailer-prefs.c:467
+#, fuzzy
+msgid "Tag"
+msgstr "yn ôl"
+
+#. May be a better text
+#: ../mail/em-mailer-prefs.c:1062
+#: ../mail/em-mailer-prefs.c:1116
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr ""
 
-#: ../mail/em-mailer-prefs.c:786
+#. May be a better text
+#: ../mail/em-mailer-prefs.c:1070
+#: ../mail/em-mailer-prefs.c:1125
 #, c-format
-msgid ""
-"%s plugin is not available. Please check whether the package is installed."
+msgid "%s plugin is not available. Please check whether the package is installed."
 msgstr ""
 
-#: ../mail/em-mailer-prefs.c:807
+#: ../mail/em-mailer-prefs.c:1091
 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 "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Mae lleoliad a strwythur plygellau blychau ebost Evolution wedi newid ers "
-"Evolution 1.x\n"
-"\n"
-"Byddwch yn amyneddgar nes i Evolution fudo'ch plygellau..."
+#. green
+#: ../mail/em-migrate.c:961
+msgid "To Do"
+msgstr "I'w wneud"
 
-#: ../mail/em-migrate.c:1649
+#. blue
+#: ../mail/em-migrate.c:962
+msgid "Later"
+msgstr "Hwyrach"
+
+#: ../mail/em-migrate.c:1128
+#, fuzzy
+msgid "Migration"
+msgstr "Trosi..."
+
+#: ../mail/em-migrate.c:1573
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Methu creu plygell newydd `%s': %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1599
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Methu copïo plygell `%s' i `%s': %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1784
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Methu sganio am flychau e-bost ar `%s': %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:1789
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Mae lleoliad a strwythur plygellau blychau ebost Evolution wedi newid ers Evolution 1.x\n"
+"\n"
+"Byddwch yn amyneddgar nes i Evolution fudo'ch plygellau..."
+
+#: ../mail/em-migrate.c:1990
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Methu agor hen ddata POP cadw-ar-y-gweinydd `%s': %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2004
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Methu creu plygell data `%s' POP3 i'w gadw ar y gweinydd: %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2033
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Methu copïo data POP3 `%s' i'w gadw ar y gweinydd: %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2504
+#: ../mail/em-migrate.c:2516
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Methu creu storfa e-bost lleol `%s': %s"
 
-#: ../mail/em-migrate.c:2709
+#: ../mail/em-migrate.c:2874
+#, fuzzy
+msgid "Migrating Folders"
+msgstr "Creu plygell `%s'"
+
+#: ../mail/em-migrate.c:2874
+#, fuzzy
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to SQLite since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Mae lleoliad a strwythur plygellau blychau ebost Evolution wedi newid ers Evolution 1.x\n"
+"\n"
+"Byddwch yn amyneddgar nes i Evolution fudo'ch plygellau..."
+
+#: ../mail/em-migrate.c:2955
 #, 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:2728
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr ""
-"Methu darllen gosodiadau'r Evolution blaenorol, nid yw `evolution/config."
-"xmldb' yn bodoli, neu mae wedi llygru."
+#: ../mail/em-migrate.c:2974
+msgid "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
+msgstr "Methu darllen gosodiadau'r Evolution blaenorol, nid yw `evolution/config.xmldb' yn bodoli, neu mae wedi llygru."
+
+#: ../mail/em-popup.c:364
+msgid "Save As..."
+msgstr "Cadw Fel..."
 
-#: ../mail/em-popup.c:562 ../mail/em-popup.c:573
+#: ../mail/em-popup.c:389
+#, c-format
+msgid "untitled_image.%s"
+msgstr "delwedd_dideitl.%s"
+
+#: ../mail/em-popup.c:495
+#: ../widgets/misc/e-attachment-handler-image.c:147
+msgid "Set as _Background"
+msgstr "Gosodwch fel _Cefndir"
+
+#: ../mail/em-popup.c:497
 msgid "_Reply to sender"
 msgstr "_Ateb i'r danfonwr"
 
-#: ../mail/em-popup.c:563 ../mail/em-popup.c:574
-#: ../ui/evolution-mail-message.xml.h:83
+#: ../mail/em-popup.c:498
+#: ../ui/evolution-mail-message.xml.h:79
 msgid "Reply to _List"
 msgstr "Ateb i'r _Rhestr"
 
-#: ../mail/em-popup.c:627
+#. make it first item
+#: ../mail/em-popup.c:547
+#: ../mail/em-popup.c:746
 msgid "_Add to Address Book"
 msgstr "_Ychwanegu i'r Llyfr Cyfeiriadau"
 
-#: ../mail/em-subscribe-editor.c:603
+#: ../mail/em-popup.c:725
+#, c-format
+msgid "Open in %s..."
+msgstr "Agor yn %s..."
+
+#: ../mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
-msgstr ""
-"Nid yw'r storfa yn cynnal tanysgrifiadau, neu nid ydynt wedi eu gweithredoli."
+msgstr "Nid yw'r storfa yn cynnal tanysgrifiadau, neu nid ydynt wedi eu gweithredoli."
 
-#: ../mail/em-subscribe-editor.c:633
+#: ../mail/em-subscribe-editor.c:639
 msgid "Subscribed"
 msgstr "Wedi Tanysgrifio"
 
-#: ../mail/em-subscribe-editor.c:637
+#: ../mail/em-subscribe-editor.c:643
 msgid "Folder"
 msgstr "Plygell"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:858
 msgid "Please select a server."
 msgstr "Dewiswch weinydd."
 
-#: ../mail/em-subscribe-editor.c:856
+#: ../mail/em-subscribe-editor.c:894
 msgid "No server has been selected"
 msgstr "Does dim gweinydd wedi ei ddewis"
 
-#: ../mail/em-utils.c:120
-msgid "Do not show this message again."
-msgstr "Peidiwch â dangos y neges hon eto."
+#. Check buttons
+#: ../mail/em-utils.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:129
+msgid "_Do not show this message again."
+msgstr "Peidiwch â _dangos y neges hon eto."
 
-#: ../mail/em-utils.c:315
+#: ../mail/em-utils.c:317
 msgid "Message Filters"
 msgstr "Hidlyddion Negeseuon"
 
-#: ../mail/em-utils.c:368
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "neges"
 
-#: ../mail/em-utils.c:557
+#: ../mail/em-utils.c:652
 msgid "Save Message..."
 msgstr "Cadw'r Neges..."
 
-#: ../mail/em-utils.c:606
+#: ../mail/em-utils.c:702
 msgid "Add address"
 msgstr "Ychwanegu cyfeiriad"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1090
+#: ../mail/em-utils.c:1223
 #, c-format
 msgid "Messages from %s"
 msgstr "Negeseuon o %s"
 
-#: ../mail/em-vfolder-editor.c:112
+#: ../mail/em-vfolder-editor.c:114
 msgid "Search _Folders"
 msgstr "_Plygellau Chwilio"
 
-#: ../mail/em-vfolder-rule.c:590
+#: ../mail/em-vfolder-rule.c:592
 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"
+#: ../mail/evolution-mail.schemas.in.h:1
+#, fuzzy
+msgid "\"Send and Receive Mail\" window height"
+msgstr "Anfon a Derbyn Ebost"
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:3
+#, fuzzy
+msgid "\"Send and Receive Mail\" window width"
+msgstr "Anfon a Derbyn Ebost"
+
+#: ../mail/evolution-mail.schemas.in.h:4
+#, fuzzy
+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"
+#: ../mail/evolution-mail.schemas.in.h:5
+#, fuzzy
+msgid "Always request read receipt"
+msgstr "_Gofyn am Dderbynneb Darllen"
+
+#: ../mail/evolution-mail.schemas.in.h:7
+#, fuzzy
+msgid "Automatic emoticon recognition"
 msgstr "Adnabod cysylltiadau'n awtomatig"
 
-#: ../mail/evolution-mail.schemas.in.in.h:3
-msgid "Automatic smiley recognition"
-msgstr "Adnabod gwenogluniau'n awtomatig"
+#: ../mail/evolution-mail.schemas.in.h:8
+msgid "Automatic link recognition"
+msgstr "Adnabod cysylltiadau'n awtomatig"
 
-#: ../mail/evolution-mail.schemas.in.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:9
 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:5
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Citation highlight color"
 msgstr "Lliw aroleuo dyfyniad"
 
-#: ../mail/evolution-mail.schemas.in.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Citation highlight color."
 msgstr "Lliw aroleuo dyfyniad."
 
-#: ../mail/evolution-mail.schemas.in.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Composer Window default height"
 msgstr "Uchder rhagosodedig Ffenest Gyfansoddi"
 
-#: ../mail/evolution-mail.schemas.in.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Composer Window default width"
 msgstr "Lled rhagosodedig Ffenest Gyfansoddi"
 
-#: ../mail/evolution-mail.schemas.in.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:14
+#, fuzzy
+msgid "Composer load/attach directory"
+msgstr "Dim cyfeiriadur albwm!"
+
+#: ../mail/evolution-mail.schemas.in.h:15
 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:10
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
+#: ../mail/evolution-mail.schemas.in.h:16
+msgid "Compress display of addresses in TO/CC/BCC to the number specified in address_count."
+msgstr "Cywasgu dangosiad cyfeiriadau yn yr olwg AT/CC/BCC i'r nifer a benodir yn address_count."
+
+#: ../mail/evolution-mail.schemas.in.h:17
+msgid "Controls how frequently local changes are synchronized with the remote mail server. The interval must be at least 30 seconds."
 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:11
+#: ../mail/evolution-mail.schemas.in.h:18
+msgid "Custom headers to use while checking for junk."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:19
+msgid "Custom headers to use while checking for junk. The list elements are string in the format \"headername=value\"."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:20
 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.h:21
 msgid "Default charset in which to compose messages."
 msgstr "Set nodau ragosodedig er mwyn cyfansoddi negeseuon."
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:22
 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.h:23
 msgid "Default charset in which to display messages."
 msgstr "Set nodau ragosodedig er mwyn dangos negeseuon."
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr "Arddull ragosodedig gyrru ymlaen"
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
-msgid "Default height of the Composer Window"
+#: ../mail/evolution-mail.schemas.in.h:25
+#, fuzzy
+msgid "Default height of the Composer Window."
 msgstr "Uchder rhagosodedig y Ffenest Gyfansoddi"
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
-msgid "Default height of the Message Window"
+#: ../mail/evolution-mail.schemas.in.h:26
+#, fuzzy
+msgid "Default height of the message window."
 msgstr "Uchder rhagosodedig y Ffenest Neges"
 
-#: ../mail/evolution-mail.schemas.in.in.h:18
-msgid "Default height of the Subscribe dialog"
+#: ../mail/evolution-mail.schemas.in.h:27
+#, fuzzy
+msgid "Default height of the subscribe dialog."
 msgstr "Uchder rhagosodedig y ddeialog Tanysgrifio"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr "Arddull ateb rhagosod"
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:29
 #, 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"
+#: ../mail/evolution-mail.schemas.in.h:30
+#, fuzzy
+msgid "Default width of the Composer Window."
 msgstr "Lled rhagosodedig y Ffenest Gyfansoddi"
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
-msgid "Default width of the Message Window"
+#: ../mail/evolution-mail.schemas.in.h:31
+#, fuzzy
+msgid "Default width of the message window."
 msgstr "Lled rhagosodedig y Ffenest Neges"
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
-msgid "Default width of the Subscribe dialog"
+#: ../mail/evolution-mail.schemas.in.h:32
+#, fuzzy
+msgid "Default width of the subscribe dialog."
 msgstr "Lled rhagosodedig y ddeialog Tanysgrifio"
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
-msgid "Directory for saving mail component files"
+#: ../mail/evolution-mail.schemas.in.h:33
+msgid "Determines whether to look up addresses for junk filtering in local address book only"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:34
+msgid "Determines whether to lookup in address book for sender email"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:35
+msgid "Determines whether to lookup the sender email in address book. If found, it shouldn't be a spam. It looks up in the books marked for autocompletion. It can be slow, if remote address books (like LDAP) are marked for autocompletion."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:36
+msgid "Determines whether to use custom headers to check for junk"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:37
+msgid "Determines whether to use custom headers to check for junk. If this option is enabled and the headers are mentioned, it will be improve the junk checking speed."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:38
+msgid "Determines whether to use the same fonts for both \"From\" and \"Subject\" lines in the \"Messages\" column in vertical view."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:39
+#, fuzzy
+msgid "Directory for loading/attaching files to composer."
 msgstr "Cyfeiriadur i gadw ffeiliau cydran e-bost"
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:40
+#, fuzzy
+msgid "Directory for saving mail component files."
+msgstr "Cyfeiriadur i gadw ffeiliau cydran e-bost"
+
+#: ../mail/evolution-mail.schemas.in.h:41
+msgid "Disable or enable ellipsizing of folder names in side bar"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:42
 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:26
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Junk folders on exit"
 msgstr "Gwacáu plygellau Sbwriel wrth adael"
 
-#: ../mail/evolution-mail.schemas.in.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "Gwacáu plygellau Sbwriel wrth adael"
 
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:45
 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
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Gwagio bob plygell Sbwriel wrth adael Evolution."
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
-msgstr ""
-"Galluogi modd caret, fel eich bod yn medru gweld cyrchwr wrth ddarllen e-"
-"bost."
+msgstr "Galluogi modd caret, fel eich bod yn medru gweld cyrchwr wrth ddarllen e-bost."
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:48
+#, fuzzy
+msgid "Enable or disable magic space bar"
+msgstr "Galluogi neu analluogi'r nodwedd chwilio wrth deipio ymlaen"
+
+#: ../mail/evolution-mail.schemas.in.h:49
+#, fuzzy
+msgid "Enable or disable the prompt whilst marking multiple messages."
+msgstr "Mae'n galluogi/analluogi'r prompt wrth farcio mwy nag un neges."
+
+#: ../mail/evolution-mail.schemas.in.h:50
 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: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 "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
+#: ../mail/evolution-mail.schemas.in.h:51
+#, fuzzy
+msgid "Enable search folders"
+msgstr "Plygellau Chwilio"
+
+#: ../mail/evolution-mail.schemas.in.h:52
+msgid "Enable search folders on startup."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:53
+msgid "Enable the side bar search feature to allow interactive searching of folder names."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:54
+msgid "Enable this to use Space bar key to scroll in message preview, message list and folders."
 msgstr ""
-"Galluogi nodwedd chwilio o fewn y bar ochr fel y gallwch chi ddechrau "
-"chwilio'n rhyngweithiol wrth deipio'r testun. Mae hyn yn gadael i chi ganfod "
-"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:33
+#: ../mail/evolution-mail.schemas.in.h:55
 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
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Enable/disable caret mode"
 msgstr "Galluogi/analluogi'r modd caret"
 
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/mail-config.glade.h:86
+msgid "Encode file names in an Outlook/GMail way"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:58
+msgid "Encode file names in the mail headers same as Outlook or GMail do, to let them display correctly file names with UTF-8 letters sent by Evolution, because they do not follow the RFC 2231, but use the incorrect RFC 2047 standard."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Height of the message-list pane"
 msgstr "Uchder y cwarel rhestr negeseuon"
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Height of the message-list pane."
 msgstr "Uchder y cwarel rhestr negeseuon."
 
-#: ../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."
+#: ../mail/evolution-mail.schemas.in.h:61
+msgid "Hides the per-folder preview and removes the selection"
 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:38
-msgid ""
-"If the \"Preview\" pane is on, then show it side-by-side rather than "
-"vertically."
+#: ../mail/evolution-mail.schemas.in.h:62
+msgid "If a user tries to open 10 or more messages at one time, ask the user if they really want to do it."
+msgstr "Os ydy'r defnyddiwr yn ceisio agor 10 neges neu fwy ar yr un pryd, gofyn iddyn nhw a ydyn nhw wir am wneud hynny."
+
+#: ../mail/evolution-mail.schemas.in.h:63
+msgid "If the \"Preview\" pane is on, then show it side-by-side rather than vertically."
+msgstr "Os yw'r panel \"Rhagolwg\" ar waith, ei ddangos ochr-yn-ochr yn hytrach na'n fertigol."
+
+#: ../mail/evolution-mail.schemas.in.h:64
+#, fuzzy
+msgid "If there isn't a builtin viewer for a particular MIME type inside Evolution, any MIME types appearing in this list which map to a Bonobo component viewer in GNOME's MIME type database may be used for displaying content."
+msgstr "Os nad oes gwelydd mewnol ar gyfer math mime arbennig o fewn Evolution, gellir defnyddio unrhyw fath mime o fewn y rhestr hon sy'n mapio i welydd cydran bonobo yng nghronfa data mathau mime GNOME er mwyn dangos y cynnwys."
+
+#: ../mail/evolution-mail.schemas.in.h:65
+msgid "Initial height of the \"Send and Receive Mail\" window. The value updates as the user resizes the window vertically."
 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: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 "
-"in GNOME's mime-type database may be used for displaying content."
+#: ../mail/evolution-mail.schemas.in.h:66
+msgid "Initial maximize state of the \"Send and Receive Mail\" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the \"Send and Receive Mail\" window cannot be maximized. This key exists only as an implementation detail."
 msgstr ""
-"Os nad oes gwelydd mewnol ar gyfer math mime arbennig o fewn Evolution, "
-"gellir defnyddio unrhyw fath mime o fewn y rhestr hon sy'n mapio i welydd "
-"cydran bonobo yng nghronfa data mathau mime GNOME er mwyn dangos y cynnwys."
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
-msgid ""
-"It disables the feature where repeated prompts to ask if offline sync is "
-"required."
+#: ../mail/evolution-mail.schemas.in.h:67
+msgid "Initial width of the \"Send and Receive Mail\" window. The value updates as the user resizes the window horizontally."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.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.h:68
+msgid "It disables/enables the repeated prompts to ask if offline sync is required before going into offline mode."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:69
+msgid "It disables/enables the repeated prompts to warn that deleting messages from a search folder permanently deletes the message, not simply removing it from the search results."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:70
 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
+#: ../mail/evolution-mail.schemas.in.h:71
 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:44
+#: ../mail/evolution-mail.schemas.in.h:73
 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:45
+#: ../mail/evolution-mail.schemas.in.h:74
+#, fuzzy
+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.h:75
 msgid "List of accepted licenses"
 msgstr "Rhestr trwyddedau wedi'u derbyn"
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of accounts"
 msgstr "Rhestr cyfrifon"
 
-#: ../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."
-msgstr ""
-"Rhestr o gyfrifon y gŵyr cydran ebost Evolution amdanynt.  Mae'r rhestr yn "
-"cynnwys llinynnau sy'n enwi is-blygellau perthynol i /apps/evolution/mail/"
-"accounts."
+#: ../mail/evolution-mail.schemas.in.h:77
+msgid "List of accounts known to the mail component of Evolution. The list contains strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr "Rhestr o gyfrifon y gŵyr cydran ebost Evolution amdanynt.  Mae'r rhestr yn cynnwys llinynnau sy'n enwi is-blygellau perthynol i /apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:78
 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: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."
+#: ../mail/evolution-mail.schemas.in.h:79
+msgid "List of dictionary language codes used for spell checking."
 msgstr ""
-"Rhestr o labeli y gŵyr cydran ebost Evolution amdanynt.  Mae'r rhestr yn "
-"cynnwys llinynnau sy'n cynnwys enw:lliw lle mae lliw yn defnyddio'r amgodiad "
-"hecs HTML."
 
-#: ../mail/evolution-mail.schemas.in.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.h:80
+msgid "List of labels known to the mail component of Evolution. The list contains strings containing name:color where color uses the HTML hex encoding."
+msgstr "Rhestr o labeli y gŵyr cydran ebost Evolution amdanynt.  Mae'r rhestr yn cynnwys llinynnau sy'n cynnwys enw:lliw lle mae lliw yn defnyddio'r amgodiad hecs HTML."
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:81
 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:52
-msgid "Load images for HTML messages over http"
+#: ../mail/evolution-mail.schemas.in.h:82
+#, fuzzy
+msgid "Load images for HTML messages over HTTP"
 msgstr "Llwytho delweddau ar gyfer negeseuon HTML dros http"
 
-#: ../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 "
-"load images off the net"
-msgstr ""
-"Llwytho delweddau ar gyfer negeseuon HTML dros http(s). Gwerthoedd posib yw: "
-"0 - Peidio byth â llwytho delweddau o'r rhwyd 1 - Llwytho delweddau os yw'r "
-"anfonwr yn y llyfr cyfeiriadau 2 - Llwytho delweddau o'r rhwyd bob amser"
+#: ../mail/evolution-mail.schemas.in.h:83
+#, fuzzy
+msgid "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - Never load images off the net. \"1\" - Load images in messages from contacts. \"2\" - Always load images off the net."
+msgstr "Llwytho delweddau ar gyfer negeseuon HTML dros http(s). Gwerthoedd posib yw: 0 - Peidio byth â llwytho delweddau o'r rhwyd 1 - Llwytho delweddau os yw'r anfonwr yn y llyfr cyfeiriadau 2 - Llwytho delweddau o'r rhwyd bob amser"
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Log filter actions"
 msgstr "Cofnodi gweithredoedd hidlo"
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Log filter actions to the specified log file."
 msgstr "Logio gweithredoedd hidlo yn y ffeil benodol."
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Logfile to log filter actions"
 msgstr "Ffeil i logio gweithredoedd hidlo"
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Logfile to log filter actions."
 msgstr "Ffeil i logio gweithredoedd hidlo."
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark as Seen after specified timeout"
 msgstr "Marcio wedi'u Gweld ar ôl amser penodol"
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark as Seen after specified timeout."
 msgstr "Marcio wedi'u Gweld ar ôl amser penodol."
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Mark citations in the message \"Preview\""
-msgstr "Marcio dyfyniadau yn y neges \"Rhagolwg\""
+msgstr "Marcio dyfyniadau yn y neges \"Preview\""
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Mark citations in the message \"Preview\"."
-msgstr "Marcio dyfyniadau yn y neges \"Rhagolwg\"."
+msgstr "Marcio dyfyniadau yn y neges \"Preview\"."
 
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message Window default height"
 msgstr "Uchder rhagosodedig Ffenest Neges"
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Message Window default width"
 msgstr "Lled rhagosodedig Ffenest Neges"
 
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr ""
-"Arddull dangos-neges (\"arferol\", \"penawdau llawn\", \"ffynhonnell\")"
+msgstr "Arddull dangos-neges (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:95
 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
+#: ../mail/evolution-mail.schemas.in.h:96
 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:67
+#: ../mail/evolution-mail.schemas.in.h:97
 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
+#: ../mail/evolution-mail.schemas.in.h:98
 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:69
-msgid "New Mail Notify sound file"
-msgstr "Ffeil sain hysbysu am e-bost newydd"
-
-#: ../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:71
+#: ../mail/evolution-mail.schemas.in.h:99
 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:72
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Prompt on empty subject"
 msgstr "Rhybuddio am bwnc gwag"
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:101
 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:74
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
+#: ../mail/evolution-mail.schemas.in.h:102
+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:75
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:104
+#, fuzzy
+msgid "Prompt when deleting messages in search folder"
+msgstr "Rhybuddio cyn anfon negeseuon gyda _llinell bwnc wag"
+
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user expunges"
 msgstr "Promptio pan mae'r defnyddiwr yn chwynnu"
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:106
 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:78
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to open 10 or more messages at once"
-msgstr ""
-"Promptio pan mae'r defnyddiwr yn ceisio agor 10 neges neu fwy ar unwaith"
+msgstr "Promptio pan mae'r defnyddiwr yn ceisio agor 10 neges neu fwy ar unwaith"
 
-#: ../mail/evolution-mail.schemas.in.in.h:79
-msgid ""
-"Prompt when user tries to send HTML mail to recipients that may not want to "
-"receive HTML mail."
-msgstr ""
-"Promptio pan mae'r defnyddiwr yn ceisio anfon e-bost HTML at dderbynwyr nad "
-"ydynt o reidrwydd am dderbyn e-bost HTML."
+#: ../mail/evolution-mail.schemas.in.h:108
+msgid "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
+msgstr "Promptio pan mae'r defnyddiwr yn ceisio anfon e-bost HTML at dderbynwyr nad ydynt o reidrwydd am dderbyn e-bost HTML."
 
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr ""
-"Promptio pan mae'r defnyddiwr yn ceisio anfon neges heb dderbynwyr At: na Cc:"
+msgstr "Promptio pan mae'r defnyddiwr yn ceisio anfon neges heb dderbynwyr At: na Cc:"
 
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:110
 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:82
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Prompt while marking multiple messages"
 msgstr "Promptio wrth farcio mwy nag un neges"
 
-#: ../mail/evolution-mail.schemas.in.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:112
+#, fuzzy
+msgid "Recognize emoticons in text and replace them with images."
+msgstr "Adnabod gwenogluniau o fewn y testun a'u hamnewid."
+
+#: ../mail/evolution-mail.schemas.in.h:113
 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: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:85
-msgid "Run junk test on incoming mail"
+#: ../mail/evolution-mail.schemas.in.h:114
+#, fuzzy
+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:86
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Save directory"
 msgstr "Cyfeiriadur cadw"
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:116
+msgid "Search for the sender photo in local address books"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Send HTML mail by default"
 msgstr "Anfon e-bost HTML yn rhagosod"
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Send HTML mail by default."
 msgstr "Anfon e-bost HTML yn rhagosod."
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:119
+#, fuzzy
+msgid "Sender email-address column in the message list"
+msgstr "Dangos cyfeiriad e-bost yr anfonwr o fewn y golofn negeseuon yn y rhestr negeseuon"
+
+#: ../mail/evolution-mail.schemas.in.h:120
+#, fuzzy
+msgid "Server synchronization interval"
+msgstr "_Opsiynau Cysoni..."
+
+#: ../mail/evolution-mail.schemas.in.h:121
+msgid "Show \"Bcc\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:122
+msgid "Show \"Cc\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:123
+msgid "Show \"From\" field when posting to a newsgroup"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:124
+msgid "Show \"From\" field when sending a mail message"
+msgstr "Dangos y maes \"Oddi wrth\" pan yn danfon neges ebost"
+
+#: ../mail/evolution-mail.schemas.in.h:125
+msgid "Show \"Reply To\" field when posting to a newsgroup"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid "Show \"Reply To\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Show Animations"
 msgstr "Dangos Animeiddio"
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Show animated images as animations."
 msgstr "Dangos delweddau animeiddiedig fel animeiddiadau."
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Show deleted messages (with a strike-through) in the message-list."
-msgstr ""
-"Dangos negeseuon sydd wedi eu dileu (gyda llinell drwyddynt) yn y rhestr "
-"negeseuon."
+msgstr "Dangos negeseuon sydd wedi eu dileu (gyda llinell drwyddynt) yn y rhestr negeseuon."
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:130
 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:95
-msgid ""
-"Show the email of the sender in the messages composite column in the message "
-"list"
+#: ../mail/evolution-mail.schemas.in.h:131
+msgid "Show photo of the sender"
+msgstr "Dangos llun o'r anfonwr"
+
+#: ../mail/evolution-mail.schemas.in.h:132
+msgid "Show the \"Bcc\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
 msgstr ""
-"Dangos cyfeiriad e-bost yr anfonwr o fewn colofn gyfansawdd y negeseuon yn y "
-"rhestr negeseuon"
 
-#: ../mail/evolution-mail.schemas.in.in.h:96
-msgid "Show the sender email in the messages column in the message list"
+#: ../mail/evolution-mail.schemas.in.h:133
+msgid "Show the \"Cc\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
 msgstr ""
-"Dangos cyfeiriad e-bost yr anfonwr o fewn y golofn negeseuon yn y rhestr "
-"negeseuon"
 
-#: ../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.h:134
+msgid "Show the \"From\" field when posting to a newsgroup. This is controlled from the View menu when a news account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:135
+#, fuzzy
+msgid "Show the \"From\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
+msgstr "Dangos y maes \"Oddi wrth\" pan yn danfon neges ebost."
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
-msgid "Specifies the type of New Mail Notification the user wishes to use."
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid "Show the \"Reply To\" field when posting to a newsgroup. This is controlled from the View menu when a news account is chosen."
 msgstr ""
-"Penodi'r math o nodyn Hysbysu am Ebost Newydd mae'r defnyddiwr am weld."
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:139
+msgid "Show the \"Reply To\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:140
+#, fuzzy
+msgid "Show the email-address of the sender in a separate column in the message list."
+msgstr "Dangos cyfeiriad e-bost yr anfonwr o fewn colofn gyfansawdd y negeseuon yn y rhestr negeseuon"
+
+#: ../mail/evolution-mail.schemas.in.h:141
+#, fuzzy
+msgid "Show the photo of the sender in the message reading pane."
+msgstr "Dangos cyfeiriad e-bost yr anfonwr o fewn colofn gyfansawdd y negeseuon yn y rhestr negeseuon"
+
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Spell check inline"
 msgstr "Gwirio sillafu'n fewnol"
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:143
+#, fuzzy
+msgid "Spell checking color"
+msgstr "Gwirio Sillafu"
+
+#: ../mail/evolution-mail.schemas.in.h:144
+#, fuzzy
+msgid "Spell checking languages"
+msgstr "Gwirio sillafu'n fewnol"
+
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Subscribe dialog default height"
 msgstr "Uchder rhagosodedig deialog Tanysgrifio"
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Subscribe dialog default width"
 msgstr "Lled rhagosodedig deialog Tanysgrifio"
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Terminal font"
 msgstr "Ffont terfynell"
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Text message part limit"
 msgstr "Cyfyngiad rhan neges destun"
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "The default plugin for Junk hook"
 msgstr "Ategyn rhagosodedig i'r bachyn Sothach"
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "The last time empty junk was run, in days since the epoch."
-msgstr ""
-"Y tro diwethaf rhedwyd y broses i wacáu'r sbwriel, mewn diwrnodau ers yr "
-"epoc."
+msgstr "Y tro diwethaf rhedwyd y broses i wacáu'r sbwriel, mewn diwrnodau ers yr epoc."
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "The last time empty trash was run, in days since the epoch."
-msgstr ""
-"Y tro diwethaf rhedwyd y broses i wacáu'r sbwriel, mewn diwrnodau ers yr "
-"epoc."
+msgstr "Y tro diwethaf rhedwyd y broses i wacáu'r sbwriel, mewn diwrnodau ers yr epoc."
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
-msgid "The terminal font for mail display"
+#: ../mail/evolution-mail.schemas.in.h:152
+#, fuzzy
+msgid "The terminal font for mail display."
 msgstr "Y ffont terfynell er mwyn dangos e-bost"
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
-msgid "The variable width font for mail display"
+#: ../mail/evolution-mail.schemas.in.h:153
+#, fuzzy
+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: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."
+#: ../mail/evolution-mail.schemas.in.h:154
+msgid "This can have three possible values. \"0\" for errors. \"1\" for warnings. \"2\" for debug messages."
 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."
+#: ../mail/evolution-mail.schemas.in.h:155
+#, fuzzy
+msgid "This decides the max size of the text part that can be formatted under Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
+msgstr "Mae hyn yn penderfynu uchafswm maint y rhan testun fedr evolution ei fformatio. 4MB / 4096 KB yw'r rhagosodiad, ac fe'i ddifinnir mewn KB."
+
+#: ../mail/evolution-mail.schemas.in.h:156
+#, fuzzy
+msgid "This is the default junk plugin, even though there are multiple plugins enabled. If the default listed plugin is disabled, then it won't fall back to the other available plugins."
+msgstr "Dyma'r ategyn sothach rhagosodedig, hyd yn oed os oes amryw ategion wedi eu galluogi. Os yw'r ategyn sothach rhagosodedig ar gael, fydd ddim cwympo yn ôl at yr ategion rhagosodedig."
+
+#: ../mail/evolution-mail.schemas.in.h:157
+msgid "This key is read only once and reset to \"false\" after read. This unselects the mail in the list and removes the preview for that folder."
 msgstr ""
-"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;"
-"header enabled&gt; - set enabled if the header is to be displayed in the "
-"mail view."
+#: ../mail/evolution-mail.schemas.in.h:158
+msgid "This key should contain a list of XML structures specifying custom headers, and whether they are to be displayed. The format of the XML structure is &lt;header enabled&gt; - set enabled if the header is to be displayed in the mail view."
+msgstr "Dylai'r allwedd hon gynnwys rhestr o strwythurau XML sy'n penodi penawdau arbennig, a p'un ai dylid eu dangos ai peidio. Ffurf y strwythur XML yw &lt;pennawd galluogwyd&gt; - gosodwch 'galluogwyd' os yw'r pennawd am gael ei ddangos yn yr olwg e-bost."
+
+#: ../mail/evolution-mail.schemas.in.h:159
+msgid "This option is related to the key lookup_addressbook and is used to determine whether to look up addresses in local address book only to exclude mail sent by known contacts from junk filtering."
 msgstr ""
-"Dylai'r allwedd hon gynnwys rhestr o strwythurau XML sy'n penodi penawdau "
-"arbennig, a p'un ai dylid eu dangos ai peidio. Ffurf y strwythur XML yw &lt;"
-"pennawd galluogwyd&gt; - gosodwch 'galluogwyd' os yw'r pennawd am gael ei "
-"ddangos yn yr olwg e-bost."
 
-#: ../mail/evolution-mail.schemas.in.in.h:112
-msgid ""
-"This sets the number of addresses to show in default message list view, "
-"beyond which a '...' is shown."
+#: ../mail/evolution-mail.schemas.in.h:160
+msgid "This option would help in improving the speed of fetching."
 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:113
-msgid ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Evolution requires a restart"
+#: ../mail/evolution-mail.schemas.in.h:161
+msgid "This sets the number of addresses to show in default message list view, beyond which a '...' is shown."
+msgstr "Gosod y nifer o gyfeiriadau i'w dangos yng ngolwg rhagosodedig y rhestr negeseuon. Ar ôl y nifer a benodir, fe ddangosir '...'"
+
+#: ../mail/evolution-mail.schemas.in.h:162
+msgid "This setting specifies whether the threads should be in expanded or collapsed state by default. Evolution requires a restart."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:163
+msgid "This setting specifies whether the threads should be sorted based on latest message in each thread, rather than by message's date. Evolution requires a restart."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Thread the message list."
 msgstr "Edafu'r rhestr negeseuon."
 
-#: ../mail/evolution-mail.schemas.in.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Thread the message-list"
 msgstr "Edafu'r rhestr negeseuon"
 
-#: ../mail/evolution-mail.schemas.in.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:166
 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:117
-msgid "Timeout for marking message as Seen"
+#: ../mail/evolution-mail.schemas.in.h:167
+#, fuzzy
+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:118
-msgid "Timeout for marking message as Seen."
+#: ../mail/evolution-mail.schemas.in.h:168
+#, fuzzy
+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:119
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "UID string of the default account."
 msgstr "Llinyn UID y cyfrif rhagosodedig."
 
-#: ../mail/evolution-mail.schemas.in.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:170
+msgid "Underline color for misspelled words when using inline spelling."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Use SpamAssassin daemon and client"
 msgstr "Defnyddio ellyll a chleient Spamassassin"
 
-#: ../mail/evolution-mail.schemas.in.in.h:121
-msgid "Use SpamAssassin daemon and client (spamc/spamd)"
+#: ../mail/evolution-mail.schemas.in.h:172
+#, fuzzy
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Defnyddio ellyll a chleient Spamassassin (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "Use custom fonts"
 msgstr "Defnyddio ffontiau addasedig"
 
-#: ../mail/evolution-mail.schemas.in.in.h:123
-msgid "Use custom fonts for displaying mail"
+#: ../mail/evolution-mail.schemas.in.h:174
+#, fuzzy
+msgid "Use custom fonts for displaying mail."
 msgstr "Defnyddio ffontiau addasedig i ddangos e-bost"
 
-#: ../mail/evolution-mail.schemas.in.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Use only local spam tests."
 msgstr "Defnyddio dim ond y profion sothach lleol."
 
-#: ../mail/evolution-mail.schemas.in.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:176
 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:126
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Use side-by-side or wide layout"
 msgstr "Defnyddio cynllun ochr-yn-ochr neu gynllun llydan"
 
-#: ../mail/evolution-mail.schemas.in.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Variable width font"
 msgstr "Ffont lled amrywiol"
 
-#: ../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:129
-msgid "View/Bcc menu item is checked."
-msgstr "Eitem ddewislen Gweld/Bcc wedi ei thicio."
-
-#: ../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:131
-msgid "View/Cc menu item is checked."
-msgstr "Eitem ddewislen Gweld/Cc wedi ei thicio."
-
-#: ../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:133
-msgid "View/From menu item is checked."
-msgstr "Eitem ddewislen Gweld/I wedi ei thicio."
-
-#: ../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:135
-msgid "View/PostTo menu item is checked."
-msgstr "Eitem ddewislen Gweld/Postio I wedi ei thicio."
+#: ../mail/evolution-mail.schemas.in.h:179
+msgid "Whether a read receipt request gets added to every message by default."
+msgstr ""
 
-#: ../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.h:180
+msgid "Whether disable ellipsizing feature of folder names in side bar."
+msgstr ""
 
-#: ../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.h:181
+msgid "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
+msgstr "P'un ai i gwympo'n ôl ar greu edafedd o'r pynciau ai peidio, pan nad yw'r negeseuon yn cynnwys penawdau Mewn-Ateb-I neu Gyfeirnodau."
 
-#: ../mail/evolution-mail.schemas.in.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."
+#: ../mail/evolution-mail.schemas.in.h:182
+msgid "Whether sort threads based on latest message in that thread"
 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:139
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid "Width of the message-list pane"
 msgstr "Lled y cwarel rhestr negeseuon"
 
-#: ../mail/evolution-mail.schemas.in.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid "Width of the message-list pane."
 msgstr "Lled y cwarel rhestr negeseuon."
 
-#: ../mail/importers/elm-importer.c:192
+#: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
 msgstr "Mewnforio data Elm"
 
-#: ../mail/importers/elm-importer.c:381
+#: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "Mewnforiwr Elm Evolution"
 
-#: ../mail/importers/elm-importer.c:382
+#: ../mail/importers/elm-importer.c:368
 msgid "Import mail from Elm."
 msgstr "Mewnforio e-bost o Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:79
+#: ../plugins/pst-import/pst-importer.c:310
 msgid "Destination folder:"
 msgstr "Plygell gyrchfan:"
 
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-mbox-importer.c:82
+#: ../plugins/pst-import/pst-importer.c:303
 msgid "Select folder to import into"
 msgstr "Dewiswch blygell i fewnforio iddi"
 
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:219
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Blwch E-bost ffurf Berkeley (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Mewnforio plygellau ffurf E-bost Berkeley (mbox)"
 
-#: ../mail/importers/mail-importer.c:148
+#: ../mail/importers/mail-importer.c:147
 msgid "Importing mailbox"
 msgstr "Mewnforio blwch e-bost"
 
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:515
+#. Destination folder, was set in our widget
+#: ../mail/importers/mail-importer.c:231
+#: ../plugins/pst-import/pst-importer.c:455
+#: ../plugins/pst-import/pst-importer.c:561
+#: ../shell/e-shell-importer.c:536
 #, c-format
 msgid "Importing `%s'"
 msgstr "Mewnforio `%s'"
 
-#: ../mail/importers/mail-importer.c:376
+#: ../mail/importers/mail-importer.c:371
 #, c-format
 msgid "Scanning %s"
 msgstr "Sganio %s"
 
-#: ../mail/importers/pine-importer.c:229
+#: ../mail/importers/pine-importer.c:225
 msgid "Importing Pine data"
 msgstr "Mewnforio data Pine"
 
-#: ../mail/importers/pine-importer.c:433
+#: ../mail/importers/pine-importer.c:424
 msgid "Evolution Pine importer"
 msgstr "Mewnforiwr Pine Evolution"
 
-#: ../mail/importers/pine-importer.c:434
+#: ../mail/importers/pine-importer.c:425
 msgid "Import mail from Pine."
 msgstr "Mewnforio e-bost o Pine."
 
-#: ../mail/mail-autofilter.c:79
+#: ../mail/mail-autofilter.c:72
 #, c-format
 msgid "Mail to %s"
 msgstr "Ebost i %s"
 
-#: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
+#: ../mail/mail-autofilter.c:235
+#: ../mail/mail-autofilter.c:274
 #, c-format
 msgid "Mail from %s"
 msgstr "Ebost wrth %s"
 
-#: ../mail/mail-autofilter.c:266
+#: ../mail/mail-autofilter.c:258
 #, c-format
 msgid "Subject is %s"
 msgstr "Pwnc yw %s"
 
-#: ../mail/mail-autofilter.c:301
+#: ../mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "rhestr e-bost %s"
 
-#: ../mail/mail-autofilter.c:372
+#: ../mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "Ychwanegu Rheol Hidlydd"
 
-#: ../mail/mail-component.c:524
+#: ../mail/mail-component.c:573
+#, 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:577
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -12988,7 +12816,7 @@ msgstr[0] "%d wedi dileu"
 msgstr[1] "%d wedi dileu"
 msgstr[2] "%d wedi dileu"
 
-#: ../mail/mail-component.c:526
+#: ../mail/mail-component.c:584
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -12996,15 +12824,7 @@ msgstr[0] "%d sothach"
 msgstr[1] "%d sothach"
 msgstr[2] "%d sothach"
 
-#: ../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
+#: ../mail/mail-component.c:587
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -13012,7 +12832,7 @@ msgstr[0] "%d drafft"
 msgstr[1] "%d ddrafft"
 msgstr[2] "%d drafft"
 
-#: ../mail/mail-component.c:554
+#: ../mail/mail-component.c:589
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -13020,7 +12840,7 @@ msgstr[0] "%d wedi anfon"
 msgstr[1] "%d wedi anfon"
 msgstr[2] "%d wedi anfon"
 
-#: ../mail/mail-component.c:556
+#: ../mail/mail-component.c:591
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -13028,7 +12848,7 @@ msgstr[0] "%d heb ei anfon"
 msgstr[1] "%d heb eu hanfon"
 msgstr[2] "%d heb eu hanfon"
 
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:597
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -13036,7 +12856,7 @@ msgstr[0] "%d heb ei ddarllen, "
 msgstr[1] "%d heb eu darllen, "
 msgstr[2] "%d heb eu darllen, "
 
-#: ../mail/mail-component.c:562
+#: ../mail/mail-component.c:598
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -13044,264 +12864,276 @@ msgstr[0] "%d yn gyfanswm"
 msgstr[1] "%d yn gyfanswm"
 msgstr[2] "%d yn gyfanswm"
 
-#: ../mail/mail-component.c:889
+#: ../mail/mail-component.c:952
 msgid "New Mail Message"
 msgstr "Neges Ebost Newydd"
 
-#: ../mail/mail-component.c:890
+#: ../mail/mail-component.c:953
+msgctxt "New"
 msgid "_Mail Message"
 msgstr "Neges _Ebost"
 
-#: ../mail/mail-component.c:891
+#: ../mail/mail-component.c:954
 msgid "Compose a new mail message"
 msgstr "Cyfansoddi neges e-bost newydd"
 
-#: ../mail/mail-component.c:897
+#: ../mail/mail-component.c:960
 msgid "New Mail Folder"
 msgstr "Plygell Ebost Newydd"
 
-#: ../mail/mail-component.c:898
+#: ../mail/mail-component.c:961
+msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Plygell Ebost"
 
-#: ../mail/mail-component.c:899
+#: ../mail/mail-component.c:962
 msgid "Create a new mail folder"
 msgstr "Creu plygell e-bost newydd"
 
-#: ../mail/mail-component.c:1045
+#: ../mail/mail-component.c:1109
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Methu wrth uwchraddio plygellau neu osodiadau e-bost."
 
-#: ../mail/mail-config.c:81
-msgid "I_mportant"
-msgstr "_Pwysig"
-
-#. red
-#: ../mail/mail-config.c:82
-msgid "_Work"
-msgstr "_Gwaith"
-
-#. orange
-#: ../mail/mail-config.c:83
-msgid "_Personal"
-msgstr "_Personol"
-
-#. forest green
-#: ../mail/mail-config.c:84
-msgid "_To Do"
-msgstr "_I'w wneud"
-
-#. blue
-#: ../mail/mail-config.c:85
-msgid "_Later"
-msgstr "_Hwyrach"
-
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr "_Gwirio am Fathau Cynaledig"
 
-#: ../mail/mail-config.glade.h:3
+#: ../mail/mail-config.glade.h:2
+msgid "(Note: Requires restart of the application)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:4
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>Ni chynhelir SSL yn yr adeiledd hwn o Evolution</b>"
 
-#: ../mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:5
+#, fuzzy
+msgid "<b>Sender Photograph</b>"
+msgstr "<b>Opsiynau calendr</b>"
+
+#: ../mail/mail-config.glade.h:6
 msgid "<b>Sig_natures</b>"
 msgstr "<b>_Llofnodion</b>"
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:7
+msgid "<b>Top Posting Option</b> (Not Recommended)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:8
 msgid "<b>_Languages</b>"
 msgstr "<b>_Ieithoedd</b>"
 
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Gwybodaeth Cyfrif</span>"
 
-#: ../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:9
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Dilysiant</span>"
 
-#: ../mail/mail-config.glade.h:10
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Cyfansoddi Negeseuon</span>"
 
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Cyfluniad</span>"
 
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Ymddygiad Rhagosodedig</span>"
 
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Dileu Ebost</span>"
 
-#: ../mail/mail-config.glade.h:14
-msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
+#: ../mail/mail-config.glade.h:16
+#, fuzzy
+msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
 msgstr "<span weight=\"bold\">Penawdau Ebost _Wedi'u Dangos </span>"
 
-#: ../mail/mail-config.glade.h:16
-msgid "<span weight=\"bold\">Labels and Colors</span>"
-msgstr "<span weight=\"bold\">Labeli a Lliwiau</span>"
+#: ../mail/mail-config.glade.h:18
+#, fuzzy
+msgid "<span weight=\"bold\">Labels</span>"
+msgstr "<span weight=\"bold\">Rhybuddion</span>"
 
-#: ../mail/mail-config.glade.h:17
+#: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Llwytho Delweddau</span>"
 
-#: ../mail/mail-config.glade.h:18
+#: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Dangos Negeseuon</span>"
 
-#: ../mail/mail-config.glade.h:19
+#: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Ffontiau Negeseuon</span>"
 
-#: ../mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">Derbynwyr Negeseuon</span>"
 
-#: ../mail/mail-config.glade.h:21
-msgid "<span weight=\"bold\">New Mail Notification</span>"
-msgstr "<span weight=\"bold\">Hysbysiad Ebost Newydd</span>"
-
-#: ../mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:23
 #: ../plugins/publish-calendar/publish-calendar.glade.h:3
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Gwybodaeth Ddewisol</span>"
 
-#: ../mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Dewisiadau</span>"
 
-#: ../mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Ffontiau Printio</span>"
 
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:27
+#, fuzzy
+msgid "<span weight=\"bold\">Proxy Settings</span>"
+msgstr "<span weight=\"bold\">Statws</span>"
+
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Gwybodaeth Angenrheidiol</span>"
 
-#: ../mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">MIME Diogel (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Diogelwch</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Negeseuon Wedi'u Hanfon a rhai Drafft</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Cyfluniad Gweinydd</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
+#, fuzzy
+msgid "<span weight=\"bold\">_Authentication Type</span>"
+msgstr "<span weight=\"bold\">Math Dilysiant</span>"
+
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Rheolaeth Cyfrifon"
 
-#: ../mail/mail-config.glade.h:33
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "_Ychwanegu Llofnod Newydd..."
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "Ychwanegu _Sgript"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "_Llofnodi negeseuon cyn eu hanfon o hyd wrth ddefnyddio'r cyfrif hwn"
 
-#: ../mail/mail-config.glade.h:36
-msgid "Also encrypt to sel_f when sending encrypted mail"
+#: ../mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "Amgryptio'ch copi eich _hun hefyd wrth anfon e-bost wedi'i amgryptio"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "_Anfon copi-carbon (cc) bob amser at:"
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "_Anfon copi-carbon dall (bcc) bob amser at:"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "_Ymddiried yn yr allweddi yn fy nghylch allweddi o hyd wrth amgryptio"
 
-#: ../mail/mail-config.glade.h:40
-msgid "Always encrypt to _myself when sending encrypted mail"
+#: ../mail/mail-config.glade.h:43
+#, fuzzy
+msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Amgryptio fy nghopi fy _hun hefyd wrth anfon e-bost wedi'i amgryptio"
 
-#: ../mail/mail-config.glade.h:41
-msgid "Attach original message"
-msgstr "Atodi'r neges wreiddiol"
+#: ../mail/mail-config.glade.h:44
+#, fuzzy
+msgid "Always request rea_d receipt"
+msgstr "_Gofyn am Dderbynneb Darllen"
 
-#: ../mail/mail-config.glade.h:43
-msgid "Automatically insert _smiley images"
+#: ../mail/mail-config.glade.h:45
+msgid ""
+"Attachment\n"
+"Inline\n"
+"Quoted"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:48
+msgid ""
+"Attachment\n"
+"Inline (Outlook style)\n"
+"Quoted\n"
+"Do not quote"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Automatically insert _emoticon images"
 msgstr "Rhoi delweddau _gwenoglun i mewn yn awtomatig"
 
-#: ../mail/mail-config.glade.h:44
+#: ../mail/mail-config.glade.h:53
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltig (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:54
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltig (ISO-8859-4)"
 
-#: ../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:47
+#: ../mail/mail-config.glade.h:55
 msgid "C_haracter set:"
 msgstr "_Set nodau:"
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:56
 msgid "Ch_eck for Supported Types "
 msgstr "_Gwirio am Fathau Wedi'u Cynnal"
 
-#: ../mail/mail-config.glade.h:49
-msgid "Check in_coming mail for junk"
+#: ../mail/mail-config.glade.h:57
+#, fuzzy
+msgid "Check cu_stom headers for junk"
 msgstr "_Gwirio'r e-bost sy'n dod i mewn ar gyfer sothach"
 
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Check incoming _messages for junk"
+msgstr "_Gwirio'r e-bost sy'n dod i mewn ar gyfer sothach"
+
+#: ../mail/mail-config.glade.h:59
 msgid "Check spelling while I _type"
 msgstr "Gwirio sillafu wrth i mi _deipio"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:60
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Yn gwirio'r e-bost sy'n dod i mewn i weld a yw'n Sothach"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:61
 msgid "Cle_ar"
 msgstr "C_lirio"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:62
 msgid "Clea_r"
 msgstr "Cl_irio"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:63
 msgid "Color for _misspelled words:"
 msgstr "Lliw'r geiriau _heb eu sillafu'n gywir:"
 
-#: ../mail/mail-config.glade.h:55
-msgid "Colors"
-msgstr "Lliwiau"
-
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:64
 msgid "Confirm _when expunging a folder"
 msgstr "_Cadarnhau wrth chwynnu plygell"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:65
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13317,299 +13149,298 @@ msgstr ""
 "\n"
 "Cliciwch \"Cymhwyso\" i gadw'ch gosodiadau."
 
-#: ../mail/mail-config.glade.h:63
+#: ../mail/mail-config.glade.h:71
 msgid "De_fault"
 msgstr "_Rhagosodiad"
 
-#: ../mail/mail-config.glade.h:64
+#: ../mail/mail-config.glade.h:72
 msgid "Default character e_ncoding:"
 msgstr "_Amgodiad nodau rhagosod:"
 
-#: ../mail/mail-config.glade.h:66
-msgid "Delete junk mails on e_xit"
+#: ../mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Delete junk messages on e_xit"
 msgstr "Dileu negeseuon sothach wrth _adael"
 
-#: ../mail/mail-config.glade.h:68
-msgid "Digitally _sign outgoing messages (by default)"
+#: ../mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "_Arwyddo'n ddigidol y negeseuon sy'n cael eu hanfon (fel rhagosodiad)"
 
-#: ../mail/mail-config.glade.h: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:77
+#, fuzzy
+msgid "Do not format messages when text si_ze exceeds"
+msgstr "Peidio â fformatio cynnwys testun o fewn e-bost os yw'r maint testun yn fwy na"
 
-#: ../mail/mail-config.glade.h:70
-msgid "Do not quote original message"
-msgstr "Peidio â dyfynnu'r neges wreiddiol"
+#: ../mail/mail-config.glade.h:78
+msgid "Do not mar_k messages as junk if sender is in my address book"
+msgstr ""
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:79
 msgid "Done"
 msgstr "Wedi gorffen"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:80
 msgid "Drafts _Folder:"
 msgstr "_Plygell Drafftiau:"
 
-#: ../mail/mail-config.glade.h:73
-#: ../plugins/publish-calendar/publish-calendar.glade.h:9
-msgid "E_nable"
-msgstr "_Galluogi"
-
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:81
 msgid "Email Accounts"
 msgstr "Cyfrifon Ebost"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:82
 msgid "Email _Address:"
 msgstr "_Cyfeiriad Ebost:"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:83
 msgid "Empty trash folders on e_xit"
 msgstr "Gwagu plygellau sbwriel wrth _adael"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:84
+msgid "Enable Magic S_pacebar"
+msgstr "Galluogi _Bar Ofod Hud"
+
+#: ../mail/mail-config.glade.h:85
+#, fuzzy
+msgid "Enable Sea_rch Folders"
+msgstr "Plygellau Chwilio"
+
+#: ../mail/mail-config.glade.h:87
 msgid "Encry_ption certificate:"
 msgstr "Tystysgrif _amgryptio:"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:88
 msgid "Encrypt out_going messages (by default)"
 msgstr "_Amgryptio'r negeseuon sy'n cael eu hanfon (fel rhagosodiad)"
 
-#: ../mail/mail-config.glade.h:80
-msgid "Fi_xed width Font:"
-msgstr "Ffont lled _Penodol:"
-
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:90
 msgid "Fi_xed-width:"
 msgstr "Lled _penodol:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:91
+msgid "Fix_ed width Font:"
+msgstr "Ffont lled P_enodol:"
+
+#: ../mail/mail-config.glade.h:92
 msgid "Font Properties"
 msgstr "Priodweddau Ffont"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:93
 msgid "Format messages in _HTML"
 msgstr "Fformatio negeseuon mewn _HTML"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:94
 msgid "Full Nam_e:"
 msgstr "_Enw Llawn:"
 
-#: ../mail/mail-config.glade.h:86
-msgid "HTML Mail"
-msgstr "Ebost HTML"
+#: ../mail/mail-config.glade.h:96
+msgid "HTML Messages"
+msgstr "Negeseuon HTML"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:97
+msgid "H_TTP Proxy:"
+msgstr "Dirprwy H_TTP"
+
+#: ../mail/mail-config.glade.h:98
 msgid "Headers"
 msgstr "Penawdau"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:99
 msgid "Highlight _quotations with"
 msgstr "Amlygu _dyfyniadau gyda"
 
-#: ../mail/mail-config.glade.h:91
-msgid "Inline"
-msgstr "Yn fewnol"
+#: ../mail/mail-config.glade.h:101
+msgid "If the server uses a non-standard port then specify the server address as \"server-name:port-number\""
+msgstr ""
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:103
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:104
+#: ../mail/message-list.etspec.h:8
+msgid "Labels"
+msgstr "Labeli"
+
+#: ../mail/mail-config.glade.h:105
 msgid "Languages Table"
 msgstr "Tabl Ieithoedd"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:106
 msgid "Mail Configuration"
 msgstr "Cyfluniad Ebost"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:107
 msgid "Mail Headers Table"
 msgstr "Tabl Penawdau E-bost"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:109
 msgid "Mailbox location"
 msgstr "Lleoliad bocs e-bost"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:110
 msgid "Message Composer"
 msgstr "Cyfansoddwr Negeseuon"
 
-#: ../mail/mail-config.glade.h:101
-msgid ""
-"Note: you will not be prompted for a password until you connect for the "
-"first time"
+#: ../mail/mail-config.glade.h:111
+msgid "No _Proxy for:"
 msgstr ""
-"Sylwer: bydd dim gofyn i chi roi cyfrinair nes i chi gysylltu am y tro cyntaf"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:112
+msgid "Note: Underscore in the label name is used as mnemonic identifier in menu."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:113
+msgid "Note: you will not be prompted for a password until you connect for the first time"
+msgstr "Sylwer: bydd dim gofyn i chi roi cyfrinair nes i chi gysylltu am y tro cyntaf"
+
+#: ../mail/mail-config.glade.h:114
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:115
 msgid "Or_ganization:"
 msgstr "_Corff:"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:116
 msgid "PGP/GPG _Key ID:"
 msgstr "ID _Allwedd PGP/GPG:"
 
-#: ../mail/mail-config.glade.h:106
-msgid "Play sound file when new mail arri_ves"
-msgstr "Chwarae ffeil sain pan fo e-bost newydd yn _cyrraedd"
+#: ../mail/mail-config.glade.h:117
+msgid "Pass_word:"
+msgstr "_Cyfrinair:"
 
-#: ../mail/mail-config.glade.h:107
-msgid ""
-"Please enter a descriptive name for this account in the space below.\n"
-"This name will be used for display purposes only."
+#: ../mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Please enter a descriptive name for this account in the space below. This name will be used for display purposes only."
 msgstr ""
 "Rhowch enw disgrifiadol ar gyfer y cyfrif yn y man isod.\n"
 "Bydd yr enw yn cael ei ddefnyddio at bwrpas dangos yn unig."
 
-#: ../mail/mail-config.glade.h:109
-msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-"Rhowch wybodaeth am y ffordd y byddwch chi'n anfon e-bost. Os nad ydych "
-"chi'n siŵr, gofynnwch i'ch gweinyddwr system neu'ch darparwr gwasanaeth "
-"Rhyngrwyd."
+#: ../mail/mail-config.glade.h:120
+msgid "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."
+msgstr "Rhowch wybodaeth am y ffordd y byddwch chi'n anfon e-bost. Os nad ydych chi'n siŵr, gofynnwch i'ch gweinyddwr system neu'ch darparwr gwasanaeth Rhyngrwyd."
 
-#: ../mail/mail-config.glade.h:110
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
-msgstr ""
-"Rhowch eich enw a'ch cyfeiriad e-bost isod. Does dim rhaid llenwi'r meysydd "
-"sy'n \"ddewisol\", oni bai eich bod am gynnwys y wybodaeth hynny yn yr e-"
-"bost fyddwch chi'n ei anfon."
+#: ../mail/mail-config.glade.h:121
+msgid "Please enter your name and email address below. The \"optional\" fields below do not need to be filled in, unless you wish to include this information in email you send."
+msgstr "Rhowch eich enw a'ch cyfeiriad e-bost isod. Does dim rhaid llenwi'r meysydd sy'n \"ddewisol\", oni bai eich bod am gynnwys y wybodaeth hynny yn yr e-bost fyddwch chi'n ei anfon."
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:122
 msgid "Please select among the following options"
 msgstr "Dewiswch ymhlith yr opsiynau yma"
 
-#: ../mail/mail-config.glade.h:112
-msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr ""
-"_Promptio wrth anfon negeseuon gyda dim ond derbynwyr Bcc wedi eu diffinio"
-
-#: ../mail/mail-config.glade.h:113
-msgid "Quote original message"
-msgstr "Dyfynnu'r neges wreiddiol"
+#: ../mail/mail-config.glade.h:123
+msgid "Port:"
+msgstr "Porth:"
 
-#: ../mail/mail-config.glade.h:114
-msgid "Quoted"
-msgstr "Dyfynnwyd"
+#: ../mail/mail-config.glade.h:124
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+msgstr "_Promptio wrth anfon negeseuon gyda dim ond derbynwyr Bcc wedi eu diffinio"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:125
 msgid "Re_member password"
 msgstr "_Cofio'r cyfrinair"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:126
 msgid "Re_ply-To:"
 msgstr "_Ateb-At:"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:128
 msgid "Remember _password"
 msgstr "Cofio'r _cyfrinair"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:129
+#, fuzzy
+msgid "S_earch for sender photograph only in local address books"
+msgstr "Darparu'r swyddogaethau craidd ar gyfer calendrau lleol."
+
+#: ../mail/mail-config.glade.h:130
 msgid "S_elect..."
 msgstr "D_ewis..."
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:131
 msgid "S_end message receipts:"
 msgstr "_Anfon negeseuon derbyn e-bost:"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:132
 msgid "S_tandard Font:"
 msgstr "Ffont _Safonol:"
 
-#: ../mail/mail-config.glade.h:122
-msgid "Se_lect..."
-msgstr "De_wis..."
-
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font"
 msgstr "Dewis ffont lled sefydlog HTML"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML fixed width font for printing"
 msgstr "Dewis ffont lled sefydlog HTML er mwyn argraffu"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:136
 msgid "Select HTML variable width font"
 msgstr "Dewis ffont lled amrywiol HTML"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:137
 msgid "Select HTML variable width font for printing"
 msgstr "Dewis ffont lled amrywiol HTML er mwyn argraffu"
 
-#: ../mail/mail-config.glade.h:128
-msgid "Select sound file"
-msgstr "Dewis ffeil sain"
-
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:139
 msgid "Sending Mail"
 msgstr "Yn Derbyn Post"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:140
 msgid "Sent _Messages Folder:"
 msgstr "Plygell _Negeseuon Wedi'u Hanfon:"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:141
 msgid "Ser_ver requires authentication"
 msgstr "Angen _dilysiant ar y gweinydd"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:142
 msgid "Server _Type: "
 msgstr "_Math o Wasanaethwr:"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:143
 msgid "Sig_ning certificate:"
 msgstr "Tystysgrif _Llofnodi:"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:144
 msgid "Signat_ure:"
 msgstr "_Llofnod:"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:145
 msgid "Signatures"
 msgstr "Llofnodion"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:146
 msgid "Signatures Table"
 msgstr "Tabl Llofnodion"
 
-#: ../mail/mail-config.glade.h:138
-msgid "Specify _filename:"
-msgstr "Penodwch enw _ffeil"
-
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:147
 msgid "Spell Checking"
 msgstr "Gwirio Sillafu"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:148
+msgid "Start _typing at the bottom on replying"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:149
 msgid "T_ype: "
 msgstr "_Math: "
 
-#: ../mail/mail-config.glade.h:141
-msgid ""
-"The list of languages here reflects only the languages for which you have a "
-"dictionary installed."
-msgstr ""
-"Mae'r rhestr hon o ieithoedd yn adlewyrchu'r rhai yr ydych wedi gosod "
-"geiriadur ar eu cyfer yn unig"
+#: ../mail/mail-config.glade.h:150
+msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
+msgstr "Mae'r rhestr hon o ieithoedd yn adlewyrchu'r rhai yr ydych wedi gosod geiriadur ar eu cyfer yn unig"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:151
+#, fuzzy
 msgid ""
 "The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only. "
+"signature. The name you specify will be used for display purposes only."
 msgstr ""
 "Allbwn y sgript hon fydd eich llofnod. At bwrpas\n"
 "dangos yn unig y defnyddir yr enw fyddwch chi'n\n"
 "ei benodi."
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:153
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13617,15 +13448,27 @@ msgstr ""
 "Rhowch yr enw yr hoffech ei ddefnyddio i gyfeirio at y cyfrif hwn.\n"
 "Er enghraifft: \"Gwaith\" neu \"Personol\""
 
-#: ../mail/mail-config.glade.h:148 ../plugins/caldav/caldav-source.c:282
+#: ../mail/mail-config.glade.h:155
+msgid "Us_ername:"
+msgstr "_Enw Defnyddiwr:"
+
+#: ../mail/mail-config.glade.h:156
+msgid "Use Authe_ntication"
+msgstr "Def_nyddio Dilysiant"
+
+#: ../mail/mail-config.glade.h:157
+#: ../plugins/caldav/caldav-source.c:405
+#: ../plugins/google-account-setup/google-source.c:681
+#: ../plugins/google-account-setup/google-contacts-source.c:280
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:307
 msgid "User_name:"
 msgstr "_Enw Defnyddiwr:"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:158
 msgid "V_ariable-width:"
 msgstr "Lled _amrywiol:"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:159
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13635,97 +13478,134 @@ msgstr ""
 "\n"
 "Cliciwch \"Ymlaen\" i ddechrau."
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:162
 msgid "_Add Signature"
 msgstr "_Ychwanegu Llofnod"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:163
 msgid "_Always load images from the Internet"
 msgstr "_Llwytho delweddau o'r Rhyngrwyd bob tro"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:164
 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:165
+msgid "_Direct connection to the Internet"
+msgstr ""
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
-msgstr ""
-"_Peidio ag arwyddo ceisiadau am gyfarfodydd (er mwyn cydweddu ag Outlook)"
+msgstr "_Peidio ag arwyddo ceisiadau am gyfarfodydd (er mwyn cydweddu ag Outlook)"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "Arddull yrru _ymlaen:"
 
-#: ../mail/mail-config.glade.h:161
-msgid "_Load images in mail from contacts"
+#: ../mail/mail-config.glade.h:169
+msgid "_Keep Signature above the original message on replying"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:170
+#, fuzzy
+msgid "_Load images in messages from contacts"
 msgstr "_Llwytho delweddau mewn negeseuon e-bost o gysylltiadau"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:171
+#, fuzzy
+msgid "_Lookup in local address book only"
+msgstr "Rhestru plygellau llyfr cyfeiriadau lleol"
+
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "Gwneud hon yn gyfrif rhagosodedig"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:173
+#, fuzzy
+msgid "_Manual proxy configuration:"
+msgstr "Cyfluniad Ebost"
+
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "_Marcio negeseuon fel rhai wedi eu darllen ar ôl"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "_Peidio byth a llwytho delweddau o'r Rhyngrwyd"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "_Llwybr:"
 
-#: ../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:178
+#, fuzzy
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
+msgstr "_Rhybuddio cyn anfon negeseuon HTML at gysylltiadau nad ydynt eu heisiau"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Rhybuddio cyn anfon negeseuon gyda _llinell bwnc wag"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "_Arddull ateb:"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "_Sgript:"
 
+#: ../mail/mail-config.glade.h:182
+msgid "_Secure HTTP Proxy:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:183
+#, fuzzy
+msgid "_Select..."
+msgstr "D_ewis..."
+
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "_Dangos delweddau wedi'u hanimeiddio"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:187
+#, fuzzy
+msgid "_Show the photograph of sender in the message preview"
+msgstr "Dangos ffynhonnell graidd o e-bost y neges"
+
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Crebachu penawdau I / Cc / Bcc yn"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "_Defnyddio cysylltiad diogel:"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:190
+#, fuzzy
+msgid "_Use system defaults"
+msgstr "Defnyddio'r _Rhagosodiad"
+
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "_Defnyddio'r un ffontiau â rhaglenni eraill"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:194
 msgid "addresses"
 msgstr "cyfeiriadau"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:195
 msgid "color"
 msgstr "lliw"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:196
 msgid "description"
 msgstr "disgrifiad"
 
+#: ../mail/mail-config.glade.h:197
+msgid "seconds"
+msgstr "eiliadau"
+
 #: ../mail/mail-dialogs.glade.h:1
 msgid "    "
 msgstr "    "
@@ -13756,80 +13636,64 @@ msgid "All local folders"
 msgstr "Pob plygell leol"
 
 #: ../mail/mail-dialogs.glade.h:8
-msgid "Case _sensitive"
-msgstr "_Cyfateb llythrennau bach/mawr"
-
-#: ../mail/mail-dialogs.glade.h:9
 msgid "Co_mpleted"
 msgstr "_Cyflawnwyd"
 
-#: ../mail/mail-dialogs.glade.h:11
-msgid "F_ind:"
-msgstr "_Canfod:"
-
-#: ../mail/mail-dialogs.glade.h:12
-msgid "Find in Message"
-msgstr "Canfod mewn Neges"
-
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:297
+#: ../mail/mail-dialogs.glade.h:9
+#: ../mail/message-tag-followup.c:270
 msgid "Flag to Follow Up"
 msgstr "Baner i Ddilyn Lan"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:10
 msgid "Folder Subscriptions"
 msgstr "Tanysgrifiadau Plygellau"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:11
 msgid "License Agreement"
 msgstr "Cytundeb Trwydded"
 
-#: ../mail/mail-dialogs.glade.h:16
-msgid "None Selected"
-msgstr "Dim Dewisedig"
-
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:12
 msgid "S_erver:"
 msgstr "G_weinydd:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Security Information"
 msgstr "Gwybodaeth Diogelwch"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:14
 msgid "Specific folders"
 msgstr "Plygellau penodol"
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:15
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
 msgstr ""
-"Mae'r negeseuon yr ydych wedi eu dewis ar gyfer dilyn i fyny wedi eu rhestru "
-"isod.\n"
+"Mae'r negeseuon yr ydych wedi eu dewis ar gyfer dilyn i fyny wedi eu rhestru isod.\n"
 "Dewiswch weithred ddilyn i fyny o'r ddewislen \"Baner\"."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:17
 msgid "_Accept License"
 msgstr "_Derbyn Trwydded"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:18
 msgid "_Due By:"
 msgstr "_Angen Erbyn:"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:19
 msgid "_Flag:"
 msgstr "_Baner"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:20
 msgid "_Tick this to accept the license agreement"
 msgstr "_Ticiwch hwn i dderbyn y cytundeb trwydded"
 
-#: ../mail/mail-folder-cache.c:859
+#: ../mail/mail-folder-cache.c:834
 #, c-format
 msgid "Pinging %s"
 msgstr "Yn pingio %s"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:107
 msgid "Filtering Selected Messages"
 msgstr "Wrthi'n Hidlo Negeseuon Ddewiswyd"
 
@@ -13838,13 +13702,13 @@ msgid "Fetching Mail"
 msgstr "Gafael Ebost"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:562
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
-msgstr ""
-"Methu rhoi'r hidlyddion ar waith ar gyfer e-bost sy'n cael ei anfon allan: %s"
+msgstr "Methu rhoi'r hidlyddion ar waith ar gyfer e-bost sy'n cael ei anfon allan: %s"
 
-#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
+#: ../mail/mail-ops.c:574
+#: ../mail/mail-ops.c:601
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13853,12 +13717,17 @@ msgstr ""
 "Wedi methu atodi at %s: %s\n"
 "Yn atodi at y blygell `Anfonwyd' lleol yn lle hynny."
 
-#: ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:618
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Methu atodi at y blygell `Anfonwyd' lleol: %s"
 
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:724
+#: ../mail/mail-ops.c:805
+msgid "Sending message"
+msgstr "Anfon neges"
+
+#: ../mail/mail-ops.c:734
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Anfon neges %d o %d"
@@ -13868,85 +13737,93 @@ 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:703
+#: ../mail/mail-ops.c:763
+#: ../mail/mail-send-recv.c:701
 msgid "Canceled."
 msgstr "Diddymwyd."
 
 #: ../mail/mail-ops.c:765
+#: ../mail/mail-send-recv.c:703
 msgid "Complete."
 msgstr "Cyflawn."
 
-#: ../mail/mail-ops.c:862
+#: ../mail/mail-ops.c:877
 msgid "Saving message to folder"
 msgstr "Cadw'r neges i'r plygell"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:954
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Symud negeseuon i %s"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:954
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copïo negeseuon i %s"
 
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1171
 msgid "Forwarded messages"
 msgstr "Negeseuon a yrrwyd ymlaen"
 
-#: ../mail/mail-ops.c:1213
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "Yn agor plygell %s"
 
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1277
+#, fuzzy, c-format
+msgid "Retrieving quota information for folder %s"
+msgstr "Gwybodaeth gyswllt ar gyfer %s"
+
+#: ../mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "Yn agor storfa %s"
 
-#: ../mail/mail-ops.c:1363
+#: ../mail/mail-ops.c:1417
 #, c-format
 msgid "Removing folder %s"
 msgstr "Yn tynnu plygell %s"
 
-#: ../mail/mail-ops.c:1457
+#: ../mail/mail-ops.c:1535
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Yn storio plygell '%s'"
 
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1598
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Chwynnu a storio cyfrif '%s'"
 
-#: ../mail/mail-ops.c:1523
+#: ../mail/mail-ops.c:1599
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Yn storio cyfrif '%s'"
 
-#: ../mail/mail-ops.c:1578
+#: ../mail/mail-ops.c:1653
 msgid "Refreshing folder"
 msgstr "Adnewyddu plygell"
 
-#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
+#: ../mail/mail-ops.c:1693
+#: ../mail/mail-ops.c:1743
 msgid "Expunging folder"
 msgstr "Dileu plygell"
 
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1740
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Gwagio sbwriel yn '%s'"
 
-#: ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1741
 msgid "Local Folders"
 msgstr "Plygellau Lleol"
 
-#: ../mail/mail-ops.c:1746
+#: ../mail/mail-ops.c:1822
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Yn nôl neges %s"
 
-#: ../mail/mail-ops.c:1856
+#: ../mail/mail-ops.c:1931
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -13954,15 +13831,15 @@ msgstr[0] "Yn nôl %d neges"
 msgstr[1] "Yn nôl %d neges"
 msgstr[2] "Yn nôl %d neges"
 
-#: ../mail/mail-ops.c:1942
+#: ../mail/mail-ops.c:2016
 #, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
+msgid_plural "Saving %d messages"
 msgstr[0] "Yn cadw %d neges"
 msgstr[1] "Yn cadw %d neges"
 msgstr[2] "Yn cadw %d neges"
 
-#: ../mail/mail-ops.c:2013
+#: ../mail/mail-ops.c:2096
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13971,11 +13848,12 @@ msgstr ""
 "Gwall wrth gadw'r negeseuon i: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2085
+#: ../mail/mail-ops.c:2168
 msgid "Saving attachment"
 msgstr "Cadw'r atodiad"
 
-#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2186
+#: ../mail/mail-ops.c:2194
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13984,89 +13862,90 @@ msgstr ""
 "Methu creu ffeil allbwn: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:2114
+#: ../mail/mail-ops.c:2209
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Methu ysgrifennu data: %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2354
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Datgysylltu o %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2354
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ail-gysylltu â %s"
 
-#: ../mail/mail-ops.c:2361
+#: ../mail/mail-ops.c:2450
 #, fuzzy, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Cyfrif Exchange ddim ar-lein."
 
-#: ../mail/mail-ops.c:2444
+#: ../mail/mail-ops.c:2536
 msgid "Checking Service"
 msgstr "Gwirio Gwasanaeth"
 
-#: ../mail/mail-send-recv.c:161
+#: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
 msgstr "Diddymu..."
 
-#: ../mail/mail-send-recv.c:403
+#: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
 msgstr "Anfon a Derbyn Ebost"
 
-#: ../mail/mail-send-recv.c:410
+#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr "Diddymu _Popeth"
 
-#: ../mail/mail-send-recv.c:516
+#: ../mail/mail-send-recv.c:503
 msgid "Updating..."
 msgstr "Diweddaru..."
 
-#: ../mail/mail-send-recv.c:516 ../mail/mail-send-recv.c:583
+#: ../mail/mail-send-recv.c:503
+#: ../mail/mail-send-recv.c:580
 msgid "Waiting..."
 msgstr "Aros..."
 
-#: ../mail/mail-send-recv.c:791
+#: ../mail/mail-send-recv.c:814
+#, c-format
 msgid "Checking for new mail"
 msgstr "Chwilio am Ebost Newydd"
 
-#: ../mail/mail-session.c:200
+#: ../mail/mail-session.c:210
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Rhowch Gymal Cyfrin ar gyfer %s"
 
-#: ../mail/mail-session.c:202
+#: ../mail/mail-session.c:212
 msgid "Enter Passphrase"
 msgstr "Rhowch Gymal Cyfrin"
 
-#: ../mail/mail-session.c:205
-#: ../plugins/exchange-operations/exchange-config-listener.c:711
+#: ../mail/mail-session.c:215
+#: ../plugins/exchange-operations/exchange-config-listener.c:705
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Rhowch Gyfrinair am %s"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:217
 msgid "Enter Password"
 msgstr "Rhowch Gyfrinair"
 
-#: ../mail/mail-session.c:245
+#: ../mail/mail-session.c:259
 msgid "User canceled operation."
 msgstr "Defnyddiwr wedi canslo'r weithred."
 
-#: ../mail/mail-signature-editor.c:384
-msgid "Edit signature"
-msgstr "Golygu llofnod"
+#: ../mail/mail-signature-editor.c:201
+msgid "_Save and Close"
+msgstr "_Cadw a Chau"
 
-#: ../mail/mail-signature-editor.c:431
-msgid "Enter a name for this signature."
-msgstr "Rhowch enw ar gyfer y llofnod."
+#: ../mail/mail-signature-editor.c:355
+msgid "Edit Signature"
+msgstr "Golygu Llofnod"
 
-#: ../mail/mail-signature-editor.c:434
-#: ../plugins/groupwise-features/properties.glade.h:4
-msgid "Name:"
-msgstr "Enw:"
+#: ../mail/mail-signature-editor.c:370
+msgid "_Signature Name:"
+msgstr "Enw _Llofnod:"
 
 #: ../mail/mail-tools.c:120
 #, c-format
@@ -14076,8 +13955,7 @@ msgstr "Methu creu cyfeiriadur sbwlio `%s': %s"
 #: ../mail/mail-tools.c:150
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
-msgstr ""
-"Ceisio defnyddio movemail gyda ffynhonnell sydd ddim ar ffurf mbox `%s'"
+msgstr "Ceisio defnyddio movemail gyda ffynhonnell sydd ddim ar ffurf mbox `%s'"
 
 #: ../mail/mail-tools.c:256
 #, c-format
@@ -14093,75 +13971,63 @@ msgstr "Gyrrwyd neges ymlaen"
 msgid "Invalid folder: `%s'"
 msgstr "Plygell annilys: `%s'"
 
-#: ../mail/mail-vfolder.c:91
+#: ../mail/mail-vfolder.c:89
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Yn gosod Plygell Chwilio: %s"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:234
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Diweddaru Plygellau Chwilio ar gyfer '%s:%s'"
 
-#: ../mail/mail-vfolder.c:247
+#: ../mail/mail-vfolder.c:241
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Diweddaru Plygellau Chwilio ar gyfer '%s'"
 
-#: ../mail/mail-vfolder.c:1023
+#: ../mail/mail-vfolder.c:1067
 msgid "Edit Search Folder"
 msgstr "Golygu Plygell Chwilio"
 
-#: ../mail/mail-vfolder.c:1107
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 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."
+#, fuzzy
+msgid "A folder named \"{0}\" already exists. Please use a different name."
+msgstr "Mae plygell o'r enw &quot;{0}&quot; yn bodoli'n barod. Dewiswch enw gwahanol."
 
 #: ../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."
+#, fuzzy
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr "Mae plygell o'r enw &quot;{1}&quot; yn bodoli'n barod. Dewiswch enw arall."
 
 #: ../mail/mail.error.xml.h:3
+#, fuzzy
 msgid ""
-"A non-empty folder at &quot;{1}&quot; already exists.\n"
+"A non-empty folder at \"{1}\" already exists.\n"
 "\n"
-"You can choose to ignore this folder, overwrite or append its contents, or "
-"quit."
+"You can choose to ignore this folder, overwrite or append its contents, or quit."
 msgstr ""
 "Mae plygell, sydd heb fod yn wag, eisoes yn bodoli yn &quot;{1}&quot;.\n"
 "\n"
-"Gallwch ddewis anwybyddu'r blygell hon, trosysgrifo neu atodi at ei "
-"chynnwys, neu adael."
+"Gallwch ddewis anwybyddu'r blygell hon, trosysgrifo neu atodi at ei chynnwys, neu adael."
 
 #: ../mail/mail.error.xml.h:6
-msgid ""
-"A read receipt notification has been requested for &quot;{1}&quot;. Send the "
-"receipt notification to {0}?"
-msgstr ""
-"Mae cais am nodyn cadarnhad darllen ar gyfer &quot;{1}&quot;.  Anfon y nodyn "
-"cadarnhad at {0}?"
+#, fuzzy
+msgid "A read receipt notification has been requested for \"{1}\". Send the receipt notification to {0}?"
+msgstr "Mae cais am nodyn cadarnhad darllen ar gyfer &quot;{1}&quot;.  Anfon y nodyn cadarnhad at {0}?"
 
 #: ../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."
+#, fuzzy
+msgid "A signature already exists with the name \"{0}\". Please specify a different name."
+msgstr "Mae llofnod o'r enw &quot;{0}&quot; yn bodoli'n barod. Dewiswch enw arall."
 
 #: ../mail/mail.error.xml.h:8
-msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
-msgstr ""
-"Mae ychwanegu llinell Bwnc pwrpasol i'ch negeseuon yn rhoi gwell syniad o'i "
-"gynnwys i'r rhai sy'n ei dderbyn."
+msgid "Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about."
+msgstr "Mae ychwanegu llinell Bwnc pwrpasol i'ch negeseuon yn rhoi gwell syniad o'i gynnwys i'r rhai sy'n ei dderbyn."
 
 #: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account and all its proxies?"
@@ -14172,8 +14038,7 @@ msgid "Are you sure you want to delete this account?"
 msgstr "Ydych chi'n siŵr eich bod am ddileu'r cyfrif hwn?"
 
 #: ../mail/mail.error.xml.h:11
-msgid ""
-"Are you sure you want to disable this account and delete all its proxies?"
+msgid "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "Ydych chi'n siŵr eich bod am ddileu'r cyfrif hwn a'i holl ddirprwyon?"
 
 #: ../mail/mail.error.xml.h:12
@@ -14181,20 +14046,13 @@ msgid "Are you sure you want to open {0} messages at once?"
 msgstr "Ydych chi'n siŵr eich bod am agor {0} neges ar yr un pryd?"
 
 #: ../mail/mail.error.xml.h:13
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr ""
-"Ydych chi'n siŵr eich bod am waredu'n barhaol bob neges a ddilëwyd ym mhob "
-"plygell?"
+msgid "Are you sure you want to permanently remove all the deleted messages in all folders?"
+msgstr "Ydych chi'n siŵr eich bod am waredu'n barhaol bob neges a ddilëwyd ym mhob plygell?"
 
 #: ../mail/mail.error.xml.h:14
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in "
-"folder &quot;{0}&quot;?"
-msgstr ""
-"Ydych chi'n siŵr eich bod am waredu'n barhaol bob neges a ddilëwyd yn y "
-"blygell &quot;{0}&quot;?"
+#, fuzzy
+msgid "Are you sure you want to permanently remove all the deleted messages in folder \"{0}\"?"
+msgstr "Ydych chi'n siŵr eich bod am waredu'n barhaol bob neges a ddilëwyd ym mhob plygell?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
@@ -14209,190 +14067,189 @@ 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:18
-msgid "Because &quot;{0}&quot;."
-msgstr "Oherwydd &quot;{0}&quot;."
+msgid "Because \"{0}\"."
+msgstr "Oherwydd \"{0}\"."
 
 #: ../mail/mail.error.xml.h:20
-msgid "Because &quot;{2}&quot;."
-msgstr "Oherwydd &quot;{2}&quot;."
+msgid "Because \"{2}\"."
+msgstr "Oherwydd \"{2}\"."
 
 #: ../mail/mail.error.xml.h:21
 msgid "Blank Signature"
 msgstr "Llofnod Gwag"
 
 #: ../mail/mail.error.xml.h:22
-msgid "Cannot add Search Folder &quot;{0}&quot;."
-msgstr "Methu ychwanegu Plygell Chwilio &quot;{0}&quot;."
+msgid "Cannot add Search Folder \"{0}\"."
+msgstr "Methu ychwanegu Plygell Chwilio \"{0}\"."
 
 #: ../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;."
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "Methu copïo plygell \"{0}\" i \"{1}\"."
 
 #: ../mail/mail.error.xml.h:24
-msgid "Cannot create folder &quot;{0}&quot;."
-msgstr "Methu creu plygell &quot;{0}&quot;."
+msgid "Cannot create folder \"{0}\"."
+msgstr "Methu creu plygell \"{0}\";."
 
 #: ../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:26
-msgid "Cannot create the save directory, because &quot;{1}&quot;"
-msgstr "Methu creu'r cyfeiriadur cadw, o achos &quot;{1}&quot;"
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "Methu creu'r cyfeiriadur cadw, o achos \"{1}\""
 
 #: ../mail/mail.error.xml.h:27
-msgid "Cannot delete folder &quot;{0}&quot;."
-msgstr "Methu dileu plygell &quot;{0}&quot;."
+msgid "Cannot delete folder \"{0}\"."
+msgstr "Methu dileu plygell \"{0}\"."
 
 #: ../mail/mail.error.xml.h:28
-msgid "Cannot delete system folder &quot;{0}&quot;."
-msgstr "Methu dileu plygell system &quot;{0}&quot;."
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Methu dileu plygell system \"{0}\"."
 
 #: ../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."
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+msgstr "Methu golygu Plygell Chwilio \"{0}\" am nad yw'n bodoli."
 
 #: ../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;."
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Methu symud plygell \"{0}\" i \"{1}\"."
 
 #: ../mail/mail.error.xml.h:31
-msgid "Cannot open source &quot;{1}&quot;"
-msgstr "Methu agor ffynhonnell &quot;{1}&quot;"
+msgid "Cannot open source \"{1}\""
+msgstr "Methu agor ffynhonnell \"{1}\";"
 
 #: ../mail/mail.error.xml.h:32
-msgid "Cannot open source &quot;{2}&quot;."
-msgstr "Methu agor ffynhonnell &quot;{2}&quot;."
+msgid "Cannot open source \"{2}\"."
+msgstr "Methu agor ffynhonnell \"{2}\"."
 
 #: ../mail/mail.error.xml.h:33
-msgid "Cannot open target &quot;{2}&quot;."
-msgstr "Methu agor targed &quot;{2}&quot;."
+msgid "Cannot open target \"{2}\"."
+msgstr "Methu agor targed \"{2}\"."
 
 #: ../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 "
-"license."
-msgstr ""
-"Methu darllen y ffeil drwydded &quot;{0}&quot;, oherwydd problem yn y "
-"gosodiad.  Fedrwch chi ddim defnyddio'r darparwr hwn nes i chi dderbyn ei "
-"drwydded."
+msgid "Cannot read the license file \"{0}\", due to an installation problem. You will not be able to use this provider until you can accept its license."
+msgstr "Methu darllen y ffeil drwydded \"{0}\", oherwydd problem yn y gosodiad.  Fedrwch chi ddim defnyddio'r darparwr hwn nes i chi dderbyn ei drwydded."
 
 #: ../mail/mail.error.xml.h:35
-msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "Methu ailenwi &quot;{0}&quot; i &quot;{1}&quot;."
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr "Methu ailenwi \"{0}\" i \"{1}\"."
 
 #: ../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;."
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Methu ail-enwi neu symud plygell system \"{0}\"."
 
 #: ../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:38
-msgid "Cannot save to directory &quot;{0}&quot;."
-msgstr "Methu cadw at gyfeiriadur &quot;{0}&quot;."
+msgid "Cannot save to directory \"{0}\"."
+msgstr "Methu cadw at y plygell \"{0}\"."
 
 #: ../mail/mail.error.xml.h:39
-msgid "Cannot save to file &quot;{0}&quot;."
-msgstr "Methu cadw at ffeil &quot;{0}&quot;."
+msgid "Cannot save to file \"{0}\"."
+msgstr "Methu cadw at ffeil \"{0}\"."
 
 #: ../mail/mail.error.xml.h:40
-msgid "Cannot set signature script &quot;{0}&quot;."
-msgstr "Methu gosod sgript llofnod &quot;{0}&quot;."
+msgid "Cannot set signature script \"{0}\"."
+msgstr "Methu gosod sgript llofnod \"{0}\"."
 
 #: ../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."
-msgstr ""
-"Sicrhewch fod eich cyfrinair wedi ei sillafu'n gywir.  Cofiwch fod "
-"llythrennau mawr yn lle llythrennau bach yn gwneud gwahaniaeth mewn sawl "
-"cyfrinair; gall fod eich clo llythrennau mawr (caps lock) ymlaen."
+#, fuzzy
+msgid "Check Junk Failed"
+msgstr "Gwirio am _Sothach"
 
 #: ../mail/mail.error.xml.h:42
-msgid "Could not save signature file."
-msgstr "Methu cadw ffeil lofnod."
+msgid "Check to make sure your password is spelled correctly. Remember that many passwords are case sensitive; your caps lock might be on."
+msgstr "Sicrhewch fod eich cyfrinair wedi ei sillafu'n gywir.  Cofiwch fod llythrennau mawr yn lle llythrennau bach yn gwneud gwahaniaeth mewn sawl cyfrinair; gall fod eich clo llythrennau mawr (caps lock) ymlaen."
 
 #: ../mail/mail.error.xml.h:43
-msgid "Delete &quot;{0}&quot;?"
-msgstr "Dileu &quot;{0}&quot;?"
+msgid "Could not save signature file."
+msgstr "Methu cadw ffeil lofnod."
 
 #: ../mail/mail.error.xml.h:44
+msgid "Delete \"{0}\"?"
+msgstr "Dileu \"{0}\"?"
+
+#: ../mail/mail.error.xml.h:45
 msgid "Delete account?"
 msgstr "Dileu'r cyfrif?"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:46
+#, fuzzy
+msgid "Delete messages in Search Folder \"{0}\"?"
+msgstr "Copïo'r negeseuon a ddewiswyd i blygell arall"
+
+#: ../mail/mail.error.xml.h:47
+#, fuzzy
+msgid "Delete messages in Search Folder?"
+msgstr "Copïo'r negeseuon a ddewiswyd i blygell arall"
+
+#: ../mail/mail.error.xml.h:48
 msgid "Discard changes?"
 msgstr "Hepgor newidiadau?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:49
+msgid "Do not d_elete"
+msgstr "Peidiwch â dil_eu"
+
+#: ../mail/mail.error.xml.h:50
 msgid "Do not delete"
 msgstr "Peidiwch â dileu"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:51
 msgid "Do not disable"
 msgstr "Peidiwch ag analluogi"
 
-#: ../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:49
-msgid ""
-"Do you want to locally synchronize the folders that are marked for offline "
-"usage?"
+#: ../mail/mail.error.xml.h:52
+msgid "Do you want to locally synchronize the folders that are marked for offline usage?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:53
 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:51
+#: ../mail/mail.error.xml.h:54
 msgid "Do you wish to save your changes?"
 msgstr "A hoffech gadw eich newidiadau?"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:55
 msgid "Enter password."
 msgstr "Rhowch gyfrinair."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:56
 msgid "Error loading filter definitions."
 msgstr "Gwall wrth lwytho diffiniadau hidlyddion."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:57
 msgid "Error while performing operation."
 msgstr "Gwall wrth wneud y weithred."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:58
 msgid "Error while {0}."
 msgstr "Gwall tra {0}."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but cannot overwrite it."
 msgstr "Ffeil yn bodoli, ond methu ei throsysgrifo."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:60
 msgid "File exists but is not a regular file."
 msgstr "Ffeil yn bodoli ond nid yw'n ffeil arferol."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:61
 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:59
-msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
+#: ../mail/mail.error.xml.h:62
+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:60
+#: ../mail/mail.error.xml.h:63
 msgid "If you proceed, all proxy accounts will be deleted permanently."
-msgstr ""
-"Os wnewch chi barhau, bydd pob cyfrif dirprwy yn cael ei ddileu'n barhaol."
+msgstr "Os wnewch chi barhau, bydd pob cyfrif dirprwy yn cael ei ddileu'n barhaol."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:64
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14400,93 +14257,65 @@ 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:63
+#: ../mail/mail.error.xml.h:66
 msgid "If you proceed, the account information will be deleted permanently."
-msgstr ""
-"Os wnewch chi barhau, bydd y wybodaeth am y cyfrif yn cael ei ddileu'n "
-"barhaol."
+msgstr "Os wnewch chi barhau, bydd y wybodaeth am y cyfrif yn cael ei ddileu'n barhaol."
 
-#: ../mail/mail.error.xml.h:64
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
-msgstr ""
-"Os wnewch chi adael, fydd y negeseuon hyn ddim yn cael eu hanfon nes i chi "
-"ail-gychwyn Evolution."
+#: ../mail/mail.error.xml.h:67
+msgid "If you quit, these messages will not be sent until Evolution is started again."
+msgstr "Os wnewch chi adael, fydd y negeseuon hyn ddim yn cael eu hanfon nes i chi ail-gychwyn Evolution."
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:68
 msgid "Ignore"
 msgstr "Anwybyddu"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:69
 msgid "Invalid authentication"
 msgstr "Dilysiad annilys"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
 msgstr "Hidlyddion e-bost wedi'u diweddaru'n awtomatig."
 
-#: ../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 "
-"your message anyway. To avoid this, you should add at least one To: or CC: "
-"recipient."
-msgstr ""
-"Mae sawl system e-bost yn ychwanegu pennawd Apparently-To at negeseuon sydd "
-"â dim ond derbynwyr BCC. Os ychwanegir y pennawd hwn, fe fydd yr holl "
-"dderbynwyr yn cael eu rhestru o fewn y neges beth bynnag. I osgoi hyn, "
-"dylech ychwanegu o leiaf un derbyniwr At: neu CC:."
+#: ../mail/mail.error.xml.h:72
+msgid "Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at least one To: or CC: recipient."
+msgstr "Mae sawl system e-bost yn ychwanegu pennawd Apparently-To at negeseuon sydd â dim ond derbynwyr BCC. Os ychwanegir y pennawd hwn, fe fydd yr holl dderbynwyr yn cael eu rhestru o fewn y neges beth bynnag. I osgoi hyn, dylech ychwanegu o leiaf un derbyniwr At: neu CC:."
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:73
 msgid "Mark all messages as read"
 msgstr "Marcio bob neges fel rhai wedi'u darllen"
 
-#: ../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:72
-msgid "Mark as _Read"
-msgstr "_Marcio Wedi'u Darllen"
-
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:74
 msgid "Missing folder."
 msgstr "Plygell coll."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "Dim ffynonellau wedi'u dewis."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:77
 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:77
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr "Gwiriwch osodiadau eich cyfrif cyn ail-geisio."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:79
 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: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."
-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:80
+msgid "Please enter a valid email address in the To: field. You can search for email addresses by clicking on the To: button next to the entry box."
+msgstr "Rhowch gyfeiriad e-bost dilys yn y maes At:. Gallwch chwilio am gyfeiriadau e-bost wrth glicio ar y botwm At: sydd nesaf at y blwch cofnod."
+
+#: ../mail/mail.error.xml.h:81
+#, fuzzy
 msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email:\n"
-"{0}\n"
-"Send anyway?"
+"Please make sure the following recipients are willing and able to receive HTML email:\n"
+"{0}"
 msgstr ""
-"Gwnewch yn siŵr fod y derbynwyr canlynol yn medru derbyn ac yn barod i "
-"dderbyn e-bost HTML:\n"
+"Gwnewch yn siŵr fod y derbynwyr canlynol yn medru derbyn ac yn barod i dderbyn e-bost HTML:\n"
 "{0}\n"
 "Anfon beth bynnag?"
 
@@ -14499,8 +14328,8 @@ msgid "Please wait."
 msgstr "Arhoswch os gwelwch yn dda."
 
 #: ../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;."
+msgid "Problem migrating old mail folder \"{0}\"."
+msgstr "Problem wrth fudo'r hen blygell e-bost \"{0}\"."
 
 #: ../mail/mail.error.xml.h:86
 msgid "Querying server"
@@ -14515,61 +14344,60 @@ msgid "Read receipt requested."
 msgstr "Mae cais am anfon hysbys eich bod wedi darllen hwn."
 
 #: ../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?"
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Dileu go iawn blygell \"{0}\" a'i holl is-blygellau?"
 
 #: ../mail/mail.error.xml.h:90
+#, fuzzy
+msgid "Report Junk Failed"
+msgstr "Mewnforio Ffeil"
+
+#: ../mail/mail.error.xml.h:91
+msgid "Report Not Junk Failed"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
 msgstr "Plygellau Chwilio wedi'u diweddaru'n awtomatig."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:93
 msgid "Send Receipt"
 msgstr "Anfon Derbynneb"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:94
 msgid "Signature Already Exists"
 msgstr "Llofnod yn bodoli'n barod"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:95
 msgid "Synchronize"
 msgstr "Cysoni"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:96
 #, 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."
-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:97
+msgid "System folders are required for Evolution to function correctly and cannot be renamed, moved, or deleted."
+msgstr "Mae Evolution angen plygellau'r system er mwyn gweithio'n gywir, ac ni ellir eu hail-enwi, eu symud na'u dileu."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient. "
+"Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients in your message. To avoid this, you should add at least one To: or CC: recipient. "
 msgstr ""
-"Mae'r rhestr cysylltiadau rydych chi'n anfon ati wedi ei chyflunio i "
-"guddio'r rhestr derbynwyr.\n"
+"Mae'r rhestr cysylltiadau rydych chi'n anfon ati wedi ei chyflunio i guddio'r rhestr derbynwyr.\n"
 "\n"
-"Mae sawl system e-bost yn ychwanegu pennawd Apparently-To at negeseuon sydd "
-"â dim ond derbynwyr BCC. Os ychwanegir y pennawd hwn, fe welir yr holl "
-"dderbynwyr o fewn eich neges. I osgoi hyn, dylech ychwanegu o leiaf un "
-"derbyniwr At: neu CC:."
+"Mae sawl system e-bost yn ychwanegu pennawd Apparently-To at negeseuon sydd â dim ond derbynwyr BCC. Os ychwanegir y pennawd hwn, fe welir yr holl dderbynwyr o fewn eich neges. I osgoi hyn, dylech ychwanegu o leiaf un derbyniwr At: neu CC:."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:101
+#, fuzzy
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "And have been updated."
 msgstr ""
 "Roedd y Plygell(au) Chwilio yma:\n"
@@ -14578,12 +14406,13 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "Diweddarwyd y Plygell(au) Chwilio."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:106
+#, fuzzy
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "And have been updated."
 msgstr ""
 "Mae'r rheol(au) hidlo yma:\n"
@@ -14592,11 +14421,11 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "Diweddarwyd y rheol(au)."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:111
 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:110
+#: ../mail/mail.error.xml.h:112
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14604,194 +14433,195 @@ 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:112
-msgid ""
-"This message cannot be sent because the account you chose to send with is "
-"not enabled"
-msgstr ""
-"Methu anfon y neges am nad yw'r cyfrif yr ydych am anfon drwyddo wedi ei "
-"alluogi"
+#: ../mail/mail.error.xml.h:114
+msgid "This message cannot be sent because the account you chose to send with is not enabled"
+msgstr "Methu anfon y neges am nad yw'r cyfrif yr ydych am anfon drwyddo wedi ei alluogi"
 
-#: ../mail/mail.error.xml.h:113
-msgid ""
-"This message cannot be sent because you have not specified any recipients"
+#: ../mail/mail.error.xml.h:115
+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:114
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr ""
-"Nid yw'r gweinydd yn cynnal y math hwn o ddilysiant ac mae'n bosib nad yw'n "
-"cynnal dilysiant o gwbl."
+#: ../mail/mail.error.xml.h:116
+msgid "This server does not support this type of authentication and may not support authentication at all."
+msgstr "Nid yw'r gweinydd yn cynnal y math hwn o ddilysiant ac mae'n bosib nad yw'n cynnal dilysiant o gwbl."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:117
 msgid "This signature has been changed, but has not been saved."
 msgstr "Mae'r llofnod wedi cael ei newid, ond mae heb gael ei arbed."
 
-#: ../mail/mail.error.xml.h:116
-msgid ""
-"This will mark all messages as read in the selected folder and its "
-"subfolders."
-msgstr ""
-"Marcio bob neges yn y blygell a ddewiswyd, a'r is-blygellau, fel rhai wedi'u "
-"darllen."
+#: ../mail/mail.error.xml.h:118
+msgid "This will mark all messages as read in the selected folder and its subfolders."
+msgstr "Marcio bob neges yn y blygell a ddewiswyd, a'r is-blygellau, fel rhai wedi'u darllen."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:119
 msgid "Unable to connect to the GroupWise server."
 msgstr "Methwyd cysylltu â'r gweinydd GroupWise."
 
-#: ../mail/mail.error.xml.h:118
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"Methu agor y blygell ddrafftiau ar gyfer y cyfrif. Defnyddio plygell "
-"ddrafftiau'r system yn lle hynny?"
+#: ../mail/mail.error.xml.h:120
+msgid "Unable to open the drafts folder for this account. Use the system drafts folder instead?"
+msgstr "Methu agor y blygell ddrafftiau ar gyfer y cyfrif. Defnyddio plygell ddrafftiau'r system yn lle hynny?"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:121
 msgid "Unable to read license file."
 msgstr "Methu darllen y ffeil drwydded."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:122
 msgid "Use _Default"
 msgstr "Defnyddio'r _Rhagosodiad"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:123
 msgid "Use default drafts folder?"
 msgstr "Defnyddio plygell ddrafftiau rhagosodedig?"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:124
+msgid ""
+"Warning: Deleting messages from a Search Folder will delete the actual message from one of your local or remote folders.\n"
+"Do you really want to do this?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:127
 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:124
+#: ../mail/mail.error.xml.h:128
 msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr ""
-"Mae gennych negeseuon heb eu hanfon, ydych chi am adael y rhaglen beth "
-"bynnag?"
+msgstr "Mae gennych negeseuon heb eu hanfon, ydych chi am adael y rhaglen beth bynnag?"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:129
 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:126
+#: ../mail/mail.error.xml.h:130
 msgid "You must name this Search Folder."
 msgstr "Rhaid i chi enwi'r Blygell Chwilio."
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:131
 msgid "You must specify a folder."
 msgstr "Rhaid i chi benodi plygell."
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:132
 msgid ""
 "You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting all local "
-"folders, all remote folders, or both."
+"Either by selecting the folders individually, and/or by selecting all local folders, all remote folders, or both."
 msgstr ""
 "Rhaid i chi benodi o leiaf un plygell fel ffynhonnell,\n"
-"naill ai wrth ddewis y plygellau'n unigol, ac/neu wrth ddewis bob plygell "
-"lleol, bob plygell pell, neu'r ddau."
+"naill ai wrth ddewis y plygellau'n unigol, ac/neu wrth ddewis bob plygell lleol, bob plygell pell, neu'r ddau."
 
-#: ../mail/mail.error.xml.h: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:134
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr "Methodd y mewngofnodi i weinydd \"{0}\"; fel \"{0}\"."
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:135
 msgid "_Append"
 msgstr "_Atodi"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:136
 msgid "_Discard changes"
 msgstr "_Hepgor newidiadau"
 
-#: ../mail/mail.error.xml.h:133
-msgid "_Do not Mark as Read"
-msgstr "Peidio â Marcio Wedi'u Darllen"
-
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:137
 msgid "_Do not Synchronize"
 msgstr "_Peidio â Chysoni"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:139
 msgid "_Expunge"
 msgstr "_Chwynnu"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:140
 msgid "_Open Messages"
 msgstr "_Agor Negeseuon"
 
-#: ../mail/message-list.c:1022
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "Heb eu Gweld"
 
-#: ../mail/message-list.c:1023
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "Wedi'u Gweld"
 
-#: ../mail/message-list.c:1024
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "Atebwyd"
 
-#: ../mail/message-list.c:1025
+#: ../mail/message-list.c:1054
+msgid "Forwarded"
+msgstr "Wedi'i Anfon Ymlaen"
+
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "Amryw Negeseuon Heb eu Gweld"
 
-#: ../mail/message-list.c:1026
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "Amryw Negeseuon"
 
-#: ../mail/message-list.c:1030
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "Isaf"
 
-#: ../mail/message-list.c:1031
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "Gostwng"
 
-#: ../mail/message-list.c:1035
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "Uwch"
 
-#: ../mail/message-list.c:1036
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "Uchaf"
 
-#: ../mail/message-list.c:1508 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1654
+#: ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1515 ../plugins/itip-formatter/itip-view.c:201
-#: ../widgets/table/e-cell-date.c:72
+#: ../mail/message-list.c:1661
+#: ../plugins/itip-formatter/itip-view.c:205
+#: ../widgets/table/e-cell-date.c:71
 msgid "Today %l:%M %p"
 msgstr "Heddiw %l:%M %p"
 
-#: ../mail/message-list.c:1524 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1670
+#: ../widgets/table/e-cell-date.c:81
 msgid "Yesterday %l:%M %p"
 msgstr "Ddoe %l:%M %p"
 
-#: ../mail/message-list.c:1536 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1682
+#: ../widgets/table/e-cell-date.c:93
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1544 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1690
+#: ../widgets/table/e-cell-date.c:101
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1546 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1692
+#: ../widgets/table/e-cell-date.c:103
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2305 ../mail/message-list.etspec.h:9
-msgid "Messages"
-msgstr "Negeseuon"
-
-#: ../mail/message-list.c:3751
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:3981
+#: ../mail/message-list.c:4456
 msgid "Generating message list"
 msgstr "Creu rhestr negeseuon"
 
+#: ../mail/message-list.c:4293
+msgid "No message satisfies your search criteria. Either clear search with Search->Clear menu item or change it."
+msgstr ""
+
+#: ../mail/message-list.c:4295
+msgid "There are only hidden messages in this folder. Use View->Show Hidden Messages to show them."
+msgstr ""
+
+#: ../mail/message-list.c:4297
+msgid "There are no messages in this folder."
+msgstr "Does dim negeseuon yn y plygell hwn."
+
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "I Fod i Ddod i Ben"
@@ -14808,52 +14638,61 @@ msgstr "Fanerog"
 msgid "Follow Up Flag"
 msgstr "Dilyn Lan Baner"
 
-#: ../mail/message-list.etspec.h:10
+#: ../mail/message-list.etspec.h:11
 msgid "Received"
 msgstr "Derbyniwyd"
 
-#: ../mail/message-list.etspec.h:14
+#: ../mail/message-list.etspec.h:15
 msgid "Sent Messages"
 msgstr "Negeseuon Wedi'u Hanfon"
 
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:16
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
+#: ../widgets/misc/e-attachment-tree-view.c:542
 msgid "Size"
 msgstr "Maint"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-list.etspec.h:19
+#, fuzzy
+msgid "Subject - Trimmed"
+msgstr "Trefnu Pynciau yn ôl eu Trywydd"
+
+#: ../mail/message-tag-followup.c:54
 msgid "Call"
 msgstr "Galw"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:55
 msgid "Do Not Forward"
 msgstr "Peidiwch Gyrru Ymlaen"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr "Dilynol"
 
-#: ../mail/message-tag-followup.c:78
+#: ../mail/message-tag-followup.c:57
 msgid "For Your Information"
 msgstr "Er Gwybodaeth"
 
-#: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:58
+#: ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Ymlaen"
 
-#: ../mail/message-tag-followup.c:80
+#: ../mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr "Dim Ymateb Angenrheidiol"
 
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:62
+#: ../ui/evolution-mail-message.xml.h:76
 msgid "Reply"
 msgstr "Ateb"
 
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:63
+#: ../ui/evolution-mail-message.xml.h:77
 msgid "Reply to All"
 msgstr "Ateb i Bawb"
 
-#: ../mail/message-tag-followup.c:84
+#: ../mail/message-tag-followup.c:64
 msgid "Review"
 msgstr "Adolygu"
 
@@ -14878,200 +14717,272 @@ msgid "Subject contains"
 msgstr "Pwnc yn cynnwys"
 
 #: ../mail/searchtypes.xml.h:6
+#, fuzzy
+msgid "Subject or Addresses contains"
+msgstr "Pwnc neu Ddanfonwr yn cynnwys"
+
+#: ../mail/searchtypes.xml.h:7
+#, fuzzy
+msgid "Subject or Recipients contains"
+msgstr "Pwnc neu Ddanfonwr yn cynnwys"
+
+#: ../mail/searchtypes.xml.h:8
 msgid "Subject or Sender contains"
 msgstr "Pwnc neu Ddanfonwr yn cynnwys"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
+#, fuzzy
+msgid "Add local address books to Evolution."
+msgstr "Rhestru plygellau llyfr cyfeiriadau lleol"
+
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
 msgid "Local Address Books"
 msgstr "Llyfr Cyfeiriadau Lleol"
 
-#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
-msgid "Provides core functionality for local address books."
-msgstr "Darparu'r swyddogaethau craidd ar gyfer calendrau lleol."
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
+msgid "List of clues for the attachment reminder plugin to look for in a message body"
+msgstr ""
 
-#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-msgid ""
-"A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from evolution."
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
+msgid "List of clues for the attachment reminder plugin to look for in a message body."
 msgstr ""
-"Ategyn fformadu sy'n dangos atodiadau sain yn fewnol ac yn gadael i chi eu "
-"chwarae'n syth o evolution."
 
-#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-msgid "Audio inline plugin"
+#: ../plugins/attachment-reminder/attachment-reminder.c:476
+#: ../plugins/templates/templates.c:389
+msgid "Keywords"
+msgstr "Allweddeiriau"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
+#, fuzzy
+msgid "Attachment Reminder"
+msgstr "Bar Atodiadau"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+msgid "Reminds you when you forgot to add an attachment to a mail message."
+msgstr ""
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
+msgid "Evolution has found some keywords that suggest that this message should contain an attachment, but cannot find one."
+msgstr ""
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+#, fuzzy
+msgid "Message has no attachments"
+msgstr "Negeseuon ag Atodiadau"
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+msgid "_Add attachment..."
+msgstr "Ychwanegu _atodiad..."
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+msgid "_Edit Message"
+msgstr "_Golygu Neges"
+
+#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
+#, fuzzy
+msgid "Audio Inline"
 msgstr "Ategyn sain mewnol"
 
-#: ../plugins/backup-restore/backup-restore.c:96
-msgid "Select name of the Evolution archive"
+#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
+msgid "Play audio attachments directly from Evolution."
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:139
+#, fuzzy
+msgid "Select name of the Evolution backup file"
 msgstr "Dewiswch enw archif Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:120
+#: ../plugins/backup-restore/backup-restore.c:167
 msgid "_Restart Evolution after backup"
 msgstr "_Ail-ddechrau Evolution ar ôl creu copïau wrth gefn"
 
-#: ../plugins/backup-restore/backup-restore.c:139
-msgid "Select name of the Evolution archive to restore"
+#: ../plugins/backup-restore/backup-restore.c:190
+#, fuzzy
+msgid "Select name of the Evolution backup file to restore"
 msgstr "Dewiswch archif Evolution i'w hadfer"
 
-#: ../plugins/backup-restore/backup-restore.c:163
+#: ../plugins/backup-restore/backup-restore.c:214
 msgid "_Restart Evolution after restore"
 msgstr "_Ail-ddechrau Evolution ar ôl adfer"
 
-#: ../plugins/backup-restore/backup-restore.c:236
+#: ../plugins/backup-restore/backup-restore.c:287
 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."
+#: ../plugins/backup-restore/backup-restore.c:289
+#, fuzzy
+msgid "You can restore Evolution from your backup. It can restore all the Mails, Calendars, Tasks, Memos, Contacts. It also restores all your personal settings, mail filters etc."
 msgstr ""
-"Gallwch adfer Evolution o'ch archif. Gellir adfer yr holl E-bost/Calendrau/"
-"Tasgau/Memos/Llyfr Cyfeiriadau. \n"
+"Gallwch adfer Evolution o'ch archif. Gellir adfer yr holl E-bost/Calendrau/Tasgau/Memos/Llyfr Cyfeiriadau. \n"
 "Mae hefyd yn adfer eich holl osodiadau personol, hidlyddion e-bost a.y.b."
 
-#: ../plugins/backup-restore/backup-restore.c:244
-msgid "_Restore Evolution from the backup archive"
+#: ../plugins/backup-restore/backup-restore.c:297
+#, fuzzy
+msgid "_Restore Evolution from the backup file"
 msgstr "_Ail-ddechrau Evolution o'r archif copïau wrth gefn"
 
-#: ../plugins/backup-restore/backup-restore.c:251
+#: ../plugins/backup-restore/backup-restore.c:304
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Dewiswch Archif Evolution i'w hadfer:"
 
-#: ../plugins/backup-restore/backup-restore.c:254
+#: ../plugins/backup-restore/backup-restore.c:307
 msgid "Choose a file to restore"
 msgstr "Dewiswch ffeil i'w hadfer"
 
-#: ../plugins/backup-restore/backup.c:50 ../plugins/backup-restore/backup.c:90
+#: ../plugins/backup-restore/backup.c:62
+msgid "Backup Evolution directory"
+msgstr "Gwneud copi wrth gefn o gyfeiriadur Evolution"
+
+#: ../plugins/backup-restore/backup.c:64
+msgid "Restore Evolution directory"
+msgstr "Adfer cyfeiriadur Evolution"
+
+#: ../plugins/backup-restore/backup.c:66
+#, fuzzy
+msgid "Check Evolution Backup"
+msgstr "Copi wrth Gefn Evolution"
+
+#: ../plugins/backup-restore/backup.c:68
+msgid "Restart Evolution"
+msgstr "Ail-gychwyn Evolution"
+
+#: ../plugins/backup-restore/backup.c:70
+msgid "With Graphical User Interface"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:188
+#: ../plugins/backup-restore/backup.c:250
 msgid "Shutting down Evolution"
 msgstr "Wrthi'n Cau Evolution"
 
-#: ../plugins/backup-restore/backup.c:55
+#: ../plugins/backup-restore/backup.c:195
 msgid "Backing Evolution accounts and settings"
 msgstr "Creu copi wrth gefn o ddata a gosodiadau Evolution"
 
-#: ../plugins/backup-restore/backup.c:60
+#: ../plugins/backup-restore/backup.c:201
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
-msgstr ""
-"Gwneud copi wrth gefn o ddata Evolution (E-bost, Cysylltiadau, Calendr, "
-"Tasgau, Memos)"
+msgstr "Gwneud copi wrth gefn o ddata Evolution (E-bost, Cysylltiadau, Calendr, Tasgau, Memos)"
 
-#: ../plugins/backup-restore/backup.c:70
+#: ../plugins/backup-restore/backup.c:212
 msgid "Backup complete"
 msgstr "Wedi gorffen cadw copi wrth gefn"
 
-#: ../plugins/backup-restore/backup.c:75
-#: ../plugins/backup-restore/backup.c:116
+#: ../plugins/backup-restore/backup.c:217
+#: ../plugins/backup-restore/backup.c:238
+#: ../plugins/backup-restore/backup.c:284
 msgid "Restarting Evolution"
 msgstr "Wrthi'n ail-gychwyn Evolution"
 
-#: ../plugins/backup-restore/backup.c:94
+#: ../plugins/backup-restore/backup.c:254
 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"
+#: ../plugins/backup-restore/backup.c:259
+#, fuzzy
+msgid "Extracting files from backup"
 msgstr "Echdynnu ffeiliau o'r archif"
 
-#: ../plugins/backup-restore/backup.c:105
+#: ../plugins/backup-restore/backup.c:266
 msgid "Loading Evolution settings"
 msgstr "Llwytho gsodiadau Evolution"
 
-#: ../plugins/backup-restore/backup.c:109
+#: ../plugins/backup-restore/backup.c:273
 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:216
-msgid "Restore Evolution directory"
-msgstr "Adfer cyfeiriadur Evolution"
-
-#: ../plugins/backup-restore/backup.c:218
-msgid "Check Evolution archive"
-msgstr "Chwilio archif Evolution"
-
-#: ../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:280
+msgid "Ensuring local sources"
+msgstr ""
 
-#: ../plugins/backup-restore/backup.c:247
-#, c-format
-msgid "Backing up to %s"
+#: ../plugins/backup-restore/backup.c:429
+#, fuzzy, c-format
+msgid "Backing up to the folder %s"
 msgstr "Copi wrth gefn i %s"
 
-#: ../plugins/backup-restore/backup.c:252
-#, c-format
-msgid "Restoring from %s"
+#: ../plugins/backup-restore/backup.c:434
+#, fuzzy, c-format
+msgid "Restoring from the folder %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
+#: ../plugins/backup-restore/backup.c:454
 msgid "Evolution Backup"
 msgstr "Copi wrth Gefn Evolution"
 
-#: ../plugins/backup-restore/backup.c:268
+#: ../plugins/backup-restore/backup.c:454
 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."
+#: ../plugins/backup-restore/backup.c:489
+#, fuzzy
+msgid "Backing up Evolution Data"
+msgstr "Gwneud copi wrth gefn o ddata presennol Evolution"
+
+#: ../plugins/backup-restore/backup.c:490
+msgid "Please wait while Evolution is backing up your data."
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:492
+#, fuzzy
+msgid "Restoring Evolution Data"
+msgstr "Wrthi'n ail-gychwyn Evolution"
+
+#: ../plugins/backup-restore/backup.c:493
+msgid "Please wait while Evolution is restoring your data."
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:511
+msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
-"Ategyn er mwyn creu copi wrth gefn, ac adfer data a gosodiadau Evolution."
 
 #. the path to the shared library
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-msgid "Backup and restore plugin"
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
+#, fuzzy
+msgid "Backup and Restore"
 msgstr "Ategyn er mwyn creu copi wrth gefn, ac adfer data"
 
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
+#, fuzzy
+msgid "Backup and restore your Evolution data and settings."
+msgstr "Creu copi wrth gefn, ac adfer data a gosodiadau Evolution"
+
 #: ../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.error.xml.h:2
-msgid "Are you sure you want to restore Evolution from the selected archive?"
+#, fuzzy
+msgid "Are you sure you want to restore Evolution from the selected backup file?"
 msgstr "Ydych chi'n siŵr eich bod am adfer Evolution o'r archif a ddewiswyd?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-msgid ""
-"Evolution backup can start only when Evolution is not running. Please make "
-"sure that you save and close all your unsaved windows before proceeding.  If "
-"you want Evolution to restart automatically after backup, please enable the "
-"toggle button."
-msgstr ""
-"Dim ond pan nad yw Evolution yn rhedeg y gellir cychwyn creu copi wrth gefn. "
-"Cyn symud ymlaen, gwnewch yn siŵr eich bod yn cadw ac yn cau'r holl "
-"ffenestri sydd heb eu cadw. Os ydych am i Evolution ail-gychwyn yn awtomatig "
-"ar ôl creu'r copi wrth gefn, galluogwch y botwm toglu."
+msgid "Evolution backup can start only when Evolution is not running. Please make sure that you save and close all your unsaved windows before proceeding.  If you want Evolution to restart automatically after backup, please enable the toggle button."
+msgstr "Dim ond pan nad yw Evolution yn rhedeg y gellir cychwyn creu copi wrth gefn. Cyn symud ymlaen, gwnewch yn siŵr eich bod yn cadw ac yn cau'r holl ffenestri sydd heb eu cadw. Os ydych am i Evolution ail-gychwyn yn awtomatig ar ôl creu'r copi wrth gefn, galluogwch y botwm toglu."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
-msgid "Invalid Evolution archive"
-msgstr "Archif Evolution annilys"
+#, fuzzy
+msgid "Insufficient Permissions"
+msgstr "Caniatadau Dirprwy"
 
 #: ../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."
+#, fuzzy
+msgid "Invalid Evolution backup file"
+msgstr "Archif Evolution annilys"
 
 #: ../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."
+#, fuzzy
+msgid "Please select a valid backup file to restore."
+msgstr "Dewiswch ffeil archif ddilys i'w hadfer."
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+#, fuzzy
+msgid "The selected folder is not writable."
+msgstr "Copïo'r blygell a ddewiswyd i blygell arall"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
+msgid "This will delete all your current Evolution data and settings and restore them from your backup. Evolution restore can start only when Evolution is not running. Please make sure that you close all your unsaved windows before you proceed. If you want Evolution to restart automatically restart after restore, please enable the toggle button."
+msgstr "Bydd hyn yn dileu'r holl ddata a gosodiadau Evolution sydd gennych, ac yn eu hadfer o'r copi wrth gefn. Dim ond pan nad yw Evolution ar waith gall y broses o adfer Evolution gychwyn. Cyn symud ymlaen, gwnewch yn siŵr eich bod yn cau'r holl ffenestri nad ydynt wedi'u cadw. Os ydych am i Evolution ail-gychwyn yn awtomatig ar ôl creu'r copi wrth gefn, galluogwch y botwm toglu."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup and restore Evolution data and settings"
@@ -15085,223 +14996,351 @@ msgstr "_Gosodiadau Adfer..."
 msgid "_Backup Settings..."
 msgstr "_Gosodiadau Creu Copi wrth Gefn..."
 
-#: ../plugins/bbdb/bbdb.c:447 ../plugins/bbdb/bbdb.c:456
+#: ../plugins/bbdb/bbdb.c:622
+#: ../plugins/bbdb/bbdb.c:631
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Cysylltiadau Awtomatig"
 
 #. Enable BBDB checkbox
-#: ../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:646
+#, fuzzy
+msgid "Create _address book entries when sending mails"
+msgstr "_Cuddio cyfeiriadau wrth anfon e-bost at y rhestr"
 
-#: ../plugins/bbdb/bbdb.c:477
+#: ../plugins/bbdb/bbdb.c:652
 msgid "Select Address book for Automatic Contacts"
 msgstr "Dewis llyfr cyfeiriadau ar gyfer Cysylltiadau Awtomatig"
 
-#: ../plugins/bbdb/bbdb.c:492
+#: ../plugins/bbdb/bbdb.c:667
 msgid "Instant Messaging Contacts"
 msgstr "Cysylltiadau Negesu Sydyn"
 
 #. Enable Gaim Checkbox
-#: ../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:682
+#, fuzzy
+msgid "Synchronize contact info and images from Pidgin buddy list"
+msgstr "Cysoni bob hyn a hyn y wybodaeth am gysylltion a'u delweddau o restr ffrindiau gaim"
 
-#: ../plugins/bbdb/bbdb.c:513
-msgid "Select Address book for Gaim buddy list"
+#: ../plugins/bbdb/bbdb.c:688
+#, fuzzy
+msgid "Select Address book for Pidgin buddy list"
 msgstr "Dewis llyfr cyfeiriadau ar gyfer rhestr ffrindiau Gaim"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:524
+#: ../plugins/bbdb/bbdb.c:699
 msgid "Synchronize with _buddy list now"
 msgstr "Cysoni gyda'r _rhestr ffrindiau nawr"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+msgid "BBDB"
+msgstr "BBDB"
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
+#, fuzzy
 msgid ""
-"Automatically fills your addressbook with names and email addresses as you "
-"reply to messages. Also fills in IM contact information from your buddy "
-"lists."
+"Takes the gruntwork out of managing your address book.\n"
+"\n"
+"Automatically fills your address book with names and email addresses as you reply to messages.  Also fills in IM contact information from your buddy lists."
+msgstr "Llenwi'ch llyfr cyfeiriadau'n awtomatig ag enwau a chyfeiriadau e-bost wrth i chi ymateb i negeseuon. Hefyd yn llenwi gwybodaeth negesu sydyn o'ch rhestrau ffrindiau."
+
+#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
+#, fuzzy, c-format
+msgid "Error occurred while spawning %s: %s."
+msgstr "Roedd gwall wrth argraffu"
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:183
+#, c-format
+msgid "Bogofilter child process does not respond, killing..."
 msgstr ""
-"Llenwi'ch llyfr cyfeiriadau'n awtomatig ag enwau a chyfeiriadau e-bost wrth "
-"i chi ymateb i negeseuon. Hefyd yn llenwi gwybodaeth negesu sydyn o'ch "
-"rhestrau ffrindiau."
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
-msgid "BBDB"
-msgstr "BBDB"
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
+#, c-format
+msgid "Wait for Bogofilter child process interrupted, terminating..."
+msgstr ""
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:302
-msgid "Convert mail text to _Unicode"
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:208
+#, c-format
+msgid "Pipe to Bogofilter failed, error code: %d."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:371
+#, fuzzy
+msgid "Convert message 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"
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
+#, fuzzy
+msgid "Convert mail messages 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."
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
+msgid "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from different character sets."
+msgstr "Trosi neges destun i UTF-8 Unicode er mwyn uno tocynnau sothach/ddim-yn-sothach sydd wedi'u creu mewn setiau nodau gwahanol."
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
+msgid "Bogofilter Junk Filter"
 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
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+#, fuzzy
+msgid "Bogofilter Options"
+msgstr "Cofnodi gweithredoedd hidlo"
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
+msgid "Filter junk messages using Bogofilter."
+msgstr ""
+
+#: ../plugins/caldav/caldav-source.c:64
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:133
+#: ../plugins/caldav/caldav-source.c:366
+#: ../plugins/calendar-http/calendar-http.c:171
 msgid "_URL:"
 msgstr "_LAU:"
 
-#: ../plugins/caldav/caldav-source.c:269
+#: ../plugins/caldav/caldav-source.c:390
+#: ../plugins/google-account-setup/google-contacts-source.c:303
 msgid "Use _SSL"
 msgstr "Defnyddio _SSL"
 
+#. add refresh option
+#: ../plugins/caldav/caldav-source.c:433
+#: ../plugins/calendar-http/calendar-http.c:308
+#: ../plugins/calendar-weather/calendar-weather.c:508
+#: ../plugins/google-account-setup/google-source.c:698
+#: ../plugins/google-account-setup/google-contacts-source.c:322
+msgid "Re_fresh:"
+msgstr "_Adnewyddu:"
+
+#: ../plugins/caldav/caldav-source.c:451
+#: ../plugins/calendar-http/calendar-http.c:326
+#: ../plugins/calendar-weather/calendar-weather.c:526
+#: ../plugins/google-account-setup/google-source.c:723
+#: ../plugins/google-account-setup/google-contacts-source.c:333
+msgid "weeks"
+msgstr "wythnosau"
+
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
-msgid "CalDAV Calendar sources"
-msgstr "Ffynonellau calendr CalDAV"
+msgid "Add CalDAV support to Evolution."
+msgstr ""
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
-msgid "CalDAV sources"
+#, fuzzy
+msgid "CalDAV Support"
 msgstr "Ffynonellau CalDAV"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
-msgid "Local Calendars"
-msgstr "Calendrau lleol"
+msgid "Add local calendars to Evolution."
+msgstr ""
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
-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:"
+msgid "Local Calendars"
+msgstr "Calendrau lleol"
 
-#: ../plugins/calendar-http/calendar-http.c:339
+#: ../plugins/calendar-http/calendar-http.c:369
 msgid "_Secure connection"
 msgstr "_Cysylltiad diogel"
 
+#: ../plugins/calendar-http/calendar-http.c:455
+msgid "Userna_me:"
+msgstr "_Enw Defnyddiwr:"
+
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
-msgid "HTTP Calendars"
-msgstr "Calendrau HTTP"
+msgid "Add web calendars to Evolution."
+msgstr ""
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
-msgid "Provides core functionality for webcal and http calendars."
-msgstr "Darparu'r swyddogaethau craidd ar gyfer calendrau webcal a http."
-
-#: ../plugins/calendar-weather/calendar-weather.c:54
-#: ../plugins/calendar-weather/calendar-weather.c:60
-msgid "Weather: Cloudy"
-msgstr "Tywydd: Cymylog"
+msgid "Web Calendars"
+msgstr "Calendrau Gwe"
 
 #: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Fog"
 msgstr "Tywydd: Niwl"
 
 #: ../plugins/calendar-weather/calendar-weather.c:62
-msgid "Weather: Partly Cloudy"
-msgstr "Tywydd: Rhannol Gymylog"
+msgid "Weather: Cloudy"
+msgstr "Tywydd: Cymylog"
 
 #: ../plugins/calendar-weather/calendar-weather.c:63
-msgid "Weather: Rain"
-msgstr "Tywydd: Glaw"
+msgid "Weather: Cloudy Night"
+msgstr "Tywydd: Noson Cymylog"
 
 #: ../plugins/calendar-weather/calendar-weather.c:64
+#, fuzzy
+msgid "Weather: Overcast"
+msgstr "Tywydd: Glaw"
+
+#: ../plugins/calendar-weather/calendar-weather.c:65
+msgid "Weather: Showers"
+msgstr "Tywydd: Cawodydd"
+
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Snow"
 msgstr "Tywydd: Eira"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Sunny"
 msgstr "Tywydd: Heulog"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:68
+msgid "Weather: Clear Night"
+msgstr "Tywydd: Noson Glir"
+
+#: ../plugins/calendar-weather/calendar-weather.c:69
 msgid "Weather: Thunderstorms"
 msgstr "Tywydd: Mellt a Tharanau"
 
-#: ../plugins/calendar-weather/calendar-weather.c:267
+#: ../plugins/calendar-weather/calendar-weather.c:230
 msgid "Select a location"
 msgstr "Dewiswch leoliad"
 
-#: ../plugins/calendar-weather/calendar-weather.c:654
+#: ../plugins/calendar-weather/calendar-weather.c:606
 msgid "_Units:"
 msgstr "_Unedau:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:661
+#: ../plugins/calendar-weather/calendar-weather.c:613
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Metrig (Celsius, cm, a.y.b.)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:662
+#: ../plugins/calendar-weather/calendar-weather.c:614
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Imperial (Fahrenheit, modfeddi, a.y.b.)"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
-msgid "Provides core functionality for weather calendars."
-msgstr "Darparu'r swyddogaethau craidd ar gyfer calendrau tywydd."
+msgid "Add weather calendars to Evolution."
+msgstr ""
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
 msgid "Weather Calendars"
 msgstr "Calendrau Tywydd"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
-msgid ""
-"A test plugin which demonstrates a popup menu plugin which lets you copy "
-"things to the clipboard."
-msgstr ""
-"Ategyn prawf sy'n arddangos ategyn naidlen sy'n gadael i chi gopïo deunydd "
-"i'r clipfwrdd."
+msgid "Copy Tool"
+msgstr "Arf Copïo"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
-msgid "Copy tool"
-msgstr "Arf copïo"
+msgid "Copy things to the clipboard."
+msgstr "Copïo pethau i'r clipfwrdd"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:1
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
 msgstr "Gwirio ai Evolution yw'r rhaglen e-bost ragosodedig"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
-msgstr ""
-"Bob tro mae Evolution yn cychwyn, gwirio ai Evolution yw'r rhaglen e-bost "
-"ragosodedig."
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
+msgid "Every time Evolution starts, check whether or not it is the default mailer."
+msgstr "Bob tro mae Evolution yn cychwyn, gwirio ai Evolution yw'r rhaglen e-bost ragosodedig."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
-msgid "Checks whether Evolution is the default mail client on startup."
+#, fuzzy
+msgid "Check whether Evolution is the default mail client on startup."
 msgstr "Gwirio ai Evolution yw'r rhaglen e-bost ragosodedig wrth gychwyn."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-msgid "Default Mail Client "
+#, fuzzy
+msgid "Default Mail Client"
 msgstr "Cleient Ebost Rhagosodedig"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
 msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Ydych chi am i Evolution fod yn rhaglen e-bost ragosodedig i chi?"
 
-#: ../plugins/default-source/default-source.c:82
-#: ../plugins/default-source/default-source.c:109
-msgid "Mark as _default folder"
-msgstr "Marcio yn _blygell ragosodedig"
+#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
+#: ../shell/main.c:627
+msgid "Evolution"
+msgstr "Evolution"
+
+#: ../plugins/default-source/default-source.c:80
+msgid "Mark as _default address book"
+msgstr "Marcio yn llyfr cyfeiriadau ragoso_dedig"
+
+#: ../plugins/default-source/default-source.c:101
+msgid "Mark as _default calendar"
+msgstr "Marcio yn calendr ragoso_dedig"
+
+#: ../plugins/default-source/default-source.c:102
+msgid "Mark as _default task list"
+msgstr "Marcio fel rhestr tasgau ragoso_dedig"
+
+#: ../plugins/default-source/default-source.c:103
+msgid "Mark as _default memo list"
+msgstr "Marcio fel rhestr memo ragoso_dedig"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 msgid "Default Sources"
 msgstr "Ffynonellau Rhagosodedig"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
+msgid "Mark your preferred address book and calendar as default."
+msgstr ""
+
+#: ../plugins/email-custom-header/email-custom-header.c:333
+msgid "Security:"
+msgstr "Diogelwch:"
+
+#: ../plugins/email-custom-header/email-custom-header.c:338
+#, fuzzy
+msgid "Unclassified"
+msgstr "Di-lofnod"
+
+#: ../plugins/email-custom-header/email-custom-header.c:339
+#, fuzzy
+msgid "Protected"
+msgstr "Crëwyd"
+
+#: ../plugins/email-custom-header/email-custom-header.c:341
+msgid "Secret"
+msgstr "Cyfrinach"
+
+#: ../plugins/email-custom-header/email-custom-header.c:342
+msgid "Top secret"
+msgstr "Cyfrinachol iawn"
+
+#: ../plugins/email-custom-header/email-custom-header.c:584
+#, fuzzy
+msgid "_Custom Header"
+msgstr "Pennawd Addasedig"
+
+#: ../plugins/email-custom-header/email-custom-header.c:906
+msgid "Key"
+msgstr "Allwedd"
+
+#: ../plugins/email-custom-header/email-custom-header.c:917
+#: ../plugins/templates/templates.c:395
+msgid "Values"
+msgstr "Gwerthoedd"
+
+#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
+#: ../plugins/email-custom-header/email-custom-header.glade.h:2
 msgid ""
-"Provides functionality for marking a calendar or an addressbook as the "
-"default one."
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
+msgstr ""
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
+#, fuzzy
+msgid "Email Custom Header"
+msgstr "Pennawd Addasedig"
+
+#. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
+msgid "Add custom headers to outgoing mail messages."
+msgstr ""
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
+msgid "Custom Header"
+msgstr "Pennawd Addasedig"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+#, fuzzy
+msgid "List of Custom Headers"
+msgstr "Penawdau Addasedig"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
+msgid "The key specifies the list of custom headers that you can add to an outgoing message. The format for specifying a Header and Header value is: Name of the custom header followed by \"=\" and the values separated by \";\""
 msgstr ""
-"Darparu'r swyddogaethau er mwyn marcio calendr neu lyfr cyfeiriadau fel un "
-"rhagosodedig."
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
@@ -15326,30 +15365,22 @@ msgstr "Cyfrinair Diogel"
 
 #. i18n: "NTLM" probably doesn't translate
 #: ../plugins/exchange-operations/exchange-account-setup.c:66
-msgid ""
-"This option will connect to the Exchange server using secure password (NTLM) "
-"authentication."
-msgstr ""
-"Bydd yr opsiwn hwn yn cysylltu â'r gweinydd Exchange gan ddefnyddio "
-"dilysiant cyfrinair diogel (NTLM)."
+msgid "This option will connect to the Exchange server using secure password (NTLM) authentication."
+msgstr "Bydd yr opsiwn hwn yn cysylltu â'r gweinydd Exchange gan ddefnyddio dilysiant cyfrinair diogel (NTLM)."
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid "Plaintext Password"
 msgstr "Cyfrinair Testun Plaen"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:76
-msgid ""
-"This option will connect to the Exchange server using standard plaintext "
-"password authentication."
-msgstr ""
-"Bydd yr opsiwn hwn yn cysylltu â'r gweinydd Exchange gan ddefnyddio "
-"dilysiant cyfrinair arferol, testun plaen."
+msgid "This option will connect to the Exchange server using standard plaintext password authentication."
+msgstr "Bydd yr opsiwn hwn yn cysylltu â'r gweinydd Exchange gan ddefnyddio dilysiant cyfrinair arferol, testun plaen."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:257
+#: ../plugins/exchange-operations/exchange-account-setup.c:271
 msgid "Out Of Office"
 msgstr "Allan o'r Swyddfa"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:264
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -15357,103 +15388,115 @@ msgstr ""
 "Bydd y neges a benodir isod yn cael ei hanfon at bob person \n"
 "fydd yn anfon e-bost atoch chi tra byddwch allan o'r swyddfa."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
-#: ../plugins/exchange-operations/exchange-account-setup.c:281
+#: ../plugins/exchange-operations/exchange-account-setup.c:290
+#: ../plugins/exchange-operations/exchange-account-setup.c:295
 msgid "I am out of the office"
 msgstr "Rydw i allan o'r swyddfa"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:277
-#: ../plugins/exchange-operations/exchange-account-setup.c:280
+#: ../plugins/exchange-operations/exchange-account-setup.c:291
+#: ../plugins/exchange-operations/exchange-account-setup.c:294
 msgid "I am in the office"
 msgstr "Rydw i yn y swyddfa"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:340
 msgid "Change the password for Exchange account"
 msgstr "Newid y cyfrinair ar gyfer cyfrif Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:330
+#: ../plugins/exchange-operations/exchange-account-setup.c:342
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Newid Cyfrinair"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 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
+#: ../plugins/exchange-operations/exchange-account-setup.c:349
 msgid "Delegation Assistant"
 msgstr "Cynorthwyydd Dirprwyo"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#: ../plugins/exchange-operations/exchange-account-setup.c:361
 msgid "Miscelleneous"
 msgstr "Amrywiol"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:371
 msgid "View the size of all Exchange folders"
 msgstr "Gweld maint bob plygell Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
+#: ../plugins/exchange-operations/exchange-account-setup.c:373
 msgid "Folders Size"
 msgstr "Maint Ffolderi"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:368
+#: ../plugins/exchange-operations/exchange-account-setup.c:380
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Gosodiadau Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:610
+#: ../plugins/exchange-operations/exchange-account-setup.c:726
 msgid "_OWA URL:"
 msgstr "LAU _OWA:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:636
+#: ../plugins/exchange-operations/exchange-account-setup.c:752
 msgid "A_uthenticate"
 msgstr "D_ilysu"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:829
-msgid "Authentication Type"
-msgstr "Math Dilysiant"
+#: ../plugins/exchange-operations/exchange-account-setup.c:774
+msgid "Mailbox name is _different than user name"
+msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:843
+#: ../plugins/exchange-operations/exchange-account-setup.c:787
+#, fuzzy
+msgid "_Mailbox:"
+msgstr "_Ebost"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:1001
+msgid "_Authentication Type"
+msgstr "Math Dilysi_ant"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:1015
 msgid "Ch_eck for Supported Types"
 msgstr "_Gwirio am Fathau wedi Cynnal"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:949
-#: ../plugins/exchange-operations/exchange-contacts.c:212
+#: ../plugins/exchange-operations/exchange-account-setup.c:1130
+#: ../plugins/exchange-operations/exchange-contacts.c:217
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:951
-#: ../plugins/exchange-operations/exchange-contacts.c:214
+#: ../plugins/exchange-operations/exchange-account-setup.c:1132
+#: ../plugins/exchange-operations/exchange-contacts.c:219
+#, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:191
-#: ../plugins/exchange-operations/exchange-contacts.c:165
+#. FIXME: Take care of i18n
+#: ../plugins/exchange-operations/exchange-account-setup.c:1137
+#: ../plugins/exchange-operations/exchange-calendar.c:236
+#: ../plugins/exchange-operations/exchange-contacts.c:222
+msgid "Size:"
+msgstr "Maint:"
+
+#: ../plugins/exchange-operations/exchange-calendar.c:196
+#: ../plugins/exchange-operations/exchange-contacts.c:170
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
 msgstr ""
-"Mae Evolution yn y modd all-lein. Fedrwch chi ddim creu na newid plygellau "
-"nawr.\n"
+"Mae Evolution yn y modd all-lein. Fedrwch chi ddim creu na newid plygellau nawr.\n"
 "Newidiwch i'r modd ar-lein ar gyfer y gweithredoedd hynny."
 
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
-#: ../plugins/exchange-operations/exchange-change-password.c:115
-msgid ""
-"The current password does not match the existing password for your account. "
-"Please enter the correct password"
-msgstr ""
-"Nid yw'r cyfrinair yr un peth â chyfrinair presennol eich cyfrif. Rhowch y "
-"cyfrinair cywir"
+#: ../plugins/exchange-operations/exchange-change-password.c:114
+msgid "The current password does not match the existing password for your account. Please enter the correct password"
+msgstr "Nid yw'r cyfrinair yr un peth â chyfrinair presennol eich cyfrif. Rhowch y cyfrinair cywir"
 
-#: ../plugins/exchange-operations/exchange-change-password.c:122
+#: ../plugins/exchange-operations/exchange-change-password.c:121
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr "Nid yw'r ddau gyfrinair yr un peth. Rhowch y cyfrineiriau eto."
 
@@ -15473,99 +15516,138 @@ msgstr "Cyfrinair Newydd:"
 msgid "Your current password has expired. Please change your password now."
 msgstr "Mae'ch cyfrinair wedi dod i ben. Newidiwch eich cyfrinair nawr."
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:663
+#: ../plugins/exchange-operations/exchange-config-listener.c:657
 #, c-format
 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:143
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
-#: ../widgets/table/e-table-header-item.c:1554
+#: ../plugins/exchange-operations/exchange-delegates-user.c:142
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:560
 msgid "Custom"
 msgstr "Addasedig"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:190
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+#: ../plugins/exchange-operations/exchange-delegates-user.c:168
+msgid "Editor (read, create, edit)"
+msgstr "Golygydd (darllen, creu, golygu)"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:172
+msgid "Author (read, create)"
+msgstr "Awduron (darllen, creu)"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:176
+msgid "Reviewer (read-only)"
+msgstr "Adolygydd (darllen-yn-unig)"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:225
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
 msgid "Delegate Permissions"
 msgstr "Caniatadau Dirprwy"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:201
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#: ../plugins/exchange-operations/exchange-delegates-user.c:236
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
 #, c-format
 msgid "Permissions for %s"
 msgstr "Caniatadau ar gyfer %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#. To translators: This is a part of the message to be sent to the delegatee
+#. summarizing the permissions assigned to him.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:326
+msgid "This message was sent automatically by Evolution to inform you that you have been designated as a delegate. You can now send messages on my behalf."
+msgstr ""
+
+#. To translators: Another chunk of the same message.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:331
+msgid "You have been given the following permissions on my folders:"
+msgstr ""
+
+#. To translators: This message is included if the delegatee has been given access
+#. to the private items.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:351
+#, fuzzy
+msgid "You are also permitted to see my private items."
+msgstr "_Dirprwy yn medru gweld eitemau preifat"
+
+#. To translators: This message is included if the delegatee has not been given access
+#. to the private items.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:358
+msgid "However you are not permitted to see my private items."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:390
+#, c-format
+msgid "You have been designated as a delegate for %s"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:416
 msgid "Delegate To"
 msgstr "Dirprwyo At"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:562
+#: ../plugins/exchange-operations/exchange-delegates.c:581
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "Tynnu'r dirprwy %s?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:680
+#: ../plugins/exchange-operations/exchange-delegates.c:698
 msgid "Could not access Active Directory"
 msgstr "Methwyd cyrchu Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:692
+#: ../plugins/exchange-operations/exchange-delegates.c:710
 msgid "Could not find self in Active Directory"
 msgstr "Methwyd darganfod eich hun o fewn Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:705
+#: ../plugins/exchange-operations/exchange-delegates.c:723
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "Methu dod o hyd i'r dirprwy %s o fewn yr Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:717
+#: ../plugins/exchange-operations/exchange-delegates.c:735
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "Methu tynnu'r dirprwy %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:777
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 msgid "Could not update list of delegates."
 msgstr "Methwyd diweddaru'r rhestr o ddirprwyon."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:795
+#: ../plugins/exchange-operations/exchange-delegates.c:813
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "Methu ychwanegu'r dirprwy %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:963
+#: ../plugins/exchange-operations/exchange-delegates.c:980
 msgid "Error reading delegates list."
 msgstr "Gwall wrth ddarllen rhestr dirprwyon."
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
-msgid "Author (read, create)"
-msgstr "Awduron (darllen, creu)"
-
 #. Translators: This is used for permissions for <user> for the folder Calendar.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
 msgid "C_alendar:"
 msgstr "_Calendr:"
 
 #. Translators: This is used for permissions for <user> for the folder Contacts.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
 msgid "Co_ntacts:"
 msgstr "_Cysylltiadau: "
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegates"
 msgstr "Dirprwyon"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
-msgid "Editor (read, create, edit)"
-msgstr "Golygydd (darllen, creu, golygu)"
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+msgid ""
+"None\n"
+"Reviewer (read-only)\n"
+"Author (read, create)\n"
+"Editor (read, create, edit)"
+msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Permissions for"
 msgstr "Caniatadau ar gyfer"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
-msgid "Reviewer (read-only)"
-msgstr "Adolygydd (darllen-yn-unig)"
-
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:12
 msgid ""
 "These users will be able to send mail on your behalf\n"
@@ -15583,25 +15665,36 @@ msgstr "_Dirprwy yn medru gweld eitemau preifat"
 msgid "_Inbox:"
 msgstr "_Blwch Derbyn:"
 
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:18
+#, fuzzy
+msgid "_Summarize permissions"
+msgstr "Caniatadau Dirprwy"
+
 #. Translators: This is used for permissions for <user> for the folder Tasks.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:19
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:20
+#: ../plugins/itip-formatter/itip-view.c:1912
 msgid "_Tasks:"
 msgstr "_Tasgau:"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:61
+#: ../plugins/exchange-operations/exchange-folder-permission.c:62
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "Caniatadau..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:135
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
 msgid "Folder Name"
 msgstr "Enw Plygell"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:139
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
 msgid "Folder Size"
 msgstr "Maint Plygell"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:310
+#. FIXME Limit to one user
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:76
+msgid "User"
+msgstr "Defnyddwyr"
+
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:309
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Tanysgrifio i Blygell Defnyddiwr Arall"
@@ -15610,20 +15703,20 @@ msgstr "Tanysgrifio i Blygell Defnyddiwr Arall"
 msgid "Exchange Folder Tree"
 msgstr "Coeden Plygell Exchange"
 
-#: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:235
-#: ../plugins/exchange-operations/exchange-folder.c:245
+#: ../plugins/exchange-operations/exchange-folder.c:65
+#: ../plugins/exchange-operations/exchange-folder.c:233
+#: ../plugins/exchange-operations/exchange-folder.c:243
 msgid "Unsubscribe Folder..."
 msgstr "Dad-danysgrifio Plygell..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:465
-#: ../plugins/exchange-operations/exchange-folder.c:520
+#: ../plugins/exchange-operations/exchange-folder.c:463
+#: ../plugins/exchange-operations/exchange-folder.c:518
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Tanysgrifio go iawn o'r blygell \"%s\"?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:477
-#: ../plugins/exchange-operations/exchange-folder.c:532
+#: ../plugins/exchange-operations/exchange-folder.c:475
+#: ../plugins/exchange-operations/exchange-folder.c:530
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Dad-danysgrifio o'r blygell \"%s\""
@@ -15648,12 +15741,10 @@ msgstr "<b>Statws:</b>"
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:6
 msgid ""
-"<small>The message specified below will be automatically sent to each person "
-"who sends\n"
+"<small>The message specified below will be automatically sent to each person who sends\n"
 "mail to you while you are out of the office.</small>"
 msgstr ""
-"<small>Bydd y neges a benodir isod yn cael ei hanfon yn awtomatig at bob "
-"person fydd yn anfon\n"
+"<small>Bydd y neges a benodir isod yn cael ei hanfon yn awtomatig at bob person fydd yn anfon\n"
 "e-bost atoch chi tra byddwch chi allan o'r swyddfa.</small>"
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:8
@@ -15688,15 +15779,18 @@ msgstr "Mae'ch cyfrinair yn dod i ben o fewn 7 diwrnod..."
 msgid "_Change Password"
 msgstr "_Newid Cyfrinair"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
 msgid "(Permission denied.)"
 msgstr "(Gwrthodwyd caniatâd.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
 msgid "Add User:"
 msgstr "Ychwanegu Defnyddiwr..."
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
+#: ../plugins/exchange-operations/exchange-send-options.c:410
+#: ../plugins/groupwise-features/proxy.c:932
+#: ../plugins/groupwise-features/share-folder.c:713
 msgid "Add User"
 msgstr "Ychwanegu Defnyddiwr"
 
@@ -15803,14 +15897,23 @@ 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
+#, fuzzy
+msgid "Send as Delegate"
+msgstr "Rhowch ddirprwy"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:15
 msgid "_Sensitivity: "
 msgstr "_Sensitifrwydd:"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:143
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:16
+msgid "_User"
+msgstr "_Defnyddiwr"
+
+#: ../plugins/exchange-operations/exchange-user-dialog.c:134
 msgid "Select User"
 msgstr "Dewis Defnyddiwr"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:181
+#: ../plugins/exchange-operations/exchange-user-dialog.c:172
 msgid "Address Book..."
 msgstr "_Llyfr Cyfeiriadau..."
 
@@ -15823,104 +15926,103 @@ msgid "Subscribe to Other User's Calendar"
 msgstr "Tanysgrifio i Galendr Defnyddiwr Arall"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
-msgid ""
-"A plugin that handles a collection of Exchange account specific operations "
-"and features."
+msgid "Activates the Evolution-Exchange extension package."
 msgstr ""
-"Ategyn sy'n delio â chasgliad o nodweddion a gweithredoedd sy'n unigryw i "
-"gyfrif Exchange."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
 msgstr "Gweithrediadau Exchange"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
+msgid "Cannot access the \"Exchange settings\" tab in offline mode."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
 msgid "Cannot change password due to configuration problems."
 msgstr "Methu newid cyfrinair oherwydd problemau cyfluniad."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
 msgid "Cannot display folders."
 msgstr "Methu dangos plygellau."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Cannot perform the operation."
 msgstr "Methu gwneud y weithred."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
-msgid ""
-"Changes to options for Exchange account \"{0}\" will only take effect after "
-"restarting Evolution."
-msgstr ""
-"Bydd y newidiadau i gyfluniad cyfrif Evolution \"{0}\" yn dod i rym wedi i "
-"chi adael ac ail-ddechrau Evolution."
-
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+msgid "Changes to options for Exchange account \"{0}\" will only take effect after restarting Evolution."
+msgstr "Bydd y newidiadau i gyfluniad cyfrif Evolution \"{0}\" yn dod i rym wedi i chi adael ac ail-ddechrau Evolution."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid "Could not authenticate to server."
 msgstr "Methwyd dilysu gyda'r gweinydd."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
 msgid "Could not change password."
 msgstr "Methu newid cyfrinair."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:8
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
 "username, and password, and try again."
 msgstr ""
-"Methu cyflunio cyfrif Exchange am i wall anhysbys ddigwydd. Gwiriwch y LAU, "
-"yr enw defnyddiwr,\n"
+"Methu cyflunio cyfrif Exchange am i wall anhysbys ddigwydd. Gwiriwch y LAU, yr enw defnyddiwr,\n"
 "a'r cyfrinair, cyn ail-geisio."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not connect to Exchange server."
 msgstr "Methwyd cysylltu â'r gweinydd Exchange"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not connect to server {0}."
 msgstr "Methwyd cysylltu â'r gweinydd {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not determine folder permissions for delegates."
 msgstr "Methwyd pennu caniatadau plygellau ar gyfer y dirprwyon."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not find Exchange Web Storage System."
 msgstr "Methu dod o hyd i System Storfa Gwe Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not locate server {0}."
 msgstr "Methu dod o hyd i'r gweinydd {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not make {0} a delegate"
 msgstr "Methu gwneud {0} yn ddirprwy"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read folder permissions"
 msgstr "Methu darllen caniatadau'r blygell"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not read folder permissions."
 msgstr "Methu darllen caniatadau'r blygell."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Could not read out-of-office state"
 msgstr "Methu darllen statws allan-o'r-swyddfa"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 msgid "Could not update folder permissions."
 msgstr "Methu diweddaru caniatadau plygell."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
 msgid "Could not update out-of-office state"
 msgstr "Methu diweddaru statws allan-o'r-swyddfa"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+msgid "Evolution requires a restart to load the subscribed user's mailbox"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid "Exchange Account is offline."
 msgstr "Cyfrif Exchange ddim ar-lein."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:24
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -15949,104 +16051,100 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Failed to update delegates:"
 msgstr "Methu diweddaru dirprwyon:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder already exists"
 msgstr "Plygell yn bodoli'n barod"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder does not exist"
 msgstr "Plygell ddim yn bodoli"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 msgid "Folder offline"
 msgstr "Ffolder all-lein"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1272
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../shell/e-shell.c:1259
 msgid "Generic error"
 msgstr "Gwall generig"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid "Global Catalog Server is not reachable"
 msgstr "Methu cyrraedd y gweinydd Catalog cyffredinol"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
-msgid ""
-"If OWA is running on a different path, you must specify that in the account "
-"configuration dialog."
-msgstr ""
-"Os yw OWA yn rhedeg ar lwybr gwahanol, rhaid i chi roi hynny yn y ddeialog "
-"cyflunio cyfrif."
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+msgid "If OWA is running on a different path, you must specify that in the account configuration dialog."
+msgstr "Os yw OWA yn rhedeg ar lwybr gwahanol, rhaid i chi roi hynny yn y ddeialog cyflunio cyfrif."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Mailbox for {0} is not on this server."
 msgstr "Nid oes blwch e-bost ar gyfer {0} ar y gweinydd."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the URL is correct and try again."
 msgstr "Gwnewch yn siŵr fod y LAU yn gywir, cyn ceisio eto."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the server name is spelled correctly and try again."
-msgstr ""
-"Gwnewch yn siŵr fod enw'r gweinydd wedi ei sillafu'n gywir cyn ceisio eto."
+msgstr "Gwnewch yn siŵr fod enw'r gweinydd wedi ei sillafu'n gywir cyn ceisio eto."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Make sure the username and password are correct and try again."
-msgstr ""
-"Gwnewch yn siŵr fod enw'r defnyddiwr a'r cyfrinair wedi eu sillafu'n gywir "
-"cyn ceisio eto."
+msgstr "Gwnewch yn siŵr fod enw'r defnyddiwr a'r cyfrinair wedi eu sillafu'n gywir cyn ceisio eto."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No Global Catalog server configured for this account."
-msgstr ""
-"Dim gweinydd Catalog cyffredinol wedi ei gyflunio ar gyfer y cyfrif hwn."
+msgstr "Dim gweinydd Catalog cyffredinol wedi ei gyflunio ar gyfer y cyfrif hwn."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No mailbox for user {0} on {1}."
 msgstr "Dim blwch e-bost ar gyfer defnyddiwr {0} ar {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "No such user {0}"
 msgstr "Dim defnyddiwr o'r enw {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Password successfully changed."
 msgstr "Cyfrinair wedi ei newid yn llwyddiannus."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 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
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please restart Evolution for changes to take effect"
 msgstr "Ail-gychwynnwch Evolution er mwyn i'r newidiadau ddod i rym"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "Please select a user."
 msgstr "Dewiswch ddefnyddiwr:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "Server rejected password because it is too weak."
 msgstr "Gweinydd wedi gwrthod y cyfrinair am ei fod yn rhy wan."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "Bydd y cyfrif Exchange yn cael ei analluogi wedi i chi adael Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "Bydd y cyfrif Exchange yn cael ei dynnu wedi i chi adael Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "Nid yw'r gweinydd Exchange yn cydweddu â Chysylltydd Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -16054,7 +16152,7 @@ msgstr ""
 "Mae'r gweinydd yn rhedeg Exchange 5.5. Dim ond Microsoft \n"
 "Exchange 2000 a 2003 mae Cysylltydd Exchange yn eu cynnal."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -16068,87 +16166,82 @@ msgstr ""
 "\n"
 "Neu gallech fod wedi cam-deipio'ch cyfrinair."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Try again with a different password."
 msgstr "Ceisiwch eto gyda chyfrinair gwahanol."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to add user to access control list:"
 msgstr "Methu ychwanegu defnyddiwr at y rhestr rheoli mynediad:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unable to edit delegates."
 msgstr "Methu golygu dirprwyon."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "Unknown error looking up {0}"
 msgstr "Gwall anhysbys wrth edrych {0} i fyny"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/google-account-setup/google-source.c:604
+#: ../plugins/mail-to-task/mail-to-task.c:343
+#: ../plugins/mail-to-task/mail-to-task.c:555
 msgid "Unknown error."
 msgstr "Gwall anhysbys."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unknown type"
 msgstr "Math anhysbys"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "Unsupported operation"
 msgstr "Gweithred heb ei chynnal"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr "Rydych yn agos at eich cwota o le i storio e-bost ar y gweinydd hwn."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+msgid "You are permitted to send a message on behalf of only one delegator at a time."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You cannot make yourself your own delegate"
 msgstr "Fedrwch chi ddim gwneud eich hun yn ddirprwy ar gyfer eich hunan"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "Rydych dros ben y cwota o le i storio e-bost ar y gweinydd hwn."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "You may only configure a single Exchange account."
 msgstr "Fedrwch chi ond cyflunio un cyfrif Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
-msgid ""
-"Your current usage is: {0} KB. Try to clear up some space by deleting some "
-"mail."
-msgstr ""
-"Eich defnydd ar hyn o bryd yw : {0} KB. Ceisiwch greu rhagor o le wrth "
-"ddileu rhai negeseuon."
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+msgid "Your current usage is: {0} KB. Try to clear up some space by deleting some mail."
+msgstr "Eich defnydd ar hyn o bryd yw : {0} KB. Ceisiwch greu rhagor o le wrth ddileu rhai negeseuon."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
-msgid ""
-"Your current usage is: {0} KB. You will not be able to either send or "
-"receive mail now."
-msgstr ""
-"Eich defnydd ar hyn o bryd yw : {0} KB. Fedrwch chi ddim anfon na derbyn e-"
-"bost nawr."
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+msgid "Your current usage is: {0} KB. You will not be able to either send or receive mail now."
+msgstr "Eich defnydd ar hyn o bryd yw : {0} KB. Fedrwch chi ddim anfon na derbyn e-bost nawr."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
-msgid ""
-"Your current usage is: {0} KB. You will not be able to send mail until you "
-"clear up some space by deleting some mail."
-msgstr ""
-"Eich defnydd ar hyn o bryd yw : {0} KB. Fedrwch chi ddim anfon e-bost nes i "
-"chi greu rhagor o le wrth ddileu rhai negeseuon."
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+msgid "Your current usage is: {0} KB. You will not be able to send mail until you clear up some space by deleting some mail."
+msgstr "Eich defnydd ar hyn o bryd yw : {0} KB. Fedrwch chi ddim anfon e-bost nes i chi greu rhagor o le wrth ddileu rhai negeseuon."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "Your password has expired."
 msgstr "Mae'ch cyfrinair wedi dod i ben."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} cannot be added to an access control list"
 msgstr "Methu ychwanegu {0} at restr rheoli mynediad."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already a delegate"
 msgstr "{0} yn ddirprwy'n barod"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:86
 msgid "{0} is already in the list"
 msgstr "{0} eisoes yn y rhestr"
 
@@ -16160,38 +16253,164 @@ msgstr "Tanysgrifio i Dasgau Defnyddiwr Arall"
 msgid "Check folder permissions"
 msgstr "Gwirio caniatadau plygell"
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Automatically launch editor when key is pressed in the mail composer"
+msgstr ""
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+#: ../plugins/external-editor/external-editor.c:120
+#, fuzzy
+msgid "Automatically launch when a new mail is edited"
+msgstr "Gwirio'n awtomatig am _e-bost newydd bob"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
+msgid "Default External Editor"
+msgstr "Golygydd Allanol Rhagosodedig"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
+msgid "The default command that must be used as the editor."
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
+msgid "External Editor"
+msgstr "Golygydd Allanol"
+
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
+#, fuzzy
+msgid "Use an external editor to compose plain-text mail messages."
+msgstr "Agor ffenestr er mwyn cyfansoddi neges e-bost"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
+msgid "Cannot create Temporary File"
+msgstr "Methu creu Ffeil Dros-Dro"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
+msgid "Editor not launchable"
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
+msgid "Evolution is unable to create a temporary file to save your mail. Retry later."
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
+msgid "External editor still running"
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
+msgid "The external editor is still running. The mail composer window cannot be closed as long as the editor is active."
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
+msgid "The external editor set in your plugin preferences cannot be launched. Try setting a different editor."
+msgstr ""
+
+#: ../plugins/external-editor/external-editor.c:109
+msgid "Command to be executed to launch the editor: "
+msgstr ""
+
+#: ../plugins/external-editor/external-editor.c:110
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim -f\""
+msgstr ""
+"Ar gyfer Emacs defnyddiwch \"xemacs\"\n"
+"Ar gyfer VI defnyddiwch \"gvim -f\""
+
+#: ../plugins/external-editor/external-editor.c:307
+#: ../plugins/external-editor/external-editor.c:309
+msgid "Compose in External Editor"
+msgstr "Cyfansoddi mewn Golygydd Allanol"
+
+#: ../plugins/face/face.c:59
+msgid "Select a (48*48) png of size < 700bytes"
+msgstr ""
+
+#: ../plugins/face/face.c:69
+msgid "PNG files"
+msgstr "Ffeil PNG"
+
+#: ../plugins/face/face.c:126
+msgid "_Face"
+msgstr "_Gwyneb"
+
+#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+msgid ""
+"Attach a small picture of your face to outgoing messages.\n"
+"\n"
+"First time the user needs to configure a 48x48 PNG image. It is Base-64 encoded and stored in ~/.evolution/faces. This will be used in subsequent sent messages."
+msgstr ""
+
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:53
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Dad-danysgrifio o'r blygell \"%s\""
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
-msgid "Allows unsubscribing of mail folders in the folder tree context menu."
-msgstr ""
-"Caniatáu dad-danysgrifio o blygellau e-bost yn newislen cyd-destun coeden "
-"plygell."
-
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
 msgstr "Dad-danysgrifio Plygellau"
 
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
+msgid "Unsubscribe from an IMAP folder by right-clicking on it in the folder tree."
+msgstr ""
+
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
 msgstr "_Dad-danysgrifio"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
+#: ../plugins/google-account-setup/google-source.c:81
+#: ../plugins/google-account-setup/google-contacts-source.c:51
+msgid "Google"
+msgstr "Google"
+
+#: ../plugins/google-account-setup/google-source.c:499
+#, fuzzy, c-format
+msgid "Enter password for user %s to access list of subscribed calendars."
+msgstr "Ychwanegu'r blygell at y rhestr o blygellau yr ydych wedi tanysgrifio iddynt"
+
+#: ../plugins/google-account-setup/google-source.c:604
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr ""
+"Methu darllen data o weinydd Google.\n"
+"%s"
+
+#: ../plugins/google-account-setup/google-source.c:739
+msgid "Cal_endar:"
+msgstr "Cal_endr:"
+
+#: ../plugins/google-account-setup/google-source.c:774
+msgid "Retrieve _list"
+msgstr "Nôl _rhestr"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:270
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:285
+msgid "<b>Server</b>"
+msgstr "<b>Gweinydd</b>"
+
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
+msgid "Add Google Calendars to Evolution."
+msgstr "Ychwanegu Google Calendars i Evolution"
+
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
+msgid "Google Calendars"
+msgstr "Calendrau Google"
+
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:450
 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."
+msgid "Add Novell GroupWise support to Evolution."
+msgstr ""
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
-msgid "Groupwise Account Setup"
+#, fuzzy
+msgid "GroupWise Account Setup"
 msgstr "Gosod Cyfrif Groupwise"
 
-#: ../plugins/groupwise-features/install-shared.c:215
+#: ../plugins/groupwise-features/install-shared.c:219
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -16216,23 +16435,24 @@ msgstr ""
 "Cliciwch 'Ymlaen' i osod y blygell wedi rhannu\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:220
+#: ../plugins/groupwise-features/install-shared.c:224
 msgid "Install the shared folder"
 msgstr "Gosod y ffolder wedi rhannu"
 
-#: ../plugins/groupwise-features/install-shared.c:222
+#: ../plugins/groupwise-features/install-shared.c:226
 msgid "Shared Folder Installation"
 msgstr "Gosod Plygell wedi Rhannu"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:77
+#: ../plugins/groupwise-features/junk-mail-settings.c:80
 msgid "Junk Settings"
 msgstr "Gosodiadau Sothach"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:90
-msgid "<b>Junk Mail Settings</b>"
-msgstr "<b>Gosodiadau E-bost Sothach</b>"
+#: ../plugins/groupwise-features/junk-mail-settings.c:93
+#: ../plugins/groupwise-features/junk-settings.glade.h:3
+msgid "Junk Mail Settings"
+msgstr "Gosodiadau E-bost Sothach"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:112
+#: ../plugins/groupwise-features/junk-mail-settings.c:117
 msgid "Junk Mail Settings..."
 msgstr "Gosodiadau E-bost Sothach..."
 
@@ -16244,12 +16464,8 @@ msgstr "<b>Rhestr Sothach :</b."
 msgid "Email:"
 msgstr "E-bost:"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:3
-msgid "Junk Mail Settings"
-msgstr "Gosodiadau E-bost Sothach"
-
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/mail-account-disable/mail-account-disable.c:46
+#: ../plugins/mail-account-disable/mail-account-disable.c:45
 msgid "_Disable"
 msgstr "_Analluogi"
 
@@ -16261,61 +16477,178 @@ msgstr "_Galluogi"
 msgid "_Junk List"
 msgstr "_Rhestr Sothach"
 
-#: ../plugins/groupwise-features/mail-retract.c:53
+#: ../plugins/groupwise-features/mail-retract.c:52
+#, fuzzy
+msgid "Message Retract"
+msgstr "Statws Neges"
+
+#: ../plugins/groupwise-features/mail-retract.c:57
+msgid "Retracting a message may remove it from the recipient's mailbox. Are you sure you want to do this ?"
+msgstr ""
+
+#: ../plugins/groupwise-features/mail-retract.c:76
 msgid "Message retracted successfully"
 msgstr "Neges wedi ei dynnu'n ôl yn llwyddiannus"
 
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:86
 msgid "Retract Mail"
 msgstr "Tynnu Ebost yn Ã?l"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
-msgid "Add Send Options to groupwise messages"
+#, fuzzy
+msgid "Add Send Options to GroupWise messages"
 msgstr "Ychwanegu Opsiynau Anfon at negeseuon Groupwise"
 
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
-#: ../widgets/misc/e-send-options.glade.h:19
-msgid "Send Options"
-msgstr "Opsiynau Anfon"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "A plugin for the features in Groupwise accounts."
+#, fuzzy
+msgid "Fine-tune your GroupWise accounts."
 msgstr "Ategyn nodweddion cyfrifon Groupwise."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-msgid "Groupwise Features"
+#, fuzzy
+msgid "GroupWise Features"
 msgstr "Nodweddion Groupwise"
 
-#: ../plugins/groupwise-features/process-meeting.c:49
+#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:1
+#, fuzzy
+msgid "Message retract failed"
+msgstr "Neges wedi ei dynnu'n ôl yn llwyddiannus"
+
+#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:2
+#, fuzzy
+msgid "The server did not allow the selected message to be retracted."
+msgstr "Trosi'r neges a ddewiswyd yn dasg newydd"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
+#, fuzzy
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr "Mae plygell o'r enw &quot;{0}&quot; yn bodoli'n barod. Dewiswch enw gwahanol."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
+msgid "Account Already Exists"
+msgstr "Cyfrif Yn Bodoli'n Barod"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:1
+msgid "Invalid user"
+msgstr "Defnyddiwr annilys"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
+msgid "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email address and try again."
+msgstr ""
+
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
+#, fuzzy
+msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+msgstr "Methu cadw at ffeil &quot;{0}&quot;."
+
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:4
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:2
+msgid "Specify User"
+msgstr "Dewis Defnyddiwr"
+
+#. 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/org-gnome-proxy.error.xml.h:6
+#, fuzzy
+msgid "You have already given proxy permissions to this user."
+msgstr "Does gennych chi mo'r caniatâd i ddileu'r e-bost hwn."
+
+#. 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/org-gnome-proxy.error.xml.h:8
+msgid "You have to specify a valid user name to give proxy rights."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
+#, fuzzy
+msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
+msgstr "Methu cadw i'r ffeil awto-gadw &quot;{0}&quot;."
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4
+msgid "You have to specify a user name which you want to add to the list"
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
+#, fuzzy
+msgid "Do you want to resend the meeting ?"
+msgstr "Ydych chi'n siŵr eich bod am ddileu'r cyfarfod?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
+#, fuzzy
+msgid "Do you want to resend the recurring meeting ?"
+msgstr "Ydych chi'n siŵr eich bod am ddileu'r cyfarfod?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
+#, fuzzy
+msgid "Do you want to retract the original item ?"
+msgstr "Ydych chi'n siŵr eich bod am ddileu'r cofnod dyddlyfr '{0}'?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
+#, fuzzy
+msgid "The original will be removed from the recipient's mailbox."
+msgstr "_Dileu'r eitem hon o flychau e-bost bob derbyniwr arall?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:5
+#, fuzzy
+msgid "This is a recurring meeting"
+msgstr "Gwneud hyn yn ddigwyddiad sy'n ail-ddigwydd"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:6
+msgid "This will create a new meeting using the existing meeting details."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
+msgid "This will create a new meeting with the existing meeting details. The recurrence rule needs to be re-entered."
+msgstr ""
+
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
+#, fuzzy
+msgid "Would you like to accept it?"
+msgstr "A hoffech gadw eich newidiadau?"
+
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:11
+#, fuzzy
+msgid "Would you like to decline it?"
+msgstr "A hoffech gadw eich newidiadau?"
+
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Accept Tentatively"
 msgstr "Derbyn yn Betrus"
 
+#: ../plugins/groupwise-features/process-meeting.c:319
+#, fuzzy
+msgid "Rese_nd Meeting..."
+msgstr "_Dirprwyo Cyfarfod..."
+
 #: ../plugins/groupwise-features/properties.glade.h:1
 msgid "<b>Users:</b>"
 msgstr "<b>Defnyddwyr :</b>"
 
+#: ../plugins/groupwise-features/properties.glade.h:2
+#, fuzzy
+msgid "C_ustomize notification message"
+msgstr "_Addasu neges hysbysu"
+
 #: ../plugins/groupwise-features/properties.glade.h:3
-#: ../widgets/table/e-table-click-to-add.c:509
+msgid "Con_tacts..."
+msgstr "Cysyll_tiadau..."
+
+#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../widgets/table/e-table-click-to-add.c:514
 msgid "Message"
 msgstr "Neges"
 
-#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../plugins/groupwise-features/properties.glade.h:6
 msgid "Shared Folder Notification"
 msgstr "Hysbysiad Plygell wedi Rhannu"
 
-#: ../plugins/groupwise-features/properties.glade.h:7
+#: ../plugins/groupwise-features/properties.glade.h:8
 msgid "The participants will receive the following notification.\n"
 msgstr "Bydd y mynychwyr yn derbyn y wybodaeth ganlynol.\n"
 
-#: ../plugins/groupwise-features/properties.glade.h:10
-msgid "_Contacts..."
-msgstr "_Cysylltiadau..."
-
-#: ../plugins/groupwise-features/properties.glade.h:11
-msgid "_Customize notification message"
-msgstr "_Addasu neges hysbysu"
-
 #: ../plugins/groupwise-features/properties.glade.h:12
 msgid "_Not Shared"
 msgstr "_Heb ei Rannu"
@@ -16365,15 +16698,17 @@ msgid "Subscribe to my _notifications"
 msgstr "Tanysgrifio i'm _hysbysiadau"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:126
-msgid "_Read"
-msgstr "_Darllen"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:14
 msgid "_Write"
 msgstr "_Ysgrifennu"
 
-#: ../plugins/groupwise-features/proxy-listing.glade.h:1
+#. To Translators: strip the part in front of the | and the | itself
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:15
+#, fuzzy
+msgid "permission to read|_Read"
+msgstr "Gwrthodwyd caniatâd"
+
+#. 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-listing.glade.h:2
 msgid "Proxy"
 msgstr "Dirprwy"
 
@@ -16381,14 +16716,15 @@ msgstr "Dirprwy"
 msgid "<b>Account Name</b>"
 msgstr "<b>Enw Cyfrif</b>"
 
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
+#. 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-dialog.glade.h:3
 msgid "Proxy Login"
 msgstr "Mewngofnodi Dirprwy"
 
-#: ../plugins/groupwise-features/proxy-login.c:220
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:503
-#: ../plugins/groupwise-features/send-options.c:83
+#: ../plugins/groupwise-features/proxy-login.c:207
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:488
+#: ../plugins/groupwise-features/send-options.c:86
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sRhowch gyfrinair am %s (defnyddiwr %s)"
@@ -16396,113 +16732,121 @@ 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:516
+#: ../plugins/groupwise-features/proxy-login.c:510
 msgid "_Proxy Login..."
 msgstr "_Mewngofnodi Dirprwy..."
 
-#: ../plugins/groupwise-features/proxy.c:697
+#. 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.c:689
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "Fydd y tab Dirprwy ddim ond ar gael wedi i'r cyfrif gael ei alluogi."
 
-#: ../plugins/groupwise-features/proxy.c:702
+#. 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.c:695
 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
+#: ../plugins/groupwise-features/send-options.c:214
+#, fuzzy
+msgid "Advanced send options"
+msgstr "Mewnosod opsiynau anfon uwch"
+
+#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder.c:748
 msgid "Users"
 msgstr "Defnyddwyr"
 
-#: ../plugins/groupwise-features/share-folder-common.c:323
+#: ../plugins/groupwise-features/share-folder-common.c:321
 msgid "Enter the users and set permissions"
 msgstr "Rhoi'r defnyddwyr a gosod caniatadau"
 
-#: ../plugins/groupwise-features/share-folder-common.c:342
+#: ../plugins/groupwise-features/share-folder-common.c:340
 msgid "New _Shared Folder..."
 msgstr "_Ffolder Newydd wedi ei Rhannu..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:450
+#: ../plugins/groupwise-features/share-folder-common.c:447
 msgid "Sharing"
 msgstr "Rhannu"
 
-#: ../plugins/groupwise-features/share-folder.c:765
+#: ../plugins/groupwise-features/share-folder.c:531
+#, fuzzy
+msgid "Custom Notification"
+msgstr "Unioniad"
+
+#: ../plugins/groupwise-features/share-folder.c:753
 msgid "Add   "
 msgstr "Ychwanegu"
 
-#: ../plugins/groupwise-features/share-folder.c:771
+#: ../plugins/groupwise-features/share-folder.c:759
 msgid "Modify"
 msgstr "Newid"
 
-#: ../plugins/groupwise-features/status-track.c:103
+#: ../plugins/groupwise-features/status-track.c:94
 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:108
+msgid "Subject:"
+msgstr "Pwnc:"
 
-#: ../plugins/groupwise-features/status-track.c:129
-msgid "<b>From</b> :"
-msgstr "<b>Oddi wrth</b> :"
+#: ../plugins/groupwise-features/status-track.c:122
+msgid "From:"
+msgstr "Oddi wrth:"
 
-#: ../plugins/groupwise-features/status-track.c:142
-msgid "<b>Creation date</b> :"
-msgstr "<b>Dyddiad creu</b> :"
+#: ../plugins/groupwise-features/status-track.c:137
+msgid "Creation date:"
+msgstr "Dyddiad creu:"
 
-#: ../plugins/groupwise-features/status-track.c:178
+#: ../plugins/groupwise-features/status-track.c:176
 msgid "Recipient: "
 msgstr "Derbynnydd:"
 
-#: ../plugins/groupwise-features/status-track.c:185
+#: ../plugins/groupwise-features/status-track.c:183
 msgid "Delivered: "
 msgstr "Anfonwyd:"
 
-#: ../plugins/groupwise-features/status-track.c:191
+#: ../plugins/groupwise-features/status-track.c:189
 msgid "Opened: "
 msgstr "Agorwyd:"
 
-#: ../plugins/groupwise-features/status-track.c:196
+#: ../plugins/groupwise-features/status-track.c:194
 msgid "Accepted: "
 msgstr "Derbyniwyd:"
 
-#: ../plugins/groupwise-features/status-track.c:201
+#: ../plugins/groupwise-features/status-track.c:199
 msgid "Deleted: "
 msgstr "Dilewyd:"
 
-#: ../plugins/groupwise-features/status-track.c:206
+#: ../plugins/groupwise-features/status-track.c:204
 msgid "Declined: "
 msgstr "Gwrthodwyd:"
 
-#: ../plugins/groupwise-features/status-track.c:211
+#: ../plugins/groupwise-features/status-track.c:209
 msgid "Completed: "
 msgstr "Cyflawnwyd:"
 
-#: ../plugins/groupwise-features/status-track.c:216
-msgid "Un-delivered: "
+#: ../plugins/groupwise-features/status-track.c:214
+msgid "Undelivered: "
 msgstr "Heb anfon:"
 
-#: ../plugins/groupwise-features/status-track.c:241
+#: ../plugins/groupwise-features/status-track.c:238
 msgid "Track Message Status..."
 msgstr "Olrhain Statws Neges..."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "A plugin to setup hula calendar sources."
-msgstr "Ategyn i osod ffynonellau calendr hula."
+msgid "Add Hula support to Evolution."
+msgstr ""
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Account Setup"
-msgstr "Gosod Cyfrif Hula"
-
-#: ../plugins/imap-features/imap-headers.c:133
-msgid "Custom Header"
-msgstr "Pennawd Addasedig"
+msgid "Hula Support"
+msgstr ""
 
-#: ../plugins/imap-features/imap-headers.c:245
+#: ../plugins/imap-features/imap-headers.c:320
 msgid "Custom Headers"
 msgstr "Penawdau Addasedig"
 
-#: ../plugins/imap-features/imap-headers.c:252
+#: ../plugins/imap-features/imap-headers.c:333
 msgid "IMAP Headers"
 msgstr "Penawdau IMAP"
 
@@ -16511,7 +16855,7 @@ msgid "<b>Custom Headers</b>"
 msgstr "<b>Penawdau Addasedig</b>"
 
 #: ../plugins/imap-features/imap-headers.glade.h:2
-msgid "<b>IMAP Headers </b>"
+msgid "<b>IMAP Headers</b>"
 msgstr "<b>Penawdau IMAP </b>"
 
 #: ../plugins/imap-features/imap-headers.glade.h:3
@@ -16524,12 +16868,10 @@ 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"
+"Give the extra headers that you need to fetch in addition to the above standard headers. \n"
 "You can ignore this if you choose \"All Headers\"."
 msgstr ""
-"Rhoi'r penawdau ychwanegol yr ydych chi am eu cyrchu yn ogystal â'r penawdau "
-"safonol welir uchod. \n"
+"Rhoi'r penawdau ychwanegol yr ydych chi am eu cyrchu yn ogystal â'r penawdau safonol welir uchod. \n"
 "Os ydych chi'n dewis \"Pob Pennawd\", medrwch anwybyddu hyn."
 
 #: ../plugins/imap-features/imap-headers.glade.h:7
@@ -16538,8 +16880,7 @@ msgid ""
 "The more headers you have the more time it will take to download."
 msgstr ""
 "Dewiswch eich Hoffterau Penawdau IMAP. \n"
-"Po fwyaf y nifer o benawdau sydd gennych, po hiraf fydd y broses o'u llwytho "
-"i lawr."
+"Po fwyaf y nifer o benawdau sydd gennych, po hiraf fydd y broses o'u llwytho i lawr."
 
 #: ../plugins/imap-features/imap-headers.glade.h:9
 msgid ""
@@ -16547,637 +16888,703 @@ msgid ""
 "Use this if you do not have filters based on mailing lists"
 msgstr ""
 "_Penawdau Sylfaenol - (Cyflymaf)\n"
-"Defnyddiwch hwn os nad oes gennych chi hidlyddion yn seiliedig ar restrau e-"
-"bost"
+"Defnyddiwch hwn os nad oes gennych chi hidlyddion yn seiliedig ar restrau e-bost"
 
 #: ../plugins/imap-features/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."
+msgid "Fine-tune your IMAP accounts."
+msgstr ""
 
 #: ../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"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:88
-msgid "_Import to Tasks"
-msgstr "_Mewnforio i'r Tasgau"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:206
-msgid "Import ICS"
-msgstr "Mewnforio ICS"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:233
-msgid "Select Task List"
-msgstr "Dewis Rhestr Dasgau"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:237
-msgid "Select Calendar"
-msgstr "Dewis Calendr"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:267
-#: ../shell/e-shell-importer.c:700
-msgid "_Import"
-msgstr "_Mewnforio"
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:49
+msgid "Hardware Abstraction Layer not loaded"
+msgstr ""
 
-#. 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/ipod-sync/evolution-ipod-sync.c:52
+msgid "The \"hald\" service is required but not currently running. Please enable the service and rerun this program, or contact your system administrator."
+msgstr ""
 
-#: ../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:81
+msgid "Search for an iPod failed"
+msgstr ""
 
-#: ../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."
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:84
+#, fuzzy
+msgid "Evolution could not find an iPod to synchronize with. Either the iPod is not connected to the system or it is not powered on."
 msgstr ""
 "<span weight=\"bold\" size=\"larger\">Methwyd canfod iPod</span>\n"
 "\n"
-"Methodd Evolution â chanfod iPod er mwyn cysoni. Naill ai nad yw'r iPod "
-"wedi'i gysylltu â'r system, neu nid yw wedi ei bweru."
+"Methodd Evolution â chanfod iPod er mwyn cysoni. Naill ai nad yw'r iPod wedi'i gysylltu â'r system, neu nid yw wedi ei bweru."
 
-#: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:194
+#: ../plugins/ipod-sync/ical-format.c:119
+#: ../plugins/save-calendar/ical-format.c:164
 msgid "iCalendar format (.ics)"
 msgstr "Ffurf iCalendr (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/calendar/addressbook with Apple iPod"
-msgstr "Cysoni'r dasg/calendr/llyfr cyfeiriadau a ddewiswyd gydag iPod Apple"
+msgid "Synchronize to iPod"
+msgstr "Cysoni ag iPod"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
-msgid "Synchronize to iPod"
+#, fuzzy
+msgid "Synchronize your data with your Apple iPod."
 msgstr "Cysoni ag iPod"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
 msgid "iPod Synchronization"
 msgstr "Cysoni iPod"
 
-#: ../plugins/itip-formatter/itip-formatter.c:274
-#: ../plugins/itip-formatter/itip-formatter.c:395
+#: ../plugins/itip-formatter/itip-formatter.c:482
+#: ../plugins/itip-formatter/itip-formatter.c:607
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Methu llwytho'r calendr '%s'."
 
-#: ../plugins/itip-formatter/itip-formatter.c:415
+#: ../plugins/itip-formatter/itip-formatter.c:627
 #, 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:441
+#: ../plugins/itip-formatter/itip-formatter.c:663
 #, 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:517
+#: ../plugins/itip-formatter/itip-formatter.c:753
 msgid "Unable to find any calendars"
 msgstr "Methu canfod unrhyw galendr"
 
-#: ../plugins/itip-formatter/itip-formatter.c:524
+#: ../plugins/itip-formatter/itip-formatter.c:760
 msgid "Unable to find this meeting in any calendar"
 msgstr "Methu canfod y cyfarfod hwn mewn unrhyw galendr"
 
-#: ../plugins/itip-formatter/itip-formatter.c:528
+#: ../plugins/itip-formatter/itip-formatter.c:764
 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: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:768
+#, fuzzy
+msgid "Unable to find this memo in any memo list"
+msgstr "Methu canfod y dasg hon mewn unrhyw restr dasgau"
 
-#: ../plugins/itip-formatter/itip-formatter.c:605
+#: ../plugins/itip-formatter/itip-formatter.c:839
+#, fuzzy
+msgid "Opening the calendar. Please wait.."
+msgstr "Agor calendr"
+
+#: ../plugins/itip-formatter/itip-formatter.c:842
 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:801
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 msgid "Unable to parse item"
 msgstr "Methu gramadegu eitem"
 
-#: ../plugins/itip-formatter/itip-formatter.c:859
+#: ../plugins/itip-formatter/itip-formatter.c:1111
 #, 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:871
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, 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:875
+#: ../plugins/itip-formatter/itip-formatter.c:1127
 #, 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:880
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 #, 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:885
+#: ../plugins/itip-formatter/itip-formatter.c:1137
 #, 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:979
+#: ../plugins/itip-formatter/itip-formatter.c:1231
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Trefnydd wedi tynnu'r dirprwy %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:986
+#: ../plugins/itip-formatter/itip-formatter.c:1238
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Wedi anfon neges ganslo at y mynychwr"
 
-#: ../plugins/itip-formatter/itip-formatter.c:988
+#: ../plugins/itip-formatter/itip-formatter.c:1240
 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:1073
+#: ../plugins/itip-formatter/itip-formatter.c:1348
 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:1100
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Methu diweddaru mynychwr. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1104
+#: ../plugins/itip-formatter/itip-formatter.c:1381
 msgid "Attendee status updated"
 msgstr "Statws mynychwr wedi diweddaru"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1231
+#: ../plugins/itip-formatter/itip-formatter.c:1407
+#, fuzzy
+msgid "Meeting information sent"
+msgstr "Gwybodaeth Cyfarfod"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1410
+#, fuzzy
+msgid "Task information sent"
+msgstr "Gwybodaeth Tasg"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1413
+#, fuzzy
+msgid "Memo information sent"
+msgstr "Dim Gwybodaeth"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1422
+msgid "Unable to send meeting information, the meeting does not exist"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1425
+#, fuzzy
+msgid "Unable to send task information, the task does not exist"
+msgstr "Methu canfod y dasg hon mewn unrhyw restr dasgau"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1428
+msgid "Unable to send memo information, the memo does not exist"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1496
+#: ../plugins/itip-formatter/itip-formatter.c:1507
 msgid "The calendar attached is not valid"
 msgstr "Mae'r calendr sydd wedi'i atodi yn annilys"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1232
-msgid ""
-"The message claims to contain a calendar, but the calendar is not a valid "
-"iCalendar."
-msgstr ""
-"Mae'r neges yn honni ei bod yn cynnwys calendr, ond nid yw'r calendr yn "
-"iCalendar dilys."
+#: ../plugins/itip-formatter/itip-formatter.c:1497
+#: ../plugins/itip-formatter/itip-formatter.c:1508
+msgid "The message claims to contain a calendar, but the calendar is not a valid iCalendar."
+msgstr "Mae'r neges yn honni ei bod yn cynnwys calendr, ond nid yw'r calendr yn iCalendar dilys."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1267
-#: ../plugins/itip-formatter/itip-formatter.c:1285
-#: ../plugins/itip-formatter/itip-formatter.c:1363
+#: ../plugins/itip-formatter/itip-formatter.c:1548
+#: ../plugins/itip-formatter/itip-formatter.c:1576
+#: ../plugins/itip-formatter/itip-formatter.c:1668
 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: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"
-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:1549
+#: ../plugins/itip-formatter/itip-formatter.c:1577
+#: ../plugins/itip-formatter/itip-formatter.c:1669
+msgid "The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"
+msgstr "Mae'r neges yn cynnwys calendr, ond nid yw'r calendr yn cynnwys unrhyw ddigwyddiadau, tasgau na gwybodaeth statws rhydd/prysur"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1297
+#: ../plugins/itip-formatter/itip-formatter.c:1588
 msgid "The calendar attached contains multiple items"
 msgstr "Mae'r calendr sydd wedi ei atodi yn cynnwys amryw eitemau"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1298
-msgid ""
-"To process all of these items, the file should be saved and the calendar "
-"imported"
+#: ../plugins/itip-formatter/itip-formatter.c:1589
+msgid "To process all of these items, the file should be saved and the calendar imported"
 msgstr "I brosesu'r holl eitemau, dylid cadw'r ffeil a mewnforio'r calendr"
 
+#: ../plugins/itip-formatter/itip-formatter.c:2335
+#, fuzzy
+msgid "This meeting recurs"
+msgstr "Mae'r apwyntiad yn _ail-ddigwydd"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2338
+#, fuzzy
+msgid "This task recurs"
+msgstr "Mae'r apwyntiad yn _ail-ddigwydd"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2341
+#, fuzzy
+msgid "This memo recurs"
+msgstr "Mae'r apwyntiad yn _ail-ddigwydd"
+
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2103
+#: ../plugins/itip-formatter/itip-formatter.c:2574
 msgid "_Delete message after acting"
 msgstr "_Dileu'r neges ar ôl gweithredu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2113
-#: ../plugins/itip-formatter/itip-formatter.c:2145
+#: ../plugins/itip-formatter/itip-formatter.c:2584
+#: ../plugins/itip-formatter/itip-formatter.c:2617
 msgid "Conflict Search"
 msgstr "Chwilio am Wrthdaro"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2128
+#: ../plugins/itip-formatter/itip-formatter.c:2599
 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:187 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:239
+#: ../plugins/itip-formatter/itip-view.c:191
+#: ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:304
 msgid "Today"
 msgstr "Heddiw"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:192
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "Heddiw %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:196
+#: ../plugins/itip-formatter/itip-view.c:200
 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:205
+#: ../plugins/itip-formatter/itip-view.c:209
 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:215
+#: ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "Yfory"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:220
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "Yfory %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:224
+#: ../plugins/itip-formatter/itip-view.c:228
 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:229
+#: ../plugins/itip-formatter/itip-view.c:233
 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:233
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Yfory %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:252
+#: ../plugins/itip-formatter/itip-view.c:256
 #, 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:257
+#: ../plugins/itip-formatter/itip-view.c:261
 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:261
+#: ../plugins/itip-formatter/itip-view.c:265
 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:266
+#: ../plugins/itip-formatter/itip-view.c:270
 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:270
+#: ../plugins/itip-formatter/itip-view.c:274
 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:279
+#: ../plugins/itip-formatter/itip-view.c:283
 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:285
+#: ../plugins/itip-formatter/itip-view.c:289
 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:289
+#: ../plugins/itip-formatter/itip-view.c:293
 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:294
+#: ../plugins/itip-formatter/itip-view.c:298
 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:298
+#: ../plugins/itip-formatter/itip-view.c:302
 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:304
+#: ../plugins/itip-formatter/itip-view.c:308
 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:309
+#: ../plugins/itip-formatter/itip-view.c:313
 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:313
+#: ../plugins/itip-formatter/itip-view.c:317
 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:318
+#: ../plugins/itip-formatter/itip-view.c:322
 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:322
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:527
+#, c-format
+msgid "Please respond on behalf of <b>%s</b>"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:441
+#: ../plugins/itip-formatter/itip-view.c:529
+#, c-format
+msgid "Received on behalf of <b>%s</b>"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:358
 #, 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:349
+#: ../plugins/itip-formatter/itip-view.c:360
 #, 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:354
+#: ../plugins/itip-formatter/itip-view.c:365
 #, 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:357
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
-msgstr ""
-"Mae <b>%s</b>, trwy %s am i chi fod yn bresennol yn y cyfarfod canlynol:"
+msgstr "Mae <b>%s</b>, trwy %s am i chi fod yn bresennol yn y cyfarfod canlynol:"
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../plugins/itip-formatter/itip-view.c:370
 #, 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:365
+#: ../plugins/itip-formatter/itip-view.c:376
 #, 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:367
+#: ../plugins/itip-formatter/itip-view.c:378
 #, 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:370
+#: ../plugins/itip-formatter/itip-view.c:382
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s wishes to receive the latest information for the following meeting:"
+msgstr "Mae <b>%s</b> am dderbyn y wybodaeth ddiweddaraf am y cyfarfod canlynol:"
+
+#: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
-msgstr ""
-"Mae <b>%s</b> am dderbyn y wybodaeth ddiweddaraf am y cyfarfod canlynol:"
+msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgstr "Mae <b>%s</b> am dderbyn y wybodaeth ddiweddaraf am y cyfarfod canlynol:"
+
+#: ../plugins/itip-formatter/itip-view.c:388
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s 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:373
+#: ../plugins/itip-formatter/itip-view.c:390
 #, 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:377
+#: ../plugins/itip-formatter/itip-view.c:394
 #, 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:379
+#: ../plugins/itip-formatter/itip-view.c:396
 #, 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:382
+#: ../plugins/itip-formatter/itip-view.c:400
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s has proposed the following meeting changes."
+msgstr "Mae <b>%s</b> wedi awgrymu'r newidiadau cyfarfod canlynol."
+
+#: ../plugins/itip-formatter/itip-view.c:402
 #, 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:386
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
-msgstr ""
-"Mae <b>%s</b>, trwy %s wedi gwrthod y newidiadau canlynol i'r cyfarfod:"
+msgstr "Mae <b>%s</b>, trwy %s wedi gwrthod y newidiadau canlynol i'r cyfarfod:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:408
 #, 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:415
+#: ../plugins/itip-formatter/itip-view.c:446
 #, 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:417
+#: ../plugins/itip-formatter/itip-view.c:448
 #, 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:422
+#: ../plugins/itip-formatter/itip-view.c:453
 #, 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:425
+#: ../plugins/itip-formatter/itip-view.c:456
 #, 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:427
+#: ../plugins/itip-formatter/itip-view.c:458
 #, 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:433
+#: ../plugins/itip-formatter/itip-view.c:464
 #, 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:435
+#: ../plugins/itip-formatter/itip-view.c:466
 #, 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:438
+#: ../plugins/itip-formatter/itip-view.c:470
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s wishes to receive the latest information for the following assigned task:"
+msgstr "Mae <b>%s</b> am dderbyn y wybodaeth ddiweddaraf am y dasg ganlynol sydd wedi ei neilltuo:"
+
+#: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following "
-"assigned task:"
-msgstr ""
-"Mae <b>%s</b> am dderbyn y wybodaeth ddiweddaraf am y dasg ganlynol sydd "
-"wedi ei neilltuo:"
+msgid "<b>%s</b> wishes to receive the latest information for the following assigned task:"
+msgstr "Mae <b>%s</b> am dderbyn y wybodaeth ddiweddaraf am y dasg ganlynol sydd wedi ei neilltuo:"
 
-#: ../plugins/itip-formatter/itip-view.c:441
+#: ../plugins/itip-formatter/itip-view.c:476
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s has sent back the following assigned task response:"
+msgstr "Mae <b>%s</b> wedi anfon yn ôl yr ateb canlynol i dasg gafodd ei neilltuo:"
+
+#: ../plugins/itip-formatter/itip-view.c:478
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
-msgstr ""
-"Mae <b>%s</b> wedi anfon yn ôl yr ateb canlynol i dasg gafodd ei neilltuo:"
+msgstr "Mae <b>%s</b> wedi anfon yn ôl yr ateb canlynol i dasg gafodd ei neilltuo:"
 
-#: ../plugins/itip-formatter/itip-view.c:445
+#: ../plugins/itip-formatter/itip-view.c:482
 #, 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:447
+#: ../plugins/itip-formatter/itip-view.c:484
 #, 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:450
+#: ../plugins/itip-formatter/itip-view.c:488
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
+msgstr "Mae <b>%s</b> yn cynnig y newidiadau canlynol i dasgau gafodd eu neilltuo:"
+
+#: ../plugins/itip-formatter/itip-view.c:490
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
-msgstr ""
-"Mae <b>%s</b> yn cynnig y newidiadau canlynol i dasgau gafodd eu neilltuo:"
+msgstr "Mae <b>%s</b> yn cynnig y newidiadau canlynol i dasgau gafodd eu neilltuo:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
-msgstr ""
-"Mae <b>%s</b>, drwy %s, wedi gwrthod y dasg ganlynol gafodd ei neilltuo:"
+msgstr "Mae <b>%s</b>, drwy %s, wedi gwrthod y dasg ganlynol gafodd ei neilltuo:"
 
-#: ../plugins/itip-formatter/itip-view.c:456
+#: ../plugins/itip-formatter/itip-view.c:496
 #, 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:483
+#: ../plugins/itip-formatter/itip-view.c:534
 #, 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:485
+#: ../plugins/itip-formatter/itip-view.c:536
 #, 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:490
+#: ../plugins/itip-formatter/itip-view.c:541
 #, 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:492
+#: ../plugins/itip-formatter/itip-view.c:543
 #, 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:496
+#: ../plugins/itip-formatter/itip-view.c:547
 #, 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:498
+#: ../plugins/itip-formatter/itip-view.c:549
 #, 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:762
+#: ../plugins/itip-formatter/itip-view.c:823
 msgid "_Open Calendar"
 msgstr "_Agor calendr"
 
-#: ../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
+#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:839
+#: ../plugins/itip-formatter/itip-view.c:856
+#: ../plugins/itip-formatter/itip-view.c:861
 msgid "_Decline"
 msgstr "_Gwrthod"
 
-#: ../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
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:863
 msgid "_Accept"
 msgstr "_Derbyn"
 
-#: ../plugins/itip-formatter/itip-view.c:772
+#: ../plugins/itip-formatter/itip-view.c:833
 msgid "_Decline all"
 msgstr "Gwrthod y _cyfan"
 
-#: ../plugins/itip-formatter/itip-view.c:773
+#: ../plugins/itip-formatter/itip-view.c:834
 msgid "_Tentative all"
 msgstr "_Pawb, I'w gadarnhau"
 
-#: ../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
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:862
 msgid "_Tentative"
 msgstr "_I'w gadarnhau"
 
-#: ../plugins/itip-formatter/itip-view.c:774
+#: ../plugins/itip-formatter/itip-view.c:835
 msgid "_Accept all"
 msgstr "Derbyn y _cyfan"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:785
+#: ../plugins/itip-formatter/itip-view.c:846
 msgid "_Send Information"
 msgstr "Anfon _Gwybodaeth"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:789
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Update Attendee Status"
 msgstr "_Diweddaru cyflwr mynychwr"
 
-#: ../plugins/itip-formatter/itip-view.c:792
+#: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Update"
 msgstr "_Diweddaru"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:951
+#: ../plugins/itip-formatter/itip-view.c:1033
 msgid "Start time:"
 msgstr "Amser cychwyn:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:960
+#: ../plugins/itip-formatter/itip-view.c:1044
 msgid "End time:"
 msgstr "Amser gorffen:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:976
-#: ../plugins/itip-formatter/itip-view.c:1026
+#: ../plugins/itip-formatter/itip-view.c:1064
+#: ../plugins/itip-formatter/itip-view.c:1118
 msgid "Comment:"
 msgstr "Sylw:"
 
-#: ../plugins/itip-formatter/itip-view.c:1040
-msgid "Send u_pdates to attendees"
+#: ../plugins/itip-formatter/itip-view.c:1103
+msgid "Send _reply to sender"
+msgstr "Danfon _ateb i'r danfonwr"
+
+#: ../plugins/itip-formatter/itip-view.c:1133
+#, fuzzy
+msgid "Send _updates to attendees"
 msgstr "Anfon _diweddariadau at y mynychwyr"
 
-#: ../plugins/itip-formatter/itip-view.c:1049
-msgid "A_pply to all instances"
+#: ../plugins/itip-formatter/itip-view.c:1142
+#, fuzzy
+msgid "_Apply to all instances"
 msgstr "_Defnyddio ym mhob achos"
 
-#: ../plugins/itip-formatter/itip-view.c:1718
-msgid "_Tasks :"
-msgstr "_Tasgau :"
+#: ../plugins/itip-formatter/itip-view.c:1151
+msgid "Show time as _free"
+msgstr "Dangos yr amser fel _rhydd"
+
+#: ../plugins/itip-formatter/itip-view.c:1154
+msgid "_Preserve my reminder"
+msgstr ""
+
+#. To Translators: This is a check box to inherit a reminder.
+#: ../plugins/itip-formatter/itip-view.c:1160
+#, fuzzy
+msgid "_Inherit reminder"
+msgstr "Dangos _Atgof"
 
-#: ../plugins/itip-formatter/itip-view.c:1720
-msgid "Memos :"
-msgstr "Memos :"
+#: ../plugins/itip-formatter/itip-view.c:1914
+msgid "_Memos:"
+msgstr "_Memos:"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Displays text/calendar parts in messages."
+#, fuzzy
+msgid "Display \"text/calendar\" MIME parts in mail messages."
 msgstr "Dangos rhannau testun/calendr o fewn negeseuon."
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
@@ -17185,119 +17592,266 @@ msgid "Itip Formatter"
 msgstr "Fformatydd Itip"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid ""
-"&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
-msgstr ""
-"Mae &quot;{0}&quot; wedi dirprwyo'r cyfarfod. Ydych chi am ychwanegu'r "
-"dirprwy &quot;{1}&quot;?"
+msgid "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate &quot;{1}&quot;?"
+msgstr "Mae &quot;{0}&quot; wedi dirprwyo'r cyfarfod. Ydych chi am ychwanegu'r dirprwy &quot;{1}&quot;?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid "This meeting has been delegated"
 msgstr "Mae'r cyfarfod hwn wedi ei ddirprwyo"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
-msgid ""
-"This response is not from a current attendee. Add the sender as an attendee?"
-msgstr ""
-"Dyw'r ymateb ddim oddi wrth rywun sy'n mynychu'r cyfarfod ar hyn o bryd.  "
-"Ychwanegu'r person fel mynychwr?"
+msgid "This response is not from a current attendee. Add the sender as an attendee?"
+msgstr "Dyw'r ymateb ddim oddi wrth rywun sy'n mynychu'r cyfarfod ar hyn o bryd.  Ychwanegu'r person fel mynychwr?"
 
-#: ../plugins/mail-account-disable/mail-account-disable.c:47
+#: ../plugins/mail-account-disable/mail-account-disable.c:46
 msgid "Proxy _Logout"
 msgstr "_Allgofnodi o'r Dirprwy"
 
 #: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
-msgid "Allows disabling of accounts."
-msgstr "Caniatáu i gyfrifon gael eu hanalluogi."
-
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
 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-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
+msgid "Disable an account by right-clicking on it in the folder tree."
+msgstr ""
 
-#: ../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/apps-evolution-mail-notification.schemas.in.h:1
+#, fuzzy
+msgid "Beep or play sound file."
+msgstr "Dewis ffeil sain"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
+msgid "Blink icon in notification area."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
+msgid "Enable D-Bus messages."
+msgstr "Galluogi negeseuon D-Bus"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
+msgid "Enable icon in notification area."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+#, fuzzy
+msgid "Generates a D-Bus message when new mail messages arrive."
+msgstr "Creu neges D-BUS newydd pan fo e-bost newydd yn cyrraedd."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+msgid "If \"true\", then beep, otherwise will play sound file when new messages arrive."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+msgid "Notify new messages for Inbox only."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+#, fuzzy
+msgid "Play sound when new messages arrive."
+msgstr "Chwarae ffeil sain pan fo e-bost newydd yn _cyrraedd"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+msgid "Popup message together with the icon."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#, fuzzy
+msgid "Show new mail icon in notification area when new messages arrive."
+msgstr "Hysbysu'r defnyddiwr gydag eicon yn y gilfach, a neges hysbysu pan fo neges newydd yn cyrraedd."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#, fuzzy
+msgid "Sound file name to be played."
+msgstr "Dim enw ffeil wedi ei roi."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#, fuzzy
+msgid "Sound file to be played when new messages arrive, if not in beep mode."
+msgstr "Ffeil sain i'w chwarae pan fo e-bost newydd yn cyrraedd."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#, fuzzy
+msgid "Whether play sound or beep when new messages arrive."
+msgstr "Chwarae ffeil sain pan fo e-bost newydd yn _cyrraedd"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+msgid "Whether show message over the icon when new messages arrive."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+#, fuzzy
+msgid "Whether the icon should blink or not."
+msgstr "A ddylai'r bar ochr fod yn weladwy."
 
-#: ../plugins/mail-notification/mail-notification.c:130
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+msgid "Whether to notify new messages in Inbox folder only."
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:245
+msgid "Generate a _D-Bus message"
+msgstr "Creu neges _D-Bus"
+
+#: ../plugins/mail-notification/mail-notification.c:368
+msgid "Evolution's Mail Notification"
+msgstr "Hysbysiad E-bost Evolution"
+
+#: ../plugins/mail-notification/mail-notification.c:389
+#, fuzzy
+msgid "Mail Notification Properties"
+msgstr "Hysbysiad E-bost Newydd"
+
+#. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
+#: ../plugins/mail-notification/mail-notification.c:468
+#, fuzzy, c-format
+msgid ""
+"You have received %d new message\n"
+"in %s."
+msgid_plural ""
+"You have received %d new messages\n"
+"in %s."
+msgstr[0] "Rydych chi wedi derbyn %d neges newydd yn %s."
+msgstr[1] "Rydych chi wedi derbyn %d neges newydd yn %s."
+msgstr[2] "Rydych chi wedi derbyn %d neges newydd yn %s."
+
+#: ../plugins/mail-notification/mail-notification.c:473
+#, fuzzy, c-format
+msgid "You have received %d new message."
+msgid_plural "You have received %d new messages."
+msgstr[0] "Rydych chi wedi derbyn %d neges newydd yn %s."
+msgstr[1] "Rydych chi wedi derbyn %d neges newydd yn %s."
+msgstr[2] "Rydych chi wedi derbyn %d neges newydd yn %s."
+
+#: ../plugins/mail-notification/mail-notification.c:490
+#: ../plugins/mail-notification/mail-notification.c:495
 msgid "New email"
 msgstr "E-bost newydd"
 
+#: ../plugins/mail-notification/mail-notification.c:555
+#, fuzzy
+msgid "Show icon in _notification area"
+msgstr "Gweld larymau dangos yn y gilfach hysbysu"
+
+#: ../plugins/mail-notification/mail-notification.c:558
+#, fuzzy
+msgid "B_link icon in notification area"
+msgstr "_Addasu neges hysbysu"
+
+#: ../plugins/mail-notification/mail-notification.c:560
+msgid "Popup _message together with the icon"
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:741
+#, fuzzy
+msgid "_Play sound when new messages arrive"
+msgstr "Chwarae ffeil sain pan fo e-bost newydd yn _cyrraedd"
+
+#: ../plugins/mail-notification/mail-notification.c:747
+msgid "_Beep"
+msgstr "_Bîp"
+
+#: ../plugins/mail-notification/mail-notification.c:748
+msgid "Play _sound file"
+msgstr "Chwarae ffeil _sain"
+
+#: ../plugins/mail-notification/mail-notification.c:759
+msgid "Specify _filename:"
+msgstr "Penodwch enw _ffeil"
+
+#: ../plugins/mail-notification/mail-notification.c:760
+msgid "Select sound file"
+msgstr "Dewis ffeil sain"
+
+#: ../plugins/mail-notification/mail-notification.c:761
+msgid "Pl_ay"
+msgstr "_Chwarae"
+
+#: ../plugins/mail-notification/mail-notification.c:818
+msgid "Notify new messages for _Inbox only"
+msgstr ""
+
 #: ../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."
+#, fuzzy
+msgid "Notifies you when new mail messages arrive."
+msgstr "Ffeil sain i'w chwarae pan fo e-bost newydd yn cyrraedd."
 
-#: ../plugins/mail-remote/client.c:30
+#: ../plugins/mail-to-task/mail-to-task.c:343
 #, c-format
-msgid "System error: %s"
-msgstr "Gwall system: %s"
+msgid "Cannot open calendar. %s"
+msgstr "Ni ellir agor calendr. %s"
 
-#: ../plugins/mail-remote/client.c:32
-#, c-format
-msgid "Camel error: %s"
-msgstr "Gwall camel: %s"
+#: ../plugins/mail-to-task/mail-to-task.c:350
+msgid "Selected source is read only, thus cannot create event there. Select other source, please."
+msgstr ""
 
-#: ../plugins/mail-remote/evolution-mail-store.c:476
-msgid "Account cannot send e-mail"
-msgstr "Cyfrif yn methu anfon e-bost"
+#: ../plugins/mail-to-task/mail-to-task.c:353
+msgid "Selected source is read only, thus cannot create task there. Select other source, please."
+msgstr ""
 
-#: ../plugins/mail-remote/evolution-mail-store.c:605
-msgid "No store available"
-msgstr "Dim storfa ar gael"
+#: ../plugins/mail-to-task/mail-to-task.c:356
+msgid "Selected source is read only, thus cannot create memo there. Select other source, please."
+msgstr ""
 
-#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
-msgid ""
-"A plugin which implements a CORBA interface for accessing mail data remotely."
-msgstr "Ategyn sy'n rhoi rhyngwyneb CORBA er mwyn cyrchu e-bost o bell."
+#: ../plugins/mail-to-task/mail-to-task.c:455
+#, fuzzy, c-format
+msgid "Could not create object. %s"
+msgstr "Methwyd diweddaru'r gwrthrych"
 
-#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:2
-msgid "Mail Remote"
-msgstr "E-bost Pell"
+#: ../plugins/mail-to-task/mail-to-task.c:555
+#, fuzzy, c-format
+msgid "Cannot get source list. %s"
+msgstr ""
+"Methu creu ffeil allbwn: %s\n"
+" %s"
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
-msgid ""
-"A plugin which allows the creation of meetings from the contents of a mail "
-"message."
-msgstr "Ategyn sy'n caniatáu creu cyfarfod o gynnwys neges e-bost."
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+#, fuzzy
+msgid "Convert a mail message to a task."
+msgstr "Trosi'r neges a ddewiswyd yn dasg newydd"
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
-msgid "Con_vert to Meeting"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:5
+msgid "Convert to a Mem_o"
+msgstr "Trosi i Mem_o"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:6
+msgid "Convert to a _Meeting"
 msgstr "Trosi'n _Gyfarfod"
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
-msgid "Mail to meeting"
-msgstr "E-bost at y cyfarfod"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:4
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:7
+msgid "Convert to a _Task"
+msgstr "_Trosi i Dasg"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
-msgid ""
-"A plugin which allows the creation of tasks from the contents of a mail "
-"message."
-msgstr "Ategyn sy'n caniatáu creu tasgau o gynnwys neges e-bost."
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:5
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:8
+msgid "Convert to an _Event"
+msgstr "Trosi'n _Ddigwyddiad"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
-msgid "Con_vert to Task"
-msgstr "_Trosi i Dasg"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:6
+msgid "Mail-to-Task"
+msgstr "Ebost-i-Dasg"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
-msgid "Mail to task"
-msgstr "E-bost at y dasg"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
+#, fuzzy
+msgid "Convert the selected message to a new event"
+msgstr "Trosi'r neges a ddewiswyd yn dasg newydd"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
+#, fuzzy
+msgid "Convert the selected message to a new meeting"
+msgstr "Trosi'r neges a ddewiswyd yn dasg newydd"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:3
+#, fuzzy
+msgid "Convert the selected message to a new memo"
+msgstr "Trosi'r neges a ddewiswyd yn dasg newydd"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:4
 msgid "Convert the selected message to a new task"
 msgstr "Trosi'r neges a ddewiswyd yn dasg newydd"
 
@@ -17323,11 +17877,9 @@ msgid "Mailing _List"
 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...)."
-msgstr ""
-"Darparu gweithredoedd cyffredin i restrau e-bost (tanysgrifio, dad-"
-"danysgrifio...)."
+#, fuzzy
+msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
+msgstr "Darparu gweithredoedd cyffredin i restrau e-bost (tanysgrifio, dad-danysgrifio...)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
 msgid "_Post message to list"
@@ -17347,14 +17899,11 @@ msgstr "Gweithred ddim ar gael"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
-"An e-mail message will be sent to the URL \"{0}\". You can either send the "
-"message automatically, or see and change it first.\n"
+"An e-mail message will be sent to the URL \"{0}\". You can either send the message automatically, or see and change it first.\n"
 "\n"
-"You should receive an answer from the mailing list shortly after the message "
-"has been sent."
+"You should receive an answer from the mailing list shortly after the message has been sent."
 msgstr ""
-"Fe anfonir neges e-bost at y LAU \"{0}\". Gallwch naill ai anfon y neges yn "
-"awtomatig, neu ei weld a'i newid gyntaf.\n"
+"Fe anfonir neges e-bost at y LAU \"{0}\". Gallwch naill ai anfon y neges yn awtomatig, neu ei weld a'i newid gyntaf.\n"
 "\n"
 "Dylech dderbyn ateb oddi wrth y rhestr e-bost yn fuan ar ôl anfon y neges."
 
@@ -17371,26 +17920,21 @@ msgid "Posting not allowed"
 msgstr "Postio heb ei ganiatáu"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
-msgid ""
-"Posting to this mailing list is not allowed. Possibly, this is a read-only "
-"mailing list. Contact the list owner for details."
-msgstr ""
-"Ni chaniateir postio at y rhestr e-bost hon. Mae'n bosib mai rhestr ddarllen-"
-"yn-unig yw hi. Cysylltwch â pherchennog y rhestr am fanylion."
+msgid "Posting to this mailing list is not allowed. Possibly, this is a read-only mailing list. Contact the list owner for details."
+msgstr "Ni chaniateir postio at y rhestr e-bost hon. Mae'n bosib mai rhestr ddarllen-yn-unig yw hi. Cysylltwch â pherchennog y rhestr am fanylion."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "Send e-mail message to mailing list?"
 msgstr "Anfon neges e-bost i restr drafod?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
+#, fuzzy
 msgid ""
-"The action could not be performed. This means the header for this action did "
-"not contain any action we could handle.\n"
+"The action could not be performed. The header for this action did not contain any action that could be processed.\n"
 "\n"
 "Header: {0}"
 msgstr ""
-"Methwyd perfformio'r weithredu. Mae hyn yn golygu na fedrwyd delio ag unrhyw "
-"beth o fewn pennawd y weithred.\n"
+"Methwyd perfformio'r weithredu. Mae hyn yn golygu na fedrwyd delio ag unrhyw beth o fewn pennawd y weithred.\n"
 "\n"
 "Pennawd: {0}"
 
@@ -17405,12 +17949,8 @@ msgstr ""
 "Pennawd: {1}"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
-msgid ""
-"This message does not contain the header information required for this "
-"action."
-msgstr ""
-"Nid yw'r neges yn cynnwys y wybodaeth penawdau sydd angen ar gyfer y "
-"weithred."
+msgid "This message does not contain the header information required for this action."
+msgstr "Nid yw'r neges yn cynnwys y wybodaeth penawdau sydd angen ar gyfer y weithred."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
 msgid "_Edit message"
@@ -17468,6 +18008,25 @@ msgstr "_Tanysgrifio â'r rhestr"
 msgid "_Unsubscribe from List"
 msgstr "Dad-danysgrifio o'r rhestr"
 
+#: ../plugins/mark-all-read/mark-all-read.c:39
+#, fuzzy
+msgid "Also mark messages in subfolders?"
+msgstr "Marcio bob neges yn yr isblygellau fel rhai wedi'u darllen?"
+
+#: ../plugins/mark-all-read/mark-all-read.c:41
+#, fuzzy
+msgid "Do you want to mark messages as read in the current folder only, or in the current folder as well as all subfolders?"
+msgstr "Marcio bob neges yn y blygell a ddewiswyd, a'r is-blygellau, fel rhai wedi'u darllen."
+
+#: ../plugins/mark-all-read/mark-all-read.c:164
+#, fuzzy
+msgid "Current Folder and _Subfolders"
+msgstr "Creu is-ffolderi"
+
+#: ../plugins/mark-all-read/mark-all-read.c:176
+msgid "Current _Folder Only"
+msgstr "_Plygell Bresennol Yn Unig"
+
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "Marcio'r Cyfan Wedi Darllen"
@@ -17477,49 +18036,26 @@ msgid "Mark Me_ssages as Read"
 msgstr "Marcio n_egeseuon fel rhai wedi eu darllen"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
-msgid "Used for marking all the messages under a folder as read"
-msgstr ""
-"Defnyddir er mwyn marcio bob neges o dan blygell fel rhai wedi'u darllen"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
-msgid "Mark calendar offline"
-msgstr "Marcio'r calendr yn un all-lein"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
-msgid "Marks the selected calendar for offline viewing."
-msgstr "Marcio'r calendr a ddewiswyd er mwyn ei weld all-lein."
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
-msgid "_Do not make this available offline"
-msgstr "_Peidio â gwneud hwn ar gael all-lein"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
-msgid "_Mark Calendar for offline use"
-msgstr "_Marcio'r Calendr at ddefnydd all-lein"
+#, fuzzy
+msgid "Mark all messages in a folder as read."
+msgstr "Marcio bob neges yn yr isblygellau fel rhai wedi'u darllen?"
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
-msgid "A plugin which implements mono plugins."
-msgstr "Ategyn sy'n galluogi ategion mono."
-
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
 msgid "Mono Loader"
 msgstr "Llwythwr Mono"
 
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:1
-msgid "Generates a D-BUS message when new mail arrives."
-msgstr "Creu neges D-BUS newydd pan fo e-bost newydd yn cyrraedd."
-
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:2
-msgid "New Mail Notification"
-msgstr "Hysbysiad E-bost Newydd"
+#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
+msgid "Support plugins written in Mono."
+msgstr ""
 
 #: ../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."
+#, fuzzy
+msgid "Manage your Evolution plugins."
+msgstr "Newidiwch Osodiadau Evolution"
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:202
+#: ../plugins/plugin-manager/plugin-manager.c:252
 msgid "Plugin Manager"
 msgstr "Rheolwr Ategion"
 
@@ -17531,109 +18067,156 @@ msgstr "Galluogi ac analluogi ategion"
 msgid "_Plugins"
 msgstr "_Ategion"
 
-#: ../plugins/plugin-manager/plugin-manager.c:53
+#: ../plugins/plugin-manager/plugin-manager.c:58
 msgid "Author(s)"
 msgstr "Awdur(on)"
 
-#: ../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:146
+#, fuzzy
+msgid "Configuration"
+msgstr "Cyfluniad Ebost"
 
-#: ../plugins/plugin-manager/plugin-manager.c:215
+#: ../plugins/plugin-manager/plugin-manager.c:265
 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:268
-#: ../plugins/plugin-manager/plugin-manager.c:327
+#: ../plugins/plugin-manager/plugin-manager.c:291
+#, fuzzy
+msgid "Overview"
+msgstr "Adolygu"
+
+#: ../plugins/plugin-manager/plugin-manager.c:362
+#: ../plugins/plugin-manager/plugin-manager.c:424
 msgid "Plugin"
 msgstr "Ategyn"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
-msgid ""
-"A test plugin which demonstrates a formatter plugin which lets you choose to "
-"disable HTML messages.\n"
-"\n"
-"This plugin is unsupported demonstration code only.\n"
-msgstr ""
-"Ategyn prawf sy'n arddangos ategyn fformadu sy'n gadael i chi wrthod e-bost "
-"HTML.\n"
-"\n"
-"Cod arddangos, heb ei gynnal, sydd yn yr ategyn hwn.\n"
-
 #. but then we also need to create our own section frame
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 msgid "Plain Text Mode"
 msgstr "Modd Testun Plaen"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
-msgid "Prefer plain-text"
-msgstr "Testun plaen yn well"
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
+msgid "Prefer Plain Text"
+msgstr "Testun Plaen Yn Well"
+
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4
+msgid "View mail messages as plain text, even if they contain HTML content."
+msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:105
+#: ../plugins/prefer-plain/prefer-plain.c:189
 msgid "Show HTML if present"
 msgstr "Dangos HTML os yw'n bresennol"
 
-#: ../plugins/prefer-plain/prefer-plain.c:106
+#: ../plugins/prefer-plain/prefer-plain.c:190
 msgid "Prefer PLAIN"
 msgstr "PLAEN os yn bosib"
 
-#: ../plugins/prefer-plain/prefer-plain.c:107
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Only ever show PLAIN"
 msgstr "Dangos PLAEN o hyd"
 
-#: ../plugins/prefer-plain/prefer-plain.c:150
-msgid "HTML Mode"
-msgstr "Modd HTML"
-
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
-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
-#: ../ui/evolution-tasks.xml.h:15
-msgid "Print Pre_view"
-msgstr "_Rhagolwg Argraffu"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:2
-msgid "Prints the message"
-msgstr "Argraffu'r neges"
+#: ../plugins/prefer-plain/prefer-plain.c:234
+msgid "HTML _Mode"
+msgstr "_Modd HTML"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
 msgid "Evolution Profiler"
 msgstr "Proffilydd Evolution"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
-msgid "Writes a log of profiling data events."
-msgstr "Mae'n ysgrifennu log o ddata proffilio."
+msgid "Profile data events in Evolution (for developers only)."
+msgstr ""
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-msgid "Allows calendars to be published to the web"
-msgstr "Caniatáu i galendrau gael eu cyhoeddi ar y we"
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
+#, fuzzy
+msgid "Import Outlook messages from PST file"
+msgstr "Mewnforio e-bost o Pine."
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+#, fuzzy
+msgid "Outlook PST import"
+msgstr "Mewnforiwr CSV a Tab Outlook"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+msgid "Outlook personal folders (.pst)"
+msgstr ""
+
+#. Address book
+#: ../plugins/pst-import/pst-importer.c:316
+#, fuzzy
+msgid "_Address Book"
+msgstr "Llyfr Cyfeiriadau"
+
+#. Appointments
+#: ../plugins/pst-import/pst-importer.c:323
+#, fuzzy
+msgid "A_ppointments"
+msgstr "Apwyntiadau"
+
+#. Journal
+#: ../plugins/pst-import/pst-importer.c:335
+#, fuzzy
+msgid "_Journal entries"
+msgstr "Cofnod dyddlyfr - %s"
+
+#: ../plugins/pst-import/pst-importer.c:350
+#, fuzzy
+msgid "Importing Outlook data"
+msgstr "Mewnforio data Elm"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 msgid "Calendar Publishing"
 msgstr "Cyhoeddi Calendr"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Locations"
 msgstr "Lleoliadau"
 
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#, fuzzy
+msgid "Publish calendars to the web."
+msgstr "Caniatáu i galendrau gael eu cyhoeddi ar y we"
+
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
 msgid "_Publish Calendar Information"
 msgstr "_Cyhoeddi Gwybodaeth Galendr"
 
-#: ../plugins/publish-calendar/publish-calendar.c:399
-msgid "Are you sure you want to remove this URL?"
+#: ../plugins/publish-calendar/publish-calendar.c:95
+#: ../plugins/publish-calendar/publish-calendar.c:337
+#, c-format
+msgid "Could not open %s:"
+msgstr "Methwyd agor %s:"
+
+#: ../plugins/publish-calendar/publish-calendar.c:97
+#, c-format
+msgid "Could not open %s: Unknown error"
+msgstr "Methwyd agor %s: Gwall anhysbys"
+
+#: ../plugins/publish-calendar/publish-calendar.c:117
+#, c-format
+msgid "There was an error while publishing to %s:"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.c:119
+#, c-format
+msgid "Publishing to %s finished successfully"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.c:164
+#, c-format
+msgid "Mount of %s failed:"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.c:620
+#, fuzzy
+msgid "Are you sure you want to remove this location?"
 msgstr "Ydych chi'n siŵr eich bod am dynnu'r LAU yma?"
 
+#: ../plugins/publish-calendar/publish-calendar.c:784
+#, fuzzy
+msgid "Could not create publish thread."
+msgstr "Methu creu neges."
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
 msgid "<span weight=\"bold\">Location</span>"
 msgstr "<span weight=\"bold\">Lleoliad</span>"
@@ -17652,6 +18235,10 @@ msgstr ""
 "Wythnosol\n"
 "Ã? llaw (drwy'r ddewislen Gweithredoedd)"
 
+#: ../plugins/publish-calendar/publish-calendar.glade.h:9
+msgid "E_nable"
+msgstr "_Galluogi"
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:10
 msgid "P_ort:"
 msgstr "_Porth:"
@@ -17665,8 +18252,9 @@ msgid "Publishing _Frequency:"
 msgstr "_Amlder Cyhoeddi:"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:13
+#, fuzzy
 msgid ""
-"SSH\n"
+"Secure FTP (SSH)\n"
 "Public FTP\n"
 "FTP (with login)\n"
 "Windows share\n"
@@ -17686,27 +18274,42 @@ msgstr ""
 msgid "Service _type:"
 msgstr "_Math o wasanaeth:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#, fuzzy
+msgid "Time _duration:"
+msgstr "_Cylchfa amser:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_File:"
 msgstr "_Ffeil:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+#: ../plugins/publish-calendar/publish-calendar.glade.h:24
 msgid "_Password:"
 msgstr "_Cyfrinair:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
 msgid "_Publish as:"
 msgstr "_Cyhoeddi fel:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Remember password"
 msgstr "_Cofio'r cyfrinair"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid "_Username:"
 msgstr "_Enw Defnyddiwr:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+#: ../plugins/publish-calendar/publish-calendar.glade.h:29
+msgid ""
+"days\n"
+"weeks\n"
+"months"
+msgstr ""
+"dyddiau\n"
+"wythnosau\n"
+"misoedd"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:32
 msgid ""
 "iCal\n"
 "Free/Busy"
@@ -17714,138 +18317,177 @@ msgstr ""
 "iCal\n"
 "Rhydd/Prysur"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:108
-msgid "SpamAssassin (built-in)"
-msgstr "SpamAssassin (yn fewnol)"
+#: ../plugins/publish-calendar/publish-format-fb.c:69
+#: ../plugins/publish-calendar/publish-format-ical.c:82
+#, c-format
+msgid "Could not publish calendar: Calendar backend no longer exists"
+msgstr ""
 
-#: ../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/publish-calendar/url-editor-dialog.c:481
+msgid "New Location"
+msgstr "Lleoliad Newydd"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:854
-msgid "I_nclude remote tests"
-msgstr "Cynnwys profion pell"
+#: ../plugins/publish-calendar/url-editor-dialog.c:483
+msgid "Edit Location"
+msgstr "Golygu Lleoliad"
 
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid ""
-"Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
-"to be installed."
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr "Helo Python"
+
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
 msgstr ""
-"Hidlo negeseuon sothach drwy SpamAssassin. Rhaid i SpamAssassin gael ei osod "
-"cyn i'r ategyn hwn weithio."
 
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin junk plugin"
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr ""
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr ""
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
+msgid "A plugin which loads other plugins written using Python."
+msgstr ""
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
+msgid "Python Loader"
+msgstr "Llwythwr Python"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
+#, fuzzy, c-format
+msgid "SpamAssassin not found, code: %d"
 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."
-msgstr "Ategyn i gadw pob atodiad neu ran o neges ar unwaith."
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#, fuzzy, c-format
+msgid "Failed to create pipe: %s"
+msgstr "Methu creu storfa e-bost lleol `%s': %s"
 
-#. 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/sa-junk-plugin/em-junk-filter.c:181
+#, c-format
+msgid "Error after fork: %s"
+msgstr "Gwall ar ôl fforch: %s"
 
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
-msgid "Save Attachments..."
-msgstr "Cadw Atodiadau..."
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
+#, c-format
+msgid "SpamAssassin child process does not respond, killing..."
+msgstr ""
 
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
-msgid "Save all attachments"
-msgstr "Cadw pob atodiad"
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
+#, c-format
+msgid "Wait for SpamAssassin child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
+#, c-format
+msgid "Pipe to SpamAssassin failed, error code: %d"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:509
+#, fuzzy, c-format
+msgid "SpamAssassin is not available."
+msgstr "Opsiynau anfon ddim ar gael."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:906
+#, fuzzy
+msgid "This will make SpamAssassin more reliable, but slower"
+msgstr "Bydd hyn yn gwneud SpamAssassin yn fwy dibynnol, ond yn arafach"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:912
+msgid "I_nclude remote tests"
+msgstr "Cynnwys profion pell"
 
-#: ../plugins/save-attachments/save-attachments.c:336
-msgid "Select save base name"
-msgstr "Dewiswch enw bôn cadw"
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
+#, fuzzy
+msgid "Filter junk messages using SpamAssassin."
+msgstr "Hidlo negeseuon sothach drwy SpamAssassin. Rhaid i SpamAssassin gael ei osod cyn i'r ategyn hwn weithio."
 
-#: ../plugins/save-attachments/save-attachments.c:355
-msgid "MIME Type"
-msgstr "Math MIME"
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
+#, fuzzy
+msgid "SpamAssassin Junk Filter"
+msgstr "Ategyn sothach SpamAssassin"
 
-#: ../plugins/save-attachments/save-attachments.c:363
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:25
-msgid "Save"
-msgstr "Cadw"
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
+#, fuzzy
+msgid "SpamAssassin Options"
+msgstr "SpamAssassin (yn fewnol)"
 
 #.
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:171
+#: ../plugins/save-calendar/csv-format.c:160
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:356
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:358
 msgid "Description List"
 msgstr "Rhestr Ddisgrifiadau"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:359
 msgid "Categories List"
 msgstr "Rhestr Gategorïau"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "Comment List"
 msgstr "Rhestr Sylwadau"
 
-#: ../plugins/save-calendar/csv-format.c:391
-msgid "Created"
-msgstr "Crëwyd"
-
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Contact List"
 msgstr "Rhestr Gysylltiadau"
 
-#: ../plugins/save-calendar/csv-format.c:393
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Start"
 msgstr "Cychwyn"
 
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "End"
 msgstr "Gorffen"
 
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "percent Done"
 msgstr "canran wedi'i Gwblhau"
 
-#: ../plugins/save-calendar/csv-format.c:398
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "URL"
 msgstr "LAU"
 
-#: ../plugins/save-calendar/csv-format.c:399
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Attendees List"
 msgstr "Rhestr Mynychwyr"
 
-#: ../plugins/save-calendar/csv-format.c:401
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Modified"
 msgstr "Newidiwyd"
 
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:523
 msgid "Advanced options for the CSV format"
 msgstr "Opsiynau estynedig ar gyfer y ffurf CSV"
 
-#: ../plugins/save-calendar/csv-format.c:559
+#: ../plugins/save-calendar/csv-format.c:530
 msgid "Prepend a header"
 msgstr "Rhoi pennyn ar y blaen"
 
-#: ../plugins/save-calendar/csv-format.c:568
+#: ../plugins/save-calendar/csv-format.c:539
 msgid "Value delimiter:"
 msgstr "Gwahanydd gwerth:"
 
-#: ../plugins/save-calendar/csv-format.c:574
+#: ../plugins/save-calendar/csv-format.c:545
 msgid "Record delimiter:"
 msgstr "Gwahanydd record:"
 
-#: ../plugins/save-calendar/csv-format.c:580
+#: ../plugins/save-calendar/csv-format.c:551
 msgid "Encapsulate values with:"
 msgstr "Capsiwleiddio gwerthoedd gyda:"
 
-#: ../plugins/save-calendar/csv-format.c:602
+#: ../plugins/save-calendar/csv-format.c:572
 msgid "Comma separated value format (.csv)"
 msgstr "Ffurf gwahanir-gan-gomáu (.csv)"
 
@@ -17854,7 +18496,8 @@ msgid "Save Selected"
 msgstr "Cadw'r Rhai wedi'u Dewis"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
-msgid "Saves selected calendar or tasks list to disk."
+#, fuzzy
+msgid "Save a calendar or task list to disk."
 msgstr "Cadw'r calendr neu'r rhestr dasgau sydd wedi dewis at y ddisg."
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
@@ -17866,42 +18509,49 @@ msgstr "Cadw i'r _Ddisg"
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:158
+#: ../plugins/save-calendar/rdf-format.c:150
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:397
+#: ../plugins/save-calendar/rdf-format.c:372
 msgid "RDF format (.rdf)"
 msgstr "Ffurf RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:169
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:158
 msgid "Select destination file"
 msgstr "Dewiswch ffeil gyrchfan"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
-msgid "Select one source"
-msgstr "Dewis un ffynhonnell"
+#, fuzzy
+msgid "Quickly select a single calendar or task list for viewing."
+msgstr "Dewis un calendr neu ffynhonnell dasgau er mwyn ei weld."
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
-msgid "Selects a single calendar or task source for viewing."
-msgstr "Dewis un calendr neu ffynhonnell dasgau er mwyn ei weld."
+#, fuzzy
+msgid "Select One Source"
+msgstr "Dewis un ffynhonnell"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
 msgid "Show _only this Calendar"
 msgstr "_Dangos y Calendr hwn yn unig"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
+#, fuzzy
+msgid "Show _only this Memo List"
+msgstr "_Dangos y Rhestr Dasgau hon yn unig"
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
 msgid "Show _only this Task List"
 msgstr "_Dangos y Rhestr Dasgau hon yn unig"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that handles the Startup wizard."
-msgstr "Ategyn sy'n delio â'r dewin Cychwyn."
+msgid "Guides you through your initial account setup."
+msgstr ""
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Startup wizard"
-msgstr "Dewin cychwyn"
+#, fuzzy
+msgid "Setup Assistant"
+msgstr "Cynorthwywr"
 
 #: ../plugins/startup-wizard/startup-wizard.c:84
 msgid "Evolution Setup Assistant"
@@ -17913,46 +18563,44 @@ msgstr "Croeso"
 
 #: ../plugins/startup-wizard/startup-wizard.c:88
 msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your email accounts, and to import files from other applications. \n"
+"Welcome to Evolution. The next few screens will allow Evolution to connect to your email accounts, and to import files from other applications. \n"
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
-"Croeso i Evolution. Bydd y sgrin neu ddau nesaf yn gadael i Evolution "
-"gysylltu â'ch cyfrifon e-bost, ac i fewnforio ffeiliau o raglenni eraill.\n"
+"Croeso i Evolution. Bydd y sgrin neu ddau nesaf yn gadael i Evolution gysylltu â'ch cyfrifon e-bost, ac i fewnforio ffeiliau o raglenni eraill.\n"
 "\n"
 "Cliciwch y botwm \"Ymlaen\" i barhau."
 
-#: ../plugins/startup-wizard/startup-wizard.c:134
+#: ../plugins/startup-wizard/startup-wizard.c:115
 msgid "Importing files"
 msgstr "Wrthi'n mewnforio ffeiliau"
 
-#: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:147
+#: ../plugins/startup-wizard/startup-wizard.c:117
+#: ../shell/e-shell-importer.c:138
 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:151
-#: ../shell/e-shell-importer.c:397
+#: ../plugins/startup-wizard/startup-wizard.c:132
+#: ../shell/e-shell-importer.c:419
 #, c-format
 msgid "From %s:"
 msgstr "Oddi wrth %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:508
+#: ../plugins/startup-wizard/startup-wizard.c:203
+#: ../shell/e-shell-importer.c:529
+#, c-format
 msgid "Importing data."
 msgstr "Mewnforio data."
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:522
+#: ../plugins/startup-wizard/startup-wizard.c:205
+#: ../shell/e-shell-importer.c:543
 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 ""
-"Dangos a ddylai'r broses o ddidoli negeseuon ar sail eu trywydd ddefnyddio'r "
-"pynciau fel ail ddewis."
+#, fuzzy
+msgid "Sort mail message threads by subject."
+msgstr "Creu edafedd pynciau o'r rhestr negeseuon"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
 msgid "Subject Threading"
@@ -17963,10 +18611,95 @@ msgid "Thread messages by subject"
 msgstr "Creu edafedd pynciau o'r rhestr negeseuon"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:54
-msgid "Fall back to threading messages by sub_ject"
+#: ../plugins/subject-thread/subject-thread.c:56
+#, fuzzy
+msgid "F_all back to threading messages by subject"
 msgstr "Syrthio'n ôl ar drefnu edafedd negeseuon ar sail eu _pwnc"
 
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+msgid "List of keyword/value pairs for the Templates plugin to substitute in a message body."
+msgstr ""
+
+#: ../plugins/templates/templates.c:601
+msgid "No title"
+msgstr "Dim teitl"
+
+#: ../plugins/templates/templates.c:709
+#, fuzzy
+msgid "Save as _Template"
+msgstr "Cadw fel drafft"
+
+#: ../plugins/templates/templates.c:711
+#, fuzzy
+msgid "Save as Template"
+msgstr "Cadw fel drafft"
+
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr ""
+
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
+msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
+msgstr ""
+
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
+msgid "TNEF Decoder"
+msgstr ""
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
+#, fuzzy
+msgid "Inline vCards"
+msgstr "Mwy nag un vCard"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2
+msgid "Show vCards directly in mail messages."
+msgstr "Dangos vCards yn uniongyrchol mewn negeseuon ebost."
+
+#: ../plugins/vcard-inline/vcard-inline.c:159
+#: ../plugins/vcard-inline/vcard-inline.c:243
+msgid "Show Full vCard"
+msgstr "Dangos y VCard Llawn"
+
+#: ../plugins/vcard-inline/vcard-inline.c:162
+msgid "Show Compact vCard"
+msgstr "Dangos VCard Cryno"
+
+#: ../plugins/vcard-inline/vcard-inline.c:222
+msgid "There is one other contact."
+msgstr "Mae un cyswllt arall."
+
+#: ../plugins/vcard-inline/vcard-inline.c:231
+#, c-format
+msgid "There is %d other contact."
+msgid_plural "There are %d other contacts."
+msgstr[0] "Mae %d cyswllt arall."
+msgstr[1] "Mae %d gyswllt arall."
+msgstr[2] "Mae %d cyswllt arall."
+
+#: ../plugins/vcard-inline/vcard-inline.c:252
+msgid "Save in Address Book"
+msgstr "Cadw mewn Llyfr Cyfeiriadau"
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+msgid "Add WebDAV contacts to Evolution."
+msgstr "Ychwanegu cysylltiadau WebDAV i Evolution"
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+msgid "WebDAV contacts"
+msgstr "Cysylltiadau WebDav"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
+msgid "WebDAV"
+msgstr "WebDav"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:295
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:321
+msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
+msgstr ""
+
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "Cragen Evolution"
@@ -17975,147 +18708,250 @@ msgstr "Cragen Evolution"
 msgid "Evolution Shell Config factory"
 msgstr "Ffatri cyflunio cragen Evolution"
 
-#: ../shell/GNOME_Evolution_Test.server.in.in.h:1
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:1
 msgid "Evolution Test"
 msgstr "Prawf Evolution"
 
-#: ../shell/GNOME_Evolution_Test.server.in.in.h:2
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:2
 msgid "Evolution Test component"
 msgstr "Cydran Profi Evolution"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:1
-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.h:1
+msgid "Authenticate proxy server connections"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:2
+#, fuzzy
+msgid "Automatic proxy configuration URL"
+msgstr "Adnabod gwenogluniau'n awtomatig"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:2
+#: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Configuration version"
 msgstr "Fersiwn cyfluniad"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default sidebar width"
 msgstr "Lled rhagosodedig bar ochr"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window height"
 msgstr "Uchder rhagosodedig ffenest"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window state"
 msgstr "Cyflwr rhagosodedig ffenest"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window width"
 msgstr "Lled rhagosodedig ffenest"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:8
+msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:9
+msgid "HTTP proxy host name"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+#, fuzzy
+msgid "HTTP proxy password"
+msgstr "Rhowch gyfrinair"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:11
+msgid "HTTP proxy port"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "HTTP proxy username"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ID neu ffugenw'r gydran i'w ddangos yn ragosodedig wrth gychwyn."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:14
+msgid "If true, then connections to the proxy server require authentication. The username is retrieved from the \"/apps/evolution/shell/network_config/authentication_user\" GConf key, and the password is retrieved from either gnome-keyring or the ~/.gnome2_private/Evolution password file."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:15
+#, fuzzy
+msgid "Initial attachment view"
+msgstr "Mewnosod Atodiad"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:16
+#, fuzzy
+msgid "Initial file chooser folder"
+msgstr "Gosod y ffolder wedi rhannu"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:17
+msgid "Initial folder for GtkFileChooser dialogs."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List View."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Last upgraded configuration version"
 msgstr "Fersiwn cyfluniad a ddiweddarwyd diwethaf"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:9
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
+#: ../shell/apps_evolution_shell.schemas.in.h:20
+msgid "List of paths for the folders to be synchronized to disk for offline usage"
+msgstr "Rhestr o lwybrau'r plygellau i'w cysoni at ddisg er mwyn eu defnyddio all-lein"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:21
+msgid "Non-proxy hosts"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:22
+msgid "Password to pass as authentication when doing HTTP proxying."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:23
+#, fuzzy
+msgid "Proxy configuration mode"
+msgstr "Gosod cyfluniad _Peilot"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:24
+msgid "SOCKS proxy host name"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:25
+msgid "SOCKS proxy port"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:26
+msgid "Secure HTTP proxy host name"
 msgstr ""
-"Rhestr o lwybrau'r plygellau i'w cysoni at ddisg er mwyn eu defnyddio all-"
-"lein"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:27
+msgid "Secure HTTP proxy port"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:28
+msgid "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 representing \"use system settings\", \"no proxy\", \"use manual proxy configuration\" and \"use proxy configuration provided in the autoconfig url\" respectively."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Sidebar is visible"
 msgstr "Bar ochr yn weladwy"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Skip development warning dialog"
 msgstr "Hepgor deialog rhybudd datblygiad"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:458
+#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/main.c:489
 msgid "Start in offline mode"
 msgstr "Dechreuwch ym modd all-lein"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "Statusbar is visible"
 msgstr "Bar statws yn weladwy"
 
-#: ../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\")."
-msgstr ""
-"Fersiwn cyfluniad Evolution, gyda lefel pennaf/lleiaf/cyfluniad (er "
-"enghraifft \"2.6.0\")."
+#: ../shell/apps_evolution_shell.schemas.in.h:33
+msgid "The configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
+msgstr "Fersiwn cyfluniad Evolution, gyda lefel pennaf/lleiaf/cyfluniad (er enghraifft \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 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:16
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 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:17
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 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:18
-msgid ""
-"The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level (for example \"2.6.0\")."
+#: ../shell/apps_evolution_shell.schemas.in.h:37
+msgid "The last upgraded configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
+msgstr "Fersiwn Evolution pryd gafodd y cyfluniad ei ddiweddaru diwethaf, gyda lefel pennaf/lleiaf/cyfluniad (er enghraifft \"2.6.0\")."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:38
+msgid "The machine name to proxy HTTP through."
 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: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 "
-"by the GNOME toolbar setting."
+#: ../shell/apps_evolution_shell.schemas.in.h:39
+msgid "The machine name to proxy secure HTTP through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:40
+msgid "The machine name to proxy socks through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:41
+msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/http_host\" that you proxy through."
 msgstr ""
-"Arddull botymau'r ffenestr. Gall fod: \"testun\", \"eiconau\", \"y ddau\", "
-"\"bar offer\". Os mai \"bar offer\" sydd wedi ei osod, gosodiadau bar offer "
-"GNOME sy'n penderfynu arddull y botymau."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:42
+msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/secure_host\" that you proxy through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:43
+msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/socks_host\" that you proxy through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:44
+msgid "The style of the window buttons. Can be \"text\", \"icons\", \"both\", \"toolbar\". If \"toolbar\" is set, the style of the buttons is determined by the GNOME toolbar setting."
+msgstr "Arddull botymau'r ffenestr. Gall fod: \"testun\", \"eiconau\", \"y ddau\", \"bar offer\". Os mai \"bar offer\" sydd wedi ei osod, gosodiadau bar offer GNOME sy'n penderfynu arddull y botymau."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:45
+msgid "This key contains a list of hosts which are connected to directly, rather than via the proxy (if it is active). The values can be hostnames, domains (using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Toolbar is visible"
 msgstr "Bar offer yn weladwy"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:47
+#, fuzzy
+msgid "URL that provides proxy configuration values."
+msgstr "Fersiwn cyfluniad a ddiweddarwyd diwethaf"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:48
+msgid "Use HTTP proxy"
+msgstr "Defnyddio dirprwy HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:49
+msgid "User name to pass as authentication when doing HTTP proxying."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 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:22
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 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:23
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the sidebar should be visible."
 msgstr "A ddylai'r bar ochr fod yn weladwy."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 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:25
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Whether the toolbar should be visible."
 msgstr "A ddylai'r bar offer fod yn weladwy."
 
-#: ../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.h:55
+msgid "Whether the warning dialog in development versions of Evolution is skipped."
+msgstr "A fydd y ddeialog rhybudd mewn fersiynau datblygu o Evolution yn cael ei hepgor."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the window buttons should be visible."
 msgstr "A ddylai botymau ffenestri fod yn weladwy."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Window button style"
 msgstr "Arddull botwm ffenest"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Window buttons are visible"
 msgstr "Botymau ffenestri yn weladwy"
 
@@ -18131,34 +18967,23 @@ msgstr "Cysylltiadau Gweithredol"
 msgid "Click OK to close these connections and go offline"
 msgstr "Cliciwch Iawn er mwyn cau'r cysylltiadau yma a mynd all-lein"
 
-#: ../shell/e-shell-folder-title-bar.c:584
-#: ../shell/e-shell-folder-title-bar.c:585
-msgid "(Untitled)"
-msgstr "(Heb Deitl)"
-
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:128
 msgid "Choose the type of importer to run:"
 msgstr "Dewiswch pa fath o fewnforiwr i'w redeg:"
 
-#: ../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"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
+#: ../shell/e-shell-importer.c:131
+#, fuzzy
+msgid "Choose the file that you want to import into Evolution, and select what type of file it is from the list."
 msgstr ""
-"Dewiswch y ffeil yr ydych am ei mewnforio i Evolution, a dewiswch o'r rhestr "
-"pa fath o ffeil yw hi.\n"
+"Dewiswch y ffeil yr ydych am ei mewnforio i Evolution, a dewiswch o'r rhestr pa fath o ffeil yw hi.\n"
 "\n"
-"Gallwch chi ddewis \"Awtomatig\" os nad ydych chi'n gwybod, ac fe fydd "
-"Evolution yn ceisio ei ddatrys."
+"Gallwch chi ddewis \"Awtomatig\" os nad ydych chi'n gwybod, ac fe fydd Evolution yn ceisio ei ddatrys."
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the destination for this import"
 msgstr "Dewiswch y gyrchfan ar gyfer y mewnforio"
 
-#: ../shell/e-shell-importer.c:150
+#: ../shell/e-shell-importer.c:141
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -18170,71 +18995,63 @@ msgstr ""
 "ddarganfuwyd unrhyw osodiadau i'w mewnforio. Os hoffech\n"
 "geisio eto, cliciwch y botwm \"Yn ôl\".\n"
 
-#: ../shell/e-shell-importer.c:285
+#: ../shell/e-shell-importer.c:295
 msgid "F_ilename:"
 msgstr "_Enw ffeil:"
 
-#: ../shell/e-shell-importer.c:290
+#: ../shell/e-shell-importer.c:300
 msgid "Select a file"
 msgstr "Dewis ffeil"
 
-#: ../shell/e-shell-importer.c:299
+#: ../shell/e-shell-importer.c:309
 msgid "File _type:"
 msgstr "_Math o ffeil:"
 
-#: ../shell/e-shell-importer.c:335
+#: ../shell/e-shell-importer.c:357
 msgid "Import data and settings from _older programs"
 msgstr "Mewnforio data a gosodiadau o _raglenni hÅ·n"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:360
 msgid "Import a _single file"
 msgstr "Mewnforio _ffeil unigol"
 
-#: ../shell/e-shell-settings-dialog.c:319
+#: ../shell/e-shell-importer.c:724
+msgid "_Import"
+msgstr "_Mewnforio"
+
+#: ../shell/e-shell-settings-dialog.c:312
 msgid "Evolution Preferences"
 msgstr "Hoffterau Evolution"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "Dim enw plygell wedi ei roi."
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "Ni all enw plygell gynnwys y nod Return."
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "Ni all enw plygell gynnwys y nod \"/\"."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "Ni all enw plygell gynnwys y nod \"#\"."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "Mae '.' a '..' yn enwau plygellau arbennig sydd wedi'u gwarchod."
+#. To translators: This is the window title and %s is the
+#. component name. Most translators will want to keep it as is.
+#: ../shell/e-shell-view.c:47
+#: ../shell/e-shell-window.c:324
+#, c-format
+msgid "%s - Evolution"
+msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window-commands.c:76
+#: ../shell/e-shell-window-commands.c:69
 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:84
-#, c-format
-msgid "Error executing %s."
+#: ../shell/e-shell-window-commands.c:78
+#, fuzzy, c-format
+msgid "Error executing %s. (%s)"
 msgstr "Gwall wrth weithredu %s."
 
-#: ../shell/e-shell-window-commands.c:132
+#: ../shell/e-shell-window-commands.c:135
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy heb ei osod."
 
-#: ../shell/e-shell-window-commands.c:135
+#: ../shell/e-shell-window-commands.c:138
 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 dialog.
-#: ../shell/e-shell-window-commands.c:575
+#: ../shell/e-shell-window-commands.c:938
 msgid "translator-credits"
 msgstr ""
 "Chris Jackson <chris www linux org uk>\n"
@@ -18243,81 +19060,89 @@ msgstr ""
 "Dafydd Harries <daf muse 19inch net>\n"
 "Rhys Jones <rhys sucs org>"
 
-#: ../shell/e-shell-window-commands.c:586
+#: ../shell/e-shell-window-commands.c:949
 msgid "Evolution Website"
 msgstr "Safle Gwe Evolution"
 
-#: ../shell/e-shell-window-commands.c:793
+#: ../shell/e-shell-window-commands.c:1163
 msgid "_Work Online"
 msgstr "_Gweithio Ar-lein"
 
-#: ../shell/e-shell-window-commands.c:806 ../ui/evolution.xml.h:55
+#: ../shell/e-shell-window-commands.c:1176
+#: ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "_Gweithio All-lein"
 
-#: ../shell/e-shell-window-commands.c:819
+#: ../shell/e-shell-window-commands.c:1189
 msgid "Work Offline"
 msgstr "Gweithio All-lein"
 
-#: ../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:372
+#, fuzzy
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
+msgstr "Mae Evolution ar-lein ar hyn o bryd. Cliciwch y botwm hwn i weithio all-lein."
 
-#: ../shell/e-shell-window.c:389
+#: ../shell/e-shell-window.c:379
 msgid "Evolution is in the process of going offline."
 msgstr "Mae Evolution yn y broses o fynd all-lein."
 
-#: ../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:386
+#, fuzzy
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
+msgstr "Mae Evolution all-lein ar hyn o bryd. Cliciwch y botwm hwn i weithio ar-lein."
 
-#: ../shell/e-shell-window.c:820
+#: ../shell/e-shell-window.c:778
 #, c-format
 msgid "Switch to %s"
 msgstr "Newid i %s"
 
-#: ../shell/e-shell.c:636
-msgid "Uknown system error."
+#: ../shell/e-shell.c:634
+msgid "Unknown system error."
 msgstr "Gwall system anhysbys."
 
-#: ../shell/e-shell.c:832 ../shell/e-shell.c:833
+#: ../shell/e-shell.c:832
+#: ../shell/e-shell.c:833
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1264 ../widgets/misc/e-cell-date-edit.c:255
+#: ../shell/e-shell.c:1251
+#: ../widgets/misc/e-cell-date-edit.c:320
 msgid "OK"
 msgstr "Iawn"
 
-#: ../shell/e-shell.c:1266
+#: ../shell/e-shell.c:1253
 msgid "Invalid arguments"
 msgstr "Argiau annilys"
 
-#: ../shell/e-shell.c:1268
+#: ../shell/e-shell.c:1255
 msgid "Cannot register on OAF"
 msgstr "Methu cofrestru ar OAF"
 
-#: ../shell/e-shell.c:1270
+#: ../shell/e-shell.c:1257
 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
-#: ../shell/e-user-creatable-items-handler.c:693
+#: ../shell/e-user-creatable-items-handler.c:674
+#: ../shell/e-user-creatable-items-handler.c:684
+#: ../shell/e-user-creatable-items-handler.c:689
 msgid "New"
 msgstr "Newydd"
 
-#: ../shell/evolution-test-component.c:140
+#: ../shell/test/evolution-test-component.c:103
 msgid "New Test"
 msgstr "Prawf Newydd"
 
-#: ../shell/evolution-test-component.c:141
+#: ../shell/test/evolution-test-component.c:104
+msgctxt "New"
 msgid "_Test"
 msgstr "_Prawf"
 
-#: ../shell/evolution-test-component.c:142
+#: ../shell/test/evolution-test-component.c:105
 msgid "Create a new test item"
 msgstr "Creu eitem prawf newydd"
 
@@ -18342,8 +19167,8 @@ msgid "Importer Type"
 msgstr "Math Mewnforiwr"
 
 #: ../shell/import.glade.h:6
-msgid "Select Importers"
-msgstr "Dewiswch Fewnforwyr"
+msgid "Select Information to Import"
+msgstr "Dewiswch Gwybodaeth i Fewnforio"
 
 #: ../shell/import.glade.h:7
 msgid "Select a File"
@@ -18360,7 +19185,7 @@ msgstr ""
 "fewnforio ffeiliau allanol i mewn i Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:219
+#: ../shell/main.c:226
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -18395,7 +19220,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:243
+#: ../shell/main.c:250
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -18403,39 +19228,43 @@ msgstr ""
 "Diolch\n"
 "Y Tîm Evolution\n"
 
-#: ../shell/main.c:250
+#: ../shell/main.c:257
 msgid "Do not tell me again"
 msgstr "Peidiwch â dweud wrthyf eto"
 
-#: ../shell/main.c:456
+#: ../shell/main.c:487
 msgid "Start Evolution activating the specified component"
 msgstr "Dechrau Evolution gan ymgychwyn y gydran benodol"
 
-#: ../shell/main.c:460
+#: ../shell/main.c:491
 msgid "Start in online mode"
 msgstr "Dechreuwch ym modd ar-lein"
 
-#: ../shell/main.c:463
+#: ../shell/main.c:494
 msgid "Forcibly shut down all Evolution components"
 msgstr "Gorfodi pob cydran Evolution i gau i lawr"
 
-#: ../shell/main.c:467
+#: ../shell/main.c:498
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Gorfodi ail-fudo o Evolution 1.4"
 
-#: ../shell/main.c:470
+#: ../shell/main.c:501
 msgid "Send the debugging output of all components to a file."
 msgstr "Anfon allbwn datnamu bob cydran at ffeil."
 
-#: ../shell/main.c:472
+#: ../shell/main.c:503
 msgid "Disable loading of any plugins."
 msgstr "Analluogi llwytho unrhyw ategyn."
 
-#: ../shell/main.c:501
+#: ../shell/main.c:505
+msgid "Disable preview pane of Mail, Contacts and Tasks."
+msgstr ""
+
+#: ../shell/main.c:614
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution, y Cleient Ebost a Threfnydd Gwybodaeth Bersonol"
 
-#: ../shell/main.c:512
+#: ../shell/main.c:642
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18449,88 +19278,72 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "Ydych chi'n siŵr eich bod am ddileu bob cyfrinair sydd wedi ei gofio?"
 
 #: ../shell/shell.error.xml.h:2
+msgid "Cannot start Evolution"
+msgstr "Methu dechrau Evolution"
+
+#: ../shell/shell.error.xml.h:3
 msgid "Continue"
 msgstr "Parhau"
 
-#: ../shell/shell.error.xml.h:3
+#: ../shell/shell.error.xml.h:4
 msgid "Delete old data from version {0}?"
 msgstr "Dileu hen ddata o fersiwn {0}?"
 
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:5
 msgid "Evolution can not start."
 msgstr "Ni all Evolution gychwyn."
 
-#: ../shell/shell.error.xml.h:5
-msgid ""
-"Forgetting your passwords will clear all remembered passwords. You will be "
-"reprompted next time they are needed."
-msgstr ""
-"Bydd anghofio cyfrineiriau yn clirio bob cyfrinair sydd wedi ei gofio. "
-"Byddwch yn cael eich promptio amdanynt y tro nesaf mae eu hangen."
+#: ../shell/shell.error.xml.h:6
+msgid "Forgetting your passwords will clear all remembered passwords. You will be reprompted next time they are needed."
+msgstr "Bydd anghofio cyfrineiriau yn clirio bob cyfrinair sydd wedi ei gofio. Byddwch yn cael eich promptio amdanynt y tro nesaf mae eu hangen."
 
-#: ../shell/shell.error.xml.h:7
+#: ../shell/shell.error.xml.h:8
 msgid "Insufficient disk space for upgrade."
 msgstr "Prinder lle disg ar gyfer yr uwchraddio."
 
-#: ../shell/shell.error.xml.h:8
+#: ../shell/shell.error.xml.h:9
 msgid "Really delete old data?"
 msgstr "Ydych chi'n siŵr eich bod am ddileu hen ddata?"
 
-#: ../shell/shell.error.xml.h:9
+#: ../shell/shell.error.xml.h:10
 msgid ""
-"The entire contents of the &quot;evolution&quot; directory are about to be "
-"permanently removed.\n"
+"The entire contents of the &quot;evolution&quot; directory are about to be permanently removed.\n"
 "\n"
-"It is suggested you manually verify that all of your mail, contact, and "
-"calendar data is present, and that this version of Evolution operates "
-"correctly before deleting this old data.\n"
+"It is suggested you manually verify that all of your mail, contact, and calendar data is present, and that this version of Evolution operates correctly before deleting this old data.\n"
 "\n"
-"Once deleted, you cannot downgrade to the previous version of Evolution "
-"without manual intervention.\n"
+"Once deleted, you cannot downgrade to the previous version of Evolution without manual intervention.\n"
 msgstr ""
-"Mae holl gynnwys y blygell &quot;evolution&quot; ar fin cael ei ddileu'n "
-"barhaol.\n"
+"Mae holl gynnwys y blygell &quot;evolution&quot; ar fin cael ei ddileu'n barhaol.\n"
 "\n"
-"Awgrymir eich bod yn gwneud yn siŵr bod eich holl ddata e-bost, cysylltiadau "
-"a chalendr yn bresennol, a bod y fersiwn hwn o Evolution yn gweithio'n gywir "
-"cyn i chi ddileu'r hen ddata yma.\n"
+"Awgrymir eich bod yn gwneud yn siŵr bod eich holl ddata e-bost, cysylltiadau a chalendr yn bresennol, a bod y fersiwn hwn o Evolution yn gweithio'n gywir cyn i chi ddileu'r hen ddata yma.\n"
 "\n"
-"Ar ôl dileu, bydd israddio i'r fersiwn flaenorol o Evolution yn broses "
-"gymhleth, fydd rhaid ei gwneud â llaw.\n"
+"Ar ôl dileu, bydd israddio i'r fersiwn flaenorol o Evolution yn broses gymhleth, fydd rhaid ei gwneud â llaw.\n"
 
-#: ../shell/shell.error.xml.h:15
+#: ../shell/shell.error.xml.h:16
 msgid ""
-"The previous version of evolution stored its data in a different location.\n"
+"The previous version of Evolution stored its data in a different location.\n"
 "\n"
-"If you choose to remove this data, the entire contents of the &quot;"
-"evolution&quot; directory will be removed permanently. If you choose to keep "
-"this data, then you may manually remove the contents of &quot;"
-"evolution&quot; at your convenience.\n"
+"If you choose to remove this data, the entire contents of the &quot;evolution&quot; directory will be removed permanently. If you choose to keep this data, then you may manually remove the contents of &quot;evolution&quot; at your convenience.\n"
 msgstr ""
 "Roedd y fersiwn flaenorol o Evolution yn storio data mewn man gwahanol.\n"
 "\n"
-"Os wnewch chi ddileu'r data yma, fe fydd holl gynnwys y blygell &quot;"
-"evolution&quot; yn cael ei ddileu'n barhaol. Os wnewch chi gadw'r data yma, "
-"gallwch ddileu cynnwys &quot;evolution&quot; eich hun pan mae'n gyfleus.\n"
+"Os wnewch chi ddileu'r data yma, fe fydd holl gynnwys y blygell &quot;evolution&quot; yn cael ei ddileu'n barhaol. Os wnewch chi gadw'r data yma, gallwch ddileu cynnwys &quot;evolution&quot; eich hun pan mae'n gyfleus.\n"
 
-#: ../shell/shell.error.xml.h:19
+#: ../shell/shell.error.xml.h:20
 msgid "Upgrade from previous version failed: {0}"
 msgstr "Methwyd uwchraddio o'r fersiwn flaenorol: {0}"
 
-#: ../shell/shell.error.xml.h:20
+#: ../shell/shell.error.xml.h:21
 msgid ""
-"Upgrading your data and settings will require up to {0} of disk space, but "
-"you only have {1} available.\n"
+"Upgrading your data and settings will require up to {0} of disk space, but you only have {1} available.\n"
 "\n"
-"You will need to make more space available in your home directory before you "
-"can continue."
+"You will need to make more space available in your home directory before you can continue."
 msgstr ""
-"Mae angen hyd at {0} o le disg i uwchraddio'ch data a'ch gosodiadau, ond dim "
-"ond {1} sydd ar gael.\n"
+"Mae angen hyd at {0} o le disg i uwchraddio'ch data a'ch gosodiadau, ond dim ond {1} sydd ar gael.\n"
 "\n"
 "Rhaid i chi ryddhau mwy o le o fewn eich plygell cartref cyn parhau."
 
-#: ../shell/shell.error.xml.h:23
+#: ../shell/shell.error.xml.h:24
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
@@ -18540,7 +19353,7 @@ msgstr ""
 "\n"
 "Cliciwch 'Cymorth' am fanylion."
 
-#: ../shell/shell.error.xml.h:26
+#: ../shell/shell.error.xml.h:27
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
 "\n"
@@ -18554,31 +19367,29 @@ msgstr ""
 "\n"
 "Cliciwch 'Cymorth' am fanylion."
 
-#: ../shell/shell.error.xml.h:31
+#: ../shell/shell.error.xml.h:32
 msgid "_Forget"
 msgstr "_Anghofio"
 
-#: ../shell/shell.error.xml.h:32
+#: ../shell/shell.error.xml.h:33
 msgid "_Keep Data"
 msgstr "_Cadw Data"
 
-#: ../shell/shell.error.xml.h:33
+#: ../shell/shell.error.xml.h:34
 msgid "_Remind Me Later"
 msgstr "_Atgofia Fi Wedyn"
 
-#: ../shell/shell.error.xml.h:34
+#: ../shell/shell.error.xml.h:35
 msgid ""
 "{1}\n"
 "\n"
-"If you choose to continue, you may not have access to some of your old "
-"data.\n"
+"If you choose to continue, you may not have access to some of your old data.\n"
 msgstr ""
 "{1}\n"
 "\n"
-"Os wnewch chi barhau, efallai na fyddwch yn medru cyrchu peth o'ch hen "
-"ddata.\n"
+"Os wnewch chi barhau, efallai na fyddwch yn medru cyrchu peth o'ch hen ddata.\n"
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -18589,98 +19400,84 @@ msgstr ""
 "\n"
 "Golygu gosodiadau ymddiried:"
 
+#: ../smime/gui/cert-trust-dialog.c:150
+msgid "Because you trust the certificate authority that issued this certificate, then you trust the authenticity of this certificate unless otherwise indicated here"
+msgstr "Am nad ydych yn ymddiried yn yr awdurdod tystysgrifo gyhoeddodd y dystysgrif hon, nid ydych yn ymddiried yn nilysrwydd y dystysgrif hon oni bai iddi gael ei nodi'n wahanol yma"
+
 #: ../smime/gui/cert-trust-dialog.c:154
-msgid ""
-"Because you trust the certificate authority that issued this certificate, "
-"then you trust the authenticity of this certificate unless otherwise "
-"indicated here"
-msgstr ""
-"Am nad ydych yn ymddiried yn yr awdurdod tystysgrifo gyhoeddodd y dystysgrif "
-"hon, nid ydych yn ymddiried yn nilysrwydd y dystysgrif hon oni bai iddi gael "
-"ei nodi'n wahanol yma"
+msgid "Because you do not trust the certificate authority that issued this certificate, then you do not trust the authenticity of this certificate unless otherwise indicated here"
+msgstr "Am nad ydych yn ymddiried yn yr awdurdod tystysgrifo wnaeth gyhoeddi'r dystysgrif, dydych chi ddim yn ymddiried fod y dystysgrif ei hun yn ddilys, oni nodir yn wahanol isod"
 
-#: ../smime/gui/cert-trust-dialog.c:158
-msgid ""
-"Because you do not trust the certificate authority that issued this "
-"certificate, then you do not trust the authenticity of this certificate "
-"unless otherwise indicated here"
-msgstr ""
-"Am nad ydych yn ymddiried yn yr awdurdod tystysgrifo wnaeth gyhoeddi'r "
-"dystysgrif, dydych chi ddim yn ymddiried fod y dystysgrif ei hun yn ddilys, "
-"oni nodir yn wahanol isod"
-
-#: ../smime/gui/certificate-manager.c: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
+#: ../smime/gui/certificate-manager.c:136
+#: ../smime/gui/certificate-manager.c:383
+#: ../smime/gui/certificate-manager.c:611
 msgid "Select a certificate to import..."
 msgstr "Dewiswch dystysgrif i'w mewnforio..."
 
-#: ../smime/gui/certificate-manager.c:147
+#: ../smime/gui/certificate-manager.c:145
 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
+#: ../smime/gui/certificate-manager.c:151
+#: ../smime/gui/certificate-manager.c:398
+#: ../smime/gui/certificate-manager.c:625
 msgid "All files"
 msgstr "Pob ffeil"
 
-#: ../smime/gui/certificate-manager.c:279
-#: ../smime/gui/certificate-manager.c:496
-#: ../smime/gui/certificate-manager.c:726
+#: ../smime/gui/certificate-manager.c:275
+#: ../smime/gui/certificate-manager.c:488
+#: ../smime/gui/certificate-manager.c:713
 msgid "Certificate Name"
 msgstr "Enw'r Dystysgrif"
 
-#: ../smime/gui/certificate-manager.c:288
-#: ../smime/gui/certificate-manager.c:514
+#: ../smime/gui/certificate-manager.c:284
+#: ../smime/gui/certificate-manager.c:506
 msgid "Purposes"
 msgstr "Pwrpasau"
 
-#: ../smime/gui/certificate-manager.c:297 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:570
+#: ../smime/gui/certificate-manager.c:293
+#: ../smime/gui/smime-ui.glade.h:37
+#: ../smime/lib/e-cert.c:552
 msgid "Serial Number"
 msgstr "Rhif Cyfresol"
 
-#: ../smime/gui/certificate-manager.c:305
+#: ../smime/gui/certificate-manager.c:301
 msgid "Expires"
 msgstr "Daw i ben"
 
-#: ../smime/gui/certificate-manager.c:398
+#: ../smime/gui/certificate-manager.c:392
 msgid "All email certificate files"
 msgstr "Pob ffeil tystysgrif e-bost"
 
-#: ../smime/gui/certificate-manager.c:505
+#: ../smime/gui/certificate-manager.c:497
 msgid "E-Mail Address"
 msgstr "Cyfeiriad Ebost"
 
-#: ../smime/gui/certificate-manager.c:630
+#: ../smime/gui/certificate-manager.c:620
 msgid "All CA certificate files"
 msgstr "Pob ffeil tystysgrif CA (Awdurdod Tystysgrifo)"
 
-#: ../smime/gui/certificate-viewer.c:341
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Gwyliwr Tystysgrif: %s"
 
-#: ../smime/gui/component.c:47
+#: ../smime/gui/component.c:46
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Rhowch y cyfrinair ar gyfer `%s'"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:70
+#: ../smime/gui/component.c:69
 msgid "Enter new password for certificate database"
 msgstr "Rhowch gyfrinair newydd ar gyfer y gronfa ddata tystysgrifau"
 
-#: ../smime/gui/component.c:72
+#: ../smime/gui/component.c:71
 msgid "Enter new password"
 msgstr "Rhowch Gyfrinair"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:121
+#: ../smime/gui/e-cert-selector.c:117
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -18689,7 +19486,7 @@ msgstr ""
 "Dynodwyd at:\n"
 "  Pwnc: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -18698,7 +19495,7 @@ msgstr ""
 "Cyhoeddwyd gan:\n"
 "  Pwnc: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:174
+#: ../smime/gui/e-cert-selector.c:170
 msgid "Select certificate"
 msgstr "Dewiswch Dystysgrif"
 
@@ -18751,14 +19548,11 @@ msgid "Backup All"
 msgstr "Cadw Copi o Bopeth Wrth Gefn"
 
 #: ../smime/gui/smime-ui.glade.h:13
-msgid ""
-"Before trusting this CA for any purpose, you should examine its certificate "
-"and its policy and procedures (if available)."
-msgstr ""
-"Cyn ymddiried mewn Awdurdod Tystysgrifo at unrhyw bwrpas, dylech archwilio "
-"ei dystysgrif a'i bolisi a chanllawiau (os yw ar gael)"
+msgid "Before trusting this CA for any purpose, you should examine its certificate and its policy and procedures (if available)."
+msgstr "Cyn ymddiried mewn Awdurdod Tystysgrifo at unrhyw bwrpas, dylech archwilio ei dystysgrif a'i bolisi a chanllawiau (os yw ar gael)"
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
+#: ../smime/gui/smime-ui.glade.h:14
+#: ../smime/lib/e-cert.c:1058
 msgid "Certificate"
 msgstr "Tystysgrif"
 
@@ -18834,11 +19628,13 @@ msgstr "Uned Corff (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "Ã?l bys SHA1"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.glade.h:35
+#: ../smime/lib/e-cert.c:800
 msgid "SSL Client Certificate"
 msgstr "Tystysgrif Cleient SSL"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:823
+#: ../smime/gui/smime-ui.glade.h:36
+#: ../smime/lib/e-cert.c:804
 msgid "SSL Server Certificate"
 msgstr "Tystysgrif Gwasanaethwr SSL"
 
@@ -18867,8 +19663,7 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "Mae gennych dystysgrifau gan y cyrff hyn sy'n eich adnabod chi:"
 
 #: ../smime/gui/smime-ui.glade.h:44
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
+msgid "You have certificates on file that identify these certificate authorities:"
 msgstr "Mae gennych dystysgrifau sy'n adnabod yr awdurdodau tystysgrifo yma:"
 
 #: ../smime/gui/smime-ui.glade.h:45
@@ -18884,182 +19679,187 @@ msgid "_Edit CA Trust"
 msgstr "_Golygu Ymddiriedaeth CA"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:676
+#: ../smime/lib/e-cert-db.c:652
 msgid "Certificate already exists"
 msgstr "Tystysgrif yn bodoli'n barod"
 
-#: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
+#: ../smime/lib/e-cert.c:222
+#: ../smime/lib/e-cert.c:232
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:425
+#: ../smime/lib/e-cert.c:407
 msgid "Sign"
 msgstr "Llofnod"
 
-#: ../smime/lib/e-cert.c:426
+#: ../smime/lib/e-cert.c:408
 msgid "Encrypt"
 msgstr "Amgryptio"
 
-#: ../smime/lib/e-cert.c:531
+#: ../smime/lib/e-cert.c:513
 msgid "Version"
 msgstr "Fersiwn"
 
-#: ../smime/lib/e-cert.c:546
+#: ../smime/lib/e-cert.c:528
 msgid "Version 1"
 msgstr "Fersiwn 1"
 
-#: ../smime/lib/e-cert.c:549
+#: ../smime/lib/e-cert.c:531
 msgid "Version 2"
 msgstr "Fersiwn 2"
 
-#: ../smime/lib/e-cert.c:552
+#: ../smime/lib/e-cert.c:534
 msgid "Version 3"
 msgstr "Fersiwn 3"
 
-#: ../smime/lib/e-cert.c:634
+#: ../smime/lib/e-cert.c:616
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 Gydag Amgryptiad RSA"
 
-#: ../smime/lib/e-cert.c:637
+#: ../smime/lib/e-cert.c:619
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 Gydag Amgryptiad RSA"
 
-#: ../smime/lib/e-cert.c:640
+#: ../smime/lib/e-cert.c:622
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 Gydag Amgryptiad RSA"
 
-#: ../smime/lib/e-cert.c:667
+#: ../smime/lib/e-cert.c:649
 msgid "PKCS #1 RSA Encryption"
 msgstr "Amgryptiad PKCS #1 RSA"
 
-#: ../smime/lib/e-cert.c:670
+#: ../smime/lib/e-cert.c:652
 msgid "Certificate Key Usage"
 msgstr "Defnydd Tystysgrif Allweddol"
 
-#: ../smime/lib/e-cert.c:673
+#: ../smime/lib/e-cert.c:655
 msgid "Netscape Certificate Type"
 msgstr "Tystysgrif Math Netscape"
 
-#: ../smime/lib/e-cert.c:676
+#: ../smime/lib/e-cert.c:658
 msgid "Certificate Authority Key Identifier"
 msgstr "Dynodwr Tystysgrif Allwedd Awdurdod"
 
-#: ../smime/lib/e-cert.c:688
+#: ../smime/lib/e-cert.c:670
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Dynodwr Gwrthrych (%s)"
 
-#: ../smime/lib/e-cert.c:739
+#: ../smime/lib/e-cert.c:720
 msgid "Algorithm Identifier"
 msgstr "Dynodwr Algorithm"
 
-#: ../smime/lib/e-cert.c:747
+#: ../smime/lib/e-cert.c:728
 msgid "Algorithm Parameters"
 msgstr "Paramedrau Algorithm"
 
-#: ../smime/lib/e-cert.c:769
+#: ../smime/lib/e-cert.c:750
 msgid "Subject Public Key Info"
 msgstr "Gwybodaeth Allwedd Gyhoeddus y Testun"
 
-#: ../smime/lib/e-cert.c:774
+#: ../smime/lib/e-cert.c:755
 msgid "Subject Public Key Algorithm"
 msgstr "Algorithm Allwedd Gyhoeddus y Testun"
 
-#: ../smime/lib/e-cert.c:789
+#: ../smime/lib/e-cert.c:770
 msgid "Subject's Public Key"
 msgstr "Allwedd Gyhoeddus y Testun"
 
-#: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
+#: ../smime/lib/e-cert.c:791
+#: ../smime/lib/e-cert.c:840
 msgid "Error: Unable to process extension"
 msgstr "Gwall: Methu prosesu estyniad"
 
-#: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
+#: ../smime/lib/e-cert.c:812
+#: ../smime/lib/e-cert.c:824
 msgid "Object Signer"
 msgstr "Llofnodwr Gwrthrych"
 
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:816
 msgid "SSL Certificate Authority"
 msgstr "Awdurdod Tystysgrif SSL"
 
-#: ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:820
 msgid "Email Certificate Authority"
 msgstr " Tystysgrif Awdurdod E-bost"
 
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:848
 msgid "Signing"
 msgstr "Llofnodi"
 
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:852
 msgid "Non-repudiation"
 msgstr "An-wrthodiad"
 
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:856
 msgid "Key Encipherment"
 msgstr "Seiffro Allwedd"
 
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:860
 msgid "Data Encipherment"
 msgstr "Seiffro Data"
 
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:864
 msgid "Key Agreement"
 msgstr "Cytundeb Allwedd"
 
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:868
 msgid "Certificate Signer"
 msgstr "Llofnodwr Tystysgrif"
 
-#: ../smime/lib/e-cert.c:891
+#: ../smime/lib/e-cert.c:872
 msgid "CRL Signer"
 msgstr "Llofnodwr CRL"
 
-#: ../smime/lib/e-cert.c:939
+#: ../smime/lib/e-cert.c:920
 msgid "Critical"
 msgstr "Gritigol"
 
-#: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
+#: ../smime/lib/e-cert.c:922
+#: ../smime/lib/e-cert.c:925
 msgid "Not Critical"
 msgstr "Heb fod yn Gritigol"
 
-#: ../smime/lib/e-cert.c:965
+#: ../smime/lib/e-cert.c:946
 msgid "Extensions"
 msgstr "Estyniadau"
 
-#: ../smime/lib/e-cert.c:1036
+#: ../smime/lib/e-cert.c:1017
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
+#: ../smime/lib/e-cert.c:1072
+#: ../smime/lib/e-cert.c:1192
 msgid "Certificate Signature Algorithm"
 msgstr "Algorithm Llofnod Tystysgrif"
 
-#: ../smime/lib/e-cert.c:1101
+#: ../smime/lib/e-cert.c:1081
 msgid "Issuer"
 msgstr "Cyhoeddwr"
 
-#: ../smime/lib/e-cert.c:1155
+#: ../smime/lib/e-cert.c:1135
 msgid "Issuer Unique ID"
 msgstr "Adnabyddwr Unigryw'r Cyhoeddwr"
 
-#: ../smime/lib/e-cert.c:1174
+#: ../smime/lib/e-cert.c:1154
 msgid "Subject Unique ID"
 msgstr "Adnabyddwr Unigryw'r Testun"
 
-#: ../smime/lib/e-cert.c:1217
+#: ../smime/lib/e-cert.c:1197
 msgid "Certificate Signature Value"
 msgstr "Gwerth Llofnod Tystysgrif"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:249
 msgid "PKCS12 File Password"
 msgstr "Cyfrinair Ffeil PKCS12"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:249
 msgid "Enter password for PKCS12 file:"
 msgstr "Rhowch gyfrinair ar gyfer ffeil PKCS12:"
 
-#: ../smime/lib/e-pkcs12.c:365
+#: ../smime/lib/e-pkcs12.c:348
 msgid "Imported Certificate"
 msgstr "Tystysgrif wedi ei Fewnforio"
 
@@ -19093,20 +19893,22 @@ msgid "Contact _Preview"
 msgstr "_Rhagolwg Cyswllt"
 
 #: ../ui/evolution-addressbook.xml.h:6
-#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-memos.xml.h:2
 #: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copïo"
 
 #: ../ui/evolution-addressbook.xml.h:7
-msgid "Copy Selected Contacts to Another Folder..."
+#, fuzzy
+msgid "Copy selected contacts to another folder"
 msgstr "Copïo'r Cyswllt/Cysylltiadau a ddewiswyd i Blygell Arall..."
 
 #: ../ui/evolution-addressbook.xml.h:8
 msgid "Copy the contacts of the selected folder into another folder"
 msgstr "Copïo'r cysylltiadau o fewn y blygell a ddewiswyd i blygell arall"
 
-#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:9
+#: ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Copïo'r dewis"
 
@@ -19115,16 +19917,18 @@ msgid "Copy to Folder..."
 msgstr "Copïo i Blygell..."
 
 #: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new addressbook folder"
+#, fuzzy
+msgid "Create a new address book folder"
 msgstr "Creu plygell llyfr cyfeiriadau newydd"
 
 #: ../ui/evolution-addressbook.xml.h:12
-#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-memos.xml.h:4
 #: ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Torri"
 
-#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:13
+#: ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Torri'r dewisiad"
 
@@ -19149,8 +19953,8 @@ msgid "Mo_ve All Contacts To..."
 msgstr "_Symud Pob Cyswllt i..."
 
 #: ../ui/evolution-addressbook.xml.h:20
-msgid "Move Selected Contacts to Another Folder..."
-msgstr "Symud y Cyswllt/Cysylltiadau a ddewiswyd i Blygell Arall..."
+msgid "Move selected contacts to another folder"
+msgstr "Symud y cysylltiadau a ddewiswyd i blygell arall..."
 
 #: ../ui/evolution-addressbook.xml.h:21
 msgid "Move the contacts of the selected folder into another folder"
@@ -19161,12 +19965,13 @@ msgid "Move to Folder..."
 msgstr "Symud i Blygell..."
 
 #: ../ui/evolution-addressbook.xml.h:23
-#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-memos.xml.h:8
 #: ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Gludo"
 
-#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
+#: ../ui/evolution-addressbook.xml.h:24
+#: ../ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "Gludo'r gludfwrdd"
 
@@ -19186,21 +19991,24 @@ msgstr "Ail-enwi'r blygell a ddewiswyd"
 msgid "S_ave Address Book As VCard"
 msgstr "_Cadw'r Llyfr Cyfeiriadau fel VCard"
 
+#: ../ui/evolution-addressbook.xml.h:31
+msgid "Save as VCard..."
+msgstr "Cadw fel VCard..."
+
 #: ../ui/evolution-addressbook.xml.h:32
-msgid "Save selected contacts as a VCard."
+msgid "Save selected contacts as a VCard"
 msgstr "Cadw ar ffurf VCard y cysylltiadau sydd wedi eu dewis."
 
 #: ../ui/evolution-addressbook.xml.h:33
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Cadw ar ffurf VCard y cysylltiadau o fewn y blygell a ddewiswyd"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2727
+#: ../ui/evolution-addressbook.xml.h:34
+#: ../widgets/text/e-text.c:2719
 msgid "Select All"
 msgstr "Dewis Popeth"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Dewis _Popeth"
 
@@ -19209,7 +20017,8 @@ msgid "Select all contacts"
 msgstr "Dewis pob cyswllt"
 
 #: ../ui/evolution-addressbook.xml.h:37
-msgid "Send a message to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts"
 msgstr "Anfon neges at y cysylltiadau dewisedig."
 
 #: ../ui/evolution-addressbook.xml.h:38
@@ -19217,7 +20026,8 @@ msgid "Send message to contact"
 msgstr "Anfon neges at y cyswllt"
 
 #: ../ui/evolution-addressbook.xml.h:39
-msgid "Send selected contacts to another person."
+#, fuzzy
+msgid "Send selected contacts to another person"
 msgstr "Anfon at berson arall y cysylltiadau sydd wedi eu dewis."
 
 #: ../ui/evolution-addressbook.xml.h:40
@@ -19240,7 +20050,8 @@ msgstr "Atal Llwytho"
 msgid "View the current contact"
 msgstr "Dangoswch y cyswllt cyfredol"
 
-#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-addressbook.xml.h:45
+#: ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-tasks.xml.h:21
 msgid "_Actions"
 msgstr "_Gweithredoedd"
@@ -19269,7 +20080,8 @@ msgstr "_Symud Cyswllt i..."
 msgid "_Move Folder Contacts To"
 msgstr "_Symud Cysylltiadau'r Blygell i"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:47
+#: ../ui/evolution-addressbook.xml.h:55
+#: ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Newydd"
 
@@ -19329,8 +20141,9 @@ msgstr "Rhestr"
 msgid "Month"
 msgstr "Mis"
 
-#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
+#: ../ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:58
+#: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "Nesaf"
 
@@ -19338,8 +20151,9 @@ msgstr "Nesaf"
 msgid "Previews the calendar to be printed"
 msgstr "Rhagolygu'r calendr i'w argraffu"
 
-#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../ui/evolution-calendar.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:70
+#: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "Blaenorol"
 
@@ -19347,7 +20161,8 @@ msgstr "Blaenorol"
 msgid "Print this calendar"
 msgstr "Argraffu'r calendr yma"
 
-#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
+#: ../ui/evolution-calendar.xml.h:23
+#: ../ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr "_Gwaredu"
 
@@ -19396,242 +20211,28 @@ msgid "View the current appointment"
 msgstr "Gweld yr apwyntiad cyfredol"
 
 #: ../ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-mail-global.xml.h:19
+msgid "View the debug console for log messages"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:37
 msgid "Week"
 msgstr "Wythnos"
 
-#: ../ui/evolution-calendar.xml.h:37
+#: ../ui/evolution-calendar.xml.h:38
 msgid "Work Week"
 msgstr "Wythnos Waith"
 
-#: ../ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Debug Logs"
+msgstr "_Gwelog:"
+
+#: ../ui/evolution-calendar.xml.h:45
 msgid "_Open Appointment"
 msgstr "_Agor Apwyntiad"
 
-#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "Copïo'r testun a ddewiswyd i'r clipfwrdd"
-
-#: ../ui/evolution-composer-entries.xml.h:3
-msgid "Copy selection to clipboard"
-msgstr "Copïo'r hyn a ddewiswyd i'r clipfwrdd"
-
-#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "Torri'r testun a ddewiswyd i'r clipfwrdd"
-
-#: ../ui/evolution-composer-entries.xml.h:7
-msgid "Cut selection to clipboard"
-msgstr "Torri'r hyn a ddewiswyd i'r clipfwrdd"
-
-#: ../ui/evolution-composer-entries.xml.h:9
-msgid "Paste from clipboard"
-msgstr "Gludo o'r clipfwrdd"
-
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "Gludo'r testun sydd ar y clipfwrdd"
-
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "Dewis y holl destun"
-
-#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Atodi"
-
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "Cliciwch yma er mwyn atodi ffeil"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "Cliciwch yma i gau'r ffenest bresennol"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "Cliciwch yma i gadw'r ffenest bresennol"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "Cliciwch yma i weld yr help sydd ar gael"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:3
-#: ../ui/evolution-signature-editor.xml.h:7
-msgid "Close"
-msgstr "Cau"
-
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "_Mewnosod"
-
-#: ../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: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:53
-#: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
-msgid "_File"
-msgstr "_Ffeil"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:44
-msgid "_Help"
-msgstr "_Cymorth"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "_Opsiynau"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "Digwyddiad drwy'r dydd"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "_Digwyddiad drwy'r dydd"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "Categoreiddio'n Gyfrinachol"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
-#: ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr "Categoreiddio yn eitem breifat"
-
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "Categoreiddio yn eitem gyhoeddus"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr "Cliciwch yma i osod neu ddadosod larymau ar gyfer y digwyddiad"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "Mewnosod opsiynau anfon uwch"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "Gwneud hyn yn ddigwyddiad sy'n ail-ddigwydd"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "_Cyhoeddus"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "Ymholi Gwybodaeth Statws Rhydd/Prysur ar gyfer y mynychwyr"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-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:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "_Cylchfa Amser"
-
-#: ../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: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: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: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: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: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: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: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:27
-msgid "_Alarms"
-msgstr "_Larymau"
-
-#: ../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: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: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:31
-msgid "_Free/Busy"
-msgstr "_Rhydd/Prysur"
-
-#: ../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:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "_Ail-ddigwyddiad"
-
-#: ../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:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "_Maes Math"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Diddymu'r weithred e-bost cyfredol"
@@ -19653,93 +20254,88 @@ 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
+#: ../ui/evolution-mail-global.xml.h:8
 msgid "Empty _Trash"
 msgstr "Gwagu'r Sbwriel"
 
-#: ../ui/evolution-mail-global.xml.h:11 ../ui/evolution-mail-list.xml.h:11
-#: ../ui/evolution-subscribe.xml.h:2
+#: ../ui/evolution-mail-global.xml.h:9
+#: ../ui/evolution-mail-list.xml.h:11
 msgid "F_older"
 msgstr "_Plygell"
 
-#: ../ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:10
 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:14
+#: ../ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
-msgstr ""
-"Tynnu'n barhaol, o bob plygell, pob neges sydd wedi marcio wedi'i ddileu"
+msgstr "Tynnu'n barhaol, o bob plygell, pob neges sydd wedi marcio wedi'i ddileu"
 
-#: ../ui/evolution-mail-global.xml.h:15
+#: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
 msgstr "Chwilio _Plygellau"
 
-#: ../ui/evolution-mail-global.xml.h:16
+#: ../ui/evolution-mail-global.xml.h:14
 msgid "Show Message _Preview"
 msgstr "Dangos _Rhagolwg Neges"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Show message preview below the message list"
 msgstr "Dangos rhagolwg neges islaw'r rhestr negeseuon"
 
-#: ../ui/evolution-mail-global.xml.h:18
+#: ../ui/evolution-mail-global.xml.h:16
 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:19
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "Show message preview window"
 msgstr "Dangos ffenest rhagolwg neges"
 
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:18
 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:21
+#: ../ui/evolution-mail-global.xml.h:20
 msgid "_Classic View"
 msgstr "_Golwg Glasurol"
 
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-mail-global.xml.h:21
 msgid "_Copy Folder To..."
 msgstr "_Copïo Plygell i..."
 
 #: ../ui/evolution-mail-global.xml.h:23
+#, fuzzy
+msgid "_Download Messages for Offline Usage"
+msgstr "Ffolder all-lein"
+
+#: ../ui/evolution-mail-global.xml.h:25
 msgid "_Message Filters"
 msgstr "_Hidlyddion Negeseuon"
 
-#: ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution-mail-global.xml.h:26
 msgid "_Move Folder To..."
 msgstr "_Symud Plygell i..."
 
-#: ../ui/evolution-mail-global.xml.h:25
+#: ../ui/evolution-mail-global.xml.h:27
 msgid "_New..."
 msgstr "_Newydd..."
 
-#: ../ui/evolution-mail-global.xml.h:26
+#: ../ui/evolution-mail-global.xml.h:28
 msgid "_Preview"
 msgstr "_Rhagolwg"
 
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
-#: ../ui/evolution-mail-global.xml.h:30
-msgid "_Subscriptions"
-msgstr "_Tanysgrifiadau"
+#: ../ui/evolution-mail-global.xml.h:32
+msgid "_Subscriptions..."
+msgstr "_Tanysgrifiadau..."
 
-#: ../ui/evolution-mail-global.xml.h:31
+#: ../ui/evolution-mail-global.xml.h:33
 msgid "_Vertical View"
 msgstr "Golwg _Fertigol"
 
@@ -19793,84 +20389,90 @@ msgid "Hide _Read Messages"
 msgstr "Cuddio Negeseuon _Ddarllenwyd"
 
 #: ../ui/evolution-mail-list.xml.h:15
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr ""
-"Cuddio negeseuon wedi'u dileu yn hytrach na'u dangos gyda llinell drwyddynt"
+msgid "Hide deleted messages rather than displaying them with a line through them"
+msgstr "Cuddio negeseuon wedi'u dileu yn hytrach na'u dangos gyda llinell drwyddynt"
 
 #: ../ui/evolution-mail-list.xml.h:16
 msgid "Mar_k All Messages as Read"
 msgstr "_Marcio pob neges fel rhai wedi'i ddarllen"
 
 #: ../ui/evolution-mail-list.xml.h:17
+#, fuzzy
+msgid "Mark all messages in the folder as read"
+msgstr "Marcio bob neges yn yr isblygellau fel rhai wedi'u darllen?"
+
+#: ../ui/evolution-mail-list.xml.h:18
 msgid "Paste message(s) from the clipboard"
 msgstr "Gludo neges/negeseuon o'r clipfwrdd"
 
-#: ../ui/evolution-mail-list.xml.h:18
+#: ../ui/evolution-mail-list.xml.h:19
 msgid "Permanently remove all deleted messages from this folder"
-msgstr ""
-"Tynnu'n barhaol o'r blygell hon bob neges sydd wedi marcio fel un wedi'i "
-"ddileu"
+msgstr "Tynnu'n barhaol o'r blygell hon bob neges sydd wedi marcio fel un wedi'i ddileu"
 
-#: ../ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:20
 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
+#: ../ui/evolution-mail-list.xml.h:22
 msgid "Refresh the folder"
 msgstr "Adnewyddu _plygell"
 
-#: ../ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:23
+#, fuzzy
+msgid "Select Message S_ubthread"
+msgstr "Pob _Trywydd Neges"
+
+#: ../ui/evolution-mail-list.xml.h:24
 msgid "Select Message _Thread"
 msgstr "Pob _Trywydd Neges"
 
-#: ../ui/evolution-mail-list.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:25
 msgid "Select _All Messages"
 msgstr "Dewis _Bob Neges"
 
-#: ../ui/evolution-mail-list.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:26
 msgid "Select all and only the messages that are not currently selected"
-msgstr ""
-"Dewis pob un o'r negeseuon, a dim ond y negeseuon, nad ydynt wedi'u dewis ar "
-"hyn o bryd"
+msgstr "Dewis pob un o'r negeseuon, a dim ond y negeseuon, nad ydynt wedi'u dewis ar hyn o bryd"
 
-#: ../ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:27
 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:26
+#: ../ui/evolution-mail-list.xml.h:28
+#, fuzzy
+msgid "Select all replies to the currently selected message"
+msgstr "Dewis pob neges o fewn yr un trywydd â'r neges a ddewiswyd"
+
+#: ../ui/evolution-mail-list.xml.h:29
 msgid "Select all visible messages"
 msgstr "Dewis bob neges weladwy"
 
-#: ../ui/evolution-mail-list.xml.h:27
+#: ../ui/evolution-mail-list.xml.h:30
 msgid "Show Hidde_n Messages"
 msgstr "_Dangos Negeseuon Cudd"
 
-#: ../ui/evolution-mail-list.xml.h:28
+#: ../ui/evolution-mail-list.xml.h:31
 msgid "Show messages that have been temporarily hidden"
 msgstr "Dangos negeseuon sydd wedi eu cuddio dros dro"
 
-#: ../ui/evolution-mail-list.xml.h:29
+#: ../ui/evolution-mail-list.xml.h:32
 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:30
+#: ../ui/evolution-mail-list.xml.h:33
 msgid "Temporarily hide the selected messages"
 msgstr "Cuddio dros dro'r negeseuon a ddewiswyd"
 
-#: ../ui/evolution-mail-list.xml.h:31
+#: ../ui/evolution-mail-list.xml.h:34
 msgid "Threaded Message list"
 msgstr "Rhestr Drywyddau Neges"
 
-#: ../ui/evolution-mail-list.xml.h:33
+#: ../ui/evolution-mail-list.xml.h:36
 msgid "_Group By Threads"
 msgstr "Grwpio mewn _Edafedd"
 
-#: ../ui/evolution-mail-list.xml.h:34 ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-list.xml.h:37
+#: ../ui/evolution-mail-message.xml.h:111
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "_Neges"
@@ -20125,207 +20727,193 @@ msgid "Paste messages from the clipboard"
 msgstr "Gludo neges(euon) o'r clipfwrdd"
 
 #: ../ui/evolution-mail-message.xml.h:68
-msgid "Pos_t New Message to Folder"
-msgstr "Postio Neges _Newydd i'r Blygell"
-
-#: ../ui/evolution-mail-message.xml.h:69
-msgid "Post a Repl_y"
-msgstr "Postio _Ymateb"
-
-#: ../ui/evolution-mail-message.xml.h:70
-msgid "Post a message to a Public folder"
-msgstr "Postio neges i blygell Gyhoeddus"
-
-#: ../ui/evolution-mail-message.xml.h:71
-msgid "Post a reply to a message in a Public folder"
-msgstr "Postio ymateb i neges mewn plygell Cyhoeddus"
-
-#: ../ui/evolution-mail-message.xml.h:72
 msgid "Pr_evious Important Message"
 msgstr "Neges Bwysig _Flaenorol"
 
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Preview the message to be printed"
 msgstr "Dangos rhagolwg y neges i'w phrintio"
 
-#: ../ui/evolution-mail-message.xml.h:77
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "Print this message"
 msgstr "Argraffu'r neges hon"
 
-#: ../ui/evolution-mail-message.xml.h:78
+#: ../ui/evolution-mail-message.xml.h:74
 msgid "Re_direct"
 msgstr "_Ailgyfeirio"
 
-#: ../ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-mail-message.xml.h:75
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Dargyfeirio (bownsio) y neges a ddewiswyd at rywun"
 
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../ui/evolution-mail-message.xml.h:80
 msgid "Reset the text to its original size"
 msgstr "Adfer y testun i'w faint gwreiddiol"
 
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:81
 msgid "Save the selected messages as a text file"
 msgstr "Cadw'r neges(euon) ddewiswyd fel ffeil destun"
 
-#: ../ui/evolution-mail-message.xml.h:86
+#: ../ui/evolution-mail-message.xml.h:82
 msgid "Search Folder from Mailing _List..."
 msgstr "Plygell Chwilio ar sail _Rhestr E-bostio..."
 
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Search Folder from Recipien_ts..."
 msgstr "Plygell Chwilio ar sail _Derbynwyr..."
 
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Search Folder from S_ubject..."
 msgstr "Plygell Chwilio ar sail _Pwnc..."
 
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:85
 msgid "Search Folder from Sen_der..."
 msgstr "Plygell Chwilio ar sail _Danfonwr..."
 
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:86
 msgid "Search for text in the body of the displayed message"
 msgstr "Chwilio am destun yng nghorff y neges a ddangosir"
 
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:87
 msgid "Select _All Text"
 msgstr "Dewis yr _holl destun"
 
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:88
 msgid "Select all the text in a message"
 msgstr "Dewis yr holl destun o fewn y neges"
 
-#: ../ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution.xml.h:27
 msgid "Set up the page settings for your current printer"
 msgstr "Gosod y dewisiadau tudalen i fyny ar gyfer eich argraffydd presennol"
 
-#: ../ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Show a blinking cursor in the body of displayed messages"
-msgstr ""
-"Dangos cyrchwr sy'n chwincian yng nghorff y negeseuon sy'n cael eu dangos"
+msgstr "Dangos cyrchwr sy'n chwincian yng nghorff y negeseuon sy'n cael eu dangos"
 
-#: ../ui/evolution-mail-message.xml.h:95
-msgid "Show messages in the normal style"
-msgstr "Dangos negeseuon yn yr arddull normal"
-
-#: ../ui/evolution-mail-message.xml.h:96
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "Show messages with all email headers"
 msgstr "Dangos negeseuon gyda phob pennawd e-bost"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Show the raw email source of the message"
 msgstr "Dangos ffynhonnell graidd o e-bost y neges"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:93
 msgid "Undelete the selected messages"
 msgstr "Dad-ddileu'r negeseuon a ddewiswyd"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Uni_mportant"
 msgstr "_Ddim yn Bwysig"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Zoom _Out"
 msgstr "_Crebachu"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "_Attached"
 msgstr "_Wedi Atodi"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "_Caret Mode"
 msgstr "Modd _Caret"
 
-#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "_Clear Flag"
 msgstr "_Clirio Baner"
 
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Delete Message"
 msgstr "_Dileu Neges"
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:103
 msgid "_Find in Message..."
 msgstr "_Canfod o fewn y Neges..."
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:104
 msgid "_Flag Completed"
 msgstr "Gosod _Baner 'Wedi Cwblhau'"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:106
 msgid "_Go To"
 msgstr "_Mynd I"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Important"
 msgstr "_Pwysig"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Inline"
 msgstr "Yn _fewnol"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Junk"
 msgstr "_Sothach"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Load Images"
 msgstr "Llwytho _Delweddau"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Message Source"
 msgstr "_Ffynhonnell Neges"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Next Message"
 msgstr "Neges _Nesaf"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:115
 msgid "_Normal Size"
 msgstr "Maint _Arferol"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Not Junk"
 msgstr "_Ddim yn Sothach"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:117
 msgid "_Open in New Window"
 msgstr "Agor mewn Ffenestr _Newydd"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Previous Message"
 msgstr "_Neges Cynt"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Quoted"
 msgstr "_Dyfynnwyd"
 
-#: ../ui/evolution-mail-message.xml.h:128
+#. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
+#: ../ui/evolution-mail-message.xml.h:122
+msgid "_Read"
+msgstr "_Darllen"
+
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Save Message..."
 msgstr "_Cadw Neges..."
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:125
 msgid "_Undelete Message"
 msgstr "_Dad-ddileu Neges"
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Unread"
 msgstr "_Heb Ddarllen"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:127
 msgid "_Zoom"
 msgstr "_Chwyddo"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Zoom In"
 msgstr "_Chwyddo"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "_Cau'r ffenestr hon"
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "Cau"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:3
+#: ../ui/evolution.xml.h:18
 msgid "Main toolbar"
 msgstr "Bar offer"
 
@@ -20361,292 +20949,6 @@ msgstr "Dangos y memo dewisedig"
 msgid "_Open Memo"
 msgstr "_Agor Memo"
 
-#: ../ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Atodi Ffeil"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:13
-msgid "Close the current file"
-msgstr "Cau'r ffeil cyfredol"
-
-#: ../ui/evolution-message-composer.xml.h:5
-msgid "Delete all but signature"
-msgstr "Dileu popeth ond y llofnod"
-
-#: ../ui/evolution-message-composer.xml.h:6
-msgid "Encrypt this message with PGP"
-msgstr "Amgryptio'r neges gyda PGP"
-
-#: ../ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "Amgryptio'r neges gyda'ch Tystysgrif Amgryptiad S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:8
-#: ../ui/evolution-signature-editor.xml.h:14
-msgid "For_mat"
-msgstr "_Fformat"
-
-#: ../ui/evolution-message-composer.xml.h:9
-msgid "Get delivery notification when your message is read"
-msgstr "Cael hysbysiad pan fo'ch neges yn cael ei darllen"
-
-#: ../ui/evolution-message-composer.xml.h:10
-msgid "HT_ML"
-msgstr "_HTML"
-
-#: ../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:15
-msgid "PGP Encrypt"
-msgstr "PGP Amgryptio"
-
-#: ../ui/evolution-message-composer.xml.h:16
-msgid "PGP Sign"
-msgstr "Arwydd PGP"
-
-#: ../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: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: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: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:27
-msgid "Save Draft"
-msgstr "Cadw Drafft"
-
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Save _As..."
-msgstr "Cadw _Fel..."
-
-#: ../ui/evolution-message-composer.xml.h:29
-msgid "Save _Draft"
-msgstr "Cadw _Drafft"
-
-#: ../ui/evolution-message-composer.xml.h:30
-msgid "Save as draft"
-msgstr "Cadw fel drafft"
-
-#: ../ui/evolution-message-composer.xml.h:31
-msgid "Save in folder..."
-msgstr "Cadw mewn plygell..."
-
-#: ../ui/evolution-message-composer.xml.h:32
-msgid "Save the current file"
-msgstr "Cadw'r ffeil cyfredol"
-
-#: ../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:34
-msgid "Save the message in a specified folder"
-msgstr "Cadw'r neges mewn plygell benodol"
-
-#: ../ui/evolution-message-composer.xml.h:35
-msgid "Send"
-msgstr "Anfon"
-
-#: ../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:37
-msgid "Send this message"
-msgstr "Anfon y neges"
-
-#: ../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:39
-msgid "Sign this message with your PGP key"
-msgstr "Llofnodi'r neges gyda'ch allwedd PGP"
-
-#: ../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: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: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: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: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: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: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:48
-msgid "_Bcc Field"
-msgstr "Maes _Bcc"
-
-#: ../ui/evolution-message-composer.xml.h:49
-msgid "_Cc Field"
-msgstr "Maes _Cc"
-
-#: ../ui/evolution-message-composer.xml.h:51
-msgid "_Delete all"
-msgstr "_Dileu'r cwbl"
-
-#: ../ui/evolution-message-composer.xml.h:54
-msgid "_From Field"
-msgstr "Maes _Oddi wrth"
-
-#: ../ui/evolution-message-composer.xml.h:55
-msgid "_Open..."
-msgstr "_Agor..."
-
-#: ../ui/evolution-message-composer.xml.h:56
-msgid "_Post-To Field"
-msgstr "Maes _Postio-i"
-
-#: ../ui/evolution-message-composer.xml.h:57
-msgid "_Prioritize Message"
-msgstr "_Gosod Blaenoriaeth y Neges"
-
-#: ../ui/evolution-message-composer.xml.h:58
-msgid "_Reply-To Field"
-msgstr "Maes _Ateb-i "
-
-#: ../ui/evolution-message-composer.xml.h:60
-msgid "_Security"
-msgstr "_Diogelwch"
-
-#: ../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"
-
-#: ../ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "_Cau"
-
-#: ../ui/evolution-signature-editor.xml.h:15
-msgid "H_TML"
-msgstr "_HTML"
-
-#: ../ui/evolution-signature-editor.xml.h:17
-msgid "Save and Close"
-msgstr "Cadw a Chau"
-
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:21
-msgid "Save and _Close"
-msgstr "Cadw a _Chau"
-
-#: ../ui/evolution-signature-editor.xml.h:22
-msgid "Save the current file and close the window"
-msgstr "Cadw'r ffeil cyfredol a chau'r ffenestr"
-
-#: ../ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr ""
-"Ychwanegu'r blygell at y rhestr o blygellau yr ydych wedi tanysgrifio iddynt"
-
-#: ../ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "Adfywio Rhestr"
-
-#: ../ui/evolution-subscribe.xml.h:4
-msgid "Refresh List of Folders"
-msgstr "Adfywio'r rhestr o blygellau"
-
-#: ../ui/evolution-subscribe.xml.h:5
-msgid "Remove folder from your list of subscribed folders"
-msgstr ""
-"Tynnu'r blygell o'r rhestr o blygellau yr ydych wedi tanysgrifio iddynt"
-
-#: ../ui/evolution-subscribe.xml.h:7
-msgid "Subscribe"
-msgstr "Tanysgrifio"
-
-#: ../ui/evolution-subscribe.xml.h:8
-msgid "Unsubscribe"
-msgstr "Dad-danysgrifio"
-
-#: ../ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Gwrthdroi'r Dewis"
-
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "Cliciwch i newid / gweld manylion statws y dasg"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "Manylion Statws"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "Cylchfa Amser"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "_Manylion Statws"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "Copïo'r tasgau a ddewiswyd"
@@ -20732,83 +21034,92 @@ msgid "Display window buttons with text only"
 msgstr "Dangos botymau ffenestr gyda thestun yn unig"
 
 #: ../ui/evolution.xml.h:10
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Evolution"
+
+#: ../ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "Gadael y rhaglen"
 
-#: ../ui/evolution.xml.h:11
+#: ../ui/evolution.xml.h:12
 msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr ""
-"Anghofio'r cyfrineiriau a gofiwyd, fel eich bod yn cael eich promptio "
-"amdanynt unwaith eto"
+msgstr "Anghofio'r cyfrineiriau a gofiwyd, fel eich bod yn cael eich promptio amdanynt unwaith eto"
 
-#: ../ui/evolution.xml.h:12
+#: ../ui/evolution.xml.h:13
 msgid "Hide window buttons"
 msgstr "Cuddio botymau ffenestr"
 
-#: ../ui/evolution.xml.h:13
+#: ../ui/evolution.xml.h:14
 msgid "I_mport..."
 msgstr "_Mewnforio..."
 
-#: ../ui/evolution.xml.h:14
-msgid "Icons _and text"
+#: ../ui/evolution.xml.h:15
+#, fuzzy
+msgid "Icons _and Text"
 msgstr "Eiconau _a thestun"
 
-#: ../ui/evolution.xml.h:15
+#: ../ui/evolution.xml.h:16
 msgid "Import data from other programs"
 msgstr "Mewnforio data o raglenni eraill"
 
-#: ../ui/evolution.xml.h:16
+#: ../ui/evolution.xml.h:17
 msgid "Lay_out"
 msgstr "_Cynllun"
 
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:19
 msgid "New _Window"
 msgstr "_Ffenestr Newydd"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:20
+msgid "Open the Frequently Asked Questions webpage"
+msgstr "Agor tudalen wê Cwestiynau a Ofynnir yn Aml"
+
+#: ../ui/evolution.xml.h:21
+#, fuzzy
+msgid "Page Set_up..."
+msgstr "Gosodiad Tudalen:"
+
+#: ../ui/evolution.xml.h:22
 msgid "Prefere_nces"
 msgstr "H_offterau"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "Anfon / Derbyn"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:24
 msgid "Send / _Receive"
 msgstr "Anfon / _Derbyn"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:25
 msgid "Send queued items and retrieve new items"
 msgstr "Anfon yr eitemau sydd yn y ciw, a galw am eitemau newydd"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:26
 msgid "Set up Pilot configuration"
 msgstr "Gosod cyfluniad _Peilot"
 
-#: ../ui/evolution.xml.h:24
+#: ../ui/evolution.xml.h:28
 msgid "Show Side _Bar"
 msgstr "Dangos _Bar Ochr"
 
-#: ../ui/evolution.xml.h:25
+#: ../ui/evolution.xml.h:29
 msgid "Show _Status Bar"
 msgstr "Dangos Bar _Statws"
 
-#: ../ui/evolution.xml.h:26
+#: ../ui/evolution.xml.h:30
 msgid "Show _Toolbar"
 msgstr "Dangos _Bar Offer"
 
-#: ../ui/evolution.xml.h:27
+#: ../ui/evolution.xml.h:31
 msgid "Show information about Evolution"
 msgstr "Dangos gwybodaeth ynghylch Evolution"
 
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:32
 msgid "Submit Bug Report"
 msgstr "Anfon Adroddiad Nam"
 
-#. <menuitem name="HelpFAQ" verb=""
-#. _label="Evolution _FAQ"/>
-#.
-#. <separator/>
 #: ../ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr "Anfon Adroddiad _Nam"
@@ -20822,7 +21133,8 @@ msgid "Toggle whether we are working offline."
 msgstr "Toglu a ydyn ni'n gweithio all-lein."
 
 #: ../ui/evolution.xml.h:36
-msgid "Tool_bar style"
+#, fuzzy
+msgid "Tool_bar Style"
 msgstr "_Arddull bar offer"
 
 #: ../ui/evolution.xml.h:37
@@ -20834,46 +21146,55 @@ msgid "View/Hide the Status Bar"
 msgstr "Cuddio/Gweld y Bar Statws"
 
 #: ../ui/evolution.xml.h:39
+#, fuzzy
+msgid "Work _Offline"
+msgstr "Gweithio All-lein"
+
+#: ../ui/evolution.xml.h:40
 msgid "_About"
 msgstr "_Ynghylch"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "_Cau Ffenestr"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
 msgstr "Anghofio _Cyfrineiriau"
 
 #: ../ui/evolution.xml.h:45
-msgid "_Hide buttons"
-msgstr "_Cuddio botymau"
+msgid "_Frequently Asked Questions"
+msgstr "Cwestiynau a Ofynnir yn _Aml"
 
-#: ../ui/evolution.xml.h:46
-msgid "_Icons only"
-msgstr "_Eiconau'n unig"
+#: ../ui/evolution.xml.h:47
+msgid "_Hide Buttons"
+msgstr "_Cuddio Botymau"
 
 #: ../ui/evolution.xml.h:48
+msgid "_Icons Only"
+msgstr "_Eiconau'n Unig"
+
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "Cyfeiriad _Cyflym"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "_Gadael"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr "_Ymddangosiad y Newidydd"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
 msgstr "_Opsiynau Cysoni..."
 
-#: ../ui/evolution.xml.h:52
-msgid "_Text only"
-msgstr "_Testun yn unig"
-
 #: ../ui/evolution.xml.h:54
+msgid "_Text Only"
+msgstr "_Testun Yn Unig"
+
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "_Ffenestr"
 
@@ -20886,8 +21207,9 @@ msgid "_Address Cards"
 msgstr "Cardiau _Cyfeiriad"
 
 #: ../views/addressbook/galview.xml.h:3
-msgid "_Phone List"
-msgstr "Rhestr _Ffôn"
+#: ../views/calendar/galview.xml.h:3
+msgid "_List View"
+msgstr "Golwg _Rhestr"
 
 #: ../views/calendar/galview.xml.h:1
 msgid "W_eek View"
@@ -20897,10 +21219,6 @@ msgstr "Golwg _Wythnos"
 msgid "_Day View"
 msgstr "Golwg _Dydd"
 
-#: ../views/calendar/galview.xml.h:3
-msgid "_List View"
-msgstr "Golwg _Rhestr"
-
 #: ../views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "Golwg _Mis"
@@ -20953,12 +21271,12 @@ msgstr "Gyda _Dyddiad Dod i Ben"
 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: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
+#. Put the "UTC" entry at the top of the combo's list.
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:428
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:430
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:432
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:771
 msgid "UTC"
 msgstr "UTC"
 
@@ -20975,32 +21293,30 @@ msgid "Select a Time Zone"
 msgstr "Dewiswch Gylchfa Amser"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
-msgid "TimeZone Combobox"
-msgstr "Blwch combo cylchfa amser"
+msgid "Timezone drop-down combination box"
+msgstr ""
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
+"Use the left mouse button to zoom in on an area of the map and select a time zone.\n"
 "Use the right mouse button to zoom out."
 msgstr ""
-"Defnyddiwch fotwm chwith y llygoden i chwyddo un ardal o'r map a dewis "
-"cylchfa amser.\n"
+"Defnyddiwch fotwm chwith y llygoden i chwyddo un ardal o'r map a dewis cylchfa amser.\n"
 "Defnyddiwch fotwm de'r llygoden i grebachu."
 
-#: ../widgets/menus/gal-define-views-dialog.c:76
-#: ../widgets/menus/gal-define-views-model.c:188
+#: ../widgets/menus/gal-define-views-dialog.c:74
+#: ../widgets/menus/gal-define-views-model.c:185
 msgid "Collection"
 msgstr "Casgliad"
 
-#: ../widgets/menus/gal-define-views-dialog.c:325
+#: ../widgets/menus/gal-define-views-dialog.c:356
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Diffinio Golygon ar gyfer %s"
 
-#: ../widgets/menus/gal-define-views-dialog.c:333
-#: ../widgets/menus/gal-define-views-dialog.c:335
+#: ../widgets/menus/gal-define-views-dialog.c:364
+#: ../widgets/menus/gal-define-views-dialog.c:366
 msgid "Define Views"
 msgstr "Diffinio Golygon"
 
@@ -21009,22 +21325,17 @@ msgstr "Diffinio Golygon"
 msgid "Define Views for \"%s\""
 msgstr "Diffinio Golygon ar gyfer \"%s\""
 
-#: ../widgets/menus/gal-define-views.glade.h:5
-msgid "_Edit..."
-msgstr "_Golygu..."
-
-#: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1907
-#: ../widgets/table/e-table-scrolled.c:222
-#: ../widgets/table/e-table-scrolled.c:223
+#: ../widgets/menus/gal-view-factory-etable.c:37
+#: ../widgets/table/e-table-scrolled.c:215
+#: ../widgets/table/e-table-scrolled.c:216
 msgid "Table"
 msgstr "Tabl"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:182
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
 msgid "Instance"
 msgstr "Enghraifft"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:232
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:281
 msgid "Save Current View"
 msgstr "Cadw'r olwg Gyfredol"
 
@@ -21037,50 +21348,50 @@ msgid "_Replace existing view"
 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:354
+#: ../widgets/menus/gal-view-instance.c:580
+#: ../widgets/menus/gal-view-menus.c:365
 msgid "Custom View"
 msgstr "Golwg _Addasedig"
 
-#: ../widgets/menus/gal-view-instance.c:588
+#: ../widgets/menus/gal-view-instance.c:581
 msgid "Save Custom View"
 msgstr "Cadw Golwg Addasedig"
 
-#: ../widgets/menus/gal-view-instance.c:592
-#: ../widgets/menus/gal-view-menus.c:378
+#: ../widgets/menus/gal-view-instance.c:585
+#: ../widgets/menus/gal-view-menus.c:388
 msgid "Define Views..."
 msgstr "Diffinio Golygon..."
 
-#: ../widgets/menus/gal-view-menus.c:291
+#: ../widgets/menus/gal-view-menus.c:304
 msgid "C_urrent View"
 msgstr "_Golwg Gyfredol"
 
-#: ../widgets/menus/gal-view-menus.c:315
+#: ../widgets/menus/gal-view-menus.c:327
 #, c-format
 msgid "Select View: %s"
 msgstr "Dewis Golwg: %s"
 
-#: ../widgets/menus/gal-view-menus.c:359
+#: ../widgets/menus/gal-view-menus.c:370
 msgid "Current view is a customized view"
 msgstr "Golwg addasedig yw'r olwg bresennol"
 
-#: ../widgets/menus/gal-view-menus.c:364
+#: ../widgets/menus/gal-view-menus.c:374
 msgid "Save Custom View..."
 msgstr "Cadw Golwg Addasedig..."
 
-#: ../widgets/menus/gal-view-menus.c:369
+#: ../widgets/menus/gal-view-menus.c:379
 msgid "Save current custom view"
 msgstr "Cadw'r olwg addasedig gyfredol"
 
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:393
 msgid "Create or edit views"
 msgstr "Creu neu olygu golygon"
 
-#: ../widgets/menus/gal-view-new-dialog.c:80
+#: ../widgets/menus/gal-view-new-dialog.c:68
 msgid "Factory"
 msgstr "Ffatri"
 
-#: ../widgets/menus/gal-view-new-dialog.c:115
+#: ../widgets/menus/gal-view-new-dialog.c:103
 msgid "Define New View"
 msgstr "Diffinio Golwg Newydd"
 
@@ -21096,345 +21407,401 @@ 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:940
+msgid "Attached message"
+msgstr "Neges wedi'i hatodi"
+
+#. Translators: Default attachment filename.
+#: ../widgets/misc/e-attachment.c:1723
+#: ../widgets/misc/e-attachment.c:2261
+#: ../widgets/misc/e-attachment-store.c:636
+msgid "attachment.dat"
+msgstr "atodiad.dat"
+
+#: ../widgets/misc/e-attachment.c:1770
+#: ../widgets/misc/e-attachment.c:2567
+msgid "A load operation is already in progress"
+msgstr ""
+
+#: ../widgets/misc/e-attachment.c:1778
+#: ../widgets/misc/e-attachment.c:2575
+msgid "A save operation is already in progress"
+msgstr ""
+
+#: ../widgets/misc/e-attachment.c:1871
+#, fuzzy, c-format
+msgid "Could not load '%s'"
+msgstr "Methwyd llwytho'r llyfr cyfeiriadau"
 
-#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
-#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
+#: ../widgets/misc/e-attachment.c:1874
+#, fuzzy, c-format
+msgid "Could not load the attachment"
+msgstr "Math cynnwys yr atodiad."
+
+#: ../widgets/misc/e-attachment.c:2138
 #, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "Methu atodi ffeil %s: %s"
+msgid "Could not open '%s'"
+msgstr "Methu agor '%s"
+
+#: ../widgets/misc/e-attachment.c:2141
+#, fuzzy, c-format
+msgid "Could not open the attachment"
+msgstr "Math cynnwys yr atodiad."
+
+#: ../widgets/misc/e-attachment.c:2583
+#, fuzzy
+msgid "Attachment contents not loaded"
+msgstr "Atodiad i'w ychwanegu."
 
-#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
+#: ../widgets/misc/e-attachment.c:2660
 #, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "Methu atodi'r ffeil %s: nid yw'n ffeil arferol"
+msgid "Could not save '%s'"
+msgstr "Methu arbed '%s'"
 
-#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/e-attachment.c:2663
+#, fuzzy, c-format
+msgid "Could not save the attachment"
+msgstr "Math cynnwys yr atodiad."
+
+#: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "Priodweddau atodiad"
 
-#: ../widgets/misc/e-attachment.glade.h:3
-msgid "File name:"
-msgstr "Enw'r ffeil:"
+#: ../widgets/misc/e-attachment-dialog.c:328
+msgid "_Filename:"
+msgstr "Enw _ffeil:"
 
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "MIME type:"
+#: ../widgets/misc/e-attachment-dialog.c:363
+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"
+#: ../widgets/misc/e-attachment-handler-image.c:95
+#, fuzzy
+msgid "Could not set as background"
+msgstr "Gosodwch fel _Cefndir"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: ../widgets/misc/e-calendar-item.c:416
-msgid "MTWTFSS"
-msgstr "LMMIGSS"
+#: ../widgets/misc/e-attachment-handler-sendto.c:87
+#, fuzzy
+msgid "Could not send attachment"
+msgid_plural "Could not send attachments"
+msgstr[0] "Methwyd agor y ffynhonnell"
+msgstr[1] "Methwyd agor y ffynhonnell"
+msgstr[2] "Methwyd agor y ffynhonnell"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:129
+msgid "_Send To..."
+msgstr "_Anfon At:"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:131
+#, fuzzy
+msgid "Send the selected attachments somewhere"
+msgstr "Dewiswch blygell i gadw'r atodiadau sydd wedi'u dewis..."
+
+#: ../widgets/misc/e-attachment-icon-view.c:473
+#: ../widgets/misc/e-attachment-tree-view.c:517
+msgid "Loading"
+msgstr "Llwytho"
+
+#: ../widgets/misc/e-attachment-icon-view.c:485
+#: ../widgets/misc/e-attachment-tree-view.c:529
+msgid "Saving"
+msgstr "Arbed"
+
+#: ../widgets/misc/e-attachment-paned.c:81
+msgid "Hide _Attachment Bar"
+msgstr "Cuddio'r Bar _Atodiadau"
+
+#: ../widgets/misc/e-attachment-paned.c:83
+#: ../widgets/misc/e-attachment-paned.c:620
+msgid "Show _Attachment Bar"
+msgstr "Dangos y Bar _Atodiadau"
+
+#: ../widgets/misc/e-attachment-store.c:541
+msgid "Add Attachment"
+msgstr "Ychwanegu Atodiad"
+
+#: ../widgets/misc/e-attachment-store.c:544
+msgid "A_ttach"
+msgstr "_Atodi"
+
+#: ../widgets/misc/e-attachment-store.c:607
+msgid "Save Attachment"
+msgid_plural "Save Attachments"
+msgstr[0] "Cadw Atodiad"
+msgstr[1] "Cadw Atodiadau"
+msgstr[2] "Cadw Atodiadau"
+
+#: ../widgets/misc/e-attachment-view.c:300
+msgid "S_ave All"
+msgstr "Cadw _Pob Un"
+
+#: ../widgets/misc/e-attachment-view.c:326
+#, fuzzy
+msgid "A_dd Attachment..."
+msgstr "Ychwanegu _atodiad..."
+
+#: ../widgets/misc/e-attachment-view.c:643
+#, c-format
+msgid "Open with \"%s\""
+msgstr "Agor gyda \"%s\""
+
+#: ../widgets/misc/e-attachment-view.c:646
+#, fuzzy, c-format
+msgid "Open this attachment in %s"
+msgstr "Lleoliad cadw atodiad"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1088
-#: ../widgets/misc/e-calendar-item.c:1742
+#: ../widgets/misc/e-calendar-item.c:1253
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:217
 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:1235
-#: ../widgets/text/e-entry.c:1236 ../widgets/text/e-text.c:3581
-#: ../widgets/text/e-text.c:3582
+#: ../widgets/misc/e-canvas-background.c:454
+#: ../widgets/misc/e-canvas-background.c:455
+#: ../widgets/text/e-text.c:3632
+#: ../widgets/text/e-text.c:3633
 msgid "Fill color"
 msgstr "Lliw llenwi"
 
-#: ../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: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
+#: ../widgets/misc/e-canvas-background.c:461
+#: ../widgets/misc/e-canvas-background.c:462
+#: ../widgets/misc/e-canvas-background.c:468
+#: ../widgets/misc/e-canvas-background.c:469
+#: ../widgets/text/e-text.c:3639
+#: ../widgets/text/e-text.c:3640
+#: ../widgets/text/e-text.c:3646
+#: ../widgets/text/e-text.c:3647
 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:1256
-#: ../widgets/text/e-entry.c:1257 ../widgets/text/e-text.c:3603
-#: ../widgets/text/e-text.c:3604
+#: ../widgets/misc/e-canvas-background.c:475
+#: ../widgets/misc/e-canvas-background.c:476
+#: ../widgets/text/e-text.c:3653
+#: ../widgets/text/e-text.c:3654
 msgid "Fill stipple"
 msgstr "Llenwi dotwaith"
 
-#: ../widgets/misc/e-canvas-background.c:485
-#: ../widgets/misc/e-canvas-background.c:486
+#: ../widgets/misc/e-canvas-background.c:482
+#: ../widgets/misc/e-canvas-background.c:483
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:492
-#: ../widgets/misc/e-canvas-background.c:493
+#: ../widgets/misc/e-canvas-background.c:489
+#: ../widgets/misc/e-canvas-background.c:490
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:499
-#: ../widgets/misc/e-canvas-background.c:500
+#: ../widgets/misc/e-canvas-background.c:496
+#: ../widgets/misc/e-canvas-background.c:497
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:506
-#: ../widgets/misc/e-canvas-background.c:507
+#: ../widgets/misc/e-canvas-background.c:503
+#: ../widgets/misc/e-canvas-background.c:504
 msgid "Y2"
 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:3017
+#: ../widgets/misc/e-canvas-vbox.c:89
+#: ../widgets/misc/e-reflow.c:1414
+#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-leaf.c:649
+#: ../widgets/table/e-table-item.c:3062
 msgid "Minimum width"
 msgstr "Lleiafswm lled"
 
-#: ../widgets/misc/e-canvas-vbox.c: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:3018
+#: ../widgets/misc/e-canvas-vbox.c:90
+#: ../widgets/misc/e-reflow.c:1415
+#: ../widgets/table/e-table-group-container.c:1002
+#: ../widgets/table/e-table-group-leaf.c:650
+#: ../widgets/table/e-table-item.c:3063
 msgid "Minimum Width"
 msgstr "Lleiafswm Lled"
 
-#: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-canvas-vbox.c:101
+#: ../widgets/misc/e-canvas-vbox.c:102
 msgid "Spacing"
 msgstr "Bylchu"
 
-#: ../widgets/misc/e-cell-date-edit.c:231
+#: ../widgets/misc/e-cell-date-edit.c:296
 msgid "Now"
 msgstr "Nawr"
 
-#: ../widgets/misc/e-cell-date-edit.c:795
+#: ../widgets/misc/e-cell-date-edit.c:846
 #, 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:79
+#: ../widgets/misc/e-cell-percent.c:76
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Rhaid i'r canran fod rhwng 0 a 100, yn gynwysedig."
 
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:57
+msgid "Arabic"
+msgstr "Arabeg"
+
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "Balteg"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "Canol Ewrop"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "Tseinëeg"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "Syrilig"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "Groeg"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Hebrew"
 msgstr "Hebraeg"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Japanese"
 msgstr "Japaneg"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Korean"
 msgstr "Corëeg"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Thai"
 msgstr "Thai"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
 msgstr "Tyrceg"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Unicode"
 msgstr "Unicode"
 
-#: ../widgets/misc/e-charset-picker.c:75
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Western European"
 msgstr "Gorllewin Ewrop"
 
-#: ../widgets/misc/e-charset-picker.c:76
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Western European, New"
 msgstr "Gorllewin Ewrop, Newydd"
 
-#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
-#: ../widgets/misc/e-charset-picker.c:96
+#: ../widgets/misc/e-charset-picker.c:89
+#: ../widgets/misc/e-charset-picker.c:90
+#: ../widgets/misc/e-charset-picker.c:91
 msgid "Traditional"
 msgstr "Traddodiadol"
 
-#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
-#: ../widgets/misc/e-charset-picker.c:99
-#: ../widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:92
+#: ../widgets/misc/e-charset-picker.c:93
+#: ../widgets/misc/e-charset-picker.c:94
+#: ../widgets/misc/e-charset-picker.c:95
 msgid "Simplified"
 msgstr "Symledig"
 
-#: ../widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:98
 msgid "Ukrainian"
 msgstr "Wcraneg"
 
-#: ../widgets/misc/e-charset-picker.c:106
+#: ../widgets/misc/e-charset-picker.c:101
 msgid "Visual"
 msgstr "Gweledol"
 
-#: ../widgets/misc/e-charset-picker.c:175
+#: ../widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Set nodau anhysbys: %s"
 
-#: ../widgets/misc/e-charset-picker.c:220
+#: ../widgets/misc/e-charset-picker.c:215
 msgid "Character Encoding"
 msgstr "Amgodiad Nodau "
 
-#: ../widgets/misc/e-charset-picker.c:235
+#: ../widgets/misc/e-charset-picker.c:230
 msgid "Enter the character set to use"
 msgstr "Rhowch y set nodau i'w defnyddio"
 
-#: ../widgets/misc/e-charset-picker.c:342
+#: ../widgets/misc/e-charset-picker.c:337
 msgid "Other..."
 msgstr "Arall..."
 
-#: ../widgets/misc/e-charset-picker.c:483
+#: ../widgets/misc/e-charset-picker.c:599
 msgid "Ch_aracter Encoding"
 msgstr "Amgodiad _Nodau "
 
-#. 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 "..."
-
-#: ../widgets/misc/e-dateedit.c:321
+#: ../widgets/misc/e-dateedit.c:295
 msgid "Date and Time"
 msgstr "Dyddiad ac Amser"
 
-#: ../widgets/misc/e-dateedit.c:340
+#: ../widgets/misc/e-dateedit.c:315
 msgid "Text entry to input date"
 msgstr "Bwlch testun i roi'r dyddiad"
 
-#: ../widgets/misc/e-dateedit.c:362
+#: ../widgets/misc/e-dateedit.c:337
 msgid "Click this button to show a calendar"
 msgstr "Cliciwch y botwm i ddangos calendr"
 
-#: ../widgets/misc/e-dateedit.c:384
-msgid "Combo box to select time"
+#: ../widgets/misc/e-dateedit.c:379
+#, fuzzy
+msgid "Drop-down combination box to select time"
 msgstr "Blwch combo i ddewis amser"
 
-#: ../widgets/misc/e-dateedit.c:385
-msgid "Time"
-msgstr "Amser"
-
-#: ../widgets/misc/e-dateedit.c:459
+#: ../widgets/misc/e-dateedit.c:455
 msgid "No_w"
 msgstr "_Nawr"
 
-#: ../widgets/misc/e-dateedit.c:465
+#: ../widgets/misc/e-dateedit.c:461
 msgid "_Today"
 msgstr "_Heddiw"
 
-#: ../widgets/misc/e-dateedit.c:1631
+#: ../widgets/misc/e-dateedit.c:1583
 msgid "Invalid Date Value"
 msgstr "Gwerth Dyddiad Annilys"
 
-#: ../widgets/misc/e-dateedit.c:1657
+#: ../widgets/misc/e-dateedit.c:1613
 msgid "Invalid Time Value"
 msgstr "Gwerth Amser Annilys"
 
-#: ../widgets/misc/e-expander.c:182
-msgid "Expanded"
-msgstr "Ehangwyd"
-
-#: ../widgets/misc/e-expander.c:183
-msgid "Whether or not the expander is expanded"
-msgstr "A yw'r chwyddwr wedi ei chwyddo ai peidio"
-
-#: ../widgets/misc/e-expander.c:191
-msgid "Text of the expander's label"
-msgstr "Testun label yr ehangydd"
-
-#: ../widgets/misc/e-expander.c:198
-msgid "Use underline"
-msgstr "Defnyddio tanlinellu"
-
-#: ../widgets/misc/e-expander.c:199
-msgid ""
-"If set, an underline in the text indicates the next character should be used "
-"for the mnemonic accelerator key"
-msgstr ""
-"A ddylid defnyddio tanlinellu yn y testun er mwyn dynodi y dylid defnyddio'r "
-"nod nesaf fel cof-lythyren bysell cyflymu"
-
-#: ../widgets/misc/e-expander.c:207
-msgid "Space to put between the label and the child"
-msgstr "Y gofod i'w roi rhwng y label a'r plentyn"
-
-#: ../widgets/misc/e-expander.c:216
-msgid "Label widget"
-msgstr "Teclyn label"
-
-#: ../widgets/misc/e-expander.c:217
-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:3316
-msgid "Expander Size"
-msgstr "Maint Ehangwr"
-
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3317
-msgid "Size of the expander arrow"
-msgstr "Maint y saeth ehangu"
-
-#: ../widgets/misc/e-expander.c:232
-msgid "Indicator Spacing"
-msgstr "Bylchiad Dangosydd"
-
-#: ../widgets/misc/e-expander.c:233
-msgid "Spacing around expander arrow"
-msgstr "Y gofod o amgylch y saeth chwyddo"
-
 #. FIXME: get the toplevel window...
-#: ../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
+#: ../widgets/misc/e-filter-bar.c:123
+#: ../widgets/misc/e-filter-bar.c:178
+#: ../widgets/misc/e-filter-bar.c:306
+#: ../widgets/misc/e-filter-bar.c:737
 msgid "Advanced Search"
 msgstr "Chwilio Uwch"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:218
+#: ../widgets/misc/e-filter-bar.c:229
 msgid "Save Search"
 msgstr "Cadw Chwiliad"
 
-#: ../widgets/misc/e-filter-bar.c:252
+#: ../widgets/misc/e-filter-bar.c:266
 msgid "_Searches"
 msgstr "_Chwiliadau"
 
-#: ../widgets/misc/e-filter-bar.c:254
+#: ../widgets/misc/e-filter-bar.c:268
 msgid "Searches"
 msgstr "Chwiliadau"
 
-#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:111
+#: ../widgets/misc/e-filter-bar.h:100
+#: ../widgets/misc/e-filter-bar.h:110
 msgid "_Save Search..."
 msgstr "_Cadw Chwiliad..."
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:101
+#: ../widgets/misc/e-filter-bar.h:111
 msgid "_Edit Saved Searches..."
 msgstr "_Golygu Chwiliadau wedi'u Harbed..."
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:102
+#: ../widgets/misc/e-filter-bar.h:112
 msgid "_Advanced Search..."
 msgstr "_Chwilio Uwch..."
 
@@ -21450,114 +21817,130 @@ msgstr "Cyfrif Presennol"
 msgid "Current Folder"
 msgstr "Plygell Bresennol"
 
-#: ../widgets/misc/e-filter-bar.h:106
-msgid "Current Message"
-msgstr "Neges Bresennol"
-
-#: ../widgets/misc/e-image-chooser.c:172
+#: ../widgets/misc/e-image-chooser.c:166
 msgid "Choose Image"
 msgstr "Dewiswch Ddelwedd"
 
-#: ../widgets/misc/e-map.c:627
+#: ../widgets/misc/e-map.c:605
 msgid "World Map"
 msgstr "Map y Byd"
 
-#: ../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."
+#: ../widgets/misc/e-map.c:607
+#, fuzzy
+msgid "Mouse-based interactive map widget for selecting timezone. Keyboard users should instead select the timezone from the drop-down combination box below."
+msgstr "Teclyn map rhyngweithiol, sy'n defnyddio'r llygoden er mwyn dewis cylchfa amser. Dylai defnyddwyr y bysellfwrdd, yn lle hynny, ddewis y gylchfa amser o'r blwch combo sydd isod."
+
+#: ../widgets/misc/e-online-button.c:106
+msgid "Online"
+msgstr "Arlein"
+
+#: ../widgets/misc/e-online-button.c:107
+msgid "The button state is online"
 msgstr ""
-"Teclyn map rhyngweithiol, sy'n defnyddio'r llygoden er mwyn dewis cylchfa "
-"amser. Dylai defnyddwyr y bysellfwrdd, yn lle hynny, ddewis y gylchfa amser "
-"o'r blwch combo sydd isod."
 
-#: ../widgets/misc/e-pilot-settings.c:103
+#: ../widgets/misc/e-pilot-settings.c:99
 msgid "Sync with:"
 msgstr "Cysoni gyda:"
 
-#: ../widgets/misc/e-pilot-settings.c:111
+#: ../widgets/misc/e-pilot-settings.c:107
 msgid "Sync Private Records:"
 msgstr "Cysoni Cofnodion Preifat..."
 
-#: ../widgets/misc/e-pilot-settings.c:120
+#: ../widgets/misc/e-pilot-settings.c:116
 msgid "Sync Categories:"
 msgstr "Cysoni Categorïau:"
 
-#: ../widgets/misc/e-reflow.c:1451 ../widgets/misc/e-reflow.c:1452
+#: ../widgets/misc/e-reflow.c:1435
+#: ../widgets/misc/e-reflow.c:1436
 msgid "Empty message"
 msgstr "Neges wag"
 
-#: ../widgets/misc/e-reflow.c:1458 ../widgets/misc/e-reflow.c:1459
+#: ../widgets/misc/e-reflow.c:1442
+#: ../widgets/misc/e-reflow.c:1443
 msgid "Reflow model"
 msgstr "Ail-redeg model"
 
-#: ../widgets/misc/e-reflow.c:1465 ../widgets/misc/e-reflow.c:1466
+#: ../widgets/misc/e-reflow.c:1449
+#: ../widgets/misc/e-reflow.c:1450
 msgid "Column width"
 msgstr "Lled colofn"
 
-#: ../widgets/misc/e-search-bar.c:598
+#: ../widgets/misc/e-search-bar.c:92
+#: ../widgets/misc/e-search-bar.c:359
+#: ../widgets/misc/e-search-bar.c:503
+#: ../widgets/misc/e-search-bar.c:505
+#: ../widgets/misc/e-search-bar.c:1021
+msgid "Search"
+msgstr "Chwilio"
+
+#: ../widgets/misc/e-search-bar.c:359
+#: ../widgets/misc/e-search-bar.c:503
+#: ../widgets/misc/e-search-bar.c:505
+#, fuzzy
+msgid "Click here to change the search type"
+msgstr "Cliciwch yma er mwyn atodi ffeil"
+
+#: ../widgets/misc/e-search-bar.c:637
 msgid "_Search"
 msgstr "_Chwilio"
 
-#: ../widgets/misc/e-search-bar.c:604
+#: ../widgets/misc/e-search-bar.c:643
 msgid "_Find Now"
 msgstr "_Canfod Nawr"
 
-#: ../widgets/misc/e-search-bar.c:605
+#: ../widgets/misc/e-search-bar.c:644
 msgid "_Clear"
 msgstr "_Clirio"
 
-#: ../widgets/misc/e-search-bar.c:856
+#: ../widgets/misc/e-search-bar.c:899
 msgid "Item ID"
 msgstr "ID Eitem"
 
-#: ../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
+#: ../widgets/misc/e-search-bar.c:906
+#: ../widgets/text/e-text.c:3555
+#: ../widgets/text/e-text.c:3556
 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:997
+#: ../widgets/misc/e-search-bar.c:1053
 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:1014
+#: ../widgets/misc/e-search-bar.c:1072
 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:1026
+#: ../widgets/misc/e-search-bar.c:1088
 msgid " i_n "
 msgstr "o _fewn"
 
-#: ../widgets/misc/e-selection-model-array.c:547
-#: ../widgets/table/e-tree-selection-model.c:811
+#: ../widgets/misc/e-selection-model-array.c:593
+#: ../widgets/table/e-tree-selection-model.c:803
 msgid "Cursor Row"
 msgstr "Rhes y Cyrchwr"
 
-#: ../widgets/misc/e-selection-model-array.c:554
-#: ../widgets/table/e-tree-selection-model.c:818
+#: ../widgets/misc/e-selection-model-array.c:600
+#: ../widgets/table/e-tree-selection-model.c:810
 msgid "Cursor Column"
 msgstr "Colofn y Cyrchwr"
 
-#: ../widgets/misc/e-selection-model.c:214
+#: ../widgets/misc/e-selection-model.c:208
 msgid "Sorter"
 msgstr "Trefnydd"
 
-#: ../widgets/misc/e-selection-model.c:221
+#: ../widgets/misc/e-selection-model.c:215
 msgid "Selection Mode"
 msgstr "Modd Dewis"
 
-#: ../widgets/misc/e-selection-model.c:229
+#: ../widgets/misc/e-selection-model.c:223
 msgid "Cursor Mode"
 msgstr "Modd Cyrchwr"
 
-#: ../widgets/misc/e-send-options.c:522
+#: ../widgets/misc/e-send-options.c:519
 msgid "When de_leted:"
 msgstr "Wedi _dileu:"
 
@@ -21582,22 +21965,18 @@ msgid "A_uto-delete sent item"
 msgstr "_Awto-ddileu eitem anfonwyd"
 
 #: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "Dosbarthiad"
-
-#: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr "_Creu eitem wedi'i anfon er mwyn dilyn gwybodaeth"
 
-#: ../widgets/misc/e-send-options.glade.h:8
+#: ../widgets/misc/e-send-options.glade.h:7
 msgid "Deli_vered and opened"
 msgstr "Wedi'i _anfon a'i agor"
 
-#: ../widgets/misc/e-send-options.glade.h:9
+#: ../widgets/misc/e-send-options.glade.h:8
 msgid "Gene_ral Options"
 msgstr "_Opsiynau Cyffredinol"
 
-#: ../widgets/misc/e-send-options.glade.h:10
+#: ../widgets/misc/e-send-options.glade.h:9
 msgid ""
 "None\n"
 "Mail Receipt"
@@ -21605,7 +21984,7 @@ msgstr ""
 "Dim\n"
 "Derbyniad yr e-bost"
 
-#: ../widgets/misc/e-send-options.glade.h:12
+#: ../widgets/misc/e-send-options.glade.h:11
 msgid ""
 "Normal\n"
 "Proprietary\n"
@@ -21621,15 +22000,15 @@ msgstr ""
 "Tra Chyfrinachol\n"
 "I'ch Llygaid Chi'n Unig"
 
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.glade.h:17
 msgid "R_eply requested"
 msgstr "Mae cais am _ymateb"
 
-#: ../widgets/misc/e-send-options.glade.h:20
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid "Sta_tus Tracking"
 msgstr "Dilyn _Statws"
 
-#: ../widgets/misc/e-send-options.glade.h:21
+#: ../widgets/misc/e-send-options.glade.h:20
 msgid ""
 "Undefined\n"
 "High\n"
@@ -21641,259 +22020,231 @@ msgstr ""
 "Arferol\n"
 "Isel"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When acce_pted:"
 msgstr "Ar ôl _derbyn:"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When co_mpleted:"
 msgstr "_Ar ôl gorffen:"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:26
 msgid "When decli_ned:"
 msgstr "Ar ôl _gwrthod:"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "Wi_thin"
 msgstr "O _fewn"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:28
 msgid "_After:"
 msgstr "_Wedi:"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "_All information"
 msgstr "_Pob gwybodaeth"
 
-#: ../widgets/misc/e-send-options.glade.h:31
+#: ../widgets/misc/e-send-options.glade.h:30
+msgid "_Classification:"
+msgstr "_Dosbarthiad:"
+
+#. To translators: This means Delay the message delivery for some time
+#: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Delay message delivery"
 msgstr "_Oedi anfon neges"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Delivered"
 msgstr "_Wedi'i drosglwyddo"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_Set expiration date"
 msgstr "Gosod dyddiad _dod i ben"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "_Until:"
 msgstr "_Tan:"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:37
 msgid "_When convenient"
 msgstr "_Pan yn gyfleus"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:38
 msgid "_When opened:"
 msgstr "Ar ôl _agor:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:213
+#: ../widgets/misc/e-task-widget.c:251
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:219
+#: ../widgets/misc/e-task-widget.c:257
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% yn gyflawn)"
 
-#: ../widgets/misc/e-url-entry.c:107
+#: ../widgets/misc/e-url-entry.c:103
 msgid "Click here to go to URL"
 msgstr "cliciwch yma i fynd i'r LAU"
 
-#: ../widgets/misc/gal-categories.glade.h:1
-msgid "Edit Master Category List..."
-msgstr "Golygu'r Rhestr Gategorïau Gyffredinol..."
-
-#: ../widgets/misc/gal-categories.glade.h:2
-msgid "Item(s) belong to these _categories:"
-msgstr "Eitem(au) yn perthyn i'r _categorïau yma:"
-
-#: ../widgets/misc/gal-categories.glade.h:3
-msgid "_Available Categories:"
-msgstr "Categorïau _Ar Gael:"
-
-#: ../widgets/misc/gal-categories.glade.h:4
-msgid "categories"
-msgstr "categorïau"
-
-#: ../widgets/table/e-cell-combo.c:177
+#: ../widgets/table/e-cell-combo.c:171
 msgid "popup list"
 msgstr "rhestr naidlenni"
 
-#: ../widgets/table/e-cell-date.c:64
+#: ../widgets/table/e-cell-date.c:63
 msgid "%l:%M %p"
 msgstr "%l:%M %p"
 
-#: ../widgets/table/e-cell-pixbuf.c:387
+#: ../widgets/table/e-cell-pixbuf.c:360
 msgid "Selected Column"
 msgstr "Colofn Wedi Dewis"
 
-#: ../widgets/table/e-cell-pixbuf.c:394
+#: ../widgets/table/e-cell-pixbuf.c:367
 msgid "Focused Column"
 msgstr "Colofn Wedi Ffocysu"
 
-#: ../widgets/table/e-cell-pixbuf.c:401
+#: ../widgets/table/e-cell-pixbuf.c:374
 msgid "Unselected Column"
 msgstr "Colofn Wedi Dad-Ddewis"
 
-#: ../widgets/table/e-cell-text.c:1802
+#: ../widgets/table/e-cell-text.c:1788
 msgid "Strikeout Column"
 msgstr "Colofn Wedi Taro Drwyddi"
 
-#: ../widgets/table/e-cell-text.c:1809
+#: ../widgets/table/e-cell-text.c:1795
 msgid "Underline Column"
 msgstr "Colofn Wedi Tanlinellu"
 
-#: ../widgets/table/e-cell-text.c:1816
+#: ../widgets/table/e-cell-text.c:1802
 msgid "Bold Column"
 msgstr "Colofn Fras"
 
-#: ../widgets/table/e-cell-text.c:1823
+#: ../widgets/table/e-cell-text.c:1809
 msgid "Color Column"
 msgstr "Lliw Colofn"
 
-#: ../widgets/table/e-cell-text.c:1837
+#: ../widgets/table/e-cell-text.c:1823
 msgid "BG Color Column"
 msgstr "Colofn Lliw Cefndir"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:1
-msgid "<- _Remove"
-msgstr "<- _Tynnu"
+#: ../widgets/table/e-table-config.c:152
+msgid "State"
+msgstr "Cyflwr"
+
+#: ../widgets/table/e-table-config.c:385
+#: ../widgets/table/e-table-config.c:427
+msgid "(Ascending)"
+msgstr "(Esgynnol)"
+
+#: ../widgets/table/e-table-config.c:385
+#: ../widgets/table/e-table-config.c:427
+msgid "(Descending)"
+msgstr "(Disgynnol)"
+
+#: ../widgets/table/e-table-config.c:392
+msgid "Not sorted"
+msgstr "Heb eu trefnu"
+
+#: ../widgets/table/e-table-config.c:433
+msgid "No grouping"
+msgstr "Dim dosbarthiad"
+
+#: ../widgets/table/e-table-config.c:642
+#: ../widgets/table/e-table-config.glade.h:11
+msgid "Show Fields"
+msgstr "Dangos Meysydd"
+
+#: ../widgets/table/e-table-config.c:663
+msgid "Available Fields"
+msgstr "Meysydd ar Gael"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:2
 #: ../widgets/table/e-table-config.glade.h:1
 msgid "A_vailable Fields:"
 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:1575
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Ascending"
 msgstr "Esgynnol"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:4
 #: ../widgets/table/e-table-config.glade.h:3
 msgid "Clear All"
 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:1575
+#, fuzzy
+msgid "Clear _All"
+msgstr "Clirio Pob Un"
+
+#: ../widgets/table/e-table-config.glade.h:5
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Descending"
 msgstr "Disgynnol"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:8
-#: ../widgets/table/e-table-config.glade.h:7
+#: ../widgets/table/e-table-config.glade.h:8
 msgid "Group Items By"
 msgstr "Grwpio Eitemau Wrth"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:9
-#: ../widgets/table/e-table-config.glade.h:8
+#: ../widgets/table/e-table-config.glade.h:9
 msgid "Move _Down"
 msgstr "Symud i _Lawr"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:10
-#: ../widgets/table/e-table-config.glade.h:9
+#: ../widgets/table/e-table-config.glade.h:10
 msgid "Move _Up"
 msgstr "Symud i _Fyny"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:11
-msgid "Sh_ow these fields in order:"
-msgstr "_Dangos y meysydd yma yn y drefn:"
+#: ../widgets/table/e-table-config.glade.h:12
+#, fuzzy
+msgid "Show _field in View"
+msgstr "Dangos maes mewn Golwg"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:12
-#: ../widgets/table/e-table-config.c:562
-#: ../widgets/table/e-table-config.glade.h:10
-msgid "Show Fields"
-msgstr "Dangos Meysydd"
+#: ../widgets/table/e-table-config.glade.h:13
+#, fuzzy
+msgid "Show field i_n View"
+msgstr "Dangos maes mewn Golwg"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:11
-msgid "Show field in View"
+#: ../widgets/table/e-table-config.glade.h:14
+#, fuzzy
+msgid "Show field in _View"
 msgstr "Dangos maes mewn Golwg"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:14
-#: ../widgets/table/e-table-config.glade.h:12
+#: ../widgets/table/e-table-config.glade.h:15
 msgid "Sort"
 msgstr "Trefnu"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:15
-#: ../widgets/table/e-table-config.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:16
 msgid "Sort Items By"
 msgstr "Trefnu Eitemau Wrth"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:16
-#: ../widgets/table/e-table-config.glade.h:14
+#: ../widgets/table/e-table-config.glade.h:17
 msgid "Then By"
 msgstr "Yna Wrth"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:17
-msgid "_Add ->"
-msgstr "_Ychwanegu ->"
-
-#: ../widgets/table/e-table-config-no-group.glade.h:18
-#: ../widgets/table/e-table-config.glade.h:16
+#: ../widgets/table/e-table-config.glade.h:19
 msgid "_Fields Shown..."
 msgstr "Meysydd a _Ddangosir..."
 
-#: ../widgets/table/e-table-config-no-group.glade.h:19
 #: ../widgets/table/e-table-config.glade.h:20
-msgid "_Sort..."
-msgstr "_Trefnu..."
-
-#: ../widgets/table/e-table-config.c:149
-msgid "State"
-msgstr "Cyflwr"
-
-#: ../widgets/table/e-table-config.c:306 ../widgets/table/e-table-config.c:348
-msgid "(Ascending)"
-msgstr "(Esgynnol)"
-
-#: ../widgets/table/e-table-config.c:306 ../widgets/table/e-table-config.c:348
-msgid "(Descending)"
-msgstr "(Disgynnol)"
-
-#: ../widgets/table/e-table-config.c:313
-msgid "Not sorted"
-msgstr "Heb eu trefnu"
-
-#: ../widgets/table/e-table-config.c:354
-msgid "No grouping"
-msgstr "Dim dosbarthiad"
-
-#: ../widgets/table/e-table-config.c:583
-msgid "Available Fields"
-msgstr "Meysydd ar Gael"
-
-#: ../widgets/table/e-table-config.glade.h:17
 msgid "_Group By..."
 msgstr "_Dosbarthu Wrth..."
 
-#: ../widgets/table/e-table-config.glade.h:19
+#: ../widgets/table/e-table-config.glade.h:22
+#, fuzzy
+msgid "_Show field in View"
+msgstr "Dangos maes mewn Golwg"
+
+#: ../widgets/table/e-table-config.glade.h:23
 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:637
-#: ../widgets/table/e-table-field-chooser.c:77
-#: ../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:644
-#: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1886
-msgid "Full Header"
-msgstr "Pennawd Llawn"
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:126
+#: ../widgets/table/e-table-config.glade.h:24
+msgid "_Sort..."
+msgstr "_Trefnu..."
+
+#: ../widgets/table/e-table-field-chooser-dialog.c:114
 msgid "Add a column..."
 msgstr "Ychwanegu colofn..."
 
@@ -21909,7 +22260,7 @@ msgstr ""
 "I ychwanegu colofn at eich tabl, llusgwch hi i'r\n"
 "man yr ydych am iddi ymddangos."
 
-#: ../widgets/table/e-table-group-container.c:345
+#: ../widgets/table/e-table-group-container.c:341
 #, c-format
 msgid "%s : %s (%d item)"
 msgid_plural "%s : %s (%d items)"
@@ -21917,7 +22268,7 @@ msgstr[0] "%s : %s (%d eitem)"
 msgstr[1] "%s : %s (%d eitem)"
 msgstr[2] "%s : %s (%d eitem)"
 
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:347
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
@@ -21925,562 +22276,988 @@ msgstr[0] "%s (%d eitem)"
 msgstr[1] "%s (%d eitem)"
 msgstr[2] "%s (%d eitem)"
 
-#: ../widgets/table/e-table-group-container.c:897
-#: ../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:2975 ../widgets/table/e-table-item.c:2976
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-container.c:925
+#: ../widgets/table/e-table-group-leaf.c:586
+#: ../widgets/table/e-table-group-leaf.c:587
+#: ../widgets/table/e-table-item.c:3020
+#: ../widgets/table/e-table-item.c:3021
 msgid "Alternating Row Colors"
 msgstr "Lliwiau Bob yn Ail Res"
 
-#: ../widgets/table/e-table-group-container.c:904
-#: ../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:2982 ../widgets/table/e-table-item.c:2983
-#: ../widgets/table/e-tree.c:3269 ../widgets/table/e-tree.c:3270
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-container.c:932
+#: ../widgets/table/e-table-group-leaf.c:593
+#: ../widgets/table/e-table-group-leaf.c:594
+#: ../widgets/table/e-table-item.c:3027
+#: ../widgets/table/e-table-item.c:3028
+#: ../widgets/table/e-tree.c:3339
+#: ../widgets/table/e-tree.c:3340
 msgid "Horizontal Draw Grid"
 msgstr "Grid Tynnu Llorweddol"
 
-#: ../widgets/table/e-table-group-container.c:911
-#: ../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:2989 ../widgets/table/e-table-item.c:2990
-#: ../widgets/table/e-tree.c:3275 ../widgets/table/e-tree.c:3276
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-container.c:939
+#: ../widgets/table/e-table-group-leaf.c:600
+#: ../widgets/table/e-table-group-leaf.c:601
+#: ../widgets/table/e-table-item.c:3034
+#: ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-tree.c:3345
+#: ../widgets/table/e-tree.c:3346
 msgid "Vertical Draw Grid"
 msgstr "Grid Tynnu Fertigol"
 
-#: ../widgets/table/e-table-group-container.c:918
-#: ../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:2996 ../widgets/table/e-table-item.c:2997
-#: ../widgets/table/e-tree.c:3281 ../widgets/table/e-tree.c:3282
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-container.c:946
+#: ../widgets/table/e-table-group-leaf.c:607
+#: ../widgets/table/e-table-group-leaf.c:608
+#: ../widgets/table/e-table-item.c:3041
+#: ../widgets/table/e-table-item.c:3042
+#: ../widgets/table/e-tree.c:3351
+#: ../widgets/table/e-tree.c:3352
 msgid "Draw focus"
 msgstr "Ffocws tynnu"
 
-#: ../widgets/table/e-table-group-container.c:925
-#: ../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:3003 ../widgets/table/e-table-item.c:3004
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-container.c:953
+#: ../widgets/table/e-table-group-leaf.c:614
+#: ../widgets/table/e-table-group-leaf.c:615
+#: ../widgets/table/e-table-item.c:3048
+#: ../widgets/table/e-table-item.c:3049
 msgid "Cursor mode"
 msgstr "Modd cyrchwr"
 
-#: ../widgets/table/e-table-group-container.c:932
-#: ../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:2968 ../widgets/table/e-table-item.c:2969
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-container.c:960
+#: ../widgets/table/e-table-group-leaf.c:628
+#: ../widgets/table/e-table-group-leaf.c:629
+#: ../widgets/table/e-table-item.c:3013
+#: ../widgets/table/e-table-item.c:3014
 msgid "Selection model"
 msgstr "Model Dewis"
 
-#: ../widgets/table/e-table-group-container.c:939
-#: ../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: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
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-container.c:967
+#: ../widgets/table/e-table-group-leaf.c:621
+#: ../widgets/table/e-table-group-leaf.c:622
+#: ../widgets/table/e-table-item.c:3055
+#: ../widgets/table/e-table-item.c:3056
+#: ../widgets/table/e-table.c:3316
+#: ../widgets/table/e-tree.c:3333
+#: ../widgets/table/e-tree.c:3334
 msgid "Length Threshold"
 msgstr "Trothwy Hyd"
 
-#: ../widgets/table/e-table-group-container.c:946
-#: ../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: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
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-container.c:974
+#: ../widgets/table/e-table-group-leaf.c:663
+#: ../widgets/table/e-table-group-leaf.c:664
+#: ../widgets/table/e-table-item.c:3089
+#: ../widgets/table/e-table-item.c:3090
+#: ../widgets/table/e-table.c:3323
+#: ../widgets/table/e-tree.c:3365
+#: ../widgets/table/e-tree.c:3366
 msgid "Uniform row height"
 msgstr "Uchder cyson rhesi"
 
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-container.c:954
-#: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-group-leaf.c:644
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-container.c:981
+#: ../widgets/table/e-table-group-leaf.c:656
+#: ../widgets/table/e-table-group-leaf.c:657
 msgid "Frozen"
 msgstr "Wedi rhewi"
 
-#: ../widgets/table/e-table-header-item.c:1453
+#: ../widgets/table/e-table-header-item.c:1449
 msgid "Customize Current View"
 msgstr "Addasu'r Olwg Bresennol"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1469
 msgid "Sort _Ascending"
 msgstr "Trefnu'n _Esgynnol"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1470
 msgid "Sort _Descending"
 msgstr "Trefnu'n _Ddisgynnol"
 
-#: ../widgets/table/e-table-header-item.c:1475
+#: ../widgets/table/e-table-header-item.c:1471
 msgid "_Unsort"
 msgstr "D_ad-drefnu"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Group By This _Field"
 msgstr "Grwpio wrth y _Maes Hwn"
 
-#: ../widgets/table/e-table-header-item.c:1478
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Group By _Box"
 msgstr "Grwpio Wrth _Focs"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1476
 msgid "Remove This _Column"
 msgstr "_Tynnu'r Golofn"
 
-#: ../widgets/table/e-table-header-item.c:1481
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Add a C_olumn..."
 msgstr "_Ychwanegu Colofn..."
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1479
 msgid "A_lignment"
 msgstr "_Aliniad"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "B_est Fit"
 msgstr "_Ffit Orau"
 
-#: ../widgets/table/e-table-header-item.c:1485
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Format Column_s..."
 msgstr "_Fformatio Colofnau..."
 
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "Custo_mize Current View..."
 msgstr "A_ddasu'r Olwg Gyfredol..."
 
-#: ../widgets/table/e-table-header-item.c:1536
-msgid "Sort By"
-msgstr "Trefnu Fesul"
-
-#: ../widgets/table/e-table-header-item.c:1879
-msgid "Font Description"
-msgstr "Disgrifiad Ffont"
-
-#: ../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:1539
+msgid "_Sort By"
+msgstr "_Trefnu Fesul"
 
-#: ../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"
+#. Custom
+#: ../widgets/table/e-table-header-item.c:1557
+#, fuzzy
+msgid "_Custom"
+msgstr "Addasedig"
 
-#: ../widgets/table/e-table-item.c:2954 ../widgets/table/e-table-item.c:2955
+#: ../widgets/table/e-table-item.c:2999
+#: ../widgets/table/e-table-item.c:3000
 msgid "Table header"
 msgstr "Pennyn Tabl"
 
-#: ../widgets/table/e-table-item.c:2961 ../widgets/table/e-table-item.c:2962
+#: ../widgets/table/e-table-item.c:3006
+#: ../widgets/table/e-table-item.c:3007
 msgid "Table model"
 msgstr "Model Tabl"
 
-#: ../widgets/table/e-table-item.c:3037 ../widgets/table/e-table-item.c:3038
+#: ../widgets/table/e-table-item.c:3082
+#: ../widgets/table/e-table-item.c:3083
 msgid "Cursor row"
 msgstr "Rhes Gyrchwr"
 
-#: ../widgets/table/e-table.c:3326 ../widgets/table/e-tree.c:3302
-#: ../widgets/table/e-tree.c:3303
+#: ../widgets/table/e-table-sorter.c:172
+msgid "Sort Info"
+msgstr "Manylion Trefnu"
+
+#: ../widgets/table/e-table.c:3330
+#: ../widgets/table/e-tree.c:3372
+#: ../widgets/table/e-tree.c:3373
 msgid "Always search"
 msgstr "Chwilio o hyd"
 
-#: ../widgets/table/e-table.c:3333
+#: ../widgets/table/e-table.c:3337
 msgid "Use click to add"
 msgstr "Defnyddiwch glic i ychwanegu"
 
-#: ../widgets/table/e-tree.c:3288 ../widgets/table/e-tree.c:3289
+#: ../widgets/table/e-tree-scrolled.c:225
+#: ../widgets/table/e-tree-scrolled.c:226
+msgid "Tree"
+msgstr "Coeden"
+
+#: ../widgets/table/e-tree.c:3358
+#: ../widgets/table/e-tree.c:3359
 msgid "ETree table adapter"
 msgstr "Addasydd tabl ETree"
 
-#: ../widgets/table/e-tree.c:3309
+#: ../widgets/table/e-tree.c:3379
 msgid "Retro Look"
 msgstr "Golwg Retro"
 
-#: ../widgets/table/e-tree.c:3310
+#: ../widgets/table/e-tree.c:3380
 msgid "Draw lines and +/- expanders."
 msgstr "Tynnu llinellau ac ehangwyr +/-."
 
-#: ../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: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: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: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: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: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: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: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: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: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: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: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/table/e-tree.c:3386
+msgid "Expander Size"
+msgstr "Maint Ehangwr"
 
-#: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
-msgid "Emulate label resize"
-msgstr "Efelychu ail-seisio labeli"
+#: ../widgets/table/e-tree.c:3387
+msgid "Size of the expander arrow"
+msgstr "Maint y saeth ehangu"
 
-#: ../widgets/text/e-text.c:2739
+#: ../widgets/text/e-text.c:2731
 msgid "Input Methods"
 msgstr "Dulliau Mewnbwn"
 
-#: ../widgets/text/e-text.c:3510 ../widgets/text/e-text.c:3511
+#: ../widgets/text/e-text.c:3548
+#: ../widgets/text/e-text.c:3549
+msgid "Event Processor"
+msgstr "Prosesydd Digwyddiadau"
+
+#: ../widgets/text/e-text.c:3562
+#: ../widgets/text/e-text.c:3563
 msgid "Bold"
 msgstr "Bras"
 
-#: ../widgets/text/e-text.c:3517 ../widgets/text/e-text.c:3518
+#: ../widgets/text/e-text.c:3569
+#: ../widgets/text/e-text.c:3570
 msgid "Strikeout"
 msgstr "Llinell Drwodd"
 
-#: ../widgets/text/e-text.c:3524 ../widgets/text/e-text.c:3525
+#: ../widgets/text/e-text.c:3576
+#: ../widgets/text/e-text.c:3577
 msgid "Anchor"
 msgstr "Angor"
 
-#: ../widgets/text/e-text.c:3539 ../widgets/text/e-text.c:3540
+#: ../widgets/text/e-text.c:3583
+#: ../widgets/text/e-text.c:3584
+msgid "Justification"
+msgstr "Unioniad"
+
+#: ../widgets/text/e-text.c:3590
+#: ../widgets/text/e-text.c:3591
 msgid "Clip Width"
 msgstr "Lled Clip"
 
-#: ../widgets/text/e-text.c:3546 ../widgets/text/e-text.c:3547
+#: ../widgets/text/e-text.c:3597
+#: ../widgets/text/e-text.c:3598
 msgid "Clip Height"
 msgstr "Uchder Clip"
 
-#: ../widgets/text/e-text.c:3553 ../widgets/text/e-text.c:3554
+#: ../widgets/text/e-text.c:3604
+#: ../widgets/text/e-text.c:3605
 msgid "Clip"
 msgstr "Clip"
 
-#: ../widgets/text/e-text.c:3560 ../widgets/text/e-text.c:3561
+#: ../widgets/text/e-text.c:3611
+#: ../widgets/text/e-text.c:3612
 msgid "Fill clip rectangle"
 msgstr "Llenwi petryal clip"
 
-#: ../widgets/text/e-text.c:3567 ../widgets/text/e-text.c:3568
+#: ../widgets/text/e-text.c:3618
+#: ../widgets/text/e-text.c:3619
 msgid "X Offset"
 msgstr "Atred X"
 
-#: ../widgets/text/e-text.c:3574 ../widgets/text/e-text.c:3575
+#: ../widgets/text/e-text.c:3625
+#: ../widgets/text/e-text.c:3626
 msgid "Y Offset"
 msgstr "Atred Y"
 
-#: ../widgets/text/e-text.c:3610 ../widgets/text/e-text.c:3611
+#: ../widgets/text/e-text.c:3660
+#: ../widgets/text/e-text.c:3661
 msgid "Text width"
 msgstr "Lled testun"
 
-#: ../widgets/text/e-text.c:3617 ../widgets/text/e-text.c:3618
+#: ../widgets/text/e-text.c:3667
+#: ../widgets/text/e-text.c:3668
 msgid "Text height"
 msgstr "Uchder testun"
 
-#: ../widgets/text/e-text.c:3717 ../widgets/text/e-text.c:3718
-msgid "IM Context"
-msgstr "Cyd-destun IM"
-
-#: ../widgets/text/e-text.c:3724 ../widgets/text/e-text.c:3725
-msgid "Handle Popup"
-msgstr "Deliwr Naidlen"
-
-#~ msgid "GTK Tree View"
-#~ msgstr "Golwg Goeden GTK"
-
-#~ msgid "Error loading default addressbook."
-#~ msgstr "Gwall wrth lwytho'r llyfr cyfeiriadau rhagosodedig."
-
-#~ msgid "Input File"
-#~ msgstr "Ffeil Mewnbwn"
-
-#~ msgid "No filename provided."
-#~ msgstr "Dim enw ffeil wedi ei roi."
-
-#~ msgid "Add Calendar"
-#~ msgstr "Ychwanegu Calendr"
-
-#~ msgid "Add Task List"
-#~ msgstr "Ychwanegu Rhestr Dasgau"
-
-#~ msgid "_Add Calendar"
-#~ msgstr "_Ychwanegu Calendr"
-
-#~ msgid "_Add Task List"
-#~ msgstr "_Ychwanegu Rhestr Dasgau"
-
-#~ msgid "<b>Calendar options</b>"
-#~ msgstr "<b>Opsiynau calendr</b>"
-
-#~ msgid "Add New Calendar"
-#~ msgstr "Ychwanegu Calendr Newydd"
-
-#~ msgid "Calendar Group"
-#~ msgstr "Grŵp Calendr"
-
-#~ msgid "Calendar Location"
-#~ msgstr "Lleoliad Calendr"
-
-#~ msgid "Calendar Name"
-#~ msgstr "Enw Calendr"
-
-#~ msgid "<b>Task List Options</b>"
-#~ msgstr "<b>Opsiynau Rhestr Dasgau</b>"
-
-#~ msgid "Add New Task List"
-#~ msgstr "Ychwanegu Rhestr Dasgau Newydd"
-
-#~ msgid "Task List Group"
-#~ msgstr "Grŵp Rhestr Dasgau"
-
-#~ msgid "Task List Name"
-#~ msgstr "Enw Rhestr Dasgau"
-
-#~ msgid "<b>Free/Busy C_alendars</b>"
-#~ msgstr "<b>Calendrau Rhydd/Prysur</b>"
-
-#~ msgid "<b>Publishing Frequency</b>"
-#~ msgstr "<b>Amlder Cyhoeddi</b>"
-
-#~ msgid "<b>Publishing _Location</b>"
-#~ msgstr "<b>_Lleoliad Cyhoeddi</b>"
-
-#~ msgid "Free/Busy Publishing Settings"
-#~ msgstr "Gosodiadau Cyhoeddi Statws Rhydd/Prysur"
-
-#~ msgid "_Daily"
-#~ msgstr "_Dyddiol"
-
-#~ msgid "_Manual"
-#~ msgstr "_Ã? llaw"
-
-#~ msgid "_Weekly"
-#~ msgstr "_Wythnosol"
-
-#~ msgid "Enter the password for %s"
-#~ msgstr "Rhowch y cyfrinair ar gyfer %s"
+#: ../widgets/text/e-text.c:3681
+#: ../widgets/text/e-text.c:3682
+msgid "Use ellipsis"
+msgstr "Defnyddio marc colli geiriau"
 
-#~ msgid "%.0fK"
-#~ msgstr "%.0fC"
+#: ../widgets/text/e-text.c:3688
+#: ../widgets/text/e-text.c:3689
+msgid "Ellipsis"
+msgstr "Coll geiriau"
 
-#~ msgid "%.0fM"
-#~ msgstr "%.0fM"
+#: ../widgets/text/e-text.c:3695
+#: ../widgets/text/e-text.c:3696
+msgid "Line wrap"
+msgstr "Amlapio llinell"
 
-#~ msgid "%.0fG"
-#~ msgstr "%.0fG"
+#: ../widgets/text/e-text.c:3702
+#: ../widgets/text/e-text.c:3703
+msgid "Break characters"
+msgstr "Torri nodau"
 
-#~ msgid "Priority Filter \"%s\""
-#~ msgstr "Hidlydd Blaenoriaeth \"%s\""
+#: ../widgets/text/e-text.c:3709
+#: ../widgets/text/e-text.c:3710
+msgid "Max lines"
+msgstr "Uchafswm llinellau"
 
-#~ 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."
+#: ../widgets/text/e-text.c:3730
+#: ../widgets/text/e-text.c:3731
+msgid "Draw borders"
+msgstr "Tynnu borderi"
 
-#~ 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."
+#: ../widgets/text/e-text.c:3737
+#: ../widgets/text/e-text.c:3738
+msgid "Allow newlines"
+msgstr "Caniatáu llinellau newydd"
 
-#~ 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."
+#: ../widgets/text/e-text.c:3744
+#: ../widgets/text/e-text.c:3745
+msgid "Draw background"
+msgstr "Tynnu cefndir"
 
-#~ msgid "Evolution is importing your old Netscape data"
-#~ msgstr "Mae Evolution yn mewnforio'ch hen ddata Netscape"
+#: ../widgets/text/e-text.c:3751
+#: ../widgets/text/e-text.c:3752
+msgid "Draw button"
+msgstr "Tynnu botwm"
 
-#~ msgid "Importing Netscape data"
-#~ msgstr "Mewnforio data Netscape"
+#: ../widgets/text/e-text.c:3758
+#: ../widgets/text/e-text.c:3759
+msgid "Cursor position"
+msgstr "Man y cyrchwr"
 
-#~ msgid "Settings"
-#~ msgstr "Gosodiadau"
+#. Translators: Input Method Context
+#: ../widgets/text/e-text.c:3766
+#: ../widgets/text/e-text.c:3768
+msgid "IM Context"
+msgstr "Cyd-destun IM"
 
-#~ msgid "Mail Filters"
-#~ msgstr "Hidlyddion Ebost"
+#: ../widgets/text/e-text.c:3774
+#: ../widgets/text/e-text.c:3775
+msgid "Handle Popup"
+msgstr "Deliwr Naidlen"
 
+#~ msgid "Toggle Attachment Bar"
+#~ msgstr "Toglu'r Bar Atodiadau"
+#~ msgid "activate"
+#~ msgstr "gweithredu"
+#~ msgid "Permission Denied."
+#~ msgstr "Gwrthodwyd Caniatâd."
+#~ msgid "A Folder with this name already exists"
+#~ msgstr "Plygell â'r un enw yn bodoli'n barod"
+#~ msgid "_Properties..."
+#~ msgstr "_Priodweddau..."
+#~ msgid "3268"
+#~ msgstr "3268"
+#~ msgid "389"
+#~ msgstr "389"
+#~ msgid "636"
+#~ msgstr "636"
+#~ msgid "<b>Display</b>"
+#~ msgstr "<b>Dangos</b>"
+#~ msgid "<b>Server Information</b>"
+#~ msgstr "<b>Gwybodaeth Gweinydd</b>"
+#~ msgid "<b>Type:</b>"
+#~ msgstr "<b>Math:</b>"
+#~ msgid "Add Address Book"
+#~ msgstr "Ychwanegu Llyfr Cyfeiriadau"
+#~ msgid "Anonymously"
+#~ msgstr "Dienw"
+#~ msgid "Basic"
+#~ msgstr "Sylfaenol"
+#~ msgid "Distinguished name"
+#~ msgstr "Enw Gwahaniaethol"
+#~ msgid "Email address"
+#~ msgstr "Cyfeiriad e-bost"
+#~ msgid "Find Possible Search Bases"
+#~ msgstr "Canfod Bonion Chwilio Posib"
+#~ msgid "Search filter"
+#~ msgstr "Hidlydd chwilio"
+#~ msgid "Sub"
+#~ msgstr "Is"
+#~ msgid "Using email address"
+#~ msgstr "Defnyddio cyfeiriad e-bost"
+#~ msgid "Whenever Possible"
+#~ msgstr "Pob Amser Bosib"
+#~ msgid "_Add Address Book"
+#~ msgstr "_Ychwanegu Llyfr Cyfeiriadau"
+#~ msgid "MSN Messenger"
+#~ msgstr "Negeseuwr MSN"
+#~ msgid "Novell Groupwise"
+#~ msgstr "Novell Groupwise"
+#~ msgid "_Address: "
+#~ msgstr "_Cyfeiriad:"
+#~ msgid "_Categories..."
+#~ msgstr "_Categorïau..."
+#~ msgid "_Notes:"
+#~ msgstr "_Nodiadau:"
+#~ msgid "United States"
+#~ msgstr "Yr Unol Daleithiau"
+#~ msgid "Afghanistan"
+#~ msgstr "Afghanistan"
+#~ msgid "Albania"
+#~ msgstr "Albania"
+#~ msgid "Algeria"
+#~ msgstr "Algeria"
+#~ msgid "American Samoa"
+#~ msgstr "American Samoa"
+#~ msgid "Andorra"
+#~ msgstr "Andorra"
+#~ msgid "Angola"
+#~ msgstr "Angola"
+#~ msgid "Anguilla"
+#~ msgstr "Anguilla"
+#~ msgid "Antarctica"
+#~ msgstr "Antarctica"
+#~ msgid "Antigua And Barbuda"
+#~ msgstr "Antigua a Barbuda"
+#~ msgid "Argentina"
+#~ msgstr "Yr Ariannin"
+#~ msgid "Armenia"
+#~ msgstr "Armenia"
+#~ msgid "Aruba"
+#~ msgstr "Aruba"
+#~ msgid "Australia"
+#~ msgstr "Awstralia"
+#~ msgid "Austria"
+#~ msgstr "Awstria"
+#~ msgid "Azerbaijan"
+#~ msgstr "Azerbaijan"
+#~ msgid "Bahamas"
+#~ msgstr "Bahamas"
+#~ msgid "Bahrain"
+#~ msgstr "Bahrain"
+#~ msgid "Bangladesh"
+#~ msgstr "Bangladesh"
+#~ msgid "Barbados"
+#~ msgstr "Barbados"
+#~ msgid "Belarus"
+#~ msgstr "Belarus"
+#~ msgid "Belgium"
+#~ msgstr "Gwlad Belg"
+#~ msgid "Belize"
+#~ msgstr "Belize"
+#~ msgid "Benin"
+#~ msgstr "Benin"
+#~ msgid "Bermuda"
+#~ msgstr "Bermuda"
+#~ msgid "Bhutan"
+#~ msgstr "Bhutan"
+#~ msgid "Bolivia"
+#~ msgstr "Bolifia"
+#~ msgid "Bosnia And Herzegowina"
+#~ msgstr "Bosnia a Herzegovina"
+#~ msgid "Botswana"
+#~ msgstr "Botswana"
+#~ msgid "Bouvet Island"
+#~ msgstr "Ynys Bouvet"
+#~ msgid "Brazil"
+#~ msgstr "Brasil"
+#~ msgid "British Indian Ocean Territory"
+#~ msgstr "British Indian Ocean Territory"
+#~ msgid "Brunei Darussalam"
+#~ msgstr "Brunei Darussalam"
+#~ msgid "Bulgaria"
+#~ msgstr "Bwlgaria"
+#~ msgid "Burkina Faso"
+#~ msgstr "Burkina Faso"
+#~ msgid "Burundi"
+#~ msgstr "Burundi"
+#~ msgid "Cambodia"
+#~ msgstr "Cambodia"
+#~ msgid "Cameroon"
+#~ msgstr "Cameroon"
+#~ msgid "Canada"
+#~ msgstr "Canada"
+#~ msgid "Cape Verde"
+#~ msgstr "Cape Verde"
+#~ msgid "Cayman Islands"
+#~ msgstr "Ynysoedd y Cayman"
+#~ msgid "Central African Republic"
+#~ msgstr "Gweriniaeth Ganol Affrica"
+#~ msgid "Chad"
+#~ msgstr "Chad"
+#~ msgid "Chile"
+#~ msgstr "Chile"
+#~ msgid "China"
+#~ msgstr "Tsieina"
+#~ msgid "Christmas Island"
+#~ msgstr "Ynys y Nadolig"
+#~ msgid "Cocos (Keeling) Islands"
+#~ msgstr "Ynysoedd Cocos (Keeling)"
+#~ msgid "Colombia"
+#~ msgstr "Colombia"
+#~ msgid "Comoros"
+#~ msgstr "Comoros"
+#~ msgid "Congo"
+#~ msgstr "Congo"
+#~ msgid "Congo, The Democratic Republic Of The"
+#~ msgstr "Congo, Gweriniaeth Ddemocratig Y"
+#~ msgid "Cook Islands"
+#~ msgstr "Ynysoedd Cook"
+#~ msgid "Costa Rica"
+#~ msgstr "Costa Rica"
+#~ msgid "Cote d'Ivoire"
+#~ msgstr "Cote d'Ivoire"
+#~ msgid "Croatia"
+#~ msgstr "Croatia"
+#~ msgid "Cuba"
+#~ msgstr "Ciwba"
+#~ msgid "Cyprus"
+#~ msgstr "Cyprus"
+#~ msgid "Czech Republic"
+#~ msgstr "Gweriniaeth Tsiec"
+#~ msgid "Denmark"
+#~ msgstr "Denmarc"
+#~ msgid "Djibouti"
+#~ msgstr "Djibouti"
+#~ msgid "Dominica"
+#~ msgstr "Dominica"
+#~ msgid "Dominican Republic"
+#~ msgstr "Gweriniaeth Dominica"
+#~ msgid "Ecuador"
+#~ msgstr "Ecuador"
+#~ msgid "Egypt"
+#~ msgstr "Yr Aifft"
+#~ msgid "El Salvador"
+#~ msgstr "El Salvador"
+#~ msgid "Equatorial Guinea"
+#~ msgstr "Equatorial Guinea"
+#~ msgid "Eritrea"
+#~ msgstr "Eritrea"
+#~ msgid "Estonia"
+#~ msgstr "Estonia"
+#~ msgid "Ethiopia"
+#~ msgstr "Ethiopia"
+#~ msgid "Falkland Islands"
+#~ msgstr "Ynysoedd y Falklands"
+#~ msgid "Faroe Islands"
+#~ msgstr "Ynysoedd y Ffaro"
+#~ msgid "Fiji"
+#~ msgstr "Ffiji"
+#~ msgid "Finland"
+#~ msgstr "Y Ffindir"
+#~ msgid "French Guiana"
+#~ msgstr "Guiana Ffrangeg"
+#~ msgid "French Polynesia"
+#~ msgstr "Polynesia Ffrangeg"
+#~ msgid "French Southern Territories"
+#~ msgstr "French Southern Territories"
+#~ msgid "Gabon"
+#~ msgstr "Gabon"
+#~ msgid "Gambia"
+#~ msgstr "Gambia"
+#~ msgid "Georgia"
+#~ msgstr "Georgia"
+#~ msgid "Germany"
+#~ msgstr "Yr Almaen"
+#~ msgid "Ghana"
+#~ msgstr "Ghana"
+#~ msgid "Gibraltar"
+#~ msgstr "Gibraltar"
+#~ msgid "Greece"
+#~ msgstr "Groeg"
+#~ msgid "Greenland"
+#~ msgstr "Greenland"
+#~ msgid "Grenada"
+#~ msgstr "Grenada"
+#~ msgid "Guadeloupe"
+#~ msgstr "Guadeloupe"
+#~ msgid "Guam"
+#~ msgstr "Guam"
+#~ msgid "Guatemala"
+#~ msgstr "Guatemala"
+#~ msgid "Guernsey"
+#~ msgstr "Guernsey"
+#~ msgid "Guinea"
+#~ msgstr "Guinea"
+#~ msgid "Guinea-bissau"
+#~ msgstr "Guinea-Bissau"
+#~ msgid "Guyana"
+#~ msgstr "Guyana"
+#~ msgid "Haiti"
+#~ msgstr "Haiti"
+#~ msgid "Heard And McDonald Islands"
+#~ msgstr "Ynys Heard ac Ynysoedd McDonald"
+#~ msgid "Holy See"
+#~ msgstr "Gwladwriaeth Ddinesig"
+#~ msgid "Honduras"
+#~ msgstr "Honduras"
+#~ msgid "Hong Kong"
+#~ msgstr "Hong Kong"
+#~ msgid "Hungary"
+#~ msgstr "Hwngari"
+#~ msgid "Iceland"
+#~ msgstr "Gwlad yr Iâ"
+#~ msgid "India"
+#~ msgstr "India"
+#~ msgid "Indonesia"
+#~ msgstr "Indonesia"
+#~ msgid "Iran"
+#~ msgstr "Iran"
+#~ msgid "Iraq"
+#~ msgstr "Irac"
+#~ msgid "Ireland"
+#~ msgstr "Iwerddon"
+#~ msgid "Isle of Man"
+#~ msgstr "Ynys Manaw"
+#~ msgid "Israel"
+#~ msgstr "Israel"
+#~ msgid "Italy"
+#~ msgstr "Yr Eidal"
+#~ msgid "Jamaica"
+#~ msgstr "Jamaica"
+#~ msgid "Japan"
+#~ msgstr "Siapan"
+#~ msgid "Jersey"
+#~ msgstr "Jersey"
+#~ msgid "Jordan"
+#~ msgstr "Yr Iorddonen"
+#~ msgid "Kazakhstan"
+#~ msgstr "Kazakhstan"
+#~ msgid "Kiribati"
+#~ msgstr "Kiribati"
+#~ msgid "Korea, Democratic People's Republic Of"
+#~ msgstr "Corea, Gweriniaeth Ddemocratig y Bobl"
+#~ msgid "Korea, Republic Of"
+#~ msgstr "Gweriniaeth Corea"
+#~ msgid "Kuwait"
+#~ msgstr "Kuwait"
+#~ msgid "Kyrgyzstan"
+#~ msgstr "Kyrgyzstan"
+#~ msgid "Laos"
+#~ msgstr "Laos"
+#~ msgid "Latvia"
+#~ msgstr "Latfia"
+#~ msgid "Lebanon"
+#~ msgstr "Libanus"
+#~ msgid "Lesotho"
+#~ msgstr "Lesotho"
+#~ msgid "Liberia"
+#~ msgstr "Liberia"
+#~ msgid "Libya"
+#~ msgstr "Libya"
+#~ msgid "Liechtenstein"
+#~ msgstr "Liechtenstein"
+#~ msgid "Lithuania"
+#~ msgstr "Lithuania"
+#~ msgid "Luxembourg"
+#~ msgstr "Luxembourg"
+#~ msgid "Macao"
+#~ msgstr "Macao"
+#~ msgid "Macedonia"
+#~ msgstr "Macedonia"
+#~ msgid "Madagascar"
+#~ msgstr "Madagascar"
+#~ msgid "Malawi"
+#~ msgstr "Malawi"
+#~ msgid "Malaysia"
+#~ msgstr "Malaysia"
+#~ msgid "Maldives"
+#~ msgstr "Maldives"
+#~ msgid "Mali"
+#~ msgstr "Mali"
+#~ msgid "Malta"
+#~ msgstr "Malta"
+#~ msgid "Marshall Islands"
+#~ msgstr "Ynysoedd Marshall"
+#~ msgid "Martinique"
+#~ msgstr "Martinique"
+#~ msgid "Mauritania"
+#~ msgstr "Mauritania"
+#~ msgid "Mauritius"
+#~ msgstr "Mauritius"
+#~ msgid "Mayotte"
+#~ msgstr "Mayotte"
+#~ msgid "Mexico"
+#~ msgstr "Mecsico"
+#~ msgid "Micronesia"
+#~ msgstr "Micronesia"
+#~ msgid "Moldova, Republic Of"
+#~ msgstr "Gweriniaeth Moldova"
+#~ msgid "Monaco"
+#~ msgstr "Monaco"
+#~ msgid "Mongolia"
+#~ msgstr "Mongolia"
+#~ msgid "Montserrat"
+#~ msgstr "Montserrat"
+#~ msgid "Morocco"
+#~ msgstr "Morocco"
+#~ msgid "Mozambique"
+#~ msgstr "Mozambique"
+#~ msgid "Myanmar"
+#~ msgstr "Myanmar"
+#~ msgid "Namibia"
+#~ msgstr "Namibia"
+#~ msgid "Nauru"
+#~ msgstr "Nauru"
+#~ msgid "Nepal"
+#~ msgstr "Nepal"
+#~ msgid "Netherlands"
+#~ msgstr "Yr Iseldiroedd"
+#~ msgid "Netherlands Antilles"
+#~ msgstr "Netherlands Antilles"
+#~ msgid "New Caledonia"
+#~ msgstr "Caledonia Newydd"
+#~ msgid "New Zealand"
+#~ msgstr "Seland Newydd"
+#~ msgid "Nicaragua"
+#~ msgstr "Nicaragua"
+#~ msgid "Niger"
+#~ msgstr "Niger"
+#~ msgid "Nigeria"
+#~ msgstr "Nigeria"
+#~ msgid "Niue"
+#~ msgstr "Niue"
+#~ msgid "Norfolk Island"
+#~ msgstr "Ynys Norfolk"
+#~ msgid "Northern Mariana Islands"
+#~ msgstr "Ynysoedd Northern Mariana"
+#~ msgid "Norway"
+#~ msgstr "Norwy"
+#~ msgid "Oman"
+#~ msgstr "Oman"
+#~ msgid "Pakistan"
+#~ msgstr "Pacistan"
+#~ msgid "Palestinian Territory"
+#~ msgstr "Palestinia"
+#~ msgid "Panama"
+#~ msgstr "Panama"
+#~ msgid "Papua New Guinea"
+#~ msgstr "Papua Guinea Newydd"
+#~ msgid "Paraguay"
+#~ msgstr "Paraguay"
+#~ msgid "Peru"
+#~ msgstr "Periw"
+#~ msgid "Philippines"
+#~ msgstr "Philippines"
+#~ msgid "Pitcairn"
+#~ msgstr "Pitcairn"
+#~ msgid "Poland"
+#~ msgstr "Gwlad Pwyl"
+#~ msgid "Portugal"
+#~ msgstr "Portiwgal"
+#~ msgid "Puerto Rico"
+#~ msgstr "Puerto Rico"
+#~ msgid "Qatar"
+#~ msgstr "Qatar"
+#~ msgid "Reunion"
+#~ msgstr "Reunion"
+#~ msgid "Romania"
+#~ msgstr "Rwmania"
+#~ msgid "Russian Federation"
+#~ msgstr "Ffederasiwn Rwsia"
+#~ msgid "Rwanda"
+#~ msgstr "Rwanda"
+#~ msgid "Saint Kitts And Nevis"
+#~ msgstr "Saint Kitts a Nevis"
+#~ msgid "Saint Lucia"
+#~ msgstr "Saint Lucia"
+#~ msgid "Saint Vincent And The Grenadines"
+#~ msgstr "Sant Vincent a'r Grenadines"
+#~ msgid "Samoa"
+#~ msgstr "Samoa"
+#~ msgid "San Marino"
+#~ msgstr "San Marino"
+#~ msgid "Sao Tome And Principe"
+#~ msgstr "Sao Tome a Principe"
+#~ msgid "Saudi Arabia"
+#~ msgstr "Saudi Arabia"
+#~ msgid "Senegal"
+#~ msgstr "Senegal"
+#~ msgid "Serbia And Montenegro"
+#~ msgstr "Serbia a Montenegro"
+#~ msgid "Seychelles"
+#~ msgstr "Seychelles"
+#~ msgid "Sierra Leone"
+#~ msgstr "Sierra Leone"
+#~ msgid "Singapore"
+#~ msgstr "Singapore"
+#~ msgid "Slovakia"
+#~ msgstr "Slofacia"
+#~ msgid "Slovenia"
+#~ msgstr "Slofenia"
+#~ msgid "Solomon Islands"
+#~ msgstr "Ynysoedd Solomon"
+#~ msgid "Somalia"
+#~ msgstr "Somalia"
+#~ msgid "South Africa"
+#~ msgstr "De Affrica"
+#~ msgid "South Georgia And The South Sandwich Islands"
+#~ msgstr "De Georgia ac Ynysoedd De Sandwich"
+#~ msgid "Spain"
+#~ msgstr "Sbaen"
+#~ msgid "Sri Lanka"
+#~ msgstr "Sri Lanka"
+#~ msgid "St. Helena"
+#~ msgstr "St. Helena"
+#~ msgid "St. Pierre And Miquelon"
+#~ msgstr "St. Pierre a Miquelon"
+#~ msgid "Sudan"
+#~ msgstr "Swdan"
+#~ msgid "Suriname"
+#~ msgstr "Suriname"
+#~ msgid "Svalbard And Jan Mayen Islands"
+#~ msgstr "Ynysoedd Svalbard a'r Jan Mayen"
+#~ msgid "Swaziland"
+#~ msgstr "Swaziland"
+#~ msgid "Sweden"
+#~ msgstr "Sweden"
+#~ msgid "Switzerland"
+#~ msgstr "Y Swisdir"
+#~ msgid "Syria"
+#~ msgstr "Syria"
+#~ msgid "Taiwan"
+#~ msgstr "Taiwan"
+#~ msgid "Tajikistan"
+#~ msgstr "Tajikistan"
+#~ msgid "Tanzania, United Republic Of"
+#~ msgstr "Tanzania, Gwerinaieth Unedig"
+#~ msgid "Thailand"
+#~ msgstr "Gwlad Thai"
+#~ msgid "Timor-Leste"
+#~ msgstr "Timor-Leste"
+#~ msgid "Togo"
+#~ msgstr "Togo"
+#~ msgid "Tokelau"
+#~ msgstr "Tokelau"
+#~ msgid "Tonga"
+#~ msgstr "Tonga"
+#~ msgid "Trinidad And Tobago"
+#~ msgstr "Trinidad a Tobago"
+#~ msgid "Tunisia"
+#~ msgstr "Tunisia"
+#~ msgid "Turkey"
+#~ msgstr "Twrci"
+#~ msgid "Turkmenistan"
+#~ msgstr "Turkmenistan"
+#~ msgid "Turks And Caicos Islands"
+#~ msgstr "Ynysoedd Turks a'r Caicos"
+#~ msgid "Tuvalu"
+#~ msgstr "Tuvalu"
+#~ msgid "Uganda"
+#~ msgstr "Uganda"
+#~ msgid "Ukraine"
+#~ msgstr "Wcrain"
+#~ msgid "United Arab Emirates"
+#~ msgstr "Emiradau Arabaidd Unedig"
+#~ msgid "United Kingdom"
+#~ msgstr "Y Deyrnas Unedig"
+#~ msgid "United States Minor Outlying Islands"
+#~ msgstr "United States Minor Outlying Islands"
+#~ msgid "Uruguay"
+#~ msgstr "Uruguay"
+#~ msgid "Uzbekistan"
+#~ msgstr "Wsbecistan"
+#~ msgid "Vanuatu"
+#~ msgstr "Vanuatu"
+#~ msgid "Venezuela"
+#~ msgstr "Venezuela"
+#~ msgid "Viet Nam"
+#~ msgstr "Fietnam"
+#~ msgid "Virgin Islands, British"
+#~ msgstr "Ynysoedd Virgin, Prydeinig"
+#~ msgid "Virgin Islands, U.S."
+#~ msgstr "Ynysoedd Virgin, U.D.A."
+#~ msgid "Wallis And Futuna Islands"
+#~ msgstr "Ynysoedd Wallis a'r Futuna"
+#~ msgid "Western Sahara"
+#~ msgstr "Western Sahara"
+#~ msgid "Yemen"
+#~ msgstr "Yemen"
+#~ msgid "Zambia"
+#~ msgstr "Zambia"
+#~ msgid "Zimbabwe"
+#~ msgstr "Zimbabwe"
+#~ msgid "AOL Instant Messenger"
+#~ msgstr "Negesydd Sydyn AOL"
+#~ msgid "Yahoo Messenger"
+#~ msgstr "Negesydd Sydyn Yahoo"
+#~ msgid "Gadu-Gadu Messenger"
+#~ msgstr "Negesydd Gadu-Gadu"
+#~ msgid "Service"
+#~ msgstr "Gwasanaeth"
+#~ msgid "Username"
+#~ msgstr "Enw Defnyddiwr"
+#~ msgid "Address _2:"
+#~ msgstr "Cyfeiriad _2:"
+#~ msgid "Ci_ty:"
+#~ msgstr "_Dinas:"
+#~ msgid "Countr_y:"
+#~ msgstr "_Gwlad:"
+#~ msgid "Full Address"
+#~ msgstr "Cyfeiriad Llawn"
+#~ msgid "_ZIP Code:"
+#~ msgstr "Cod Post/_ZIP:"
+#~ msgid "Dr."
+#~ msgstr "Dr."
+#~ msgid "Esq."
+#~ msgstr "Ysw."
+#~ msgid "I"
+#~ msgstr "I"
+#~ msgid "II"
+#~ msgstr "II"
+#~ msgid "III"
+#~ msgstr "III"
+#~ msgid "Jr."
+#~ msgstr "Jr."
+#~ msgid "Miss"
+#~ msgstr "Miss"
+#~ msgid "Mr."
+#~ msgstr "Mr."
+#~ msgid "Mrs."
+#~ msgstr "Mrs."
+#~ msgid "Ms."
+#~ msgstr "Ms."
+#~ msgid "Sr."
+#~ msgstr "Sr."
+#~ msgid "Add IM Account"
+#~ msgstr "Ychwanegu Cyfrif Negeseuo Cyflym"
+#~ msgid "_Account name:"
+#~ msgstr "_Enw cyfrif:"
+#~ msgid "_IM Service:"
+#~ msgstr "Gwasanaeth _Negeseuo Cyflym:"
+#~ msgid "\n"
+#~ msgstr "\n"
+#~ msgid "Add an email to the List"
+#~ msgstr "Ychwanegu e-bost at y Rhestr"
+#~ msgid "Insert email addresses from Address Book"
+#~ msgstr "Mewnosod cyfeiriadau e-bost o'r Llyfr Cyfeiriadau"
+#~ msgid "Members"
+#~ msgstr "Aelodau"
+#~ msgid "Remove an email address from the List"
+#~ msgstr "Tynnu cyfeiriad e-bost o'r Rhestr"
+#~ msgid "_Select"
+#~ msgstr "_Dewis"
 #~ msgid ""
-#~ "Evolution has found Netscape mail files.\n"
-#~ "Would you like them to be imported into Evolution?"
+#~ "The changed email or name of this contact already\n"
+#~ "exists in this folder.  Would you like to add it anyway?"
 #~ msgstr ""
-#~ "Mae Evolution wedi canfod hen ffeiliau e-bost Netscape.\n"
-#~ "Hoffech chi eu mewnforio i Evolution?"
-
-#~ msgid "No output directory!"
-#~ msgstr "Dim cyfeiriadur albwm!"
-
+#~ "Mae'r enw neu gyfeiriad e-bost, wedi ei newid, yn bodoli eisoes\n"
+#~ "o fewn y blygell. Ydych chi am ei ychwanegu beth bynnag?"
 #~ msgid ""
-#~ "The output directory was not found on iPod! Please ensure that iPod has "
-#~ "been correctly set up and try again."
+#~ "We were unable to open this addressbook.  This either means you have "
+#~ "entered an incorrect URI, or the LDAP server is unreachable."
 #~ msgstr ""
-#~ "Cyfeiriadur allbwn heb ei ganfod ar yr iPod! Gwnewch yn siŵr fod yr iPod "
-#~ "wedi ei osod yn gywir a cheisiwch eto."
-
-#~ msgid "Could not export data!"
-#~ msgstr "Methu allforio data!"
-
-#~ msgid "Exporting data failed."
-#~ msgstr "Methodd yr allforio data."
-
-#~ msgid "Could not open addressbook!"
-#~ msgstr "Methwyd agor y llyfr cyfeiriadau"
-
-#~ msgid "Could not open the Evolution addressbook to export data."
-#~ msgstr "Methu agor y llyfr cyfeiriadau Evolution i allforio data."
-
-#~ msgid "Could not open calendar/todo!"
-#~ msgstr "Methu agor y calendr/rhestr dasgau i'w gwneud!"
-
-#~ 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 "An attachment to add."
-#~ msgstr "Atodiad i'w ychwanegu."
-
-#~ msgid "Content type of the attachment."
-#~ msgstr "Math cynnwys yr atodiad."
-
-#~ msgid "The filename to display in the mail."
-#~ msgstr "Yr enw ffeil i'w ddangos yn yr e-bost."
-
-#~ msgid "Description of the attachment."
-#~ msgstr "Disgrifiad yr atodiad."
-
-#~ msgid "Mark attachment to be shown inline by default."
-#~ msgstr "Marcio'r atodiad yn un i'w ddangos, fel rhagosodiad, yn fewnol."
-
-#~ msgid "Print cards"
-#~ msgstr "Argraffu cardiau"
-
-#~ msgid "Organization"
-#~ msgstr "Sefydliad"
-
-#~ msgid "_Send New Message To ..."
-#~ msgstr "_Danfon Neges Newydd At..."
-
-#~ msgid "E-mail"
-#~ msgstr "E-bost"
-
-#~ msgid "Importing ..."
-#~ msgstr "Mewnforio..."
-
-#~ msgid "Print envelope"
-#~ msgstr "Argraffu amlen"
-
-#~ msgid "Print contacts"
-#~ msgstr "Argraffu cysylltiadau"
-
-#~ msgid "Print contact"
-#~ msgstr "Argraffu cyswllt"
-
-#~ msgid "Su_mmary"
-#~ msgstr "_Crynodeb"
-
-#~ msgid "_Memo Content:"
-#~ msgstr "Cynnwys _Memos:"
-
-#~ msgid "Selected day (%a %b %d %Y)"
-#~ msgstr "Dydd dewisedig (%a %b %d %Y)"
-
-#~ msgid "%a %b %d"
-#~ msgstr "%a %b %d"
-
-#~ msgid "%a %d %Y"
-#~ msgstr "%a %d %Y"
-
-#~ msgid "%a %b %d %Y"
-#~ msgstr "%a %b %d %Y"
-
-#~ msgid "Selected week (%s - %s)"
-#~ msgstr "Wythnos ddewisedig (%s - %s)"
-
-#~ msgid "Selected month (%b %Y)"
-#~ msgstr "Mis dewisedig (%b %Y)"
-
-#~ msgid "Selected year (%Y)"
-#~ msgstr "Blwyddyn ddewisedig (%Y)"
-
-#~ msgid "Print Preview"
-#~ msgstr "Rhagolwg Argraffu"
-
-#~ msgid "Print Item"
-#~ msgstr "Argraffu Eitem"
+#~ "Wedi methu agor y llyfr cyfeiriadau hwn. Un ai rydych wedi rhoi URI "
+#~ "anghywir, neu mae'r gweinydd LDAP yn anghyraeddadwy."
+#~ msgid "10 pt. Tahoma"
+#~ msgstr "10 pt. Tahoma"
+#~ msgid "8 pt. Tahoma"
+#~ msgstr "8 pt. Tahoma"
+#~ msgid "Blank forms at end:"
+#~ msgstr "Ffurflenni gwag ar y diwedd:"
+#~ msgid "Body"
+#~ msgstr "Corff"
+#~ msgid "Bottom:"
+#~ msgstr "Gwaelod:"
+#~ msgid "Dimensions:"
+#~ msgstr "Dimensiynau:"
+#~ msgid "F_ont..."
+#~ msgstr "_Ffont..."
+#~ msgid "Fonts"
+#~ msgstr "Ffontiau"
+#~ msgid "Footer:"
+#~ msgstr "Troedyn:"
+#~ msgid "Format"
+#~ msgstr "Fformat"
+#~ msgid "Header/Footer"
+#~ msgstr "Pennawd/Troedyn"
+#~ msgid "Headings"
+#~ msgstr "Penawdau"
+#~ msgid "Headings for each letter"
+#~ msgstr "Penawdau ar gyfer bob llythyren"
+#~ msgid "Height:"
+#~ msgstr "Uchder:"
+#~ msgid "Immediately follow each other"
+#~ msgstr "Yn dilyn ei gilydd yn syth"
+#~ msgid "Include:"
+#~ msgstr "Cynnwys:"
+#~ msgid "Landscape"
+#~ msgstr "Tirlun"
+#~ msgid "Left:"
+#~ msgstr "Chwith:"
+#~ msgid "Letter tabs on side"
+#~ msgstr "Tabiau llythrennau ar yr ochr"
+#~ msgid "Margins"
+#~ msgstr "Ymylau"
+#~ msgid "Number of columns:"
+#~ msgstr "Nifer y colofnau:"
+#~ msgid "Options"
+#~ msgstr "Opsiynau"
+#~ msgid "Orientation"
+#~ msgstr "Gogwydd"
 
-#~ msgid "No, Do not Change Status"
-#~ msgstr "Na, Peidio â Newid Statws"