Updated Welsh translation

author: Iestyn Pryce <dylunio@gmail.com> 2009-08-08 01:05:47 +0800
committer: Matthew Barnes <mbarnes@redhat.com> 2009-08-11 04:43:40 +0800
commit: a51558d0fb96ff179b9249a473c3c03dcb7c5df4 (patch)
tree: bf6bd4c5e99336c009f6847d0eda6c99fb7f8d89 /po
parent: eeb05e58d8af259d36bf1a22668a34219dcea847 (diff)
download: gsoc2013-evolution-a51558d0fb96ff179b9249a473c3c03dcb7c5df4.tar.gz
gsoc2013-evolution-a51558d0fb96ff179b9249a473c3c03dcb7c5df4.tar.zst
gsoc2013-evolution-a51558d0fb96ff179b9249a473c3c03dcb7c5df4.zip
1 files changed, 1345 insertions, 1143 deletions
diff --git a/po/cy.po b/po/cy.po
index cfb7df7bf2..8ea393e083 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -29,8 +29,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-23 20:12+0100\n"
-"PO-Revision-Date: 2009-07-26 20:39+0100\n"
+"POT-Creation-Date: 2009-08-07 17:57+0100\n"
+"PO-Revision-Date: 2009-08-07 18:05+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"
@@ -187,8 +187,8 @@ msgstr "%A %d %b %Y"
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:189
 #: ../calendar/gui/calendar-component.c:774
-#: ../calendar/gui/e-day-view-top-item.c:848
-#: ../calendar/gui/e-day-view.c:1587
+#: ../calendar/gui/e-day-view-top-item.c:844
+#: ../calendar/gui/e-day-view.c:1593
 #: ../calendar/gui/e-week-view-main-item.c:368
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -220,8 +220,8 @@ msgstr "%d %b %Y"
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:219
 #: ../calendar/gui/calendar-component.c:800
-#: ../calendar/gui/e-day-view-top-item.c:852
-#: ../calendar/gui/e-day-view.c:1603
+#: ../calendar/gui/e-day-view-top-item.c:848
+#: ../calendar/gui/e-day-view.c:1609
 #: ../calendar/gui/e-week-view-main-item.c:382
 msgid "%d %b"
 msgstr "%d %b"
@@ -412,7 +412,7 @@ msgstr "Methwyd dilysu gyda'r gweinydd LDAP."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1743
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1752
 msgid "Failed to delete contact"
 msgstr "Methu dileu'r cyswllt"
 
@@ -556,24 +556,20 @@ 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"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "C_ontacts"
 msgstr "_Cysylltiadau"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Certificates"
 msgstr "Tystysgrifau"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configure autocomplete here"
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure contacts and autocompletion here"
 msgstr "Cyfluniwch awto-gwblhau yma"
 
 #. Create the contacts group
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 #: ../addressbook/gui/component/addressbook-view.c:1213
 #: ../calendar/gui/calendar-component.c:193
 #: ../calendar/gui/migration.c:395
@@ -582,37 +578,37 @@ msgstr "Cyfluniwch awto-gwblhau yma"
 msgid "Contacts"
 msgstr "Cysylltiadau"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 msgid "Evolution Address Book"
 msgstr "Llyfr Cyfeiriadau Evolution"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 #, fuzzy
 msgid "Evolution Address Book address popup"
 msgstr "Naidlen cyfeiriad Llyfr Cyfeiriadau Evolution"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Address Book address viewer"
 msgstr "Gwelydd cyfeiriad Llyfr Cyfeiriadau Evolution"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Address Book card viewer"
 msgstr "Gwelydd cerdyn Llyfr Cyfeiriadau Evolution"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Address Book component"
 msgstr "Cydran Llyfr Cyfeiriadau Evolution"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 #, 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
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution folder settings configuration control"
 msgstr "Rheolaeth gosodiadau plygellau Evolution"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Manage your S/MIME certificates here"
 msgstr "Trefnwch dystysgrifau S/MIME yma"
 
@@ -746,19 +742,19 @@ msgstr "Mae'r cwmpas chwilio yn penderfynu ba ddyfnder islaw'r goeden cyfeiriadu
 
 #: ../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/cal-prefs-dialog.glade.h:23
 #: ../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
+#: ../mail/mail-config.glade.h:96
 #: ../plugins/itip-formatter/itip-formatter.c:2558
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Cyffredinol"
 
 #: ../addressbook/gui/component/addressbook-config.c:1021
-#: ../addressbook/gui/widgets/e-addressbook-view.c:553
+#: ../addressbook/gui/widgets/e-addressbook-view.c:554
 #: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "Llyfr Cyfeiriadau"
@@ -886,11 +882,11 @@ msgid "_Rename..."
 msgstr "_Ailenwi..."
 
 #: ../addressbook/gui/component/addressbook-view.c:954
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 #: ../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/e-calendar-table.c:1613
+#: ../calendar/gui/e-calendar-view.c:1828
+#: ../calendar/gui/e-memo-table.c:949
 #: ../calendar/gui/memos-component.c:482
 #: ../calendar/gui/tasks-component.c:475
 #: ../mail/em-folder-tree.c:2119
@@ -977,7 +973,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "URI y blygell a ddefnyddiwyd diwethaf yn y ddeialog dewis enwau."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Vertical pane position"
 msgstr "Lleoliad cwarel fertigol"
 
@@ -990,10 +986,25 @@ msgid "Whether to show the preview pane."
 msgstr "P'un ai i ddangos y cwarel rhagolwg."
 
 #: ../addressbook/gui/component/autocompletion-config.c:175
+msgid "Autocompletion"
+msgstr "Awto-gwblhau"
+
+#: ../addressbook/gui/component/autocompletion-config.c:177
 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
+#: ../addressbook/gui/component/autocompletion-config.c:182
+#, fuzzy
+msgid "Date/Time Format"
+msgstr "Dyddiad ac Amser"
+
+#: ../addressbook/gui/component/autocompletion-config.c:185
+#: ../mail/em-mailer-prefs.c:1456
+#, fuzzy
+msgid "Table column:"
+msgstr "Model Tabl"
+
+#: ../addressbook/gui/component/autocompletion-config.c:187
 #, fuzzy
 msgid "Look up in address books"
 msgstr "llyfr cyfeiriadau evolution"
@@ -1115,7 +1126,7 @@ msgstr "Dull _mewngofnodi:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:36
 #: ../calendar/gui/dialogs/calendar-setup.c:226
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:176
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
@@ -1130,7 +1141,7 @@ msgid "_Search scope:"
 msgstr "Cwmpas _chwilio:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:39
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:185
 #: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Server:"
 msgstr "_Gwasanaethwr:"
@@ -1149,8 +1160,9 @@ msgstr "cardiau"
 
 #: ../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
+#: ../calendar/gui/dialogs/event-page.glade.h:24
 #: ../plugins/caldav/caldav-source.c:448
+#: ../plugins/calendar-file/calendar-file.c:286
 #: ../plugins/calendar-http/calendar-http.c:323
 #: ../plugins/calendar-weather/calendar-weather.c:523
 #: ../plugins/google-account-setup/google-source.c:720
@@ -1199,7 +1211,7 @@ msgid "<b>Work</b>"
 msgstr "<b>Gwaith</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.glade.h:7
 #: ../calendar/gui/dialogs/memo-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "_Categorïau..."
@@ -1268,8 +1280,8 @@ msgid "_Birthday:"
 msgstr "_Pen-blwydd:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: ../calendar/gui/dialogs/event-page.c:805
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.c:820
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 #: ../plugins/itip-formatter/itip-view.c:1910
 msgid "_Calendar:"
 msgstr "_Calendr:"
@@ -1353,7 +1365,7 @@ msgid "_Zip/Postal Code:"
 msgstr "Cod _Post/Zip:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
-#: ../mail/em-mailer-prefs.c:472
+#: ../mail/em-mailer-prefs.c:473
 #: ../plugins/exchange-operations/exchange-delegates.c:951
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:697
 #: ../plugins/plugin-manager/plugin-manager.c:57
@@ -1435,7 +1447,7 @@ msgstr "Cartref"
 #: ../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
+#: ../calendar/gui/e-calendar-view.c:2289
 msgid "Other"
 msgstr "Arall"
 
@@ -1617,7 +1629,7 @@ msgid "Contact List Editor"
 msgstr "Golygydd Rhestr Gysylltiadau"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:211
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:212
 #: ../calendar/gui/e-day-view-time-item.c:812
 #: ../calendar/gui/e-timezone-entry.c:118
 msgid "Select..."
@@ -1647,7 +1659,7 @@ 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-addressbook-view.c:211
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
 #: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
@@ -1714,7 +1726,7 @@ msgid "Email"
 msgstr "E-bost"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 #: ../calendar/gui/cal-search-bar.c:79
 #: ../calendar/gui/caltypes.xml.h:2
 #: ../calendar/gui/memotypes.xml.h:2
@@ -1723,7 +1735,7 @@ msgid "Any field contains"
 msgstr "Unrhyw faes yn cynnwys"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:158
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
 msgid "Email begins with"
 msgstr "E-bost yn dechrau gyda"
 
@@ -1745,7 +1757,7 @@ msgstr[2] "%d cyswllt"
 
 #: ../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-addressbook-view.c:225
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
 #: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
@@ -1769,15 +1781,15 @@ msgstr "Model:"
 msgid "Error modifying card"
 msgstr "Gwall newid carden"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:157
+#: ../addressbook/gui/widgets/e-addressbook-view.c:158
 msgid "Name begins with"
 msgstr "Enw yn dechrau gyda"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:217
+#: ../addressbook/gui/widgets/e-addressbook-view.c:218
 msgid "Source"
 msgstr "Tardd"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:231
+#: ../addressbook/gui/widgets/e-addressbook-view.c:232
 #: ../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
@@ -1786,74 +1798,74 @@ msgstr "Tardd"
 msgid "Type"
 msgstr "Math"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:811
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1962
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1971
 msgid "Save as vCard..."
 msgstr "Cadw fel vCard..."
 
-#: ../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
+#: ../addressbook/gui/widgets/e-addressbook-view.c:932
+#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-view.c:1806
+#: ../calendar/gui/e-memo-table.c:932
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Agor"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
 msgid "_New Contact..."
 msgstr "Cyswllt _Newydd..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:934
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "New Contact _List..."
 msgstr "_Rhestr Gyswllt Newydd..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:938
 msgid "_Save as vCard..."
 msgstr "_Cadw fel vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Forward Contact"
 msgstr "Gyrru Cyswllt _ymlaen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contacts"
 msgstr "Gyrru _Cysylltiadau ymlaen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "Send _Message to Contact"
 msgstr "Anfon _Neges I'r Cyswllt"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to List"
 msgstr "Anfon Neges at _Restr"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to Contacts"
 msgstr "Anfon Neges at _Gysylltiadau"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "_Print"
 msgstr "_Argraffu"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:947
 msgid "Cop_y to Address Book..."
 msgstr "_Copïo i'r Llyfr Cyfeiriadau..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Mo_ve to Address Book..."
 msgstr "_Symud i'r Llyfr Cyfeiriadau..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:951
 msgid "Cu_t"
 msgstr "_Torri"
 
-#: ../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
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../calendar/gui/e-calendar-table.c:1599
+#: ../calendar/gui/e-calendar-view.c:1813
+#: ../calendar/gui/e-memo-table.c:940
 #: ../mail/em-folder-tree.c:991
 #: ../mail/em-folder-view.c:1325
-#: ../mail/message-list.c:2103
+#: ../mail/message-list.c:2109
 #: ../ui/evolution-addressbook.xml.h:46
 #: ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-message.xml.h:99
@@ -1862,19 +1874,19 @@ msgstr "_Torri"
 msgid "_Copy"
 msgstr "_Copïo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
 msgid "P_aste"
 msgstr "_Gludo"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1525
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1534
 #: ../calendar/gui/cal-search-bar.c:624
 #: ../calendar/gui/cal-search-bar.c:667
 #: ../calendar/gui/cal-search-bar.c:686
 msgid "Any Category"
 msgstr "Unrhyw Gategori"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1528
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1537
 #: ../calendar/gui/cal-search-bar.c:628
 #: ../calendar/gui/cal-search-bar.c:671
 #: ../calendar/gui/cal-search-bar.c:690
@@ -1911,7 +1923,7 @@ msgid "Car Phone"
 msgstr "Ffôn Car"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:7
+#: ../calendar/gui/dialogs/event-page.glade.h:8
 #: ../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
@@ -2252,7 +2264,7 @@ msgstr "Sgwrs Fideo"
 #: ../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
+#: ../calendar/gui/gnome-cal.c:2548
 #: ../plugins/exchange-operations/exchange-delegates-user.c:75
 #: ../plugins/exchange-operations/exchange-folder.c:572
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:419
@@ -2265,7 +2277,7 @@ msgid "Calendar"
 msgstr "Calendr"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:627
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #: ../calendar/gui/dialogs/event-editor.c:116
 msgid "Free/Busy"
 msgstr "Rhydd/Prysur"
@@ -2293,13 +2305,13 @@ msgid "Web Log"
 msgstr "Gweflog"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:646
-#: ../calendar/gui/e-calendar-view.c:2578
+#: ../calendar/gui/e-calendar-view.c:2580
 msgid "Birthday"
 msgstr "Pen-blwydd"
 
 # EFALLAI
 #: ../addressbook/gui/widgets/eab-contact-display.c:647
-#: ../calendar/gui/e-calendar-view.c:2579
+#: ../calendar/gui/e-calendar-view.c:2581
 msgid "Anniversary"
 msgstr "Cylchwyl"
 
@@ -2369,8 +2381,8 @@ msgstr "Protocol ni chynhelir"
 #: ../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/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:661
 #: ../calendar/gui/print.c:2548
 msgid "Canceled"
 msgstr "Diddymwyd"
@@ -3201,9 +3213,9 @@ msgid "Memo_s"
 msgstr "_Memos"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:288
+#: ../calendar/gui/e-memo-table.c:293
 #: ../calendar/gui/e-memos.c:1123
-#: ../calendar/gui/gnome-cal.c:1843
+#: ../calendar/gui/gnome-cal.c:1846
 #: ../calendar/gui/memos-component.c:564
 #: ../calendar/gui/memos-component.c:882
 #: ../calendar/gui/memos-control.c:386
@@ -3212,9 +3224,9 @@ msgid "Memos"
 msgstr "Memos"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:720
+#: ../calendar/gui/e-calendar-table.c:725
 #: ../calendar/gui/e-tasks.c:1426
-#: ../calendar/gui/gnome-cal.c:1711
+#: ../calendar/gui/gnome-cal.c:1714
 #: ../calendar/gui/print.c:1973
 #: ../calendar/gui/tasks-component.c:557
 #: ../calendar/gui/tasks-component.c:879
@@ -3236,7 +3248,7 @@ msgstr "_Calendrau"
 
 #. Tasks
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../plugins/pst-import/pst-importer.c:329
+#: ../plugins/pst-import/pst-importer.c:328
 #: ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Tasgau"
@@ -3254,8 +3266,9 @@ msgstr[2] "munud"
 
 #: ../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
+#: ../calendar/gui/dialogs/event-page.glade.h:23
 #: ../plugins/caldav/caldav-source.c:449
+#: ../plugins/calendar-file/calendar-file.c:287
 #: ../plugins/calendar-http/calendar-http.c:324
 #: ../plugins/calendar-weather/calendar-weather.c:524
 #: ../plugins/google-account-setup/google-source.c:721
@@ -3281,8 +3294,8 @@ 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/alarm-notify/alarm-queue.c:1592
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
 #: ../calendar/gui/e-itip-control.c:1164
 #: ../plugins/itip-formatter/itip-view.c:1023
 msgid "Location:"
@@ -3297,10 +3310,10 @@ msgid "_Dismiss"
 msgstr "_Diystyru"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1028
+#: ../calendar/gui/dialogs/comp-editor.c:1038
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:8
 #: ../filter/filter.glade.h:11
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:168
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:22
 #: ../ui/evolution-addressbook.xml.h:51
@@ -3321,32 +3334,32 @@ msgstr "_Hepian"
 msgid "location of appointment"
 msgstr "lleoliad yr apwyntiad"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1458
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1451
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1575
 msgid "No summary available."
 msgstr "Dim crynodeb ar gael."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1467
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1469
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1460
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
 msgid "No description available."
 msgstr "Dim disgrifiad ar gael."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1477
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
 msgid "No location information available."
 msgstr "Dim gwybodaeth lleoliad ar gael."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1522
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1515
 #, c-format
 msgid "You have %d alarms"
 msgstr "Mae gennych %d larwm."
 
-#: ../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
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1675
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1686
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1679
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3358,7 +3371,7 @@ msgstr ""
 "hwn ei gyflunio i anfon e-bost.  Bydd Evolution yn dangos\n"
 "blwch deialog atgoffa arferol yn lle hynny."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1709
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
@@ -3373,7 +3386,7 @@ msgstr ""
 "\n"
 "Ydych chi'n siŵr eich bod am redeg y rhaglen?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1730
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
 msgid "Do not ask me about this program again."
 msgstr "Peidiwch â gofyn ynghylch y rhaglen hon eto."
 
@@ -3471,388 +3484,428 @@ msgid "Confirm expunge"
 msgstr "Cadarnhau chwynnu"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+msgid "Count of default recurrence for a new event. -1 means forever."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 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.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default appointment reminder"
 msgstr "atgoffad apwyntiad rhagosodedig"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#, fuzzy
+msgid "Default recurrence count"
+msgstr "Unedau atgoffa rhagosodedig"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder units"
 msgstr "Unedau atgoffa rhagosodedig"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Default reminder value"
 msgstr "Gwerth atgoffad rhagosodedig"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Directory for saving alarm audio files"
 msgstr "Ym mha gyfeiriadur i arbed ffeiliau sain larymau"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Event Gradient"
 msgstr "Graddiant Digwyddiad"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Event Transparency"
 msgstr "Tryloywder Digwyddiadau"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Free/busy server URLs"
 msgstr "LAU gweinyddion statws rhydd/prysur"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Free/busy template URL"
 msgstr "LAU templed statws rhydd/prysur"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Gradient of the events in calendar views."
 msgstr "Graddiant y digwyddiadau yn yr olwg galendr."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide completed tasks"
 msgstr "Cuddio tasgau sydd wedi gorffen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hide task units"
 msgstr "Cuddio unedau tasg"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Hide task value"
 msgstr "Cuddio gwerth tasg"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Horizontal pane position"
 msgstr "Lleoliad cwarel llorweddol"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 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.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 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.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "Yr ysbeidiau a ddangosir yng ngolygon Dydd ac Wythnos Waith, mewn munudau."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Last alarm time"
 msgstr "Amser larwm diweddaraf"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Level beyond which the message should be logged."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "List of recently used second time zones in a Day View."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 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.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "Marcus Bains Line"
 msgstr "Llinell Marcus Bains"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Lliw Llinell Marcus Bains - Golwg Dydd"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Lliw Llinell Marcus Bains - Bar amser"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 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
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid "Maximum number of recently used timezones to remember."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Munud diwedd dydd gwaith, 0 i 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Munud cychwyn dydd gwaith, 0 i 59"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Month view horizontal pane position"
 msgstr "Lleoliad cwarel llorweddol golwg Mis"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Month view vertical pane position"
 msgstr "Lleoliad cwarel fertigol golwg Mis"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 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.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 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.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Overdue tasks color"
 msgstr "Lliw tasgau hwyr"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels."
 msgstr "Lleoliad y cwarel llorweddol, rhwng y calendr llywio dyddiadau a'r rhestr dasgau pan ddim yn yr olwg mis, mewn picseli."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels."
 msgstr "Lleoliad y cwarel llorweddol, rhwng yr olwg a'r calendr llywio dyddiadau a'r rhestr dasgau pan yn yr olwg mis, mewn picseli."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid "Position of the vertical pane, between the calendar lists and the date navigator calendar."
 msgstr "Lleoliad y cwarel fertigol, rhwng y rhestrau calendr a'r calendr llywio dyddiadau."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Position of the vertical pane, between the task list and the task preview pane, in pixels."
 msgstr "Lleoliad y cwarel fertigol, rhwng yr olwg tasgau a'r cwarel rhagolwg tasgau, mewn picseli."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid "Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels."
 msgstr "Lleoliad y cwarel fertigol, rhwng yr olwg a'r calendr llywio dyddiadau a'r rhestr dasgau pan yn yr olwg mis, mewn picseli"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid "Position of the vertical pane, between the view and the date navigator calendar and task list when not in the month view, in pixels."
 msgstr "Lleoliad y cwarel fertigol, rhwng y calendr llywio dyddiadau a'r rhestr dasgau pan ddim yn yr olwg mis, mewn picseli."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#, fuzzy
+msgid "Primary calendar"
+msgstr "Argraffu'r calendr yma"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#, fuzzy
+msgid "Primary memo list"
+msgstr "Rhestr femo newydd"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#, fuzzy
+msgid "Primary task list"
+msgstr "Rhestr dasgau newydd"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 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.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid "Recently used second time zones in a Day View"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid "Save directory for alarm audio"
 msgstr "Cyfeiriadur cadw sain larwm"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid "Scroll Month View by a week"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 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.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 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.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 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.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 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.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Show display alarms in notification tray"
 msgstr "Gweld larymau dangos yn y gilfach hysbysu"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 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.h:61
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Show the \"Preview\" pane"
 msgstr "Dangos y cwarel \"Rhagolwg\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Show the \"Preview\" pane."
 msgstr "Dangos y cwarel \"Rhagolwg\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Dangos y maes cylchfa amser yn y golygydd digwyddiadau/tasgau/cyfarfodydd"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 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.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 #, 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
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show week numbers in date navigator"
 msgstr "Dangos rhifau wythnos yn y llywiwr dyddiadau"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Shows the second time zone in a Day View, if set. Value is similar to one used in a 'timezone' key."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Tasks due today color"
 msgstr "Lliw tasgau i fod i ddod i ben heddiw"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Tasks vertical pane position"
 msgstr "Lleoliad fertigol cwarel Tasgau"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 #, no-c-format
 msgid "The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain."
 msgstr "Patrymlun LAU i'w ddefnyddio wrth gefn ar gyfer gwybodaeth rydd/prysur. Rhoddir rhan defnyddiwr y cyfeiriad e-bost yn lle %u, a'r enw parth yn lle %d."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like \"America/New York\"."
 msgstr "Y gylchfa amser ragosodedig i'w defnyddio ar gyfer amserau a dyddiadau yn y calendr, ar ffurf lleoliad cylchfa amser Olsen heb ei gyfieithu, fel \"Europe/London\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "The second timezone for a Day View"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "This can have three possible values. 0 for errors. 1 for warnings. 2 for debug messages."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Time divisions"
 msgstr "Rhaniadau amser"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 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.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Timezone"
 msgstr "Cylchfa amser"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Transparency of the events in calendar views, a value between 0 (transparent) and 1 (opaque)."
 msgstr "Tryloywder y digwyddiadau yn yr olwg galendr, gwerth rhwng 0 (tryloyw) ac 1 (hollol anhryloyw)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Twenty four hour time format"
 msgstr "Ffurf cloc bedair awr ar hugain"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+msgid "URI of the highlighted (\"primary\") calendar"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+msgid "URI of the highlighted (\"primary\") memo list"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+msgid "URI of the highlighted (\"primary\") task list"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Unedau nodyn atgoffa rhagosodedig, \"munudau\", \"oriau\" neu \"dyddiau\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr "Unedau er mwyn penderfynu p'un ai i guddio tasgau, \"munudau\", \"oriau\" neu \"dyddiau\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Use system timezone"
 msgstr "Defnyddio cyrchfa amser y system"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+msgid "Use the system timezone instead of the timezone selected in Evolution."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Week start"
 msgstr "Dechrau wythnos"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 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.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 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.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 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.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "P'un ai i ofyn am gadarnhad cyn gwaredu apwyntiadau a thasgau."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid "Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday."
 msgstr "P'un ai i gywasgu penwythnosau yn yr olwg mis, fydd yn rhoi Dydd Sadwrn a Dydd Sul yng ngofod un diwrnod."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "P'un ai i ddangos amser gorffen digwyddiadau yng ngolygon wythnos a mis."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "P'un ai i dynnu Llinell Marcus Bains (llinell yr amser presennol) ar y calendr."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 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.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Whether to scroll a Month View by a week, not by a month."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 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.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 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.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "P'un ai i ddangos maes categorïau yn y golygydd digwyddiad/tasg/cyfarfod."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 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.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "P'un ai i ddangos maes statws yn y golygydd digwyddiad/tasg/cyfarfod."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "P'un ai i ddangos amserau ar ffurf bedair awr ar hugain yn lle defnyddio am/pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "P'un ai i ddangos maes cylchfa amser yn y golygydd digwyddiad/tasg/cyfarfod."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 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.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 #, 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.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 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.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Work days"
 msgstr "Dyddiau gwaith"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Workday end hour"
 msgstr "Awr gorffen dydd gwaith"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Workday end minute"
 msgstr "Munud gorffen dydd gwaith"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Workday start hour"
 msgstr "Awr dechrau dydd gwaith"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid "Workday start minute"
 msgstr "Munud cychwyn dydd gwaith"
 
@@ -3917,16 +3970,17 @@ msgstr "Apwyntiadau'r 7 Diwrnod Nesaf"
 msgid "Print"
 msgstr "Argraffu"
 
-#: ../calendar/gui/calendar-commands.c:312
+#: ../calendar/gui/calendar-commands.c:331
 msgid "This operation will permanently erase all events older than the selected amount of time. If you continue, you will not be able to recover these events."
 msgstr "Bydd y weithred yn dileu'n barhaol pob digwyddiad sy'n hynach na'r amser a ddewiswyd. Os wnewch chi barhau, fedrwch chi ddim adfer y digwyddiadau."
 
-#: ../calendar/gui/calendar-commands.c:318
+#: ../calendar/gui/calendar-commands.c:337
 msgid "Purge events older than"
 msgstr "Gwaredu digwyddiadau sy'n hŷn na"
 
-#: ../calendar/gui/calendar-commands.c:323
+#: ../calendar/gui/calendar-commands.c:342
 #: ../plugins/caldav/caldav-source.c:450
+#: ../plugins/calendar-file/calendar-file.c:288
 #: ../plugins/calendar-http/calendar-http.c:325
 #: ../plugins/calendar-weather/calendar-weather.c:525
 #: ../plugins/google-account-setup/google-source.c:722
@@ -4098,9 +4152,9 @@ 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/e-cal-list-view.c:249
+#: ../calendar/gui/e-cal-model.c:370
+#: ../calendar/gui/e-calendar-table.c:565
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:340
 msgid "Confidential"
@@ -4118,9 +4172,8 @@ 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"
+msgstr "Disgrifiad yn Cynnwys"
 
 #: ../calendar/gui/caltypes.xml.h:10
 #: ../calendar/gui/memotypes.xml.h:9
@@ -4139,7 +4192,7 @@ 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/publish-calendar/publish-calendar.c:722
 #: ../plugins/save-calendar/csv-format.c:371
 msgid "Location"
 msgstr "Lleoliad"
@@ -4151,18 +4204,18 @@ 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/e-cal-list-view.c:248
+#: ../calendar/gui/e-cal-model.c:368
+#: ../calendar/gui/e-calendar-table.c:564
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Preifat"
 
 #: ../calendar/gui/caltypes.xml.h:15
-#: ../calendar/gui/e-cal-list-view.c:246
-#: ../calendar/gui/e-cal-model.c:340
-#: ../calendar/gui/e-cal-model.c:347
-#: ../calendar/gui/e-calendar-table.c:562
+#: ../calendar/gui/e-cal-list-view.c:247
+#: ../calendar/gui/e-cal-model.c:359
+#: ../calendar/gui/e-cal-model.c:366
+#: ../calendar/gui/e-calendar-table.c:563
 #: ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Cyhoeddus"
@@ -4185,9 +4238,8 @@ 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"
+msgstr "Crynodeb yn Cynnwys"
 
 #: ../calendar/gui/caltypes.xml.h:19
 #: ../calendar/gui/memotypes.xml.h:16
@@ -4331,15 +4383,14 @@ msgid ""
 msgstr ""
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#, fuzzy
 msgid ""
 "minutes\n"
 "hours\n"
 "days"
 msgstr ""
-"Munudau\n"
-"Oriau\n"
-"Diwrnodau"
+"munudau\n"
+"oriau\n"
+"diwrnodau"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
 #, fuzzy
@@ -4357,7 +4408,7 @@ msgid "A_dd"
 msgstr "_Ychwanegu"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "Alarms"
 msgstr "Larymau"
@@ -4373,16 +4424,16 @@ msgid "Attach file(s)"
 msgstr "Atodi ffeil(iau)"
 
 #. 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/dialogs/cal-prefs-dialog.c:136
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:185
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/event-page.c:2993
 #: ../calendar/gui/e-cal-model-tasks.c:671
 #: ../calendar/gui/e-day-view-time-item.c:785
 #: ../calendar/gui/e-itip-control.c:1150
 #: ../filter/filter-rule.c:942
-#: ../mail/em-account-editor.c:706
-#: ../mail/em-account-editor.c:1435
+#: ../mail/em-account-editor.c:717
+#: ../mail/em-account-editor.c:1451
 #: ../mail/em-account-prefs.c:435
 #: ../mail/em-junk-hook.c:93
 #: ../plugins/calendar-weather/calendar-weather.c:333
@@ -4397,10 +4448,19 @@ msgstr "Atodi ffeil(iau)"
 msgid "None"
 msgstr "Dim"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:647
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:648
 msgid "Selected Calendars for Alarms"
 msgstr "Calendrau a ddewiswyd ar gyfer Larymau"
 
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:865
+#, fuzzy
+msgid "Time and date:"
+msgstr "Cylchfa amser:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:866
+msgid "Date only:"
+msgstr "Dyddiad yn unig:"
+
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 #, fuzzy
 msgid "(Shown in a Day View)"
@@ -4436,47 +4496,53 @@ msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Rhybuddion</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../mail/mail-config.glade.h:14
+#, fuzzy
+msgid "<span weight=\"bold\">Date/Time Format</span>"
+msgstr "<span weight=\"bold\">Amser</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 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:12
-#: ../mail/mail-config.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../mail/mail-config.glade.h:18
 #: ../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:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "<span weight=\"bold\">Task List</span>"
 msgstr "<span weight=\"bold\">Rhestr Dasgau</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "<span weight=\"bold\">Time</span>"
 msgstr "<span weight=\"bold\">Amser</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">Wythnos Waith</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Day _ends:"
 msgstr "Dydd yn _gorffen:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Display"
 msgstr "Dangos"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #, 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/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Friday"
 msgstr "Dydd Gwener"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -4486,13 +4552,13 @@ msgstr ""
 "Oriau\n"
 "Diwrnodau"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: ../calendar/gui/dialogs/recurrence-page.c:1103
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
 #: ../calendar/gui/e-itip-control.c:727
 msgid "Monday"
 msgstr "Dydd Llun"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -4510,182 +4576,181 @@ msgstr ""
 "Sadwrn\n"
 "Sul"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../mail/mail-config.glade.h:118
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../mail/mail-config.glade.h:119
 msgid "Pick a color"
 msgstr "Dewiswch liw"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "S_un"
 msgstr "S_ul"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: ../calendar/gui/dialogs/recurrence-page.c:1108
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../calendar/gui/e-itip-control.c:732
 msgid "Saturday"
 msgstr "Dydd Sadwrn"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Sc_roll Month View by a week"
 msgstr ""
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #, fuzzy
 msgid "Se_cond zone:"
 msgstr "Anfon at:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Select the calendars for alarm notification"
 msgstr "Dewis y calendrau ar gyfer hysbysiad larwm"
 
 #. 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
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Sh_ow a reminder"
 msgstr "Dangos _Atgof"
 
 #. 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
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Show a _reminder"
-msgstr "Dangos _Atgof"
+msgstr "Dangos _atgof"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Show week _numbers in date navigator"
 msgstr "Dangos rhifau _wythnos yn y llywiwr dyddiadau"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 #, 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/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../calendar/gui/e-itip-control.c:726
 msgid "Sunday"
 msgstr "Dydd Sul"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "T_asks due today:"
 msgstr "_Tasgau i fod i ddod i ben heddiw:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "T_hu"
 msgstr "_Iau"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Template:"
 msgstr "Templed:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-#: ../calendar/gui/dialogs/recurrence-page.c:1106
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Thursday"
 msgstr "Dydd Iau"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "Time _zone:"
 msgstr "_Cylchfa amser:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "Time format:"
 msgstr "Fformat amser:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-#: ../calendar/gui/dialogs/recurrence-page.c:1104
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Tuesday"
 msgstr "Dydd Mawrth"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 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/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
 #: ../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:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "Wee_k starts on:"
 msgstr "_Wythnos yn cychwyn:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "Work days:"
 msgstr "Dyddiau gwaith:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_12 hour (AM/PM)"
 msgstr "_12 awr (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_24 hour"
 msgstr "_24 awr"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Gofyn am gadarnhad wrth ddileu eitemau"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Compress weekends in month view"
 msgstr "_Cywasgu wythnosau yn yr olwg mis"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Day begins:"
 msgstr "_Dydd yn cychwyn:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Fri"
 msgstr "_Gwe"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "_Hide completed tasks after"
 msgstr "_Cuddio tasgau gorffenedig ar ôl"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
 msgid "_Mon"
 msgstr "_Llu"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 msgid "_Overdue tasks:"
 msgstr "_Tasgau sy'n hwyr:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:74
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
 msgid "_Sat"
 msgstr "_Sad"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
 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:76
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
 msgid "_Time divisions:"
 msgstr "_Rhaniadau amser:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:78
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:79
 msgid "_Tue"
 msgstr "_Maw"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:80
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:81
 msgid "_Wed"
 msgstr "_Mer"
 
 #. 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
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:83
 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
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:85
 msgid "before every appointment"
 msgstr "cyn bob apwyntiad"
 
@@ -4792,132 +4857,132 @@ msgid "Validation error: %s"
 msgstr "Gwall dilysu: %s"
 
 # TRWSIO
-#: ../calendar/gui/dialogs/comp-editor-util.c:188
+#: ../calendar/gui/dialogs/comp-editor-util.c:189
 #: ../calendar/gui/print.c:2349
 msgid " to "
 msgstr " i"
 
 # TRWSIO
-#: ../calendar/gui/dialogs/comp-editor-util.c:192
+#: ../calendar/gui/dialogs/comp-editor-util.c:193
 #: ../calendar/gui/print.c:2353
 msgid " (Completed "
 msgstr " (Cyflawnwyd "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:194
+#: ../calendar/gui/dialogs/comp-editor-util.c:195
 #: ../calendar/gui/print.c:2355
 msgid "Completed "
 msgstr "Cyflawnwyd"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:199
+#: ../calendar/gui/dialogs/comp-editor-util.c:200
 #: ../calendar/gui/print.c:2360
 msgid " (Due "
 msgstr " (Amser Disgwyl "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:201
+#: ../calendar/gui/dialogs/comp-editor-util.c:202
 #: ../calendar/gui/print.c:2362
 msgid "Due "
 msgstr "Amser Disgwyl "
 
-#: ../calendar/gui/dialogs/comp-editor.c:221
+#: ../calendar/gui/dialogs/comp-editor.c:224
 msgid "Could not save attachments"
 msgstr "Methu cadw atodiadau"
 
-#: ../calendar/gui/dialogs/comp-editor.c:483
+#: ../calendar/gui/dialogs/comp-editor.c:487
 msgid "Could not update object"
 msgstr "Methwyd diweddaru'r gwrthrych"
 
-#: ../calendar/gui/dialogs/comp-editor.c:572
+#: ../calendar/gui/dialogs/comp-editor.c:582
 msgid "Edit Appointment"
 msgstr "Golygu Apwyntiad"
 
-#: ../calendar/gui/dialogs/comp-editor.c:579
+#: ../calendar/gui/dialogs/comp-editor.c:589
 #, c-format
 msgid "Meeting - %s"
 msgstr "Cyfarfod - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:581
+#: ../calendar/gui/dialogs/comp-editor.c:591
 #, c-format
 msgid "Appointment - %s"
 msgstr "Apwyntiad - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:587
+#: ../calendar/gui/dialogs/comp-editor.c:597
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tasg wedi Neilltuo - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:589
+#: ../calendar/gui/dialogs/comp-editor.c:599
 #, c-format
 msgid "Task - %s"
 msgstr "Tasg - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:594
+#: ../calendar/gui/dialogs/comp-editor.c:604
 #, c-format
 msgid "Memo - %s"
 msgstr "Memo - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:610
+#: ../calendar/gui/dialogs/comp-editor.c:620
 msgid "No Summary"
 msgstr "Dim Crynodeb"
 
-#: ../calendar/gui/dialogs/comp-editor.c:752
+#: ../calendar/gui/dialogs/comp-editor.c:762
 msgid "Keep original item?"
 msgstr "Cadw eitem gwreiddiol?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:958
+#: ../calendar/gui/dialogs/comp-editor.c:968
 msgid "Click here to close the current window"
 msgstr "Cliciwch yma i gau'r ffenest bresennol"
 
-#: ../calendar/gui/dialogs/comp-editor.c:965
+#: ../calendar/gui/dialogs/comp-editor.c:975
 msgid "Copy selected text to the clipboard"
 msgstr "Copïo'r testun a ddewiswyd i'r clipfwrdd"
 
-#: ../calendar/gui/dialogs/comp-editor.c:972
+#: ../calendar/gui/dialogs/comp-editor.c:982
 msgid "Cut selected text to the clipboard"
 msgstr "Torri'r testun a ddewiswyd i'r clipfwrdd"
 
-#: ../calendar/gui/dialogs/comp-editor.c:979
+#: ../calendar/gui/dialogs/comp-editor.c:989
 msgid "Click here to view help available"
 msgstr "Cliciwch yma i weld yr help sydd ar gael"
 
-#: ../calendar/gui/dialogs/comp-editor.c:986
+#: ../calendar/gui/dialogs/comp-editor.c:996
 msgid "Paste text from the clipboard"
 msgstr "Gludo'r testun sydd ar y clipfwrdd"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1007
+#: ../calendar/gui/dialogs/comp-editor.c:1017
 msgid "Click here to save the current window"
 msgstr "Cliciwch yma i gadw'r ffenest bresennol"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1014
+#: ../calendar/gui/dialogs/comp-editor.c:1024
 msgid "Select all text"
 msgstr "Dewis y holl destun"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1021
+#: ../calendar/gui/dialogs/comp-editor.c:1031
 msgid "_Classification"
 msgstr "_Dosbarthiad"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1035
-#: ../mail/mail-signature-editor.c:208
+#: ../calendar/gui/dialogs/comp-editor.c:1045
+#: ../mail/mail-signature-editor.c:209
 #: ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "_Ffeil"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1042
+#: ../calendar/gui/dialogs/comp-editor.c:1052
 #: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:1059
 msgid "_Insert"
 msgstr "_Mewnosod"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1056
+#: ../calendar/gui/dialogs/comp-editor.c:1066
 msgid "_Options"
 msgstr "_Opsiynau"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1063
+#: ../calendar/gui/dialogs/comp-editor.c:1073
 #: ../mail/em-folder-tree.c:2106
 #: ../ui/evolution-addressbook.xml.h:64
 #: ../ui/evolution-mail-global.xml.h:34
@@ -4927,113 +4992,117 @@ msgstr "_Opsiynau"
 msgid "_View"
 msgstr "_Golwg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1073
+#: ../calendar/gui/dialogs/comp-editor.c:1083
 #: ../composer/e-composer-actions.c:315
 msgid "_Attachment..."
 msgstr "_Atodiad..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1075
+#: ../calendar/gui/dialogs/comp-editor.c:1085
 msgid "Click here to attach a file"
 msgstr "Cliciwch yma er mwyn atodi ffeil"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1083
+#: ../calendar/gui/dialogs/comp-editor.c:1093
 msgid "_Categories"
 msgstr "_Categorïau"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1085
+#: ../calendar/gui/dialogs/comp-editor.c:1095
 msgid "Toggles whether to display categories"
 msgstr "Toglu p'un ai i ddangos categorïau ai peidio"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1091
+#: ../calendar/gui/dialogs/comp-editor.c:1101
 msgid "Time _Zone"
 msgstr "_Cylchfa Amser"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1093
+#: ../calendar/gui/dialogs/comp-editor.c:1103
 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
+#: ../calendar/gui/dialogs/comp-editor.c:1112
 msgid "Pu_blic"
 msgstr "_Cyhoeddus"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1104
+#: ../calendar/gui/dialogs/comp-editor.c:1114
 msgid "Classify as public"
 msgstr "Categoreiddio yn eitem gyhoeddus"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1109
+#: ../calendar/gui/dialogs/comp-editor.c:1119
 msgid "_Private"
 msgstr "_Preifat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1111
+#: ../calendar/gui/dialogs/comp-editor.c:1121
 #, fuzzy
 msgid "Classify as private"
 msgstr "Categoreiddio yn eitem breifat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1116
+#: ../calendar/gui/dialogs/comp-editor.c:1126
 msgid "_Confidential"
 msgstr "_Cyfrinachol"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1118
+#: ../calendar/gui/dialogs/comp-editor.c:1128
 #, fuzzy
 msgid "Classify as confidential"
 msgstr "Categoreiddio'n Gyfrinachol"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1126
+#: ../calendar/gui/dialogs/comp-editor.c:1136
 msgid "R_ole Field"
 msgstr "Maes _Rôl"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1128
+#: ../calendar/gui/dialogs/comp-editor.c:1138
 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
+#: ../calendar/gui/dialogs/comp-editor.c:1144
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1136
+#: ../calendar/gui/dialogs/comp-editor.c:1146
 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
+#: ../calendar/gui/dialogs/comp-editor.c:1152
 msgid "_Status Field"
 msgstr "_Maes Statws"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1144
+#: ../calendar/gui/dialogs/comp-editor.c:1154
 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
+#: ../calendar/gui/dialogs/comp-editor.c:1160
 msgid "_Type Field"
 msgstr "_Maes Math"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1152
+#: ../calendar/gui/dialogs/comp-editor.c:1162
 #, 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
+#: ../calendar/gui/dialogs/comp-editor.c:1186
+#: ../composer/e-composer-private.c:67
 msgid "Recent _Documents"
 msgstr "_Dogfennau Diweddar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1602
+#: ../calendar/gui/dialogs/comp-editor.c:1615
 #: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:1670
+msgid "Save"
+msgstr "Cadw"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1924
+#: ../calendar/gui/dialogs/comp-editor.c:1973
+#: ../calendar/gui/dialogs/comp-editor.c:2833
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "Efallai bydd y newidiadau wnaed i'r eitem yn cael eu tynnu os wnaiff diweddariad gyrraedd"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2729
+#: ../calendar/gui/dialogs/comp-editor.c:2801
 #: ../mail/em-utils.c:371
 #: ../plugins/prefer-plain/prefer-plain.c:91
 msgid "attachment"
 msgstr "atodiad"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2789
+#: ../calendar/gui/dialogs/comp-editor.c:2862
 msgid "Unable to use current version!"
 msgstr "Ni ellir defnyddio'r fersiwn cyfredol!"
 
@@ -5174,94 +5243,108 @@ msgstr "Ymholi Gwybodaeth Statws Rhydd/Prysur ar gyfer y mynychwyr"
 msgid "Appoint_ment"
 msgstr "_Apwyntiad"
 
-#: ../calendar/gui/dialogs/event-page.c:749
-#: ../calendar/gui/dialogs/event-page.c:2735
+#: ../calendar/gui/dialogs/event-page.c:748
+msgid "Event cannot be edited, because the selected calendar is read only"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:752
+msgid "Event cannot be fully edited, because you are not the organizer"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:764
+#: ../calendar/gui/dialogs/event-page.c:2769
 msgid "This event has alarms"
 msgstr "Mae gan yr apwyntiad larymau"
 
-#: ../calendar/gui/dialogs/event-page.c:812
-#: ../calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/event-page.c:827
+#: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "_Trefnydd:"
 
-#: ../calendar/gui/dialogs/event-page.c:859
+#: ../calendar/gui/dialogs/event-page.c:874
 msgid "_Delegatees"
 msgstr "_Cynrychiolwyr"
 
-#: ../calendar/gui/dialogs/event-page.c:861
+#: ../calendar/gui/dialogs/event-page.c:876
 msgid "Atte_ndees"
 msgstr "_Mynychwyr"
 
-#: ../calendar/gui/dialogs/event-page.c:1046
+#: ../calendar/gui/dialogs/event-page.c:1062
 msgid "Event with no start date"
 msgstr "Digwyddiad heb amser cychwyn"
 
-#: ../calendar/gui/dialogs/event-page.c:1049
+#: ../calendar/gui/dialogs/event-page.c:1065
 msgid "Event with no end date"
 msgstr "Digwyddiad heb amser gorffen"
 
-#: ../calendar/gui/dialogs/event-page.c:1218
-#: ../calendar/gui/dialogs/memo-page.c:639
-#: ../calendar/gui/dialogs/task-page.c:814
+#: ../calendar/gui/dialogs/event-page.c:1236
+#: ../calendar/gui/dialogs/memo-page.c:654
+#: ../calendar/gui/dialogs/task-page.c:830
 msgid "Start date is wrong"
 msgstr "Dyddiad cychwyn yn anghywir"
 
-#: ../calendar/gui/dialogs/event-page.c:1228
+#: ../calendar/gui/dialogs/event-page.c:1246
 msgid "End date is wrong"
 msgstr "Dyddiad gorffen yn anghywir"
 
-#: ../calendar/gui/dialogs/event-page.c:1251
+#: ../calendar/gui/dialogs/event-page.c:1269
 msgid "Start time is wrong"
 msgstr "Amser cychwyn yn anghywir"
 
-#: ../calendar/gui/dialogs/event-page.c:1258
+#: ../calendar/gui/dialogs/event-page.c:1276
 msgid "End time is wrong"
 msgstr "Amser gorffen yn anghywir"
 
-#: ../calendar/gui/dialogs/event-page.c:1420
-#: ../calendar/gui/dialogs/memo-page.c:680
-#: ../calendar/gui/dialogs/task-page.c:874
+#: ../calendar/gui/dialogs/event-page.c:1438
+#: ../calendar/gui/dialogs/memo-page.c:695
+#: ../calendar/gui/dialogs/task-page.c:890
 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:1426
-#: ../calendar/gui/dialogs/memo-page.c:686
-#: ../calendar/gui/dialogs/task-page.c:880
+#: ../calendar/gui/dialogs/event-page.c:1444
+#: ../calendar/gui/dialogs/memo-page.c:701
+#: ../calendar/gui/dialogs/task-page.c:896
 msgid "An organizer is required."
 msgstr "Mae gofyn am drefnydd."
 
-#: ../calendar/gui/dialogs/event-page.c:1451
-#: ../calendar/gui/dialogs/task-page.c:904
+#: ../calendar/gui/dialogs/event-page.c:1469
+#: ../calendar/gui/dialogs/task-page.c:920
 msgid "At least one attendee is required."
 msgstr "Mae eisiau un neu fwy o'r mynychwyr."
 
-#: ../calendar/gui/dialogs/event-page.c:1890
-#: ../calendar/gui/dialogs/task-page.c:1200
+#: ../calendar/gui/dialogs/event-page.c:1912
+#: ../calendar/gui/dialogs/task-page.c:1219
 #: ../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
+#: ../calendar/gui/dialogs/event-page.c:1913
+#: ../calendar/gui/dialogs/task-page.c:1220
 msgid "_Add "
 msgstr "_Ychwanegu"
 
-#: ../calendar/gui/dialogs/event-page.c:2611
+#: ../calendar/gui/dialogs/event-page.c:2639
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Ni ellir agor y calendr '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:2655
-#: ../calendar/gui/dialogs/memo-page.c:895
-#: ../calendar/gui/dialogs/task-page.c:1806
+#. Translators: This string is used when we are creating an Event
+#. (meeting or appointment)  on behalf of some other user
+#. Translators: This string is used when we are creating a Memo
+#. on behalf of some other user
+#. Translators: This string is used when we are creating a Task
+#. on behalf of some other user
+#: ../calendar/gui/dialogs/event-page.c:2683
+#: ../calendar/gui/dialogs/memo-page.c:910
+#: ../calendar/gui/dialogs/task-page.c:1825
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:2933
+#: ../calendar/gui/dialogs/event-page.c:2967
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -5269,7 +5352,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:2939
+#: ../calendar/gui/dialogs/event-page.c:2973
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -5277,7 +5360,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:2945
+#: ../calendar/gui/dialogs/event-page.c:2979
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
@@ -5285,7 +5368,7 @@ msgstr[0] "%d funud cyn yr apwyntiad"
 msgstr[1] "%d funud cyn yr apwyntiad"
 msgstr[2] "%d munud cyn yr apwyntiad"
 
-#: ../calendar/gui/dialogs/event-page.c:2958
+#: ../calendar/gui/dialogs/event-page.c:2992
 msgid "Customize"
 msgstr "Addasu"
 
@@ -5303,46 +5386,51 @@ msgstr ""
 msgid "Attendee_s..."
 msgstr "_Mynychwyr..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/e-meeting-list-view.c:151
+msgid "Attendees"
+msgstr "Mynychwyr"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:9
 msgid "Custom Alarm:"
 msgstr "Larwm Addasedig:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "Disgrifiad Digwyddiad"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 #: ../calendar/gui/dialogs/memo-page.glade.h:4
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "_Crynodeb:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Alarm"
 msgstr "_Larwm"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../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
+#: ../calendar/gui/dialogs/event-page.glade.h:17
 #: ../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
+#: ../calendar/gui/dialogs/event-page.glade.h:18
 msgid "_Time:"
 msgstr "_Amser:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:18
+#: ../calendar/gui/dialogs/event-page.glade.h:19
 #: ../calendar/gui/dialogs/memo-page.glade.h:8
 #: ../calendar/gui/dialogs/task-page.glade.h:10
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:193
 #: ../mail/mail-dialogs.glade.h:21
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:5
 #: ../smime/gui/smime-ui.glade.h:49
@@ -5353,7 +5441,7 @@ msgstr ""
 "a\n"
 "b"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:20
+#: ../calendar/gui/dialogs/event-page.glade.h:21
 #, fuzzy
 msgid ""
 "for\n"
@@ -5365,18 +5453,26 @@ msgstr "hyd"
 msgid "Memo"
 msgstr "Memo"
 
-#: ../calendar/gui/dialogs/memo-page.c:856
+#: ../calendar/gui/dialogs/memo-page.c:347
+msgid "Memo cannot be edited, because the selected memo list is read only"
+msgstr ""
+
+#: ../calendar/gui/dialogs/memo-page.c:351
+msgid "Memo cannot be fully edited, because you are not the organizer"
+msgstr ""
+
+#: ../calendar/gui/dialogs/memo-page.c:871
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Methu agor memos o fewn '%s'."
 
-#: ../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
+#: ../calendar/gui/dialogs/memo-page.c:1031
+#: ../mail/em-format-html.c:1566
+#: ../mail/em-format-html.c:1624
+#: ../mail/em-format-html.c:1649
 #: ../mail/em-format-quote.c:209
 #: ../mail/em-format.c:925
-#: ../mail/em-mailer-prefs.c:77
+#: ../mail/em-mailer-prefs.c:78
 #: ../mail/message-list.etspec.h:20
 msgid "To"
 msgstr "I"
@@ -5391,7 +5487,7 @@ msgid "T_o:"
 msgstr "_At:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:365
+#: ../calendar/gui/dialogs/task-page.c:380
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Grŵp"
@@ -5432,21 +5528,21 @@ msgstr "Hwn ac Enghreifftiau Dyfodol"
 msgid "All Instances"
 msgstr "Pob Enghraifft"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:559
+#: ../calendar/gui/dialogs/recurrence-page.c:563
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Mae'r apwyntiad yn cynnwys ail-ddigwyddiadau na all Evolution eu newid."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:888
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "Dyddiad ail-ddigwydd yn annilys"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:928
+#: ../calendar/gui/dialogs/recurrence-page.c:932
 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:957
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "ar"
 
@@ -5454,7 +5550,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:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "first"
 msgstr "cyntaf"
 
@@ -5463,7 +5559,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:1020
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "second"
 msgstr "ail"
 
@@ -5471,7 +5567,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:1025
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "third"
 msgstr "trydydd"
 
@@ -5479,21 +5575,30 @@ 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:1030
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "fourth"
 msgstr "pedwerydd"
 
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fifth] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#, fuzzy
+msgid "fifth"
+msgstr "Lled"
+
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1035
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 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:1059
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "Other Date"
 msgstr "Dyddiad Arall"
 
@@ -5501,7 +5606,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:1065
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "1st to 10th"
 msgstr "1af hyd 10fed"
 
@@ -5509,7 +5614,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:1071
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "11th to 20th"
 msgstr "11eg hyd 20fed"
 
@@ -5517,45 +5622,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:1077
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 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:1102
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 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:1231
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
 msgid "on the"
 msgstr "ar y"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1401
+#: ../calendar/gui/dialogs/recurrence-page.c:1410
 msgid "occurrences"
 msgstr "digwyddiadau"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2096
+#: ../calendar/gui/dialogs/recurrence-page.c:2105
 msgid "Add exception"
 msgstr "Ychwanegu eithriad"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2137
+#: ../calendar/gui/dialogs/recurrence-page.c:2146
 msgid "Could not get a selection to modify."
 msgstr "Methu cael dewisiad i'w newid."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2143
+#: ../calendar/gui/dialogs/recurrence-page.c:2152
 msgid "Modify exception"
 msgstr "Newid eithriad"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2187
+#: ../calendar/gui/dialogs/recurrence-page.c:2196
 msgid "Could not get a selection to delete."
 msgstr "Methu cael dewisiad i'w ddileu."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2311
+#: ../calendar/gui/dialogs/recurrence-page.c:2320
 msgid "Date/Time"
 msgstr "Dyddiad ac Amser"
 
@@ -5601,10 +5706,14 @@ msgid ""
 "forever"
 msgstr ""
 
-#: ../calendar/gui/dialogs/send-comp.c:116
+#: ../calendar/gui/dialogs/send-comp.c:160
 msgid "Send my alarms with this event"
 msgstr ""
 
+#: ../calendar/gui/dialogs/send-comp.c:162
+msgid "Notify new attendees _only"
+msgstr ""
+
 #: ../calendar/gui/dialogs/task-details-page.c:376
 #: ../calendar/gui/dialogs/task-details-page.c:396
 msgid "Completed date is wrong"
@@ -5681,16 +5790,25 @@ msgstr "_Tasg"
 msgid "Task Details"
 msgstr "Manylion Tasg"
 
-#: ../calendar/gui/dialogs/task-page.c:373
+#: ../calendar/gui/dialogs/task-page.c:336
+msgid "Task cannot be edited, because the selected task list is read only"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.c:340
+#, fuzzy
+msgid "Task cannot be fully edited, because you are not the organizer"
+msgstr "Methu anfon y neges am nad ydych wedi penodi unrhyw un i'w dderbyn"
+
+#: ../calendar/gui/dialogs/task-page.c:388
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Trefn_ydd:"
 
-#: ../calendar/gui/dialogs/task-page.c:787
+#: ../calendar/gui/dialogs/task-page.c:803
 msgid "Due date is wrong"
 msgstr "Dyddiad disgwyliedig yn anghywir"
 
-#: ../calendar/gui/dialogs/task-page.c:1763
+#: ../calendar/gui/dialogs/task-page.c:1782
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Methu agor tasgau o fewn '%s'."
@@ -5835,7 +5953,7 @@ msgstr "Dyddiad Cychwyn:"
 #: ../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
+#: ../mail/mail-config.glade.h:76
 msgid "Description:"
 msgstr "Disgrifiad:"
 
@@ -5867,8 +5985,8 @@ msgstr "Statws:"
 #: ../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/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:659
 #: ../calendar/gui/print.c:2542
 msgid "In Progress"
 msgstr "Ar Waith"
@@ -5878,8 +5996,8 @@ msgstr "Ar Waith"
 #: ../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-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:660
 #: ../calendar/gui/e-itip-control.c:939
 #: ../calendar/gui/e-meeting-store.c:179
 #: ../calendar/gui/e-meeting-store.c:202
@@ -5892,8 +6010,8 @@ 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/e-calendar-table.c:232
+#: ../calendar/gui/e-calendar-table.c:658
 #: ../calendar/gui/print.c:2539
 #: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
@@ -5904,22 +6022,22 @@ msgid "Priority:"
 msgstr "Blaenoriaeth:"
 
 #: ../calendar/gui/e-cal-component-preview.c:264
-#: ../calendar/gui/e-calendar-table.c:584
+#: ../calendar/gui/e-calendar-table.c:585
 #: ../calendar/gui/tasktypes.xml.h:14
 #: ../mail/message-list.c:1064
 msgid "High"
 msgstr "Uchel"
 
 #: ../calendar/gui/e-cal-component-preview.c:266
-#: ../calendar/gui/e-cal-model.c:1057
-#: ../calendar/gui/e-calendar-table.c:585
+#: ../calendar/gui/e-cal-model.c:1076
+#: ../calendar/gui/e-calendar-table.c:586
 #: ../calendar/gui/tasktypes.xml.h:17
 #: ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "Arferol"
 
 #: ../calendar/gui/e-cal-component-preview.c:268
-#: ../calendar/gui/e-calendar-table.c:586
+#: ../calendar/gui/e-calendar-table.c:587
 #: ../calendar/gui/tasktypes.xml.h:16
 #: ../mail/message-list.c:1062
 msgid "Low"
@@ -5948,12 +6066,12 @@ msgid "Start Date"
 msgstr "Dyddiad Dechrau"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:636
+#: ../calendar/gui/e-calendar-table.c:637
 msgid "Free"
 msgstr "Yn Rhydd"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:637
+#: ../calendar/gui/e-calendar-table.c:638
 #: ../calendar/gui/e-meeting-time-sel.c:391
 msgid "Busy"
 msgstr "Prysur"
@@ -5969,7 +6087,7 @@ msgstr ""
 "45.436845,125.862501"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1027
-#: ../calendar/gui/e-cal-model.c:1063
+#: ../calendar/gui/e-cal-model.c:1082
 #: ../calendar/gui/e-meeting-list-view.c:190
 #: ../calendar/gui/e-meeting-store.c:151
 #: ../calendar/gui/e-meeting-store.c:161
@@ -5979,7 +6097,7 @@ msgid "Yes"
 msgstr "Ie"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1027
-#: ../calendar/gui/e-cal-model.c:1063
+#: ../calendar/gui/e-cal-model.c:1082
 #: ../calendar/gui/e-meeting-list-view.c:191
 #: ../calendar/gui/e-meeting-store.c:163
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
@@ -5987,7 +6105,7 @@ msgid "No"
 msgstr "Nage"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:353
+#: ../calendar/gui/e-cal-model.c:372
 #: ../calendar/gui/e-itip-control.c:1195
 #: ../calendar/gui/e-itip-control.c:1333
 #: ../calendar/gui/e-meeting-list-view.c:166
@@ -6005,137 +6123,137 @@ msgstr "Nage"
 msgid "Unknown"
 msgstr "Anhysbys"
 
-#: ../calendar/gui/e-cal-model.c:1059
+#: ../calendar/gui/e-cal-model.c:1078
 msgid "Recurring"
 msgstr "Ail-ddigwydd"
 
-#: ../calendar/gui/e-cal-model.c:1061
+#: ../calendar/gui/e-cal-model.c:1080
 msgid "Assigned"
 msgstr "Wedi Neilltuo"
 
-#: ../calendar/gui/e-calendar-table.c:334
+#: ../calendar/gui/e-calendar-table.c:335
 msgid "* No Summary *"
 msgstr "* Dim Crynodeb *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-table.c:370
-#: ../calendar/gui/e-calendar-view.c:2427
+#: ../calendar/gui/e-calendar-table.c:371
+#: ../calendar/gui/e-calendar-view.c:2429
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Trefnydd: %s <%s>"
 
 #. 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
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2433
 #, c-format
 msgid "Organizer: %s"
 msgstr "Trefnydd: %s"
 
-#: ../calendar/gui/e-calendar-table.c:404
+#: ../calendar/gui/e-calendar-table.c:405
 msgid "Start: "
 msgstr "Cychwyn:"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:417
 #, fuzzy
 msgid "Due: "
 msgstr "Amser Disgwyl "
 
-#: ../calendar/gui/e-calendar-table.c:587
+#: ../calendar/gui/e-calendar-table.c:588
 #: ../calendar/gui/tasktypes.xml.h:24
 msgid "Undefined"
 msgstr "Anniffiniedig"
 
-#: ../calendar/gui/e-calendar-table.c:606
+#: ../calendar/gui/e-calendar-table.c:607
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:607
+#: ../calendar/gui/e-calendar-table.c:608
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:608
+#: ../calendar/gui/e-calendar-table.c:609
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:609
+#: ../calendar/gui/e-calendar-table.c:610
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:610
+#: ../calendar/gui/e-calendar-table.c:611
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:611
+#: ../calendar/gui/e-calendar-table.c:612
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:612
+#: ../calendar/gui/e-calendar-table.c:613
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:613
+#: ../calendar/gui/e-calendar-table.c:614
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:614
+#: ../calendar/gui/e-calendar-table.c:615
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:615
+#: ../calendar/gui/e-calendar-table.c:616
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:616
+#: ../calendar/gui/e-calendar-table.c:617
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:892
-#: ../calendar/gui/e-calendar-view.c:657
-#: ../calendar/gui/e-memo-table.c:444
+#: ../calendar/gui/e-calendar-table.c:897
+#: ../calendar/gui/e-calendar-view.c:659
+#: ../calendar/gui/e-memo-table.c:449
 msgid "Deleting selected objects"
 msgstr "Dileu gwrthrych dewisedig"
 
-#: ../calendar/gui/e-calendar-table.c:1171
-#: ../calendar/gui/e-calendar-view.c:871
-#: ../calendar/gui/e-memo-table.c:649
+#: ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:873
+#: ../calendar/gui/e-memo-table.c:654
 msgid "Updating objects"
 msgstr "Diweddaru gwrthrychau"
 
-#: ../calendar/gui/e-calendar-table.c:1359
-#: ../calendar/gui/e-calendar-view.c:1331
-#: ../calendar/gui/e-memo-table.c:823
+#: ../calendar/gui/e-calendar-table.c:1364
+#: ../calendar/gui/e-calendar-view.c:1333
+#: ../calendar/gui/e-memo-table.c:828
 #: ../composer/e-composer-actions.c:219
 msgid "Save as..."
 msgstr "Cadw fel..."
 
-#: ../calendar/gui/e-calendar-table.c:1583
-#: ../calendar/gui/e-calendar-view.c:1787
+#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-calendar-view.c:1789
 msgid "New _Task"
 msgstr "_Tasg Newydd"
 
-#: ../calendar/gui/e-calendar-table.c:1587
-#: ../calendar/gui/e-memo-table.c:928
+#: ../calendar/gui/e-calendar-table.c:1592
+#: ../calendar/gui/e-memo-table.c:933
 msgid "Open _Web Page"
 msgstr "Agor Tudalen _Gwe"
 
-#: ../calendar/gui/e-calendar-table.c:1588
-#: ../calendar/gui/e-calendar-view.c:1805
-#: ../calendar/gui/e-memo-table.c:929
+#: ../calendar/gui/e-calendar-table.c:1593
+#: ../calendar/gui/e-calendar-view.c:1807
+#: ../calendar/gui/e-memo-table.c:934
 #: ../mail/em-folder-view.c:1336
 #: ../mail/em-popup.c:494
 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
+#: ../calendar/gui/e-calendar-table.c:1594
+#: ../calendar/gui/e-calendar-view.c:1792
+#: ../calendar/gui/e-memo-table.c:935
 msgid "P_rint..."
 msgstr "_Argraffu..."
 
-#: ../calendar/gui/e-calendar-table.c:1593
-#: ../calendar/gui/e-calendar-view.c:1810
-#: ../calendar/gui/e-memo-table.c:934
+#: ../calendar/gui/e-calendar-table.c:1598
+#: ../calendar/gui/e-calendar-view.c:1812
+#: ../calendar/gui/e-memo-table.c:939
 #: ../ui/evolution-addressbook.xml.h:2
 #: ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1
@@ -6143,10 +6261,10 @@ msgstr "_Argraffu..."
 msgid "C_ut"
 msgstr "_Torri"
 
-#: ../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
+#: ../calendar/gui/e-calendar-table.c:1600
+#: ../calendar/gui/e-calendar-view.c:1795
+#: ../calendar/gui/e-calendar-view.c:1814
+#: ../calendar/gui/e-memo-table.c:941
 #: ../ui/evolution-addressbook.xml.h:57
 #: ../ui/evolution-calendar.xml.h:46
 #: ../ui/evolution-memos.xml.h:19
@@ -6154,38 +6272,38 @@ msgstr "_Torri"
 msgid "_Paste"
 msgstr "_Gludo"
 
-#: ../calendar/gui/e-calendar-table.c:1599
+#: ../calendar/gui/e-calendar-table.c:1604
 #: ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Neilltuo Tasg"
 
-#: ../calendar/gui/e-calendar-table.c:1600
-#: ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/e-calendar-table.c:1605
+#: ../calendar/gui/e-memo-table.c:945
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Gyrru ymlaen fel iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1601
+#: ../calendar/gui/e-calendar-table.c:1606
 msgid "_Mark as Complete"
 msgstr "_Marcio yn gyflawn"
 
-#: ../calendar/gui/e-calendar-table.c:1602
+#: ../calendar/gui/e-calendar-table.c:1607
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcio'r tasgau a ddewiswyd yn rai cyflawn"
 
-#: ../calendar/gui/e-calendar-table.c:1603
+#: ../calendar/gui/e-calendar-table.c:1608
 msgid "_Mark as Incomplete"
 msgstr "_Marcio heb eu gorffen"
 
-#: ../calendar/gui/e-calendar-table.c:1604
+#: ../calendar/gui/e-calendar-table.c:1609
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Marcio'r tasgau a ddewiswyd yn rai heb eu gorffen"
 
-#: ../calendar/gui/e-calendar-table.c:1609
+#: ../calendar/gui/e-calendar-table.c:1614
 msgid "_Delete Selected Tasks"
 msgstr "_Dileu'r tasgau a ddewiswyd"
 
-#: ../calendar/gui/e-calendar-table.c:1844
+#: ../calendar/gui/e-calendar-table.c:1849
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Cliciwch i ychwanegu tasg"
@@ -6220,7 +6338,7 @@ msgstr "Dyddiad cychwyn"
 #. 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-calendar-view.c:2337
 #: ../calendar/gui/e-meeting-list-view.c:601
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21
@@ -6229,68 +6347,68 @@ msgstr "Dyddiad cychwyn"
 msgid "Status"
 msgstr "Statws"
 
-#: ../calendar/gui/e-calendar-view.c:1476
+#: ../calendar/gui/e-calendar-view.c:1478
 msgid "Moving items"
 msgstr "Symud eitemau"
 
-#: ../calendar/gui/e-calendar-view.c:1478
+#: ../calendar/gui/e-calendar-view.c:1480
 msgid "Copying items"
 msgstr "Copïo eitemau"
 
-#: ../calendar/gui/e-calendar-view.c:1784
+#: ../calendar/gui/e-calendar-view.c:1786
 msgid "New _Appointment..."
 msgstr "_Apwyntiad Newydd..."
 
-#: ../calendar/gui/e-calendar-view.c:1785
+#: ../calendar/gui/e-calendar-view.c:1787
 msgid "New All Day _Event"
 msgstr "_Digwyddiad Newydd Drwy'r Dydd"
 
-#: ../calendar/gui/e-calendar-view.c:1786
+#: ../calendar/gui/e-calendar-view.c:1788
 msgid "New _Meeting"
 msgstr "_Cyfarfod Newydd"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1797
+#: ../calendar/gui/e-calendar-view.c:1799
 msgid "_Current View"
 msgstr "Golwg _Cyfredol"
 
-#: ../calendar/gui/e-calendar-view.c:1799
+#: ../calendar/gui/e-calendar-view.c:1801
 msgid "Select T_oday"
 msgstr "Dewis _Heddiw"
 
-#: ../calendar/gui/e-calendar-view.c:1800
+#: ../calendar/gui/e-calendar-view.c:1802
 msgid "_Select Date..."
 msgstr "_Dewis Dyddiad..."
 
-#: ../calendar/gui/e-calendar-view.c:1806
+#: ../calendar/gui/e-calendar-view.c:1808
 msgid "Pri_nt..."
 msgstr "_Argraffu..."
 
-#: ../calendar/gui/e-calendar-view.c:1816
+#: ../calendar/gui/e-calendar-view.c:1818
 msgid "Cop_y to Calendar..."
 msgstr "_Copïo i Galendr..."
 
-#: ../calendar/gui/e-calendar-view.c:1817
+#: ../calendar/gui/e-calendar-view.c:1819
 msgid "Mo_ve to Calendar..."
 msgstr "_Symud i Galendr..."
 
-#: ../calendar/gui/e-calendar-view.c:1818
+#: ../calendar/gui/e-calendar-view.c:1820
 msgid "_Delegate Meeting..."
 msgstr "_Dirprwyo Cyfarfod..."
 
-#: ../calendar/gui/e-calendar-view.c:1819
+#: ../calendar/gui/e-calendar-view.c:1821
 msgid "_Schedule Meeting..."
 msgstr "_Trefnu Cyfarfod..."
 
-#: ../calendar/gui/e-calendar-view.c:1820
+#: ../calendar/gui/e-calendar-view.c:1822
 msgid "_Forward as iCalendar..."
 msgstr "_Gyrru Ymlaen fel iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1821
+#: ../calendar/gui/e-calendar-view.c:1823
 msgid "_Reply"
 msgstr "_Ateb"
 
-#: ../calendar/gui/e-calendar-view.c:1822
+#: ../calendar/gui/e-calendar-view.c:1824
 #: ../mail/e-attachment-handler-mail.c:140
 #: ../mail/em-folder-view.c:1330
 #: ../mail/em-popup.c:499
@@ -6298,20 +6416,20 @@ msgstr "_Ateb"
 msgid "Reply to _All"
 msgstr "Ateb i _Bawb"
 
-#: ../calendar/gui/e-calendar-view.c:1827
+#: ../calendar/gui/e-calendar-view.c:1829
 msgid "Make this Occurrence _Movable"
 msgstr "Galluogi _symud y digwyddiad hwn"
 
-#: ../calendar/gui/e-calendar-view.c:1828
+#: ../calendar/gui/e-calendar-view.c:1830
 #: ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Dileu _digwyddiad hyn"
 
-#: ../calendar/gui/e-calendar-view.c:1829
+#: ../calendar/gui/e-calendar-view.c:1831
 msgid "Delete _All Occurrences"
 msgstr "Dileu _Pob digwyddiadau"
 
-#: ../calendar/gui/e-calendar-view.c:2282
+#: ../calendar/gui/e-calendar-view.c:2284
 #: ../calendar/gui/e-itip-control.c:1183
 #: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:171
@@ -6320,7 +6438,7 @@ msgstr "Dileu _Pob digwyddiadau"
 msgid "Accepted"
 msgstr "Derbyniwyd"
 
-#: ../calendar/gui/e-calendar-view.c:2283
+#: ../calendar/gui/e-calendar-view.c:2285
 #: ../calendar/gui/e-itip-control.c:1191
 #: ../calendar/gui/e-meeting-list-view.c:203
 #: ../calendar/gui/e-meeting-store.c:173
@@ -6329,7 +6447,7 @@ msgstr "Derbyniwyd"
 msgid "Declined"
 msgstr "Gwrthododd"
 
-#: ../calendar/gui/e-calendar-view.c:2284
+#: ../calendar/gui/e-calendar-view.c:2286
 #: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:175
 #: ../calendar/gui/e-meeting-store.c:198
@@ -6337,7 +6455,7 @@ msgstr "Gwrthododd"
 msgid "Tentative"
 msgstr "I'w gadarnhau"
 
-#: ../calendar/gui/e-calendar-view.c:2285
+#: ../calendar/gui/e-calendar-view.c:2287
 #: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:177
 #: ../calendar/gui/e-meeting-store.c:200
@@ -6345,34 +6463,34 @@ msgstr "I'w gadarnhau"
 msgid "Delegated"
 msgstr "Dirprwywyd"
 
-#: ../calendar/gui/e-calendar-view.c:2286
+#: ../calendar/gui/e-calendar-view.c:2288
 msgid "Needs action"
 msgstr "Angen gweithred"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2447
+#: ../calendar/gui/e-calendar-view.c:2449
 #: ../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:2478
+#: ../calendar/gui/e-calendar-view.c:2480
 #, 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:105
+#: ../calendar/gui/e-cell-date-edit-text.c:102
 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:108
+#: ../calendar/gui/e-cell-date-edit-text.c:105
 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:116
+#: ../calendar/gui/e-cell-date-edit-text.c:113
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -6401,29 +6519,29 @@ msgstr "Dangos y cwarel \"Rhagolwg\""
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:844
-#: ../calendar/gui/e-day-view.c:1570
+#: ../calendar/gui/e-day-view-top-item.c:840
+#: ../calendar/gui/e-day-view.c:1576
 #: ../calendar/gui/e-week-view-main-item.c:359
 #: ../calendar/gui/print.c:1666
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:799
+#: ../calendar/gui/e-day-view.c:805
 #: ../calendar/gui/e-week-view.c:541
 #: ../calendar/gui/print.c:825
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:802
+#: ../calendar/gui/e-day-view.c:808
 #: ../calendar/gui/e-week-view.c:544
 #: ../calendar/gui/print.c:827
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2301
+#: ../calendar/gui/e-day-view.c:2309
 #, c-format
 msgid "Week %d"
 msgstr "Wythnos %d"
@@ -6500,12 +6618,12 @@ msgstr[2] "cyfanswm o %d gwaith"
 msgid ", ending on "
 msgstr ", yn gorffen ar "
 
-#. For Translators : 'starts' is starts:date implying a task starts on what date
+#. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
 #: ../calendar/gui/e-itip-control.c:900
 msgid "Starts"
 msgstr "Cychwyn"
 
-#. For Translators : 'ends' is ends:date implying a task ends on what date
+#. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
 #: ../calendar/gui/e-itip-control.c:914
 msgid "Ends"
 msgstr "Gorffen"
@@ -6863,10 +6981,6 @@ msgstr "Cyfranogwyr Dewisol"
 msgid "Resources"
 msgstr "Adnoddau"
 
-#: ../calendar/gui/e-meeting-list-view.c:151
-msgid "Attendees"
-msgstr "Mynychwyr"
-
 #: ../calendar/gui/e-meeting-list-view.c:162
 #: ../calendar/gui/e-meeting-store.c:84
 #: ../calendar/gui/e-meeting-store.c:101
@@ -7053,11 +7167,11 @@ msgstr "Iaith"
 msgid "Member"
 msgstr "Aelodau"
 
-#: ../calendar/gui/e-memo-table.c:945
+#: ../calendar/gui/e-memo-table.c:950
 msgid "_Delete Selected Memos"
 msgstr "_Dileu'r Memos a Ddewiswyd"
 
-#: ../calendar/gui/e-memo-table.c:1094
+#: ../calendar/gui/e-memo-table.c:1099
 #: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Cliciwch i ychwanegu memo"
@@ -7115,39 +7229,39 @@ msgstr "Dewiswch Gylchfa Amser"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2670
+#: ../calendar/gui/gnome-cal.c:2673
 msgid "_Custom View"
 msgstr "Golwg _Addasedig"
 
-#: ../calendar/gui/gnome-cal.c:2671
+#: ../calendar/gui/gnome-cal.c:2674
 msgid "_Save Custom View"
 msgstr "_Cadw Golwg Addasedig"
 
-#: ../calendar/gui/gnome-cal.c:2676
+#: ../calendar/gui/gnome-cal.c:2679
 msgid "_Define Views..."
 msgstr "_Diffinio Golygon..."
 
-#: ../calendar/gui/gnome-cal.c:2913
+#: ../calendar/gui/gnome-cal.c:2916
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Yn llwytho tasgau am %s"
 
-#: ../calendar/gui/gnome-cal.c:2928
+#: ../calendar/gui/gnome-cal.c:2931
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Yn llwytho tasgau at %s"
 
-#: ../calendar/gui/gnome-cal.c:2937
+#: ../calendar/gui/gnome-cal.c:2940
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Llwytho memos yn %s"
 
-#: ../calendar/gui/gnome-cal.c:3049
+#: ../calendar/gui/gnome-cal.c:3052
 #, c-format
 msgid "Opening %s"
 msgstr "Yn agor %s"
 
-#: ../calendar/gui/gnome-cal.c:4009
+#: ../calendar/gui/gnome-cal.c:4012
 msgid "Purging"
 msgstr "Puro"
 
@@ -7187,37 +7301,37 @@ msgstr "Dewis Dyddiad"
 msgid "_Select Today"
 msgstr "Dewis _Heddiw"
 
-#: ../calendar/gui/itip-utils.c:409
-#: ../calendar/gui/itip-utils.c:460
-#: ../calendar/gui/itip-utils.c:548
+#: ../calendar/gui/itip-utils.c:410
+#: ../calendar/gui/itip-utils.c:461
+#: ../calendar/gui/itip-utils.c:553
 msgid "An organizer must be set."
 msgstr "Rhaid gosod trefnydd."
 
-#: ../calendar/gui/itip-utils.c:452
+#: ../calendar/gui/itip-utils.c:453
 msgid "At least one attendee is necessary"
 msgstr "Rhaid bod un neu fwy o fynychwyr"
 
-#: ../calendar/gui/itip-utils.c:630
-#: ../calendar/gui/itip-utils.c:776
+#: ../calendar/gui/itip-utils.c:635
+#: ../calendar/gui/itip-utils.c:781
 msgid "Event information"
 msgstr "Gwybodaeth digwyddiad"
 
-#: ../calendar/gui/itip-utils.c:632
-#: ../calendar/gui/itip-utils.c:779
+#: ../calendar/gui/itip-utils.c:637
+#: ../calendar/gui/itip-utils.c:784
 msgid "Task information"
 msgstr "Gwybodaeth Tasg"
 
-#: ../calendar/gui/itip-utils.c:634
-#: ../calendar/gui/itip-utils.c:782
+#: ../calendar/gui/itip-utils.c:639
+#: ../calendar/gui/itip-utils.c:787
 msgid "Memo information"
 msgstr "Gwybodaeth memo"
 
-#: ../calendar/gui/itip-utils.c:636
-#: ../calendar/gui/itip-utils.c:800
+#: ../calendar/gui/itip-utils.c:641
+#: ../calendar/gui/itip-utils.c:805
 msgid "Free/Busy information"
 msgstr "Gwybodaeth statws Rhydd/Prysur"
 
-#: ../calendar/gui/itip-utils.c:638
+#: ../calendar/gui/itip-utils.c:643
 msgid "Calendar information"
 msgstr "Gwybodaeth Calendr"
 
@@ -7225,7 +7339,7 @@ msgstr "Gwybodaeth Calendr"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:672
+#: ../calendar/gui/itip-utils.c:677
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Derbyniwyd"
@@ -7234,7 +7348,7 @@ msgstr "Derbyniwyd"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:679
+#: ../calendar/gui/itip-utils.c:684
 #, fuzzy
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
@@ -7247,8 +7361,8 @@ msgstr "Wedi derbyn yn betrus"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:686
-#: ../calendar/gui/itip-utils.c:734
+#: ../calendar/gui/itip-utils.c:691
+#: ../calendar/gui/itip-utils.c:739
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Gwrthododd"
@@ -7257,7 +7371,7 @@ msgstr "Gwrthododd"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:693
+#: ../calendar/gui/itip-utils.c:698
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Dirprwywyd"
@@ -7265,7 +7379,7 @@ 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
+#: ../calendar/gui/itip-utils.c:711
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Diweddarwyd"
@@ -7273,7 +7387,7 @@ msgstr "Diweddarwyd"
 #. 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
+#: ../calendar/gui/itip-utils.c:718
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Diddymu"
@@ -7281,7 +7395,7 @@ 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
+#: ../calendar/gui/itip-utils.c:725
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Adnewyddu"
@@ -7289,22 +7403,22 @@ msgstr "Adnewyddu"
 #. 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
+#: ../calendar/gui/itip-utils.c:732
 #, fuzzy
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Gwrthgynnig"
 
-#: ../calendar/gui/itip-utils.c:797
+#: ../calendar/gui/itip-utils.c:802
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Gwybodaeth statws Rhydd/Prysur (%s i %s)"
 
-#: ../calendar/gui/itip-utils.c:805
+#: ../calendar/gui/itip-utils.c:810
 msgid "iCalendar information"
 msgstr "Gwybodaeth iCalendr"
 
-#: ../calendar/gui/itip-utils.c:976
+#: ../calendar/gui/itip-utils.c:981
 msgid "You must be an attendee of the event."
 msgstr "Rhaid i chi fod yn mynychu'r digwyddiad."
 
@@ -9328,12 +9442,7 @@ msgstr "Pasiffig/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pasiffig/Yap"
 
-#: ../composer/e-composer-autosave.c:273
-#, fuzzy
-msgid "Could not open autosave file"
-msgstr "Methwyd agor ffeil"
-
-#: ../composer/e-composer-autosave.c:280
+#: ../composer/e-composer-autosave.c:444
 msgid "Unable to retrieve message from editor"
 msgstr "Methu cyrchu neges o'r golygydd"
 
@@ -9347,7 +9456,7 @@ msgid "Attach a file"
 msgstr "Atodi Ffeil"
 
 #: ../composer/e-composer-actions.c:322
-#: ../mail/mail-signature-editor.c:194
+#: ../mail/mail-signature-editor.c:195
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "_Cau"
@@ -9396,7 +9505,7 @@ msgid "Save as draft"
 msgstr "Cadw fel drafft"
 
 #: ../composer/e-composer-actions.c:364
-#: ../composer/e-composer-private.c:186
+#: ../composer/e-composer-private.c:191
 msgid "S_end"
 msgstr "A_nfon"
 
@@ -9539,7 +9648,7 @@ msgstr "_Oddi wrth:"
 #: ../composer/e-composer-header-table.c:945
 #: ../mail/em-format-quote.c:209
 #: ../mail/em-format.c:923
-#: ../mail/em-mailer-prefs.c:75
+#: ../mail/em-mailer-prefs.c:76
 #: ../mail/message-list.etspec.h:7
 #: ../mail/message-tag-followup.c:296
 msgid "From"
@@ -9599,7 +9708,7 @@ msgstr "Dewiswch blygellau i bostio'r neges ati."
 msgid "Click here to select folders to post to"
 msgstr "Cliciwch yma i ddewis plygellau i bostio atynt"
 
-#: ../composer/e-composer-private.c:203
+#: ../composer/e-composer-private.c:208
 msgid "Save draft"
 msgstr "Cadw drafft"
 
@@ -9611,12 +9720,12 @@ msgstr "Methu llofnodi neges i'w hanfon: Dim tystysgrif llofnodi wedi'i phenodi
 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
+#: ../composer/e-msg-composer.c:1350
+#: ../composer/e-msg-composer.c:2189
 msgid "Compose Message"
 msgstr "Cyfansoddi'r Neges"
 
-#: ../composer/e-msg-composer.c:3328
+#: ../composer/e-msg-composer.c:3347
 msgid "<b>(The composer contains a non-text message body, which cannot be edited.)</b>"
 msgstr "<b>(Mae'r cyfansoddwr yn cynnwys corff neges nad yw'n destun, na ellir mo'i olygu.)</b>"
 
@@ -9769,6 +9878,47 @@ msgstr "cerdyn cyfeiriad"
 msgid "calendar information"
 msgstr "gwybodaeth calendr"
 
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:188
+#: ../plugins/itip-formatter/itip-view.c:191
+#: ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:304
+msgid "Today"
+msgstr "Heddiw"
+
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:200
+#: ../plugins/itip-formatter/itip-view.c:219
+msgid "Tomorrow"
+msgstr "Yfory"
+
+#: ../e-util/e-datetime-format.c:202
+#, fuzzy
+msgid "Yesterday"
+msgstr "Ddoe %l:%M %p"
+
+#: ../e-util/e-datetime-format.c:205
+#, c-format
+msgid "%d days from now"
+msgstr ""
+
+#: ../e-util/e-datetime-format.c:207
+#, fuzzy, c-format
+msgid "%d days ago"
+msgstr "1 dydd yn ôl"
+
+#: ../e-util/e-datetime-format.c:281
+#: ../e-util/e-datetime-format.c:291
+#: ../e-util/e-datetime-format.c:300
+#, fuzzy
+msgid "Use locale default"
+msgstr "Defnyddio'r _Rhagosodiad"
+
+#: ../e-util/e-datetime-format.c:495
+#, fuzzy
+msgid "Format:"
+msgstr "Fformat"
+
 #: ../e-util/e-error.c:78
 #: ../e-util/e-error.c:79
 #: ../e-util/e-error.c:121
@@ -9804,73 +9954,73 @@ msgstr "Cwblhau"
 msgid "Name of the component being logged"
 msgstr ""
 
-#: ../e-util/e-non-intrusive-error-dialog.c:190
+#: ../e-util/e-non-intrusive-error-dialog.c:191
 #, fuzzy
 msgid "Debug Logs"
 msgstr "Gweflog"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:204
+#: ../e-util/e-non-intrusive-error-dialog.c:205
 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
+#: ../e-util/e-non-intrusive-error-dialog.c:223
 msgid "second(s)."
 msgstr "eiliad"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:228
+#: ../e-util/e-non-intrusive-error-dialog.c:229
 #, fuzzy
 msgid "Log Messages:"
 msgstr "Negeseuon"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:273
+#: ../e-util/e-non-intrusive-error-dialog.c:274
 msgid "Log Level"
 msgstr ""
 
-#: ../e-util/e-non-intrusive-error-dialog.c:281
+#: ../e-util/e-non-intrusive-error-dialog.c:282
 #: ../widgets/misc/e-dateedit.c:380
 msgid "Time"
 msgstr "Amser"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:291
-#: ../mail/message-list.c:2521
+#: ../e-util/e-non-intrusive-error-dialog.c:292
+#: ../mail/message-list.c:2527
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Negeseuon"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:300
+#: ../e-util/e-non-intrusive-error-dialog.c:301
 #: ../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
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Error"
 msgstr "Gwall"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Errors"
 msgstr "Gwallau"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Warnings and Errors"
 msgstr "Rhybyddion a Gwallau"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:42
+#: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Debug"
 msgstr "Dadnamu"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:42
+#: ../e-util/e-non-intrusive-error-dialog.h:41
 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
+#: ../mail/em-composer-prefs.c:957
 #: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:714
+#: ../plugins/publish-calendar/publish-calendar.c:718
 msgid "Enabled"
 msgstr "Galluogwyd"
 
@@ -10373,7 +10523,7 @@ msgid "Mail Accounts"
 msgstr "Cyfrifon Ebost"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:109
 msgid "Mail Preferences"
 msgstr "Hoffterau Ebost"
 
@@ -10382,7 +10532,7 @@ msgid "Network Preferences"
 msgstr "Hoffterau Rhwydwaith"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
-#: ../plugins/pst-import/pst-importer.c:298
+#: ../plugins/pst-import/pst-importer.c:297
 msgid "_Mail"
 msgstr "_Ebost"
 
@@ -10406,9 +10556,9 @@ 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/em-format-html-display.c:1642
 #: ../mail/message-list.etspec.h:1
-#: ../widgets/misc/e-attachment-paned.c:141
+#: ../widgets/misc/e-attachment-paned.c:147
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Atodiad"
@@ -10416,13 +10566,13 @@ msgstr[1] "Atodiadau"
 msgstr[2] "Atodiadau"
 
 #: ../mail/e-mail-attachment-bar.c:615
-#: ../widgets/misc/e-attachment-paned.c:601
+#: ../widgets/misc/e-attachment-paned.c:607
 #, fuzzy
 msgid "Icon View"
 msgstr "Golwg Mis"
 
 #: ../mail/e-mail-attachment-bar.c:616
-#: ../widgets/misc/e-attachment-paned.c:602
+#: ../widgets/misc/e-attachment-paned.c:608
 msgid "List View"
 msgstr "Golwg Rhestr"
 
@@ -10518,79 +10668,72 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Dewiswch Blygell"
 
-#: ../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
+#: ../mail/em-account-editor.c:797
 msgid "Never"
 msgstr "Byth"
 
-#: ../mail/em-account-editor.c:782
+#: ../mail/em-account-editor.c:798
 msgid "Always"
 msgstr "Bob tro"
 
-#: ../mail/em-account-editor.c:783
+#: ../mail/em-account-editor.c:799
 msgid "Ask for each message"
 msgstr "Gofyn am bob neges"
 
-#: ../mail/em-account-editor.c:1861
-#: ../mail/mail-config.glade.h:100
+#: ../mail/em-account-editor.c:1877
+#: ../mail/mail-config.glade.h:101
 msgid "Identity"
 msgstr "Hunaniaeth"
 
-#: ../mail/em-account-editor.c:1912
-#: ../mail/mail-config.glade.h:127
+#: ../mail/em-account-editor.c:1928
+#: ../mail/mail-config.glade.h:128
 msgid "Receiving Email"
 msgstr "Derbyn Ebost"
 
-#: ../mail/em-account-editor.c:2184
+#: ../mail/em-account-editor.c:2200
 msgid "Check for _new messages every"
 msgstr "Gwirio am neges ebost _newydd pob"
 
-#: ../mail/em-account-editor.c:2192
+#: ../mail/em-account-editor.c:2208
 msgid "minu_tes"
 msgstr "munu_dau"
 
-#: ../mail/em-account-editor.c:2382
-#: ../mail/mail-config.glade.h:138
+#: ../mail/em-account-editor.c:2398
+#: ../mail/mail-config.glade.h:139
 msgid "Sending Email"
 msgstr "Anfon E-bost"
 
-#: ../mail/em-account-editor.c:2441
-#: ../mail/mail-config.glade.h:73
+#: ../mail/em-account-editor.c:2457
+#: ../mail/mail-config.glade.h:74
 msgid "Defaults"
 msgstr "Rhagosodiadau"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2507
-#: ../mail/mail-config.glade.h:133
+#: ../mail/em-account-editor.c:2523
+#: ../mail/mail-config.glade.h:134
 #: ../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:2544
-#: ../mail/em-account-editor.c:2639
+#: ../mail/em-account-editor.c:2560
+#: ../mail/em-account-editor.c:2655
 msgid "Receiving Options"
 msgstr "Gosodiadau Derbyn"
 
-#: ../mail/em-account-editor.c:2545
-#: ../mail/em-account-editor.c:2640
+#: ../mail/em-account-editor.c:2561
+#: ../mail/em-account-editor.c:2656
 msgid "Checking for New Messages"
 msgstr "Chwilio am Negeseuon Newydd"
 
-#: ../mail/em-account-editor.c:3107
-#: ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:3123
+#: ../mail/mail-config.glade.h:35
 msgid "Account Editor"
 msgstr "Golygydd Cyfrifon"
 
-#: ../mail/em-account-editor.c:3107
-#: ../mail/mail-config.glade.h:89
+#: ../mail/em-account-editor.c:3123
+#: ../mail/mail-config.glade.h:90
 msgid "Evolution Account Assistant"
 msgstr "Cynorthwyydd Cyfrifon Evolution"
 
@@ -10607,50 +10750,50 @@ msgstr "Enw'r cyfrif"
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../mail/em-composer-prefs.c:303
-#: ../mail/em-composer-prefs.c:438
+#: ../mail/em-composer-prefs.c:318
+#: ../mail/em-composer-prefs.c:452
 #: ../mail/mail-config.c:1160
-#: ../mail/mail-signature-editor.c:478
+#: ../mail/mail-signature-editor.c:481
 msgid "Unnamed"
 msgstr "Dienw"
 
-#: ../mail/em-composer-prefs.c:947
+#: ../mail/em-composer-prefs.c:961
 msgid "Language(s)"
 msgstr "Iaith (ieithoedd)"
 
-#: ../mail/em-composer-prefs.c:980
+#: ../mail/em-composer-prefs.c:994
 msgid "Add signature script"
 msgstr "Ychwanegu sgript llofnod"
 
-#: ../mail/em-composer-prefs.c:1022
+#: ../mail/em-composer-prefs.c:1036
 msgid "Signature(s)"
 msgstr "Llofnod(ion)"
 
-#: ../mail/em-composer-utils.c:1116
+#: ../mail/em-composer-utils.c:1132
 #: ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Neges Yrrwyd Ymlaen --------"
 
-#: ../mail/em-composer-utils.c:1569
+#: ../mail/em-composer-utils.c:1585
 msgid "No destination address provided, forward of the message has been cancelled."
 msgstr ""
 
-#: ../mail/em-composer-utils.c:1575
+#: ../mail/em-composer-utils.c:1591
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr ""
 
-#: ../mail/em-composer-utils.c:2042
+#: ../mail/em-composer-utils.c:2058
 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:2089
+#: ../mail/em-composer-utils.c:2105
 msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
 msgstr "Ar ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} am ${24Hour}:${Minute} ${TimeZone}, ysgrifennodd ${Sender}:"
 
-#: ../mail/em-composer-utils.c:2232
+#: ../mail/em-composer-utils.c:2248
 msgid "-----Original Message-----"
 msgstr "-------- Neges Wreiddiol --------"
 
@@ -10780,7 +10923,7 @@ msgid "is set"
 msgstr "wedi'i osod"
 
 #: ../mail/em-filter-i18n.h:41
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Sothach"
@@ -10918,7 +11061,7 @@ msgstr "Atal Prosesu"
 #: ../mail/em-filter-i18n.h:74
 #: ../mail/em-format-quote.c:341
 #: ../mail/em-format.c:928
-#: ../mail/em-mailer-prefs.c:80
+#: ../mail/em-mailer-prefs.c:81
 #: ../mail/message-list.etspec.h:18
 #: ../mail/message-tag-followup.c:300
 #: ../plugins/groupwise-features/properties.glade.h:7
@@ -11121,13 +11264,13 @@ msgid "Copying folder %s"
 msgstr "Copïo plygell %s"
 
 #: ../mail/em-folder-tree.c:895
-#: ../mail/message-list.c:2012
+#: ../mail/message-list.c:2018
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Symud ffeiliau i mewn i'r blygell %s"
 
 #: ../mail/em-folder-tree.c:897
-#: ../mail/message-list.c:2014
+#: ../mail/message-list.c:2020
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copïo ffeiliau i mewn i'r blygell %s"
@@ -11149,12 +11292,12 @@ msgstr "_Symud i Blygell"
 #: ../mail/em-folder-tree.c:992
 #: ../mail/em-folder-utils.c:362
 #: ../mail/em-folder-view.c:1186
-#: ../mail/message-list.c:2104
+#: ../mail/message-list.c:2110
 msgid "_Move"
 msgstr "_Symud"
 
 #: ../mail/em-folder-tree.c:994
-#: ../mail/message-list.c:2106
+#: ../mail/message-list.c:2112
 msgid "Cancel _Drag"
 msgstr "Diddymu _Llusgo"
 
@@ -11205,7 +11348,7 @@ msgstr "Copïo `%s' i `%s'"
 #: ../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
+#: ../plugins/pst-import/pst-importer.c:302
 msgid "Select folder"
 msgstr "Dewis plygell"
 
@@ -11398,141 +11541,143 @@ msgstr "Cliciwch i alw %s"
 msgid "Click to hide/unhide addresses"
 msgstr "Cliciwch i ddangos/cuddio cyfeiriadau"
 
-#: ../mail/em-format-html-display.c:569
-#: ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:560
+#: ../mail/em-format-html.c:654
 msgid "Unsigned"
 msgstr "Di-lofnod"
 
-#: ../mail/em-format-html-display.c:569
+#: ../mail/em-format-html-display.c:560
 msgid "This message is not signed. There is no guarantee that this message is authentic."
 msgstr "Nid yw'r neges wedi ei llofnodi. Does dim gwarant fod y neges hon yn ddilys."
 
-#: ../mail/em-format-html-display.c:570
-#: ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:561
+#: ../mail/em-format-html.c:655
 msgid "Valid signature"
 msgstr "Llofnod dilys"
 
-#: ../mail/em-format-html-display.c:570
+#: ../mail/em-format-html-display.c:561
 msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
 msgstr "Mae'r neges hon wedi ei llofnodi ac yn ddilys, sy'n golygu ei bod hi'n ddigon tebyg fod y neges yn un dilys."
 
-#: ../mail/em-format-html-display.c:571
-#: ../mail/em-format-html.c:655
+#: ../mail/em-format-html-display.c:562
+#: ../mail/em-format-html.c:656
 msgid "Invalid signature"
 msgstr "Llofnod annilys"
 
-#: ../mail/em-format-html-display.c:571
+#: ../mail/em-format-html-display.c:562
 msgid "The signature of this message cannot be verified, it may have been altered in transit."
 msgstr "Methu dilysu llofnod y neges hon: fe all fod wedi ei newid yn ystod ei thaith."
 
-#: ../mail/em-format-html-display.c:572
-#: ../mail/em-format-html.c:656
+#: ../mail/em-format-html-display.c:563
+#: ../mail/em-format-html.c:657
 msgid "Valid signature, but cannot verify sender"
 msgstr "Llofnod dilys, ond yn methu dilysu'r anfonwr"
 
-#: ../mail/em-format-html-display.c:572
+#: ../mail/em-format-html-display.c:563
 msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
 msgstr "Mae'r neges wedi ei llofnodi â llofnod dilys, ond methwyd dilysu anfonwr y neges."
 
-#: ../mail/em-format-html-display.c:573
-#: ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:564
+#: ../mail/em-format-html.c:658
 msgid "Signature exists, but need public key"
 msgstr "Llofnod yn bodoli, ond angen allwedd cyhoeddus"
 
-#: ../mail/em-format-html-display.c:573
+#: ../mail/em-format-html-display.c:564
 #, fuzzy
 msgid "This message is signed with a signature, but there is no corresponding public key."
 msgstr "Mae'r neges wedi ei llofnodi â llofnod dilys, ond methwyd dilysu anfonwr y neges."
 
-#: ../mail/em-format-html-display.c:580
-#: ../mail/em-format-html.c:663
+#: ../mail/em-format-html-display.c:571
+#: ../mail/em-format-html.c:664
 msgid "Unencrypted"
 msgstr "Heb amgryptio"
 
-#: ../mail/em-format-html-display.c:580
+#: ../mail/em-format-html-display.c:571
 msgid "This message is not encrypted. Its content may be viewed in transit across the Internet."
 msgstr "Nid yw'r neges hon wedi ei hamgryptio. Gellir darllen ei chynnwys wrth iddi deithio ar draws y Rhyngrwyd."
 
-#: ../mail/em-format-html-display.c:581
-#: ../mail/em-format-html.c:664
+#: ../mail/em-format-html-display.c:572
+#: ../mail/em-format-html.c:665
 msgid "Encrypted, weak"
 msgstr "Wedi amgryptio, yn wan"
 
-#: ../mail/em-format-html-display.c:581
+#: ../mail/em-format-html-display.c:572
 msgid "This message is encrypted, but with a weak encryption algorithm. It would be difficult, but not impossible for an outsider to view the content of this message in a practical amount of time."
 msgstr "Mae'r neges hon wedi ei hamgryptio, ond gydag algorithm amgryptio gwan.  Fe fyddai hi'n anodd, ond nid yn amhosib, i rywun o'r tu allan weld cynnwys y neges hon ymhen cyfnod ymarferol o amser."
 
-#: ../mail/em-format-html-display.c:582
-#: ../mail/em-format-html.c:665
+#: ../mail/em-format-html-display.c:573
+#: ../mail/em-format-html.c:666
 msgid "Encrypted"
 msgstr "Wedi amgryptio"
 
-#: ../mail/em-format-html-display.c:582
+#: ../mail/em-format-html-display.c:573
 msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
 msgstr "Mae'r neges hon wedi ei hamgryptio.  Fe fyddai hi'n anodd i rywun o'r tu allan weld cynnwys y neges hon."
 
-#: ../mail/em-format-html-display.c:583
-#: ../mail/em-format-html.c:666
+#: ../mail/em-format-html-display.c:574
+#: ../mail/em-format-html.c:667
 msgid "Encrypted, strong"
 msgstr "Wedi amgryptio, yn gryf"
 
-#: ../mail/em-format-html-display.c:583
+#: ../mail/em-format-html-display.c:574
 msgid "This message is encrypted, with a strong encryption algorithm. It would be very difficult for an outsider to view the content of this message in a practical amount of time."
 msgstr "Mae'r neges hon wedi ei hamgryptio, gydag algorithm amgryptio cryf.  Fe fyddai hi'n anodd iawn i rywun o'r tu allan weld cynnwys y neges hon mewn cyfnod ymarferol o amser."
 
-#: ../mail/em-format-html-display.c:684
+#: ../mail/em-format-html-display.c:675
 #: ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Gweld Tystysgrif"
 
-#: ../mail/em-format-html-display.c:699
+#: ../mail/em-format-html-display.c:690
 msgid "This certificate is not viewable"
 msgstr "Ni ellir gweld y dystysgrif"
 
-#: ../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:980
+#, fuzzy
+msgid "Completed on"
+msgstr "Cyflawnwyd"
 
-#: ../mail/em-format-html-display.c:999
+#: ../mail/em-format-html-display.c:988
 msgid "Overdue:"
 msgstr "Hwyr:"
 
-#: ../mail/em-format-html-display.c:1002
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "gan %B %d, %Y %l:%M %p"
+#. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
+#: ../mail/em-format-html-display.c:992
+msgid "by"
+msgstr "erbyn"
 
-#: ../mail/em-format-html-display.c:1082
+#: ../mail/em-format-html-display.c:1071
 #: ../widgets/misc/e-attachment-view.c:357
 msgid "_View Inline"
 msgstr "_Gweld yn Fewnol"
 
-#: ../mail/em-format-html-display.c:1083
+#: ../mail/em-format-html-display.c:1072
 #: ../widgets/misc/e-attachment-view.c:350
 msgid "_Hide"
 msgstr "_Cuddio"
 
-#: ../mail/em-format-html-display.c:1084
+#: ../mail/em-format-html-display.c:1073
 msgid "_Fit to Width"
 msgstr "_Ffitio i'r Lled"
 
-#: ../mail/em-format-html-display.c:1085
+#: ../mail/em-format-html-display.c:1074
 msgid "Show _Original Size"
 msgstr "Dangos y _Maint Gwreiddiol"
 
-#: ../mail/em-format-html-display.c:1586
-#: ../mail/em-format-html-display.c:1625
+#: ../mail/em-format-html-display.c:1575
+#: ../mail/em-format-html-display.c:1614
 msgid "View _Unformatted"
 msgstr "Gweld testun heb _Fformatio"
 
-#: ../mail/em-format-html-display.c:1588
+#: ../mail/em-format-html-display.c:1577
 msgid "Hide _Unformatted"
 msgstr "Cuddio testun heb _Fformatio"
 
-#: ../mail/em-format-html-display.c:1645
+#: ../mail/em-format-html-display.c:1634
 msgid "O_pen With"
 msgstr "Agor _Gyda"
 
-#: ../mail/em-format-html-display.c:1722
+#: ../mail/em-format-html-display.c:1711
 #, fuzzy
 msgid "Evolution cannot render this email as it is too large to process. You can view it unformatted or with an external text editor."
 msgstr "Ni all Evolution rendro'r e-bost hwn am ei fod yn rhy fawr i'w drin. Gallwch ei weld heb y fformatio neu gan ddefnyddio golygydd testun allanol."
@@ -11542,106 +11687,96 @@ msgstr "Ni all Evolution rendro'r e-bost hwn am ei fod yn rhy fawr i'w drin. Gal
 msgid "Page %d of %d"
 msgstr "Tudalen %d o %d"
 
-#: ../mail/em-format-html.c:504
-#: ../mail/em-format-html.c:513
+#: ../mail/em-format-html.c:505
+#: ../mail/em-format-html.c:514
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Yn nôl `%s'"
 
-#: ../mail/em-format-html.c:928
+#: ../mail/em-format-html.c:929
 #, fuzzy
 msgid "Unknown external-body part."
 msgstr "Rhan corff allanol wedi ei gam-ffurfio."
 
-#: ../mail/em-format-html.c:936
+#: ../mail/em-format-html.c:937
 msgid "Malformed external-body part."
 msgstr "Rhan corff allanol wedi ei gam-ffurfio."
 
-#: ../mail/em-format-html.c:966
+#: ../mail/em-format-html.c:967
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pwyntydd at safle FTP (%s)"
 
-#: ../mail/em-format-html.c:977
+#: ../mail/em-format-html.c:978
 #, 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:979
+#: ../mail/em-format-html.c:980
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pwyntydd at ffeil leol (%s)"
 
-#: ../mail/em-format-html.c:1000
+#: ../mail/em-format-html.c:1001
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pwyntydd at wybodaeth bell (%s)"
 
-#: ../mail/em-format-html.c:1011
+#: ../mail/em-format-html.c:1012
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pwyntydd at ddata allanol anhysbys (math \"%s\")"
 
-#: ../mail/em-format-html.c:1239
+#: ../mail/em-format-html.c:1240
 msgid "Formatting message"
 msgstr "Fformatio neges"
 
-#: ../mail/em-format-html.c:1413
+#: ../mail/em-format-html.c:1414
 msgid "Formatting Message..."
 msgstr "Fformatio Neges..."
 
 # Why are these two msgstr's in caps? Should they be?
-#: ../mail/em-format-html.c:1566
-#: ../mail/em-format-html.c:1630
-#: ../mail/em-format-html.c:1651
+#: ../mail/em-format-html.c:1567
+#: ../mail/em-format-html.c:1631
+#: ../mail/em-format-html.c:1652
 #: ../mail/em-format-quote.c:209
 #: ../mail/em-format.c:926
-#: ../mail/em-mailer-prefs.c:78
+#: ../mail/em-mailer-prefs.c:79
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1567
-#: ../mail/em-format-html.c:1636
-#: ../mail/em-format-html.c:1654
+#: ../mail/em-format-html.c:1568
+#: ../mail/em-format-html.c:1637
+#: ../mail/em-format-html.c:1655
 #: ../mail/em-format-quote.c:209
 #: ../mail/em-format.c:927
-#: ../mail/em-mailer-prefs.c:79
+#: ../mail/em-mailer-prefs.c:80
 msgid "Bcc"
 msgstr "Bcc"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1746
+#: ../mail/em-format-html.c:1747
 #: ../mail/em-format-quote.c:352
-#: ../mail/em-mailer-prefs.c:1434
+#: ../mail/em-mailer-prefs.c:1435
 msgid "Mailer"
 msgstr "Ebostiwr"
 
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: ../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: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
+#: ../mail/em-format-html.c:1910
 #, 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
+#: ../mail/em-mailer-prefs.c:77
 msgid "Reply-To"
 msgstr "Ateb-I"
 
 #: ../mail/em-format.c:929
-#: ../mail/em-mailer-prefs.c:81
+#: ../mail/em-mailer-prefs.c:82
 #: ../mail/message-list.etspec.h:2
 #: ../widgets/misc/e-dateedit.c:316
 #: ../widgets/misc/e-dateedit.c:338
@@ -11649,12 +11784,12 @@ msgid "Date"
 msgstr "Dyddiad"
 
 #: ../mail/em-format.c:930
-#: ../mail/em-mailer-prefs.c:82
+#: ../mail/em-mailer-prefs.c:83
 msgid "Newsgroups"
 msgstr "Grwpiau Newyddion"
 
 #: ../mail/em-format.c:931
-#: ../mail/em-mailer-prefs.c:83
+#: ../mail/em-mailer-prefs.c:84
 #: ../plugins/face/org-gnome-face.eplug.xml.h:4
 msgid "Face"
 msgstr "Gwyneb"
@@ -11711,72 +11846,77 @@ msgstr "Methu gramadegu neges PGP"
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Methu gramadegu neges S/MIME: Gwall anhysbys"
 
-#: ../mail/em-mailer-prefs.c:94
+#: ../mail/em-mailer-prefs.c:95
 msgid "Every time"
 msgstr "Bob tro"
 
-#: ../mail/em-mailer-prefs.c:95
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per day"
 msgstr "Unwaith y dydd"
 
-#: ../mail/em-mailer-prefs.c:96
+#: ../mail/em-mailer-prefs.c:97
 msgid "Once per week"
 msgstr "Unwaith bob wythnos"
 
-#: ../mail/em-mailer-prefs.c:97
+#: ../mail/em-mailer-prefs.c:98
 msgid "Once per month"
 msgstr "Unwaith bob mis"
 
-#: ../mail/em-mailer-prefs.c:331
+#: ../mail/em-mailer-prefs.c:332
 #, fuzzy
 msgid "Add Custom Junk Header"
 msgstr "Pennawd Addasedig"
 
-#: ../mail/em-mailer-prefs.c:335
+#: ../mail/em-mailer-prefs.c:336
 msgid "Header Name:"
 msgstr "Enw Pennawd:"
 
-#: ../mail/em-mailer-prefs.c:336
+#: ../mail/em-mailer-prefs.c:337
 msgid "Header Value Contains:"
 msgstr ""
 
-#: ../mail/em-mailer-prefs.c:437
+#: ../mail/em-mailer-prefs.c:438
 #: ../widgets/table/e-table-click-to-add.c:500
 #: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "Pennawd"
 
-#: ../mail/em-mailer-prefs.c:441
+#: ../mail/em-mailer-prefs.c:442
 msgid "Contains Value"
 msgstr "Yn Cynnwys Gwerth "
 
-#: ../mail/em-mailer-prefs.c:464
+#: ../mail/em-mailer-prefs.c:465
 msgid "Color"
 msgstr "Lliw"
 
-#: ../mail/em-mailer-prefs.c:467
+#: ../mail/em-mailer-prefs.c:468
 #, fuzzy
 msgid "Tag"
 msgstr "yn ôl"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1062
-#: ../mail/em-mailer-prefs.c:1116
+#: ../mail/em-mailer-prefs.c:1063
+#: ../mail/em-mailer-prefs.c:1117
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr ""
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1070
-#: ../mail/em-mailer-prefs.c:1125
+#: ../mail/em-mailer-prefs.c:1071
+#: ../mail/em-mailer-prefs.c:1126
 #, c-format
 msgid "%s plugin is not available. Please check whether the package is installed."
 msgstr ""
 
-#: ../mail/em-mailer-prefs.c:1091
+#: ../mail/em-mailer-prefs.c:1092
 msgid "No Junk plugin available"
 msgstr "Dim ategyn Sbwriel ar gael"
 
+#: ../mail/em-mailer-prefs.c:1455
+#, fuzzy
+msgid "Date header:"
+msgstr "Pennyn Tabl"
+
 #. green
 #: ../mail/em-migrate.c:961
 msgid "To Do"
@@ -12150,568 +12290,593 @@ msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Gwagio bob plygell Sbwriel wrth adael Evolution."
 
 #: ../mail/evolution-mail.schemas.in.h:47
+msgid "Enable animated images in HTML mail. Many users find animated images annoying and prefer to see a static image instead."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Galluogi modd caret, fel eich bod yn medru gweld cyrchwr wrth ddarllen e-bost."
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 #, 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
+#: ../mail/evolution-mail.schemas.in.h:50
 #, 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
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable or disable type ahead search feature"
 msgstr "Galluogi neu analluogi'r nodwedd chwilio wrth deipio ymlaen"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:52
 #, fuzzy
 msgid "Enable search folders"
 msgstr "Plygellau Chwilio"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Enable search folders on startup."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable the side bar search feature to allow interactive searching of folder names."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable this to use Space bar key to scroll in message preview, message list and folders."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 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.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Enable/disable caret mode"
 msgstr "Galluogi/analluogi'r modd caret"
 
-#: ../mail/evolution-mail.schemas.in.h:57
-#: ../mail/mail-config.glade.h:86
+#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/mail-config.glade.h:87
 msgid "Encode file names in an Outlook/GMail way"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Encode file names in the mail headers same as Outlook or GMail do, to let them display correctly file names with UTF-8 letters sent by Evolution, because they do not follow the RFC 2231, but use the incorrect RFC 2047 standard."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../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.h:60
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Height of the message-list pane."
 msgstr "Uchder y cwarel rhestr negeseuon."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Hides the per-folder preview and removes the selection"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid "If a user tries to open 10 or more messages at one time, ask the user if they really want to do it."
 msgstr "Os ydy'r defnyddiwr yn ceisio agor 10 neges neu fwy ar yr un pryd, gofyn iddyn nhw a ydyn nhw wir am wneud hynny."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "If the \"Preview\" pane is on, then show it side-by-side rather than vertically."
 msgstr "Os yw'r panel \"Rhagolwg\" ar waith, ei ddangos ochr-yn-ochr yn hytrach na'n fertigol."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
 #, fuzzy
 msgid "If there isn't a builtin viewer for a particular MIME type inside Evolution, any MIME types appearing in this list which map to a Bonobo component viewer in GNOME's MIME type database may be used for displaying content."
 msgstr "Os nad oes gwelydd mewnol ar gyfer math mime arbennig o fewn Evolution, gellir defnyddio unrhyw fath mime o fewn y rhestr hon sy'n mapio i welydd cydran bonobo yng nghronfa data mathau mime GNOME er mwyn dangos y cynnwys."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid "Initial height of the \"Send and Receive Mail\" window. The value updates as the user resizes the window vertically."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Initial maximize state of the \"Send and Receive Mail\" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the \"Send and Receive Mail\" window cannot be maximized. This key exists only as an implementation detail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Initial width of the \"Send and Receive Mail\" window. The value updates as the user resizes the window horizontally."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "It disables/enables the repeated prompts to ask if offline sync is required before going into offline mode."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "It disables/enables the repeated prompts to warn that deleting messages from a search folder permanently deletes the message, not simply removing it from the search results."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Last time empty junk was run"
 msgstr "Y tro diwethaf rhedwyd y broses o wagio'r sbwriel"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Last time empty trash was run"
 msgstr "Y tro diwethaf rhedwyd y broses o wagio'r sbwriel"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "List of Labels and their associated colors"
 msgstr "Rhestr o Labeli a'r lliwiau sy'n gysylltiedig"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 #, 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
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of accepted licenses"
 msgstr "Rhestr trwyddedau wedi'u derbyn"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "List of accounts"
 msgstr "Rhestr cyfrifon"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of accounts known to the mail component of Evolution. The list contains strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr "Rhestr o gyfrifon y gŵyr cydran ebost Evolution amdanynt.  Mae'r rhestr yn cynnwys llinynnau sy'n enwi is-blygellau perthynol i /apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 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.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "List of dictionary language codes used for spell checking."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid "List of labels known to the mail component of Evolution. The list contains strings containing name:color where color uses the HTML hex encoding."
 msgstr "Rhestr o labeli y gŵyr cydran ebost Evolution amdanynt.  Mae'r rhestr yn cynnwys llinynnau sy'n cynnwys enw:lliw lle mae lliw yn defnyddio'r amgodiad hecs HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
 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.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
 #, fuzzy
 msgid "Load images for HTML messages over HTTP"
 msgstr "Llwytho delweddau ar gyfer negeseuon HTML dros http"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
 #, fuzzy
 msgid "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - Never load images off the net. \"1\" - Load images in messages from contacts. \"2\" - Always load images off the net."
 msgstr "Llwytho delweddau ar gyfer negeseuon HTML dros http(s). Gwerthoedd posib yw: 0 - Peidio byth â llwytho delweddau o'r rhwyd 1 - Llwytho delweddau os yw'r anfonwr yn y llyfr cyfeiriadau 2 - Llwytho delweddau o'r rhwyd bob amser"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Log filter actions"
 msgstr "Cofnodi gweithredoedd hidlo"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Log filter actions to the specified log file."
 msgstr "Logio gweithredoedd hidlo yn y ffeil benodol."
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Logfile to log filter actions"
 msgstr "Ffeil i logio gweithredoedd hidlo"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Logfile to log filter actions."
 msgstr "Ffeil i logio gweithredoedd hidlo."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../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.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Mark as Seen after specified timeout."
 msgstr "Marcio wedi'u Gweld ar ôl amser penodol."
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marcio dyfyniadau yn y neges \"Preview\""
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marcio dyfyniadau yn y neges \"Preview\"."
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Message Window default height"
 msgstr "Uchder rhagosodedig Ffenest Neges"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Message Window default width"
 msgstr "Lled rhagosodedig Ffenest Neges"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Arddull dangos-neges (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
 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.h:96
+#: ../mail/evolution-mail.schemas.in.h:97
 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.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 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.h:98
+#: ../mail/evolution-mail.schemas.in.h:99
 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.h:99
+#: ../mail/evolution-mail.schemas.in.h:100
 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.h:100
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt on empty subject"
 msgstr "Rhybuddio am bwnc gwag"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Promptio'r defnyddiwr pan mae'n ceisio chwynnu plygell."
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Promptio'r defnyddiwr pan mae'n ceisio anfon neges heb bwnc."
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 #, 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
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Prompt when user expunges"
 msgstr "Promptio pan mae'r defnyddiwr yn chwynnu"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user only fills Bcc"
 msgstr "Promptio pan mae'r defnyddiwr yn llenwi Bcc yn unig"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Promptio pan mae'r defnyddiwr yn ceisio agor 10 neges neu fwy ar unwaith"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
 msgstr "Promptio pan mae'r defnyddiwr yn ceisio anfon e-bost HTML at dderbynwyr nad ydynt o reidrwydd am dderbyn e-bost HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Promptio pan mae'r defnyddiwr yn ceisio anfon neges heb dderbynwyr At: na Cc:"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 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.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Prompt while marking multiple messages"
 msgstr "Promptio wrth farcio mwy nag un neges"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
+msgid "Put personalized signatures at the top of replies"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:114
+msgid "Put the cursor at the bottom of replies"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:115
 #, 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
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Recognize links in text and replace them."
 msgstr "Adnabod cysylltion o fewn y testun a'u hamnewid."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:117
 #, 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.h:115
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Save directory"
 msgstr "Cyfeiriadur cadw"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Search for the sender photo in local address books"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Send HTML mail by default"
 msgstr "Anfon e-bost HTML yn rhagosod"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Send HTML mail by default."
 msgstr "Anfon e-bost HTML yn rhagosod."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:122
 #, fuzzy
 msgid "Sender email-address column in the message list"
 msgstr "Dangos cyfeiriad e-bost yr anfonwr o fewn y golofn negeseuon yn y rhestr negeseuon"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:123
 #, fuzzy
 msgid "Server synchronization interval"
 msgstr "_Opsiynau Cysoni..."
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:127
 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
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Show Animations"
 msgstr "Dangos Animeiddio"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Show animated images as animations."
 msgstr "Dangos delweddau animeiddiedig fel animeiddiadau."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Dangos negeseuon sydd wedi eu dileu (gyda llinell drwyddynt) yn y rhestr negeseuon."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:133
 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.h:131
+#: ../mail/evolution-mail.schemas.in.h:134
+#, fuzzy
+msgid "Show image animations"
+msgstr "_Dangos delweddau wedi'u hanimeiddio"
+
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Show photo of the sender"
 msgstr "Dangos llun o'r anfonwr"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Show the \"Bcc\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Show the \"Cc\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "Show the \"From\" field when posting to a newsgroup. This is controlled from the View menu when a news account is chosen."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:139
 #, fuzzy
 msgid "Show the \"From\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
 msgstr "Dangos y maes \"Oddi wrth\" pan yn danfon neges ebost."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Show the \"Reply To\" field when posting to a newsgroup. This is controlled from the View menu when a news account is chosen."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Show the \"Reply To\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:144
 #, fuzzy
 msgid "Show the email-address of the sender in a separate column in the message list."
 msgstr "Dangos cyfeiriad e-bost yr anfonwr o fewn colofn gyfansawdd y negeseuon yn y rhestr negeseuon"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:145
 #, fuzzy
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Dangos cyfeiriad e-bost yr anfonwr o fewn colofn gyfansawdd y negeseuon yn y rhestr negeseuon"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Spell check inline"
 msgstr "Gwirio sillafu'n fewnol"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:147
 #, fuzzy
 msgid "Spell checking color"
 msgstr "Gwirio Sillafu"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:148
 #, fuzzy
 msgid "Spell checking languages"
 msgstr "Gwirio sillafu'n fewnol"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Subscribe dialog default height"
 msgstr "Uchder rhagosodedig deialog Tanysgrifio"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Subscribe dialog default width"
 msgstr "Lled rhagosodedig deialog Tanysgrifio"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Terminal font"
 msgstr "Ffont terfynell"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Text message part limit"
 msgstr "Cyfyngiad rhan neges destun"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "The default plugin for Junk hook"
 msgstr "Ategyn rhagosodedig i'r bachyn Sothach"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "Y tro diwethaf rhedwyd y broses i wacáu'r sbwriel, mewn diwrnodau ers yr epoc."
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "Y tro diwethaf rhedwyd y broses i wacáu'r sbwriel, mewn diwrnodau ers yr epoc."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:156
 #, fuzzy
 msgid "The terminal font for mail display."
 msgstr "Y ffont terfynell er mwyn dangos e-bost"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:157
 #, fuzzy
 msgid "The variable width font for mail display."
 msgstr "Y ffont lled newidiol er mwyn dangos e-bost"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "This can have three possible values. \"0\" for errors. \"1\" for warnings. \"2\" for debug messages."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:159
 #, fuzzy
 msgid "This decides the max size of the text part that can be formatted under Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
 msgstr "Mae hyn yn penderfynu uchafswm maint y rhan testun fedr evolution ei fformatio. 4MB / 4096 KB yw'r rhagosodiad, ac fe'i ddifinnir mewn KB."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:160
 #, fuzzy
 msgid "This is the default junk plugin, even though there are multiple plugins enabled. If the default listed plugin is disabled, then it won't fall back to the other available plugins."
 msgstr "Dyma'r ategyn sothach rhagosodedig, hyd yn oed os oes amryw ategion wedi eu galluogi. Os yw'r ategyn sothach rhagosodedig ar gael, fydd ddim cwympo yn ôl at yr ategion rhagosodedig."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "This key is read only once and reset to \"false\" after read. This unselects the mail in the list and removes the preview for that folder."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "This key should contain a list of XML structures specifying custom headers, and whether they are to be displayed. The format of the XML structure is &lt;header enabled&gt; - set enabled if the header is to be displayed in the mail view."
 msgstr "Dylai'r allwedd hon gynnwys rhestr o strwythurau XML sy'n penodi penawdau arbennig, a p'un ai dylid eu dangos ai peidio. Ffurf y strwythur XML yw &lt;pennawd galluogwyd&gt; - gosodwch 'galluogwyd' os yw'r pennawd am gael ei ddangos yn yr olwg e-bost."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "This option is related to the key lookup_addressbook and is used to determine whether to look up addresses in local address book only to exclude mail sent by known contacts from junk filtering."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "This option would help in improving the speed of fetching."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "This sets the number of addresses to show in default message list view, beyond which a '...' is shown."
 msgstr "Gosod y nifer o gyfeiriadau i'w dangos yng ngolwg rhagosodedig y rhestr negeseuon. Ar ôl y nifer a benodir, fe ddangosir '...'"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "This setting specifies whether the threads should be in expanded or collapsed state by default. Evolution requires a restart."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "This setting specifies whether the threads should be sorted based on latest message in each thread, rather than by message's date. Evolution requires a restart."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Thread the message list."
 msgstr "Edafu'r rhestr negeseuon."
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Thread the message-list"
 msgstr "Edafu'r rhestr negeseuon"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:170
 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.h:167
+#: ../mail/evolution-mail.schemas.in.h:171
 #, fuzzy
 msgid "Timeout for marking message as seen"
 msgstr "Terfyn amser cyn marcio neges fel un wedi ei Gweld"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:172
 #, fuzzy
 msgid "Timeout for marking message as seen."
 msgstr "Terfyn amser cyn marcio neges fel un wedi ei Gweld."
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "UID string of the default account."
 msgstr "Llinyn UID y cyfrif rhagosodedig."
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Use SpamAssassin daemon and client"
 msgstr "Defnyddio ellyll a chleient Spamassassin"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:176
 #, fuzzy
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Defnyddio ellyll a chleient Spamassassin (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Use custom fonts"
 msgstr "Defnyddio ffontiau addasedig"
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:178
 #, fuzzy
 msgid "Use custom fonts for displaying mail."
 msgstr "Defnyddio ffontiau addasedig i ddangos e-bost"
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Use only local spam tests."
 msgstr "Defnyddio dim ond y profion sothach lleol."
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Defnyddio dim ond y profion sothach lleol (dim DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "Use side-by-side or wide layout"
 msgstr "Defnyddio cynllun ochr-yn-ochr neu gynllun llydan"
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:182
+msgid "Users get all up in arms over where the cursor should go when replying to a message. This determines whether the cursor is placed at the top of the message or the bottom."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:183
+msgid "Users get all up in arms over where their signature should go when replying to a message. This determines whether the signature is placed at the top of the message or the bottom."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid "Variable width font"
 msgstr "Ffont lled amrywiol"
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
 msgstr "P'un ai i gwympo'n ôl ar greu edafedd o'r pynciau ai peidio, pan nad yw'r negeseuon yn cynnwys penawdau Mewn-Ateb-I neu Gyfeirnodau."
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "Whether sort threads based on latest message in that thread"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Width of the message-list pane"
 msgstr "Lled y cwarel rhestr negeseuon"
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Width of the message-list pane."
 msgstr "Lled y cwarel rhestr negeseuon."
 
@@ -12728,12 +12893,12 @@ msgid "Import mail from Elm."
 msgstr "Mewnforio e-bost o Elm."
 
 #: ../mail/importers/evolution-mbox-importer.c:79
-#: ../plugins/pst-import/pst-importer.c:310
+#: ../plugins/pst-import/pst-importer.c:309
 msgid "Destination folder:"
 msgstr "Plygell gyrchfan:"
 
 #: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:303
+#: ../plugins/pst-import/pst-importer.c:302
 msgid "Select folder to import into"
 msgstr "Dewiswch blygell i fewnforio iddi"
 
@@ -12751,9 +12916,9 @@ msgstr "Mewnforio blwch e-bost"
 
 #. 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
+#: ../plugins/pst-import/pst-importer.c:454
+#: ../plugins/pst-import/pst-importer.c:560
+#: ../shell/e-shell-importer.c:555
 #, c-format
 msgid "Importing `%s'"
 msgstr "Mewnforio `%s'"
@@ -12939,138 +13104,138 @@ msgstr "<span weight=\"bold\">Cyfansoddi Negeseuon</span>"
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Cyfluniad</span>"
 
-#: ../mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Ymddygiad Rhagosodedig</span>"
 
-#: ../mail/mail-config.glade.h:15
+#: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Dileu Ebost</span>"
 
-#: ../mail/mail-config.glade.h:16
+#: ../mail/mail-config.glade.h:17
 #, fuzzy
 msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
 msgstr "<span weight=\"bold\">Penawdau Ebost _Wedi'u Dangos </span>"
 
-#: ../mail/mail-config.glade.h:18
+#: ../mail/mail-config.glade.h:19
 #, fuzzy
 msgid "<span weight=\"bold\">Labels</span>"
 msgstr "<span weight=\"bold\">Rhybuddion</span>"
 
-#: ../mail/mail-config.glade.h:19
+#: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Llwytho Delweddau</span>"
 
-#: ../mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Dangos Negeseuon</span>"
 
-#: ../mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Ffontiau Negeseuon</span>"
 
-#: ../mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">Derbynwyr Negeseuon</span>"
 
-#: ../mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:24
 #: ../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:24
+#: ../mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Dewisiadau</span>"
 
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:26
 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:26
+#: ../mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Ffontiau Printio</span>"
 
-#: ../mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:28
 #, fuzzy
 msgid "<span weight=\"bold\">Proxy Settings</span>"
 msgstr "<span weight=\"bold\">Statws</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Gwybodaeth Angenrheidiol</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">MIME Diogel (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Diogelwch</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Negeseuon Wedi'u Hanfon a rhai Drafft</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Cyfluniad Gweinydd</span>"
 
-#: ../mail/mail-config.glade.h:33
+#: ../mail/mail-config.glade.h:34
 #, fuzzy
 msgid "<span weight=\"bold\">_Authentication Type</span>"
 msgstr "<span weight=\"bold\">Math Dilysiant</span>"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 msgid "Account Management"
 msgstr "Rheolaeth Cyfrifon"
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 msgid "Add Ne_w Signature..."
 msgstr "_Ychwanegu Llofnod Newydd..."
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
 msgid "Add _Script"
 msgstr "Ychwanegu _Sgript"
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
 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:39
+#: ../mail/mail-config.glade.h:40
 #, 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:40
+#: ../mail/mail-config.glade.h:41
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "_Anfon copi-carbon (cc) bob amser at:"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "_Anfon copi-carbon dall (bcc) bob amser at:"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:43
 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:43
+#: ../mail/mail-config.glade.h:44
 #, 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:44
+#: ../mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Always request rea_d receipt"
 msgstr "_Gofyn am Dderbynneb Darllen"
 
-#: ../mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:46
 msgid ""
 "Attachment\n"
 "Inline\n"
 "Quoted"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:49
 msgid ""
 "Attachment\n"
 "Inline (Outlook style)\n"
@@ -13078,62 +13243,62 @@ msgid ""
 "Do not quote"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Automatically insert _emoticon images"
 msgstr "Rhoi delweddau _gwenoglun i mewn yn awtomatig"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:54
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltig (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:55
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltig (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:56
 msgid "C_haracter set:"
 msgstr "_Set nodau:"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:57
 msgid "Ch_eck for Supported Types "
 msgstr "_Gwirio am Fathau Wedi'u Cynnal"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:58
 #, 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:58
+#: ../mail/mail-config.glade.h:59
 #, 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
+#: ../mail/mail-config.glade.h:60
 msgid "Check spelling while I _type"
 msgstr "Gwirio sillafu wrth i mi _deipio"
 
-#: ../mail/mail-config.glade.h:60
+#: ../mail/mail-config.glade.h:61
 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:61
+#: ../mail/mail-config.glade.h:62
 msgid "Cle_ar"
 msgstr "C_lirio"
 
-#: ../mail/mail-config.glade.h:62
+#: ../mail/mail-config.glade.h:63
 msgid "Clea_r"
 msgstr "Cl_irio"
 
-#: ../mail/mail-config.glade.h:63
+#: ../mail/mail-config.glade.h:64
 msgid "Color for _misspelled words:"
 msgstr "Lliw'r geiriau _heb eu sillafu'n gywir:"
 
-#: ../mail/mail-config.glade.h:64
+#: ../mail/mail-config.glade.h:65
 msgid "Confirm _when expunging a folder"
 msgstr "_Cadarnhau wrth chwynnu plygell"
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:66
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13149,288 +13314,288 @@ msgstr ""
 "\n"
 "Cliciwch \"Cymhwyso\" i gadw'ch gosodiadau."
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:72
 msgid "De_fault"
 msgstr "_Rhagosodiad"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:73
 msgid "Default character e_ncoding:"
 msgstr "_Amgodiad nodau rhagosod:"
 
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Delete junk messages on e_xit"
 msgstr "Dileu negeseuon sothach wrth _adael"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:77
 #, 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:77
+#: ../mail/mail-config.glade.h:78
 #, 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:78
+#: ../mail/mail-config.glade.h:79
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.glade.h:80
 msgid "Done"
 msgstr "Wedi gorffen"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:81
 msgid "Drafts _Folder:"
 msgstr "_Plygell Drafftiau:"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
 msgid "Email Accounts"
 msgstr "Cyfrifon Ebost"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Email _Address:"
 msgstr "_Cyfeiriad Ebost:"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:84
 msgid "Empty trash folders on e_xit"
 msgstr "Gwagu plygellau sbwriel wrth _adael"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
 msgid "Enable Magic S_pacebar"
 msgstr "Galluogi _Bar Ofod Hud"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:86
 #, fuzzy
 msgid "Enable Sea_rch Folders"
 msgstr "Plygellau Chwilio"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Encry_ption certificate:"
 msgstr "Tystysgrif _amgryptio:"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Encrypt out_going messages (by default)"
 msgstr "_Amgryptio'r negeseuon sy'n cael eu hanfon (fel rhagosodiad)"
 
-#: ../mail/mail-config.glade.h:90
+#: ../mail/mail-config.glade.h:91
 msgid "Fi_xed-width:"
 msgstr "Lled _penodol:"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:92
 msgid "Fix_ed width Font:"
 msgstr "Ffont lled P_enodol:"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Font Properties"
 msgstr "Priodweddau Ffont"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:94
 msgid "Format messages in _HTML"
 msgstr "Fformatio negeseuon mewn _HTML"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Full Nam_e:"
 msgstr "_Enw Llawn:"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 msgid "HTML Messages"
 msgstr "Negeseuon HTML"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "H_TTP Proxy:"
 msgstr "Dirprwy H_TTP"
 
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:99
 msgid "Headers"
 msgstr "Penawdau"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Highlight _quotations with"
 msgstr "Amlygu _dyfyniadau gyda"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid "If the server uses a non-standard port then specify the server address as \"server-name:port-number\""
 msgstr ""
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
 #: ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Labeli"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
 msgid "Languages Table"
 msgstr "Tabl Ieithoedd"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
 msgid "Mail Configuration"
 msgstr "Cyfluniad Ebost"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:108
 msgid "Mail Headers Table"
 msgstr "Tabl Penawdau E-bost"
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
 msgid "Mailbox location"
 msgstr "Lleoliad bocs e-bost"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid "Message Composer"
 msgstr "Cyfansoddwr Negeseuon"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "No _Proxy for:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr ""
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid "Note: you will not be prompted for a password until you connect for the first time"
 msgstr "Sylwer: bydd dim gofyn i chi roi cyfrinair nes i chi gysylltu am y tro cyntaf"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid "Or_ganization:"
 msgstr "_Corff:"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid "PGP/GPG _Key ID:"
 msgstr "ID _Allwedd PGP/GPG:"
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
 msgid "Pass_word:"
 msgstr "_Cyfrinair:"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 #, fuzzy
 msgid "Please enter a descriptive name for this account in the space below. This name will be used for display purposes only."
 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:120
+#: ../mail/mail-config.glade.h:121
 msgid "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."
 msgstr "Rhowch wybodaeth am y ffordd y byddwch chi'n anfon e-bost. Os nad ydych chi'n siŵr, gofynnwch i'ch gweinyddwr system neu'ch darparwr gwasanaeth Rhyngrwyd."
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Please enter your name and email address below. The \"optional\" fields below do not need to be filled in, unless you wish to include this information in email you send."
 msgstr "Rhowch eich enw a'ch cyfeiriad e-bost isod. Does dim rhaid llenwi'r meysydd sy'n \"ddewisol\", oni bai eich bod am gynnwys y wybodaeth hynny yn yr e-bost fyddwch chi'n ei anfon."
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
 msgid "Please select among the following options"
 msgstr "Dewiswch ymhlith yr opsiynau yma"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:124
 msgid "Port:"
 msgstr "Porth:"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 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:125
+#: ../mail/mail-config.glade.h:126
 msgid "Re_member password"
 msgstr "_Cofio'r cyfrinair"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "Re_ply-To:"
 msgstr "_Ateb-At:"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "Remember _password"
 msgstr "Cofio'r _cyfrinair"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 #, 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
+#: ../mail/mail-config.glade.h:131
 msgid "S_elect..."
 msgstr "D_ewis..."
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "S_end message receipts:"
 msgstr "_Anfon negeseuon derbyn e-bost:"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "S_tandard Font:"
 msgstr "Ffont _Safonol:"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML fixed width font"
 msgstr "Dewis ffont lled sefydlog HTML"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Select HTML fixed width font for printing"
 msgstr "Dewis ffont lled sefydlog HTML er mwyn argraffu"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Select HTML variable width font"
 msgstr "Dewis ffont lled amrywiol HTML"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Select HTML variable width font for printing"
 msgstr "Dewis ffont lled amrywiol HTML er mwyn argraffu"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Sending Mail"
 msgstr "Yn Derbyn Post"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "Sent _Messages Folder:"
 msgstr "Plygell _Negeseuon Wedi'u Hanfon:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:142
 msgid "Ser_ver requires authentication"
 msgstr "Angen _dilysiant ar y gweinydd"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:143
 msgid "Server _Type: "
 msgstr "_Math o Wasanaethwr:"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:144
 msgid "Sig_ning certificate:"
 msgstr "Tystysgrif _Llofnodi:"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:145
 msgid "Signat_ure:"
 msgstr "_Llofnod:"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:146
 msgid "Signatures"
 msgstr "Llofnodion"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:147
 msgid "Signatures Table"
 msgstr "Tabl Llofnodion"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:148
 msgid "Spell Checking"
 msgstr "Gwirio Sillafu"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:149
 msgid "Start _typing at the bottom on replying"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:150
 msgid "T_ype: "
 msgstr "_Math: "
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:151
 msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
 msgstr "Mae'r rhestr hon o ieithoedd yn adlewyrchu'r rhai yr ydych wedi gosod geiriadur ar eu cyfer yn unig"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:152
 #, fuzzy
 msgid ""
 "The output of this script will be used as your\n"
@@ -13440,7 +13605,7 @@ msgstr ""
 "dangos yn unig y defnyddir yr enw fyddwch chi'n\n"
 "ei benodi."
 
-#: ../mail/mail-config.glade.h:153
+#: ../mail/mail-config.glade.h:154
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13448,15 +13613,15 @@ 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:155
+#: ../mail/mail-config.glade.h:156
 msgid "Us_ername:"
 msgstr "_Enw Defnyddiwr:"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:157
 msgid "Use Authe_ntication"
 msgstr "Def_nyddio Dilysiant"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:158
 #: ../plugins/caldav/caldav-source.c:405
 #: ../plugins/google-account-setup/google-source.c:681
 #: ../plugins/google-account-setup/google-contacts-source.c:280
@@ -13464,11 +13629,11 @@ msgstr "Def_nyddio Dilysiant"
 msgid "User_name:"
 msgstr "_Enw Defnyddiwr:"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:159
 msgid "V_ariable-width:"
 msgstr "Lled _amrywiol:"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:160
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13478,131 +13643,131 @@ msgstr ""
 "\n"
 "Cliciwch \"Ymlaen\" i ddechrau."
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:163
 msgid "_Add Signature"
 msgstr "_Ychwanegu Llofnod"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:164
 msgid "_Always load images from the Internet"
 msgstr "_Llwytho delweddau o'r Rhyngrwyd bob tro"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:165
 msgid "_Default junk plugin:"
 msgstr "_Ategyn sbwriel rhagosodedig:"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:166
 msgid "_Direct connection to the Internet"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:167
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Peidio ag arwyddo ceisiadau am gyfarfodydd (er mwyn cydweddu ag Outlook)"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:169
 msgid "_Forward style:"
 msgstr "Arddull yrru _ymlaen:"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:170
 msgid "_Keep Signature above the original message on replying"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Load images in messages from contacts"
 msgstr "_Llwytho delweddau mewn negeseuon e-bost o gysylltiadau"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Lookup in local address book only"
 msgstr "Rhestru plygellau llyfr cyfeiriadau lleol"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:173
 msgid "_Make this my default account"
 msgstr "Gwneud hon yn gyfrif rhagosodedig"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Manual proxy configuration:"
 msgstr "Cyfluniad Ebost"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:175
 msgid "_Mark messages as read after"
 msgstr "_Marcio negeseuon fel rhai wedi eu darllen ar ôl"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:177
 msgid "_Never load images from the Internet"
 msgstr "_Peidio byth a llwytho delweddau o'r Rhyngrwyd"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:178
 msgid "_Path:"
 msgstr "_Llwybr:"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:179
 #, 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:179
+#: ../mail/mail-config.glade.h:180
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Rhybuddio cyn anfon negeseuon gyda _llinell bwnc wag"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:181
 msgid "_Reply style:"
 msgstr "_Arddull ateb:"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:182
 msgid "_Script:"
 msgstr "_Sgript:"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:183
 msgid "_Secure HTTP Proxy:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:184
 #, 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:186
+#: ../mail/mail-config.glade.h:187
 msgid "_Show image animations"
 msgstr "_Dangos delweddau wedi'u hanimeiddio"
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:188
 #, 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
+#: ../mail/mail-config.glade.h:189
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Crebachu penawdau I / Cc / Bcc yn"
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:190
 msgid "_Use Secure Connection:"
 msgstr "_Defnyddio cysylltiad diogel:"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:191
 #, fuzzy
 msgid "_Use system defaults"
 msgstr "Defnyddio'r _Rhagosodiad"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:192
 msgid "_Use the same fonts as other applications"
 msgstr "_Defnyddio'r un ffontiau â rhaglenni eraill"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:195
 msgid "addresses"
 msgstr "cyfeiriadau"
 
-#: ../mail/mail-config.glade.h:195
+#: ../mail/mail-config.glade.h:196
 msgid "color"
 msgstr "lliw"
 
-#: ../mail/mail-config.glade.h:196
+#: ../mail/mail-config.glade.h:197
 msgid "description"
 msgstr "disgrifiad"
 
-#: ../mail/mail-config.glade.h:197
+#: ../mail/mail-config.glade.h:198
 msgid "seconds"
 msgstr "eiliadau"
 
@@ -13935,15 +14100,15 @@ msgstr "Rhowch Gyfrinair"
 msgid "User canceled operation."
 msgstr "Defnyddiwr wedi canslo'r weithred."
 
-#: ../mail/mail-signature-editor.c:201
+#: ../mail/mail-signature-editor.c:202
 msgid "_Save and Close"
 msgstr "_Cadw a Chau"
 
-#: ../mail/mail-signature-editor.c:355
+#: ../mail/mail-signature-editor.c:356
 msgid "Edit Signature"
 msgstr "Golygu Llofnod"
 
-#: ../mail/mail-signature-editor.c:370
+#: ../mail/mail-signature-editor.c:371
 msgid "_Signature Name:"
 msgstr "Enw _Llofnod:"
 
@@ -14572,7 +14737,7 @@ msgid "Highest"
 msgstr "Uchaf"
 
 #: ../mail/message-list.c:1654
-#: ../widgets/table/e-cell-date.c:55
+#: ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
@@ -14580,45 +14745,40 @@ msgstr "?"
 #. in 12-hour format, without seconds.
 #: ../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:1670
-#: ../widgets/table/e-cell-date.c:81
 msgid "Yesterday %l:%M %p"
 msgstr "Ddoe %l:%M %p"
 
 #: ../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:1690
-#: ../widgets/table/e-cell-date.c:101
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
 #: ../mail/message-list.c:1692
-#: ../widgets/table/e-cell-date.c:103
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3981
-#: ../mail/message-list.c:4456
+#: ../mail/message-list.c:3987
+#: ../mail/message-list.c:4462
 msgid "Generating message list"
 msgstr "Creu rhestr negeseuon"
 
-#: ../mail/message-list.c:4293
+#: ../mail/message-list.c:4299
 msgid "No message satisfies your search criteria. Either clear search with Search->Clear menu item or change it."
 msgstr ""
 
-#: ../mail/message-list.c:4295
+#: ../mail/message-list.c:4301
 msgid "There are only hidden messages in this folder. Use View->Show Hidden Messages to show them."
 msgstr ""
 
-#: ../mail/message-list.c:4297
+#: ../mail/message-list.c:4303
 msgid "There are no messages in this folder."
 msgstr "Does dim negeseuon yn y plygell hwn."
 
@@ -15108,6 +15268,7 @@ msgstr "Defnyddio _SSL"
 
 #. add refresh option
 #: ../plugins/caldav/caldav-source.c:433
+#: ../plugins/calendar-file/calendar-file.c:267
 #: ../plugins/calendar-http/calendar-http.c:308
 #: ../plugins/calendar-weather/calendar-weather.c:508
 #: ../plugins/google-account-setup/google-source.c:698
@@ -15116,6 +15277,7 @@ msgid "Re_fresh:"
 msgstr "_Adnewyddu:"
 
 #: ../plugins/caldav/caldav-source.c:451
+#: ../plugins/calendar-file/calendar-file.c:289
 #: ../plugins/calendar-http/calendar-http.c:326
 #: ../plugins/calendar-weather/calendar-weather.c:526
 #: ../plugins/google-account-setup/google-source.c:723
@@ -15132,9 +15294,41 @@ msgstr ""
 msgid "CalDAV Support"
 msgstr "Ffynonellau CalDAV"
 
+#: ../plugins/calendar-file/calendar-file.c:204
+#, fuzzy
+msgid "_Customize options"
+msgstr "Addasu"
+
+#: ../plugins/calendar-file/calendar-file.c:224
+msgid "File _name:"
+msgstr "_Enw ffeil:"
+
+#: ../plugins/calendar-file/calendar-file.c:228
+#, fuzzy
+msgid "Choose calendar file"
+msgstr "Dewiswch ffeil"
+
+#: ../plugins/calendar-file/calendar-file.c:272
+#, fuzzy
+msgid "On open"
+msgstr "Agor"
+
+#: ../plugins/calendar-file/calendar-file.c:273
+msgid "On file change"
+msgstr ""
+
+#: ../plugins/calendar-file/calendar-file.c:274
+#, fuzzy
+msgid "Periodically"
+msgstr "Personol"
+
+#: ../plugins/calendar-file/calendar-file.c:301
+msgid "Force read _only"
+msgstr ""
+
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
 msgid "Add local calendars to Evolution."
-msgstr ""
+msgstr "Ychwanegu calendrau lleol at Evolution"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
 msgid "Local Calendars"
@@ -15150,7 +15344,7 @@ msgstr "_Enw Defnyddiwr:"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
 msgid "Add web calendars to Evolution."
-msgstr ""
+msgstr "Ychwanegu calendrau o'r wê at Evolution."
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
 msgid "Web Calendars"
@@ -16732,7 +16926,7 @@ msgstr "%sRhowch gyfrinair am %s (defnyddiwr %s)"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:510
+#: ../plugins/groupwise-features/proxy-login.c:512
 msgid "_Proxy Login..."
 msgstr "_Mewngofnodi Dirprwy..."
 
@@ -16842,11 +17036,11 @@ msgstr ""
 msgid "Hula Support"
 msgstr ""
 
-#: ../plugins/imap-features/imap-headers.c:320
+#: ../plugins/imap-features/imap-headers.c:332
 msgid "Custom Headers"
 msgstr "Penawdau Addasedig"
 
-#: ../plugins/imap-features/imap-headers.c:333
+#: ../plugins/imap-features/imap-headers.c:345
 msgid "IMAP Headers"
 msgstr "Penawdau IMAP"
 
@@ -16863,10 +17057,6 @@ msgid "Basic and _Mailing List Headers (Default)"
 msgstr "Sylfaenol a _Phenawdau Rhestrau E-bost (Rhagosodiad)"
 
 #: ../plugins/imap-features/imap-headers.glade.h:4
-msgid "Fetch A_ll Headers"
-msgstr "Cyrchu _Bob Pennawd"
-
-#: ../plugins/imap-features/imap-headers.glade.h:5
 msgid ""
 "Give the extra headers that you need to fetch in addition to the above standard headers. \n"
 "You can ignore this if you choose \"All Headers\"."
@@ -16874,7 +17064,7 @@ msgstr ""
 "Rhoi'r penawdau ychwanegol yr ydych chi am eu cyrchu yn ogystal â'r penawdau safonol welir uchod. \n"
 "Os ydych chi'n dewis \"Pob Pennawd\", medrwch anwybyddu hyn."
 
-#: ../plugins/imap-features/imap-headers.glade.h:7
+#: ../plugins/imap-features/imap-headers.glade.h:6
 msgid ""
 "Select your IMAP Header Preferences. \n"
 "The more headers you have the more time it will take to download."
@@ -16882,7 +17072,7 @@ msgstr ""
 "Dewiswch eich Hoffterau Penawdau IMAP. \n"
 "Po fwyaf y nifer o benawdau sydd gennych, po hiraf fydd y broses o'u llwytho i lawr."
 
-#: ../plugins/imap-features/imap-headers.glade.h:9
+#: ../plugins/imap-features/imap-headers.glade.h:8
 msgid ""
 "_Basic Headers - (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
@@ -16890,6 +17080,11 @@ msgstr ""
 "_Penawdau Sylfaenol - (Cyflymaf)\n"
 "Defnyddiwch hwn os nad oes gennych chi hidlyddion yn seiliedig ar restrau e-bost"
 
+#: ../plugins/imap-features/imap-headers.glade.h:10
+#, fuzzy
+msgid "_Fetch All Headers"
+msgstr "Cyrchu _Bob Pennawd"
+
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
 msgid "Fine-tune your IMAP accounts."
 msgstr ""
@@ -17122,13 +17317,6 @@ msgstr "Chwilio am Wrthdaro"
 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: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:196
@@ -17147,11 +17335,6 @@ msgstr "Heddiw %H:%M:%S"
 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:219
-msgid "Tomorrow"
-msgstr "Yfory"
-
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:224
@@ -17701,7 +17884,7 @@ 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
+#: ../plugins/mail-notification/mail-notification.c:498
 #, fuzzy, c-format
 msgid ""
 "You have received %d new message\n"
@@ -17713,7 +17896,7 @@ 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
+#: ../plugins/mail-notification/mail-notification.c:503
 #, fuzzy, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -17721,51 +17904,51 @@ 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
+#: ../plugins/mail-notification/mail-notification.c:520
+#: ../plugins/mail-notification/mail-notification.c:525
 msgid "New email"
 msgstr "E-bost newydd"
 
-#: ../plugins/mail-notification/mail-notification.c:555
+#: ../plugins/mail-notification/mail-notification.c:588
 #, fuzzy
 msgid "Show icon in _notification area"
 msgstr "Gweld larymau dangos yn y gilfach hysbysu"
 
-#: ../plugins/mail-notification/mail-notification.c:558
+#: ../plugins/mail-notification/mail-notification.c:591
 #, fuzzy
 msgid "B_link icon in notification area"
 msgstr "_Addasu neges hysbysu"
 
-#: ../plugins/mail-notification/mail-notification.c:560
+#: ../plugins/mail-notification/mail-notification.c:593
 msgid "Popup _message together with the icon"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:741
+#: ../plugins/mail-notification/mail-notification.c:774
 #, 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
+#: ../plugins/mail-notification/mail-notification.c:780
 msgid "_Beep"
 msgstr "_Bîp"
 
-#: ../plugins/mail-notification/mail-notification.c:748
+#: ../plugins/mail-notification/mail-notification.c:781
 msgid "Play _sound file"
 msgstr "Chwarae ffeil _sain"
 
-#: ../plugins/mail-notification/mail-notification.c:759
+#: ../plugins/mail-notification/mail-notification.c:792
 msgid "Specify _filename:"
 msgstr "Penodwch enw _ffeil"
 
-#: ../plugins/mail-notification/mail-notification.c:760
+#: ../plugins/mail-notification/mail-notification.c:793
 msgid "Select sound file"
 msgstr "Dewis ffeil sain"
 
-#: ../plugins/mail-notification/mail-notification.c:761
+#: ../plugins/mail-notification/mail-notification.c:794
 msgid "Pl_ay"
 msgstr "_Chwarae"
 
-#: ../plugins/mail-notification/mail-notification.c:818
+#: ../plugins/mail-notification/mail-notification.c:851
 msgid "Notify new messages for _Inbox only"
 msgstr ""
 
@@ -18018,13 +18201,14 @@ msgstr "Marcio bob neges yn yr isblygellau fel rhai wedi'u darllen?"
 msgid "Do you want to mark messages as read in the current folder only, or in the current folder as well as all subfolders?"
 msgstr "Marcio bob neges yn y blygell a ddewiswyd, a'r is-blygellau, fel rhai wedi'u darllen."
 
-#: ../plugins/mark-all-read/mark-all-read.c:164
+#: ../plugins/mark-all-read/mark-all-read.c:166
 #, fuzzy
-msgid "Current Folder and _Subfolders"
+msgid "In Current Folder and _Subfolders"
 msgstr "Creu is-ffolderi"
 
-#: ../plugins/mark-all-read/mark-all-read.c:176
-msgid "Current _Folder Only"
+#: ../plugins/mark-all-read/mark-all-read.c:180
+#, fuzzy
+msgid "In Current _Folder Only"
 msgstr "_Plygell Bresennol Yn Unig"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
@@ -18142,24 +18326,24 @@ msgid "Outlook personal folders (.pst)"
 msgstr ""
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:316
+#: ../plugins/pst-import/pst-importer.c:315
 #, fuzzy
 msgid "_Address Book"
 msgstr "Llyfr Cyfeiriadau"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:323
+#: ../plugins/pst-import/pst-importer.c:322
 #, fuzzy
 msgid "A_ppointments"
 msgstr "Apwyntiadau"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:335
+#: ../plugins/pst-import/pst-importer.c:334
 #, fuzzy
 msgid "_Journal entries"
 msgstr "Cofnod dyddlyfr - %s"
 
-#: ../plugins/pst-import/pst-importer.c:350
+#: ../plugins/pst-import/pst-importer.c:349
 #, fuzzy
 msgid "Importing Outlook data"
 msgstr "Mewnforio data Elm"
@@ -18207,12 +18391,12 @@ msgstr ""
 msgid "Mount of %s failed:"
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.c:620
+#: ../plugins/publish-calendar/publish-calendar.c:624
 #, 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
+#: ../plugins/publish-calendar/publish-calendar.c:788
 #, fuzzy
 msgid "Could not create publish thread."
 msgstr "Methu creu neges."
@@ -18468,26 +18652,31 @@ msgid "Modified"
 msgstr "Newidiwyd"
 
 #: ../plugins/save-calendar/csv-format.c:523
-msgid "Advanced options for the CSV format"
+#, fuzzy
+msgid "A_dvanced options for the CSV format"
 msgstr "Opsiynau estynedig ar gyfer y ffurf CSV"
 
 #: ../plugins/save-calendar/csv-format.c:530
-msgid "Prepend a header"
+#, fuzzy
+msgid "Prepend a _header"
 msgstr "Rhoi pennyn ar y blaen"
 
 #: ../plugins/save-calendar/csv-format.c:539
-msgid "Value delimiter:"
+#, fuzzy
+msgid "_Value delimiter:"
 msgstr "Gwahanydd gwerth:"
 
-#: ../plugins/save-calendar/csv-format.c:545
-msgid "Record delimiter:"
+#: ../plugins/save-calendar/csv-format.c:546
+#, fuzzy
+msgid "_Record delimiter:"
 msgstr "Gwahanydd record:"
 
-#: ../plugins/save-calendar/csv-format.c:551
-msgid "Encapsulate values with:"
+#: ../plugins/save-calendar/csv-format.c:553
+#, fuzzy
+msgid "_Encapsulate values with:"
 msgstr "Capsiwleiddio gwerthoedd gyda:"
 
-#: ../plugins/save-calendar/csv-format.c:572
+#: ../plugins/save-calendar/csv-format.c:575
 msgid "Comma separated value format (.csv)"
 msgstr "Ffurf gwahanir-gan-gomáu (.csv)"
 
@@ -18517,7 +18706,11 @@ msgstr "%FT%T"
 msgid "RDF format (.rdf)"
 msgstr "Ffurf RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:158
+#: ../plugins/save-calendar/save-calendar.c:104
+msgid "_Format:"
+msgstr "_Fformat:"
+
+#: ../plugins/save-calendar/save-calendar.c:165
 msgid "Select destination file"
 msgstr "Dewiswch ffeil gyrchfan"
 
@@ -18587,13 +18780,13 @@ msgid "From %s:"
 msgstr "Oddi wrth %s:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:203
-#: ../shell/e-shell-importer.c:529
+#: ../shell/e-shell-importer.c:548
 #, c-format
 msgid "Importing data."
 msgstr "Mewnforio data."
 
 #: ../plugins/startup-wizard/startup-wizard.c:205
-#: ../shell/e-shell-importer.c:543
+#: ../shell/e-shell-importer.c:562
 msgid "Please wait"
 msgstr "Arhoswch os gwelwch yn dda"
 
@@ -19015,7 +19208,7 @@ msgstr "Mewnforio data a gosodiadau o _raglenni hŷn"
 msgid "Import a _single file"
 msgstr "Mewnforio _ffeil unigol"
 
-#: ../shell/e-shell-importer.c:724
+#: ../shell/e-shell-importer.c:743
 msgid "_Import"
 msgstr "_Mewnforio"
 
@@ -21407,58 +21600,58 @@ msgstr "Math o olwg"
 msgid "Type of view:"
 msgstr "Math o olwg:"
 
-#: ../widgets/misc/e-attachment.c:940
+#: ../widgets/misc/e-attachment.c:990
 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.c:1773
+#: ../widgets/misc/e-attachment.c:2313
 #: ../widgets/misc/e-attachment-store.c:636
 msgid "attachment.dat"
 msgstr "atodiad.dat"
 
-#: ../widgets/misc/e-attachment.c:1770
-#: ../widgets/misc/e-attachment.c:2567
+#: ../widgets/misc/e-attachment.c:1822
+#: ../widgets/misc/e-attachment.c:2619
 msgid "A load operation is already in progress"
 msgstr ""
 
-#: ../widgets/misc/e-attachment.c:1778
-#: ../widgets/misc/e-attachment.c:2575
+#: ../widgets/misc/e-attachment.c:1830
+#: ../widgets/misc/e-attachment.c:2627
 msgid "A save operation is already in progress"
 msgstr ""
 
-#: ../widgets/misc/e-attachment.c:1871
+#: ../widgets/misc/e-attachment.c:1923
 #, fuzzy, c-format
 msgid "Could not load '%s'"
 msgstr "Methwyd llwytho'r llyfr cyfeiriadau"
 
-#: ../widgets/misc/e-attachment.c:1874
+#: ../widgets/misc/e-attachment.c:1926
 #, fuzzy, c-format
 msgid "Could not load the attachment"
 msgstr "Math cynnwys yr atodiad."
 
-#: ../widgets/misc/e-attachment.c:2138
+#: ../widgets/misc/e-attachment.c:2190
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Methu agor '%s"
 
-#: ../widgets/misc/e-attachment.c:2141
+#: ../widgets/misc/e-attachment.c:2193
 #, fuzzy, c-format
 msgid "Could not open the attachment"
 msgstr "Math cynnwys yr atodiad."
 
-#: ../widgets/misc/e-attachment.c:2583
+#: ../widgets/misc/e-attachment.c:2635
 #, fuzzy
 msgid "Attachment contents not loaded"
 msgstr "Atodiad i'w ychwanegu."
 
-#: ../widgets/misc/e-attachment.c:2660
+#: ../widgets/misc/e-attachment.c:2712
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Methu arbed '%s'"
 
-#: ../widgets/misc/e-attachment.c:2663
+#: ../widgets/misc/e-attachment.c:2715
 #, fuzzy, c-format
 msgid "Could not save the attachment"
 msgstr "Math cynnwys yr atodiad."
@@ -21497,22 +21690,22 @@ msgstr "_Anfon At:"
 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-icon-view.c:480
 #: ../widgets/misc/e-attachment-tree-view.c:517
 msgid "Loading"
 msgstr "Llwytho"
 
-#: ../widgets/misc/e-attachment-icon-view.c:485
+#: ../widgets/misc/e-attachment-icon-view.c:492
 #: ../widgets/misc/e-attachment-tree-view.c:529
 msgid "Saving"
 msgstr "Arbed"
 
-#: ../widgets/misc/e-attachment-paned.c:81
+#: ../widgets/misc/e-attachment-paned.c:87
 msgid "Hide _Attachment Bar"
 msgstr "Cuddio'r Bar _Atodiadau"
 
-#: ../widgets/misc/e-attachment-paned.c:83
-#: ../widgets/misc/e-attachment-paned.c:620
+#: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:626
 msgid "Show _Attachment Bar"
 msgstr "Dangos y Bar _Atodiadau"
 
@@ -21817,7 +22010,7 @@ msgstr "Cyfrif Presennol"
 msgid "Current Folder"
 msgstr "Plygell Bresennol"
 
-#: ../widgets/misc/e-image-chooser.c:166
+#: ../widgets/misc/e-image-chooser.c:168
 msgid "Choose Image"
 msgstr "Dewiswch Ddelwedd"
 
@@ -22094,10 +22287,6 @@ msgstr "cliciwch yma i fynd i'r LAU"
 msgid "popup list"
 msgstr "rhestr naidlenni"
 
-#: ../widgets/table/e-cell-date.c:63
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
 #: ../widgets/table/e-cell-pixbuf.c:360
 msgid "Selected Column"
 msgstr "Colofn Wedi Dewis"
@@ -22610,6 +22799,21 @@ msgstr "Cyd-destun IM"
 msgid "Handle Popup"
 msgstr "Deliwr Naidlen"
 
+#, fuzzy
+#~ msgid "Could not open autosave file"
+#~ msgstr "Methwyd agor ffeil"
+#~ msgid "Autogenerated"
+#~ msgstr "Awtogynhyrchwyd"
+#~ msgid "Completed on %B %d, %Y, %l:%M %p"
+#~ msgstr "Wedi cwblhau ar %B %d, %Y, %l:%M %p"
+#~ msgid "by %B %d, %Y, %l:%M %p"
+#~ msgstr "gan %B %d, %Y %l:%M %p"
+#~ msgid " (%a, %R %Z)"
+#~ msgstr "(%a, %R %Z)"
+#~ msgid " (%R %Z)"
+#~ msgstr "(%R %Z)"
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
 #~ msgid "Toggle Attachment Bar"
 #~ msgstr "Toglu'r Bar Atodiadau"
 #~ msgid "activate"
@@ -23232,8 +23436,6 @@ msgstr "Deliwr Naidlen"
 #~ msgstr "Ffontiau"
 #~ msgid "Footer:"
 #~ msgstr "Troedyn:"
-#~ msgid "Format"
-#~ msgstr "Fformat"
 #~ msgid "Header/Footer"
 #~ msgstr "Pennawd/Troedyn"
 #~ msgid "Headings"
author	Iestyn Pryce <dylunio@gmail.com>	2009-08-08 01:05:47 +0800
committer	Matthew Barnes <mbarnes@redhat.com>	2009-08-11 04:43:40 +0800
commit	a51558d0fb96ff179b9249a473c3c03dcb7c5df4 (patch)
tree	bf6bd4c5e99336c009f6847d0eda6c99fb7f8d89 /po
parent	eeb05e58d8af259d36bf1a22668a34219dcea847 (diff)
download	gsoc2013-evolution-a51558d0fb96ff179b9249a473c3c03dcb7c5df4.tar.gz gsoc2013-evolution-a51558d0fb96ff179b9249a473c3c03dcb7c5df4.tar.zst gsoc2013-evolution-a51558d0fb96ff179b9249a473c3c03dcb7c5df4.zip